Display multiple arrows for accelerated transactions

Estimate accelerated positions in partner mempools
2024-02-02 21:59:18 +00:00 · 2024-02-02 02:25:49 +00:00
811 changed files with 108692 additions and 188173 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ jobs:
    if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')"
    strategy:
      matrix:
-        node: ["20", "21"]
+        node: ["18", "20"]
        flavor: ["dev", "prod"]
      fail-fast: false
    runs-on: "ubuntu-latest"
@@ -29,13 +29,13 @@ jobs:

      - name: Read rust-toolchain file from repository
        id: gettoolchain
-        run: echo "::set-output name=toolchain::$(cat ./rust/gbt/rust-toolchain)"
+        run: echo "::set-output name=toolchain::$(cat rust-toolchain)"
        working-directory: ${{ matrix.node }}/${{ matrix.flavor }}

      - name: Install ${{ steps.gettoolchain.outputs.toolchain }} Rust toolchain
        # Latest version available on this commit is 1.71.1
        # Commit date is Aug 3, 2023
-        uses: dtolnay/rust-toolchain@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a
+        uses: dtolnay/rust-toolchain@be73d7920c329f220ce78e0234b8f96b7ae60248
        with:
          toolchain: ${{ steps.gettoolchain.outputs.toolchain }}

@@ -115,10 +115,6 @@ jobs:

      - name: Sync-assets
        run: npm run sync-assets-dev
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          MEMPOOL_CDN: 1
-          VERBOSE: 1
        working-directory: assets/frontend

      - name: Zip mining-pool assets
@@ -160,7 +156,7 @@ jobs:
    if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')"
    strategy:
      matrix:
-        node: ["20", "21"]
+        node: ["18", "20"]
        flavor: ["dev", "prod"]
      fail-fast: false
    runs-on: "ubuntu-latest"
@@ -241,8 +237,6 @@ jobs:
        working-directory: ${{ matrix.node }}/${{ matrix.flavor }}/frontend
        env: 
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          MEMPOOL_CDN: 1
-          VERBOSE: 1
  
  e2e:
    if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')"
@@ -251,17 +245,21 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
+        # module: ["mempool", "liquid", "bisq"] Disabling bisq support for now
        module: ["mempool", "liquid"]
        include:
          - module: "mempool"
            spec: |
              cypress/e2e/mainnet/*.spec.ts
              cypress/e2e/signet/*.spec.ts
-              cypress/e2e/testnet4/*.spec.ts
+              cypress/e2e/testnet/*.spec.ts
          - module: "liquid"
            spec: |
              cypress/e2e/liquid/liquid.spec.ts
              cypress/e2e/liquidtestnet/liquidtestnet.spec.ts
+          # - module: "bisq"
+          #   spec: |
+          #     cypress/e2e/bisq/bisq.spec.ts

    name: E2E tests for ${{ matrix.module }}
    steps:
@@ -331,32 +329,4 @@ jobs:
          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          CYPRESS_PROJECT_ID: ${{ secrets.CYPRESS_PROJECT_ID }}
-
-  validate_docker_json:
-    if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')"
-    runs-on: "ubuntu-latest"
-    name: Validate generated backend Docker JSON
-
-    steps: 
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          path: docker
-      
-      - name: Install jq
-        run: sudo apt-get install jq -y
-
-      - name: Create new start script to run on CI
-        run: |
-          sed '$d' start.sh > start_ci.sh
-        working-directory: docker/docker/backend
-
-      - name: Run the script to generate the sample JSON
-        run: |
-          sh start_ci.sh
-        working-directory: docker/docker/backend
-
-      - name: Validate JSON syntax
-        run: |
-          cat mempool-config.json | jq
-        working-directory: docker/docker/backend
+        
--- a/.github/workflows/get_backend_block_height.yml
+++ b/.github/workflows/get_backend_block_height.yml
@@ -1,19 +0,0 @@
-name: 'Check if servers are in sync'
-
-on: [workflow_dispatch]
-
-jobs:
-  print-backend-sha:
-    runs-on: 'ubuntu-latest'
-    name: Get block height
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          path: repo
-
-      - name: Run script
-        working-directory: repo
-        run: |
-          chmod +x ./scripts/get_block_tip_height.sh
-          sh ./scripts/get_block_tip_height.sh
--- a/.github/workflows/on-tag.yml
+++ b/.github/workflows/on-tag.yml
@@ -101,7 +101,5 @@ jobs:
          --platform linux/amd64,linux/arm64 \
          --tag ${{ secrets.DOCKER_HUB_USER }}/${{ matrix.service }}:$TAG \
          --tag ${{ secrets.DOCKER_HUB_USER }}/${{ matrix.service }}:latest \
-          --build-context rustgbt=./rust \
-          --build-context backend=./backend \
          --output "type=registry" ./${{ matrix.service }}/ \
          --build-arg commitHash=$SHORT_SHA
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,3 @@ backend/mempool-config.json
 frontend/src/resources/config.template.js
 frontend/src/resources/config.js
 target
-docker/backend/start_ci.sh
--- a/rust/gbt/Cargo.lock
+++ b/rust/gbt/Cargo.lock
@@ -2,74 +2,38 @@
 # It is not intended for manual editing.
 version = 3

-[[package]]
-name = "addr2line"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
 [[package]]
 name = "aho-corasick"
-version = "1.1.3"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04"
 dependencies = [
 "memchr",
 ]

 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
-
-[[package]]
-name = "backtrace"
-version = "0.3.73"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
-]
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"

 [[package]]
 name = "bitflags"
-version = "2.6.0"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+checksum = "6dbe3c979c178231552ecba20214a8272df4e09f232a87aef4320cf06539aded"

 [[package]]
 name = "bytemuck"
-version = "1.16.1"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e"
+checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"

 [[package]]
 name = "bytes"
-version = "1.6.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952"
-
-[[package]]
-name = "cc"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "324c74f2155653c90b04f25b2a47a8a631360cb908f92a772695f430c7e31052"
+checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"

 [[package]]
 name = "cfg-if"
@@ -88,20 +52,14 @@ dependencies = [

 [[package]]
 name = "ctor"
-version = "0.2.8"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f"
+checksum = "1586fa608b1dab41f667475b4a41faec5ba680aee428bfa5de4ea520fdc6e901"
 dependencies = [
 "quote",
- "syn",
+ "syn 2.0.20",
 ]

-[[package]]
-name = "equivalent"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
-
 [[package]]
 name = "gbt"
 version = "1.0.0"
@@ -117,61 +75,58 @@ dependencies = [
 "tracing-subscriber",
 ]

-[[package]]
-name = "gimli"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
-
 [[package]]
 name = "hashbrown"
-version = "0.14.5"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"

 [[package]]
 name = "hermit-abi"
-version = "0.3.9"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
+dependencies = [
+ "libc",
+]

 [[package]]
 name = "indexmap"
-version = "2.2.6"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
- "equivalent",
+ "autocfg",
 "hashbrown",
 ]

 [[package]]
 name = "lazy_static"
-version = "1.5.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

 [[package]]
 name = "libc"
-version = "0.2.155"
+version = "0.2.146"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"

 [[package]]
 name = "libloading"
-version = "0.8.4"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d"
+checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
 dependencies = [
 "cfg-if",
- "windows-targets",
+ "winapi",
 ]

 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"

 [[package]]
 name = "matchers"
@@ -179,29 +134,20 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
 dependencies = [
- "regex-automata 0.1.10",
+ "regex-automata",
 ]

 [[package]]
 name = "memchr"
-version = "2.7.4"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
-
-[[package]]
-name = "miniz_oxide"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
-dependencies = [
- "adler",
-]
+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"

 [[package]]
 name = "napi"
-version = "2.16.8"
+version = "2.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1bd081bbaef43600fd2c5dd4c525b8ecea7dfdacf40ebc674e87851dce6559e"
+checksum = "0ede2d12cd6fce44da537a4be1f5510c73be2506c2e32dfaaafd1f36968f3a0e"
 dependencies = [
 "bitflags",
 "ctor",
@@ -213,29 +159,29 @@ dependencies = [

 [[package]]
 name = "napi-build"
-version = "2.1.3"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1c0f5d67ee408a4685b61f5ab7e58605c8ae3f2b4189f0127d804ff13d5560a"
+checksum = "882a73d9ef23e8dc2ebbffb6a6ae2ef467c0f18ac10711e4cc59c5485d41df0e"

 [[package]]
 name = "napi-derive"
-version = "2.16.9"
+version = "2.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87c3b5d4ab13e20a4bb9d3a1e2f3d4e77eee4a205d0f810abfd226b971dc6ce5"
+checksum = "da1c6a8fa84d549aa8708fcd062372bf8ec6e849de39016ab921067d21bde367"
 dependencies = [
 "cfg-if",
 "convert_case",
 "napi-derive-backend",
 "proc-macro2",
 "quote",
- "syn",
+ "syn 1.0.109",
 ]

 [[package]]
 name = "napi-derive-backend"
-version = "1.0.71"
+version = "1.0.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96de436a6ab93265beef838f8333c8345438f059df6081fe0ad0b8648ee0c524"
+checksum = "20bbc7c69168d06a848f925ec5f0e0997f98e8c8d4f2cc30157f0da51c009e17"
 dependencies = [
 "convert_case",
 "once_cell",
@@ -243,14 +189,14 @@ dependencies = [
 "quote",
 "regex",
 "semver",
- "syn",
+ "syn 1.0.109",
 ]

 [[package]]
 name = "napi-sys"
-version = "2.4.0"
+version = "2.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "427802e8ec3a734331fec1035594a210ce1ff4dc5bc1950530920ab717964ea3"
+checksum = "166b5ef52a3ab5575047a9fe8d4a030cdd0f63c96f071cd6907674453b07bae3"
 dependencies = [
 "libloading",
 ]
@@ -267,28 +213,19 @@ dependencies = [

 [[package]]
 name = "num_cpus"
-version = "1.16.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
 dependencies = [
 "hermit-abi",
 "libc",
 ]

-[[package]]
-name = "object"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"

 [[package]]
 name = "overload"
@@ -298,49 +235,47 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"

 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"

 [[package]]
 name = "priority-queue"
-version = "2.0.3"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70c501afe3a2e25c9bd219aa56ec1e04cdb3fcdd763055be268778c13fa82c1f"
+checksum = "fff39edfcaec0d64e8d0da38564fad195d2d51b680940295fcc307366e101e61"
 dependencies = [
 "autocfg",
- "equivalent",
 "indexmap",
 ]

 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406"
 dependencies = [
 "unicode-ident",
 ]

 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
 dependencies = [
 "proc-macro2",
 ]

 [[package]]
 name = "regex"
-version = "1.10.5"
+version = "1.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
+checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390"
 dependencies = [
 "aho-corasick",
 "memchr",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.7.2",
 ]

 [[package]]
@@ -352,17 +287,6 @@ dependencies = [
 "regex-syntax 0.6.29",
 ]

-[[package]]
-name = "regex-automata"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax 0.8.4",
-]
-
 [[package]]
 name = "regex-syntax"
 version = "0.6.29"
@@ -371,42 +295,47 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"

 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"

 [[package]]
 name = "semver"
-version = "1.0.23"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"

 [[package]]
 name = "sharded-slab"
-version = "0.1.7"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
 dependencies = [
 "lazy_static",
 ]

 [[package]]
 name = "smallvec"
-version = "1.13.2"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"

 [[package]]
 name = "syn"
-version = "2.0.71"
+version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcb8d4cebc40aa517dfb69618fa647a346562e67228e2236ae0042ee6ac14775"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -415,9 +344,9 @@ dependencies = [

 [[package]]
 name = "thread_local"
-version = "1.1.8"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
 dependencies = [
 "cfg-if",
 "once_cell",
@@ -425,21 +354,23 @@ dependencies = [

 [[package]]
 name = "tokio"
-version = "1.38.1"
+version = "1.28.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df"
+checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
 dependencies = [
- "backtrace",
+ "autocfg",
 "num_cpus",
 "pin-project-lite",
+ "windows-sys",
 ]

 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
 dependencies = [
+ "cfg-if",
 "pin-project-lite",
 "tracing-attributes",
 "tracing-core",
@@ -447,20 +378,20 @@ dependencies = [

 [[package]]
 name = "tracing-attributes"
-version = "0.1.27"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.20",
 ]

 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
 dependencies = [
 "once_cell",
 "valuable",
@@ -468,20 +399,20 @@ dependencies = [

 [[package]]
 name = "tracing-log"
-version = "0.2.0"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
+checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
 dependencies = [
+ "lazy_static",
 "log",
- "once_cell",
 "tracing-core",
 ]

 [[package]]
 name = "tracing-subscriber"
-version = "0.3.18"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
 dependencies = [
 "matchers",
 "nu-ansi-term",
@@ -497,15 +428,15 @@ dependencies = [

 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"

 [[package]]
 name = "unicode-segmentation"
-version = "1.11.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"

 [[package]]
 name = "valuable"
@@ -536,15 +467,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

 [[package]]
-name = "windows-targets"
-version = "0.52.6"
+name = "windows-sys"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
 dependencies = [
 "windows_aarch64_gnullvm",
 "windows_aarch64_msvc",
 "windows_i686_gnu",
- "windows_i686_gnullvm",
 "windows_i686_msvc",
 "windows_x86_64_gnu",
 "windows_x86_64_gnullvm",
@@ -553,48 +492,42 @@ dependencies = [

 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.6"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"

 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.6"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"

 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.6"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"

 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.6"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"

 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.6"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"

 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.6"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"

 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.6"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -0,0 +1,8 @@
+[workspace]
+members = [
+	"./backend/rust-gbt",
+]
+
+[profile.release]
+lto = true
+codegen-units = 1
--- a/12
+++ b/12
@@ -1,5 +1,5 @@
 The Mempool Open Source Project®
-Copyright (c) 2019-2024 Mempool Space K.K. and other shadowy super-coders
+Copyright (c) 2019-2023 Mempool Space K.K. and other shadowy super-coders

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

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

 See our full Trademark Policy and Guidelines for more details, published on 
 <https://mempool.space/trademark-policy>.
--- a/backend/.eslintrc
+++ b/backend/.eslintrc
@@ -20,7 +20,6 @@
    "@typescript-eslint/no-this-alias": 1,
    "@typescript-eslint/no-var-requires": 1,
    "@typescript-eslint/explicit-function-return-type": 1,
-    "@typescript-eslint/no-unused-vars": 1,
    "no-console": 1,
    "no-constant-condition": 1,
    "no-dupe-else-if": 1,
@@ -33,8 +32,6 @@
    "prefer-rest-params": 1,
    "quotes": [1, "single", { "allowTemplateLiterals": true }],
    "semi": 1,
-    "curly": [1, "all"],
-    "eqeqeq": 1,
-    "no-trailing-spaces": 1
+    "eqeqeq": 1
  }
 }
--- a/backend/.gitignore
+++ b/backend/.gitignore
@@ -7,12 +7,6 @@ mempool-config.json
 pools.json
 icons.json

-# docker
-Dockerfile
-GeoIP
-start.sh
-wait-for-it.sh
-
 # compiled output
 /dist
 /tmp
@@ -54,6 +48,3 @@ Thumbs.db

 # package folder (npm run package output)
 /package
-
-# Rust GBT folder (We build externally first)
-/rust-gbt
--- a/backend/README.md
+++ b/backend/README.md
@@ -103,7 +103,7 @@ In particular, make sure:
 - the correct Bitcoin Core RPC credentials are specified in `CORE_RPC`
 - the correct `BACKEND` is specified in `MEMPOOL`:
  - "electrum" if you're using [romanz/electrs](https://github.com/romanz/electrs) or [cculianu/Fulcrum](https://github.com/cculianu/Fulcrum)
-  - "esplora" if you're using [mempool/electrs](https://github.com/mempool/electrs)
+  - "esplora" if you're using [Blockstream/electrs](https://github.com/Blockstream/electrs)
  - "none" if you're not using any Electrum Server

 ### 6. Run Mempool Backend
@@ -181,7 +181,7 @@ Create a new wallet, if needed:
   bitcoin-cli -regtest createwallet test
   ```

-Load wallet (this command may take a while if you have a lot of UTXOs):
+Load wallet (this command may take a while if you have lot of UTXOs):
   ```
   bitcoin-cli -regtest loadwallet test
   ```
@@ -229,13 +229,13 @@ Generate block at regular interval (every 10 seconds in this example):

 ### Mining pools update

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

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

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

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

 ### Re-index tables

--- a/backend/mempool-config.sample.json
+++ b/backend/mempool-config.sample.json
@@ -1,6 +1,5 @@
 {
  "MEMPOOL": {
-    "OFFICIAL": false,
    "NETWORK": "mainnet",
    "BACKEND": "electrum",
    "ENABLED": true,
@@ -24,19 +23,19 @@
    "EXTERNAL_RETRY_INTERVAL": 0,
    "USER_AGENT": "mempool",
    "STDOUT_LOG_MIN_PRIORITY": "debug",
-    "AUTOMATIC_POOLS_UPDATE": false,
+    "AUTOMATIC_BLOCK_REINDEXING": false,
    "POOLS_JSON_URL": "https://raw.githubusercontent.com/mempool/mining-pools/master/pools-v2.json",
    "POOLS_JSON_TREE_URL": "https://api.github.com/repos/mempool/mining-pools/git/trees/master",
    "AUDIT": false,
-    "RUST_GBT": true,
-    "LIMIT_GBT": false,
+    "ADVANCED_GBT_AUDIT": false,
+    "ADVANCED_GBT_MEMPOOL": false,
+    "RUST_GBT": false,
    "CPFP_INDEXING": false,
    "DISK_CACHE_BLOCK_INTERVAL": 6,
    "MAX_PUSH_TX_SIZE_WEIGHT": 4000000,
    "ALLOW_UNREACHABLE": true,
    "PRICE_UPDATES_PER_HOUR": 1,
-    "MAX_TRACKED_ADDRESSES": 100,
-    "UNIX_SOCKET_PATH": ""
+    "MAX_TRACKED_ADDRESSES": 100
  },
  "CORE_RPC": {
    "HOST": "127.0.0.1",
@@ -59,8 +58,7 @@
    "RETRY_UNIX_SOCKET_AFTER": 30000,
    "REQUEST_TIMEOUT": 10000,
    "FALLBACK_TIMEOUT": 5000,
-    "FALLBACK": [],
-    "MAX_BEHIND_TIP": 2
+    "FALLBACK": []
  },
  "SECOND_CORE_RPC": {
    "HOST": "127.0.0.1",
@@ -99,6 +97,10 @@
    "GEOLITE2_ASN": "/usr/local/share/GeoIP/GeoLite2-ASN.mmdb",
    "GEOIP2_ISP": "/usr/local/share/GeoIP/GeoIP2-ISP.mmdb"
  },
+  "BISQ": {
+    "ENABLED": false,
+    "DATA_PATH": "/bisq/statsnode-data/btc_mainnet/db"
+  },
  "LIGHTNING": {
    "ENABLED": false,
    "BACKEND": "lnd",
@@ -129,7 +131,9 @@
    "MEMPOOL_API": "https://mempool.space/api/v1",
    "MEMPOOL_ONION": "http://mempoolhqx4isw62xs7abwphsq7ldayuidyx2v2oethdhhj6mlo2r6ad.onion/api/v1",
    "LIQUID_API": "https://liquid.network/api/v1",
-    "LIQUID_ONION": "http://liquidmom47f6s3m53ebfxn47p76a6tlnxib3wp6deux7wuzotdr6cyd.onion/api/v1"
+    "LIQUID_ONION": "http://liquidmom47f6s3m53ebfxn47p76a6tlnxib3wp6deux7wuzotdr6cyd.onion/api/v1",
+    "BISQ_URL": "https://bisq.markets/api",
+    "BISQ_ONION": "http://bisqmktse2cabavbr2xjq7xw3h6g5ottemo5rolfcwt6aly6tp5fdryd.onion/api"
  },
  "REDIS": {
    "ENABLED": false,
@@ -140,8 +144,6 @@
    "ENABLED": false,
    "AUDIT": false,
    "AUDIT_START_HEIGHT": 774000,
-    "STATISTICS": false,
-    "STATISTICS_START_TIME": 1481932800,
    "SERVERS": [
      "list",
      "of",
@@ -150,12 +152,7 @@
    ]
  },
  "MEMPOOL_SERVICES": {
-    "API": "https://mempool.space/api/v1/services",
+    "API": "https://mempool.space/api",
    "ACCELERATIONS": false
-  },
-  "FIAT_PRICE": {
-    "ENABLED": true,
-    "PAID": false,
-    "API_KEY": "your-api-key-from-freecurrencyapi.com"
  }
 }
--- a/backend/npm_package_rm_build_deps.sh
+++ b/backend/npm_package_rm_build_deps.sh
@@ -3,7 +3,10 @@ set -e

 # Cleaning up inside the node_modules folder
 cd package/node_modules
-rm -rf \
+rm -r \
  typescript \
  @typescript-eslint \
-  @napi-rs
+  @napi-rs \
+  ./rust-gbt/src \
+  ./rust-gbt/Cargo.toml \
+  ./rust-gbt/build.rs
--- a/backend/package-lock.json
+++ b/backend/package-lock.json
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
  "name": "mempool-backend",
-  "version": "3.0.1",
+  "version": "3.0.0-dev",
  "description": "Bitcoin mempool visualizer and blockchain explorer backend",
  "license": "GNU Affero General Public License v3.0",
  "homepage": "https://mempool.space",
@@ -22,12 +22,10 @@
  "main": "index.ts",
  "scripts": {
    "tsc": "./node_modules/typescript/bin/tsc -p tsconfig.build.json",
-    "build": "npm run tsc && npm run create-resources",
-    "clean": "rm -rf ./dist/ ./node_modules/ ./package/ ./rust-gbt/",
+    "build": "npm run rust-build && npm run tsc && npm run create-resources",
    "create-resources": "cp ./src/tasks/price-feeds/mtgox-weekly.json ./dist/tasks && node dist/api/fetch-version.js",
    "package": "./npm_package.sh",
    "package-rm-build-deps": "./npm_package_rm_build_deps.sh",
-    "preinstall": "cd ../rust/gbt && npm run build-release && npm run to-backend",
    "start": "node --max-old-space-size=2048 dist/index.js",
    "start-production": "node --max-old-space-size=16384 dist/index.js",
    "reindex-updated-pools": "npm run start-production --update-pools",
@@ -36,32 +34,34 @@
    "test:ci": "CI=true ./node_modules/.bin/jest --coverage",
    "lint": "./node_modules/.bin/eslint . --ext .ts",
    "lint:fix": "./node_modules/.bin/eslint . --ext .ts --fix",
-    "prettier": "./node_modules/.bin/prettier --write \"src/**/*.{js,ts}\""
+    "prettier": "./node_modules/.bin/prettier --write \"src/**/*.{js,ts}\"",
+    "rust-clean": "cd rust-gbt && rm -f *.node index.d.ts index.js && rm -rf target && cd ../",
+    "rust-build": "npm run rust-clean && cd rust-gbt && npm run build-release"
  },
  "dependencies": {
-    "@babel/core": "^7.25.2",
+    "@babel/core": "^7.23.2",
    "@mempool/electrum-client": "1.1.9",
    "@types/node": "^18.15.3",
-    "axios": "~1.7.2",
+    "axios": "~1.6.1",
    "bitcoinjs-lib": "~6.1.3",
    "crypto-js": "~4.2.0",
-    "express": "~4.19.2",
+    "express": "~4.18.2",
    "maxmind": "~4.3.11",
-    "mysql2": "~3.11.0",
+    "mysql2": "~3.7.0",
    "rust-gbt": "file:./rust-gbt",
-    "redis": "^4.7.0",
+    "redis": "^4.6.6",
    "socks-proxy-agent": "~7.0.0",
    "typescript": "~4.9.3",
-    "ws": "~8.18.0"
+    "ws": "~8.13.0"
  },
  "devDependencies": {
    "@babel/code-frame": "^7.18.6",
-    "@babel/core": "^7.25.2",
+    "@babel/core": "^7.23.2",
    "@types/compression": "^1.7.2",
    "@types/crypto-js": "^4.1.1",
    "@types/express": "^4.17.17",
    "@types/jest": "^29.5.0",
-    "@types/ws": "~8.5.10",
+    "@types/ws": "~8.5.5",
    "@typescript-eslint/eslint-plugin": "^5.55.0",
    "@typescript-eslint/parser": "^5.55.0",
    "eslint": "^8.36.0",
--- a/backend/rust-gbt/.gitignore
+++ b/backend/rust-gbt/.gitignore
@@ -1,8 +1,4 @@
-package-lock.json
-index.js
-index.d.ts
 *.node
 **/node_modules
-**/target
 **/.DS_Store
 npm-debug.log*
--- a/backend/rust-gbt/Cargo.toml
+++ b/backend/rust-gbt/Cargo.toml
@@ -12,18 +12,14 @@ crate-type = ["cdylib"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-priority-queue = "2.0.2"
+priority-queue = "1.3.2"
 bytes = "1.4.0"
-napi = { version = "2", features = ["napi8", "tokio_rt"] }
-napi-derive = "2"
+napi = { version = "2.13.2", features = ["napi8", "tokio_rt"] }
+napi-derive = "2.13.0"
 bytemuck = "1.13.1"
 tracing = "0.1.36"
-tracing-log = "0.2.0"
+tracing-log = "0.1.3"
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"]}

 [build-dependencies]
-napi-build = "2"
-
-[profile.release]
-lto = true
-codegen-units = 1
+napi-build = "2.0.1"
--- a/backend/rust-gbt/README.md
+++ b/backend/rust-gbt/README.md
--- a/backend/rust-gbt/build.rs
+++ b/backend/rust-gbt/build.rs
--- a/backend/rust-gbt/index.d.ts
+++ b/backend/rust-gbt/index.d.ts
@@ -0,0 +1,50 @@
+/* tslint:disable */
+/* eslint-disable */
+
+/* auto-generated by NAPI-RS */
+
+export interface ThreadTransaction {
+  uid: number
+  order: number
+  fee: number
+  weight: number
+  sigops: number
+  effectiveFeePerVsize: number
+  inputs: Array<number>
+}
+export interface ThreadAcceleration {
+  uid: number
+  delta: number
+}
+export class GbtGenerator {
+  constructor()
+  /**
+   * # Errors
+   *
+   * Rejects if the thread panics or if the Mutex is poisoned.
+   */
+  make(mempool: Array<ThreadTransaction>, accelerations: Array<ThreadAcceleration>, maxUid: number): Promise<GbtResult>
+  /**
+   * # Errors
+   *
+   * Rejects if the thread panics or if the Mutex is poisoned.
+   */
+  update(newTxs: Array<ThreadTransaction>, removeTxs: Array<number>, accelerations: Array<ThreadAcceleration>, maxUid: number): Promise<GbtResult>
+}
+/**
+ * The result from calling the gbt function.
+ *
+ * This tuple contains the following:
+ *        blocks: A 2D Vector of transaction IDs (u32), the inner Vecs each represent a block.
+ * block_weights: A Vector of total weights per block.
+ *      clusters: A 2D Vector of transaction IDs representing clusters of dependent mempool transactions
+ *         rates: A Vector of tuples containing transaction IDs (u32) and effective fee per vsize (f64)
+ */
+export class GbtResult {
+  blocks: Array<Array<number>>
+  blockWeights: Array<number>
+  clusters: Array<Array<number>>
+  rates: Array<Array<number>>
+  overflow: Array<number>
+  constructor(blocks: Array<Array<number>>, blockWeights: Array<number>, clusters: Array<Array<number>>, rates: Array<Array<number>>, overflow: Array<number>)
+}
--- a/backend/rust-gbt/index.js
+++ b/backend/rust-gbt/index.js
@@ -0,0 +1,258 @@
+/* tslint:disable */
+/* eslint-disable */
+/* prettier-ignore */
+
+/* auto-generated by NAPI-RS */
+
+const { existsSync, readFileSync } = require('fs')
+const { join } = require('path')
+
+const { platform, arch } = process
+
+let nativeBinding = null
+let localFileExisted = false
+let loadError = null
+
+function isMusl() {
+  // For Node 10
+  if (!process.report || typeof process.report.getReport !== 'function') {
+    try {
+      const lddPath = require('child_process').execSync('which ldd').toString().trim()
+      return readFileSync(lddPath, 'utf8').includes('musl')
+    } catch (e) {
+      return true
+    }
+  } else {
+    const { glibcVersionRuntime } = process.report.getReport().header
+    return !glibcVersionRuntime
+  }
+}
+
+switch (platform) {
+  case 'android':
+    switch (arch) {
+      case 'arm64':
+        localFileExisted = existsSync(join(__dirname, 'gbt.android-arm64.node'))
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./gbt.android-arm64.node')
+          } else {
+            nativeBinding = require('gbt-android-arm64')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      case 'arm':
+        localFileExisted = existsSync(join(__dirname, 'gbt.android-arm-eabi.node'))
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./gbt.android-arm-eabi.node')
+          } else {
+            nativeBinding = require('gbt-android-arm-eabi')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      default:
+        throw new Error(`Unsupported architecture on Android ${arch}`)
+    }
+    break
+  case 'win32':
+    switch (arch) {
+      case 'x64':
+        localFileExisted = existsSync(
+          join(__dirname, 'gbt.win32-x64-msvc.node')
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./gbt.win32-x64-msvc.node')
+          } else {
+            nativeBinding = require('gbt-win32-x64-msvc')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      case 'ia32':
+        localFileExisted = existsSync(
+          join(__dirname, 'gbt.win32-ia32-msvc.node')
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./gbt.win32-ia32-msvc.node')
+          } else {
+            nativeBinding = require('gbt-win32-ia32-msvc')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      case 'arm64':
+        localFileExisted = existsSync(
+          join(__dirname, 'gbt.win32-arm64-msvc.node')
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./gbt.win32-arm64-msvc.node')
+          } else {
+            nativeBinding = require('gbt-win32-arm64-msvc')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      default:
+        throw new Error(`Unsupported architecture on Windows: ${arch}`)
+    }
+    break
+  case 'darwin':
+    localFileExisted = existsSync(join(__dirname, 'gbt.darwin-universal.node'))
+    try {
+      if (localFileExisted) {
+        nativeBinding = require('./gbt.darwin-universal.node')
+      } else {
+        nativeBinding = require('gbt-darwin-universal')
+      }
+      break
+    } catch {}
+    switch (arch) {
+      case 'x64':
+        localFileExisted = existsSync(join(__dirname, 'gbt.darwin-x64.node'))
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./gbt.darwin-x64.node')
+          } else {
+            nativeBinding = require('gbt-darwin-x64')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      case 'arm64':
+        localFileExisted = existsSync(
+          join(__dirname, 'gbt.darwin-arm64.node')
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./gbt.darwin-arm64.node')
+          } else {
+            nativeBinding = require('gbt-darwin-arm64')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      default:
+        throw new Error(`Unsupported architecture on macOS: ${arch}`)
+    }
+    break
+  case 'freebsd':
+    if (arch !== 'x64') {
+      throw new Error(`Unsupported architecture on FreeBSD: ${arch}`)
+    }
+    localFileExisted = existsSync(join(__dirname, 'gbt.freebsd-x64.node'))
+    try {
+      if (localFileExisted) {
+        nativeBinding = require('./gbt.freebsd-x64.node')
+      } else {
+        nativeBinding = require('gbt-freebsd-x64')
+      }
+    } catch (e) {
+      loadError = e
+    }
+    break
+  case 'linux':
+    switch (arch) {
+      case 'x64':
+        if (isMusl()) {
+          localFileExisted = existsSync(
+            join(__dirname, 'gbt.linux-x64-musl.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./gbt.linux-x64-musl.node')
+            } else {
+              nativeBinding = require('gbt-linux-x64-musl')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        } else {
+          localFileExisted = existsSync(
+            join(__dirname, 'gbt.linux-x64-gnu.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./gbt.linux-x64-gnu.node')
+            } else {
+              nativeBinding = require('gbt-linux-x64-gnu')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        }
+        break
+      case 'arm64':
+        if (isMusl()) {
+          localFileExisted = existsSync(
+            join(__dirname, 'gbt.linux-arm64-musl.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./gbt.linux-arm64-musl.node')
+            } else {
+              nativeBinding = require('gbt-linux-arm64-musl')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        } else {
+          localFileExisted = existsSync(
+            join(__dirname, 'gbt.linux-arm64-gnu.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./gbt.linux-arm64-gnu.node')
+            } else {
+              nativeBinding = require('gbt-linux-arm64-gnu')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        }
+        break
+      case 'arm':
+        localFileExisted = existsSync(
+          join(__dirname, 'gbt.linux-arm-gnueabihf.node')
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./gbt.linux-arm-gnueabihf.node')
+          } else {
+            nativeBinding = require('gbt-linux-arm-gnueabihf')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      default:
+        throw new Error(`Unsupported architecture on Linux: ${arch}`)
+    }
+    break
+  default:
+    throw new Error(`Unsupported OS: ${platform}, architecture: ${arch}`)
+}
+
+if (!nativeBinding) {
+  if (loadError) {
+    throw loadError
+  }
+  throw new Error(`Failed to load native binding`)
+}
+
+const { GbtGenerator, GbtResult } = nativeBinding
+
+module.exports.GbtGenerator = GbtGenerator
+module.exports.GbtResult = GbtResult
--- a/backend/rust-gbt/package-lock.json
+++ b/backend/rust-gbt/package-lock.json
@@ -0,0 +1,34 @@
+{
+  "name": "gbt",
+  "version": "3.0.1",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "gbt",
+      "version": "3.0.1",
+      "hasInstallScript": true,
+      "dependencies": {
+        "@napi-rs/cli": "2.16.1"
+      },
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/@napi-rs/cli": {
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/cli/-/cli-2.16.1.tgz",
+      "integrity": "sha512-L0Gr5iEQIDEbvWdDr1HUaBOxBSHL1VZhWSk1oryawoT8qJIY+KGfLFelU+Qma64ivCPbxYpkfPoKYVG3rcoGIA==",
+      "bin": {
+        "napi": "scripts/index.js"
+      },
+      "engines": {
+        "node": ">= 10"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/Brooooooklyn"
+      }
+    }
+  }
+}
--- a/backend/rust-gbt/package.json
+++ b/backend/rust-gbt/package.json
@@ -6,12 +6,10 @@
  "types": "index.d.ts",
  "scripts": {
    "artifacts": "napi artifacts",
-    "build": "npm install --no-save @napi-rs/cli@2.18.0 && npm run check-cargo-version && napi build --platform",
+    "build": "napi build --platform",
    "build-debug": "npm run build",
    "build-release": "npm run build -- --release --strip",
-    "check-cargo-version": "VER=$(cat rust-toolchain) ; if ! cargo version | grep \"cargo $VER\" >/dev/null ; then echo -e \"\\033[1;35m[[[[WARNING]]]]: cargo version mismatch with ./rust-toolchain version ($VER)!!!\\033[0m\" >&2; fi",
-    "clean": "rm -rf ./target/ ./node_modules/ *.node package-lock.json",
-    "to-backend": "FD=${FD:-../../backend/rust-gbt/} ; rm -rf $FD && mkdir $FD && cp index.js index.d.ts package.json *.node $FD",
+    "install": "npm run build-release",
    "prepublishOnly": "napi prepublish -t npm",
    "test": "cargo test"
  },
@@ -26,6 +24,9 @@
      ]
    }
  },
+  "dependencies": {
+    "@napi-rs/cli": "2.16.1"
+  },
  "engines": {
    "node": ">= 12"
  }
--- a/backend/rust-gbt/src/audit_transaction.rs
+++ b/backend/rust-gbt/src/audit_transaction.rs
--- a/backend/rust-gbt/src/gbt.rs
+++ b/backend/rust-gbt/src/gbt.rs
@@ -8,9 +8,11 @@ use crate::{
    GbtResult, ThreadTransactionsMap, thread_acceleration::ThreadAcceleration,
 };

+const MAX_BLOCK_WEIGHT_UNITS: u32 = 4_000_000 - 4_000;
 const BLOCK_SIGOPS: u32 = 80_000;
 const BLOCK_RESERVED_WEIGHT: u32 = 4_000;
 const BLOCK_RESERVED_SIGOPS: u32 = 400;
+const MAX_BLOCKS: usize = 8;

 type AuditPool = Vec<Option<ManuallyDrop<AuditTransaction>>>;
 type ModifiedQueue = PriorityQueue<u32, TxPriority, U32HasherState>;
@@ -51,13 +53,7 @@ impl Ord for TxPriority {
 // TODO: Make gbt smaller to fix these lints.
 #[allow(clippy::too_many_lines)]
 #[allow(clippy::cognitive_complexity)]
-pub fn gbt(
-    mempool: &mut ThreadTransactionsMap,
-    accelerations: &[ThreadAcceleration],
-    max_uid: usize,
-    max_block_weight: u32,
-    max_blocks: usize,
-) -> GbtResult {
+pub fn gbt(mempool: &mut ThreadTransactionsMap, accelerations: &[ThreadAcceleration], max_uid: usize) -> GbtResult {
    let mut indexed_accelerations = Vec::with_capacity(max_uid + 1);
    indexed_accelerations.resize(max_uid + 1, None);
    for acceleration in accelerations {
@@ -150,9 +146,9 @@ pub fn gbt(
                modified.pop();
            }

-            if blocks.len() < (max_blocks - 1)
+            if blocks.len() < (MAX_BLOCKS - 1)
                && ((block_weight + (4 * next_tx.ancestor_sigop_adjusted_vsize())
-                    >= max_block_weight - 4_000)
+                    >= MAX_BLOCK_WEIGHT_UNITS)
                    || (block_sigops + next_tx.ancestor_sigops() > BLOCK_SIGOPS))
            {
                // hold this package in an overflow list while we check for smaller options
@@ -205,9 +201,9 @@ pub fn gbt(

        // this block is full
        let exceeded_package_tries =
-            failures > 1000 && block_weight > (max_block_weight - 4_000 - BLOCK_RESERVED_WEIGHT);
+            failures > 1000 && block_weight > (MAX_BLOCK_WEIGHT_UNITS - BLOCK_RESERVED_WEIGHT);
        let queue_is_empty = mempool_stack.is_empty() && modified.is_empty();
-        if (exceeded_package_tries || queue_is_empty) && blocks.len() < (max_blocks - 1) {
+        if (exceeded_package_tries || queue_is_empty) && blocks.len() < (MAX_BLOCKS - 1) {
            // finalize this block
            if transactions.is_empty() {
                info!("trying to push an empty block! breaking loop! mempool {:#?} | modified {:#?} | overflow {:#?}", mempool_stack.len(), modified.len(), overflow.len());
--- a/backend/rust-gbt/src/lib.rs
+++ b/backend/rust-gbt/src/lib.rs
@@ -35,8 +35,6 @@ type ThreadTransactionsMap = HashMap<u32, ThreadTransaction, U32HasherState>;
 #[napi]
 pub struct GbtGenerator {
    thread_transactions: Arc<Mutex<ThreadTransactionsMap>>,
-    max_block_weight: u32,
-    max_blocks: usize,
 }

 #[napi::module_init]
@@ -67,12 +65,10 @@ impl GbtGenerator {
    #[napi(constructor)]
    #[allow(clippy::new_without_default)]
    #[must_use]
-    pub fn new(max_block_weight: u32, max_blocks: u32) -> Self {
+    pub fn new() -> Self {
        debug!("Created new GbtGenerator");
        Self {
            thread_transactions: Arc::new(Mutex::new(u32hashmap_with_capacity(STARTING_CAPACITY))),
-            max_block_weight,
-            max_blocks: max_blocks as usize,
        }
    }

@@ -80,19 +76,12 @@ impl GbtGenerator {
    ///
    /// Rejects if the thread panics or if the Mutex is poisoned.
    #[napi]
-    pub async fn make(
-        &self,
-        mempool: Vec<ThreadTransaction>,
-        accelerations: Vec<ThreadAcceleration>,
-        max_uid: u32,
-    ) -> Result<GbtResult> {
+    pub async fn make(&self, mempool: Vec<ThreadTransaction>, accelerations: Vec<ThreadAcceleration>, max_uid: u32) -> Result<GbtResult> {
        trace!("make: Current State {:#?}", self.thread_transactions);
        run_task(
            Arc::clone(&self.thread_transactions),
            accelerations,
            max_uid as usize,
-            self.max_block_weight,
-            self.max_blocks,
            move |map| {
                for tx in mempool {
                    map.insert(tx.uid, tx);
@@ -118,8 +107,6 @@ impl GbtGenerator {
            Arc::clone(&self.thread_transactions),
            accelerations,
            max_uid as usize,
-            self.max_block_weight,
-            self.max_blocks,
            move |map| {
                for tx in new_txs {
                    map.insert(tx.uid, tx);
@@ -162,8 +149,6 @@ async fn run_task<F>(
    thread_transactions: Arc<Mutex<ThreadTransactionsMap>>,
    accelerations: Vec<ThreadAcceleration>,
    max_uid: usize,
-    max_block_weight: u32,
-    max_blocks: usize,
    callback: F,
 ) -> Result<GbtResult>
 where
@@ -181,13 +166,7 @@ where
        callback(&mut map);

        info!("Starting gbt algorithm for {} elements...", map.len());
-        let result = gbt::gbt(
-            &mut map,
-            &accelerations,
-            max_uid,
-            max_block_weight,
-            max_blocks as usize,
-        );
+        let result = gbt::gbt(&mut map, &accelerations, max_uid);
        info!("Finished gbt algorithm for {} elements...", map.len());

        debug!(
--- a/backend/rust-gbt/src/thread_acceleration.rs
+++ b/backend/rust-gbt/src/thread_acceleration.rs
--- a/backend/rust-gbt/src/thread_transaction.rs
+++ b/backend/rust-gbt/src/thread_transaction.rs
--- a/backend/rust-gbt/src/u32_hasher_types.rs
+++ b/backend/rust-gbt/src/u32_hasher_types.rs
--- a/backend/src/fixtures/mempool-config.template.json
+++ b/backend/src/fixtures/mempool-config.template.json
@@ -1,16 +1,14 @@
 {
  "MEMPOOL": {
    "ENABLED": true,
-    "OFFICIAL": false,
    "NETWORK": "__MEMPOOL_NETWORK__",
    "BACKEND": "__MEMPOOL_BACKEND__",
    "BLOCKS_SUMMARIES_INDEXING": true,
    "GOGGLES_INDEXING": false,
    "HTTP_PORT": 1,
-    "UNIX_SOCKET_PATH": "/mempool/socket/mempool-bitcoin-mainnet",
    "SPAWN_CLUSTER_PROCS": 2,
    "API_URL_PREFIX": "__MEMPOOL_API_URL_PREFIX__",
-    "AUTOMATIC_POOLS_UPDATE": false,
+    "AUTOMATIC_BLOCK_REINDEXING": false,
    "POLL_RATE_MS": 3,
    "CACHE_DIR": "__MEMPOOL_CACHE_DIR__",
    "CACHE_ENABLED": true,
@@ -29,8 +27,9 @@
    "POOLS_JSON_TREE_URL": "__MEMPOOL_POOLS_JSON_TREE_URL__",
    "POOLS_JSON_URL": "__MEMPOOL_POOLS_JSON_URL__",
    "AUDIT": true,
+    "ADVANCED_GBT_AUDIT": true,
+    "ADVANCED_GBT_MEMPOOL": true,
    "RUST_GBT": false,
-    "LIMIT_GBT": false,
    "CPFP_INDEXING": true,
    "MAX_BLOCKS_BULK_QUERY": 999,
    "DISK_CACHE_BLOCK_INTERVAL": 999,
@@ -60,8 +59,7 @@
    "RETRY_UNIX_SOCKET_AFTER": 888,
    "REQUEST_TIMEOUT": 10000,
    "FALLBACK_TIMEOUT": 5000,
-    "FALLBACK": [],
-    "MAX_BEHIND_TIP": 2
+    "FALLBACK": []
  },
  "SECOND_CORE_RPC": {
    "HOST": "__SECOND_CORE_RPC_HOST__",
@@ -81,8 +79,7 @@
    "USERNAME": "__DATABASE_USERNAME__",
    "PASSWORD": "__DATABASE_PASSWORD__",
    "PID_DIR": "__DATABASE_PID_FILE__",
-    "TIMEOUT": 3000,
-    "POOL_SIZE": 100
+    "TIMEOUT": 3000
  },
  "SYSLOG": {
    "ENABLED": false,
@@ -95,6 +92,10 @@
    "ENABLED": false,
    "TX_PER_SECOND_SAMPLE_PERIOD": 20
  },
+  "BISQ": {
+    "ENABLED": true,
+    "DATA_PATH": "__BISQ_DATA_PATH__"
+  },
  "SOCKS5PROXY": {
    "ENABLED": true,
    "USE_ONION": true,
@@ -107,7 +108,9 @@
    "MEMPOOL_API": "__EXTERNAL_DATA_SERVER_MEMPOOL_API__",
    "MEMPOOL_ONION": "__EXTERNAL_DATA_SERVER_MEMPOOL_ONION__",
    "LIQUID_API": "__EXTERNAL_DATA_SERVER_LIQUID_API__",
-    "LIQUID_ONION": "__EXTERNAL_DATA_SERVER_LIQUID_ONION__"
+    "LIQUID_ONION": "__EXTERNAL_DATA_SERVER_LIQUID_ONION__",
+    "BISQ_URL": "__EXTERNAL_DATA_SERVER_BISQ_URL__",
+    "BISQ_ONION": "__EXTERNAL_DATA_SERVER_BISQ_ONION__"
  },
  "LIGHTNING": {
    "ENABLED": true,
@@ -132,8 +135,6 @@
    "ENABLED": false,
    "AUDIT": false,
    "AUDIT_START_HEIGHT": 774000,
-    "STATISTICS": false,
-    "STATISTICS_START_TIME": 1481932800,
    "SERVERS": []
  },
  "MEMPOOL_SERVICES": {
@@ -144,10 +145,5 @@
    "ENABLED": false,
    "UNIX_SOCKET_PATH": "/tmp/redis.sock",
    "BATCH_QUERY_BASE_SIZE": 5000
-  },
-  "FIAT_PRICE": {
-    "ENABLED": true,
-    "PAID": false,
-    "API_KEY": "__MEMPOOL_CURRENCY_API_KEY__"
  }
 }
--- a/backend/src/tests/api/common.ts
+++ b/backend/src/tests/api/common.ts
@@ -4,37 +4,21 @@ import { MempoolTransactionExtended } from '../../mempool.interfaces';
 const randomTransactions = require('./test-data/transactions-random.json');
 const replacedTransactions = require('./test-data/transactions-replaced.json');
 const rbfTransactions = require('./test-data/transactions-rbfs.json');
-const nonStandardTransactions = require('./test-data/non-standard-txs.json');

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

-  describe('Mempool Goggles', () => {
-    test('should detect nonstandard transactions', () => {
-      nonStandardTransactions.forEach((tx) => {
-        expect(Common.isNonStandard(tx)).toEqual(true);
-      });
-    });
-  
-    test('should not misclassify as nonstandard transactions', () => {
-      randomTransactions.forEach((tx) => {
-        expect(Common.isNonStandard(tx)).toEqual(false);
-      });
-    });
+  test.only('should detect RBF transactions with scalable method', () => {
+    const newTransactions = rbfTransactions.concat(randomTransactions);
+    const result: { [txid: string]: MempoolTransactionExtended[] } = Common.findRbfTransactions(newTransactions, replacedTransactions, true);
+    expect(Object.values(result).length).toEqual(2);
+    expect(result).toHaveProperty('7219d95161f3718335991ac6d967d24eedec370908c9879bb1e192e6d797d0a6');
+    expect(result).toHaveProperty('5387881d695d4564d397026dc5f740f816f8390b4b2c5ec8c20309122712a875');
  });
 });
--- a/backend/src/tests/api/difficulty-adjustment.test.ts
+++ b/backend/src/tests/api/difficulty-adjustment.test.ts
@@ -11,35 +11,9 @@ describe('Mempool Difficulty Adjustment', () => {
    };

    const vectors = [
-      [ // Vector 1 (normal adjustment)
-        [ // Inputs
-          dt('2024-02-02T15:42:06.000Z'), // Last DA time (in seconds)
-          dt('2024-02-08T14:43:05.000Z'), // timestamp of 504 blocks ago (in seconds)
-          dt('2024-02-11T22:43:01.000Z'), // Current time (now) (in seconds)
-          830027,                         // Current block height
-          7.333505241141637,             // Previous retarget % (Passed through)
-          'mainnet',                      // Network (if testnet, next value is non-zero)
-          0,                              // Latest block timestamp in seconds (only used if difficulty already locked in)
-        ],
-        { // Expected Result
-          progressPercent: 71.97420634920636,
-          difficultyChange: 8.512745140778843,
-          estimatedRetargetDate: 1708004001715,
-          remainingBlocks: 565,
-          remainingTime: 312620715,
-          previousRetarget: 7.333505241141637,
-          previousTime: 1706888526,
-          nextRetargetHeight: 830592,
-          timeAvg: 553311,
-          adjustedTimeAvg: 553311,
-          timeOffset: 0,
-          expectedBlocks: 1338.0916666666667,
-        },
-      ],
-      [ // Vector 2 (within quarter-epoch overlap)
+      [ // Vector 1
        [ // Inputs
          dt('2022-08-18T11:07:00.000Z'), // Last DA time (in seconds)
-          dt('2022-08-16T03:16:54.000Z'), // timestamp of 504 blocks ago (in seconds)
          dt('2022-08-19T14:03:53.000Z'), // Current time (now) (in seconds)
          750134,                         // Current block height
          0.6280047707459726,             // Previous retarget % (Passed through)
@@ -48,23 +22,21 @@ describe('Mempool Difficulty Adjustment', () => {
        ],
        { // Expected Result
          progressPercent: 9.027777777777777,
-          difficultyChange: 1.0420538959004633,
-          estimatedRetargetDate: 1662009048328,
+          difficultyChange: 13.180707740199772,
+          estimatedRetargetDate: 1661895424692,
          remainingBlocks: 1834,
-          remainingTime: 1091215328,
+          remainingTime: 977591692,
          previousRetarget: 0.6280047707459726,
          previousTime: 1660820820,
          nextRetargetHeight: 751968,
          timeAvg: 533038,
-          adjustedTimeAvg: 594992,
          timeOffset: 0,
          expectedBlocks: 161.68833333333333,
        },
      ],
-      [ // Vector 3 (testnet)
+      [ // Vector 2 (testnet)
        [ // Inputs
          dt('2022-08-18T11:07:00.000Z'), // Last DA time (in seconds)
-          dt('2022-08-16T03:16:54.000Z'), // timestamp of 504 blocks ago (in seconds)
          dt('2022-08-19T14:03:53.000Z'), // Current time (now) (in seconds)
          750134,                         // Current block height
          0.6280047707459726,             // Previous retarget % (Passed through)
@@ -73,24 +45,22 @@ describe('Mempool Difficulty Adjustment', () => {
        ],
        { // Expected Result is same other than timeOffset
          progressPercent: 9.027777777777777,
-          difficultyChange: 1.0420538959004633,
-          estimatedRetargetDate: 1662009048328,
+          difficultyChange: 13.180707740199772,
+          estimatedRetargetDate: 1661895424692,
          remainingBlocks: 1834,
-          remainingTime: 1091215328,
+          remainingTime: 977591692,
          previousTime: 1660820820,
          previousRetarget: 0.6280047707459726,
          nextRetargetHeight: 751968,
          timeAvg: 533038,
-          adjustedTimeAvg: 594992,
          timeOffset: -667000, // 11 min 7 seconds since last block (testnet only)
          // If we add time avg to abs(timeOffset) it makes exactly 1200000 ms, or 20 minutes
          expectedBlocks: 161.68833333333333,
        },
      ],
-      [ // Vector 4 (mainnet lock-in (epoch ending 788255))
+      [ // Vector 3 (mainnet lock-in (epoch ending 788255))
        [ // Inputs
          dt('2023-04-20T09:57:33.000Z'), // Last DA time (in seconds)
-          dt('2022-08-16T03:16:54.000Z'), // timestamp of 504 blocks ago (in seconds)
          dt('2023-05-04T14:54:09.000Z'), // Current time (now) (in seconds)
          788255,                         // Current block height
          1.7220298879531821,             // Previous retarget % (Passed through)
@@ -107,17 +77,16 @@ describe('Mempool Difficulty Adjustment', () => {
          previousTime: 1681984653,
          nextRetargetHeight: 788256,
          timeAvg: 609129,
-          adjustedTimeAvg: 609129,
          timeOffset: 0,
          expectedBlocks: 2045.66,
        },
      ],
-    ] as [[number, number, number, number, number, string, number], DifficultyAdjustment][];
+    ] as [[number, number, number, number, string, number], DifficultyAdjustment][];

    for (const vector of vectors) {
      const result = calcDifficultyAdjustment(...vector[0]);
      // previousRetarget is passed through untouched
-      expect(result.previousRetarget).toStrictEqual(vector[0][4]);
+      expect(result.previousRetarget).toStrictEqual(vector[0][3]);
      expect(result).toStrictEqual(vector[1]);
    }
  });
--- a/backend/src/tests/api/test-data/non-standard-txs.json
+++ b/backend/src/tests/api/test-data/non-standard-txs.json
@@ -1,52 +0,0 @@
-[
-  {
-    "txid": "50136231cb7eeeffb17fc41d1cca213426abe5bf3760e3d6421cad0c0edad367",
-    "version": 1,
-    "locktime": 0,
-    "vin": [
-        {
-            "txid": "c7f86fb7b830124057475b282809f3474ef3565daa3de0b599980fb9e84ab019",
-            "vout": 4217,
-            "prevout": {
-                "scriptpubkey": "001466197b5eadd8067ec194a457e1044b6d1fbdd3b3",
-                "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 66197b5eadd8067ec194a457e1044b6d1fbdd3b3",
-                "scriptpubkey_type": "v0_p2wpkh",
-                "scriptpubkey_address": "bc1qvcvhkh4dmqr8asv553t7zpztd50mm5ang4na33",
-                "value": 106
-            },
-            "scriptsig": "",
-            "scriptsig_asm": "",
-            "witness": [
-                "3043021f2af6060a142c6cfd7428adad6a50745d2424813d7ced5c0bbcca85e70de1be022021440ca1c8c3ed49ecd1b64dca6911adcd430c5d3dd60d77ffe0072953999f5b01",
-                "02ead5c34e3d2c506574b562f857576e11380b6ba15d9f0ad7b7303fdaa9c1513d"
-            ],
-            "is_coinbase": false,
-            "sequence": 4294967295
-        }
-    ],
-    "vout": [
-        {
-            "scriptpubkey": "6a023a29",
-            "scriptpubkey_asm": "OP_RETURN OP_PUSHBYTES_2 3a29",
-            "scriptpubkey_type": "op_return",
-            "value": 0
-        },
-        {
-            "scriptpubkey": "6a036d7648",
-            "scriptpubkey_asm": "OP_RETURN OP_PUSHBYTES_3 6d7648",
-            "scriptpubkey_type": "op_return",
-            "value": 0
-        }
-    ],
-    "size": 186,
-    "weight": 420,
-    "sigops": 1,
-    "fee": 106,
-    "status": {
-        "confirmed": true,
-        "block_height": 836361,
-        "block_hash": "0000000000000000000341cc26cda4af82cd25f7063c448772228cbf2836915b",
-        "block_time": 1711448028
-    }
-  }
-]
--- a/backend/src/tests/api/test-data/transactions-random.json
+++ b/backend/src/tests/api/test-data/transactions-random.json
@@ -273,328 +273,5 @@
        },
        "bestDescendant": null,
        "cpfpChecked": true
-    },
-    {
-        "txid": "20b984492b5264162a4c92c9a34bc7fa08b67d669de7b4c5982ad3cb28aaecf6",
-        "version": 2,
-        "locktime": 0,
-        "vin": [
-            {
-                "txid": "3adda6afd547193793c248e667c2b7dbf26d705003de65e3a25e5be698286aef",
-                "vout": 2,
-                "prevout": {
-                    "scriptpubkey": "0014989cf12774fc705609610c7b9419f2d1c4807644",
-                    "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 989cf12774fc705609610c7b9419f2d1c4807644",
-                    "scriptpubkey_type": "v0_p2wpkh",
-                    "scriptpubkey_address": "bc1qnzw0zfm5l3c9vztpp3aegx0j68zgqajyffr2r6",
-                    "value": 27619
-                },
-                "scriptsig": "",
-                "scriptsig_asm": "",
-                "witness": [
-                    "304402205d7f1e0d928982645c2bcc4c730c4545c382d6520c2a14eebc71594702cd06b302200511d452ce51c79017536f50acb115eefe7c04506ad12b9307d2b5d56b999beb01",
-                    "03716cb4f0430fe69c596a12c6680c55803150645989b406772838d548cde7cca5"
-                ],
-                "is_coinbase": false,
-                "sequence": 4294967295
-            }
-        ],
-        "vout": [
-            {
-                "scriptpubkey": "6a5d0614c0a2331441",
-                "scriptpubkey_asm": "OP_RETURN OP_PUSHNUM_13 OP_PUSHBYTES_6 14c0a2331441",
-                "scriptpubkey_type": "op_return",
-                "value": 0
-            },
-            {
-                "scriptpubkey": "5114d71c6c3ea7ba7e6ee477a0bfd82c20c78997882c",
-                "scriptpubkey_asm": "OP_PUSHNUM_1 OP_PUSHBYTES_20 d71c6c3ea7ba7e6ee477a0bfd82c20c78997882c",
-                "scriptpubkey_type": "unknown",
-                "scriptpubkey_address": "bc1p6uwxc048hflxaerh5zlastpqc7ye0zpvq7gq2a",
-                "value": 546
-            },
-            {
-                "scriptpubkey": "0014989cf12774fc705609610c7b9419f2d1c4807644",
-                "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 989cf12774fc705609610c7b9419f2d1c4807644",
-                "scriptpubkey_type": "v0_p2wpkh",
-                "scriptpubkey_address": "bc1qnzw0zfm5l3c9vztpp3aegx0j68zgqajyffr2r6",
-                "value": 23073
-            }
-        ],
-        "size": 240,
-        "weight": 633,
-        "sigops": 1,
-        "fee": 4000,
-        "status": {
-            "confirmed": true,
-            "block_height": 848136,
-            "block_hash": "00000000000000000002c69c7a3010fcd596c0c7451c23e7cd1f5e19ebf8ee6d",
-            "block_time": 1718517071
-        }
-    },
-    {
-        "txid": "b10c0000004da5a9d1d9b4ae32e09f0b3e62d21a5cce5428d4ad714fb444eb5d",
-        "version": 1,
-        "locktime": 1231006505,
-        "vin": [
-            {
-                "txid": "d46a24962c1d7bd6e87d80570c6a53413eaf30d7fde7f52347f13645ae53969b",
-                "vout": 0,
-                "prevout": {
-                    "scriptpubkey": "41049434a2dd7c5b82df88f578f8d7fd14e8d36513aaa9c003eb5bd6cb56065e44b7e0227139e8a8e68e7de0a4ed32b8c90edc9673b8a7ea541b52f2a22196f7b8cfac",
-                    "scriptpubkey_asm": "OP_PUSHBYTES_65 049434a2dd7c5b82df88f578f8d7fd14e8d36513aaa9c003eb5bd6cb56065e44b7e0227139e8a8e68e7de0a4ed32b8c90edc9673b8a7ea541b52f2a22196f7b8cf OP_CHECKSIG",
-                    "scriptpubkey_type": "p2pk",
-                    "value": 6102
-                },
-                "scriptsig": "473044022004f027ae0b19bb7a7aa8fcdf135f1da769d087342020359ef4099a9f0f0ba4ec02206a83a9b78df3fed89a3b6052e69963e1fb08d8f6d17d945e43b51b5214aa41e601",
-                "scriptsig_asm": "OP_PUSHBYTES_71 3044022004f027ae0b19bb7a7aa8fcdf135f1da769d087342020359ef4099a9f0f0ba4ec02206a83a9b78df3fed89a3b6052e69963e1fb08d8f6d17d945e43b51b5214aa41e601",
-                "is_coinbase": false,
-                "sequence": 20090103
-            },
-            {
-                "txid": "cb9b47ac04023b29fb633a8ef04af351ac9fd74c57c9a2163f683516274767e3",
-                "vout": 0,
-                "prevout": {
-                    "scriptpubkey": "76a914bbb1f7d0f7e15ac088af9bafe25aaac1a59832d088ac",
-                    "scriptpubkey_asm": "OP_DUP OP_HASH160 OP_PUSHBYTES_20 bbb1f7d0f7e15ac088af9bafe25aaac1a59832d0 OP_EQUALVERIFY OP_CHECKSIG",
-                    "scriptpubkey_type": "p2pkh",
-                    "scriptpubkey_address": "1J7SZJry7CX4zWdH3P8E8UJjZrhcLEjJ39",
-                    "value": 1913
-                },
-                "scriptsig": "46304302204dc2939be89ab6626457fff40aec2cc4e6213e64bcb4d2c43bf6b49358ff638c021f33d2f8fdf6d54a2c82bb7cddc62becc2cbbaca6fd7f3ec927ea975f29ad8510221028b98707adfd6f468d56c1a6067a6f0c7fef43afbacad45384017f8be93a18d40",
-                "scriptsig_asm": "OP_PUSHBYTES_70 304302204dc2939be89ab6626457fff40aec2cc4e6213e64bcb4d2c43bf6b49358ff638c021f33d2f8fdf6d54a2c82bb7cddc62becc2cbbaca6fd7f3ec927ea975f29ad85102 OP_PUSHBYTES_33 028b98707adfd6f468d56c1a6067a6f0c7fef43afbacad45384017f8be93a18d40",
-                "is_coinbase": false,
-                "sequence": 20081031
-            },
-            {
-                "txid": "cb9b47ac04023b29fb633a8ef04af351ac9fd74c57c9a2163f683516274767e3",
-                "vout": 1,
-                "prevout": {
-                    "scriptpubkey": "52210304e708d258a632ffb128a62ecf5eebd1904e505497d031619513afc8bca7858f2102b9dc03f1133e7cbc7eb311631acc2dbda908fb0f0fae095da2f4dd427f51308a4104678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f53ae",
-                    "scriptpubkey_asm": "OP_PUSHNUM_2 OP_PUSHBYTES_33 0304e708d258a632ffb128a62ecf5eebd1904e505497d031619513afc8bca7858f OP_PUSHBYTES_33 02b9dc03f1133e7cbc7eb311631acc2dbda908fb0f0fae095da2f4dd427f51308a OP_PUSHBYTES_65 04678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f OP_PUSHNUM_3 OP_CHECKMULTISIG",
-                    "scriptpubkey_type": "multisig",
-                    "value": 1971
-                },
-                "scriptsig": "00453042021e4f6ff73d7b304a5cbf3bb7738abb5f81a4af6335962134ce27a1cc45fec702201b95e3acb7db93257b20651cdcb79af66bf0bb86a8ae5b4e0a5df4e3f86787e2033b303802153b78ce563f89a0ed9414f5aa28ad0d96d6795f9c63021f34793e2878497561e7616291ebdda3024b681cdacc8b863b5b0804cd30c2a481",
-                "scriptsig_asm": "OP_0 OP_PUSHBYTES_69 3042021e4f6ff73d7b304a5cbf3bb7738abb5f81a4af6335962134ce27a1cc45fec702201b95e3acb7db93257b20651cdcb79af66bf0bb86a8ae5b4e0a5df4e3f86787e203 OP_PUSHBYTES_59 303802153b78ce563f89a0ed9414f5aa28ad0d96d6795f9c63021f34793e2878497561e7616291ebdda3024b681cdacc8b863b5b0804cd30c2a481",
-                "is_coinbase": false,
-                "sequence": 19750504
-            },
-            {
-                "txid": "45e1cb33599acb071810ccc801b71bd7610865f5b899492946ab1bfbcb61cad6",
-                "vout": 0,
-                "prevout": {
-                    "scriptpubkey": "a91419f0b86f61606c6eb51b217698ca7e8bff1e398b87",
-                    "scriptpubkey_asm": "OP_HASH160 OP_PUSHBYTES_20 19f0b86f61606c6eb51b217698ca7e8bff1e398b OP_EQUAL",
-                    "scriptpubkey_type": "p2sh",
-                    "scriptpubkey_address": "344BBtYkhaCXgA7oYSXASUfh4bFieiponG",
-                    "value": 2140
-                },
-                "scriptsig": "00443041021d1313459a48bd1d0628eec635495f793e970729684394f9b814d2b24012022050be6d9918444e283da0136884f8311ec465d0fed2f8d24b75a8485ebdc13aea013a303702153b78ce563f89a0ed9414f5aa28ad0d96d6795f9c63021e78644ba72eab69fefb5fe50700671bfb91dda699f72ffbb325edc6a3c4ef8239303602153b78ce563f89a0ed9414f5aa28ad0d96d6795f9c63021d2c2db104e70720c39af43b6ba3edd930c26e0818aa59ff9c886281d8ba834ced532103e0a220d36f6f7ed5f3f58c279d055707c454135baf18fd00d798fec3cb52dfbc2103cf689db9313b9f7fc0b984dd9cac750be76041b392919b06f6bf94813da34cd421027f8af2eb6e904deddaa60d5af393d430575eb35e4dfd942a8a5882734b078906410411db93e1dcdb8a016b49840f8c53bc1eb68a382e97b1482ecad7b148a6909a5cb2e0eaddfb84ccf9744464f82e160bfa9b8b64f9d4c03f999b8643f656b412a34104ae1a62fe09c5f51b13905f07f06b99a2f7159b2225f374cd378d71302fa28414e7aab37397f554a7df5f142c21c1b7303b8a0626f1baded5c72a704f7e6cd84c55ae",
-                "scriptsig_asm": "OP_0 OP_PUSHBYTES_68 3041021d1313459a48bd1d0628eec635495f793e970729684394f9b814d2b24012022050be6d9918444e283da0136884f8311ec465d0fed2f8d24b75a8485ebdc13aea01 OP_PUSHBYTES_58 303702153b78ce563f89a0ed9414f5aa28ad0d96d6795f9c63021e78644ba72eab69fefb5fe50700671bfb91dda699f72ffbb325edc6a3c4ef82 OP_PUSHBYTES_57 303602153b78ce563f89a0ed9414f5aa28ad0d96d6795f9c63021d2c2db104e70720c39af43b6ba3edd930c26e0818aa59ff9c886281d8ba83 OP_PUSHDATA1 532103e0a220d36f6f7ed5f3f58c279d055707c454135baf18fd00d798fec3cb52dfbc2103cf689db9313b9f7fc0b984dd9cac750be76041b392919b06f6bf94813da34cd421027f8af2eb6e904deddaa60d5af393d430575eb35e4dfd942a8a5882734b078906410411db93e1dcdb8a016b49840f8c53bc1eb68a382e97b1482ecad7b148a6909a5cb2e0eaddfb84ccf9744464f82e160bfa9b8b64f9d4c03f999b8643f656b412a34104ae1a62fe09c5f51b13905f07f06b99a2f7159b2225f374cd378d71302fa28414e7aab37397f554a7df5f142c21c1b7303b8a0626f1baded5c72a704f7e6cd84c55ae",
-                "is_coinbase": false,
-                "sequence": 16,
-                "inner_redeemscript_asm": "OP_PUSHNUM_3 OP_PUSHBYTES_33 03e0a220d36f6f7ed5f3f58c279d055707c454135baf18fd00d798fec3cb52dfbc OP_PUSHBYTES_33 03cf689db9313b9f7fc0b984dd9cac750be76041b392919b06f6bf94813da34cd4 OP_PUSHBYTES_33 027f8af2eb6e904deddaa60d5af393d430575eb35e4dfd942a8a5882734b078906 OP_PUSHBYTES_65 0411db93e1dcdb8a016b49840f8c53bc1eb68a382e97b1482ecad7b148a6909a5cb2e0eaddfb84ccf9744464f82e160bfa9b8b64f9d4c03f999b8643f656b412a3 OP_PUSHBYTES_65 04ae1a62fe09c5f51b13905f07f06b99a2f7159b2225f374cd378d71302fa28414e7aab37397f554a7df5f142c21c1b7303b8a0626f1baded5c72a704f7e6cd84c OP_PUSHNUM_5 OP_CHECKMULTISIG"
-            },
-            {
-                "txid": "cb9b47ac04023b29fb633a8ef04af351ac9fd74c57c9a2163f683516274767e3",
-                "vout": 2,
-                "prevout": {
-                    "scriptpubkey": "a9143b13a1f71c20c799d86bb624b3898c826d6c82da87",
-                    "scriptpubkey_asm": "OP_HASH160 OP_PUSHBYTES_20 3b13a1f71c20c799d86bb624b3898c826d6c82da OP_EQUAL",
-                    "scriptpubkey_type": "p2sh",
-                    "scriptpubkey_address": "375PJxsKRtAq4WoS6u82jvgZW94R8Wx3iH",
-                    "value": 5139
-                },
-                "scriptsig": "1600149b27f072e4b972927c445d1946162a550b0914d8",
-                "scriptsig_asm": "OP_PUSHBYTES_22 00149b27f072e4b972927c445d1946162a550b0914d8",
-                "witness": [
-                    "3040021c23902a01d4c5cff2c33c8bdb778a5aadea78a9a0d6d4db60aaa0fba1022069237d9dbf2db8cff9c260ba71250493682d01a746f4a45c5c7ea386e56d2bc902",
-                    "0240187acd3e2fd3d8e1acffefa85907b6550730c24f78dfd3301c829fc4daf3cc"
-                ],
-                "is_coinbase": false,
-                "sequence": 141,
-                "inner_redeemscript_asm": "OP_0 OP_PUSHBYTES_20 9b27f072e4b972927c445d1946162a550b0914d8"
-            },
-            {
-                "txid": "cb9b47ac04023b29fb633a8ef04af351ac9fd74c57c9a2163f683516274767e3",
-                "vout": 3,
-                "prevout": {
-                    "scriptpubkey": "a914a3c0698f2300c7b2e8107d4c9c988e642110039087",
-                    "scriptpubkey_asm": "OP_HASH160 OP_PUSHBYTES_20 a3c0698f2300c7b2e8107d4c9c988e6421100390 OP_EQUAL",
-                    "scriptpubkey_type": "p2sh",
-                    "scriptpubkey_address": "3GcrZrbUuvE4UtUdSbKTXcRnTqmfMdyMAC",
-                    "value": 3220
-                },
-                "scriptsig": "220020a18160de7291554f349c7d5cbee4ab97fb542e94cf302ce8d7e9747e4188ca75",
-                "scriptsig_asm": "OP_PUSHBYTES_34 0020a18160de7291554f349c7d5cbee4ab97fb542e94cf302ce8d7e9747e4188ca75",
-                "witness": [
-                    "303f021c65aee6696e80be6e14545cfd64b44f17b0514c150eefdb090c0f0bd9021f3fef4aa95c252a225622aba99e4d5af5a6fe40d177acd593e64cf2f8557ccc03",
-                    "03b55c6f0749e0f3e2caeca05f68e3699f1b3c62a550730f704985a6a9aae437a1",
-                    "76a914db865fd920959506111079995f1e4017b489bfe38763ac6721024d560f7f5d28aae5e1a8aa2b7ba615d7fc48e4ea27e5d27336e6a8f5fa0f5c8c7c820120876475527c2103443e8834fa7d79d7b5e95e0e9d0847f6b03ac3ea977979858b4104947fca87ca52ae67a91446c3747322b220fdb925c9802f0e949c1feab99988ac6868"
-                ],
-                "is_coinbase": false,
-                "sequence": 3735928559,
-                "inner_redeemscript_asm": "OP_0 OP_PUSHBYTES_32 a18160de7291554f349c7d5cbee4ab97fb542e94cf302ce8d7e9747e4188ca75",
-                "inner_witnessscript_asm": "OP_DUP OP_HASH160 OP_PUSHBYTES_20 db865fd920959506111079995f1e4017b489bfe3 OP_EQUAL OP_IF OP_CHECKSIG OP_ELSE OP_PUSHBYTES_33 024d560f7f5d28aae5e1a8aa2b7ba615d7fc48e4ea27e5d27336e6a8f5fa0f5c8c OP_SWAP OP_SIZE OP_PUSHBYTES_1 20 OP_EQUAL OP_NOTIF OP_DROP OP_PUSHNUM_2 OP_SWAP OP_PUSHBYTES_33 03443e8834fa7d79d7b5e95e0e9d0847f6b03ac3ea977979858b4104947fca87ca OP_PUSHNUM_2 OP_CHECKMULTISIG OP_ELSE OP_HASH160 OP_PUSHBYTES_20 46c3747322b220fdb925c9802f0e949c1feab999 OP_EQUALVERIFY OP_CHECKSIG OP_ENDIF OP_ENDIF"
-            },
-            {
-                "txid": "cb9b47ac04023b29fb633a8ef04af351ac9fd74c57c9a2163f683516274767e3",
-                "vout": 4,
-                "prevout": {
-                    "scriptpubkey": "0014c0ca6e754e65d3ba59112d7abc33e500c00ecfa7",
-                    "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 c0ca6e754e65d3ba59112d7abc33e500c00ecfa7",
-                    "scriptpubkey_type": "v0_p2wpkh",
-                    "scriptpubkey_address": "bc1qcr9xua2wvhfm5kg394atcvl9qrqqana8rrmy8h",
-                    "value": 17144
-                },
-                "scriptsig": "",
-                "scriptsig_asm": "",
-                "witness": [
-                    "303e021c11f60486afd0f5d6573603fb2076ef2f676455b92ada257d2f25558a021e317719c946f951d49bf4df4285a618629cd9e554fcbf787c319a0c4dd22601",
-                    "032467f24cc31664f0cf34ff8d5cbb590888ddc1dcfec724a32ae3dd5338b8508e"
-                ],
-                "is_coinbase": false,
-                "sequence": 21000000
-            },
-            {
-                "txid": "637db3928a8fb1b22b81f92dc738ee7637e5b172d650363d0b327429578bd001",
-                "vout": 0,
-                "prevout": {
-                    "scriptpubkey": "0020a9530a167fcada672c142ee636dcd171796e69ef8e37aa1f77f35c58edd7a357",
-                    "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_32 a9530a167fcada672c142ee636dcd171796e69ef8e37aa1f77f35c58edd7a357",
-                    "scriptpubkey_type": "v0_p2wsh",
-                    "scriptpubkey_address": "bc1q49fs59nletdxwtq59mnrdhx3w9uku6003cm658mh7dw93mwh5dts2w2kht",
-                    "value": 8149
-                },
-                "scriptsig": "",
-                "scriptsig_asm": "",
-                "witness": [
-                    "303d021c32f9454db85cb1a4ca63a9883d4347c5e13f3654e884ae44e9efa3c8021d62f07fe452c06b084bc3e09afd3aac4039136549a465533bc1ca66967902",
-                    "01",
-                    "632102fd6db4de50399b2aa086edb23f8e140bbc823d6651e024a0eb871288068789cd67012ab27521034134a2bb35c3f83dab2489d96160741888b8b5589bb694dea6e7bc24486e9c6f68ac"
-                ],
-                "is_coinbase": false,
-                "sequence": 4190024921,
-                "inner_witnessscript_asm": "OP_IF OP_PUSHBYTES_33 02fd6db4de50399b2aa086edb23f8e140bbc823d6651e024a0eb871288068789cd OP_ELSE OP_PUSHBYTES_1 2a OP_CSV OP_DROP OP_PUSHBYTES_33 034134a2bb35c3f83dab2489d96160741888b8b5589bb694dea6e7bc24486e9c6f OP_ENDIF OP_CHECKSIG"
-            },
-            {
-                "txid": "0020db02df125062ebae5bacd189ebff22577b2817c1872be79a0d3ba3982c41",
-                "vout": 0,
-                "prevout": {
-                    "scriptpubkey": "512071212ded0ff4c9b1b0c505d8012772e2dbe98a3cae7168377b950fb6b866a849",
-                    "scriptpubkey_asm": "OP_PUSHNUM_1 OP_PUSHBYTES_32 71212ded0ff4c9b1b0c505d8012772e2dbe98a3cae7168377b950fb6b866a849",
-                    "scriptpubkey_type": "v1_p2tr",
-                    "scriptpubkey_address": "bc1pwysjmmg07nymrvx9qhvqzfmjutd7nz3u4ecksdmmj58mdwrx4pysq6m68g",
-                    "value": 9001
-                },
-                "scriptsig": "",
-                "scriptsig_asm": "",
-                "witness": [
-                    "d822f203827852998cad370232e8c57294540a5da51107fa26cf466bdd2b8b0b3d161999cc80aed8de7386a2bd5d5313aea159a231cc26fa53aaa702b7fa21ed"
-                ],
-                "is_coinbase": false,
-                "sequence": 341
-            },
-            {
-                "txid": "795741ecf9c431b14b1c8d2dd017d3978fd4f6452e91edf416f31ef9971206b4",
-                "vout": 0,
-                "prevout": {
-                    "scriptpubkey": "512089ac120a490eee88db5588112f95f88093284c814f07c3ad943a7faefba2271a",
-                    "scriptpubkey_asm": "OP_PUSHNUM_1 OP_PUSHBYTES_32 89ac120a490eee88db5588112f95f88093284c814f07c3ad943a7faefba2271a",
-                    "scriptpubkey_type": "v1_p2tr",
-                    "scriptpubkey_address": "bc1p3xkpyzjfpmhg3k643qgjl90cszfjsnypfuru8tv58fl6a7azyudqkcu66k",
-                    "value": 19953
-                },
-                "scriptsig": "",
-                "scriptsig_asm": "",
-                "witness": [
-                    "fe6eb715dceffefc067fdc787d250a9a9116682d216f6356ea38fc1f112bd74995faa90315e81981d2c2260b7eaca3c41a16b280362980f0d8faf4c05ebb82c5",
-                    "e34ad0ad33885a473831f8ba8d9339123cb19d0e642e156d8e0d6e2ab2691aedb30e55a35637a806927225e1aa72223d41e59f92c6579b819e7d331a7ada9d2e01",
-                    "2a4861fb4cb951c791bf6c93859ef65abccd90034f91b9b77abb918e13b6fce75d5fa3e2d2f6eeeae105315178c2cb9db2ef238fe89b282f691c06db43bc71ca02",
-                    "fc97bb2be673c3bf388aaf58178ef14d354caf83c92aca8ef1831d619b8511e928f4f5fdea3962067b11e7cecfe094cd0f66a4ea9af9ec836d70d18f2b37df0281",
-                    "a5781a0adaa80ab7f7f164172dd1a1cb127e523daa0d6949aba074a15c589f12dfb8183182afec9230cb7947b7422a4abc1bb78173550d66274ea19f6c9dd92c82",
-                    "",
-                    "",
-                    "205f4237bd7dae576b34abc8a9c6fa4f0e4787c04234ca963e9e96c8f9b67b56d1ac205f4237bd7f93c69403a30c6b641f27ccf5201090152fcf1596474221307831c3ba205ac8ff25ce63564963d1148b84627f614af1f3c77d7caa23adc61264fa5e4996ba20b210c83e6f5b3f866837112d023d9ae8da2a6412168d54968ab87860ab970690ba20d3ee3b7a8b8149122b3c886330b3241538ba4b935c4040f4a73ddab917241bc5ba20cdfabb9d0e5c8f09a83f19e36e100d8f5e882f1b60aa60dacd9e6d072c117bc0ba20aab038c238e95fb54cdd0a6705dc1b1f8d135a9e9b20ab9c7ff96eef0e9bf545ba559c",
-                    "c0b1674191a88ec5cdd733e4240a81803105dc412d6c6708d53ab94fc248f4f5534a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33bf4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e166f7cf9580f1c2dfb3c4d5d043cdbb128c640e3f20161245aa7372e9666168516a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48dd5d27987d2a3dfc724e359870c6644b40e497bdc0589a033220fe15429d88599e3bf3d07d4b0375638d5f1db5255fe07ba2c4cb067cd81b84ee974b6585fb46829a3efd3ef04f9153d47a990bd7b048a4b2d213daaa5fb8ed670fb85f13bdbcf54e48e5f5c656b26c3bca14a8c95aa583d07ebe84dde3b7dd4a78f4e4186e713d29c9c0e8e4d2a9790922af73f0b8d51f0bd4bb19940d9cf910ead8fbe85bc9bbb41a757f405890fb0f5856228e23b715702d714d59bf2b1feb70d8b2b4e3e089fdbcf0ef9d8d00f66e47917f67cc5d78aec1ac786e2abb8d2facb4e4790aad6cc455ae816e6cdafdb58d54e35d4f46d860047458eacf1c7405dc634631c570d8d31992805518fd62daa3bdd2a5c4fd2cd3054c9b3dca1d78055e9528cff6adc8f907925d2ebe48765103e6845c06f1f2bb77c6adc1cc002865865eb5cfd5c1cb10c007c60e14f9d087e0291d4d0c7869697c6681d979c6639dbd960792b4d4133e794d097969002ee05d336686fc03c9e15a597c1b9827669460fac9879903637777defed8717c581b4c0509329550e344bdc14ac38f71fc050096887e535c8fd456524104a6674693c29946543f8a0befccce5a352bda55ec8559fc630f5f37393096d97bfee8660f4100ffd61874d62f9a65de9fb6acf740c4c386990ef7373be398c4bdc43709db7398106609eea2a7841aaf3a4fa2000dc18184faa2a7eb5a2af5845a8d3796308ff9840e567b14cf6bb158ff26c999e6f9a1f5448f9aa"
-                ],
-                "is_coinbase": false,
-                "sequence": 342,
-                "inner_witnessscript_asm": "OP_PUSHBYTES_32 5f4237bd7dae576b34abc8a9c6fa4f0e4787c04234ca963e9e96c8f9b67b56d1 OP_CHECKSIG OP_PUSHBYTES_32 5f4237bd7f93c69403a30c6b641f27ccf5201090152fcf1596474221307831c3 OP_CHECKSIGADD OP_PUSHBYTES_32 5ac8ff25ce63564963d1148b84627f614af1f3c77d7caa23adc61264fa5e4996 OP_CHECKSIGADD OP_PUSHBYTES_32 b210c83e6f5b3f866837112d023d9ae8da2a6412168d54968ab87860ab970690 OP_CHECKSIGADD OP_PUSHBYTES_32 d3ee3b7a8b8149122b3c886330b3241538ba4b935c4040f4a73ddab917241bc5 OP_CHECKSIGADD OP_PUSHBYTES_32 cdfabb9d0e5c8f09a83f19e36e100d8f5e882f1b60aa60dacd9e6d072c117bc0 OP_CHECKSIGADD OP_PUSHBYTES_32 aab038c238e95fb54cdd0a6705dc1b1f8d135a9e9b20ab9c7ff96eef0e9bf545 OP_CHECKSIGADD OP_PUSHNUM_5 OP_NUMEQUAL"
-            }
-        ],
-        "vout": [
-            {
-                "scriptpubkey": "210261542eb020b36c1da48e2e607b90a8c1f2ccdbd06eaf5fb4bb0d7cc34293d32aac",
-                "scriptpubkey_asm": "OP_PUSHBYTES_33 0261542eb020b36c1da48e2e607b90a8c1f2ccdbd06eaf5fb4bb0d7cc34293d32a OP_CHECKSIG",
-                "scriptpubkey_type": "p2pk",
-                "value": 576
-            },
-            {
-                "scriptpubkey": "76a9140240539af6c68431e4ce9cc5ef464f12c1741b3c88ac",
-                "scriptpubkey_asm": "OP_DUP OP_HASH160 OP_PUSHBYTES_20 0240539af6c68431e4ce9cc5ef464f12c1741b3c OP_EQUALVERIFY OP_CHECKSIG",
-                "scriptpubkey_type": "p2pkh",
-                "scriptpubkey_address": "1CuQsdrcgcmPvugo3NqEwh1kDcpeEnuFC",
-                "value": 546
-            },
-            {
-                "scriptpubkey": "5121028b45a50f795be0413680036665d17a3eca099648ea80637bc3a70a7d2b52ae2851ae",
-                "scriptpubkey_asm": "OP_PUSHNUM_1 OP_PUSHBYTES_33 028b45a50f795be0413680036665d17a3eca099648ea80637bc3a70a7d2b52ae28 OP_PUSHNUM_1 OP_CHECKMULTISIG",
-                "scriptpubkey_type": "multisig",
-                "value": 582
-            },
-            {
-                "scriptpubkey": "a91449ed2c96e33b6134408af8484508bcc3248c8dbd87",
-                "scriptpubkey_asm": "OP_HASH160 OP_PUSHBYTES_20 49ed2c96e33b6134408af8484508bcc3248c8dbd OP_EQUAL",
-                "scriptpubkey_type": "p2sh",
-                "scriptpubkey_address": "38RuNhSiZiftB6WVnStu5aUz6jXtCDXQZk",
-                "value": 540
-            },
-            {
-                "scriptpubkey": "0014c8e51cf6891c0a2101aecea8cd5ce9bbbfaf7bba",
-                "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 c8e51cf6891c0a2101aecea8cd5ce9bbbfaf7bba",
-                "scriptpubkey_type": "v0_p2wpkh",
-                "scriptpubkey_address": "bc1qerj3ea5frs9zzqdwe65v6h8fhwl677a6s0hxhf",
-                "value": 294
-            },
-            {
-                "scriptpubkey": "0020c485bbb80c4be276e77eac3a983a391cc8b1a1b5f160995a36c3dff18296385a",
-                "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_32 c485bbb80c4be276e77eac3a983a391cc8b1a1b5f160995a36c3dff18296385a",
-                "scriptpubkey_type": "v0_p2wsh",
-                "scriptpubkey_address": "bc1qcjzmhwqvf038dem74safsw3ernytrgd479sfjk3kc00lrq5k8pdqczl83q",
-                "value": 330
-            },
-            {
-                "scriptpubkey": "5120a7a42b268957a06c9de4d7260f1df392ce4d6e7b743f5adc27415ce2afceb3b9",
-                "scriptpubkey_asm": "OP_PUSHNUM_1 OP_PUSHBYTES_32 a7a42b268957a06c9de4d7260f1df392ce4d6e7b743f5adc27415ce2afceb3b9",
-                "scriptpubkey_type": "v1_p2tr",
-                "scriptpubkey_address": "bc1p57jzkf5f27sxe80y6unq780njt8y6mnmwsl44hp8g9ww9t7wkwusv7av76",
-                "value": 330
-            },
-            {
-                "scriptpubkey": "51024e73",
-                "scriptpubkey_asm": "OP_PUSHNUM_1 OP_PUSHBYTES_2 4e73",
-                "scriptpubkey_type": "unknown",
-                "scriptpubkey_address": "bc1pfeessrawgf",
-                "value": 240
-            },
-            {
-                "scriptpubkey": "6a224e6f7420796f757220696e707574732c206e6f7420796f7572206f7574707574732e005152535455565758595a5b5c5d5e5f60",
-                "scriptpubkey_asm": "OP_RETURN OP_PUSHBYTES_34 4e6f7420796f757220696e707574732c206e6f7420796f7572206f7574707574732e OP_0 OP_PUSHNUM_1 OP_PUSHNUM_2 OP_PUSHNUM_3 OP_PUSHNUM_4 OP_PUSHNUM_5 OP_PUSHNUM_6 OP_PUSHNUM_7 OP_PUSHNUM_8 OP_PUSHNUM_9 OP_PUSHNUM_10 OP_PUSHNUM_11 OP_PUSHNUM_12 OP_PUSHNUM_13 OP_PUSHNUM_14 OP_PUSHNUM_15 OP_PUSHNUM_16",
-                "scriptpubkey_type": "op_return",
-                "value": 0
-            }
-        ],
-        "size": 3500,
-        "weight": 8186,
-        "sigops": 115,
-        "fee": 71294,
-        "status": {
-            "confirmed": true,
-            "block_height": 850000,
-            "block_hash": "00000000000000000002a0b5db2a7f8d9087464c2586b546be7bce8eb53b8187",
-            "block_time": 1719689674
-        }
    }
 ]
--- a/backend/src/tests/config.test.ts
+++ b/backend/src/tests/config.test.ts
@@ -14,16 +14,14 @@ describe('Mempool Backend Config', () => {

      expect(config.MEMPOOL).toStrictEqual({
        ENABLED: true,
-        OFFICIAL: false,
        NETWORK: 'mainnet',
        BACKEND: 'none',
        BLOCKS_SUMMARIES_INDEXING: false,
        GOGGLES_INDEXING: false,
        HTTP_PORT: 8999,
-        UNIX_SOCKET_PATH: '',
        SPAWN_CLUSTER_PROCS: 0,
        API_URL_PREFIX: '/api/v1/',
-        AUTOMATIC_POOLS_UPDATE: false,
+        AUTOMATIC_BLOCK_REINDEXING: false,
        POLL_RATE_MS: 2000,
        CACHE_DIR: './cache',
        CACHE_ENABLED: true,
@@ -42,8 +40,9 @@ describe('Mempool Backend Config', () => {
        POOLS_JSON_TREE_URL: 'https://api.github.com/repos/mempool/mining-pools/git/trees/master',
        POOLS_JSON_URL: 'https://raw.githubusercontent.com/mempool/mining-pools/master/pools-v2.json',
        AUDIT: false,
+        ADVANCED_GBT_AUDIT: false,
+        ADVANCED_GBT_MEMPOOL: false,
        RUST_GBT: false,
-        LIMIT_GBT: false,
        CPFP_INDEXING: false,
        MAX_BLOCKS_BULK_QUERY: 0,
        DISK_CACHE_BLOCK_INTERVAL: 6,
@@ -63,7 +62,6 @@ describe('Mempool Backend Config', () => {
        REQUEST_TIMEOUT: 10000,
        FALLBACK_TIMEOUT: 5000,
        FALLBACK: [],
-        MAX_BEHIND_TIP: 2,
       });

      expect(config.CORE_RPC).toStrictEqual({
@@ -95,8 +93,7 @@ describe('Mempool Backend Config', () => {
        USERNAME: 'mempool',
        PASSWORD: 'mempool',
        TIMEOUT: 180000,
-        PID_DIR: '',
-        POOL_SIZE: 100,
+        PID_DIR: ''
      });

      expect(config.SYSLOG).toStrictEqual({
@@ -109,6 +106,8 @@ describe('Mempool Backend Config', () => {

      expect(config.STATISTICS).toStrictEqual({ ENABLED: true, TX_PER_SECOND_SAMPLE_PERIOD: 150 });

+      expect(config.BISQ).toStrictEqual({ ENABLED: false, DATA_PATH: '/bisq/statsnode-data/btc_mainnet/db' });
+
      expect(config.SOCKS5PROXY).toStrictEqual({
        ENABLED: false,
        USE_ONION: true,
@@ -122,7 +121,9 @@ describe('Mempool Backend Config', () => {
        MEMPOOL_API: 'https://mempool.space/api/v1',
        MEMPOOL_ONION: 'http://mempoolhqx4isw62xs7abwphsq7ldayuidyx2v2oethdhhj6mlo2r6ad.onion/api/v1',
        LIQUID_API: 'https://liquid.network/api/v1',
-        LIQUID_ONION: 'http://liquidmom47f6s3m53ebfxn47p76a6tlnxib3wp6deux7wuzotdr6cyd.onion/api/v1'
+        LIQUID_ONION: 'http://liquidmom47f6s3m53ebfxn47p76a6tlnxib3wp6deux7wuzotdr6cyd.onion/api/v1',
+        BISQ_URL: 'https://bisq.markets/api',
+        BISQ_ONION: 'http://bisqmktse2cabavbr2xjq7xw3h6g5ottemo5rolfcwt6aly6tp5fdryd.onion/api'
      });

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

@@ -151,12 +150,6 @@ describe('Mempool Backend Config', () => {
        UNIX_SOCKET_PATH: '',
        BATCH_QUERY_BASE_SIZE: 5000,
      });
-
-      expect(config.FIAT_PRICE).toStrictEqual({
-        ENABLED: true,
-        PAID: false,
-        API_KEY: '',
-      });
    });
  });

@@ -183,6 +176,8 @@ describe('Mempool Backend Config', () => {

      expect(config.STATISTICS).toStrictEqual(fixture.STATISTICS);

+      expect(config.BISQ).toStrictEqual(fixture.BISQ);
+
      expect(config.SOCKS5PROXY).toStrictEqual(fixture.SOCKS5PROXY);

      expect(config.EXTERNAL_DATA_SERVER).toStrictEqual(fixture.EXTERNAL_DATA_SERVER);
--- a/backend/src/tests/gbt/gbt-tests.ts
+++ b/backend/src/tests/gbt/gbt-tests.ts
@@ -13,7 +13,7 @@ const vectorBuffer: Buffer = fs.readFileSync(path.join(__dirname, './', './test-

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

--- a/backend/src/api/about.routes.ts
+++ b/backend/src/api/about.routes.ts
@@ -1,87 +0,0 @@
-import { Application } from "express";
-import config from "../config";
-import axios from "axios";
-import logger from "../logger";
-
-class AboutRoutes {
-  public initRoutes(app: Application) {
-    app
-      .get(config.MEMPOOL.API_URL_PREFIX + 'donations', async (req, res) => {
-        try {
-          const response = await axios.get(`${config.EXTERNAL_DATA_SERVER.MEMPOOL_API}/donations`, { responseType: 'stream', timeout: 10000 });
-          response.data.pipe(res);
-        } catch (e) {
-          res.status(500).end();
-        }
-      })
-      .get(config.MEMPOOL.API_URL_PREFIX + 'donations/images/:id', async (req, res) => {
-        try {
-          const response = await axios.get(`${config.EXTERNAL_DATA_SERVER.MEMPOOL_API}/donations/images/${req.params.id}`, {
-            responseType: 'stream', timeout: 10000
-          });
-          response.data.pipe(res);
-        } catch (e) {
-          res.status(500).end();
-        }
-      })
-      .get(config.MEMPOOL.API_URL_PREFIX + 'contributors', async (req, res) => {
-        try {
-          const response = await axios.get(`${config.EXTERNAL_DATA_SERVER.MEMPOOL_API}/contributors`, { responseType: 'stream', timeout: 10000 });
-          response.data.pipe(res);
-        } catch (e) {
-          res.status(500).end();
-        }
-      })
-      .get(config.MEMPOOL.API_URL_PREFIX + 'contributors/images/:id', async (req, res) => {
-        try {
-          const response = await axios.get(`${config.EXTERNAL_DATA_SERVER.MEMPOOL_API}/contributors/images/${req.params.id}`, {
-            responseType: 'stream', timeout: 10000
-          });
-          response.data.pipe(res);
-        } catch (e) {
-          res.status(500).end();
-        }
-      })
-      .get(config.MEMPOOL.API_URL_PREFIX + 'translators', async (req, res) => {
-        try {
-          const response = await axios.get(`${config.EXTERNAL_DATA_SERVER.MEMPOOL_API}/translators`, { responseType: 'stream', timeout: 10000 });
-          response.data.pipe(res);
-        } catch (e) {
-          res.status(500).end();
-        }
-      })
-      .get(config.MEMPOOL.API_URL_PREFIX + 'translators/images/:id', async (req, res) => {
-        try {
-          const response = await axios.get(`${config.EXTERNAL_DATA_SERVER.MEMPOOL_API}/translators/images/${req.params.id}`, {
-            responseType: 'stream', timeout: 10000
-          });
-          response.data.pipe(res);
-        } catch (e) {
-          res.status(500).end();
-        }
-      })
-      .get(config.MEMPOOL.API_URL_PREFIX + 'services/sponsors', async (req, res) => {
-        const url = `${config.MEMPOOL_SERVICES.API}/${req.originalUrl.replace('/api/v1/services/', '')}`;
-        try {
-          const response = await axios.get(url, { responseType: 'stream', timeout: 10000 });
-          response.data.pipe(res);
-        } catch (e) {
-          logger.err(`Unable to fetch sponsors from ${url}. ${e}`, 'About Page');
-          res.status(500).end();
-        }
-      })
-      .get(config.MEMPOOL.API_URL_PREFIX + 'services/account/images/:username/:md5', async (req, res) => {
-        const url = `${config.MEMPOOL_SERVICES.API}/${req.originalUrl.replace('/api/v1/services/', '')}`;
-        try {
-          const response = await axios.get(url, { responseType: 'stream', timeout: 10000 });
-          response.data.pipe(res);
-        } catch (e) {
-          logger.err(`Unable to fetch sponsor profile image from ${url}. ${e}`, 'About Page');
-          res.status(500).end();
-        }
-      })
-    ;
-  }
-}
-
-export default new AboutRoutes();
--- a/backend/src/api/acceleration/acceleration.routes.ts
+++ b/backend/src/api/acceleration/acceleration.routes.ts
@@ -1,84 +0,0 @@
-import { Application, Request, Response } from 'express';
-import config from '../../config';
-import axios from 'axios';
-import logger from '../../logger';
-import mempool from '../mempool';
-import AccelerationRepository from '../../repositories/AccelerationRepository';
-
-class AccelerationRoutes {
-  private tag = 'Accelerator';
-
-  public initRoutes(app: Application): void {
-    app
-      .get(config.MEMPOOL.API_URL_PREFIX + 'services/accelerator/accelerations', this.$getAcceleratorAccelerations.bind(this))
-      .get(config.MEMPOOL.API_URL_PREFIX + 'services/accelerator/accelerations/history', this.$getAcceleratorAccelerationsHistory.bind(this))
-      .get(config.MEMPOOL.API_URL_PREFIX + 'services/accelerator/accelerations/history/aggregated', this.$getAcceleratorAccelerationsHistoryAggregated.bind(this))
-      .get(config.MEMPOOL.API_URL_PREFIX + 'services/accelerator/accelerations/stats', this.$getAcceleratorAccelerationsStats.bind(this))
-      .post(config.MEMPOOL.API_URL_PREFIX + 'services/accelerator/estimate', this.$getAcceleratorEstimate.bind(this))
-    ;
-  }
-
-  private async $getAcceleratorAccelerations(req: Request, res: Response): Promise<void> {
-    const accelerations = mempool.getAccelerations();
-    res.status(200).send(Object.values(accelerations));
-  }
-
-  private async $getAcceleratorAccelerationsHistory(req: Request, res: Response): Promise<void> {
-    const history = await AccelerationRepository.$getAccelerationInfo(null, req.query.blockHeight ? parseInt(req.query.blockHeight as string, 10) : null);
-    res.status(200).send(history.map(accel => ({
-      txid: accel.txid,
-      added: accel.added,
-      status: 'completed',
-      effectiveFee: accel.effective_fee,
-      effectiveVsize: accel.effective_vsize,
-      boostRate: accel.boost_rate,
-      boostCost: accel.boost_cost,
-      blockHeight: accel.height,
-      pools: [accel.pool],
-    })));
-  }
-
-  private async $getAcceleratorAccelerationsHistoryAggregated(req: Request, res: Response): Promise<void> {
-    const url = `${config.MEMPOOL_SERVICES.API}/${req.originalUrl.replace('/api/v1/services/', '')}`;
-    try {
-      const response = await axios.get(url, { responseType: 'stream', timeout: 10000 });
-      for (const key in response.headers) {
-        res.setHeader(key, response.headers[key]);
-      }
-      response.data.pipe(res);
-    } catch (e) {
-      logger.err(`Unable to get aggregated acceleration history from ${url} in $getAcceleratorAccelerationsHistoryAggregated(), ${e}`, this.tag);
-      res.status(500).end();
-    }
-  }
-
-  private async $getAcceleratorAccelerationsStats(req: Request, res: Response): Promise<void> {
-    const url = `${config.MEMPOOL_SERVICES.API}/${req.originalUrl.replace('/api/v1/services/', '')}`;
-    try {
-      const response = await axios.get(url, { responseType: 'stream', timeout: 10000 });
-      for (const key in response.headers) {
-        res.setHeader(key, response.headers[key]);
-      }
-      response.data.pipe(res);
-    } catch (e) {
-      logger.err(`Unable to get acceleration stats from ${url} in $getAcceleratorAccelerationsStats(), ${e}`, this.tag);
-      res.status(500).end();
-    }
-  }
-
-  private async $getAcceleratorEstimate(req: Request, res: Response): Promise<void> {
-    const url = `${config.MEMPOOL_SERVICES.API}/${req.originalUrl.replace('/api/v1/services/', '')}`;
-    try {
-      const response = await axios.post(url, req.body, { responseType: 'stream', timeout: 10000 });
-      for (const key in response.headers) {
-        res.setHeader(key, response.headers[key]);
-      }
-      response.data.pipe(res);
-    } catch (e) {
-      logger.err(`Unable to get acceleration estimate from ${url} in $getAcceleratorEstimate(), ${e}`, this.tag);
-      res.status(500).end();
-    }
-  }
-}
-
-export default new AccelerationRoutes();
--- a/backend/src/api/acceleration/acceleration.ts
+++ b/backend/src/api/acceleration/acceleration.ts
@@ -1,244 +0,0 @@
-import logger from '../../logger';
-import { MempoolTransactionExtended } from '../../mempool.interfaces';
-import { GraphTx, getSameBlockRelatives, initializeRelatives, makeBlockTemplate, mempoolComparator, removeAncestors, setAncestorScores } from '../mini-miner';
-
-const BLOCK_WEIGHT_UNITS = 4_000_000;
-const MAX_RELATIVE_GRAPH_SIZE = 200;
-const BID_BOOST_WINDOW = 40_000;
-const BID_BOOST_MIN_OFFSET = 10_000;
-const BID_BOOST_MAX_OFFSET = 400_000;
-
-export type Acceleration = {
-  txid: string;
-  max_bid: number;
-};
-
-interface TxSummary {
-  txid: string; // txid of the current transaction
-  effectiveVsize: number; // Total vsize of the dependency tree
-  effectiveFee: number;  // Total fee of the dependency tree in sats
-  ancestorCount: number; // Number of ancestors
-}
-
-export interface AccelerationInfo {
-  txSummary: TxSummary;
-  targetFeeRate: number; // target fee rate (recommended next block fee, or median fee for mined block)
-  nextBlockFee: number; // fee in sats required to be in the next block (using recommended next block fee, or median fee for mined block)
-  cost: number; // additional cost to accelerate ((cost + txSummary.effectiveFee) / txSummary.effectiveVsize) >= targetFeeRate
-}
-
-class AccelerationCosts {
-  /**
-   * Takes a list of accelerations and verbose block data
-   * Returns the "fair" boost rate to charge accelerations
-   *
-   * @param accelerationsx
-   * @param verboseBlock
-   */
-  public calculateBoostRate(accelerations: Acceleration[], blockTxs: MempoolTransactionExtended[]): number {
-    // Run GBT ourselves to calculate accurate effective fee rates
-    // the list of transactions comes from a mined block, so we already know everything fits within consensus limits
-    const template = makeBlockTemplate(blockTxs, accelerations, 1, Infinity, Infinity);
-
-    // initialize working maps for fast tx lookups
-    const accMap = {};
-    const txMap = {};
-    for (const acceleration of accelerations) {
-      accMap[acceleration.txid] = acceleration;
-    }
-    for (const tx of template) {
-      txMap[tx.txid] = tx;
-    }
-
-    // Identify and exclude accelerated and otherwise prioritized transactions
-    const excludeMap = {};
-    let totalWeight = 0;
-    let minAcceleratedPackage = Infinity;
-    let lastEffectiveRate = 0;
-    // Iterate over the mined template from bottom to top.
-    // Transactions should appear in ascending order of mining priority.
-    for (const blockTx of [...blockTxs].reverse()) {
-      const txid = blockTx.txid;
-      const tx = txMap[txid];
-      totalWeight += tx.weight;
-      const isAccelerated = accMap[txid] != null;
-      // If a cluster has a in-band effective fee rate than the previous cluster,
-      // it must have been prioritized out-of-band (in order to have a higher mining priority)
-      // so exclude from the analysis.
-      const isPrioritized = tx.effectiveFeePerVsize < lastEffectiveRate;
-      if (isPrioritized || isAccelerated) {
-        let packageWeight = 0;
-        // exclude this whole CPFP cluster
-        for (const clusterTxid of tx.cluster) {
-          packageWeight += txMap[clusterTxid].weight;
-          if (!excludeMap[clusterTxid]) {
-            excludeMap[clusterTxid] = true;
-          }
-        }
-        // keep track of the smallest accelerated CPFP cluster for later
-        if (isAccelerated) {
-          minAcceleratedPackage = Math.min(minAcceleratedPackage, packageWeight);
-        }
-      }
-      if (!isPrioritized) {
-        if (!isAccelerated) {
-          lastEffectiveRate = tx.effectiveFeePerVsize;
-        }
-      }
-    }
-
-    // The Bid Boost Rate is calculated by disregarding the bottom X weight units of the block,
-    // where X is the larger of BID_BOOST_MIN_OFFSET or the smallest accelerated package weight (the "offset"),
-    // then taking the average fee rate of the following BID_BOOST_WINDOW weight units
-    // (ignoring accelerated transactions and their ancestors).
-    //
-    // Transactions within the offset might pay less than the fair rate due to bin-packing effects
-    // But the average rate paid by the next chunk of non-accelerated transactions provides a good
-    // upper bound on the "next best rate" of alternatives to including the accelerated transactions
-    // (since, if there were any better options, they would have been included instead)
-    const spareWeight = BLOCK_WEIGHT_UNITS - totalWeight;
-    const windowOffset = Math.min(Math.max(minAcceleratedPackage, BID_BOOST_MIN_OFFSET, spareWeight), BID_BOOST_MAX_OFFSET);
-    const leftBound = windowOffset;
-    const rightBound = windowOffset + BID_BOOST_WINDOW;
-    let totalFeeInWindow = 0;
-    let totalWeightInWindow = Math.max(0, spareWeight - leftBound);
-    let txIndex = blockTxs.length - 1;
-    for (let offset = spareWeight; offset < BLOCK_WEIGHT_UNITS && txIndex >= 0; txIndex--) {
-      const txid = blockTxs[txIndex].txid;
-      const tx = txMap[txid];
-      if (excludeMap[txid]) {
-        // skip prioritized transactions and their ancestors
-        continue;
-      }
-
-      const left = offset;
-      const right = offset + tx.weight;
-      offset += tx.weight;
-      if (right < leftBound) {
-        // not within window yet
-        continue;
-      }
-      if (left > rightBound) {
-        // past window
-        break;
-      }
-      // count fees for weight units within the window
-      const overlapLeft = Math.max(leftBound, left);
-      const overlapRight = Math.min(rightBound, right);
-      const overlapUnits = overlapRight - overlapLeft;
-      totalFeeInWindow += (tx.effectiveFeePerVsize * (overlapUnits / 4));
-      totalWeightInWindow += overlapUnits;
-    }
-
-    if (totalWeightInWindow < BID_BOOST_WINDOW) {
-      // not enough un-prioritized transactions to calculate a fair rate
-      // just charge everyone their max bids
-      return Infinity;
-    }
-    // Divide the total fee by the size of the BID_BOOST_WINDOW in vbytes
-    const averageRate = totalFeeInWindow / (BID_BOOST_WINDOW / 4);
-    return averageRate;
-  }
-
-
-  /**
-   * Takes an accelerated mined txid and a target rate
-   * Returns the total vsize, fees and acceleration cost (in sats) of the tx and all same-block ancestors
-   *
-   * @param txid
-   * @param medianFeeRate
-   */
-  public getAccelerationInfo(tx: MempoolTransactionExtended, targetFeeRate: number, transactions: MempoolTransactionExtended[]): AccelerationInfo {
-    // Get same-block transaction ancestors
-    const allRelatives = getSameBlockRelatives(tx, transactions);
-    const relativesMap = initializeRelatives(allRelatives);
-    const rootTx = relativesMap.get(tx.txid) as GraphTx;
-
-    // Calculate cost to boost
-    return this.calculateAccelerationAncestors(rootTx, relativesMap, targetFeeRate);
-  }
-
-  /**
-   * Given a root transaction, a list of in-mempool ancestors, and a target fee rate,
-   * Calculate the minimum set of transactions to fee-bump, their total vsize + fees
-   *
-   * @param tx
-   * @param ancestors
-   */
-  private calculateAccelerationAncestors(tx: GraphTx, relatives: Map<string, GraphTx>, targetFeeRate: number): AccelerationInfo {
-    // add root tx to the ancestor map
-    relatives.set(tx.txid, tx);
-
-    // Check for high-sigop transactions (not supported)
-    relatives.forEach(entry => {
-      if (entry.vsize > Math.ceil(entry.weight / 4)) {
-        throw new Error(`high_sigop_tx`);
-      }
-    });
-
-    // Initialize individual & ancestor fee rates
-    relatives.forEach(entry => setAncestorScores(entry));
-
-    // Sort by descending ancestor score
-    let sortedRelatives = Array.from(relatives.values()).sort(mempoolComparator);
-
-    let includedInCluster: Map<string, GraphTx> | null = null;
-
-    // While highest score >= targetFeeRate
-    let maxIterations = MAX_RELATIVE_GRAPH_SIZE;
-    while (sortedRelatives.length && sortedRelatives[0].score && sortedRelatives[0].score >= targetFeeRate && maxIterations > 0) {
-      maxIterations--;
-      // Grab the highest scoring entry
-      const best = sortedRelatives.shift();
-      if (best) {
-        const cluster = new Map<string, GraphTx>(best.ancestors?.entries() || []);
-        if (best.ancestors.has(tx.txid)) {
-          includedInCluster = cluster;
-        }
-        cluster.set(best.txid, best);
-        // Remove this cluster (it already pays over the target rate, so doesn't need to be boosted)
-        // and update scores, ancestor totals and dependencies for the survivors
-        removeAncestors(cluster, relatives);
-
-        // re-sort
-        sortedRelatives = Array.from(relatives.values()).sort(mempoolComparator);
-      }
-    }
-
-    // sanity check for infinite loops / too many ancestors (should never happen)
-    if (maxIterations <= 0) {
-      logger.warn(`acceleration dependency calculation failed: calculateAccelerationAncestors loop exceeded ${MAX_RELATIVE_GRAPH_SIZE} iterations, unable to proceed`);
-      throw new Error('invalid_tx_dependencies');
-    }
-
-    let totalFee = tx.fees.ancestor;
-
-    // transaction is already CPFP-d above the target rate by some descendant
-    if (includedInCluster) {
-      let clusterSize = 0;
-      let clusterFee = 0;
-      includedInCluster.forEach(entry => {
-        clusterSize += entry.vsize;
-        clusterFee += entry.fees.base;
-      });
-      const clusterRate = clusterFee / clusterSize;
-      totalFee = Math.ceil(tx.ancestorsize * clusterRate);
-    }
-
-    // Whatever remains in the accelerated tx's dependencies needs to be boosted to the targetFeeRate
-    // Cost = (totalVsize * targetFeeRate) - totalFee
-    return {
-      txSummary: {
-        txid: tx.txid,
-        effectiveVsize: tx.ancestorsize,
-        effectiveFee: totalFee,
-        ancestorCount: tx.ancestorcount,
-      },
-      cost: Math.max(0, Math.ceil(tx.ancestorsize * targetFeeRate) - totalFee),
-      targetFeeRate,
-      nextBlockFee: Math.ceil(tx.ancestorsize * targetFeeRate),
-    };
-  }
-}
-
-export default new AccelerationCosts;
--- a/backend/src/api/audit.ts
+++ b/backend/src/api/audit.ts
@@ -6,22 +6,19 @@ import rbfCache from './rbf-cache';
 const PROPAGATION_MARGIN = 180; // in seconds, time since a transaction is first seen after which it is assumed to have propagated to all miners

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

    const matches: string[] = []; // present in both mined block and template
    const added: string[] = []; // present in mined block, not in template
-    const unseen: string[] = []; // present in the mined block, not in our mempool
-    const prioritized: string[] = []; // higher in the block than would be expected by in-band feerate alone
    const fresh: string[] = []; // missing, but firstSeen or lastBoosted within PROPAGATION_MARGIN
    const rbf: string[] = []; // either missing or present, and either part of a full-rbf replacement, or a conflict with the mined block
    const accelerated: string[] = []; // prioritized by the mempool accelerator
    const isCensored = {}; // missing, without excuse
    const isDisplaced = {};
-    const isAccelerated = {};
    let displacedWeight = 0;
    let matchedWeight = 0;
    let projectedWeight = 0;
@@ -34,7 +31,6 @@ class Audit {
      inBlock[tx.txid] = tx;
      if (mempool[tx.txid] && mempool[tx.txid].acceleration) {
        accelerated.push(tx.txid);
-        isAccelerated[tx.txid] = true;
      }
    }
    // coinbase is always expected
@@ -72,23 +68,20 @@ class Audit {

    // we can expect an honest miner to include 'displaced' transactions in place of recent arrivals and censored txs
    // these displaced transactions should occupy the first N weight units of the next projected block
-    let displacedWeightRemaining = displacedWeight + 4000;
+    let displacedWeightRemaining = displacedWeight;
    let index = 0;
    let lastFeeRate = Infinity;
    let failures = 0;
-    let blockIndex = 1;
-    while (projectedBlocks[blockIndex] && failures < 500) {
-      const txid = projectedBlocks[blockIndex].transactionIds[index];
+    while (projectedBlocks[1] && index < projectedBlocks[1].transactionIds.length && failures < 500) {
+      const txid = projectedBlocks[1].transactionIds[index];
      const tx = mempool[txid];
      if (tx) {
        const fits = (tx.weight - displacedWeightRemaining) < 4000;
-        // 0.005 margin of error for any remaining vsize rounding issues
-        const feeMatches = tx.effectiveFeePerVsize >= (lastFeeRate - 0.005);
+        const feeMatches = tx.effectiveFeePerVsize >= lastFeeRate;
        if (fits || feeMatches) {
          isDisplaced[txid] = true;
          if (fits) {
-            // (tx.effectiveFeePerVsize * tx.vsize) / Math.ceil(tx.vsize) attempts to correct for vsize rounding in the simple non-CPFP case
-            lastFeeRate = Math.min(lastFeeRate, (tx.effectiveFeePerVsize * tx.vsize) / Math.ceil(tx.vsize));
+            lastFeeRate = Math.min(lastFeeRate, tx.effectiveFeePerVsize);
          }
          if (tx.firstSeen == null || (now - (tx?.firstSeen || 0)) > PROPAGATION_MARGIN) {
            displacedWeightRemaining -= tx.weight;
@@ -101,10 +94,6 @@ class Audit {
        logger.warn('projected transaction missing from mempool cache');
      }
      index++;
-      if (index >= projectedBlocks[blockIndex].transactionIds.length) {
-        index = 0;
-        blockIndex++;
-      }
    }

    // mark unexpected transactions in the mined block as 'added'
@@ -116,41 +105,14 @@ class Audit {
      } else {
        if (rbfCache.has(tx.txid)) {
          rbf.push(tx.txid);
-          if (!mempool[tx.txid] && !rbfCache.getReplacedBy(tx.txid)) {
-            unseen.push(tx.txid);
-          }
-        } else {
-          if (mempool[tx.txid]) {
-            if (isDisplaced[tx.txid]) {
-              added.push(tx.txid);
-            }
-          } else {
-            unseen.push(tx.txid);
-          }
+        } else if (!isDisplaced[tx.txid]) {
+          added.push(tx.txid);
        }
        overflowWeight += tx.weight;
      }
      totalWeight += tx.weight;
    }

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

    return {
-      unseen,
      censored: Object.keys(isCensored),
      added,
-      prioritized,
      fresh,
      sigop: [],
      fullrbf: rbf,
--- a/backend/src/api/backend-info.ts
+++ b/backend/src/api/backend-info.ts
@@ -9,8 +9,8 @@ class BackendInfo {

  constructor() {
    // This file is created by ./fetch-version.ts during building
-    const versionFile = path.join(__dirname, 'version.json');
-    let versionInfo;
+    const versionFile = path.join(__dirname, 'version.json')
+    var versionInfo;
    if (fs.existsSync(versionFile)) {
      versionInfo = JSON.parse(fs.readFileSync(versionFile).toString());
    } else {
@@ -24,8 +24,7 @@ class BackendInfo {
      hostname: os.hostname(),
      version: versionInfo.version,
      gitCommit: versionInfo.gitCommit,
-      lightning: config.LIGHTNING.ENABLED,
-      backend: config.MEMPOOL.BACKEND,
+      lightning: config.LIGHTNING.ENABLED
    };
  }

@@ -33,7 +32,7 @@ class BackendInfo {
    return this.backendInfo;
  }

-  public getShortCommitHash(): string {
+  public getShortCommitHash() {
    return this.backendInfo.gitCommit.slice(0, 7);
  }
 }
--- a/backend/src/api/bisq/bisq.routes.ts
+++ b/backend/src/api/bisq/bisq.routes.ts
@@ -0,0 +1,381 @@
+import { Application, Request, Response } from 'express';
+import config from '../../config';
+import { RequiredSpec } from '../../mempool.interfaces';
+import bisq from './bisq';
+import { MarketsApiError } from './interfaces';
+import marketsApi from './markets-api';
+
+class BisqRoutes {
+  public initRoutes(app: Application) {
+    app
+      .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/stats', this.getBisqStats)
+      .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/tx/:txId', this.getBisqTransaction)
+      .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/block/:hash', this.getBisqBlock)
+      .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/blocks/tip/height', this.getBisqTip)
+      .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/blocks/:index/:length', this.getBisqBlocks)
+      .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/address/:address', this.getBisqAddress)
+      .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/txs/:index/:length', this.getBisqTransactions)
+      .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/currencies', this.getBisqMarketCurrencies.bind(this))
+      .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/depth', this.getBisqMarketDepth.bind(this))
+      .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/hloc', this.getBisqMarketHloc.bind(this))
+      .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/markets', this.getBisqMarketMarkets.bind(this))
+      .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/offers', this.getBisqMarketOffers.bind(this))
+      .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/ticker', this.getBisqMarketTicker.bind(this))
+      .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/trades', this.getBisqMarketTrades.bind(this))
+      .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/volumes', this.getBisqMarketVolumes.bind(this))
+      .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/volumes/7d', this.getBisqMarketVolumes7d.bind(this))
+    ;
+  }
+
+
+  private getBisqStats(req: Request, res: Response) {
+    const result = bisq.getStats();
+    res.json(result);
+  }
+
+  private getBisqTip(req: Request, res: Response) {
+    const result = bisq.getLatestBlockHeight();
+    res.type('text/plain');
+    res.send(result.toString());
+  }
+
+  private getBisqTransaction(req: Request, res: Response) {
+    const result = bisq.getTransaction(req.params.txId);
+    if (result) {
+      res.json(result);
+    } else {
+      res.status(404).send('Bisq transaction not found');
+    }
+  }
+
+  private getBisqTransactions(req: Request, res: Response) {
+    const types: string[] = [];
+    req.query.types = req.query.types || [];
+    if (!Array.isArray(req.query.types)) {
+      res.status(500).send('Types is not an array');
+      return;
+    }
+
+    for (const _type in req.query.types) {
+      if (typeof req.query.types[_type] === 'string') {
+        types.push(req.query.types[_type].toString());
+      }
+    }
+
+    const index = parseInt(req.params.index, 10) || 0;
+    const length = parseInt(req.params.length, 10) > 100 ? 100 : parseInt(req.params.length, 10) || 25;
+    const [transactions, count] = bisq.getTransactions(index, length, types);
+    res.header('X-Total-Count', count.toString());
+    res.json(transactions);
+  }
+
+  private getBisqBlock(req: Request, res: Response) {
+    const result = bisq.getBlock(req.params.hash);
+    if (result) {
+      res.json(result);
+    } else {
+      res.status(404).send('Bisq block not found');
+    }
+  }
+
+  private getBisqBlocks(req: Request, res: Response) {
+    const index = parseInt(req.params.index, 10) || 0;
+    const length = parseInt(req.params.length, 10) > 100 ? 100 : parseInt(req.params.length, 10) || 25;
+    const [transactions, count] = bisq.getBlocks(index, length);
+    res.header('X-Total-Count', count.toString());
+    res.json(transactions);
+  }
+
+  private getBisqAddress(req: Request, res: Response) {
+    const result = bisq.getAddress(req.params.address.substr(1));
+    if (result) {
+      res.json(result);
+    } else {
+      res.status(404).send('Bisq address not found');
+    }
+  }
+
+  private getBisqMarketCurrencies(req: Request, res: Response) {
+    const constraints: RequiredSpec = {
+      'type': {
+        required: false,
+        types: ['crypto', 'fiat', 'all']
+      },
+    };
+
+    const p = this.parseRequestParameters(req.query, constraints);
+    if (p.error) {
+      res.status(400).json(this.getBisqMarketErrorResponse(p.error));
+      return;
+    }
+
+    const result = marketsApi.getCurrencies(p.type);
+    if (result) {
+      res.json(result);
+    } else {
+      res.status(500).json(this.getBisqMarketErrorResponse('getBisqMarketCurrencies error'));
+    }
+  }
+
+  private getBisqMarketDepth(req: Request, res: Response) {
+    const constraints: RequiredSpec = {
+      'market': {
+        required: true,
+        types: ['@string']
+      },
+    };
+
+    const p = this.parseRequestParameters(req.query, constraints);
+    if (p.error) {
+      res.status(400).json(this.getBisqMarketErrorResponse(p.error));
+      return;
+    }
+
+    const result = marketsApi.getDepth(p.market);
+    if (result) {
+      res.json(result);
+    } else {
+      res.status(500).json(this.getBisqMarketErrorResponse('getBisqMarketDepth error'));
+    }
+  }
+
+  private getBisqMarketMarkets(req: Request, res: Response) {
+    const result = marketsApi.getMarkets();
+    if (result) {
+      res.json(result);
+    } else {
+      res.status(500).json(this.getBisqMarketErrorResponse('getBisqMarketMarkets error'));
+    }
+  }
+
+  private getBisqMarketTrades(req: Request, res: Response) {
+    const constraints: RequiredSpec = {
+      'market': {
+        required: true,
+        types: ['@string']
+      },
+      'timestamp_from': {
+        required: false,
+        types: ['@number']
+      },
+      'timestamp_to': {
+        required: false,
+        types: ['@number']
+      },
+      'trade_id_to': {
+        required: false,
+        types: ['@string']
+      },
+      'trade_id_from': {
+        required: false,
+        types: ['@string']
+      },
+      'direction': {
+        required: false,
+        types: ['buy', 'sell']
+      },
+      'limit': {
+        required: false,
+        types: ['@number']
+      },
+      'sort': {
+        required: false,
+        types: ['asc', 'desc']
+      }
+    };
+
+    const p = this.parseRequestParameters(req.query, constraints);
+    if (p.error) {
+      res.status(400).json(this.getBisqMarketErrorResponse(p.error));
+      return;
+    }
+
+    const result = marketsApi.getTrades(p.market, p.timestamp_from,
+      p.timestamp_to, p.trade_id_from, p.trade_id_to, p.direction, p.limit, p.sort);
+    if (result) {
+      res.json(result);
+    } else {
+      res.status(500).json(this.getBisqMarketErrorResponse('getBisqMarketTrades error'));
+    }
+  }
+
+  private getBisqMarketOffers(req: Request, res: Response) {
+    const constraints: RequiredSpec = {
+      'market': {
+        required: true,
+        types: ['@string']
+      },
+      'direction': {
+        required: false,
+        types: ['buy', 'sell']
+      },
+    };
+
+    const p = this.parseRequestParameters(req.query, constraints);
+    if (p.error) {
+      res.status(400).json(this.getBisqMarketErrorResponse(p.error));
+      return;
+    }
+
+    const result = marketsApi.getOffers(p.market, p.direction);
+    if (result) {
+      res.json(result);
+    } else {
+      res.status(500).json(this.getBisqMarketErrorResponse('getBisqMarketOffers error'));
+    }
+  }
+
+  private getBisqMarketVolumes(req: Request, res: Response) {
+    const constraints: RequiredSpec = {
+      'market': {
+        required: false,
+        types: ['@string']
+      },
+      'interval': {
+        required: false,
+        types: ['minute', 'half_hour', 'hour', 'half_day', 'day', 'week', 'month', 'year', 'auto']
+      },
+      'timestamp_from': {
+        required: false,
+        types: ['@number']
+      },
+      'timestamp_to': {
+        required: false,
+        types: ['@number']
+      },
+      'milliseconds': {
+        required: false,
+        types: ['@boolean']
+      },
+      'timestamp': {
+        required: false,
+        types: ['no', 'yes']
+      },
+    };
+
+    const p = this.parseRequestParameters(req.query, constraints);
+    if (p.error) {
+      res.status(400).json(this.getBisqMarketErrorResponse(p.error));
+      return;
+    }
+
+    const result = marketsApi.getVolumes(p.market, p.timestamp_from, p.timestamp_to, p.interval, p.milliseconds, p.timestamp);
+    if (result) {
+      res.json(result);
+    } else {
+      res.status(500).json(this.getBisqMarketErrorResponse('getBisqMarketVolumes error'));
+    }
+  }
+
+  private getBisqMarketHloc(req: Request, res: Response) {
+    const constraints: RequiredSpec = {
+      'market': {
+        required: true,
+        types: ['@string']
+      },
+      'interval': {
+        required: false,
+        types: ['minute', 'half_hour', 'hour', 'half_day', 'day', 'week', 'month', 'year', 'auto']
+      },
+      'timestamp_from': {
+        required: false,
+        types: ['@number']
+      },
+      'timestamp_to': {
+        required: false,
+        types: ['@number']
+      },
+      'milliseconds': {
+        required: false,
+        types: ['@boolean']
+      },
+      'timestamp': {
+        required: false,
+        types: ['no', 'yes']
+      },
+    };
+
+    const p = this.parseRequestParameters(req.query, constraints);
+    if (p.error) {
+      res.status(400).json(this.getBisqMarketErrorResponse(p.error));
+      return;
+    }
+
+    const result = marketsApi.getHloc(p.market, p.interval, p.timestamp_from, p.timestamp_to, p.milliseconds, p.timestamp);
+    if (result) {
+      res.json(result);
+    } else {
+      res.status(500).json(this.getBisqMarketErrorResponse('getBisqMarketHloc error'));
+    }
+  }
+
+  private getBisqMarketTicker(req: Request, res: Response) {
+    const constraints: RequiredSpec = {
+      'market': {
+        required: false,
+        types: ['@string']
+      },
+    };
+
+    const p = this.parseRequestParameters(req.query, constraints);
+    if (p.error) {
+      res.status(400).json(this.getBisqMarketErrorResponse(p.error));
+      return;
+    }
+
+    const result = marketsApi.getTicker(p.market);
+    if (result) {
+      res.json(result);
+    } else {
+      res.status(500).json(this.getBisqMarketErrorResponse('getBisqMarketTicker error'));
+    }
+  }
+
+  private getBisqMarketVolumes7d(req: Request, res: Response) {
+    const result = marketsApi.getVolumesByTime(604800);
+    if (result) {
+      res.json(result);
+    } else {
+      res.status(500).json(this.getBisqMarketErrorResponse('getBisqMarketVolumes7d error'));
+    }
+  }
+
+  private parseRequestParameters(requestParams: object, params: RequiredSpec): { [name: string]: any; } {
+    const final = {};
+    for (const i in params) {
+      if (params.hasOwnProperty(i)) {
+        if (params[i].required && requestParams[i] === undefined) {
+          return { error: i + ' parameter missing'};
+        }
+        if (typeof requestParams[i] === 'string') {
+          const str = (requestParams[i] || '').toString().toLowerCase();
+          if (params[i].types.indexOf('@number') > -1) {
+            const number = parseInt((str).toString(), 10);
+            final[i] = number;
+          } else if (params[i].types.indexOf('@string') > -1) {
+            final[i] = str;
+          } else if (params[i].types.indexOf('@boolean') > -1) {
+            final[i] = str === 'true' || str === 'yes';
+          } else if (params[i].types.indexOf(str) > -1) {
+            final[i] = str;
+          } else {
+            return { error: i + ' parameter invalid'};
+          }
+        } else if (typeof requestParams[i] === 'number') {
+          final[i] = requestParams[i];
+        }
+      }
+    }
+    return final;
+  }
+
+  private getBisqMarketErrorResponse(message: string): MarketsApiError {
+    return {
+      'success': 0,
+      'error': message
+    };
+  }
+
+}
+
+export default new BisqRoutes;
--- a/backend/src/api/bisq/bisq.ts
+++ b/backend/src/api/bisq/bisq.ts
@@ -0,0 +1,359 @@
+import config from '../../config';
+import * as fs from 'fs';
+import axios, { AxiosResponse } from 'axios';
+import * as http from 'http';
+import * as https from 'https';
+import { SocksProxyAgent } from 'socks-proxy-agent';
+import { BisqBlocks, BisqBlock, BisqTransaction, BisqStats, BisqTrade } from './interfaces';
+import { Common } from '../common';
+import { BlockExtended } from '../../mempool.interfaces';
+import backendInfo from '../backend-info';
+import logger from '../../logger';
+
+class Bisq {
+  private static BLOCKS_JSON_FILE_PATH = config.BISQ.DATA_PATH + '/json/all/blocks.json';
+  private latestBlockHeight = 0;
+  private blocks: BisqBlock[] = [];
+  private allBlocks: BisqBlock[] = [];
+  private transactions: BisqTransaction[] = [];
+  private transactionIndex: { [txId: string]: BisqTransaction } = {};
+  private blockIndex: { [hash: string]: BisqBlock } = {};
+  private addressIndex: { [address: string]: BisqTransaction[] } = {};
+  private stats: BisqStats = {
+    minted: 0,
+    burnt: 0,
+    addresses: 0,
+    unspent_txos: 0,
+    spent_txos: 0,
+  };
+  private price: number = 0;
+  private priceUpdateCallbackFunction: ((price: number) => void) | undefined;
+  private topDirectoryWatcher: fs.FSWatcher | undefined;
+  private subdirectoryWatcher: fs.FSWatcher | undefined;
+
+  constructor() {}
+
+  startBisqService(): void {
+    try {
+      this.checkForBisqDataFolder();
+    } catch (e) {
+      logger.info('Retrying to start bisq service in 3 minutes');
+      setTimeout(this.startBisqService.bind(this), 180000);
+      return;
+    }
+    this.loadBisqDumpFile();
+    setInterval(this.updatePrice.bind(this), 1000 * 60 * 60);
+    this.updatePrice();
+    this.startTopDirectoryWatcher();
+    this.startSubDirectoryWatcher();
+  }
+
+  handleNewBitcoinBlock(block: BlockExtended): void {
+    if (block.height - 10 > this.latestBlockHeight && this.latestBlockHeight !== 0) {
+      logger.warn(`Bitcoin block height (#${block.height}) has diverged from the latest Bisq block height (#${this.latestBlockHeight}). Restarting watchers...`);
+      this.startTopDirectoryWatcher();
+      this.startSubDirectoryWatcher();
+    }
+  }
+
+  getTransaction(txId: string): BisqTransaction | undefined {
+    return this.transactionIndex[txId];
+  }
+
+  getTransactions(start: number, length: number, types: string[]): [BisqTransaction[], number] {
+    let transactions = this.transactions;
+    if (types.length) {
+      transactions = transactions.filter((tx) => types.indexOf(tx.txType) > -1);
+    }
+    return [transactions.slice(start, length + start), transactions.length];
+  }
+
+  getBlock(hash: string): BisqBlock | undefined {
+    return this.blockIndex[hash];
+  }
+
+  getAddress(hash: string): BisqTransaction[] {
+    return this.addressIndex[hash];
+  }
+
+  getBlocks(start: number, length: number): [BisqBlock[], number] {
+    return [this.blocks.slice(start, length + start), this.blocks.length];
+  }
+
+  getStats(): BisqStats {
+    return this.stats;
+  }
+
+  setPriceCallbackFunction(fn: (price: number) => void) {
+    this.priceUpdateCallbackFunction = fn;
+  }
+
+  getLatestBlockHeight(): number {
+    return this.latestBlockHeight;
+  }
+
+  private checkForBisqDataFolder() {
+    if (!fs.existsSync(Bisq.BLOCKS_JSON_FILE_PATH)) {
+      logger.warn(Bisq.BLOCKS_JSON_FILE_PATH + ` doesn't exist. Make sure Bisq is running and the config is correct before starting the server.`);
+      throw new Error(`Cannot load BISQ ${Bisq.BLOCKS_JSON_FILE_PATH} file`);
+    }
+  }
+
+  private startTopDirectoryWatcher() {
+    if (this.topDirectoryWatcher) {
+      this.topDirectoryWatcher.close();
+    }
+    let fsWait: NodeJS.Timeout | null = null;
+    this.topDirectoryWatcher = fs.watch(config.BISQ.DATA_PATH + '/json', () => {
+      if (fsWait) {
+        clearTimeout(fsWait);
+      }
+      if (this.subdirectoryWatcher) {
+        this.subdirectoryWatcher.close();
+      }
+      fsWait = setTimeout(() => {
+        logger.debug(`Bisq restart detected. Resetting both watchers in 3 minutes.`);
+        setTimeout(() => {
+          this.startTopDirectoryWatcher();
+          this.startSubDirectoryWatcher();
+          this.loadBisqDumpFile();
+        }, 180000);
+      }, 15000);
+    });
+  }
+
+  private startSubDirectoryWatcher() {
+    if (this.subdirectoryWatcher) {
+      this.subdirectoryWatcher.close();
+    }
+    if (!fs.existsSync(Bisq.BLOCKS_JSON_FILE_PATH)) {
+      logger.warn(Bisq.BLOCKS_JSON_FILE_PATH + ` doesn't exist. Trying to restart sub directory watcher again in 3 minutes.`);
+      setTimeout(() => this.startSubDirectoryWatcher(), 180000);
+      return;
+    }
+    let fsWait: NodeJS.Timeout | null = null;
+    this.subdirectoryWatcher = fs.watch(config.BISQ.DATA_PATH + '/json/all', () => {
+      if (fsWait) {
+        clearTimeout(fsWait);
+      }
+      fsWait = setTimeout(() => {
+        logger.debug(`Change detected in the Bisq data folder.`);
+        this.loadBisqDumpFile();
+      }, 2000);
+    });
+  }
+  private async updatePrice() {
+    type axiosOptions = {
+      headers: {
+        'User-Agent': string
+      };
+      timeout: number;
+      httpAgent?: http.Agent;
+      httpsAgent?: https.Agent;
+    }
+    const setDelay = (secs: number = 1): Promise<void> => new Promise(resolve => setTimeout(() => resolve(), secs * 1000));
+    const BISQ_URL = (config.SOCKS5PROXY.ENABLED === true) && (config.SOCKS5PROXY.USE_ONION === true) ? config.EXTERNAL_DATA_SERVER.BISQ_ONION : config.EXTERNAL_DATA_SERVER.BISQ_URL;
+    const isHTTP = (new URL(BISQ_URL).protocol.split(':')[0] === 'http') ? true : false;
+    const axiosOptions: axiosOptions = {
+      headers: {
+        'User-Agent': (config.MEMPOOL.USER_AGENT === 'mempool') ? `mempool/v${backendInfo.getBackendInfo().version}` : `${config.MEMPOOL.USER_AGENT}`
+      },
+      timeout: config.SOCKS5PROXY.ENABLED ? 30000 : 10000
+    };
+    let retry = 0;
+
+    while(retry < config.MEMPOOL.EXTERNAL_MAX_RETRY) {
+      try {
+        if (config.SOCKS5PROXY.ENABLED) {
+          const socksOptions: any = {
+            agentOptions: {
+              keepAlive: true,
+            },
+            hostname: config.SOCKS5PROXY.HOST,
+            port: config.SOCKS5PROXY.PORT
+          };
+
+          if (config.SOCKS5PROXY.USERNAME && config.SOCKS5PROXY.PASSWORD) {
+            socksOptions.username = config.SOCKS5PROXY.USERNAME;
+            socksOptions.password = config.SOCKS5PROXY.PASSWORD;
+          } else {
+            // Retry with different tor circuits https://stackoverflow.com/a/64960234
+            socksOptions.username = `circuit${retry}`;
+          }
+
+          // Handle proxy agent for onion addresses
+          if (isHTTP) {
+            axiosOptions.httpAgent = new SocksProxyAgent(socksOptions);
+          } else {
+            axiosOptions.httpsAgent = new SocksProxyAgent(socksOptions);
+          }
+        }
+        
+        const data: AxiosResponse = await axios.get(`${BISQ_URL}/trades/?market=bsq_btc`, axiosOptions);
+        if (data.statusText === 'error' || !data.data) {
+          throw new Error(`Could not fetch data from Bisq market, Error: ${data.status}`);
+        }
+        const prices: number[] = [];
+        data.data.forEach((trade) => {
+          prices.push(parseFloat(trade.price) * 100000000);
+        });
+        prices.sort((a, b) => a - b);
+        this.price = Common.median(prices);
+        if (this.priceUpdateCallbackFunction) {
+          this.priceUpdateCallbackFunction(this.price);
+        }
+        logger.debug('Successfully updated Bisq market price');
+        break;
+      } catch (e) {
+        logger.err('Error updating Bisq market price: '  + (e instanceof Error ? e.message : e));
+        await setDelay(config.MEMPOOL.EXTERNAL_RETRY_INTERVAL);
+        retry++;
+      }
+    }
+  }
+
+  private async loadBisqDumpFile(): Promise<void> {
+    this.allBlocks = [];
+    try {
+      await this.loadData();
+      this.buildIndex();
+      this.calculateStats();
+    } catch (e) {
+      logger.info('Cannot load bisq dump file because: ' + (e instanceof Error ? e.message : e));
+    }
+  }
+
+  private buildIndex() {
+    const start = new Date().getTime();
+    this.transactions = [];
+    this.transactionIndex = {};
+    this.addressIndex = {};
+
+    this.allBlocks.forEach((block) => {
+      /* Build block index */
+      if (!this.blockIndex[block.hash]) {
+        this.blockIndex[block.hash] = block;
+      }
+
+      /* Build transactions index */
+      block.txs.forEach((tx) => {
+        this.transactions.push(tx);
+        this.transactionIndex[tx.id] = tx;
+      });
+    });
+
+    /* Build address index */
+    this.transactions.forEach((tx) => {
+      tx.inputs.forEach((input) => {
+        if (!this.addressIndex[input.address]) {
+          this.addressIndex[input.address] = [];
+        }
+        if (this.addressIndex[input.address].indexOf(tx) === -1) {
+          this.addressIndex[input.address].push(tx);
+        }
+      });
+      tx.outputs.forEach((output) => {
+        if (!this.addressIndex[output.address]) {
+          this.addressIndex[output.address] = [];
+        }
+        if (this.addressIndex[output.address].indexOf(tx) === -1) {
+          this.addressIndex[output.address].push(tx);
+        }
+      });
+    });
+
+    const time = new Date().getTime() - start;
+    logger.debug('Bisq data index rebuilt in ' + time + ' ms');
+  }
+
+  private calculateStats() {
+    let minted = 0;
+    let burned = 0;
+    let unspent = 0;
+    let spent = 0;
+
+    this.transactions.forEach((tx) => {
+      tx.outputs.forEach((output) => {
+        if (output.opReturn) {
+          return;
+        }
+        if (output.txOutputType === 'GENESIS_OUTPUT' || output.txOutputType === 'ISSUANCE_CANDIDATE_OUTPUT' && output.isVerified) {
+          minted += output.bsqAmount;
+        }
+        if (output.isUnspent) {
+          unspent++;
+        } else {
+          spent++;
+        }
+      });
+      burned += tx['burntFee'];
+    });
+
+    this.stats = {
+      addresses: Object.keys(this.addressIndex).length,
+      minted: minted / 100,
+      burnt: burned / 100,
+      spent_txos: spent,
+      unspent_txos: unspent,
+    };
+  }
+
+  private async loadData(): Promise<any> {
+    if (!fs.existsSync(Bisq.BLOCKS_JSON_FILE_PATH)) {
+      throw new Error(Bisq.BLOCKS_JSON_FILE_PATH + ` doesn't exist`);
+    }
+
+    const readline = require('readline');
+    const events = require('events');
+
+    const rl = readline.createInterface({
+      input: fs.createReadStream(Bisq.BLOCKS_JSON_FILE_PATH),
+      crlfDelay: Infinity
+    });
+
+    let blockBuffer = '';
+    let readingBlock = false;
+    let lineCount = 1;
+    const start = new Date().getTime();
+
+    logger.debug('Processing Bisq data dump...');
+
+    rl.on('line', (line) => {
+      if (lineCount === 2) {
+        line = line.replace('  "chainHeight": ', '');
+        this.latestBlockHeight = parseInt(line, 10);
+      }
+
+      if (line === '    {') {
+        readingBlock = true;
+      } else if (line === '    },') {
+        blockBuffer += '}';
+        try {
+          const block: BisqBlock =  JSON.parse(blockBuffer);
+          this.allBlocks.push(block);
+          readingBlock = false;
+          blockBuffer = '';
+        } catch (e) {
+          logger.debug(blockBuffer);
+          throw Error(`Unable to parse Bisq data dump at line ${lineCount}` + (e instanceof Error ? e.message : e));
+        }
+      }
+
+      if (readingBlock === true) {
+        blockBuffer += line;
+      }
+
+      ++lineCount;
+    });
+
+    await events.once(rl, 'close');
+
+    this.allBlocks.reverse();
+    this.blocks = this.allBlocks.filter((block) => block.txs.length > 0);
+
+    const time = new Date().getTime() - start;
+    logger.debug('Bisq dump processed in ' + time + ' ms');
+  }
+}
+
+export default new Bisq();
--- a/backend/src/api/bisq/interfaces.ts
+++ b/backend/src/api/bisq/interfaces.ts
@@ -0,0 +1,258 @@
+
+export interface BisqBlocks {
+  chainHeight: number;
+  blocks: BisqBlock[];
+}
+
+export interface BisqBlock {
+  height: number;
+  time: number;
+  hash: string;
+  previousBlockHash: string;
+  txs: BisqTransaction[];
+}
+
+export interface BisqTransaction {
+  txVersion: string;
+  id: string;
+  blockHeight: number;
+  blockHash: string;
+  time: number;
+  inputs: BisqInput[];
+  outputs: BisqOutput[];
+  txType: string;
+  txTypeDisplayString: string;
+  burntFee: number;
+  invalidatedBsq: number;
+  unlockBlockHeight: number;
+}
+
+export interface BisqStats {
+  minted: number;
+  burnt: number;
+  addresses: number;
+  unspent_txos: number;
+  spent_txos: number;
+}
+
+interface BisqInput {
+  spendingTxOutputIndex: number;
+  spendingTxId: string;
+  bsqAmount: number;
+  isVerified: boolean;
+  address: string;
+  time: number;
+}
+
+interface BisqOutput {
+  txVersion: string;
+  txId: string;
+  index: number;
+  bsqAmount: number;
+  btcAmount: number;
+  height: number;
+  isVerified: boolean;
+  burntFee: number;
+  invalidatedBsq: number;
+  address: string;
+  scriptPubKey: BisqScriptPubKey;
+  time: any;
+  txType: string;
+  txTypeDisplayString: string;
+  txOutputType: string;
+  txOutputTypeDisplayString: string;
+  lockTime: number;
+  isUnspent: boolean;
+  spentInfo: SpentInfo;
+  opReturn?: string;
+}
+
+interface BisqScriptPubKey {
+  addresses: string[];
+  asm: string;
+  hex: string;
+  reqSigs?: number;
+  type: string;
+}
+
+interface SpentInfo {
+  height: number;
+  inputIndex: number;
+  txId: string;
+}
+
+export interface BisqTrade {
+  direction: string;
+  price: string;
+  amount: string;
+  volume: string;
+  payment_method: string;
+  trade_id: string;
+  trade_date: number;
+  market?: string;
+}
+
+export interface Currencies { [txid: string]: Currency; }
+
+export interface Currency {
+  code: string;
+  name: string;
+  precision: number;
+
+  _type: string;
+}
+
+export interface Depth { [market: string]: Market; }
+
+interface Market {
+  'buys': string[];
+  'sells': string[];
+}
+
+export interface HighLowOpenClose {
+  period_start: number | string;
+  open: string;
+  high: string;
+  low: string;
+  close: string;
+  volume_left: string;
+  volume_right: string;
+  avg: string;
+}
+
+export interface Markets { [txid: string]: Pair; }
+
+interface Pair {
+  pair: string;
+  lname: string;
+  rname: string;
+  lsymbol: string;
+  rsymbol: string;
+  lprecision: number;
+  rprecision: number;
+  ltype: string;
+  rtype: string;
+  name: string;
+}
+
+export interface Offers { [market: string]: OffersMarket; }
+
+interface OffersMarket {
+  buys: Offer[] | null;
+  sells: Offer[] | null;
+}
+
+export interface OffersData {
+  direction: string;
+  currencyCode: string;
+  minAmount: number;
+  amount: number;
+  price: number;
+  date: number;
+  useMarketBasedPrice: boolean;
+  marketPriceMargin: number;
+  paymentMethod: string;
+  id: string;
+  currencyPair: string;
+  primaryMarketDirection: string;
+  priceDisplayString: string;
+  primaryMarketAmountDisplayString: string;
+  primaryMarketMinAmountDisplayString: string;
+  primaryMarketVolumeDisplayString: string;
+  primaryMarketMinVolumeDisplayString: string;
+  primaryMarketPrice: number;
+  primaryMarketAmount: number;
+  primaryMarketMinAmount: number;
+  primaryMarketVolume: number;
+  primaryMarketMinVolume: number;
+}
+
+export interface Offer {
+  offer_id: string;
+  offer_date: number;
+  direction: string;
+  min_amount: string;
+  amount: string;
+  price: string;
+  volume: string;
+  payment_method: string;
+  offer_fee_txid: any;
+}
+
+export interface Tickers { [market: string]: Ticker | null; }
+
+export interface Ticker {
+  last: string;
+  high: string;
+  low: string;
+  volume_left: string;
+  volume_right: string;
+  buy: string | null;
+  sell: string | null;
+}
+
+export interface Trade {
+  direction: string;
+  price: string;
+  amount: string;
+  volume: string;
+  payment_method: string;
+  trade_id: string;
+  trade_date: number;
+}
+
+export interface TradesData {
+  currency: string;
+  direction: string;
+  tradePrice: number;
+  tradeAmount: number;
+  tradeDate: number;
+  paymentMethod: string;
+  offerDate: number;
+  useMarketBasedPrice: boolean;
+  marketPriceMargin: number;
+  offerAmount: number;
+  offerMinAmount: number;
+  offerId: string;
+  depositTxId?: string;
+  currencyPair: string;
+  primaryMarketDirection: string;
+  primaryMarketTradePrice: number;
+  primaryMarketTradeAmount: number;
+  primaryMarketTradeVolume: number;
+
+  _market: string;
+  _tradePriceStr: string;
+  _tradeAmountStr: string;
+  _tradeVolumeStr: string;
+  _offerAmountStr: string;
+  _tradePrice: number;
+  _tradeAmount: number;
+  _tradeVolume: number;
+  _offerAmount: number;
+}
+
+export interface MarketVolume {
+  period_start: number;
+  num_trades: number;
+  volume: string;
+}
+
+export interface MarketsApiError {
+  success: number;
+  error: string;
+}
+
+export type Interval = 'minute' | 'half_hour' | 'hour' | 'half_day' | 'day' | 'week' | 'month' | 'year' | 'auto';
+
+export interface SummarizedIntervals { [market: string]: SummarizedInterval; }
+export interface SummarizedInterval {
+  'period_start': number;
+  'open': number;
+  'close': number;
+  'high': number;
+  'low': number;
+  'avg': number;
+  'volume_right': number;
+  'volume_left': number;
+}
--- a/backend/src/api/bisq/markets-api.ts
+++ b/backend/src/api/bisq/markets-api.ts
@@ -0,0 +1,679 @@
+import { Currencies, OffersData, TradesData, Depth, Currency, Interval, HighLowOpenClose,
+  Markets, Offers, Offer, BisqTrade, MarketVolume, Tickers, Ticker, SummarizedIntervals, SummarizedInterval } from './interfaces';
+
+const strtotime = require('./strtotime');
+
+class BisqMarketsApi {
+  private cryptoCurrencyData: Currency[] = [];
+  private fiatCurrencyData: Currency[] = [];
+  private activeCryptoCurrencyData: Currency[] = [];
+  private activeFiatCurrencyData: Currency[] = [];
+  private offersData: OffersData[] = [];
+  private tradesData: TradesData[] = [];
+  private fiatCurrenciesIndexed: { [code: string]: true } = {};
+  private allCurrenciesIndexed: { [code: string]: Currency } = {};
+  private tradeDataByMarket: { [market: string]: TradesData[] } = {};
+  private tickersCache: Ticker | Tickers | null = null;
+
+  constructor() { }
+
+  setOffersData(offers: OffersData[]) {
+    this.offersData = offers;
+  }
+
+  setTradesData(trades: TradesData[]) {
+    this.tradesData = trades;
+    this.tradeDataByMarket = {};
+
+    this.tradesData.forEach((trade) => {
+      trade._market = trade.currencyPair.toLowerCase().replace('/', '_');
+      if (!this.tradeDataByMarket[trade._market]) {
+        this.tradeDataByMarket[trade._market] = [];
+      }
+      this.tradeDataByMarket[trade._market].push(trade);
+    });
+  }
+
+  setCurrencyData(cryptoCurrency: Currency[], fiatCurrency: Currency[], activeCryptoCurrency: Currency[], activeFiatCurrency: Currency[]) {
+    this.cryptoCurrencyData = cryptoCurrency,
+    this.fiatCurrencyData = fiatCurrency,
+    this.activeCryptoCurrencyData = activeCryptoCurrency,
+    this.activeFiatCurrencyData = activeFiatCurrency;
+
+    this.fiatCurrenciesIndexed = {};
+    this.allCurrenciesIndexed = {};
+
+    this.fiatCurrencyData.forEach((currency) => {
+      currency._type = 'fiat';
+      this.fiatCurrenciesIndexed[currency.code] = true;
+      this.allCurrenciesIndexed[currency.code] = currency;
+    });
+    this.cryptoCurrencyData.forEach((currency) => {
+       currency._type = 'crypto';
+       this.allCurrenciesIndexed[currency.code] = currency;
+    });
+  }
+
+  updateCache() {
+    this.tickersCache = null;
+    this.tickersCache = this.getTicker();
+  }
+
+  getCurrencies(
+    type: 'crypto' | 'fiat' | 'active' | 'all' = 'all',
+  ): Currencies {
+    let currencies: Currency[];
+
+    switch (type) {
+      case 'fiat':
+        currencies = this.fiatCurrencyData;
+        break;
+      case 'crypto':
+        currencies = this.cryptoCurrencyData;
+        break;
+      case 'active':
+        currencies = this.activeCryptoCurrencyData.concat(this.activeFiatCurrencyData);
+        break;
+      case 'all':
+      default:
+        currencies = this.cryptoCurrencyData.concat(this.fiatCurrencyData);
+    }
+    const result = {};
+    currencies.forEach((currency) => {
+      result[currency.code] = currency;
+    });
+    return result;
+  }
+
+  getDepth(
+    market: string,
+  ): Depth {
+    const currencyPair = market.replace('_', '/').toUpperCase();
+
+    const buys = this.offersData
+      .filter((offer) => offer.currencyPair === currencyPair && offer.primaryMarketDirection === 'BUY')
+      .map((offer) => offer.price)
+      .sort((a, b) => b - a)
+      .map((price) => this.intToBtc(price));
+
+    const sells = this.offersData
+      .filter((offer) => offer.currencyPair === currencyPair && offer.primaryMarketDirection === 'SELL')
+      .map((offer) => offer.price)
+      .sort((a, b) => a - b)
+      .map((price) => this.intToBtc(price));
+
+    const result = {};
+    result[market] = {
+      'buys': buys,
+      'sells': sells,
+    };
+    return result;
+  }
+
+  getOffers(
+    market: string,
+    direction?: 'buy' | 'sell',
+  ): Offers {
+    const currencyPair = market.replace('_', '/').toUpperCase();
+
+    let buys: Offer[] | null = null;
+    let sells: Offer[] | null = null;
+
+    if (!direction || direction === 'buy') {
+      buys = this.offersData
+        .filter((offer) => offer.currencyPair === currencyPair && offer.primaryMarketDirection === 'BUY')
+        .sort((a, b) => b.price - a.price)
+        .map((offer) => this.offerDataToOffer(offer, market));
+    }
+
+    if (!direction || direction === 'sell') {
+      sells = this.offersData
+        .filter((offer) => offer.currencyPair === currencyPair && offer.primaryMarketDirection === 'SELL')
+        .sort((a, b) => a.price - b.price)
+        .map((offer) => this.offerDataToOffer(offer, market));
+    }
+
+    const result: Offers = {};
+    result[market] = {
+      'buys': buys,
+      'sells': sells,
+    };
+    return result;
+  }
+
+  getMarkets(): Markets {
+    const allCurrencies = this.getCurrencies();
+    const activeCurrencies = this.getCurrencies('active');
+    const markets = {};
+
+    for (const currency of Object.keys(activeCurrencies)) {
+      if (allCurrencies[currency].code === 'BTC') {
+        continue;
+      }
+
+      const isFiat = allCurrencies[currency]._type === 'fiat';
+      const pmarketname = allCurrencies['BTC']['name'];
+
+      const lsymbol = isFiat ? 'BTC' : currency;
+      const rsymbol = isFiat ? currency : 'BTC';
+      const lname = isFiat ? pmarketname : allCurrencies[currency].name;
+      const rname = isFiat ? allCurrencies[currency].name : pmarketname;
+      const ltype = isFiat ? 'crypto' : allCurrencies[currency]._type;
+      const rtype = isFiat ? 'fiat' : 'crypto';
+      const lprecision = 8;
+      const rprecision = isFiat ? 2 : 8;
+      const pair = lsymbol.toLowerCase() + '_' + rsymbol.toLowerCase();
+
+      markets[pair] = {
+        'pair': pair,
+        'lname': lname,
+        'rname': rname,
+        'lsymbol': lsymbol,
+        'rsymbol': rsymbol,
+        'lprecision': lprecision,
+        'rprecision': rprecision,
+        'ltype': ltype,
+        'rtype': rtype,
+        'name': lname + '/' + rname,
+      };
+    }
+
+    return markets;
+  }
+
+  getTrades(
+    market: string,
+    timestamp_from?: number,
+    timestamp_to?: number,
+    trade_id_from?: string,
+    trade_id_to?: string,
+    direction?: 'buy' | 'sell',
+    limit: number = 100,
+    sort: 'asc' | 'desc' = 'desc',
+  ): BisqTrade[] {
+      limit = Math.min(limit, 2000);
+      const _market = market === 'all' ? undefined : market;
+
+      if (!timestamp_from) {
+        timestamp_from = new Date('2016-01-01').getTime() / 1000;
+      }
+      if (!timestamp_to) {
+        timestamp_to = new Date().getTime() / 1000;
+      }
+
+      const matches = this.getTradesByCriteria(_market, timestamp_to, timestamp_from,
+        trade_id_to, trade_id_from, direction, sort, limit, false);
+
+      if (sort === 'asc') {
+        matches.sort((a, b) => a.tradeDate - b.tradeDate);
+      } else {
+        matches.sort((a, b) => b.tradeDate - a.tradeDate);
+      }
+
+      return matches.map((trade) => {
+        const bsqTrade: BisqTrade = {
+          direction: trade.primaryMarketDirection,
+          price: trade._tradePriceStr,
+          amount: trade._tradeAmountStr,
+          volume: trade._tradeVolumeStr,
+          payment_method: trade.paymentMethod,
+          trade_id: trade.offerId,
+          trade_date: trade.tradeDate,
+        };
+        if (market === 'all') {
+          bsqTrade.market = trade._market;
+        }
+        return bsqTrade;
+      });
+  }
+
+  getVolumes(
+    market?: string,
+    timestamp_from?: number,
+    timestamp_to?: number,
+    interval: Interval = 'auto',
+    milliseconds?: boolean,
+    timestamp: 'no' | 'yes' = 'yes',
+  ): MarketVolume[] {
+    if (milliseconds) {
+      timestamp_from = timestamp_from ? timestamp_from / 1000 : timestamp_from;
+      timestamp_to = timestamp_to ? timestamp_to / 1000 : timestamp_to;
+    }
+    if (!timestamp_from) {
+      timestamp_from = new Date('2016-01-01').getTime() / 1000;
+    }
+    if (!timestamp_to) {
+      timestamp_to = new Date().getTime() / 1000;
+    }
+
+    const trades = this.getTradesByCriteria(market, timestamp_to, timestamp_from,
+      undefined, undefined, undefined, 'asc', Number.MAX_SAFE_INTEGER);
+
+    if (interval === 'auto') {
+      const range = timestamp_to - timestamp_from;
+      interval = this.getIntervalFromRange(range);
+    }
+
+    const intervals: any = {};
+    const marketVolumes: MarketVolume[] = [];
+
+    for (const trade of trades) {
+      const traded_at = trade['tradeDate'] / 1000;
+      const interval_start = this.intervalStart(traded_at, interval);
+
+      if (!intervals[interval_start]) {
+        intervals[interval_start] = {
+          'volume': 0,
+          'num_trades': 0,
+        };
+      }
+
+      const period = intervals[interval_start];
+      period['period_start'] = interval_start;
+      period['volume'] += this.fiatCurrenciesIndexed[trade.currency] ? trade._tradeAmount : trade._tradeVolume;
+      period['num_trades']++;
+    }
+
+    for (const p in intervals) {
+      if (intervals.hasOwnProperty(p)) {
+        const period = intervals[p];
+        marketVolumes.push({
+          period_start: timestamp === 'no' ? new Date(period['period_start'] * 1000).toISOString() : period['period_start'],
+          num_trades: period['num_trades'],
+          volume: this.intToBtc(period['volume']),
+        });
+      }
+    }
+
+    return marketVolumes;
+  }
+
+  getTicker(
+    market?: string,
+  ): Tickers | Ticker | null {
+    if (market) {
+      return this.getTickerFromMarket(market);
+    }
+
+    if (this.tickersCache) {
+      return this.tickersCache;
+    }
+
+    const allMarkets = this.getMarkets();
+    const tickers = {};
+    for (const m in allMarkets) {
+      if (allMarkets.hasOwnProperty(m)) {
+        tickers[allMarkets[m].pair] = this.getTickerFromMarket(allMarkets[m].pair);
+      }
+    }
+
+    return tickers;
+  }
+
+  getTickerFromMarket(market: string): Ticker | null {
+    let ticker: Ticker;
+    const timestamp_from = strtotime('-24 hour');
+    const timestamp_to = new Date().getTime() / 1000;
+    const trades = this.getTradesByCriteria(market, timestamp_to, timestamp_from,
+      undefined, undefined, undefined, 'asc', Number.MAX_SAFE_INTEGER);
+
+    const periods: SummarizedInterval[] = Object.values(this.getTradesSummarized(trades, timestamp_from));
+
+    const allCurrencies = this.getCurrencies();
+    const currencyRight = allCurrencies[market.split('_')[1].toUpperCase()];
+
+    if (periods[0]) {
+      ticker = {
+        'last': this.intToBtc(periods[0].close),
+        'high': this.intToBtc(periods[0].high),
+        'low': this.intToBtc(periods[0].low),
+        'volume_left': this.intToBtc(periods[0].volume_left),
+        'volume_right': this.intToBtc(periods[0].volume_right),
+        'buy': null,
+        'sell': null,
+      };
+    } else {
+      const lastTrade = this.tradeDataByMarket[market];
+      if (!lastTrade) {
+        return null;
+      }
+      const tradePrice = lastTrade[0].primaryMarketTradePrice * Math.pow(10, 8 - currencyRight.precision);
+
+      const lastTradePrice = this.intToBtc(tradePrice);
+      ticker = {
+        'last': lastTradePrice,
+        'high': lastTradePrice,
+        'low': lastTradePrice,
+        'volume_left': '0',
+        'volume_right': '0',
+        'buy': null,
+        'sell': null,
+      };
+    }
+
+    const timestampFromMilli = timestamp_from * 1000;
+    const timestampToMilli = timestamp_to * 1000;
+
+    const currencyPair = market.replace('_', '/').toUpperCase();
+    const offersData = this.offersData.slice().sort((a, b) => a.price - b.price);
+
+    const buy = offersData.find((offer) => offer.currencyPair === currencyPair
+                                          && offer.primaryMarketDirection === 'BUY'
+                                          && offer.date >= timestampFromMilli
+                                          && offer.date <= timestampToMilli
+                                        );
+    const sell = offersData.find((offer) => offer.currencyPair === currencyPair
+                                            && offer.primaryMarketDirection === 'SELL'
+                                            && offer.date >= timestampFromMilli
+                                            && offer.date <= timestampToMilli
+                                          );
+
+    if (buy) {
+      ticker.buy = this.intToBtc(buy.primaryMarketPrice * Math.pow(10, 8 - currencyRight.precision));
+    }
+    if (sell) {
+      ticker.sell = this.intToBtc(sell.primaryMarketPrice * Math.pow(10, 8 - currencyRight.precision));
+    }
+
+    return ticker;
+  }
+
+  getHloc(
+    market: string,
+    interval: Interval = 'auto',
+    timestamp_from?: number,
+    timestamp_to?: number,
+    milliseconds?: boolean,
+    timestamp: 'no' | 'yes' = 'yes',
+  ): HighLowOpenClose[] {
+    if (milliseconds) {
+      timestamp_from = timestamp_from ? timestamp_from / 1000 : timestamp_from;
+      timestamp_to = timestamp_to ? timestamp_to / 1000 : timestamp_to;
+    }
+    if (!timestamp_from) {
+      timestamp_from = new Date('2016-01-01').getTime() / 1000;
+    }
+    if (!timestamp_to) {
+      timestamp_to = new Date().getTime() / 1000;
+    }
+
+    const trades = this.getTradesByCriteria(market, timestamp_to, timestamp_from,
+      undefined, undefined, undefined, 'asc', Number.MAX_SAFE_INTEGER);
+
+    if (interval === 'auto') {
+      const range = timestamp_to - timestamp_from;
+      interval = this.getIntervalFromRange(range);
+    }
+
+    const intervals = this.getTradesSummarized(trades, timestamp_from, interval);
+
+    const hloc: HighLowOpenClose[] = [];
+
+    for (const p in intervals) {
+      if (intervals.hasOwnProperty(p)) {
+        const period = intervals[p];
+        hloc.push({
+          period_start: timestamp === 'no' ? new Date(period['period_start'] * 1000).toISOString() : period['period_start'],
+          open: this.intToBtc(period['open']),
+          close: this.intToBtc(period['close']),
+          high: this.intToBtc(period['high']),
+          low: this.intToBtc(period['low']),
+          avg: this.intToBtc(period['avg']),
+          volume_right: this.intToBtc(period['volume_right']),
+          volume_left: this.intToBtc(period['volume_left']),
+        });
+      }
+    }
+
+    return hloc;
+  }
+
+  private getIntervalFromRange(range: number): Interval {
+    // two days range loads minute data
+    if (range <= 3600) {
+      // up to one hour range loads minutely data
+      return 'minute';
+    } else if (range <= 1 * 24 * 3600) {
+      // up to one day range loads half-hourly data
+      return 'half_hour';
+    } else if (range <= 3 * 24 * 3600) {
+      // up to 3 day range loads hourly data
+      return 'hour';
+    } else if (range <= 7 * 24 * 3600) {
+      // up to 7 day range loads half-daily data
+      return 'half_day';
+    } else if (range <= 60 * 24 * 3600) {
+      // up to 2 month range loads daily data
+      return 'day';
+    } else if (range <= 12 * 31 * 24 * 3600) {
+      // up to one year range loads weekly data
+      return 'week';
+    } else if (range <= 12 * 31 * 24 * 3600) {
+      // up to 5 year range loads monthly data
+      return 'month';
+    } else {
+      // greater range loads yearly data
+      return 'year';
+    }
+  }
+
+  getVolumesByTime(time: number): MarketVolume[] {
+    const timestamp_from = new Date().getTime() / 1000 - time;
+    const timestamp_to = new Date().getTime() / 1000;
+
+    const trades = this.getTradesByCriteria(undefined, timestamp_to, timestamp_from,
+      undefined, undefined, undefined, 'asc', Number.MAX_SAFE_INTEGER);
+
+    const markets: any = {};
+
+    for (const trade of trades) {
+      if (!markets[trade._market]) {
+        markets[trade._market] = {
+          'volume': 0,
+          'num_trades': 0,
+        };
+      }
+
+      markets[trade._market]['volume'] += this.fiatCurrenciesIndexed[trade.currency] ? trade._tradeAmount : trade._tradeVolume;
+      markets[trade._market]['num_trades']++;
+    }
+
+    return markets;
+  }
+
+  private getTradesSummarized(trades: TradesData[], timestamp_from: number, interval?: string): SummarizedIntervals {
+    const intervals: any = {};
+    const intervals_prices: any = {};
+
+    for (const trade of trades) {
+      const traded_at = trade.tradeDate / 1000;
+      const interval_start = !interval ? timestamp_from : this.intervalStart(traded_at, interval);
+
+      if (!intervals[interval_start]) {
+          intervals[interval_start] = {
+            'open': 0,
+            'close': 0,
+            'high': 0,
+            'low': 0,
+            'avg': 0,
+            'volume_right': 0,
+            'volume_left': 0,
+        };
+        intervals_prices[interval_start] = [];
+      }
+      const period = intervals[interval_start];
+      const price = trade._tradePrice;
+
+      if (!intervals_prices[interval_start]['leftvol']) {
+        intervals_prices[interval_start]['leftvol'] = [];
+      }
+      if (!intervals_prices[interval_start]['rightvol']) {
+        intervals_prices[interval_start]['rightvol'] = [];
+      }
+
+      intervals_prices[interval_start]['leftvol'].push(trade._tradeAmount);
+      intervals_prices[interval_start]['rightvol'].push(trade._tradeVolume);
+
+      if (price) {
+          const plow = period['low'];
+          period['period_start'] = interval_start;
+          period['open'] = period['open'] || price;
+          period['close'] = price;
+          period['high'] = price > period['high'] ? price : period['high'];
+          period['low'] = (plow && price > plow) ? period['low'] : price;
+          period['avg'] = intervals_prices[interval_start]['rightvol'].reduce((p: number, c: number) => c + p, 0)
+            / intervals_prices[interval_start]['leftvol'].reduce((c: number, p: number) => c + p, 0) * 100000000;
+          period['volume_left'] += trade._tradeAmount;
+          period['volume_right'] += trade._tradeVolume;
+      }
+    }
+    return intervals;
+  }
+
+  private getTradesByCriteria(
+    market: string | undefined,
+    timestamp_to: number,
+    timestamp_from: number,
+    trade_id_to: string | undefined,
+    trade_id_from: string | undefined,
+    direction: 'buy' | 'sell' | undefined,
+    sort: string,
+    limit: number,
+    integerAmounts: boolean = true,
+ ): TradesData[] {
+    let trade_id_from_ts: number | null = null;
+    let trade_id_to_ts: number | null = null;
+    const allCurrencies = this.getCurrencies();
+
+    const timestampFromMilli = timestamp_from * 1000;
+    const timestampToMilli = timestamp_to * 1000;
+
+    // note: the offer_id_from/to depends on iterating over trades in
+    // descending chronological order.
+    const tradesDataSorted = this.tradesData.slice();
+    if (sort === 'asc') {
+      tradesDataSorted.reverse();
+    }
+
+    let matches: TradesData[] = [];
+    for (const trade of tradesDataSorted) {
+      if (trade_id_from === trade.offerId) {
+        trade_id_from_ts = trade.tradeDate;
+      }
+      if (trade_id_to === trade.offerId) {
+        trade_id_to_ts = trade.tradeDate;
+      }
+      if (trade_id_to && trade_id_to_ts === null) {
+        continue;
+      }
+      if (trade_id_from && trade_id_from_ts != null && trade_id_from_ts !== trade.tradeDate) {
+        continue;
+      }
+      if (market && market !== trade._market) {
+        continue;
+      }
+      if (timestampFromMilli && timestampFromMilli > trade.tradeDate) {
+        continue;
+      }
+      if (timestampToMilli && timestampToMilli < trade.tradeDate) {
+        continue;
+      }
+      if (direction && direction !== trade.direction.toLowerCase()) {
+        continue;
+      }
+
+      // Filter out bogus trades with BTC/BTC or XXX/XXX market.
+      // See github issue: https://github.com/bitsquare/bitsquare/issues/883
+      const currencyPairs = trade.currencyPair.split('/');
+      if (currencyPairs[0] === currencyPairs[1]) {
+        continue;
+      }
+
+      const currencyLeft = allCurrencies[currencyPairs[0]];
+      const currencyRight = allCurrencies[currencyPairs[1]];
+
+      if (!currencyLeft || !currencyRight) {
+        continue;
+      }
+
+      const tradePrice = trade.primaryMarketTradePrice * Math.pow(10, 8 - currencyRight.precision);
+      const tradeAmount = trade.primaryMarketTradeAmount * Math.pow(10, 8 - currencyLeft.precision);
+      const tradeVolume = trade.primaryMarketTradeVolume * Math.pow(10, 8 - currencyRight.precision);
+
+      if (integerAmounts) {
+        trade._tradePrice = tradePrice;
+        trade._tradeAmount = tradeAmount;
+        trade._tradeVolume = tradeVolume;
+        trade._offerAmount = trade.offerAmount;
+      } else {
+        trade._tradePriceStr = this.intToBtc(tradePrice);
+        trade._tradeAmountStr = this.intToBtc(tradeAmount);
+        trade._tradeVolumeStr = this.intToBtc(tradeVolume);
+        trade._offerAmountStr = this.intToBtc(trade.offerAmount);
+      }
+
+      matches.push(trade);
+
+      if (matches.length >= limit) {
+        break;
+      }
+    }
+
+    if ((trade_id_from && !trade_id_from_ts) || (trade_id_to && !trade_id_to_ts)) {
+      matches = [];
+    }
+    return matches;
+  }
+
+  private intervalStart(ts: number, interval: string): number {
+    switch (interval) {
+        case 'minute':
+            return (ts - (ts % 60));
+        case '10_minute':
+            return (ts - (ts % 600));
+        case 'half_hour':
+            return (ts - (ts % 1800));
+        case 'hour':
+            return (ts - (ts % 3600));
+        case 'half_day':
+            return (ts - (ts % (3600 * 12)));
+        case 'day':
+            return strtotime('midnight today', ts);
+        case 'week':
+            return strtotime('midnight sunday last week', ts);
+        case 'month':
+            return strtotime('midnight first day of this month', ts);
+        case 'year':
+            return strtotime('midnight first day of january', ts);
+        default:
+            throw new Error('Unsupported interval: ' + interval);
+    }
+}
+
+  private offerDataToOffer(offer: OffersData, market: string): Offer {
+    const currencyPairs = market.split('_');
+    const currencyRight = this.allCurrenciesIndexed[currencyPairs[1].toUpperCase()];
+    const currencyLeft = this.allCurrenciesIndexed[currencyPairs[0].toUpperCase()];
+    const price = offer['primaryMarketPrice'] * Math.pow( 10, 8 - currencyRight['precision']);
+    const amount = offer['primaryMarketAmount'] * Math.pow( 10, 8 - currencyLeft['precision']);
+    const volume = offer['primaryMarketVolume'] * Math.pow( 10, 8 - currencyRight['precision']);
+
+    return {
+      offer_id: offer.id,
+      offer_date: offer.date,
+      direction: offer.primaryMarketDirection,
+      min_amount: this.intToBtc(offer.minAmount),
+      amount: this.intToBtc(amount),
+      price: this.intToBtc(price),
+      volume: this.intToBtc(volume),
+      payment_method: offer.paymentMethod,
+      offer_fee_txid: null,
+    };
+  }
+
+  private intToBtc(val: number): string {
+    return (val / 100000000).toFixed(8);
+  }
+}
+
+export default new BisqMarketsApi();
--- a/backend/src/api/bisq/markets.ts
+++ b/backend/src/api/bisq/markets.ts
@@ -0,0 +1,137 @@
+import config from '../../config';
+import * as fs from 'fs';
+import { OffersData as OffersData, TradesData, Currency } from './interfaces';
+import bisqMarket from './markets-api';
+import logger from '../../logger';
+
+class Bisq {
+  private static FOLDER_WATCH_CHANGE_DETECTION_DEBOUNCE = 4000;
+  private static MARKET_JSON_PATH = config.BISQ.DATA_PATH;
+  private static MARKET_JSON_FILE_PATHS = {
+    activeCryptoCurrency: '/active_crypto_currency_list.json',
+    activeFiatCurrency: '/active_fiat_currency_list.json',
+    cryptoCurrency: '/crypto_currency_list.json',
+    fiatCurrency: '/fiat_currency_list.json',
+    offers: '/offers_statistics.json',
+    trades: '/trade_statistics.json',
+  };
+
+  private cryptoCurrencyLastMtime = new Date('2016-01-01');
+  private fiatCurrencyLastMtime = new Date('2016-01-01');
+  private offersLastMtime = new Date('2016-01-01');
+  private tradesLastMtime = new Date('2016-01-01');
+
+  private subdirectoryWatcher: fs.FSWatcher | undefined;
+
+  constructor() {}
+
+  startBisqService(): void {
+    try {
+      this.checkForBisqDataFolder();
+    } catch (e) {
+      logger.info('Retrying to start bisq service (markets) in 3 minutes');
+      setTimeout(this.startBisqService.bind(this), 180000);
+      return;
+    }
+    this.loadBisqDumpFile();
+    this.startBisqDirectoryWatcher();
+  }
+
+  private checkForBisqDataFolder() {
+    if (!fs.existsSync(Bisq.MARKET_JSON_PATH + Bisq.MARKET_JSON_FILE_PATHS.cryptoCurrency)) {
+      logger.err(Bisq.MARKET_JSON_PATH + Bisq.MARKET_JSON_FILE_PATHS.cryptoCurrency + ` doesn't exist. Make sure Bisq is running and the config is correct before starting the server.`);
+      throw new Error(`Cannot load BISQ ${Bisq.MARKET_JSON_FILE_PATHS.cryptoCurrency} file`);
+    }
+  }
+
+  private startBisqDirectoryWatcher() {
+    if (this.subdirectoryWatcher) {
+      this.subdirectoryWatcher.close();
+    }
+    if (!fs.existsSync(Bisq.MARKET_JSON_PATH + Bisq.MARKET_JSON_FILE_PATHS.cryptoCurrency)) {
+      logger.warn(Bisq.MARKET_JSON_PATH + Bisq.MARKET_JSON_FILE_PATHS.cryptoCurrency + ` doesn't exist. Trying to restart sub directory watcher again in 3 minutes.`);
+      setTimeout(() => this.startBisqDirectoryWatcher(), 180000);
+      return;
+    }
+    let fsWait: NodeJS.Timeout | null = null;
+    this.subdirectoryWatcher = fs.watch(Bisq.MARKET_JSON_PATH, () => {
+      if (fsWait) {
+        clearTimeout(fsWait);
+      }
+      fsWait = setTimeout(() => {
+        logger.debug(`Change detected in the Bisq market data folder.`);
+        this.loadBisqDumpFile();
+      }, Bisq.FOLDER_WATCH_CHANGE_DETECTION_DEBOUNCE);
+    });
+  }
+
+  private async loadBisqDumpFile(): Promise<void> {
+    const start = new Date().getTime();
+    try {
+      let marketsDataUpdated = false;
+      const cryptoMtime = this.getFileMtime(Bisq.MARKET_JSON_FILE_PATHS.cryptoCurrency);
+      const fiatMtime = this.getFileMtime(Bisq.MARKET_JSON_FILE_PATHS.fiatCurrency);
+      if (cryptoMtime > this.cryptoCurrencyLastMtime || fiatMtime > this.fiatCurrencyLastMtime) {
+        const cryptoCurrencyData = await this.loadData<Currency[]>(Bisq.MARKET_JSON_FILE_PATHS.cryptoCurrency);
+        const fiatCurrencyData = await this.loadData<Currency[]>(Bisq.MARKET_JSON_FILE_PATHS.fiatCurrency);
+        const activeCryptoCurrencyData = await this.loadData<Currency[]>(Bisq.MARKET_JSON_FILE_PATHS.activeCryptoCurrency);
+        const activeFiatCurrencyData = await this.loadData<Currency[]>(Bisq.MARKET_JSON_FILE_PATHS.activeFiatCurrency);
+        logger.debug('Updating Bisq Market Currency Data');
+        bisqMarket.setCurrencyData(cryptoCurrencyData, fiatCurrencyData, activeCryptoCurrencyData, activeFiatCurrencyData);
+        if (cryptoMtime > this.cryptoCurrencyLastMtime) {
+          this.cryptoCurrencyLastMtime = cryptoMtime;
+        }
+        if (fiatMtime > this.fiatCurrencyLastMtime) {
+          this.fiatCurrencyLastMtime = fiatMtime;
+        }
+        marketsDataUpdated = true;
+      }
+      const offersMtime = this.getFileMtime(Bisq.MARKET_JSON_FILE_PATHS.offers);
+      if (offersMtime > this.offersLastMtime) {
+        const offersData = await this.loadData<OffersData[]>(Bisq.MARKET_JSON_FILE_PATHS.offers);
+        logger.debug('Updating Bisq Market Offers Data');
+        bisqMarket.setOffersData(offersData);
+        this.offersLastMtime = offersMtime;
+        marketsDataUpdated = true;
+      }
+      const tradesMtime = this.getFileMtime(Bisq.MARKET_JSON_FILE_PATHS.trades);
+      if (tradesMtime > this.tradesLastMtime) {
+        const tradesData = await this.loadData<TradesData[]>(Bisq.MARKET_JSON_FILE_PATHS.trades);
+        logger.debug('Updating Bisq Market Trades Data');
+        bisqMarket.setTradesData(tradesData);
+        this.tradesLastMtime = tradesMtime;
+        marketsDataUpdated = true;
+      }
+      if (marketsDataUpdated) {
+        bisqMarket.updateCache();
+        const time = new Date().getTime() - start;
+        logger.debug('Bisq market data updated in ' + time + ' ms');
+      }
+    } catch (e) {
+      logger.err('loadBisqMarketDataDumpFile() error.' + (e instanceof Error ? e.message : e));
+    }
+  }
+
+  private getFileMtime(path: string): Date {
+    const stats = fs.statSync(Bisq.MARKET_JSON_PATH + path);
+    return stats.mtime;
+  }
+
+  private loadData<T>(path: string): Promise<T> {
+    return new Promise((resolve, reject) => {
+      fs.readFile(Bisq.MARKET_JSON_PATH + path, 'utf8', (err, data) => {
+        if (err) {
+          reject(err);
+        }
+        try {
+          const parsedData = JSON.parse(data);
+          resolve(parsedData);
+        } catch (e) {
+          reject('JSON parse error (' + path + ')');
+        }
+      });
+    });
+  }
+}
+
+export default new Bisq();
--- a/backend/src/api/bisq/strtotime.ts
+++ b/backend/src/api/bisq/strtotime.ts
--- a/backend/src/api/bitcoin/bitcoin-api-abstract-factory.ts
+++ b/backend/src/api/bitcoin/bitcoin-api-abstract-factory.ts
@@ -1,4 +1,4 @@
-import { IBitcoinApi, TestMempoolAcceptResult } from './bitcoin-api.interface';
+import { IBitcoinApi } from './bitcoin-api.interface';
 import { IEsploraApi } from './esplora-api.interface';

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

  startHealthChecks(): void;
-  getHealthStatus(): HealthCheckHost[];
 }
 export interface BitcoinRpcCredentials {
  host: string;
@@ -41,15 +38,3 @@ export interface BitcoinRpcCredentials {
  timeout: number;
  cookie?: string;
 }
-
-export interface HealthCheckHost {
-  host: string;
-  active: boolean;
-  rtt: number;
-  latestHeight: number;
-  socket: boolean;
-  outOfSync: boolean;
-  unreachable: boolean;
-  checked: boolean;
-  lastChecked: number;
-}
--- a/backend/src/api/bitcoin/bitcoin-api.interface.ts
+++ b/backend/src/api/bitcoin/bitcoin-api.interface.ts
@@ -106,7 +106,6 @@ export namespace IBitcoinApi {
      address?: string;              //  (string) bitcoin address
      addresses?: string[];           //  (string) bitcoin addresses
      pegout_chain?: string;         //  (string) Elements peg-out chain
-      pegout_address?: string;       //  (string) Elements peg-out address
      pegout_addresses?: string[];   //  (string) Elements peg-out addresses
    };
  }
@@ -205,16 +204,3 @@ export namespace IBitcoinApi {
    "utxo_size_inc": number;
  }
 }
-
-export interface TestMempoolAcceptResult {
-  txid: string,
-  wtxid: string,
-  allowed?: boolean,
-  vsize?: number,
-  fees?: {
-    base: number,
-    "effective-feerate": number,
-    "effective-includes": string[],
-  },
-  ['reject-reason']?: string,
-}
--- a/backend/src/api/bitcoin/bitcoin-api.ts
+++ b/backend/src/api/bitcoin/bitcoin-api.ts
@@ -1,6 +1,6 @@
 import * as bitcoinjs from 'bitcoinjs-lib';
-import { AbstractBitcoinApi, HealthCheckHost } from './bitcoin-api-abstract-factory';
-import { IBitcoinApi, TestMempoolAcceptResult } from './bitcoin-api.interface';
+import { AbstractBitcoinApi } from './bitcoin-api-abstract-factory';
+import { IBitcoinApi } from './bitcoin-api.interface';
 import { IEsploraApi } from './esplora-api.interface';
 import blocks from '../blocks';
 import mempool from '../mempool';
@@ -107,14 +107,8 @@ class BitcoinApi implements AbstractBitcoinApi {
      .then((rpcBlock: IBitcoinApi.Block) => rpcBlock.tx);
  }

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

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

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

-  async $getCoinbaseTx(blockhash: string): Promise<IEsploraApi.Transaction> {
-    const txids = await this.$getTxIdsForBlock(blockhash);
-    return this.$getRawTransaction(txids[0]);
-  }
-
  $getEstimatedHashrate(blockHeight: number): Promise<number> {
    // 120 is the default block span in Core
    return this.bitcoindClient.getNetworkHashPs(120, blockHeight);
@@ -409,10 +382,6 @@ class BitcoinApi implements AbstractBitcoinApi {
  }

  public startHealthChecks(): void {};
-
-  public getHealthStatus() {
-    return [];
-  }
 }

 export default BitcoinApi;
--- a/backend/src/api/bitcoin/bitcoin.routes.ts
+++ b/backend/src/api/bitcoin/bitcoin.routes.ts
@@ -19,7 +19,6 @@ import bitcoinClient from './bitcoin-client';
 import difficultyAdjustment from '../difficulty-adjustment';
 import transactionRepository from '../../repositories/TransactionRepository';
 import rbfCache from '../rbf-cache';
-import { calculateMempoolTxCpfp } from '../cpfp';

 class BitcoinRoutes {
  public initRoutes(app: Application) {
@@ -37,12 +36,65 @@ class BitcoinRoutes {
      .get(config.MEMPOOL.API_URL_PREFIX + 'replacements', this.getRbfReplacements)
      .get(config.MEMPOOL.API_URL_PREFIX + 'fullrbf/replacements', this.getFullRbfReplacements)
      .post(config.MEMPOOL.API_URL_PREFIX + 'tx/push', this.$postTransactionForm)
+      .get(config.MEMPOOL.API_URL_PREFIX + 'donations', async (req, res) => {
+        try {
+          const response = await axios.get(`${config.EXTERNAL_DATA_SERVER.MEMPOOL_API}/donations`, { responseType: 'stream', timeout: 10000 });
+          response.data.pipe(res);
+        } catch (e) {
+          res.status(500).end();
+        }
+      })
+      .get(config.MEMPOOL.API_URL_PREFIX + 'donations/images/:id', async (req, res) => {
+        try {
+          const response = await axios.get(`${config.EXTERNAL_DATA_SERVER.MEMPOOL_API}/donations/images/${req.params.id}`, {
+            responseType: 'stream', timeout: 10000
+          });
+          response.data.pipe(res);
+        } catch (e) {
+          res.status(500).end();
+        }
+      })
+      .get(config.MEMPOOL.API_URL_PREFIX + 'contributors', async (req, res) => {
+        try {
+          const response = await axios.get(`${config.EXTERNAL_DATA_SERVER.MEMPOOL_API}/contributors`, { responseType: 'stream', timeout: 10000 });
+          response.data.pipe(res);
+        } catch (e) {
+          res.status(500).end();
+        }
+      })
+      .get(config.MEMPOOL.API_URL_PREFIX + 'contributors/images/:id', async (req, res) => {
+        try {
+          const response = await axios.get(`${config.EXTERNAL_DATA_SERVER.MEMPOOL_API}/contributors/images/${req.params.id}`, {
+            responseType: 'stream', timeout: 10000
+          });
+          response.data.pipe(res);
+        } catch (e) {
+          res.status(500).end();
+        }
+      })
+      .get(config.MEMPOOL.API_URL_PREFIX + 'translators', async (req, res) => {
+        try {
+          const response = await axios.get(`${config.EXTERNAL_DATA_SERVER.MEMPOOL_API}/translators`, { responseType: 'stream', timeout: 10000 });
+          response.data.pipe(res);
+        } catch (e) {
+          res.status(500).end();
+        }
+      })
+      .get(config.MEMPOOL.API_URL_PREFIX + 'translators/images/:id', async (req, res) => {
+        try {
+          const response = await axios.get(`${config.EXTERNAL_DATA_SERVER.MEMPOOL_API}/translators/images/${req.params.id}`, {
+            responseType: 'stream', timeout: 10000
+          });
+          response.data.pipe(res);
+        } catch (e) {
+          res.status(500).end();
+        }
+      })
      .get(config.MEMPOOL.API_URL_PREFIX + 'blocks', this.getBlocks.bind(this))
      .get(config.MEMPOOL.API_URL_PREFIX + 'blocks/:height', this.getBlocks.bind(this))
      .get(config.MEMPOOL.API_URL_PREFIX + 'block/:hash', this.getBlock)
      .get(config.MEMPOOL.API_URL_PREFIX + 'block/:hash/summary', this.getStrippedBlockTransactions)
      .get(config.MEMPOOL.API_URL_PREFIX + 'block/:hash/audit-summary', this.getBlockAuditSummary)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'block/:hash/tx/:txid/audit', this.$getBlockTxAuditSummary)
      .get(config.MEMPOOL.API_URL_PREFIX + 'blocks/tip/height', this.getBlockTipHeight)
      .post(config.MEMPOOL.API_URL_PREFIX + 'psbt/addparents', this.postPsbtCompletion)
      .get(config.MEMPOOL.API_URL_PREFIX + 'blocks-bulk/:from', this.getBlocksByBulk.bind(this))
@@ -56,7 +108,6 @@ class BitcoinRoutes {
          .get(config.MEMPOOL.API_URL_PREFIX + 'mempool/recent', this.getRecentMempoolTransactions)
          .get(config.MEMPOOL.API_URL_PREFIX + 'tx/:txId', this.getTransaction)
          .post(config.MEMPOOL.API_URL_PREFIX + 'tx', this.$postTransaction)
-          .post(config.MEMPOOL.API_URL_PREFIX + 'txs/test', this.$testTransactions)
          .get(config.MEMPOOL.API_URL_PREFIX + 'tx/:txId/hex', this.getRawTransaction)
          .get(config.MEMPOOL.API_URL_PREFIX + 'tx/:txId/status', this.getTransactionStatus)
          .get(config.MEMPOOL.API_URL_PREFIX + 'tx/:txId/outspends', this.getTransactionOutspends)
@@ -70,10 +121,8 @@ class BitcoinRoutes {
          .get(config.MEMPOOL.API_URL_PREFIX + 'block-height/:height', this.getBlockHeight)
          .get(config.MEMPOOL.API_URL_PREFIX + 'address/:address', this.getAddress)
          .get(config.MEMPOOL.API_URL_PREFIX + 'address/:address/txs', this.getAddressTransactions)
-          .get(config.MEMPOOL.API_URL_PREFIX + 'address/:address/txs/summary', this.getAddressTransactionSummary)
          .get(config.MEMPOOL.API_URL_PREFIX + 'scripthash/:scripthash', this.getScriptHash)
          .get(config.MEMPOOL.API_URL_PREFIX + 'scripthash/:scripthash/txs', this.getScriptHashTransactions)
-          .get(config.MEMPOOL.API_URL_PREFIX + 'scripthash/:scripthash/txs/summary', this.getScriptHashTransactionSummary)
          .get(config.MEMPOOL.API_URL_PREFIX + 'address-prefix/:prefix', this.getAddressPrefix)
          ;
      }
@@ -160,17 +209,13 @@ class BitcoinRoutes {
          descendants: tx.descendants || null,
          effectiveFeePerVsize: tx.effectiveFeePerVsize || null,
          sigops: tx.sigops,
-          fee: tx.fee,
          adjustedVsize: tx.adjustedVsize,
-          acceleration: tx.acceleration,
-          acceleratedBy: tx.acceleratedBy || undefined,
-          acceleratedAt: tx.acceleratedAt || undefined,
-          feeDelta: tx.feeDelta || undefined,
+          acceleration: tx.acceleration
        });
        return;
      }

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

      res.json(cpfpInfo);
      return;
@@ -364,27 +409,13 @@ class BitcoinRoutes {
    }
  }

-  private async $getBlockTxAuditSummary(req: Request, res: Response) {
-    try {
-      const auditSummary = await blocks.$getBlockTxAuditSummary(req.params.hash, req.params.txid);
-      if (auditSummary) {
-        res.setHeader('Expires', new Date(Date.now() + 1000 * 3600 * 24 * 30).toUTCString());
-        res.json(auditSummary);
-      } else {
-        return res.status(404).send(`transaction audit not available`);
-      }
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
  private async getBlocks(req: Request, res: Response) {
    try {
      if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK)) { // Bitcoin
        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));
-      } else { // Liquid
+      } else { // Liquid, Bisq
        return await this.getLegacyBlocks(req, res);
      }
    } catch (e) {
@@ -394,7 +425,7 @@ class BitcoinRoutes {

  private async getBlocksByBulk(req: Request, res: Response) {
    try {
-      if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false) { // Liquid - Not implemented
+      if (['mainnet', 'testnet', 'signet'].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) {
@@ -535,13 +566,6 @@ class BitcoinRoutes {
    }
  }

-  private async getAddressTransactionSummary(req: Request, res: Response): Promise<void> {
-    if (config.MEMPOOL.BACKEND !== 'esplora') {
-      res.status(405).send('Address summary lookups require mempool/electrs backend.');
-      return;
-    }
-  }
-
  private async getScriptHash(req: Request, res: Response) {
    if (config.MEMPOOL.BACKEND === 'none') {
      res.status(405).send('Address lookups cannot be used with bitcoind as backend.');
@@ -585,13 +609,6 @@ class BitcoinRoutes {
    }
  }

-  private async getScriptHashTransactionSummary(req: Request, res: Response): Promise<void> {
-    if (config.MEMPOOL.BACKEND !== 'esplora') {
-      res.status(405).send('Scripthash summary lookups require mempool/electrs backend.');
-      return;
-    }
-  }
-
  private async getAddressPrefix(req: Request, res: Response) {
    try {
      const blockHash = await bitcoinApi.$getAddressPrefix(req.params.prefix);
@@ -769,19 +786,6 @@ class BitcoinRoutes {
    }
  }

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

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

 interface FailoverHost {
  host: string,
  rtts: number[],
  rtt: number,
-  timedOut?: boolean,
  failures: number,
  latestHeight?: number,
  socket?: boolean,
  outOfSync?: boolean,
  unreachable?: boolean,
  preferred?: boolean,
-  checked: boolean,
-  lastChecked?: number,
 }

 class FailoverRouter {
  activeHost: FailoverHost;
  fallbackHost: FailoverHost;
-  maxSlippage: number = config.ESPLORA.MAX_BEHIND_TIP ?? 2;
-  maxHeight: number = 0;
  hosts: FailoverHost[];
  multihost: boolean;
  pollInterval: number = 60000;
@@ -41,7 +34,6 @@ class FailoverRouter {
    this.hosts = (config.ESPLORA.FALLBACK || []).map(domain => {
      return {
        host: domain,
-        checked: false,
        rtts: [],
        rtt: Infinity,
        failures: 0,
@@ -54,7 +46,6 @@ class FailoverRouter {
      failures: 0,
      socket: !!config.ESPLORA.UNIX_SOCKET_PATH,
      preferred: true,
-      checked: false,
    };
    this.fallbackHost = this.activeHost;
    this.hosts.unshift(this.activeHost);
@@ -83,92 +74,66 @@ class FailoverRouter {
      clearTimeout(this.pollTimer);
    }

-    const start = Date.now();
+    const results = await Promise.allSettled(this.hosts.map(async (host) => {
+      if (host.socket) {
+        return this.pollConnection.get<number>('/blocks/tip/height', { socketPath: host.host, timeout: config.ESPLORA.FALLBACK_TIMEOUT });
+      } else {
+        return this.pollConnection.get<number>(host.host + '/blocks/tip/height', { timeout: config.ESPLORA.FALLBACK_TIMEOUT });
+      }
+    }));
+    const maxHeight = results.reduce((max, result) => Math.max(max, result.status === 'fulfilled' ? result.value?.data || 0 : 0), 0);

    // update rtts & sync status
-    for (const host of this.hosts) {
-      try {
-        const result = await (host.socket
-          ? this.pollConnection.get<number>('/blocks/tip/height', { socketPath: host.host, timeout: config.ESPLORA.FALLBACK_TIMEOUT })
-          : this.pollConnection.get<number>(host.host + '/blocks/tip/height', { timeout: config.ESPLORA.FALLBACK_TIMEOUT })
-        );
-        if (result) {
-          const height = result.data;
-          host.latestHeight = height;
-          this.maxHeight = Math.max(height || 0, ...this.hosts.map(h => (!(h.unreachable || h.timedOut || h.outOfSync) ? h.latestHeight || 0 : 0)));
-          const rtt = result.config['meta'].rtt;
-          host.rtts.unshift(rtt);
-          host.rtts.slice(0, 5);
-          host.rtt = host.rtts.reduce((acc, l) => acc + l, 0) / host.rtts.length;
-          if (height == null || isNaN(height) || (this.maxHeight - height > this.maxSlippage)) {
-            host.outOfSync = true;
-          } else {
-            host.outOfSync = false;
-          }
-          host.unreachable = false;
-        } else {
+    for (let i = 0; i < results.length; i++) {
+      const host = this.hosts[i];
+      const result = results[i].status === 'fulfilled' ? (results[i] as PromiseFulfilledResult<AxiosResponse<number, any>>).value : null;
+      if (result) {
+        const height = result.data;
+        const rtt = result.config['meta'].rtt;
+        host.rtts.unshift(rtt);
+        host.rtts.slice(0, 5);
+        host.rtt = host.rtts.reduce((acc, l) => acc + l, 0) / host.rtts.length;
+        host.latestHeight = height;
+        if (height == null || isNaN(height) || (maxHeight - height > 2)) {
          host.outOfSync = true;
-          host.unreachable = true;
-          host.rtts = [];
-          host.rtt = Infinity;
+        } else {
+          host.outOfSync = false;
        }
-        host.timedOut = false;
-      } catch (e) {
+        host.unreachable = false;
+      } else {
        host.outOfSync = true;
        host.unreachable = true;
-        host.rtts = [];
-        host.rtt = Infinity;
-        if (isAxiosError(e) && (e.code === 'ECONNABORTED' || e.code === 'ETIMEDOUT')) {
-          host.timedOut = true;
-        } else {
-          host.timedOut = false;
-        }
      }
-      host.checked = true;
-      host.lastChecked = Date.now();
-
-      const rankOrder = this.sortHosts();
-      // switch if the current host is out of sync or significantly slower than the next best alternative
-      if (this.activeHost.outOfSync || this.activeHost.unreachable || (this.activeHost !== rankOrder[0] && rankOrder[0].preferred) || (!this.activeHost.preferred && this.activeHost.rtt > (rankOrder[0].rtt * 2) + 50)) {
-        if (this.activeHost.unreachable) {
-          logger.warn(`🚨🚨🚨 Unable to reach ${this.activeHost.host}, failing over to next best alternative 🚨🚨🚨`);
-        } else if (this.activeHost.outOfSync) {
-          logger.warn(`🚨🚨🚨 ${this.activeHost.host} has fallen behind, failing over to next best alternative 🚨🚨🚨`);
-        } else {
-          logger.debug(`🛠️ ${this.activeHost.host} is no longer the best esplora host 🛠️`);
-        }
-        this.electHost();
-      }
-      await Common.sleep$(50);
    }

-    const rankOrder = this.updateFallback();
-    logger.debug(`Tomahawk ranking:\n${rankOrder.map((host, index) => this.formatRanking(index, host, this.activeHost, this.maxHeight)).join('\n')}`);
+    this.sortHosts();

-    const elapsed = Date.now() - start;
+    logger.debug(`Tomahawk ranking:\n${this.hosts.map((host, index) => this.formatRanking(index, host, this.activeHost, maxHeight)).join('\n')}`);

-    this.pollTimer = setTimeout(() => { this.pollHosts(); }, Math.max(1, this.pollInterval - elapsed));
+    // switch if the current host is out of sync or significantly slower than the next best alternative
+    if (this.activeHost.outOfSync || this.activeHost.unreachable || (this.activeHost !== this.hosts[0] && this.hosts[0].preferred) || (!this.activeHost.preferred && this.activeHost.rtt > (this.hosts[0].rtt * 2) + 50)) {
+      if (this.activeHost.unreachable) {
+        logger.warn(`🚨🚨🚨 Unable to reach ${this.activeHost.host}, failing over to next best alternative 🚨🚨🚨`);
+      } else if (this.activeHost.outOfSync) {
+        logger.warn(`🚨🚨🚨 ${this.activeHost.host} has fallen behind, failing over to next best alternative 🚨🚨🚨`);
+      } else {
+        logger.debug(`🛠️ ${this.activeHost.host} is no longer the best esplora host 🛠️`);
+      }
+      this.electHost();
+    }
+
+    this.pollTimer = setTimeout(() => { this.pollHosts(); }, this.pollInterval);
  }

  private formatRanking(index: number, host: FailoverHost, active: FailoverHost, maxHeight: number): string {
-    const heightStatus = !host.checked ? '⏳' : (host.outOfSync ? '🚫' : (host.latestHeight && host.latestHeight < maxHeight ? '🟧' : '✅'));
-    return `${host === active ? '⭐️' : '  '} ${host.rtt < Infinity ? Math.round(host.rtt).toString().padStart(5, ' ') + 'ms' : (host.timedOut ? '  ⌛️💥 ' : '    -  ')} ${!host.checked ? '⏳' : (host.unreachable ? '🔥' : '✅')} | block: ${host.latestHeight || '??????'} ${heightStatus} | ${host.host} ${host === active ? '⭐️' : '  '}`;
-  }
-
-  private updateFallback(): FailoverHost[] {
-    const rankOrder = this.sortHosts();
-    if (rankOrder.length > 1 && rankOrder[0] === this.activeHost) {
-      this.fallbackHost = rankOrder[1];
-    } else {
-      this.fallbackHost = rankOrder[0];
-    }
-    return rankOrder;
+    const heightStatus = host.outOfSync ? '🚫' : (host.latestHeight && host.latestHeight < maxHeight ? '🟧' : '✅');
+    return `${host === active ? '⭐️' : '  '} ${host.rtt < Infinity ? Math.round(host.rtt).toString().padStart(5, ' ') + 'ms' : '    -  '} ${host.unreachable ? '🔥' : '✅'} | block: ${host.latestHeight || '??????'} ${heightStatus} | ${host.host} ${host === active ? '⭐️' : '  '}`;
  }

  // sort hosts by connection quality, and update default fallback
-  public sortHosts(): FailoverHost[] {
+  private sortHosts(): void {
    // sort by connection quality
-    return this.hosts.slice().sort((a, b) => {
+    this.hosts.sort((a, b) => {
      if ((a.unreachable || a.outOfSync) === (b.unreachable || b.outOfSync)) {
        if  (a.preferred === b.preferred) {
          // lower rtt is best
@@ -180,13 +145,19 @@ class FailoverRouter {
        return (a.unreachable || a.outOfSync) ? 1 : -1;
      }
    });
+    if (this.hosts.length > 1 && this.hosts[0] === this.activeHost) {
+      this.fallbackHost = this.hosts[1];
+    } else {
+      this.fallbackHost = this.hosts[0];
+    }
  }

  // depose the active host and choose the next best replacement
  private electHost(): void {
+    this.activeHost.outOfSync = true;
    this.activeHost.failures = 0;
-    const rankOrder = this.sortHosts();
-    this.activeHost = rankOrder[0];
+    this.sortHosts();
+    this.activeHost = this.hosts[0];
    logger.warn(`Switching esplora host to ${this.activeHost.host}`);
  }

@@ -194,7 +165,6 @@ class FailoverRouter {
    host.failures++;
    if (host.failures > 5 && this.multihost) {
      logger.warn(`🚨🚨🚨 Too many esplora failures on ${this.activeHost.host}, falling back to next best alternative 🚨🚨🚨`);
-      this.activeHost.unreachable = true;
      this.electHost();
      return this.activeHost;
    } else {
@@ -328,10 +298,6 @@ class ElectrsApi implements AbstractBitcoinApi {
    throw new Error('Method not implemented.');
  }

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

-  async $getCoinbaseTx(blockhash: string): Promise<IEsploraApi.Transaction> {
-    const txid = await this.failoverRouter.$get<string>(`/block/${blockhash}/txid/0`);
-    return this.failoverRouter.$get<IEsploraApi.Transaction>('/tx/' + txid);
-  }
-
  public startHealthChecks(): void {
    this.failoverRouter.startHealthChecks();
  }
-
-  public getHealthStatus(): HealthCheckHost[] {
-    if (config.MEMPOOL.OFFICIAL) {
-      return this.failoverRouter.sortHosts().map(host => ({
-        host: host.host,
-        active: host === this.failoverRouter.activeHost,
-        rtt: host.rtt,
-        latestHeight: host.latestHeight || 0,
-        socket: !!host.socket,
-        outOfSync: !!host.outOfSync,
-        unreachable: !!host.unreachable,
-        checked: !!host.checked,
-        lastChecked: host.lastChecked || 0,
-      }));
-    } else {
-      return [];
-    }
-  }
 }

 export default ElectrsApi;
--- a/backend/src/api/blocks.ts
+++ b/backend/src/api/blocks.ts
@@ -2,7 +2,7 @@ import config from '../config';
 import bitcoinApi, { bitcoinCoreApi } from './bitcoin/bitcoin-api-factory';
 import logger from '../logger';
 import memPool from './mempool';
-import { BlockExtended, BlockExtension, BlockSummary, PoolTag, TransactionExtended, TransactionMinerInfo, CpfpSummary, MempoolTransactionExtended, TransactionClassified, BlockAudit, TransactionAudit } from '../mempool.interfaces';
+import { BlockExtended, BlockExtension, BlockSummary, PoolTag, TransactionExtended, TransactionMinerInfo, CpfpSummary, MempoolTransactionExtended, TransactionClassified } from '../mempool.interfaces';
 import { Common } from './common';
 import diskCache from './disk-cache';
 import transactionUtils from './transaction-utils';
@@ -29,11 +29,6 @@ import websocketHandler from './websocket-handler';
 import redisCache from './redis-cache';
 import rbfCache from './rbf-cache';
 import { calcBitsDifference } from './difficulty-adjustment';
-import AccelerationRepository from '../repositories/AccelerationRepository';
-import { calculateFastBlockCpfp, calculateGoodBlockCpfp } from './cpfp';
-import mempool from './mempool';
-import CpfpRepository from '../repositories/CpfpRepository';
-import accelerationApi from './services/acceleration';

 class Blocks {
  private blocks: BlockExtended[] = [];
@@ -42,10 +37,8 @@ class Blocks {
  private currentBits = 0;
  private lastDifficultyAdjustmentTime = 0;
  private previousDifficultyRetarget = 0;
-  private quarterEpochBlockTime: number | null = null;
  private newBlockCallbacks: ((block: BlockExtended, txIds: string[], transactions: TransactionExtended[]) => void)[] = [];
  private newAsyncBlockCallbacks: ((block: BlockExtended, txIds: string[], transactions: MempoolTransactionExtended[]) => Promise<void>)[] = [];
-  private classifyingBlocks: boolean = false;

  private mainLoopTimeout: number = 120000;

@@ -299,12 +292,10 @@ class Blocks {
    extras.virtualSize = block.weight / 4.0;
    if (coinbaseTx?.vout.length > 0) {
      extras.coinbaseAddress = coinbaseTx.vout[0].scriptpubkey_address ?? null;
-      extras.coinbaseAddresses = [...new Set<string>(coinbaseTx.vout.map(v => v.scriptpubkey_address).filter(a => a) as string[])];
      extras.coinbaseSignature = coinbaseTx.vout[0].scriptpubkey_asm ?? null;
      extras.coinbaseSignatureAscii = transactionUtils.hex2ascii(coinbaseTx.vin[0].scriptsig) ?? null;
    } else {
      extras.coinbaseAddress = null;
-      extras.coinbaseAddresses = null;
      extras.coinbaseSignature = null;
      extras.coinbaseSignatureAscii = null;
    }
@@ -376,7 +367,8 @@ class Blocks {
      }
    }

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

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

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

    if (config.DATABASE.ENABLED === true) {
@@ -440,11 +449,9 @@ class Blocks {


        if (config.MEMPOOL.BACKEND === 'esplora') {
-          const txs = (await bitcoinApi.$getTxsForBlock(block.hash)).map(tx => transactionUtils.extendMempoolTransaction(tx));
+          const txs = (await bitcoinApi.$getTxsForBlock(block.hash)).map(tx => transactionUtils.extendTransaction(tx));
          const cpfpSummary = await this.$indexCPFP(block.hash, block.height, txs);
-          if (cpfpSummary) {
-            await this.$getStrippedBlockTransactions(block.hash, true, true, cpfpSummary, block.height); // This will index the block summary
-          }
+          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
        }
@@ -558,11 +565,6 @@ class Blocks {
   * [INDEXING] Index transaction classification flags for Goggles
   */
  public async $classifyBlocks(): Promise<void> {
-    if (this.classifyingBlocks) {
-      return;
-    }
-    this.classifyingBlocks = true;
-
    // classification requires an esplora backend
    if (!Common.gogglesIndexingEnabled() || config.MEMPOOL.BACKEND !== 'esplora') {
      return;
@@ -571,11 +573,8 @@ class Blocks {
    const blockchainInfo = await bitcoinClient.getBlockchainInfo();
    const currentBlockHeight = blockchainInfo.blocks;

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

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

    for (let height = currentBlockHeight; height >= 0; height--) {
      try {
-        let txs: MempoolTransactionExtended[] | null = null;
+        let txs: TransactionExtended[] | null = null;
        if (unclassifiedBlocks[height]) {
          const blockHash = unclassifiedBlocks[height];
          // fetch transactions
-          txs = (await bitcoinApi.$getTxsForBlock(blockHash)).map(tx => transactionUtils.extendMempoolTransaction(tx)) || [];
+          txs = (await bitcoinApi.$getTxsForBlock(blockHash)).map(tx => transactionUtils.extendTransaction(tx)) || [];
          // add CPFP
-          const cpfpSummary = calculateGoodBlockCpfp(height, txs, []);
+          const cpfpSummary = Common.calculateCpfp(height, txs, true);
          // classify
          const { transactions: classifiedTxs } = this.summarizeBlockTransactions(blockHash, cpfpSummary.transactions);
-          await BlocksSummariesRepository.$saveTransactions(height, blockHash, classifiedTxs, 2);
-          if (unclassifiedBlocks[height].version < 2 && targetSummaryVersion === 2) {
-            const cpfpClusters = await CpfpRepository.$getClustersAt(height);
-            if (!cpfpRepository.compareClusters(cpfpClusters, cpfpSummary.clusters)) {
-              // CPFP clusters changed - update the compact_cpfp tables
-              await CpfpRepository.$deleteClustersAt(height);
-              await this.$saveCpfp(blockHash, height, cpfpSummary);
-            }
-          }
+          await BlocksSummariesRepository.$saveTransactions(height, blockHash, classifiedTxs, 1);
          await Common.sleep$(250);
        }
        if (unclassifiedTemplates[height]) {
@@ -651,7 +642,7 @@ class Blocks {
              }
              templateTxs.push(tx || templateTx);
            }
-            const cpfpSummary = calculateGoodBlockCpfp(height, templateTxs?.filter(tx => tx['effectiveFeePerVsize'] != null) as MempoolTransactionExtended[], []);
+            const cpfpSummary = Common.calculateCpfp(height, templateTxs?.filter(tx => tx['effectiveFeePerVsize'] != null) as TransactionExtended[], true);
            // classify
            const { transactions: classifiedTxs } = this.summarizeBlockTransactions(blockHash, cpfpSummary.transactions);
            const classifiedTxMap: { [txid: string]: TransactionClassified } = {};
@@ -685,54 +676,6 @@ class Blocks {
        indexedThisRun = 0;
      }
    }
-
-    this.classifyingBlocks = false;
-  }
-
-  /**
-   * [INDEXING] Index missing coinbase addresses for all blocks
-   */
-  public async $indexCoinbaseAddresses(): Promise<void> {
-    try {
-      // Get all indexed block hash
-      const unindexedBlocks = await blocksRepository.$getBlocksWithoutCoinbaseAddresses();
-
-      if (!unindexedBlocks?.length) {
-        return;
-      }
-
-      logger.info(`Indexing missing coinbase addresses for ${unindexedBlocks.length} blocks`);
-
-      // Logging
-      let count = 0;
-      let countThisRun = 0;
-      let timer = Date.now() / 1000;
-      const startedAt = Date.now() / 1000;
-      for (const { height, hash } of unindexedBlocks) {
-        // Logging
-        const elapsedSeconds = (Date.now() / 1000) - timer;
-        if (elapsedSeconds > 5) {
-          const runningFor = (Date.now() / 1000) - startedAt;
-          const blockPerSeconds = countThisRun / elapsedSeconds;
-          const progress = Math.round(count / unindexedBlocks.length * 10000) / 100;
-          logger.debug(`Indexing coinbase addresses for #${height} | ~${blockPerSeconds.toFixed(2)} blocks/sec | total: ${count}/${unindexedBlocks.length} (${progress}%) | elapsed: ${runningFor.toFixed(2)} seconds`);
-          timer = Date.now() / 1000;
-          countThisRun = 0;
-        }
-
-        const coinbaseTx = await bitcoinApi.$getCoinbaseTx(hash);
-        const addresses = new Set<string>(coinbaseTx.vout.map(v => v.scriptpubkey_address).filter(a => a) as string[]);
-        await blocksRepository.$saveCoinbaseAddresses(hash, [...addresses]);
-
-        // Logging
-        count++;
-        countThisRun++;
-      }
-      logger.notice(`coinbase addresses indexing completed: indexed ${count} blocks`);
-    } catch (e) {
-      logger.err(`coinbase addresses indexing failed. Trying again in 10 seconds. Reason: ${(e instanceof Error ? e.message : e)}`);
-      throw e;
-    }
  }

  /**
@@ -830,16 +773,6 @@ class Blocks {
    } else {
      this.currentBlockHeight = this.blocks[this.blocks.length - 1].height;
    }
-    if (this.currentBlockHeight >= 503) {
-      try {
-        const quarterEpochBlockHash = await bitcoinApi.$getBlockHash(this.currentBlockHeight - 503);
-        const quarterEpochBlock = await bitcoinApi.$getBlock(quarterEpochBlockHash);
-        this.quarterEpochBlockTime = quarterEpochBlock?.timestamp;
-      } catch (e) {
-        this.quarterEpochBlockTime = null;
-        logger.warn('failed to update last epoch block time: ' + (e instanceof Error ? e.message : e));
-      }
-    }

    if (blockHeightTip - this.currentBlockHeight > config.MEMPOOL.INITIAL_BLOCKS_AMOUNT * 2) {
      logger.info(`${blockHeightTip - this.currentBlockHeight} blocks since tip. Fast forwarding to the ${config.MEMPOOL.INITIAL_BLOCKS_AMOUNT} recent blocks`);
@@ -884,11 +817,8 @@ class Blocks {
      } else {
        this.currentBlockHeight++;
        logger.debug(`New block found (#${this.currentBlockHeight})!`);
-        // skip updating the orphan block cache if we've fallen behind the chain tip
-        if (this.currentBlockHeight >= blockHeightTip - 2) {
-          this.updateTimerProgress(timer, `getting orphaned blocks for ${this.currentBlockHeight}`);
-          await chainTips.updateOrphanedBlocks();
-        }
+        this.updateTimerProgress(timer, `getting orphaned blocks for ${this.currentBlockHeight}`);
+        await chainTips.updateOrphanedBlocks();
      }

      this.updateTimerProgress(timer, `getting block data for ${this.currentBlockHeight}`);
@@ -905,12 +835,7 @@ class Blocks {
        }
      }

-      let accelerations = Object.values(mempool.getAccelerations());
-      if (accelerations?.length > 0) {
-        const pool = await this.$findBlockMiner(transactionUtils.stripCoinbaseTransaction(transactions[0]));
-        accelerations = accelerations.filter(a => a.pools.includes(pool.uniqueId));
-      }
-      const cpfpSummary: CpfpSummary = calculateGoodBlockCpfp(block.height, transactions, accelerations.map(a => ({ txid: a.txid, max_bid: a.feeDelta })));
+      const cpfpSummary: CpfpSummary = Common.calculateCpfp(block.height, transactions);
      const blockExtended: BlockExtended = await this.$getBlockExtended(block, cpfpSummary.transactions);
      const blockSummary: BlockSummary = this.summarizeBlockTransactions(block.id, cpfpSummary.transactions);
      this.updateTimerProgress(timer, `got block data for ${this.currentBlockHeight}`);
@@ -926,19 +851,18 @@ class Blocks {
            await BlocksRepository.$deleteBlocksFrom(lastBlock.height - 10);
            await HashratesRepository.$deleteLastEntries();
            await cpfpRepository.$deleteClustersFrom(lastBlock.height - 10);
-            await AccelerationRepository.$deleteAccelerationsFrom(lastBlock.height - 10);
            this.blocks = this.blocks.slice(0, -10);
            this.updateTimerProgress(timer, `rolled back chain divergence from ${this.currentBlockHeight}`);
            for (let i = 10; i >= 0; --i) {
              const newBlock = await this.$indexBlock(lastBlock.height - i);
              this.blocks.push(newBlock);
              this.updateTimerProgress(timer, `reindexed block`);
-              let newCpfpSummary;
+              let cpfpSummary;
              if (config.MEMPOOL.CPFP_INDEXING) {
-                newCpfpSummary = await this.$indexCPFP(newBlock.id, lastBlock.height - i);
+                cpfpSummary = await this.$indexCPFP(newBlock.id, lastBlock.height - i);
                this.updateTimerProgress(timer, `reindexed block cpfp`);
              }
-              await this.$getStrippedBlockTransactions(newBlock.id, true, true, newCpfpSummary, newBlock.height);
+              await this.$getStrippedBlockTransactions(newBlock.id, true, true, cpfpSummary, newBlock.height);
              this.updateTimerProgress(timer, `reindexed block summary`);
            }
            await mining.$indexDifficultyAdjustments();
@@ -987,7 +911,7 @@ class Blocks {

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

      if (block.height % 2016 === 0) {
        if (Common.indexingEnabled()) {
@@ -1029,9 +953,6 @@ class Blocks {
      if (this.blocks.length > config.MEMPOOL.INITIAL_BLOCKS_AMOUNT * 4) {
        this.blocks = this.blocks.slice(-config.MEMPOOL.INITIAL_BLOCKS_AMOUNT * 4);
      }
-      blockSummary.transactions.forEach(tx => {
-        delete tx.acc;
-      });
      this.blockSummaries.push(blockSummary);
      if (this.blockSummaries.length > config.MEMPOOL.INITIAL_BLOCKS_AMOUNT * 4) {
        this.blockSummaries = this.blockSummaries.slice(-config.MEMPOOL.INITIAL_BLOCKS_AMOUNT * 4);
@@ -1074,11 +995,11 @@ class Blocks {
    return state;
  }

-  private updateTimerProgress(state, msg): void {
+  private updateTimerProgress(state, msg) {
    state.progress = msg;
  }

-  private clearTimer(state): void {
+  private clearTimer(state) {
    if (state.timer) {
      clearTimeout(state.timer);
    }
@@ -1167,24 +1088,17 @@ class Blocks {
      summary = {
        id: hash,
        transactions: cpfpSummary.transactions.map(tx => {
-          let flags: number = 0;
-          try {
-            flags = Common.getTransactionFlags(tx);
-          } catch (e) {
-            logger.warn('Failed to classify transaction: ' + (e instanceof Error ? e.message : e));
-          }
          return {
            txid: tx.txid,
-            time: tx.firstSeen,
            fee: tx.fee || 0,
            vsize: tx.vsize,
            value: Math.round(tx.vout.reduce((acc, vout) => acc + (vout.value ? vout.value : 0), 0)),
            rate: tx.effectiveFeePerVsize,
-            flags: flags,
+            flags: tx.flags || Common.getTransactionFlags(tx),
          };
        }),
      };
-      summaryVersion = cpfpSummary.version;
+      summaryVersion = 1;
    } else {
      if (config.MEMPOOL.BACKEND === 'esplora') {
        const txs = (await bitcoinApi.$getTxsForBlock(hash)).map(tx => transactionUtils.extendTransaction(tx));
@@ -1309,7 +1223,6 @@ class Blocks {
        utxoset_size: block.extras.utxoSetSize ?? null,
        coinbase_raw: block.extras.coinbaseRaw ?? null,
        coinbase_address: block.extras.coinbaseAddress ?? null,
-        coinbase_addresses: block.extras.coinbaseAddresses ?? null,
        coinbase_signature: block.extras.coinbaseSignature ?? null,
        coinbase_signature_ascii: block.extras.coinbaseSignatureAscii ?? null,
        pool_slug: block.extras.pool.slug ?? null,
@@ -1371,7 +1284,7 @@ class Blocks {
    return blocks;
  }

-  public async $getBlockAuditSummary(hash: string): Promise<BlockAudit | null> {
+  public async $getBlockAuditSummary(hash: string): Promise<any> {
    if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK)) {
      return BlocksAuditsRepository.$getBlockAudit(hash);
    } else {
@@ -1379,14 +1292,6 @@ class Blocks {
    }
  }

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

-  public getQuarterEpochBlockTime(): number | null {
-    return this.quarterEpochBlockTime;
-  }
-
  public getCurrentBlockHeight(): number {
    return this.currentBlockHeight;
  }

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

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

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

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

-      return summary;
-    } else {
-      logger.err(`Cannot index CPFP for block ${height} - missing transaction data`);
-      return null;
-    }
+    return summary;
  }

  public async $saveCpfp(hash: string, height: number, cpfpSummary: CpfpSummary): Promise<void> {
--- a/backend/src/api/chain-tips.ts
+++ b/backend/src/api/chain-tips.ts
@@ -12,68 +12,32 @@ export interface OrphanedBlock {
  height: number;
  hash: string;
  status: 'valid-fork' | 'valid-headers' | 'headers-only';
-  prevhash: string;
 }

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

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

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

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

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

--- a/backend/src/api/common.ts
+++ b/backend/src/api/common.ts
@@ -1,30 +1,11 @@
 import * as bitcoinjs from 'bitcoinjs-lib';
 import { Request } from 'express';
-import { EffectiveFeeStats, MempoolBlockWithTransactions, TransactionExtended, MempoolTransactionExtended, TransactionStripped, WorkingEffectiveFeeStats, TransactionClassified, TransactionFlags } from '../mempool.interfaces';
+import { CpfpInfo, CpfpSummary, CpfpCluster, EffectiveFeeStats, MempoolBlockWithTransactions, TransactionExtended, MempoolTransactionExtended, TransactionStripped, WorkingEffectiveFeeStats, TransactionClassified, TransactionFlags } from '../mempool.interfaces';
 import config from '../config';
 import { NodeSocket } from '../repositories/NodesSocketsRepository';
 import { isIP } from 'net';
 import transactionUtils from './transaction-utils';
 import { isPoint } from '../utils/secp256k1';
-import logger from '../logger';
-import { getVarIntLength, opcodes, parseMultisigScript } from '../utils/bitcoin-script';
-
-// Bitcoin Core default policy settings
-const TX_MAX_STANDARD_VERSION = 2;
-const MAX_STANDARD_TX_WEIGHT = 400_000;
-const MAX_BLOCK_SIGOPS_COST = 80_000;
-const MAX_STANDARD_TX_SIGOPS_COST = (MAX_BLOCK_SIGOPS_COST / 5);
-const MIN_STANDARD_TX_NONWITNESS_SIZE = 65;
-const MAX_P2SH_SIGOPS = 15;
-const MAX_STANDARD_P2WSH_STACK_ITEMS = 100;
-const MAX_STANDARD_P2WSH_STACK_ITEM_SIZE = 80;
-const MAX_STANDARD_TAPSCRIPT_STACK_ITEM_SIZE = 80;
-const MAX_STANDARD_P2WSH_SCRIPT_SIZE = 3600;
-const MAX_STANDARD_SCRIPTSIG_SIZE = 1650;
-const DUST_RELAY_TX_FEE = 3;
-const MAX_OP_RETURN_RELAY = 83;
-const DEFAULT_PERMIT_BAREMULTISIG = true;
-
 export class Common {
  static nativeAssetId = config.MEMPOOL.NETWORK === 'liquidtestnet' ?
    '144c654344aa716d6f3abcc1ca90e5641e4e2a7f633bc09fe3baf64585819a49'
@@ -195,167 +176,6 @@ export class Common {
    );
  }

-  /**
-   * Validates most standardness rules
-   *
-   * returns true early if any standardness rule is violated, otherwise false
-   * (except for non-mandatory-script-verify-flag and p2sh script evaluation rules which are *not* enforced)
-   */
-  static isNonStandard(tx: TransactionExtended): boolean {
-    // version
-    if (tx.version > TX_MAX_STANDARD_VERSION) {
-      return true;
-    }
-
-    // tx-size
-    if (tx.weight > MAX_STANDARD_TX_WEIGHT) {
-      return true;
-    }
-
-    // tx-size-small
-    if (this.getNonWitnessSize(tx) < MIN_STANDARD_TX_NONWITNESS_SIZE) {
-      return true;
-    }
-
-    // bad-txns-too-many-sigops
-    if (tx.sigops && tx.sigops > MAX_STANDARD_TX_SIGOPS_COST) {
-      return true;
-    }
-
-    // input validation
-    for (const vin of tx.vin) {
-      if (vin.is_coinbase) {
-        // standardness rules don't apply to coinbase transactions
-        return false;
-      }
-      // scriptsig-size
-      if ((vin.scriptsig.length / 2) > MAX_STANDARD_SCRIPTSIG_SIZE) {
-        return true;
-      }
-      // scriptsig-not-pushonly
-      if (vin.scriptsig_asm) {
-        for (const op of vin.scriptsig_asm.split(' ')) {
-          if (opcodes[op] && opcodes[op] > opcodes['OP_16']) {
-            return true;
-          }
-        }
-      }
-      // bad-txns-nonstandard-inputs
-      if (vin.prevout?.scriptpubkey_type === 'p2sh') {
-        // TODO: evaluate script (https://github.com/bitcoin/bitcoin/blob/1ac627c485a43e50a9a49baddce186ee3ad4daad/src/policy/policy.cpp#L177)
-        // countScriptSigops returns the witness-scaled sigops, so divide by 4 before comparison with MAX_P2SH_SIGOPS
-        const sigops = (transactionUtils.countScriptSigops(vin.inner_redeemscript_asm) / 4);
-        if (sigops > MAX_P2SH_SIGOPS) {
-          return true;
-        }
-      } else if (['unknown', 'provably_unspendable', 'empty'].includes(vin.prevout?.scriptpubkey_type || '')) {
-        return true;
-      }
-      // TODO: bad-witness-nonstandard
-    }
-
-    // output validation
-    let opreturnCount = 0;
-    for (const vout of tx.vout) {
-      // scriptpubkey
-      if (['nonstandard', 'provably_unspendable', 'empty'].includes(vout.scriptpubkey_type)) {
-        // (non-standard output type)
-        return true;
-      } else if (vout.scriptpubkey_type === 'unknown') {
-        // undefined segwit version/length combinations are actually standard in outputs
-        // https://github.com/bitcoin/bitcoin/blob/2c79abc7ad4850e9e3ba32a04c530155cda7f980/src/script/interpreter.cpp#L1950-L1951
-        if (vout.scriptpubkey.startsWith('00') || !this.isWitnessProgram(vout.scriptpubkey)) {
-          return true;
-        }
-      } else if (vout.scriptpubkey_type === 'multisig') {
-        if (!DEFAULT_PERMIT_BAREMULTISIG) {
-          // bare-multisig
-          return true;
-        }
-        const mOfN = parseMultisigScript(vout.scriptpubkey_asm);
-        if (!mOfN || mOfN.n < 1 || mOfN.n > 3 || mOfN.m < 1 || mOfN.m > mOfN.n) {
-          // (non-standard bare multisig threshold)
-          return true;
-        }
-      } else if (vout.scriptpubkey_type === 'op_return') {
-        opreturnCount++;
-        if ((vout.scriptpubkey.length / 2) > MAX_OP_RETURN_RELAY) {
-          // over default datacarrier limit
-          return true;
-        }
-      }
-      // dust
-      // (we could probably hardcode this for the different output types...)
-      if (vout.scriptpubkey_type !== 'op_return') {
-        let dustSize = (vout.scriptpubkey.length / 2);
-        // add varint length overhead
-        dustSize += getVarIntLength(dustSize);
-        // add value size
-        dustSize += 8;
-        if (Common.isWitnessProgram(vout.scriptpubkey)) {
-          dustSize += 67;
-        } else {
-          dustSize += 148;
-        }
-        if (vout.value < (dustSize * DUST_RELAY_TX_FEE)) {
-          // under minimum output size
-          return true;
-        }
-      }
-    }
-
-    // multi-op-return
-    if (opreturnCount > 1) {
-      return true;
-    }
-
-    // TODO: non-mandatory-script-verify-flag
-
-    return false;
-  }
-
-  // A witness program is any valid scriptpubkey that consists of a 1-byte push opcode
-  // followed by a data push between 2 and 40 bytes.
-  // https://github.com/bitcoin/bitcoin/blob/2c79abc7ad4850e9e3ba32a04c530155cda7f980/src/script/script.cpp#L224-L240
-  static isWitnessProgram(scriptpubkey: string): false | { version: number, program: string } {
-    if (scriptpubkey.length < 8 || scriptpubkey.length > 84) {
-      return false;
-    }
-    const version = parseInt(scriptpubkey.slice(0,2), 16);
-    if (version !== 0 && version < 0x51 || version > 0x60) {
-        return false;
-    }
-    const push = parseInt(scriptpubkey.slice(2,4), 16);
-    if (push + 2 === (scriptpubkey.length / 2)) {
-      return {
-        version: version ? version - 0x50 : 0,
-        program: scriptpubkey.slice(4),
-      };
-    }
-    return false;
-  }
-
-  static getNonWitnessSize(tx: TransactionExtended): number {
-    let weight = tx.weight;
-    let hasWitness = false;
-    for (const vin of tx.vin) {
-      if (vin.witness?.length) {
-        hasWitness = true;
-        // witness count
-        weight -= getVarIntLength(vin.witness.length);
-        for (const witness of vin.witness) {
-          // witness item size + content
-          weight -= getVarIntLength(witness.length / 2) + (witness.length / 2);
-        }
-      }
-    }
-    if (hasWitness) {
-      // marker & segwit flag
-      weight -= 2;
-    }
-    return Math.ceil(weight / 4);
-  }
-
  static setSegwitSighashFlags(flags: bigint, witness: string[]): bigint {
    for (const w of witness) {
      if (this.isDERSig(w)) {
@@ -400,34 +220,16 @@ export class Common {
    ].includes(pubkey);
  }

-  static isInscription(vin, flags): bigint {
-    // in taproot, if the last witness item begins with 0x50, it's an annex
-    const hasAnnex = vin.witness?.[vin.witness.length - 1].startsWith('50');
-    // script spends have more than one witness item, not counting the annex (if present)
-    if (vin.witness.length > (hasAnnex ? 2 : 1)) {
-      // the script itself is the second-to-last witness item, not counting the annex
-      const asm = vin.inner_witnessscript_asm || transactionUtils.convertScriptSigAsm(vin.witness[vin.witness.length - (hasAnnex ? 3 : 2)]);
-      // inscriptions smuggle data within an 'OP_0 OP_IF ... OP_ENDIF' envelope
-      if (asm?.includes('OP_0 OP_IF')) {
-        flags |= TransactionFlags.inscription;
-      }
-    }
-    return flags;
-  }
-
  static getTransactionFlags(tx: TransactionExtended): number {
    let flags = tx.flags ? BigInt(tx.flags) : 0n;

    // Update variable flags (CPFP, RBF)
-    flags &= ~TransactionFlags.cpfp_child;
    if (tx.ancestors?.length) {
      flags |= TransactionFlags.cpfp_child;
    }
-    flags &= ~TransactionFlags.cpfp_parent;
    if (tx.descendants?.length) {
      flags |= TransactionFlags.cpfp_parent;
    }
-    flags &= ~TransactionFlags.replacement;
    if (tx.replacement) {
      flags |= TransactionFlags.replacement;
    }
@@ -442,11 +244,8 @@ export class Common {
      flags |= TransactionFlags.v1;
    } else if (tx.version === 2) {
      flags |= TransactionFlags.v2;
-    } else if (tx.version === 3) {
-      flags |= TransactionFlags.v3;
    }
-    const reusedInputAddresses: { [address: string ]: number } = {};
-    const reusedOutputAddresses: { [address: string ]: number } = {};
+    const reusedAddresses: { [address: string ]: number } = {};
    const inValues = {};
    const outValues = {};
    let rbf = false;
@@ -454,30 +253,27 @@ export class Common {
      if (vin.sequence < 0xfffffffe) {
        rbf = true;
      }
-      if (vin.prevout?.scriptpubkey_type) {
-        switch (vin.prevout?.scriptpubkey_type) {
-          case 'p2pk': flags |= TransactionFlags.p2pk; break;
-          case 'multisig': flags |= TransactionFlags.p2ms; break;
-          case 'p2pkh': flags |= TransactionFlags.p2pkh; break;
-          case 'p2sh': flags |= TransactionFlags.p2sh; break;
-          case 'v0_p2wpkh': flags |= TransactionFlags.p2wpkh; break;
-          case 'v0_p2wsh': flags |= TransactionFlags.p2wsh; break;
-          case 'v1_p2tr': {
-            flags |= TransactionFlags.p2tr;
-            if (vin.witness?.length) {
-              flags = Common.isInscription(vin, flags);
+      switch (vin.prevout?.scriptpubkey_type) {
+        case 'p2pk': flags |= TransactionFlags.p2pk; break;
+        case 'multisig': flags |= TransactionFlags.p2ms; break;
+        case 'p2pkh': flags |= TransactionFlags.p2pkh; break;
+        case 'p2sh': flags |= TransactionFlags.p2sh; break;
+        case 'v0_p2wpkh': flags |= TransactionFlags.p2wpkh; break;
+        case 'v0_p2wsh': flags |= TransactionFlags.p2wsh; break;
+        case 'v1_p2tr': {
+          flags |= TransactionFlags.p2tr;
+          // in taproot, if the last witness item begins with 0x50, it's an annex
+          const hasAnnex = vin.witness?.[vin.witness.length - 1].startsWith('50');
+          // script spends have more than one witness item, not counting the annex (if present)
+          if (vin.witness.length > (hasAnnex ? 2 : 1)) {
+            // the script itself is the second-to-last witness item, not counting the annex
+            const asm = vin.inner_witnessscript_asm || transactionUtils.convertScriptSigAsm(vin.witness[vin.witness.length - (hasAnnex ? 3 : 2)]);
+            // inscriptions smuggle data within an 'OP_0 OP_IF ... OP_ENDIF' envelope
+            if (asm?.includes('OP_0 OP_IF')) {
+              flags |= TransactionFlags.inscription;
            }
-          } break;
-        }
-      } else {
-        // no prevouts, optimistically check witness-bearing inputs
-        if (vin.witness?.length >= 2) {
-          try {
-            flags = Common.isInscription(vin, flags);
-          } catch {
-            // witness script parsing will fail if this isn't really a taproot output
          }
-        }
+        } break;
      }

      // sighash flags
@@ -490,7 +286,7 @@ export class Common {
      }

      if (vin.prevout?.scriptpubkey_address) {
-        reusedInputAddresses[vin.prevout?.scriptpubkey_address] = (reusedInputAddresses[vin.prevout?.scriptpubkey_address] || 0) + 1;
+        reusedAddresses[vin.prevout?.scriptpubkey_address] = (reusedAddresses[vin.prevout?.scriptpubkey_address] || 0) + 1;
      }
      inValues[vin.prevout?.value || Math.random()] = (inValues[vin.prevout?.value || Math.random()] || 0) + 1;
    }
@@ -500,14 +296,12 @@ export class Common {
      flags |= TransactionFlags.no_rbf;
    }
    let hasFakePubkey = false;
-    let P2WSHCount = 0;
-    let olgaSize = 0;
    for (const vout of tx.vout) {
      switch (vout.scriptpubkey_type) {
        case 'p2pk': {
          flags |= TransactionFlags.p2pk;
          // detect fake pubkey (i.e. not a valid DER point on the secp256k1 curve)
-          hasFakePubkey = hasFakePubkey || !isPoint(vout.scriptpubkey?.slice(2, -2));
+          hasFakePubkey = hasFakePubkey || !isPoint(vout.scriptpubkey.slice(2, -2));
        } break;
        case 'multisig': {
          flags |= TransactionFlags.p2ms;
@@ -527,21 +321,7 @@ export class Common {
        case 'op_return': flags |= TransactionFlags.op_return; break;
      }
      if (vout.scriptpubkey_address) {
-        reusedOutputAddresses[vout.scriptpubkey_address] = (reusedOutputAddresses[vout.scriptpubkey_address] || 0) + 1;
-      }
-      if (vout.scriptpubkey_type === 'v0_p2wsh') {
-        if (!P2WSHCount) {
-          olgaSize = parseInt(vout.scriptpubkey.slice(4, 8), 16);
-        }
-        P2WSHCount++;
-        if (P2WSHCount === Math.ceil((olgaSize + 2) / 32)) {
-          const nullBytes = (P2WSHCount * 32) - olgaSize - 2;
-          if (vout.scriptpubkey.endsWith(''.padEnd(nullBytes * 2, '0'))) {
-            flags |= TransactionFlags.fake_scripthash;
-          }
-        }
-      } else {
-        P2WSHCount = 0;
+        reusedAddresses[vout.scriptpubkey_address] = (reusedAddresses[vout.scriptpubkey_address] || 0) + 1;
      }
      outValues[vout.value || Math.random()] = (outValues[vout.value || Math.random()] || 0) + 1;
    }
@@ -551,7 +331,7 @@ export class Common {
    
    // fast but bad heuristic to detect possible coinjoins
    // (at least 5 inputs and 5 outputs, less than half of which are unique amounts, with no address reuse)
-    const addressReuse = Object.keys(reusedOutputAddresses).reduce((acc, key) => Math.max(acc, (reusedInputAddresses[key] || 0) + (reusedOutputAddresses[key] || 0)), 0) > 1;
+    const addressReuse = Object.values(reusedAddresses).reduce((acc, count) => Math.max(acc, count), 0) > 1;
    if (!addressReuse && tx.vin.length >= 5 && tx.vout.length >= 5 && (Object.keys(inValues).length + Object.keys(outValues).length) <= (tx.vin.length + tx.vout.length) / 2 ) {
      flags |= TransactionFlags.coinjoin;
    }
@@ -564,20 +344,11 @@ export class Common {
      flags |= TransactionFlags.batch_payout;
    }

-    if (this.isNonStandard(tx)) {
-      flags |= TransactionFlags.nonstandard;
-    }
-
    return Number(flags);
  }

  static classifyTransaction(tx: TransactionExtended): TransactionClassified {
-    let flags = 0;
-    try {
-      flags = Common.getTransactionFlags(tx);
-    } catch (e) {
-      logger.warn('Failed to add classification flags to transaction: ' + (e instanceof Error ? e.message : e));
-    }
+    const flags = Common.getTransactionFlags(tx);
    tx.flags = flags;
    return {
      ...Common.stripTransaction(tx),
@@ -597,7 +368,6 @@ export class Common {
      value: tx.vout.reduce((acc, vout) => acc + (vout.value ? vout.value : 0), 0),
      acc: tx.acceleration || undefined,
      rate: tx.effectiveFeePerVsize,
-      time: tx.firstSeen || undefined,
    };
  }

@@ -620,6 +390,69 @@ export class Common {
    }
  }

+  static setRelativesAndGetCpfpInfo(tx: MempoolTransactionExtended, memPool: { [txid: string]: MempoolTransactionExtended }): CpfpInfo {
+    const parents = this.findAllParents(tx, memPool);
+    const lowerFeeParents = parents.filter((parent) => parent.adjustedFeePerVsize < tx.effectiveFeePerVsize);
+
+    let totalWeight = (tx.adjustedVsize * 4) + lowerFeeParents.reduce((prev, val) => prev + (val.adjustedVsize * 4), 0);
+    let totalFees = tx.fee + lowerFeeParents.reduce((prev, val) => prev + val.fee, 0);
+
+    tx.ancestors = parents
+      .map((t) => {
+        return {
+          txid: t.txid,
+          weight: (t.adjustedVsize * 4),
+          fee: t.fee,
+        };
+      });
+
+    // Add high (high fee) decendant weight and fees
+    if (tx.bestDescendant) {
+      totalWeight += tx.bestDescendant.weight;
+      totalFees += tx.bestDescendant.fee;
+    }
+
+    tx.effectiveFeePerVsize = Math.max(0, totalFees / (totalWeight / 4));
+    tx.cpfpChecked = true;
+
+    return {
+      ancestors: tx.ancestors,
+      bestDescendant: tx.bestDescendant || null,
+    };
+  }
+
+
+  private static findAllParents(tx: MempoolTransactionExtended, memPool: { [txid: string]: MempoolTransactionExtended }): MempoolTransactionExtended[] {
+    let parents: MempoolTransactionExtended[] = [];
+    tx.vin.forEach((parent) => {
+      if (parents.find((p) => p.txid === parent.txid)) {
+        return;
+      }
+
+      const parentTx = memPool[parent.txid];
+      if (parentTx) {
+        if (tx.bestDescendant && tx.bestDescendant.fee / (tx.bestDescendant.weight / 4) > parentTx.adjustedFeePerVsize) {
+          if (parentTx.bestDescendant && parentTx.bestDescendant.fee < tx.fee + tx.bestDescendant.fee) {
+            parentTx.bestDescendant = {
+              weight: (tx.adjustedVsize * 4) + tx.bestDescendant.weight,
+              fee: tx.fee + tx.bestDescendant.fee,
+              txid: tx.txid,
+            };
+          }
+        } else if (tx.adjustedFeePerVsize > parentTx.adjustedFeePerVsize) {
+          parentTx.bestDescendant = {
+            weight: (tx.adjustedVsize * 4),
+            fee: tx.fee,
+            txid: tx.txid
+          };
+        }
+        parents.push(parentTx);
+        parents = parents.concat(this.findAllParents(parentTx, memPool));
+      }
+    });
+    return parents;
+  }
+
  // calculates the ratio of matched transactions to projected transactions by weight
  static getSimilarity(projectedBlock: MempoolBlockWithTransactions, transactions: TransactionExtended[]): number {
    let matchedWeight = 0;
@@ -809,6 +642,96 @@ export class Common {
    }
  }

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

@@ -816,10 +739,9 @@ export class Common {
    let medianFee = 0;
    let medianWeight = 0;

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

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

--- a/backend/src/api/cpfp.ts
+++ b/backend/src/api/cpfp.ts
@@ -1,272 +0,0 @@
-import { Ancestor, CpfpCluster, CpfpInfo, CpfpSummary, MempoolTransactionExtended, TransactionExtended } from '../mempool.interfaces';
-import { GraphTx, convertToGraphTx, expandRelativesGraph, initializeRelatives, makeBlockTemplate, mempoolComparator, removeAncestors, setAncestorScores } from './mini-miner';
-import memPool from './mempool';
-import { Acceleration } from './acceleration/acceleration';
-
-const CPFP_UPDATE_INTERVAL = 60_000; // update CPFP info at most once per 60s per transaction
-const MAX_CLUSTER_ITERATIONS = 100;
-
-export function calculateFastBlockCpfp(height: number, transactions: MempoolTransactionExtended[], saveRelatives: boolean = false): CpfpSummary {
-  const clusters: CpfpCluster[] = []; // list of all cpfp clusters in this block
-  const clusterMap: { [txid: string]: CpfpCluster } = {}; // map transactions to their cpfp cluster
-  let clusterTxs: TransactionExtended[] = []; // working list of elements of the current cluster
-  let ancestors: { [txid: string]: boolean } = {}; // working set of ancestors of the current cluster root
-  const txMap: { [txid: string]: TransactionExtended } = {};
-  // initialize the txMap
-  for (const tx of transactions) {
-    txMap[tx.txid] = tx;
-  }
-  // reverse pass to identify CPFP clusters
-  for (let i = transactions.length - 1; i >= 0; i--) {
-    const tx = transactions[i];
-    if (!ancestors[tx.txid]) {
-      let totalFee = 0;
-      let totalVSize = 0;
-      clusterTxs.forEach(tx => {
-        totalFee += tx?.fee || 0;
-        totalVSize += (tx.weight / 4);
-      });
-      const effectiveFeePerVsize = totalFee / totalVSize;
-      let cluster: CpfpCluster;
-      if (clusterTxs.length > 1) {
-        cluster = {
-          root: clusterTxs[0].txid,
-          height,
-          txs: clusterTxs.map(tx => { return { txid: tx.txid, weight: tx.weight, fee: tx.fee || 0 }; }),
-          effectiveFeePerVsize,
-        };
-        clusters.push(cluster);
-      }
-      clusterTxs.forEach(tx => {
-        txMap[tx.txid].effectiveFeePerVsize = effectiveFeePerVsize;
-        if (cluster) {
-          clusterMap[tx.txid] = cluster;
-        }
-      });
-      // reset working vars
-      clusterTxs = [];
-      ancestors = {};
-    }
-    clusterTxs.push(tx);
-    tx.vin.forEach(vin => {
-      ancestors[vin.txid] = true;
-    });
-  }
-  // forward pass to enforce ancestor rate caps
-  for (const tx of transactions) {
-    let minAncestorRate = tx.effectiveFeePerVsize;
-    for (const vin of tx.vin) {
-      if (txMap[vin.txid]?.effectiveFeePerVsize) {
-        minAncestorRate = Math.min(minAncestorRate, txMap[vin.txid].effectiveFeePerVsize);
-      }
-    }
-    // check rounded values to skip cases with almost identical fees
-    const roundedMinAncestorRate = Math.ceil(minAncestorRate);
-    const roundedEffectiveFeeRate = Math.floor(tx.effectiveFeePerVsize);
-    if (roundedMinAncestorRate < roundedEffectiveFeeRate) {
-      tx.effectiveFeePerVsize = minAncestorRate;
-      if (!clusterMap[tx.txid]) {
-        // add a single-tx cluster to record the dependent rate
-        const cluster = {
-          root: tx.txid,
-          height,
-          txs: [{ txid: tx.txid, weight: tx.weight, fee: tx.fee || 0 }],
-          effectiveFeePerVsize: minAncestorRate,
-        };
-        clusterMap[tx.txid] = cluster;
-        clusters.push(cluster);
-      } else {
-        // update the existing cluster with the dependent rate
-        clusterMap[tx.txid].effectiveFeePerVsize = minAncestorRate;
-      }
-    }
-  }
-  if (saveRelatives) {
-    for (const cluster of clusters) {
-      cluster.txs.forEach((member, index) => {
-        txMap[member.txid].descendants = cluster.txs.slice(0, index).reverse();
-        txMap[member.txid].ancestors = cluster.txs.slice(index + 1).reverse();
-        txMap[member.txid].effectiveFeePerVsize = cluster.effectiveFeePerVsize;
-      });
-    }
-  }
-  return {
-    transactions,
-    clusters,
-    version: 1,
-  };
-}
-
-export function calculateGoodBlockCpfp(height: number, transactions: MempoolTransactionExtended[], accelerations: Acceleration[]): CpfpSummary {
-  const txMap: { [txid: string]: MempoolTransactionExtended } = {};
-  for (const tx of transactions) {
-    txMap[tx.txid] = tx;
-  }
-  const template = makeBlockTemplate(transactions, accelerations, 1, Infinity, Infinity);
-  const clusters = new Map<string, string[]>();
-  for (const tx of template) {
-    const cluster = tx.cluster || [];
-    const root = cluster.length ? cluster[cluster.length - 1] : null;
-    if (cluster.length > 1 && root && !clusters.has(root)) {
-      clusters.set(root, cluster);
-    }
-    txMap[tx.txid].effectiveFeePerVsize = tx.effectiveFeePerVsize;
-  }
-
-  const clusterArray: CpfpCluster[] = [];
-
-  for (const cluster of clusters.values()) {
-    for (const txid of cluster) {
-      const mempoolTx = txMap[txid];
-      if (mempoolTx) {
-        const ancestors: Ancestor[] = [];
-        const descendants: Ancestor[] = [];
-        let matched = false;
-        cluster.forEach(relativeTxid => {
-          if (relativeTxid === txid) {
-            matched = true;
-          } else {
-            const relative = {
-              txid: relativeTxid,
-              fee: txMap[relativeTxid].fee,
-              weight: (txMap[relativeTxid].adjustedVsize * 4) || txMap[relativeTxid].weight,
-            };
-            if (matched) {
-              descendants.push(relative);
-            } else {
-              ancestors.push(relative);
-            }
-          }
-        });
-        if (mempoolTx.ancestors?.length !== ancestors.length || mempoolTx.descendants?.length !== descendants.length) {
-          mempoolTx.cpfpDirty = true;
-        }
-        Object.assign(mempoolTx, { ancestors, descendants, bestDescendant: null, cpfpChecked: true });
-      }
-    }
-    const root = cluster[cluster.length - 1];
-    clusterArray.push({
-      root: root,
-      height,
-      txs: cluster.reverse().map(txid => ({
-        txid,
-        fee: txMap[txid].fee,
-        weight: (txMap[txid].adjustedVsize * 4) || txMap[txid].weight,
-      })),
-      effectiveFeePerVsize: txMap[root].effectiveFeePerVsize,
-    });
-  }
-
-  return {
-    transactions: transactions.map(tx => txMap[tx.txid]),
-    clusters: clusterArray,
-    version: 2,
-  };
-}
-
-/**
- * Takes a mempool transaction and a copy of the current mempool, and calculates the CPFP data for
- * that transaction (and all others in the same cluster)
- */
-export function calculateMempoolTxCpfp(tx: MempoolTransactionExtended, mempool: { [txid: string]: MempoolTransactionExtended }): CpfpInfo {
-  if (tx.cpfpUpdated && Date.now() < (tx.cpfpUpdated + CPFP_UPDATE_INTERVAL)) {
-    tx.cpfpDirty = false;
-    return {
-      ancestors: tx.ancestors || [],
-      bestDescendant: tx.bestDescendant || null,
-      descendants: tx.descendants || [],
-      effectiveFeePerVsize: tx.effectiveFeePerVsize || tx.adjustedFeePerVsize || tx.feePerVsize,
-      sigops: tx.sigops,
-      fee: tx.fee,
-      adjustedVsize: tx.adjustedVsize,
-      acceleration: tx.acceleration
-    };
-  }
-
-  const ancestorMap = new Map<string, GraphTx>();
-  const graphTx = convertToGraphTx(tx, memPool.getSpendMap());
-  ancestorMap.set(tx.txid, graphTx);
-
-  const allRelatives = expandRelativesGraph(mempool, ancestorMap, memPool.getSpendMap());
-  const relativesMap = initializeRelatives(allRelatives);
-  const cluster = calculateCpfpCluster(tx.txid, relativesMap);
-
-  let totalVsize = 0;
-  let totalFee = 0;
-  for (const tx of cluster.values()) {
-    totalVsize += tx.vsize;
-    totalFee += tx.fees.base;
-  }
-  const effectiveFeePerVsize = totalFee / totalVsize;
-  for (const tx of cluster.values()) {
-    mempool[tx.txid].effectiveFeePerVsize = effectiveFeePerVsize;
-    mempool[tx.txid].ancestors = Array.from(tx.ancestors.values()).map(tx => ({ txid: tx.txid, weight: tx.weight, fee: tx.fees.base }));
-    mempool[tx.txid].descendants = Array.from(cluster.values()).filter(entry => entry.txid !== tx.txid && !tx.ancestors.has(entry.txid)).map(tx => ({ txid: tx.txid, weight: tx.weight, fee: tx.fees.base }));
-    mempool[tx.txid].bestDescendant = null;
-    mempool[tx.txid].cpfpChecked = true;
-    mempool[tx.txid].cpfpDirty = true;
-    mempool[tx.txid].cpfpUpdated = Date.now();
-  }
-
-  tx = mempool[tx.txid];
-
-  return {
-    ancestors: tx.ancestors || [],
-    bestDescendant: tx.bestDescendant || null,
-    descendants: tx.descendants || [],
-    effectiveFeePerVsize: tx.effectiveFeePerVsize || tx.adjustedFeePerVsize || tx.feePerVsize,
-    sigops: tx.sigops,
-    fee: tx.fee,
-    adjustedVsize: tx.adjustedVsize,
-    acceleration: tx.acceleration
-  };
-}
-
-/**
-   * Given a root transaction and a list of in-mempool ancestors,
-   * Calculate the CPFP cluster
-   * 
-   * @param tx
-   * @param ancestors
-   */
-function calculateCpfpCluster(txid: string, graph: Map<string, GraphTx>): Map<string, GraphTx> {
-  const tx = graph.get(txid);
-  if (!tx) {
-    return new Map<string, GraphTx>([]);
-  }
-
-  // Initialize individual & ancestor fee rates
-  graph.forEach(entry => setAncestorScores(entry));
-
-  // Sort by descending ancestor score
-  let sortedRelatives = Array.from(graph.values()).sort(mempoolComparator);
-
-  // Iterate until we reach a cluster that includes our target tx
-  let maxIterations = MAX_CLUSTER_ITERATIONS;
-  let best = sortedRelatives.shift();
-  let bestCluster = new Map<string, GraphTx>(best?.ancestors?.entries() || []);
-  while (sortedRelatives.length && best && (best.txid !== tx.txid && !best.ancestors.has(tx.txid)) && maxIterations > 0) {
-    maxIterations--;
-    if ((best && best.txid === tx.txid) || (bestCluster && bestCluster.has(tx.txid))) {
-      break;
-    } else {
-      // Remove this cluster (it doesn't include our target tx)
-      // and update scores, ancestor totals and dependencies for the survivors
-      removeAncestors(bestCluster, graph);
-
-      // re-sort
-      sortedRelatives = Array.from(graph.values()).sort(mempoolComparator);
-
-      // Grab the next highest scoring entry
-      best = sortedRelatives.shift();
-      if (best) {
-        bestCluster = new Map<string, GraphTx>(best?.ancestors?.entries() || []);
-        bestCluster.set(best?.txid, best);
-      }
-    }
-  }
-
-  bestCluster.set(tx.txid, tx);
-
-  return bestCluster;
-}
--- a/backend/src/api/database-migration.ts
+++ b/backend/src/api/database-migration.ts
@@ -7,7 +7,7 @@ import cpfpRepository from '../repositories/CpfpRepository';
 import { RowDataPacket } from 'mysql2';

 class DatabaseMigration {
-  private static currentVersion = 81;
+  private static currentVersion = 67;
  private queryTimeout = 3600_000;
  private statisticsAddedIndexed = false;
  private uniqueLogs: string[] = [];
@@ -566,140 +566,6 @@ class DatabaseMigration {
      await this.$executeQuery('ALTER TABLE `blocks_templates` ADD INDEX `version` (`version`)');
      await this.updateToSchemaVersion(67);
    }
-    
-    if (databaseSchemaVersion < 68 && config.MEMPOOL.NETWORK === "liquid") {
-      await this.$executeQuery('TRUNCATE TABLE elements_pegs');
-      await this.$executeQuery('ALTER TABLE elements_pegs ADD PRIMARY KEY (txid, txindex);');
-      await this.$executeQuery(`UPDATE state SET number = 0 WHERE name = 'last_elements_block';`);
-      // Create the federation_addresses table and add the two Liquid Federation change addresses in
-      await this.$executeQuery(this.getCreateFederationAddressesTableQuery(), await this.$checkIfTableExists('federation_addresses'));
-      await this.$executeQuery(`INSERT INTO federation_addresses (bitcoinaddress) VALUES ('bc1qxvay4an52gcghxq5lavact7r6qe9l4laedsazz8fj2ee2cy47tlqff4aj4')`); // Federation change address
-      await this.$executeQuery(`INSERT INTO federation_addresses (bitcoinaddress) VALUES ('3EiAcrzq1cELXScc98KeCswGWZaPGceT1d')`); // Federation change address
-      // Create the federation_txos table that uses the federation_addresses table as a foreign key
-      await this.$executeQuery(this.getCreateFederationTxosTableQuery(), await this.$checkIfTableExists('federation_txos'));
-      await this.$executeQuery(`INSERT INTO state VALUES('last_bitcoin_block_audit', 0, NULL);`);
-      await this.updateToSchemaVersion(68);
-    }
-
-    if (databaseSchemaVersion < 69 && config.MEMPOOL.NETWORK === 'mainnet') {
-      await this.$executeQuery(this.getCreateAccelerationsTableQuery(), await this.$checkIfTableExists('accelerations'));
-      await this.updateToSchemaVersion(69);
-    }
-
-    if (databaseSchemaVersion < 70 && config.MEMPOOL.NETWORK === 'mainnet') {
-      await this.$executeQuery('ALTER TABLE accelerations MODIFY COLUMN added DATETIME;');
-      await this.updateToSchemaVersion(70);
-    }
-
-    if (databaseSchemaVersion < 71 && config.MEMPOOL.NETWORK === 'liquid') {
-      await this.$executeQuery('TRUNCATE TABLE elements_pegs');
-      await this.$executeQuery('TRUNCATE TABLE federation_txos');
-      await this.$executeQuery('SET FOREIGN_KEY_CHECKS = 0');
-      await this.$executeQuery('TRUNCATE TABLE federation_addresses');
-      await this.$executeQuery('SET FOREIGN_KEY_CHECKS = 1');
-      await this.$executeQuery(`INSERT INTO federation_addresses (bitcoinaddress) VALUES ('bc1qxvay4an52gcghxq5lavact7r6qe9l4laedsazz8fj2ee2cy47tlqff4aj4')`); // Federation change address
-      await this.$executeQuery(`INSERT INTO federation_addresses (bitcoinaddress) VALUES ('3EiAcrzq1cELXScc98KeCswGWZaPGceT1d')`); // Federation change address
-      await this.$executeQuery(`UPDATE state SET number = 0 WHERE name = 'last_elements_block';`);
-      await this.$executeQuery(`UPDATE state SET number = 0 WHERE name = 'last_bitcoin_block_audit';`);
-      await this.$executeQuery('ALTER TABLE `federation_txos` ADD timelock INT NOT NULL DEFAULT 0');
-      await this.$executeQuery('ALTER TABLE `federation_txos` ADD expiredAt INT NOT NULL DEFAULT 0');
-      await this.$executeQuery('ALTER TABLE `federation_txos` ADD emergencyKey TINYINT NOT NULL DEFAULT 0');
-      await this.updateToSchemaVersion(71);
-    }
-
-    if (databaseSchemaVersion < 72 && isBitcoin === true) {
-      // reindex Goggles flags for mined block templates above height 832000
-      await this.$executeQuery('UPDATE blocks_summaries SET version = 0 WHERE height >= 832000;');
-      await this.updateToSchemaVersion(72);
-    }
-
-    if (databaseSchemaVersion < 73 && config.MEMPOOL.NETWORK === 'mainnet') {
-      // Clear bad data
-      await this.$executeQuery(`TRUNCATE accelerations`);
-      this.uniqueLog(logger.notice, `'accelerations' table has been truncated`);
-      await this.updateToSchemaVersion(73);
-    }
-
-    if (databaseSchemaVersion < 74 && config.MEMPOOL.NETWORK === 'mainnet') {
-      await this.$executeQuery(`INSERT INTO state(name, number) VALUE ('last_acceleration_block', 0);`);
-      await this.updateToSchemaVersion(74);
-    }
-
-    if (databaseSchemaVersion < 75) {
-      await this.$executeQuery('ALTER TABLE `prices` ADD `BGN` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `BRL` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `CNY` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `CZK` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `DKK` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `HKD` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `HRK` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `HUF` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `IDR` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `ILS` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `INR` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `ISK` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `KRW` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `MXN` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `MYR` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `NOK` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `NZD` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `PHP` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `PLN` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `RON` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `RUB` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `SEK` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `SGD` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `THB` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `TRY` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `ZAR` float DEFAULT "-1"');
-
-      if (isBitcoin === true) {
-        await this.$executeQuery('TRUNCATE hashrates');
-        await this.$executeQuery('TRUNCATE difficulty_adjustments');
-        await this.$executeQuery(`UPDATE state SET string = NULL WHERE name = 'pools_json_sha'`);
-      }
-
-      await this.updateToSchemaVersion(75);
-    }
-
-    if (databaseSchemaVersion < 76 && isBitcoin === true) {
-      await this.$executeQuery('ALTER TABLE `blocks_audits` ADD prioritized_txs JSON DEFAULT "[]"');
-      await this.updateToSchemaVersion(76);
-    }
-
-    if (databaseSchemaVersion < 77 && config.MEMPOOL.NETWORK === 'mainnet') {
-      await this.$executeQuery('ALTER TABLE `accelerations` ADD requested datetime DEFAULT NULL');
-      await this.updateToSchemaVersion(77);
-    }
-
-    if (databaseSchemaVersion < 78) {
-      await this.$executeQuery('ALTER TABLE `prices` CHANGE `time` `time` datetime NOT NULL');
-      await this.updateToSchemaVersion(78);
-    }
-
-    if (databaseSchemaVersion < 79 && config.MEMPOOL.NETWORK === 'mainnet') {
-      // Clear bad data
-      await this.$executeQuery(`TRUNCATE accelerations`);
-      this.uniqueLog(logger.notice, `'accelerations' table has been truncated`);
-      await this.$executeQuery(`
-        UPDATE state
-        SET number = 0
-        WHERE name = 'last_acceleration_block'
-      `);
-      await this.updateToSchemaVersion(79);
-    }
-
-    if (databaseSchemaVersion < 80) {
-      await this.$executeQuery('ALTER TABLE `blocks` ADD coinbase_addresses JSON DEFAULT NULL');
-      await this.updateToSchemaVersion(80);
-    }
-
-    if (databaseSchemaVersion < 81 && isBitcoin === true) {
-      await this.$executeQuery('ALTER TABLE `blocks_audits` ADD version INT NOT NULL DEFAULT 0');
-      await this.$executeQuery('ALTER TABLE `blocks_audits` ADD INDEX `version` (`version`)');
-      await this.$executeQuery('ALTER TABLE `blocks_audits` ADD unseen_txs JSON DEFAULT "[]"');
-      await this.updateToSchemaVersion(81);
-    }
  }

  /**
@@ -947,32 +813,6 @@ class DatabaseMigration {
    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;`;
  }

-  private getCreateFederationAddressesTableQuery(): string {
-    return `CREATE TABLE IF NOT EXISTS federation_addresses (
-      bitcoinaddress varchar(100) NOT NULL,
-      PRIMARY KEY (bitcoinaddress)
-    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;`;
-  }
-
-  private getCreateFederationTxosTableQuery(): string {
-    return `CREATE TABLE IF NOT EXISTS federation_txos (
-      txid varchar(65) NOT NULL,
-      txindex int(11) NOT NULL,
-      bitcoinaddress varchar(100) NOT NULL,
-      amount bigint(20) unsigned NOT NULL,
-      blocknumber int(11) unsigned NOT NULL,
-      blocktime int(11) unsigned NOT NULL,
-      unspent tinyint(1) NOT NULL,
-      lastblockupdate int(11) unsigned NOT NULL,
-      lasttimeupdate int(11) unsigned NOT NULL,
-      pegtxid varchar(65) NOT NULL,
-      pegindex int(11) NOT NULL,
-      pegblocktime int(11) unsigned NOT NULL,
-      PRIMARY KEY (txid, txindex), 
-      FOREIGN KEY (bitcoinaddress) REFERENCES federation_addresses (bitcoinaddress)
-    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;`;
-  }
-
  private getCreatePoolsTableQuery(): string {
    return `CREATE TABLE IF NOT EXISTS pools (
      id int(11) NOT NULL AUTO_INCREMENT,
@@ -1243,23 +1083,6 @@ class DatabaseMigration {
    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;`;
  }

-  private getCreateAccelerationsTableQuery(): string {
-    return `CREATE TABLE IF NOT EXISTS accelerations (
-      txid varchar(65) NOT NULL,
-      added datetime NOT NULL,
-      height int(10) NOT NULL,
-      pool smallint unsigned NULL,
-      effective_vsize int(10) NOT NULL,
-      effective_fee bigint(20) unsigned NOT NULL,
-      boost_rate float unsigned,
-      boost_cost bigint(20) unsigned NOT NULL,
-      PRIMARY KEY (txid),
-      INDEX (added),
-      INDEX (height),
-      INDEX (pool)
-    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;`;
-  }
-
  public async $blocksReindexingTruncate(): Promise<void> {
    logger.warn(`Truncating pools, blocks, hashrates and difficulty_adjustments tables for re-indexing (using '--reindex-blocks'). You can cancel this command within 5 seconds`);
    await Common.sleep$(5000);
--- a/backend/src/api/difficulty-adjustment.ts
+++ b/backend/src/api/difficulty-adjustment.ts
@@ -12,7 +12,6 @@ export interface DifficultyAdjustment {
  previousTime: number;          // Unix time in ms
  nextRetargetHeight: number;    // Block Height
  timeAvg: number;               // Duration of time in ms
-  adjustedTimeAvg;               // Expected block interval with hashrate implied over last 504 blocks
  timeOffset: number;            // (Testnet) Time since last block (cap @ 20min) in ms
  expectedBlocks: number;         // Block count
 }
@@ -81,7 +80,6 @@ export function calcBitsDifference(oldBits: number, newBits: number): number {

 export function calcDifficultyAdjustment(
  DATime: number,
-  quarterEpochTime: number | null,
  nowSeconds: number,
  blockHeight: number,
  previousRetarget: number,
@@ -102,20 +100,8 @@ export function calcDifficultyAdjustment(

  let difficultyChange = 0;
  let timeAvgSecs = blocksInEpoch ? diffSeconds / blocksInEpoch : BLOCK_SECONDS_TARGET;
-  let adjustedTimeAvgSecs = timeAvgSecs;
-
-  // for the first 504 blocks of the epoch, calculate the expected avg block interval
-  // from a sliding window over the last 504 blocks
-  if (quarterEpochTime && blocksInEpoch < 503) {
-    const timeLastEpoch = DATime - quarterEpochTime;
-    const adjustedTimeLastEpoch = timeLastEpoch * (1 + (previousRetarget / 100));
-    const adjustedTimeSpan = diffSeconds + adjustedTimeLastEpoch;
-    adjustedTimeAvgSecs = adjustedTimeSpan / 503;
-    difficultyChange = (BLOCK_SECONDS_TARGET / (adjustedTimeSpan / 504) - 1) * 100;
-  } else {
-    difficultyChange = (BLOCK_SECONDS_TARGET / (actualTimespan / (blocksInEpoch + 1)) - 1) * 100;
-  }

+  difficultyChange = (BLOCK_SECONDS_TARGET / (actualTimespan / (blocksInEpoch + 1)) - 1) * 100;
  // Max increase is x4 (+300%)
  if (difficultyChange > 300) {
    difficultyChange = 300;
@@ -140,8 +126,7 @@ export function calcDifficultyAdjustment(
  }

  const timeAvg = Math.floor(timeAvgSecs * 1000);
-  const adjustedTimeAvg = Math.floor(adjustedTimeAvgSecs * 1000);
-  const remainingTime = remainingBlocks * adjustedTimeAvg;
+  const remainingTime = remainingBlocks * timeAvg;
  const estimatedRetargetDate = remainingTime + nowSeconds * 1000;

  return {
@@ -154,7 +139,6 @@ export function calcDifficultyAdjustment(
    previousTime: DATime,
    nextRetargetHeight,
    timeAvg,
-    adjustedTimeAvg,
    timeOffset,
    expectedBlocks,
  };
@@ -171,10 +155,9 @@ class DifficultyAdjustmentApi {
      return null;
    }
    const nowSeconds = Math.floor(new Date().getTime() / 1000);
-    const quarterEpochBlockTime = blocks.getQuarterEpochBlockTime();

    return calcDifficultyAdjustment(
-      DATime, quarterEpochBlockTime, nowSeconds, blockHeight, previousRetarget,
+      DATime, nowSeconds, blockHeight, previousRetarget,
      config.MEMPOOL.NETWORK, latestBlock.timestamp
    );
  }
--- a/backend/src/api/explorer/channels.routes.ts
+++ b/backend/src/api/explorer/channels.routes.ts
@@ -54,11 +54,9 @@ class ChannelsRoutes {

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

      const channels = await channelsApi.$getChannelsForNode(req.query.public_key, index, 10, status);
--- a/backend/src/api/explorer/nodes.api.ts
+++ b/backend/src/api/explorer/nodes.api.ts
@@ -666,9 +666,7 @@ class NodesApi {
        node.last_update = null;
      }
  
-      const uniqueAddr = [...new Set(node.addresses?.map(a => a.addr))];
-      const formattedSockets = (uniqueAddr.join(',')) ?? '';
-
+      const sockets = (node.addresses?.map(a => a.addr).join(',')) ?? '';
      const query = `INSERT INTO nodes(
          public_key,
          first_seen,
@@ -697,13 +695,13 @@ class NodesApi {
        node.alias,
        this.aliasToSearchText(node.alias),
        node.color,
-        formattedSockets,
+        sockets,
        JSON.stringify(node.features),
        node.last_update,
        node.alias,
        this.aliasToSearchText(node.alias),
        node.color,
-        formattedSockets,
+        sockets,
        JSON.stringify(node.features),
      ]);
    } catch (e) {
@@ -715,9 +713,7 @@ class NodesApi {
   * Update node sockets
   */
  public async $updateNodeSockets(publicKey: string, sockets: {network: string; addr: string}[]): Promise<void> {
-    const uniqueAddr = [...new Set(sockets.map(a => a.addr))];
-
-    const formattedSockets = (uniqueAddr.join(',')) ?? '';
+    const formattedSockets = (sockets.map(a => a.addr).join(',')) ?? '';
    try {
      await DB.query(`UPDATE nodes SET sockets = ? WHERE public_key = ?`, [formattedSockets, publicKey]);
    } catch (e) {
--- a/backend/src/api/explorer/nodes.routes.ts
+++ b/backend/src/api/explorer/nodes.routes.ts
@@ -48,14 +48,6 @@ class NodesRoutes {
            '032850492ee61a5f7006a2fda6925e4b4ec3782f2b6de2ff0e439ef5a38c3b2470',
            '022c80bace98831c44c32fb69755f2b353434e0ee9e7fbda29507f7ef8abea1421',
            '02c3559c833e6f99f9ca05fe503e0b4e7524dea9121344edfd3e811101e0c28680',
-            '02b36a324fa2dd3af2a63ac65f241907882829bed5002b4e14171d25c219e0d470',
-            '0231b6e8f21f9f6c057f6bf8a812f79e396ee16a66ece91939a1576ce9fb9e87a5',
-            '034b6aac206bffcbd651b7ead1ab8a0991c945dfafe19ff27dcdeadc6843ebd15c',
-            '039c065f7e344acd969ebdd4a94550915b6f24e8782ae2be540bb96c8a4fcfb86b',
-            '03d9f9f4803fc75920f14dd13d83fbecc53229a65d4ee4cd2d86fdf211f7337576',
-            '0357fe48c4dece744f70865eda66e396aab5d05e09e1145cd3b7da83f11446d4cf',
-            '02bca4d642eda631f2c8659758e2a2868e518b93503f2bfcd767749c6530a10679',
-            '03f32c99c0bb9f62dae53671d1d300565773455248f34134cc02779b881561174e',
            '032c7c7819276c4f706a04df1a0f1e10a5495994a7be4c1d3d28ca766e5a2b957b',
            '025a7e38c2834dd843591a4d23d5f09cdeb77ddca85f673c2d944a14220ff14cf7',
            '0395e2731a1673ef21d7a16a727c4fc4d4c35a861c428ce2c819c53d2b81c8bd55',
@@ -68,14 +60,6 @@ class NodesRoutes {
            '039c14fdec2d958e3d14cebf657451bbd9e039196615785e82c917f274e3fb2205',
            '033589bbcb233ffc416cefd5437c7f37e9d7cb7942d405e39e72c4c846d9b37f18',
            '029293110441c6e2eacb57e1255bf6ef05c41a6a676fe474922d33c19f98a7d584',
-            '038eb09bed4532ff36d12acc1279f55cbe8d95212d19f809e057bb50de00051fba',
-            '027b7c0278366a0268e8bd0072b14539f6cb455a7bd588ae22d888bed541f65311',
-            '02f4dd78f6eda8838029b2cdbaaea6e875e2fa373cd348ee41a7c1bb177d3fca66',
-            '036b3fb692da214a3edaac5b67903b958f5ccd8712e09aa61b67ea7acfd94b40c2',
-            '023bc8915d308e0b65f8de6867f95960141372436fce3edad5cec3f364d6ac948f',
-            '0341690503ef21d0e203dddd9e62646380d0dfc32c499e055e7f698b9064d1c736',
-            '0355d573805c018a37a5b2288378d70e9b5b438f7394abd6f467cb9b47c90eeb93',
-            '0361aa68deb561a8b47b41165848edcccb98a1b56a5ea922d9d5b30a09bb7282ea',
            '0235ad0b56ed8c42c4354444c24e971c05e769ec0b5fb0ccea42880095dc02ea2c',
            '029700819a37afea630f80e6cc461f3fd3c4ace2598a21cfbbe64d1c78d0ee69a5',
            '02c2d8b2dbf87c7894af2f1d321290e2fe6db5446cd35323987cee98f06e2e0075',
@@ -92,14 +76,6 @@ class NodesRoutes {
            '0243348cb3741cfe2d8485fa8375c29c7bc7cbb67577c363cb6987a5e5fd0052cc',
            '02cb73e631af44bee600d80f8488a9194c9dc5c7590e575c421a070d1be05bc8e9',
            '0306f55ee631aa1e2cd4d9b2bfcbc14404faec5c541cef8b2e6f779061029d09c4',
-            '030bbbd8495561a894e301fe6ba5b22f8941fc661cc0e673e0206158231d8ac130',
-            '03ee1f08e516ed083475f39c6cae4fa1eec686d004d2f105218269e27d7f2da5a4',
-            '028c378b998f476ed22d6815c170dd2a3388a43fdf791a7cff70b9997349b8447a',
-            '036f19f044d19cb1b04f14d91b6e7e5443ce337217a8c14d43861f3e86dd07bd7f',
-            '03058d61869e8b88436493648b2e3e530627edf5a0b253c285cd565c1477a5c237',
-            '0279dfedc87b47a941f1797f2c422c03aa3108914ea6b519d76537d60860535a9a',
-            '0353486b8016761e58ec8aee7305ee58d5dc66b55ef5bd8cbaf49508f66d52d62e',
-            '03df5db8eccfabcae47ff15553cfdecb2d3f56979f43a0c3578f28d056b5e35104',
            '03ddab321b760433cbf561b615ef62ac7d318630c5f51d523aaf5395b90b751956',
            '033d92c7bfd213ef1b34c90e985fb5dc77f9ec2409d391492484e57a44c4aca1de',
            '02ad010dda54253c1eb9efe38b0760657a3b43ecad62198c359c051c9d99d45781',
@@ -112,14 +88,6 @@ class NodesRoutes {
            '038310e3a786340f2bd7770704c7ccfe560fd163d9a1c99d67894597419d12cbf7',
            '03e5e9d879b72c7d67ecd483bae023bd33e695bb32b981a4021260f7b9d62bc761',
            '028d16e1a0ace4c0c0a421536d8d32ce484dfe6e2f726b7b0e7c30f12a195f8cc7',
-            '0326cf9a4ca67a5b9cdffae57293dbd6f7c5113b93010dc6f6fe4af3afde1a1739',
-            '034867e16f62cebb8c2c2c22b91117c173bbece9c8a1e5bd001374a3699551cd8f',
-            '038dfb1f1b637a8c27e342ffc6f9feca20e0b47be3244e09ae78df4998e2ae83b9',
-            '03cb1cea3394d973355c11bc61c2f689f9d3e1c3db60d205f27770f5ad83200f77',
-            '03535447b592cbdb153189b3e06a455452b1011380cb3e6511a31090c15d8efc9f',
-            '028e90e9984d262ebfa3c23fb3f335a2ae061a0bdedee03f45f72b438d9e7d2ce3',
-            '03ee0176289dc4a6111fa5ef22eed5273758c420fbe58cc1d2d76def75dd7e640c',
-            '0370b2cd9f0eaf436d5c25c93fb39210d8cc06b31f688fc2f54418aabe394aed79',
            '02ff690d06c187ab994bf83c5a2114fe5bf50112c2c817af0f788f736be9fa2070',
            '02a9f570c51a2526a5ee85802e88f9281bed771eb66a0c8a7d898430dd5d0eae45',
            '038c3de773255d3bd7a50e31e58d423baac5c90826a74d75e64b74c95475de1097',
@@ -136,14 +104,6 @@ class NodesRoutes {
            '03229ab4b7f692753e094b93df90530150680f86b535b5183b0cffd75b3df583fc',
            '03a696eb7acde991c1be97a58a9daef416659539ae462b897f5e9ae361f990228e',
            '0248bf26cf3a63ab8870f34dc0ec9e6c8c6288cdba96ba3f026f34ec0f13ac4055',
-            '021b28ecdd782fd909705d6be354db268977b1a2ac5a5275186fc19e08bb8fca93',
-            '031bec1fbd8eb7fe94d2bda108c9c3cc8c22ecfc1c3a5c11d36f5881b01b4a81a6',
-            '03879c4f827a3188574d5757e002f574265a966d70aea942169785b31369b067d5',
-            '0228d4b5a4fd73a03967b76f8b8cb37b9d0b6e7039126a9397bb732c15bed78e9b',
-            '03f58dbb629f4427f5a1dbc02e6a7ec79345fdf13a0e4163d4f3b7aea2539cf095',
-            '021cdcb8123aa670cdfc9f43909dbb297363c093883409e9e7fc82e7267f7c72bd',
-            '02f2aa2c2b7b432a70dc4d0b04afa19d48715ed3b90594d49c1c8744f2e9ebb030',
-            '03709a02fb3ab4857689a8ea0bd489a6ab6f56f8a397be578bc6d5ad22efbe3756',
            '03fbc17549ec667bccf397ababbcb4cdc0e3394345e4773079ab2774612ec9be61',
            '03da9a8623241ccf95f19cd645c6cecd4019ac91570e976eb0a128bebbc4d8a437',
            '03ca5340cf85cb2e7cf076e489f785410838de174e40be62723e8a60972ad75144',
@@ -156,14 +116,6 @@ class NodesRoutes {
            '02b6b1640fe029e304c216951af9fbefdb23b0bdc9baaf327540d31b6107841fdf',
            '03694289827203a5b3156d753071ddd5bf92e371f5a462943f9555eef6d2d6606c',
            '0283d850db7c3e8ea7cc9c4abc7afaab12bbdf72b677dcba1d608350d2537d7d43',
-            '03b4dda7878d3b7b71ecd6d4738322c7f9a9c1fb583374d2724f4ccc4947f37570',
-            '0279a35f05b5acf159429549e56fd426685c4fec191431c58738968bbc77a39f25',
-            '03cb102d796ddcf08610cd03fae8b7a1df69ff48e9e8a152af315f9edf71762eb8',
-            '036b89526f4d5ac4c317f4fd23cb9f8e4ad844498bc7950a41114d060101d995d4',
-            '0313eade145959d7036db009fd5b0bf1947a739c7c3c790b491ec9161b94e6ad1e',
-            '02b670ca4c4bb2c5ea89c3b691da98a194cfc48fcd5c072df02a20290bddd60610',
-            '02a9196d5e08598211397a83cf013a5962b84bd61198abfdd204dff987e54f7a0d',
-            '036d015cd2f486fb38348182980b7e596e6c9733873102ea126fed7b4152be03b8',
            '02521287789f851268a39c9eccc9d6180d2c614315b583c9e6ae0addbd6d79df06',
            '0258c2a7b7f8af2585b4411b1ec945f70988f30412bb1df179de941f14d0b1bc3e',
            '03c3389ff1a896f84d921ed01a19fc99c6724ce8dc4b960cd3b7b2362b62cd60d7',
--- a/backend/src/api/liquid/elements-parser.ts
+++ b/backend/src/api/liquid/elements-parser.ts
@@ -5,12 +5,8 @@ import { Common } from '../common';
 import DB from '../../database';
 import logger from '../../logger';

-const federationChangeAddresses = ['bc1qxvay4an52gcghxq5lavact7r6qe9l4laedsazz8fj2ee2cy47tlqff4aj4', '3EiAcrzq1cELXScc98KeCswGWZaPGceT1d'];
-const auditBlockOffsetWithTip = 1; // Wait for 1 block confirmation before processing the block in the audit process to reduce the risk of reorgs
-
 class ElementsParser {
  private isRunning = false;
-  private isUtxosUpdatingRunning = false;

  constructor() { }

@@ -36,6 +32,12 @@ class ElementsParser {
    }
  }

+  public async $getPegDataByMonth(): Promise<any> {
+    const query = `SELECT SUM(amount) AS amount, DATE_FORMAT(FROM_UNIXTIME(datetime), '%Y-%m-01') AS date FROM elements_pegs GROUP BY DATE_FORMAT(FROM_UNIXTIME(datetime), '%Y%m')`;
+    const [rows] = await DB.query(query);
+    return rows;
+  }
+
  protected async $parseBlock(block: IBitcoinApi.Block) {
    for (const tx of block.tx) {
      await this.$parseInputs(tx, block);
@@ -53,30 +55,29 @@ class ElementsParser {

  protected async $parsePegIn(input: IBitcoinApi.Vin, vindex: number, txid: string, block: IBitcoinApi.Block) {
    const bitcoinTx: IBitcoinApi.Transaction = await bitcoinSecondClient.getRawTransaction(input.txid, true);
-    const bitcoinBlock: IBitcoinApi.Block = await bitcoinSecondClient.getBlock(bitcoinTx.blockhash);
    const prevout = bitcoinTx.vout[input.vout || 0];
    const outputAddress = prevout.scriptPubKey.address || (prevout.scriptPubKey.addresses && prevout.scriptPubKey.addresses[0]) || '';
    await this.$savePegToDatabase(block.height, block.time, prevout.value * 100000000, txid, vindex,
-      outputAddress, bitcoinTx.txid, prevout.n, bitcoinBlock.height, bitcoinBlock.time, 1);
+      outputAddress, bitcoinTx.txid, prevout.n, 1);
  }

  protected async $parseOutputs(tx: IBitcoinApi.Transaction, block: IBitcoinApi.Block) {
    for (const output of tx.vout) {
      if (output.scriptPubKey.pegout_chain) {
        await this.$savePegToDatabase(block.height, block.time, 0 - output.value * 100000000, tx.txid, output.n,
-          (output.scriptPubKey.pegout_address || ''), '', 0, 0, 0, 0);
+          (output.scriptPubKey.pegout_addresses && output.scriptPubKey.pegout_addresses[0] || ''), '', 0, 0);
      }
      if (!output.scriptPubKey.pegout_chain && output.scriptPubKey.type === 'nulldata'
        && output.value && output.value > 0 && output.asset && output.asset === Common.nativeAssetId) {
        await this.$savePegToDatabase(block.height, block.time, 0 - output.value * 100000000, tx.txid, output.n,
-          (output.scriptPubKey.pegout_address || ''), '', 0, 0, 0, 1);
+          (output.scriptPubKey.pegout_addresses && output.scriptPubKey.pegout_addresses[0] || ''), '', 0, 1);
      }
    }
  }

  protected async $savePegToDatabase(height: number, blockTime: number, amount: number, txid: string,
-    txindex: number, bitcoinaddress: string, bitcointxid: string, bitcoinindex: number, bitcoinblock: number, bitcoinBlockTime: number, final_tx: number): Promise<void> {
-    const query = `INSERT IGNORE INTO elements_pegs(
+    txindex: number, bitcoinaddress: string, bitcointxid: string, bitcoinindex: number, final_tx: number): Promise<void> {
+    const query = `INSERT INTO elements_pegs(
        block, datetime, amount, txid, txindex, bitcoinaddress, bitcointxid, bitcoinindex, final_tx
      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`;

@@ -84,22 +85,7 @@ class ElementsParser {
      height, blockTime, amount, txid, txindex, bitcoinaddress, bitcointxid, bitcoinindex, final_tx
    ];
    await DB.query(query, params);
-    logger.debug(`Saved L-BTC peg from Liquid block height #${height} with TXID ${txid}.`);
-
-    if (amount > 0) { // Peg-in
-  
-      // Add the address to the federation addresses table
-      await DB.query(`INSERT IGNORE INTO federation_addresses (bitcoinaddress) VALUES (?)`, [bitcoinaddress]);
-
-      // Add the UTXO to the federation txos table
-      const query_utxos = `INSERT IGNORE INTO federation_txos (txid, txindex, bitcoinaddress, amount, blocknumber, blocktime, unspent, lastblockupdate, lasttimeupdate, timelock, expiredAt, emergencyKey, pegtxid, pegindex, pegblocktime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`;
-      const params_utxos: (string | number)[] = [bitcointxid, bitcoinindex, bitcoinaddress, amount, bitcoinblock, bitcoinBlockTime, 1, bitcoinblock - 1, 0, 4032, 0, 0, txid, txindex, blockTime];
-      await DB.query(query_utxos, params_utxos);
-      const [minBlockUpdate] = await DB.query(`SELECT MIN(lastblockupdate) AS lastblockupdate FROM federation_txos WHERE unspent = 1`)
-      await this.$saveLastBlockAuditToDatabase(minBlockUpdate[0]['lastblockupdate']);
-      logger.debug(`Saved new Federation UTXO ${bitcointxid}:${bitcoinindex} belonging to ${bitcoinaddress} to federation txos`);
-
-    }
+    logger.debug(`Saved L-BTC peg from block height #${height} with TXID ${txid}.`);
  }

  protected async $getLatestBlockHeightFromDatabase(): Promise<number> {
@@ -112,382 +98,6 @@ class ElementsParser {
    const query = `UPDATE state SET number = ? WHERE name = 'last_elements_block'`;
    await DB.query(query, [blockHeight]);
  }
-
-  ///////////// FEDERATION AUDIT //////////////
-
-  public async $updateFederationUtxos() {
-    if (this.isUtxosUpdatingRunning) {
-      return;
-    }
-
-    this.isUtxosUpdatingRunning = true;
-
-    try {
-      let auditProgress = await this.$getAuditProgress();
-      // If no peg in transaction was found in the database, return
-      if (!auditProgress.lastBlockAudit) {
-        logger.debug(`No Federation UTXOs found in the database. Waiting for some to be confirmed before starting the Federation UTXOs audit`);
-        this.isUtxosUpdatingRunning = false;
-        return;
-      }
-
-      const bitcoinBlocksToSync = await this.$getBitcoinBlockchainState();
-      // If the bitcoin blockchain is not synced yet, return
-      if (bitcoinBlocksToSync.bitcoinHeaders > bitcoinBlocksToSync.bitcoinBlocks + 1) {
-        logger.debug(`Bitcoin client is not synced yet. ${bitcoinBlocksToSync.bitcoinHeaders - bitcoinBlocksToSync.bitcoinBlocks} blocks remaining to sync before the Federation audit process can start`);
-        this.isUtxosUpdatingRunning = false;
-        return;
-      }
-
-      auditProgress.lastBlockAudit++;
-
-      // Logging
-      let indexedThisRun = 0;
-      let timer = Date.now() / 1000;
-      const startedAt = Date.now() / 1000;
-      const indexingSpeeds: number[] = [];
-
-      while (auditProgress.lastBlockAudit <= auditProgress.confirmedTip) {
-
-        // First, get the current UTXOs that need to be scanned in the block
-        const utxos = await this.$getFederationUtxosToScan(auditProgress.lastBlockAudit);
-
-        // Get the peg-out addresses that need to be scanned
-        const redeemAddresses = await this.$getRedeemAddressesToScan();
-
-        // The fast way: check if these UTXOs are still unspent as of the current block with gettxout
-        let spentAsTip: any[];
-        let unspentAsTip: any[];
-        if (auditProgress.confirmedTip - auditProgress.lastBlockAudit <= 150) { // If the audit status is not too far in the past, we can use gettxout (fast way)
-          const utxosToParse = await this.$getFederationUtxosToParse(utxos);
-          spentAsTip = utxosToParse.spentAsTip;
-          unspentAsTip = utxosToParse.unspentAsTip;
-          logger.debug(`Found ${utxos.length} Federation UTXOs and ${redeemAddresses.length} Peg-Out Addresses to scan in Bitcoin block height #${auditProgress.lastBlockAudit} / #${auditProgress.confirmedTip}`);
-          logger.debug(`${unspentAsTip.length} / ${utxos.length} Federation UTXOs are unspent as of tip`);
-        } else { // If the audit status is too far in the past, it is useless and wasteful to look for still unspent txos since they will all be spent as of the tip
-          spentAsTip = utxos;
-          unspentAsTip = [];
-
-          // Logging
-          const elapsedSeconds = (Date.now() / 1000) - timer;
-          if (elapsedSeconds > 5) {
-            const runningFor = (Date.now() / 1000) - startedAt;
-            const blockPerSeconds = indexedThisRun / elapsedSeconds;
-            indexingSpeeds.push(blockPerSeconds);
-            if (indexingSpeeds.length > 100) indexingSpeeds.shift(); // Keep the length of the up to 100 last indexing speeds
-            const meanIndexingSpeed = indexingSpeeds.reduce((a, b) => a + b, 0) / indexingSpeeds.length;
-            const eta = (auditProgress.confirmedTip - auditProgress.lastBlockAudit) / meanIndexingSpeed;
-            logger.debug(`Scanning ${utxos.length} Federation UTXOs and ${redeemAddresses.length} Peg-Out Addresses at Bitcoin block height #${auditProgress.lastBlockAudit} / #${auditProgress.confirmedTip} | ~${meanIndexingSpeed.toFixed(2)} blocks/sec | elapsed: ${(runningFor / 60).toFixed(0)} minutes | ETA: ${(eta / 60).toFixed(0)} minutes`);
-            timer = Date.now() / 1000;
-            indexedThisRun = 0;
-          }
-        }
-
-        // The slow way: parse the block to look for the spending tx
-        const blockHash: IBitcoinApi.ChainTips = await bitcoinSecondClient.getBlockHash(auditProgress.lastBlockAudit);
-        const block: IBitcoinApi.Block = await bitcoinSecondClient.getBlock(blockHash, 2);
-        await this.$parseBitcoinBlock(block, spentAsTip, unspentAsTip, auditProgress.confirmedTip, redeemAddresses);
-
-        // Finally, update the lastblockupdate of the remaining UTXOs and save to the database
-        const [minBlockUpdate] = await DB.query(`SELECT MIN(lastblockupdate) AS lastblockupdate FROM federation_txos WHERE unspent = 1`)
-        await this.$saveLastBlockAuditToDatabase(minBlockUpdate[0]['lastblockupdate']);
-
-        auditProgress = await this.$getAuditProgress();
-        auditProgress.lastBlockAudit++;
-        indexedThisRun++;
-      }
-
-      this.isUtxosUpdatingRunning = false;
-    } catch (e) {
-      this.isUtxosUpdatingRunning = false;
-      throw new Error(e instanceof Error ? e.message : 'Error');
-    } 
-  }
-
-  // Get the UTXOs that need to be scanned in block height (UTXOs that were last updated in the block height - 1)
-  protected async $getFederationUtxosToScan(height: number) { 
-    const query = `SELECT txid, txindex, bitcoinaddress, amount, blocknumber, timelock, expiredAt FROM federation_txos WHERE lastblockupdate = ? AND unspent = 1`;
-    const [rows] = await DB.query(query, [height - 1]);
-    return rows as any[];
-  }
-
-  // Returns the UTXOs that are spent as of tip and need to be scanned
-  protected async $getFederationUtxosToParse(utxos: any[]): Promise<any> {
-    const spentAsTip: any[] = [];
-    const unspentAsTip: any[] = [];
-
-    for (const utxo of utxos) {
-      const result = await bitcoinSecondClient.getTxOut(utxo.txid, utxo.txindex, false);
-      result ? unspentAsTip.push(utxo) : spentAsTip.push(utxo);
-    }
-    
-    return {spentAsTip, unspentAsTip};
-  }
-
-  protected async $parseBitcoinBlock(block: IBitcoinApi.Block, spentAsTip: any[], unspentAsTip: any[], confirmedTip: number, redeemAddressesData: any[] = []) {
-    const redeemAddresses: string[] = redeemAddressesData.map(redeemAddress => redeemAddress.bitcoinaddress);
-    for (const tx of block.tx) {
-      let mightRedeemInThisTx = false;
-      // Check if the Federation UTXOs that was spent as of tip are spent in this block
-      for (const input of tx.vin) {
-        const txo = spentAsTip.find(txo => txo.txid === input.txid && txo.txindex === input.vout);
-        if (txo) {
-          mightRedeemInThisTx = true; // A Federation UTXO is spent in this block: we might find a peg-out address in the outputs
-          if (txo.expiredAt > 0 ) {
-            if (input.txinwitness?.length !== 13) { // Check if the witness data of the input contains the 11 signatures: if it doesn't, emergency keys are being used
-              await DB.query(`UPDATE federation_txos SET unspent = 0, lastblockupdate = ?, lasttimeupdate = ?, emergencyKey = 1 WHERE txid = ? AND txindex = ?`, [block.height, block.time, txo.txid, txo.txindex]);
-              logger.debug(`Expired Federation UTXO ${txo.txid}:${txo.txindex} (${txo.amount} sats) was spent in block ${block.height} using emergency keys!`);
-             } else {
-              await DB.query(`UPDATE federation_txos SET unspent = 0, lastblockupdate = ?, lasttimeupdate = ? WHERE txid = ? AND txindex = ?`, [block.height, block.time, txo.txid, txo.txindex]);
-              logger.debug(`Expired Federation UTXO ${txo.txid}:${txo.txindex} (${txo.amount} sats) was spent in block ${block.height} using regular 11-of-15 signatures`);
-            }
-          } else {
-            await DB.query(`UPDATE federation_txos SET unspent = 0, lastblockupdate = ?, lasttimeupdate = ? WHERE txid = ? AND txindex = ?`, [block.height, block.time, txo.txid, txo.txindex]);
-            logger.debug(`Federation UTXO ${txo.txid}:${txo.txindex} (${txo.amount} sats) was spent in block ${block.height}`);
-          }
-          // Remove the TXO from the utxo array
-          spentAsTip.splice(spentAsTip.indexOf(txo), 1);
-        }
-      }
-      // Check if an output is sent to a change address of the federation
-      for (const output of tx.vout) {
-        if (output.scriptPubKey.address && federationChangeAddresses.includes(output.scriptPubKey.address)) {
-          // Check that the UTXO was not already added in the DB by previous scans
-          const [rows_check] = await DB.query(`SELECT txid FROM federation_txos WHERE txid = ? AND txindex = ?`, [tx.txid, output.n]) as any[];
-          if (rows_check.length === 0) {
-            const timelock = output.scriptPubKey.address === federationChangeAddresses[0] ? 4032 : 2016; // P2WSH change address has a 4032 timelock, P2SH change address has a 2016 timelock
-            const query_utxos = `INSERT INTO federation_txos (txid, txindex, bitcoinaddress, amount, blocknumber, blocktime, unspent, lastblockupdate, lasttimeupdate, timelock, expiredAt, emergencyKey, pegtxid, pegindex, pegblocktime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`;
-            const params_utxos: (string | number)[] = [tx.txid, output.n, output.scriptPubKey.address, output.value * 100000000, block.height, block.time, 1, block.height, 0, timelock, 0, 0, '', 0, 0];
-            await DB.query(query_utxos, params_utxos);
-            // Add the UTXO to the utxo array
-            spentAsTip.push({
-              txid: tx.txid,
-              txindex: output.n,
-              bitcoinaddress: output.scriptPubKey.address,
-              amount: output.value * 100000000,
-              blocknumber: block.height,
-              timelock: timelock,
-              expiredAt: 0,
-            });
-            logger.debug(`Added new Federation UTXO ${tx.txid}:${output.n} (${Math.round(output.value * 100000000)} sats), change address: ${output.scriptPubKey.address}`);
-          }
-        }
-        if (mightRedeemInThisTx && output.scriptPubKey.address && redeemAddresses.includes(output.scriptPubKey.address)) {
-          // Find the number of times output.scriptPubKey.address appears in redeemAddresses. There can be address reuse for peg-outs...
-          const matchingAddress: any[] = redeemAddressesData.filter(redeemAddress => redeemAddress.bitcoinaddress === output.scriptPubKey.address && -redeemAddress.amount === Math.round(output.value * 100000000));
-          if (matchingAddress.length > 0) {
-            if (matchingAddress.length > 1) {
-              // If there are more than one peg out address with the same amount, we can't know which one redeemed the UTXO: we take the oldest one
-              matchingAddress.sort((a, b) => a.datetime - b.datetime);
-              logger.debug(`Found redeem txid ${tx.txid}:${output.n} to peg-out address ${matchingAddress[0].bitcoinaddress}, amount ${matchingAddress[0].amount}, datetime ${matchingAddress[0].datetime}`);
-            } else {
-              logger.debug(`Found redeem txid ${tx.txid}:${output.n} to peg-out address ${matchingAddress[0].bitcoinaddress}, amount ${matchingAddress[0].amount}`);
-            }
-            const query_add_redeem = `UPDATE elements_pegs SET bitcointxid = ?, bitcoinindex = ? WHERE bitcoinaddress = ? AND amount = ? AND datetime = ?`;
-            const params_add_redeem: (string | number)[] = [tx.txid, output.n, matchingAddress[0].bitcoinaddress, matchingAddress[0].amount, matchingAddress[0].datetime];
-            await DB.query(query_add_redeem, params_add_redeem);
-            const index = redeemAddressesData.indexOf(matchingAddress[0]);
-            redeemAddressesData.splice(index, 1);
-            redeemAddresses.splice(index, 1);
-          } else { // The output amount does not match the peg-out amount... log it
-            logger.debug(`Found redeem txid ${tx.txid}:${output.n} to peg-out address ${output.scriptPubKey.address} but output amount ${Math.round(output.value * 100000000)} does not match the peg-out amount!`);
-          }
-        }
-      }
-    }
-
-    for (const utxo of spentAsTip) {   
-      if (utxo.expiredAt === 0 && block.height >= utxo.blocknumber + utxo.timelock) { // The UTXO is expiring in this block
-        await DB.query(`UPDATE federation_txos SET lastblockupdate = ?, expiredAt = ? WHERE txid = ? AND txindex = ?`, [block.height, block.time, utxo.txid, utxo.txindex]);
-      } else {
-        await DB.query(`UPDATE federation_txos SET lastblockupdate = ? WHERE txid = ? AND txindex = ?`, [block.height, utxo.txid, utxo.txindex]);
-      }
-    }
-
-    for (const utxo of unspentAsTip) {
-      if (utxo.expiredAt === 0 && block.height >= utxo.blocknumber + utxo.timelock) { // The UTXO is expiring in this block
-        await DB.query(`UPDATE federation_txos SET unspent = 0, lastblockupdate = ?, expiredAt = ? WHERE txid = ? AND txindex = ?`, [confirmedTip, block.time, utxo.txid, utxo.txindex]);
-      } else if (utxo.expiredAt === 0 && confirmedTip >= utxo.blocknumber + utxo.timelock) { // The UTXO is expiring before the tip: we need to keep track of it
-        await DB.query(`UPDATE federation_txos SET lastblockupdate = ? WHERE txid = ? AND txindex = ?`, [utxo.blocknumber + utxo.timelock - 1, utxo.txid, utxo.txindex]); 
-      } else {
-      await DB.query(`UPDATE federation_txos SET lastblockupdate = ? WHERE txid = ? AND txindex = ?`, [confirmedTip, utxo.txid, utxo.txindex]);
-      }
-    }
-  }
-
-  protected async $saveLastBlockAuditToDatabase(blockHeight: number) {
-    const query = `UPDATE state SET number = ? WHERE name = 'last_bitcoin_block_audit'`;
-    await DB.query(query, [blockHeight]);
-  }
-
-  // Get the bitcoin block where the audit process was last updated
-  protected async $getAuditProgress(): Promise<any> {
-    const lastblockaudit = await this.$getLastBlockAudit();
-    const bitcoinBlocksToSync = await this.$getBitcoinBlockchainState();
-    return {
-      lastBlockAudit: lastblockaudit,
-      confirmedTip: bitcoinBlocksToSync.bitcoinBlocks - auditBlockOffsetWithTip,
-    };
-  }
-
-  // Get the bitcoin blocks remaining to be synced
-  protected async $getBitcoinBlockchainState(): Promise<any> {
-    const result = await bitcoinSecondClient.getBlockchainInfo();
-    return {
-      bitcoinBlocks: result.blocks,
-      bitcoinHeaders: result.headers,
-    }
-  }
-
-  protected async $getLastBlockAudit(): Promise<number> {
-    const query = `SELECT number FROM state WHERE name = 'last_bitcoin_block_audit'`;
-    const [rows] = await DB.query(query);
-    return rows[0]['number'];
-  }
-
-  protected async $getRedeemAddressesToScan(): Promise<any[]> {
-    const query = `SELECT datetime, amount, bitcoinaddress FROM elements_pegs where amount < 0 AND bitcoinaddress != '' AND bitcointxid = '';`;
-    const [rows]: any[] = await DB.query(query);
-    return rows;
-  }
-
-  protected isDust(amount: number, feeRate: number): boolean {
-    return amount <= (450 * feeRate); // A P2WSH 11-of-15 multisig input is around 450 bytes
-  }
-
-  ///////////// DATA QUERY //////////////
-
-  public async $getAuditStatus(): Promise<any> {
-    const lastBlockAudit = await this.$getLastBlockAudit();
-    const bitcoinBlocksToSync = await this.$getBitcoinBlockchainState();
-    return {
-      bitcoinBlocks: bitcoinBlocksToSync.bitcoinBlocks,
-      bitcoinHeaders: bitcoinBlocksToSync.bitcoinHeaders,
-      lastBlockAudit: lastBlockAudit,
-      isAuditSynced: bitcoinBlocksToSync.bitcoinHeaders - bitcoinBlocksToSync.bitcoinBlocks <= 2 && bitcoinBlocksToSync.bitcoinBlocks - lastBlockAudit <= 3,
-    };
-  }
-
-  public async $getPegDataByMonth(): Promise<any> {
-    const query = `SELECT SUM(amount) AS amount, DATE_FORMAT(FROM_UNIXTIME(datetime), '%Y-%m-01') AS date FROM elements_pegs GROUP BY DATE_FORMAT(FROM_UNIXTIME(datetime), '%Y%m')`;
-    const [rows] = await DB.query(query);
-    return rows;
-  }
-
-  public async $getFederationReservesByMonth(): Promise<any> {
-    const query = `
-    SELECT SUM(amount) AS amount, DATE_FORMAT(FROM_UNIXTIME(blocktime), '%Y-%m-01') AS date FROM federation_txos 
-    WHERE
-        (blocktime > UNIX_TIMESTAMP(LAST_DAY(FROM_UNIXTIME(blocktime) - INTERVAL 1 MONTH) + INTERVAL 1 DAY))
-      AND 
-        ((unspent = 1) OR (unspent = 0 AND lasttimeupdate > UNIX_TIMESTAMP(LAST_DAY(FROM_UNIXTIME(blocktime)) + INTERVAL 1 DAY)))
-      AND 
-        (expiredAt = 0 OR expiredAt > UNIX_TIMESTAMP(LAST_DAY(FROM_UNIXTIME(blocktime)) + INTERVAL 1 DAY))
-    GROUP BY 
-        date;`;          
-    const [rows] = await DB.query(query);
-    return rows;
-  }
-
-  // Get the current L-BTC pegs and the last Liquid block it was updated
-  public async $getCurrentLbtcSupply(): Promise<any> {
-    const [rows] = await DB.query(`SELECT SUM(amount) AS LBTC_supply FROM elements_pegs;`);
-    const lastblockupdate = await this.$getLatestBlockHeightFromDatabase();
-    const hash = await bitcoinClient.getBlockHash(lastblockupdate);
-    return {
-      amount: rows[0]['LBTC_supply'],
-      lastBlockUpdate: lastblockupdate,
-      hash: hash
-    };
-  }
-
-  // Get the current reserves of the federation and the last Bitcoin block it was updated
-  public async $getCurrentFederationReserves(): Promise<any> {
-    const [rows] = await DB.query(`SELECT SUM(amount) AS total_balance FROM federation_txos WHERE unspent = 1 AND expiredAt = 0;`);
-    const lastblockaudit = await this.$getLastBlockAudit();
-    const hash = await bitcoinSecondClient.getBlockHash(lastblockaudit);
-    return {
-      amount: rows[0]['total_balance'],
-      lastBlockUpdate: lastblockaudit,
-      hash: hash
-    };
-  }
-
-  // Get all of the federation addresses, most balances first
-  public async $getFederationAddresses(): Promise<any> {
-    const query = `SELECT bitcoinaddress, SUM(amount) AS balance FROM federation_txos WHERE unspent = 1 AND expiredAt = 0 GROUP BY bitcoinaddress ORDER BY balance DESC;`;
-    const [rows] = await DB.query(query);
-    return rows;
-  }
-
-  // Get all of the UTXOs held by the federation, most recent first
-  public async $getFederationUtxos(): Promise<any> {
-    const query = `SELECT txid, txindex, bitcoinaddress, amount, blocknumber, blocktime, pegtxid, pegindex, pegblocktime, timelock, expiredAt FROM federation_txos WHERE unspent = 1 AND expiredAt = 0 ORDER BY blocktime DESC;`;
-    const [rows] = await DB.query(query);
-    return rows;
-  }
-
-  // Get expired UTXOs, most recent first
-  public async $getExpiredUtxos(): Promise<any> {
-    const query = `SELECT txid, txindex, bitcoinaddress, amount, blocknumber, blocktime, pegtxid, pegindex, pegblocktime, timelock, expiredAt FROM federation_txos WHERE unspent = 1 AND expiredAt > 0 ORDER BY blocktime DESC;`;
-    const [rows]: any[] = await DB.query(query);
-    const feeRate = Math.round((await bitcoinSecondClient.estimateSmartFee(1)).feerate * 100000000 / 1000);
-    for (const row of rows) {
-      row.isDust = this.isDust(row.amount, feeRate);
-    }
-    return rows;
-  }
-
-    // Get utxos that were spent using emergency keys
-    public async $getEmergencySpentUtxos(): Promise<any> {
-      const query = `SELECT txid, txindex, bitcoinaddress, amount, blocknumber, blocktime, pegtxid, pegindex, pegblocktime, timelock, expiredAt FROM federation_txos WHERE emergencyKey = 1 ORDER BY blocktime DESC;`;
-      const [rows] = await DB.query(query);
-      return rows;
-    }
-  
-  // Get the total number of federation addresses
-  public async $getFederationAddressesNumber(): Promise<any> {
-    const query = `SELECT COUNT(DISTINCT bitcoinaddress) AS address_count FROM federation_txos WHERE unspent = 1 AND expiredAt = 0;`;
-    const [rows] = await DB.query(query);
-    return rows[0];
-  }
-
-  // Get the total number of federation utxos
-  public async $getFederationUtxosNumber(): Promise<any> {
-    const query = `SELECT COUNT(*) AS utxo_count FROM federation_txos WHERE unspent = 1 AND expiredAt = 0;`;
-    const [rows] = await DB.query(query);
-    return rows[0];
-  }
-
-  // Get the total number of emergency spent utxos and their total amount
-  public async $getEmergencySpentUtxosStats(): Promise<any> {
-    const query = `SELECT COUNT(*) AS utxo_count, SUM(amount) AS total_amount FROM federation_txos WHERE emergencyKey = 1;`;
-    const [rows] = await DB.query(query);
-    return rows[0];
-  }
-
-  // Get recent pegs in / out
-  public async $getPegsList(count: number = 0): Promise<any> {
-    const query = `SELECT txid, txindex, amount, bitcoinaddress, bitcointxid, bitcoinindex, datetime AS blocktime FROM elements_pegs ORDER BY block DESC LIMIT 15 OFFSET ?;`;
-    const [rows] = await DB.query(query, [count]);
-    return rows;
-  }
-
-  // Get all peg in / out from the last month
-  public async $getPegsVolumeDaily(): Promise<any> {
-    const pegInQuery = await DB.query(`SELECT SUM(amount) AS volume, COUNT(*) AS number FROM elements_pegs WHERE amount > 0 and datetime > UNIX_TIMESTAMP(TIMESTAMPADD(DAY, -1, CURRENT_TIMESTAMP()));`);
-    const pegOutQuery = await DB.query(`SELECT SUM(amount) AS volume, COUNT(*) AS number FROM elements_pegs WHERE amount < 0 and datetime > UNIX_TIMESTAMP(TIMESTAMPADD(DAY, -1, CURRENT_TIMESTAMP()));`);
-    return [
-      pegInQuery[0][0],
-      pegOutQuery[0][0]
-    ];
-  }
-
-  // Get the total pegs number
-  public async $getPegsCount(): Promise<any> {
-    const [rows] = await DB.query(`SELECT COUNT(*) AS pegs_count FROM elements_pegs;`);
-    return rows[0];
-  }
 }

 export default new ElementsParser();
--- a/backend/src/api/liquid/liquid.routes.ts
+++ b/backend/src/api/liquid/liquid.routes.ts
@@ -15,21 +15,7 @@ class LiquidRoutes {
    
    if (config.DATABASE.ENABLED) {
      app
-        .get(config.MEMPOOL.API_URL_PREFIX + 'liquid/pegs', this.$getElementsPegs)
        .get(config.MEMPOOL.API_URL_PREFIX + 'liquid/pegs/month', this.$getElementsPegsByMonth)
-        .get(config.MEMPOOL.API_URL_PREFIX + 'liquid/pegs/list/:count', this.$getPegsList)
-        .get(config.MEMPOOL.API_URL_PREFIX + 'liquid/pegs/volume', this.$getPegsVolumeDaily)
-        .get(config.MEMPOOL.API_URL_PREFIX + 'liquid/pegs/count', this.$getPegsCount)
-        .get(config.MEMPOOL.API_URL_PREFIX + 'liquid/reserves', this.$getFederationReserves)
-        .get(config.MEMPOOL.API_URL_PREFIX + 'liquid/reserves/month', this.$getFederationReservesByMonth)
-        .get(config.MEMPOOL.API_URL_PREFIX + 'liquid/reserves/addresses', this.$getFederationAddresses)
-        .get(config.MEMPOOL.API_URL_PREFIX + 'liquid/reserves/addresses/total', this.$getFederationAddressesNumber)
-        .get(config.MEMPOOL.API_URL_PREFIX + 'liquid/reserves/utxos', this.$getFederationUtxos)
-        .get(config.MEMPOOL.API_URL_PREFIX + 'liquid/reserves/utxos/total', this.$getFederationUtxosNumber)
-        .get(config.MEMPOOL.API_URL_PREFIX + 'liquid/reserves/utxos/expired', this.$getExpiredUtxos)
-        .get(config.MEMPOOL.API_URL_PREFIX + 'liquid/reserves/utxos/emergency-spent', this.$getEmergencySpentUtxos)
-        .get(config.MEMPOOL.API_URL_PREFIX + 'liquid/reserves/utxos/emergency-spent/stats', this.$getEmergencySpentUtxosStats)
-        .get(config.MEMPOOL.API_URL_PREFIX + 'liquid/reserves/status', this.$getFederationAuditStatus)
        ;
    }
  }
@@ -77,183 +63,11 @@ class LiquidRoutes {
  private async $getElementsPegsByMonth(req: Request, res: Response) {
    try {
      const pegs = await elementsParser.$getPegDataByMonth();
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 60 * 60).toUTCString());
      res.json(pegs);
    } catch (e) {
      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }
-
-  private async $getFederationReservesByMonth(req: Request, res: Response) {
-    try {
-      const reserves = await elementsParser.$getFederationReservesByMonth();
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 60 * 60).toUTCString());
-      res.json(reserves);
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
-  private async $getElementsPegs(req: Request, res: Response) {
-    try {
-      const currentSupply = await elementsParser.$getCurrentLbtcSupply();
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 30).toUTCString());
-      res.json(currentSupply);
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
-  private async $getFederationReserves(req: Request, res: Response) {
-    try {
-      const currentReserves = await elementsParser.$getCurrentFederationReserves();
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 30).toUTCString());
-      res.json(currentReserves);
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
-  private async $getFederationAuditStatus(req: Request, res: Response) {
-    try {
-      const auditStatus = await elementsParser.$getAuditStatus();
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 30).toUTCString());
-      res.json(auditStatus);
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
-  private async $getFederationAddresses(req: Request, res: Response) {
-    try {
-      const federationAddresses = await elementsParser.$getFederationAddresses();
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 30).toUTCString());
-      res.json(federationAddresses);
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
-  private async $getFederationAddressesNumber(req: Request, res: Response) {
-    try {
-      const federationAddresses = await elementsParser.$getFederationAddressesNumber();
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 30).toUTCString());
-      res.json(federationAddresses);
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
-  private async $getFederationUtxos(req: Request, res: Response) {
-    try {
-      const federationUtxos = await elementsParser.$getFederationUtxos();
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 30).toUTCString());
-      res.json(federationUtxos);
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
-  private async $getExpiredUtxos(req: Request, res: Response) {
-    try {
-      const expiredUtxos = await elementsParser.$getExpiredUtxos();
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 30).toUTCString());
-      res.json(expiredUtxos);
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
-  private async $getFederationUtxosNumber(req: Request, res: Response) {
-    try {
-      const federationUtxos = await elementsParser.$getFederationUtxosNumber();
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 30).toUTCString());
-      res.json(federationUtxos);
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
-  private async $getEmergencySpentUtxos(req: Request, res: Response) {
-    try {
-      const emergencySpentUtxos = await elementsParser.$getEmergencySpentUtxos();
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 30).toUTCString());
-      res.json(emergencySpentUtxos);
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
-  private async $getEmergencySpentUtxosStats(req: Request, res: Response) {
-    try {
-      const emergencySpentUtxos = await elementsParser.$getEmergencySpentUtxosStats();
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 30).toUTCString());
-      res.json(emergencySpentUtxos);
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
-  private async $getPegsList(req: Request, res: Response) {
-    try {
-      const recentPegs = await elementsParser.$getPegsList(parseInt(req.params?.count));
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 30).toUTCString());
-      res.json(recentPegs);
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
-  private async $getPegsVolumeDaily(req: Request, res: Response) {
-    try {
-      const pegsVolume = await elementsParser.$getPegsVolumeDaily();
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 30).toUTCString());
-      res.json(pegsVolume);
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
-  private async $getPegsCount(req: Request, res: Response) {
-    try {
-      const pegsCount = await elementsParser.$getPegsCount();
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 30).toUTCString());
-      res.json(pegsCount);
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
 }

 export default new LiquidRoutes();
--- a/backend/src/api/mempool-blocks.ts
+++ b/backend/src/api/mempool-blocks.ts
@@ -1,6 +1,6 @@
 import { GbtGenerator, GbtResult, ThreadTransaction as RustThreadTransaction, ThreadAcceleration as RustThreadAcceleration } from 'rust-gbt';
 import logger from '../logger';
-import { MempoolBlock, MempoolTransactionExtended, MempoolBlockWithTransactions, MempoolBlockDelta, Ancestor, CompactThreadTransaction, EffectiveFeeStats, TransactionClassified, TransactionCompressed, MempoolDeltaChange, GbtCandidates, PoolTag } from '../mempool.interfaces';
+import { MempoolBlock, MempoolTransactionExtended, MempoolBlockWithTransactions, MempoolBlockDelta, Ancestor, CompactThreadTransaction, EffectiveFeeStats, PoolTag, TransactionClassified } from '../mempool.interfaces';
 import { Common, OnlineFeeStatsCalculator } from './common';
 import config from '../config';
 import { Worker } from 'worker_threads';
@@ -16,14 +16,22 @@ class MempoolBlocks {
  private mempoolBlockDeltas: MempoolBlockDelta[] = [];
  private txSelectionWorker: Worker | null = null;
  private rustInitialized: boolean = false;
-  private rustGbtGenerator: GbtGenerator = new GbtGenerator(config.MEMPOOL.BLOCK_WEIGHT_UNITS, config.MEMPOOL.MEMPOOL_BLOCKS_AMOUNT);
+  private rustGbtGenerator: GbtGenerator = new GbtGenerator();

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

  private pools: { [id: number]: PoolTag } = {};

+  constructor() {
+    PoolsRepository.$getPools().then(allPools => {
+      this.pools = {};
+      for (const pool of allPools) {
+        this.pools[pool.uniqueId] = pool;
+      }
+    });
+  }
+
  public getMempoolBlocks(): MempoolBlock[] {
    return this.mempoolBlocks.map((block) => {
      return {
@@ -45,16 +53,130 @@ class MempoolBlocks {
    return this.mempoolBlockDeltas;
  }

-  public async updatePools$(): Promise<void> {
-    if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false) {
-      this.pools = {};
-      return;
+  public updateMempoolBlocks(memPool: { [txid: string]: MempoolTransactionExtended }, saveResults: boolean = false): MempoolBlockWithTransactions[] {
+    const latestMempool = memPool;
+    const memPoolArray: MempoolTransactionExtended[] = [];
+    for (const i in latestMempool) {
+      memPoolArray.push(latestMempool[i]);
    }
-    const allPools = await PoolsRepository.$getPools();
-    this.pools = {};
-    for (const pool of allPools) {
-      this.pools[pool.uniqueId] = pool;
+    const start = new Date().getTime();
+
+    // Clear bestDescendants & ancestors
+    memPoolArray.forEach((tx) => {
+      tx.bestDescendant = null;
+      tx.ancestors = [];
+      tx.cpfpChecked = false;
+      if (!tx.effectiveFeePerVsize) {
+        tx.effectiveFeePerVsize = tx.adjustedFeePerVsize;
+      }
+    });
+
+    // First sort
+    memPoolArray.sort((a, b) => {
+      if (a.adjustedFeePerVsize === b.adjustedFeePerVsize) {
+        // tie-break by lexicographic txid order for stability
+        return a.txid < b.txid ? -1 : 1;
+      } else {
+        return b.adjustedFeePerVsize - a.adjustedFeePerVsize;
+      }
+    });
+
+    // Loop through and traverse all ancestors and sum up all the sizes + fees
+    // Pass down size + fee to all unconfirmed children
+    let sizes = 0;
+    memPoolArray.forEach((tx) => {
+      sizes += tx.weight;
+      if (sizes > 4000000 * 8) {
+        return;
+      }
+      Common.setRelativesAndGetCpfpInfo(tx, memPool);
+    });
+
+    // Final sort, by effective fee
+    memPoolArray.sort((a, b) => {
+      if (a.effectiveFeePerVsize === b.effectiveFeePerVsize) {
+        // tie-break by lexicographic txid order for stability
+        return a.txid < b.txid ? -1 : 1;
+      } else {
+        return b.effectiveFeePerVsize - a.effectiveFeePerVsize;
+      }
+    });
+
+    const end = new Date().getTime();
+    const time = end - start;
+    logger.debug('Mempool blocks calculated in ' + time / 1000 + ' seconds');
+
+    const blocks = this.calculateMempoolBlocks(memPoolArray);
+
+    if (saveResults) {
+      const deltas = this.calculateMempoolDeltas(this.mempoolBlocks, blocks);
+      this.mempoolBlocks = blocks;
+      this.mempoolBlockDeltas = deltas;
    }
+
+    return blocks;
+  }
+
+  private calculateMempoolBlocks(transactionsSorted: MempoolTransactionExtended[]): MempoolBlockWithTransactions[] {
+    const mempoolBlocks: MempoolBlockWithTransactions[] = [];
+    let feeStatsCalculator: OnlineFeeStatsCalculator = new OnlineFeeStatsCalculator(config.MEMPOOL.BLOCK_WEIGHT_UNITS);
+    let onlineStats = false;
+    let blockSize = 0;
+    let blockWeight = 0;
+    let blockVsize = 0;
+    let blockFees = 0;
+    const sizeLimit = (config.MEMPOOL.BLOCK_WEIGHT_UNITS / 4) * 1.2;
+    let transactionIds: string[] = [];
+    let transactions: MempoolTransactionExtended[] = [];
+    transactionsSorted.forEach((tx, index) => {
+      if (blockWeight + tx.weight <= config.MEMPOOL.BLOCK_WEIGHT_UNITS
+        || mempoolBlocks.length === config.MEMPOOL.MEMPOOL_BLOCKS_AMOUNT - 1) {
+        tx.position = {
+          block: mempoolBlocks.length,
+          vsize: blockVsize + (tx.vsize / 2),
+        };
+        blockWeight += tx.weight;
+        blockVsize += tx.vsize;
+        blockSize += tx.size;
+        blockFees += tx.fee;
+        if (blockVsize <= sizeLimit) {
+          transactions.push(tx);
+        }
+        transactionIds.push(tx.txid);
+        if (onlineStats) {
+          feeStatsCalculator.processNext(tx);
+        }
+      } else {
+        mempoolBlocks.push(this.dataToMempoolBlocks(transactionIds, transactions, blockSize, blockWeight, blockFees));
+        blockVsize = 0;
+        tx.position = {
+          block: mempoolBlocks.length,
+          vsize: blockVsize + (tx.vsize / 2),
+        };
+
+        if (mempoolBlocks.length === config.MEMPOOL.MEMPOOL_BLOCKS_AMOUNT - 1) {
+          const stackWeight = transactionsSorted.slice(index).reduce((total, tx) => total + (tx.weight || 0), 0);
+          if (stackWeight > config.MEMPOOL.BLOCK_WEIGHT_UNITS) {
+            onlineStats = true;
+            feeStatsCalculator = new OnlineFeeStatsCalculator(stackWeight, 0.5, [10, 20, 30, 40, 50, 60, 70, 80, 90]);
+            feeStatsCalculator.processNext(tx);
+          }
+        }
+
+        blockVsize += tx.vsize;
+        blockWeight = tx.weight;
+        blockSize = tx.size;
+        blockFees = tx.fee;
+        transactionIds = [tx.txid];
+        transactions = [tx];
+      }
+    });
+    if (transactions.length) {
+      const feeStats = onlineStats ? feeStatsCalculator.getRawFeeStats() : undefined;
+      mempoolBlocks.push(this.dataToMempoolBlocks(transactionIds, transactions, blockSize, blockWeight, blockFees, feeStats));
+    }
+
+    return mempoolBlocks;
  }

  private calculateMempoolDeltas(prevBlocks: MempoolBlockWithTransactions[], mempoolBlocks: MempoolBlockWithTransactions[]): MempoolBlockDelta[] {
@@ -62,7 +184,7 @@ class MempoolBlocks {
    for (let i = 0; i < Math.max(mempoolBlocks.length, prevBlocks.length); i++) {
      let added: TransactionClassified[] = [];
      let removed: string[] = [];
-      const changed: TransactionClassified[] = [];
+      const changed: { txid: string, rate: number | undefined, acc: boolean | undefined }[] = [];
      if (mempoolBlocks[i] && !prevBlocks[i]) {
        added = mempoolBlocks[i].transactions;
      } else if (!mempoolBlocks[i] && prevBlocks[i]) {
@@ -85,20 +207,20 @@ class MempoolBlocks {
          if (!prevIds[tx.txid]) {
            added.push(tx);
          } else if (tx.rate !== prevIds[tx.txid].rate || tx.acc !== prevIds[tx.txid].acc) {
-            changed.push(tx);
+            changed.push({ txid: tx.txid, rate: tx.rate, acc: tx.acc });
          }
        });
      }
      mempoolBlockDeltas.push({
-        added: added.map(this.compressTx),
+        added,
        removed,
-        changed: changed.map(this.compressDeltaChange),
+        changed,
      });
    }
    return mempoolBlockDeltas;
  }

-  public async $makeBlockTemplates(transactions: string[], newMempool: { [txid: string]: MempoolTransactionExtended }, candidates: GbtCandidates | undefined, saveResults: boolean = false, useAccelerations: boolean = false, accelerationPool?: number): Promise<MempoolBlockWithTransactions[]> {
+  public async $makeBlockTemplates(newMempool: { [txid: string]: MempoolTransactionExtended }, saveResults: boolean = false, useAccelerations: boolean = false, accelerationPool?: number): Promise<MempoolBlockWithTransactions[]> {
    const start = Date.now();

    // reset mempool short ids
@@ -106,8 +228,7 @@ class MempoolBlocks {
      this.resetUids();
    }
    // set missing short ids
-    for (const txid of transactions) {
-      const tx = newMempool[txid];
+    for (const tx of Object.values(newMempool)) {
      this.setUid(tx, !saveResults);
    }

@@ -116,8 +237,7 @@ class MempoolBlocks {
    // prepare a stripped down version of the mempool with only the minimum necessary data
    // to reduce the overhead of passing this data to the worker thread
    const strippedMempool: Map<number, CompactThreadTransaction> = new Map();
-    for (const txid of transactions) {
-      const entry = newMempool[txid];
+    Object.values(newMempool).forEach(entry => {
      if (entry.uid !== null && entry.uid !== undefined) {
        const stripped = {
          uid: entry.uid,
@@ -130,7 +250,7 @@ class MempoolBlocks {
        };
        strippedMempool.set(entry.uid, stripped);
      }
-    }
+    });

    // (re)initialize tx selection worker thread
    if (!this.txSelectionWorker) {
@@ -161,7 +281,7 @@ class MempoolBlocks {
      // clean up thread error listener
      this.txSelectionWorker?.removeListener('error', threadErrorListener);

-      const processed = this.processBlockTemplates(newMempool, blocks, null, Object.entries(rates), Object.values(clusters), candidates, accelerations, accelerationPool, saveResults);
+      const processed = this.processBlockTemplates(newMempool, blocks, null, Object.entries(rates), Object.values(clusters), accelerations, accelerationPool, saveResults);

      logger.debug(`makeBlockTemplates completed in ${(Date.now() - start)/1000} seconds`);

@@ -172,10 +292,10 @@ class MempoolBlocks {
    return this.mempoolBlocks;
  }

-  public async $updateBlockTemplates(transactions: string[], newMempool: { [txid: string]: MempoolTransactionExtended }, added: MempoolTransactionExtended[], removed: MempoolTransactionExtended[], candidates: GbtCandidates | undefined, accelerationDelta: string[] = [], saveResults: boolean = false, useAccelerations: boolean = false): Promise<void> {
+  public async $updateBlockTemplates(newMempool: { [txid: string]: MempoolTransactionExtended }, added: MempoolTransactionExtended[], removed: MempoolTransactionExtended[], accelerationDelta: string[] = [], saveResults: boolean = false, useAccelerations: boolean = false): Promise<void> {
    if (!this.txSelectionWorker) {
      // need to reset the worker
-      await this.$makeBlockTemplates(transactions, newMempool, candidates, saveResults, useAccelerations);
+      await this.$makeBlockTemplates(newMempool, saveResults, useAccelerations);
      return;
    }

@@ -185,9 +305,9 @@ class MempoolBlocks {
    const addedAndChanged: MempoolTransactionExtended[] = useAccelerations ? accelerationDelta.map(txid => newMempool[txid]).filter(tx => tx != null).concat(added) : added;

    for (const tx of addedAndChanged) {
-      this.setUid(tx, false);
+      this.setUid(tx, true);
    }
-    const removedTxs = removed.filter(tx => tx.uid != null) as MempoolTransactionExtended[];
+    const removedUids = removed.map(tx => this.getUid(tx)).filter(uid => uid != null) as number[];

    // prepare a stripped down version of the mempool with only the minimum necessary data
    // to reduce the overhead of passing this data to the worker thread
@@ -213,15 +333,15 @@ class MempoolBlocks {
        });
        this.txSelectionWorker?.once('error', reject);
      });
-      this.txSelectionWorker.postMessage({ type: 'update', added: addedStripped, removed: removedTxs.map(tx => tx.uid) as number[] });
+      this.txSelectionWorker.postMessage({ type: 'update', added: addedStripped, removed: removedUids });
      const { blocks, rates, clusters } = this.convertResultTxids(await workerResultPromise);

-      this.removeUids(removedTxs);
+      this.removeUids(removedUids);

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

-      this.processBlockTemplates(newMempool, blocks, null, Object.entries(rates), Object.values(clusters), candidates, accelerations, null, saveResults);
+      this.processBlockTemplates(newMempool, blocks, null, Object.entries(rates), Object.values(clusters), accelerations, null, saveResults);
      logger.debug(`updateBlockTemplates completed in ${(Date.now() - start) / 1000} seconds`);
    } catch (e) {
      logger.err('updateBlockTemplates failed. ' + (e instanceof Error ? e.message : e));
@@ -230,31 +350,28 @@ class MempoolBlocks {

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

-  public async $rustMakeBlockTemplates(txids: string[], newMempool: { [txid: string]: MempoolTransactionExtended }, candidates: GbtCandidates | undefined, saveResults: boolean = false, useAccelerations: boolean = false, accelerationPool?: number): Promise<MempoolBlockWithTransactions[]> {
+  public async $rustMakeBlockTemplates(newMempool: { [txid: string]: MempoolTransactionExtended }, saveResults: boolean = false, useAccelerations: boolean = false, accelerationPool?: number): Promise<MempoolBlockWithTransactions[]> {
    const start = Date.now();

    // reset mempool short ids
    if (saveResults) {
      this.resetUids();
    }
-
-    const transactions = txids.map(txid => newMempool[txid]).filter(tx => tx != null);
    // set missing short ids
-    for (const tx of transactions) {
+    for (const tx of Object.values(newMempool)) {
      this.setUid(tx, !saveResults);
    }
    // set short ids for transaction inputs
-    for (const tx of transactions) {
+    for (const tx of Object.values(newMempool)) {
      tx.inputs = tx.vin.map(v => this.getUid(newMempool[v.txid])).filter(uid => (uid !== null && uid !== undefined)) as number[];
    }

    const accelerations = useAccelerations ? mempool.getAccelerations() : {};
    const acceleratedList = accelerationPool ? Object.values(accelerations).filter(acc => newMempool[acc.txid] && acc.pools.includes(accelerationPool)) : Object.values(accelerations).filter(acc => newMempool[acc.txid]);
    const convertedAccelerations = acceleratedList.map(acc => {
-      this.setUid(newMempool[acc.txid], true);
      return {
        uid: this.getUid(newMempool[acc.txid]),
        delta: acc.feeDelta,
@@ -262,18 +379,18 @@ class MempoolBlocks {
    });

    // run the block construction algorithm in a separate thread, and wait for a result
-    const rustGbt = saveResults ? this.rustGbtGenerator : new GbtGenerator(config.MEMPOOL.BLOCK_WEIGHT_UNITS, config.MEMPOOL.MEMPOOL_BLOCKS_AMOUNT);
+    const rustGbt = saveResults ? this.rustGbtGenerator : new GbtGenerator();
    try {
      const { blocks, blockWeights, rates, clusters, overflow } = this.convertNapiResultTxids(
-        await rustGbt.make(transactions as RustThreadTransaction[], convertedAccelerations as RustThreadAcceleration[], this.nextUid),
+        await rustGbt.make(Object.values(newMempool) as RustThreadTransaction[], convertedAccelerations as RustThreadAcceleration[], this.nextUid),
      );
      if (saveResults) {
        this.rustInitialized = true;
      }
-      const expectedSize = transactions.length;
+      const mempoolSize = Object.keys(newMempool).length;
      const resultMempoolSize = blocks.reduce((total, block) => total + block.length, 0) + overflow.length;
-      logger.debug(`RUST updateBlockTemplates returned ${resultMempoolSize} txs out of ${expectedSize} in the mempool, ${overflow.length} were unmineable`);
-      const processed = this.processBlockTemplates(newMempool, blocks, blockWeights, rates, clusters, candidates, accelerations, accelerationPool, saveResults);
+      logger.debug(`RUST updateBlockTemplates returned ${resultMempoolSize} txs out of ${mempoolSize} in the mempool, ${overflow.length} were unmineable`);
+      const processed = this.processBlockTemplates(newMempool, blocks, blockWeights, rates, clusters, accelerations, accelerationPool, saveResults);
      logger.debug(`RUST makeBlockTemplates completed in ${(Date.now() - start)/1000} seconds`);
      return processed;
    } catch (e) {
@@ -285,37 +402,36 @@ class MempoolBlocks {
    return this.mempoolBlocks;
  }

-  public async $oneOffRustBlockTemplates(transactions: string[], newMempool: { [txid: string]: MempoolTransactionExtended }, candidates: GbtCandidates | undefined, useAccelerations: boolean, accelerationPool?: number): Promise<MempoolBlockWithTransactions[]> {
-    return this.$rustMakeBlockTemplates(transactions, newMempool, candidates, false, useAccelerations, accelerationPool);
+  public async $oneOffRustBlockTemplates(newMempool: { [txid: string]: MempoolTransactionExtended }, useAccelerations: boolean, accelerationPool?: number): Promise<MempoolBlockWithTransactions[]> {
+    return this.$rustMakeBlockTemplates(newMempool, false, useAccelerations, accelerationPool);
  }

-  public async $rustUpdateBlockTemplates(transactions: string[], newMempool: { [txid: string]: MempoolTransactionExtended }, added: MempoolTransactionExtended[], removed: MempoolTransactionExtended[], candidates: GbtCandidates | undefined, useAccelerations: boolean, accelerationPool?: number): Promise<MempoolBlockWithTransactions[]> {
+  public async $rustUpdateBlockTemplates(newMempool: { [txid: string]: MempoolTransactionExtended }, mempoolSize: number, added: MempoolTransactionExtended[], removed: MempoolTransactionExtended[], useAccelerations: boolean, accelerationPool?: number): Promise<MempoolBlockWithTransactions[]> {
    // GBT optimization requires that uids never get too sparse
    // as a sanity check, we should also explicitly prevent uint32 uid overflow
-    if (this.nextUid + added.length >= Math.min(Math.max(262144, 2 * transactions.length), MAX_UINT32)) {
+    if (this.nextUid + added.length >= Math.min(Math.max(262144, 2 * mempoolSize), MAX_UINT32)) {
      this.resetRustGbt();
    }

    if (!this.rustInitialized) {
      // need to reset the worker
-      return this.$rustMakeBlockTemplates(transactions, newMempool, candidates, true, useAccelerations, accelerationPool);
+      return this.$rustMakeBlockTemplates(newMempool, true, useAccelerations, accelerationPool);
    }

    const start = Date.now();
    // set missing short ids
    for (const tx of added) {
-      this.setUid(tx, false);
+      this.setUid(tx, true);
    }
    // set short ids for transaction inputs
    for (const tx of added) {
      tx.inputs = tx.vin.map(v => this.getUid(newMempool[v.txid])).filter(uid => (uid !== null && uid !== undefined)) as number[];
    }
-    const removedTxs = removed.filter(tx => tx.uid != null) as MempoolTransactionExtended[];
+    const removedUids = removed.map(tx => this.getUid(tx)).filter(uid => (uid !== null && uid !== undefined)) as number[];

    const accelerations = useAccelerations ? mempool.getAccelerations() : {};
    const acceleratedList = accelerationPool ? Object.values(accelerations).filter(acc => newMempool[acc.txid] && acc.pools.includes(accelerationPool)) : Object.values(accelerations).filter(acc => newMempool[acc.txid]);
    const convertedAccelerations = acceleratedList.map(acc => {
-      this.setUid(newMempool[acc.txid], true);
      return {
        uid: this.getUid(newMempool[acc.txid]),
        delta: acc.feeDelta,
@@ -327,18 +443,18 @@ class MempoolBlocks {
      const { blocks, blockWeights, rates, clusters, overflow } = this.convertNapiResultTxids(
        await this.rustGbtGenerator.update(
          added as RustThreadTransaction[],
-          removedTxs.map(tx => tx.uid) as number[],
+          removedUids,
          convertedAccelerations as RustThreadAcceleration[],
          this.nextUid,
        ),
      );
      const resultMempoolSize = blocks.reduce((total, block) => total + block.length, 0) + overflow.length;
-      logger.debug(`RUST updateBlockTemplates returned ${resultMempoolSize} txs out of ${transactions.length} candidates, ${overflow.length} were unmineable`);
-      if (transactions.length !== resultMempoolSize) {
-        throw new Error(`GBT returned wrong number of transactions ${transactions.length} vs ${resultMempoolSize}, cache is probably out of sync`);
+      logger.debug(`RUST updateBlockTemplates returned ${resultMempoolSize} txs out of ${mempoolSize} in the mempool, ${overflow.length} were unmineable`);
+      if (mempoolSize !== resultMempoolSize) {
+        throw new Error('GBT returned wrong number of transactions , cache is probably out of sync');
      } else {
-        const processed = this.processBlockTemplates(newMempool, blocks, blockWeights, rates, clusters, candidates, accelerations, accelerationPool, true);
-        this.removeUids(removedTxs);
+        const processed = this.processBlockTemplates(newMempool, blocks, blockWeights, rates, clusters, accelerations, accelerationPool, true);
+        this.removeUids(removedUids);
        logger.debug(`RUST updateBlockTemplates completed in ${(Date.now() - start)/1000} seconds`);
        return processed;
      }
@@ -349,20 +465,12 @@ class MempoolBlocks {
    }
  }

-  private processBlockTemplates(mempool: { [txid: string]: MempoolTransactionExtended }, blocks: string[][], blockWeights: number[] | null, rates: [string, number][], clusters: string[][], candidates: GbtCandidates | undefined, accelerations: { [txid: string]: Acceleration }, accelerationPool, saveResults): MempoolBlockWithTransactions[] {
-    for (const txid of Object.keys(candidates?.txs ?? mempool)) {
-      if (txid in mempool) {
-        mempool[txid].cpfpDirty = false;
-        mempool[txid].ancestors = [];
-        mempool[txid].descendants = [];
-        mempool[txid].bestDescendant = null;
-      }
-    }
+  private processBlockTemplates(mempool: { [txid: string]: MempoolTransactionExtended }, blocks: string[][], blockWeights: number[] | null, rates: [string, number][], clusters: string[][], accelerations: { [txid: string]: Acceleration }, accelerationPool, saveResults): MempoolBlockWithTransactions[] {
    for (const [txid, rate] of rates) {
      if (txid in mempool) {
        mempool[txid].cpfpDirty = (rate !== mempool[txid].effectiveFeePerVsize);
        mempool[txid].effectiveFeePerVsize = rate;
-        mempool[txid].cpfpChecked = true;
+        mempool[txid].cpfpChecked = false;
      }
    }

@@ -391,9 +499,6 @@ class MempoolBlocks {
            if (txid === memberTxid) {
              matched = true;
            } else {
-              if (!mempool[txid]) {
-                console.log('txid missing from mempool! ', txid, candidates?.txs[txid]);
-              }
              const relative = {
                txid: txid,
                fee: mempool[txid].fee,
@@ -415,7 +520,7 @@ class MempoolBlocks {
      }
    }

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

    const sizeLimit = (config.MEMPOOL.BLOCK_WEIGHT_UNITS / 4) * 1.2;
    // update this thread's mempool with the results
@@ -426,16 +531,6 @@ class MempoolBlocks {
      let totalWeight = 0;
      let totalFees = 0;
      const transactions: MempoolTransactionExtended[] = [];
-
-      // backfill purged transactions
-      if (candidates?.txs && blockIndex === blocks.length - 1) {
-        for (const txid of Object.keys(mempool)) {
-          if (!candidates.txs[txid]) {
-            block.push(txid);
-          }
-        }
-      }
-
      for (const txid of block) {
        if (txid) {
          mempoolTx = mempool[txid];
@@ -444,25 +539,29 @@ class MempoolBlocks {
            block: blockIndex,
            vsize: totalVsize + (mempoolTx.vsize / 2),
          };
+          if (!mempoolTx.cpfpChecked) {
+            if (mempoolTx.ancestors?.length) {
+              mempoolTx.ancestors = [];
+            }
+            if (mempoolTx.descendants?.length) {
+              mempoolTx.descendants = [];
+            }
+            mempoolTx.bestDescendant = null;
+            mempoolTx.cpfpChecked = true;
+          }

          const acceleration = accelerations[txid];
-          if (isAcceleratedBy[txid] || (acceleration && (!accelerationPool || acceleration.pools.includes(accelerationPool)))) {
+          if (isAccelerated[txid] || (acceleration && (!accelerationPool || acceleration.pools.includes(accelerationPool)))) {
            if (!mempoolTx.acceleration) {
              mempoolTx.cpfpDirty = true;
            }
            mempoolTx.acceleration = true;
-            mempoolTx.acceleratedBy = isAcceleratedBy[txid] || acceleration?.pools;
-            mempoolTx.acceleratedAt = acceleration?.added;
-            mempoolTx.feeDelta = acceleration?.feeDelta;
            for (const ancestor of mempoolTx.ancestors || []) {
              if (!mempool[ancestor.txid].acceleration) {
                mempool[ancestor.txid].cpfpDirty = true;
              }
              mempool[ancestor.txid].acceleration = true;
-              mempool[ancestor.txid].acceleratedBy = mempoolTx.acceleratedBy;
-              mempool[ancestor.txid].acceleratedAt = mempoolTx.acceleratedAt;
-              mempool[ancestor.txid].feeDelta = mempoolTx.feeDelta;
-              isAcceleratedBy[ancestor.txid] = mempoolTx.acceleratedBy;
+              isAccelerated[ancestor.txid] = true;
            }
          } else {
            if (mempoolTx.acceleration) {
@@ -508,7 +607,7 @@ class MempoolBlocks {

  private dataToMempoolBlocks(transactionIds: string[], transactions: MempoolTransactionExtended[], totalSize: number, totalWeight: number, totalFees: number, feeStats?: EffectiveFeeStats ): MempoolBlockWithTransactions {
    if (!feeStats) {
-      feeStats = Common.calcEffectiveFeeStatistics(transactions);
+      feeStats = Common.calcEffectiveFeeStatistics(transactions.filter(tx => !tx.acceleration));
    }
    return {
      blockSize: totalSize,
@@ -524,38 +623,30 @@ class MempoolBlocks {

  private resetUids(): void {
    this.uidMap.clear();
-    this.txidMap.clear();
    this.nextUid = 1;
  }

  private setUid(tx: MempoolTransactionExtended, skipSet = false): number {
-    if (!this.txidMap.has(tx.txid) || !skipSet) {
+    if (tx.uid === null || tx.uid === undefined || !skipSet) {
      const uid = this.nextUid;
      this.nextUid++;
      this.uidMap.set(uid, tx.txid);
-      this.txidMap.set(tx.txid, uid);
      tx.uid = uid;
      return uid;
    } else {
-      tx.uid = this.txidMap.get(tx.txid) as number;
      return tx.uid;
    }
  }

  private getUid(tx: MempoolTransactionExtended): number | void {
-    if (tx) {
-      return this.txidMap.get(tx.txid);
+    if (tx?.uid !== null && tx?.uid !== undefined && this.uidMap.has(tx.uid)) {
+      return tx.uid;
    }
  }

-  private removeUids(txs: MempoolTransactionExtended[]): void {
-    for (const tx of txs) {
-      const uid = this.txidMap.get(tx.txid);
-      if (uid != null) {
-        this.uidMap.delete(uid);
-        this.txidMap.delete(tx.txid);
-      }
-      tx.uid = undefined;
+  private removeUids(uids: number[]): void {
+    for (const uid of uids) {
+      this.uidMap.delete(uid);
    }
  }

@@ -614,40 +705,6 @@ class MempoolBlocks {
    return { blocks: convertedBlocks, blockWeights, rates: convertedRates, clusters: convertedClusters, overflow: convertedOverflow };
  }

-  public compressTx(tx: TransactionClassified): TransactionCompressed {
-    if (tx.acc) {
-      return [
-        tx.txid,
-        tx.fee,
-        tx.vsize,
-        tx.value,
-        Math.round((tx.rate || (tx.fee / tx.vsize)) * 100) / 100,
-        tx.flags,
-        tx.time || 0,
-        1,
-      ];
-    } else {
-      return [
-        tx.txid,
-        tx.fee,
-        tx.vsize,
-        tx.value,
-        Math.round((tx.rate || (tx.fee / tx.vsize)) * 100) / 100,
-        tx.flags,
-        tx.time || 0,
-      ];
-    }
-  }
-
-  public compressDeltaChange(tx: TransactionClassified): MempoolDeltaChange {
-    return [
-      tx.txid,
-      Math.round((tx.rate || (tx.fee / tx.vsize)) * 100) / 100,
-      tx.flags,
-      tx.acc ? 1 : 0,
-    ];
-  }
-
  // estimates and saves positions of accelerations in mining partner mempools
  private updateAccelerationPositions(mempoolCache: { [txid: string]: MempoolTransactionExtended }, accelerations: { [txid: string]: Acceleration }, mempoolBlocks: MempoolBlockWithTransactions[]): void {
    const accelerationPositions: { [txid: string]: { poolId: number, pool: string, block: number, vsize: number }[] } = {};
--- a/backend/src/api/mempool.ts
+++ b/backend/src/api/mempool.ts
@@ -1,6 +1,6 @@
 import config from '../config';
 import bitcoinApi from './bitcoin/bitcoin-api-factory';
-import { MempoolTransactionExtended, TransactionExtended, VbytesPerSecond, GbtCandidates } from '../mempool.interfaces';
+import { MempoolTransactionExtended, TransactionExtended, VbytesPerSecond } from '../mempool.interfaces';
 import logger from '../logger';
 import { Common } from './common';
 import transactionUtils from './transaction-utils';
@@ -11,20 +11,18 @@ import bitcoinSecondClient from './bitcoin/bitcoin-second-client';
 import rbfCache from './rbf-cache';
 import { Acceleration } from './services/acceleration';
 import redisCache from './redis-cache';
-import blocks from './blocks';

 class Mempool {
  private inSync: boolean = false;
  private mempoolCacheDelta: number = -1;
  private mempoolCache: { [txId: string]: MempoolTransactionExtended } = {};
-  private mempoolCandidates: { [txid: string ]: boolean } = {};
  private spendMap = new Map<string, MempoolTransactionExtended>();
  private mempoolInfo: IBitcoinApi.MempoolInfo = { loaded: false, size: 0, bytes: 0, usage: 0, total_fee: 0,
                                                    maxmempool: 300000000, mempoolminfee: Common.isLiquid() ? 0.00000100 : 0.00001000, minrelaytxfee: Common.isLiquid() ? 0.00000100 : 0.00001000 };
  private mempoolChangedCallback: ((newMempool: {[txId: string]: MempoolTransactionExtended; }, newTransactions: MempoolTransactionExtended[],
    deletedTransactions: MempoolTransactionExtended[], accelerationDelta: string[]) => void) | undefined;
  private $asyncMempoolChangedCallback: ((newMempool: {[txId: string]: MempoolTransactionExtended; }, mempoolSize: number, newTransactions: MempoolTransactionExtended[],
-    deletedTransactions: MempoolTransactionExtended[], accelerationDelta: string[], candidates?: GbtCandidates) => Promise<void>) | undefined;
+    deletedTransactions: MempoolTransactionExtended[], accelerationDelta: string[]) => Promise<void>) | undefined;

  private accelerations: { [txId: string]: Acceleration } = {};
  private accelerationPositions: { [txid: string]: { poolId: number, pool: string, block: number, vsize: number }[] } = {};
@@ -43,8 +41,6 @@ class Mempool {
  private missingTxCount = 0;
  private mainLoopTimeout: number = 120000;

-  public limitGBT = config.MEMPOOL.USE_SECOND_NODE_FOR_MINFEE && config.MEMPOOL.LIMIT_GBT;
-
  constructor() {
    setInterval(this.updateTxPerSecond.bind(this), 1000);
  }
@@ -79,8 +75,7 @@ class Mempool {
  }

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

@@ -92,10 +87,6 @@ class Mempool {
    return this.spendMap;
  }

-  public getFromSpendMap(txid, index): MempoolTransactionExtended | void {
-    return this.spendMap.get(`${txid}:${index}`);
-  }
-
  public async $setMempool(mempoolData: { [txId: string]: MempoolTransactionExtended }) {
    this.mempoolCache = mempoolData;
    let count = 0;
@@ -117,10 +108,6 @@ class Mempool {
      if (config.MEMPOOL.CACHE_ENABLED && config.REDIS.ENABLED) {
        await redisCache.$addTransaction(this.mempoolCache[txid]);
      }
-      this.mempoolCache[txid].flags = Common.getTransactionFlags(this.mempoolCache[txid]);
-      this.mempoolCache[txid].cpfpChecked = false;
-      this.mempoolCache[txid].cpfpDirty = true;
-      this.mempoolCache[txid].cpfpUpdated = undefined;
    }
    if (config.MEMPOOL.CACHE_ENABLED && config.REDIS.ENABLED) {
      await redisCache.$flushTransactions();
@@ -130,7 +117,7 @@ class Mempool {
      this.mempoolChangedCallback(this.mempoolCache, [], [], []);
    }
    if (this.$asyncMempoolChangedCallback) {
-      await this.$asyncMempoolChangedCallback(this.mempoolCache, count, [], [], [], this.limitGBT ? { txs: {}, added: [], removed: [] } : undefined);
+      await this.$asyncMempoolChangedCallback(this.mempoolCache, count, [], [], []);
    }
    this.addToSpendMap(Object.values(this.mempoolCache));
  }
@@ -173,10 +160,6 @@ class Mempool {
    return newTransactions;
  }

-  public getMempoolCandidates(): { [txid: string]: boolean } {
-    return this.mempoolCandidates;
-  }
-
  public async $updateMemPoolInfo() {
    this.mempoolInfo = await this.$getMempoolInfo();
  }
@@ -206,7 +189,7 @@ class Mempool {
    return txTimes;
  }

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

    // warn if this run stalls the main loop for more than 2 minutes
@@ -347,8 +330,6 @@ class Mempool {
      }
    }

-    const candidates = await this.getNextCandidates(minFeeMempool, minFeeTip, deletedTransactions);
-
    const newMempoolSize = currentMempoolSize + newTransactions.length - deletedTransactions.length;
    const newTransactionsStripped = newTransactions.map((tx) => Common.stripTransaction(tx));
    this.latestTransactions = newTransactionsStripped.concat(this.latestTransactions).slice(0, 6);
@@ -360,14 +341,12 @@ class Mempool {

    this.mempoolCacheDelta = Math.abs(transactions.length - newMempoolSize);

-    const candidatesChanged = candidates?.added?.length || candidates?.removed?.length;
-
    if (this.mempoolChangedCallback && (hasChange || deletedTransactions.length)) {
      this.mempoolChangedCallback(this.mempoolCache, newTransactions, deletedTransactions, accelerationDelta);
    }
-    if (this.$asyncMempoolChangedCallback && (hasChange || deletedTransactions.length || candidatesChanged)) {
+    if (this.$asyncMempoolChangedCallback && (hasChange || deletedTransactions.length)) {
      this.updateTimerProgress(timer, 'running async mempool callback');
-      await this.$asyncMempoolChangedCallback(this.mempoolCache, newMempoolSize, newTransactions, deletedTransactions, accelerationDelta, candidates);
+      await this.$asyncMempoolChangedCallback(this.mempoolCache, newMempoolSize, newTransactions, deletedTransactions, accelerationDelta);
      this.updateTimerProgress(timer, 'completed async mempool callback');
    }

@@ -396,15 +375,15 @@ class Mempool {
  }

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

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

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

 class MiningRoutes {
  public initRoutes(app: Application) {
@@ -25,7 +23,6 @@ class MiningRoutes {
      .get(config.MEMPOOL.API_URL_PREFIX + 'mining/difficulty-adjustments', this.$getDifficultyAdjustments)
      .get(config.MEMPOOL.API_URL_PREFIX + 'mining/reward-stats/:blockCount', this.$getRewardStats)
      .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/fees/:interval', this.$getHistoricalBlockFees)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/fees', this.$getBlockFeesTimespan)
      .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/rewards/:interval', this.$getHistoricalBlockRewards)
      .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/fee-rates/:interval', this.$getHistoricalBlockFeeRates)
      .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/sizes-weights/:interval', this.$getHistoricalBlockSizeAndWeight)
@@ -37,13 +34,6 @@ class MiningRoutes {
      .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/audit/:hash', this.$getBlockAudit)
      .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/timestamp/:timestamp', this.$getHeightFromTimestamp)
      .get(config.MEMPOOL.API_URL_PREFIX + 'historical-price', this.$getHistoricalPrice)
-
-      .get(config.MEMPOOL.API_URL_PREFIX + 'accelerations/pool/:slug', this.$getAccelerationsByPool)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'accelerations/block/:height', this.$getAccelerationsByHeight)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'accelerations/recent/:interval', this.$getRecentAccelerations)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'accelerations/total', this.$getAccelerationTotals)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'accelerations', this.$getActiveAccelerations)
-      .post(config.MEMPOOL.API_URL_PREFIX + 'acceleration/request/:txid', this.$requestAcceleration)
    ;
  }

@@ -56,20 +46,13 @@ class MiningRoutes {
        res.status(400).send('Prices are not available on testnets.');
        return;
      }
-      const timestamp = parseInt(req.query.timestamp as string, 10) || 0;
-      const currency = req.query.currency as string;
-      
-      let response;
-      if (timestamp && currency) {
-        response = await PricesRepository.$getNearestHistoricalPrice(timestamp, currency);
-      } else if (timestamp) {
-        response = await PricesRepository.$getNearestHistoricalPrice(timestamp);
-      } else if (currency) {
-        response = await PricesRepository.$getHistoricalPrices(currency);
+      if (req.query.timestamp) {
+        res.status(200).send(await PricesRepository.$getNearestHistoricalPrice(
+          parseInt(<string>req.query.timestamp ?? 0, 10)
+        ));
      } else {
-        response = await PricesRepository.$getHistoricalPrices();
+        res.status(200).send(await PricesRepository.$getHistoricalPrices());
      }
-      res.status(200).send(response);
    } catch (e) {
      res.status(500).send(e instanceof Error ? e.message : e);
    }
@@ -221,24 +204,6 @@ class MiningRoutes {
    }
  }

-  private async $getBlockFeesTimespan(req: Request, res: Response) {
-    try {
-      if (!parseInt(req.query.from as string, 10) || !parseInt(req.query.to as string, 10)) {
-        throw new Error('Invalid timestamp range');
-      }
-      if (parseInt(req.query.from as string, 10) > parseInt(req.query.to as string, 10)) {
-        throw new Error('from must be less than to');
-      }
-      const blockFees = await mining.$getBlockFeesTimespan(parseInt(req.query.from as string, 10), parseInt(req.query.to as string, 10));
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
-      res.json(blockFees);
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
  private async $getHistoricalBlockRewards(req: Request, res: Response) {
    try {
      const blockRewards = await mining.$getHistoricalBlockRewards(req.params.interval);
@@ -387,94 +352,6 @@ class MiningRoutes {
      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }
-
-  private async $getAccelerationsByPool(req: Request, res: Response): Promise<void> {
-    try {
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
-      if (!config.MEMPOOL_SERVICES.ACCELERATIONS || ['testnet', 'signet', 'liquidtestnet', 'liquid'].includes(config.MEMPOOL.NETWORK)) {
-        res.status(400).send('Acceleration data is not available.');
-        return;
-      }
-      res.status(200).send(await AccelerationRepository.$getAccelerationInfo(req.params.slug));
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
-  private async $getAccelerationsByHeight(req: Request, res: Response): Promise<void> {
-    try {
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 3600 * 24).toUTCString());
-      if (!config.MEMPOOL_SERVICES.ACCELERATIONS || ['testnet', 'signet', 'liquidtestnet', 'liquid'].includes(config.MEMPOOL.NETWORK)) {
-        res.status(400).send('Acceleration data is not available.');
-        return;
-      }
-      const height = req.params.height === undefined ? undefined : parseInt(req.params.height, 10);
-      res.status(200).send(await AccelerationRepository.$getAccelerationInfo(null, height));
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
-  private async $getRecentAccelerations(req: Request, res: Response): Promise<void> {
-    try {
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
-      if (!config.MEMPOOL_SERVICES.ACCELERATIONS || ['testnet', 'signet', 'liquidtestnet', 'liquid'].includes(config.MEMPOOL.NETWORK)) {
-        res.status(400).send('Acceleration data is not available.');
-        return;
-      }
-      res.status(200).send(await AccelerationRepository.$getAccelerationInfo(null, null, req.params.interval));
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
-  private async $getAccelerationTotals(req: Request, res: Response): Promise<void> {
-    try {
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
-      if (!config.MEMPOOL_SERVICES.ACCELERATIONS || ['testnet', 'signet', 'liquidtestnet', 'liquid'].includes(config.MEMPOOL.NETWORK)) {
-        res.status(400).send('Acceleration data is not available.');
-        return;
-      }
-      res.status(200).send(await AccelerationRepository.$getAccelerationTotals(<string>req.query.pool, <string>req.query.interval));
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
-  private async $getActiveAccelerations(req: Request, res: Response): Promise<void> {
-    try {
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
-      if (!config.MEMPOOL_SERVICES.ACCELERATIONS || ['testnet', 'signet', 'liquidtestnet', 'liquid'].includes(config.MEMPOOL.NETWORK)) {
-        res.status(400).send('Acceleration data is not available.');
-        return;
-      }
-      res.status(200).send(accelerationApi.accelerations || []);
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
-  private async $requestAcceleration(req: Request, res: Response): Promise<void> {
-    res.setHeader('Pragma', 'no-cache');
-    res.setHeader('Cache-control', 'private, no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0');
-    res.setHeader('expires', -1);
-    try {
-      accelerationApi.accelerationRequested(req.params.txid);
-      res.status(200).send();
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
 }

 export default new MiningRoutes();
--- a/backend/src/api/mining/mining.ts
+++ b/backend/src/api/mining/mining.ts
@@ -45,22 +45,11 @@ class Mining {
   */
  public async $getHistoricalBlockFees(interval: string | null = null): Promise<any> {
    return await BlocksRepository.$getHistoricalBlockFees(
-      this.getTimeRange(interval),
+      this.getTimeRange(interval, 5),
      Common.getSqlInterval(interval)
    );
  }

-  /**
-   * Get timespan block total fees
-   */
-  public async $getBlockFeesTimespan(from: number, to: number): Promise<number> {
-    return await BlocksRepository.$getHistoricalBlockFees(
-      this.getTimeRangeFromTimespan(from, to),
-      null,
-      {from, to}
-    );
-  }
-  
  /**
   * Get historical block rewards
   */
@@ -153,7 +142,7 @@ class Mining {
  public async $getPoolStat(slug: string): Promise<object> {
    const pool = await PoolsRepository.$getPool(slug);
    if (!pool) {
-      throw new Error('This mining pool does not exist');
+      throw new Error('This mining pool does not exist ' + escape(slug));
    }

    const blockCount: number = await BlocksRepository.$blockCount(pool.id);
@@ -657,24 +646,6 @@ class Mining {
    }
  }

-  private getTimeRangeFromTimespan(from: number, to: number, scale = 1): number {
-    const timespan = to - from;
-    switch (true) {
-      case timespan > 3600 * 24 * 365 * 4: return 86400 * scale; // 24h
-      case timespan > 3600 * 24 * 365 * 3: return 43200 * scale; // 12h
-      case timespan > 3600 * 24 * 365 * 2: return 43200 * scale; // 12h
-      case timespan > 3600 * 24 * 365: return 28800 * scale; // 8h
-      case timespan > 3600 * 24 * 30 * 6: return 28800 * scale; // 8h
-      case timespan > 3600 * 24 * 30 * 3: return 10800 * scale; // 3h
-      case timespan > 3600 * 24 * 30: return 7200 * scale; // 2h
-      case timespan > 3600 * 24 * 7: return 1800 * scale; // 30min
-      case timespan > 3600 * 24 * 3: return 300 * scale; // 5min
-      case timespan > 3600 * 24: return 1 * scale;
-      default: return 1 * scale;
-    }
-  }
-  
-
  // Finds the oldest block in a consecutive chain back from the tip
  // assumes `blocks` is sorted in ascending height order
  private getOldestConsecutiveBlock(blocks: DifficultyBlock[]): DifficultyBlock {
--- a/backend/src/api/pools-parser.ts
+++ b/backend/src/api/pools-parser.ts
@@ -5,9 +5,6 @@ import PoolsRepository from '../repositories/PoolsRepository';
 import { PoolTag } from '../mempool.interfaces';
 import diskCache from './disk-cache';
 import mining from './mining/mining';
-import transactionUtils from './transaction-utils';
-import BlocksRepository from '../repositories/BlocksRepository';
-import redisCache from './redis-cache';

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

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

    await this.$insertUnknownPool();

-    let reindexUnknown = false;
-
    for (const pool of this.miningPools) {
      if (!pool.id) {
        logger.info(`Mining pool ${pool.name} has no unique 'id' defined. Skipping.`);
        continue;
      }

-      // One of the two fields 'addresses' or 'regexes' must be a non-empty array
-      if (!pool.addresses && !pool.regexes) {
-        logger.err(`Mining pool ${pool.name} must have at least one of the fields 'addresses' or 'regexes'. Skipping.`);
-        continue;
-      }
-
-      pool.addresses = pool.addresses || [];
-      pool.regexes = pool.regexes || [];
-
-      if (pool.addresses.length === 0 && pool.regexes.length === 0) {
-        logger.err(`Mining pool ${pool.name} has no 'addresses' nor 'regexes' defined. Skipping.`);
-        continue;
-      }
-
-      if (pool.addresses.length === 0) {
-        logger.warn(`Mining pool ${pool.name} has no 'addresses' defined.`);
-      }
-
-      if (pool.regexes.length === 0) {
-        logger.warn(`Mining pool ${pool.name} has no 'regexes' defined.`);
-      }
-
      const poolDB = await PoolsRepository.$getPoolByUniqueId(pool.id, false);
      if (!poolDB) {
        // New mining pool
        const slug = pool.name.replace(/[^a-z0-9]/gi, '').toLowerCase();
        logger.debug(`Inserting new mining pool ${pool.name}`);
        await PoolsRepository.$insertNewMiningPool(pool, slug);
-        reindexUnknown = true;
+        await this.$deleteUnknownBlocks();
      } else {
        if (poolDB.name !== pool.name) {
          // Pool has been renamed
@@ -104,45 +76,7 @@ class PoolsParser {
          // Pool addresses changed or coinbase tags changed
          logger.notice(`Updating addresses and/or coinbase tags for ${pool.name} mining pool.`);
          await PoolsRepository.$updateMiningPoolTags(poolDB.id, pool.addresses, pool.regexes);
-          reindexUnknown = true;
-          await this.$reindexBlocksForPool(poolDB.id);
-        }
-      }
-    }
-
-    if (reindexUnknown) {
-      logger.notice(`Updating addresses and/or coinbase tags for unknown mining pool.`);
-      let unknownPool;
-      if (config.DATABASE.ENABLED === true) {
-        unknownPool = await PoolsRepository.$getUnknownPool();
-      } else {
-        unknownPool = this.unknownPool;
-      }
-      await this.$reindexBlocksForPool(unknownPool.id);
-    }
-  }
-
-  public matchBlockMiner(scriptsig: string, addresses: string[], pools: PoolTag[]): PoolTag | undefined {
-    const asciiScriptSig = transactionUtils.hex2ascii(scriptsig);
-
-    for (let i = 0; i < pools.length; ++i) {
-      if (addresses.length) {
-        const poolAddresses: string[] = typeof pools[i].addresses === 'string' ?
-          JSON.parse(pools[i].addresses) : pools[i].addresses;
-        for (let y = 0; y < poolAddresses.length; y++) {
-          if (addresses.indexOf(poolAddresses[y]) !== -1) {
-            return pools[i];
-          }
-        }
-      }
-
-      const regexes: string[] = typeof pools[i].regexes === 'string' ?
-        JSON.parse(pools[i].regexes) : pools[i].regexes;
-      for (let y = 0; y < regexes.length; ++y) {
-        const regex = new RegExp(regexes[y], 'i');
-        const match = asciiScriptSig.match(regex);
-        if (match !== null) {
-          return pools[i];
+          await this.$deleteBlocksForPool(poolDB);
        }
      }
    }
@@ -178,11 +112,22 @@ class PoolsParser {
  }

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

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

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

--- a/backend/src/api/redis-cache.ts
+++ b/backend/src/api/redis-cache.ts
@@ -19,91 +19,45 @@ class RedisCache {
  private client;
  private connected = false;
  private schemaVersion = 1;
-  private redisConfig: any;

-  private pauseFlush: boolean = false;
  private cacheQueue: MempoolTransactionExtended[] = [];
-  private removeQueue: string[] = [];
-  private rbfCacheQueue: { type: string, txid: string, value: any }[] = [];
-  private rbfRemoveQueue: { type: string, txid: string }[] = [];
  private txFlushLimit: number = 10000;
-  private ignoreBlocksCache = false;

  constructor() {
    if (config.REDIS.ENABLED) {
-      this.redisConfig = {
+      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();
-      setInterval(() => { this.$ensureConnected(); }, 10000);
    }
  }

-  private async $ensureConnected(): Promise<boolean> {
+  private async $ensureConnected(): Promise<void> {
    if (!this.connected && config.REDIS.ENABLED) {
-      try {
-        this.client = createClient(this.redisConfig);
-        this.client.on('error', async (e) => {
-          logger.err(`Error in Redis client: ${e instanceof Error ? e.message : e}`);
-          this.connected = false;
-          await this.client.disconnect();
-        });
-        await this.client.connect().then(async () => {
-          try {
-            const version = await this.client.get('schema_version');
-            this.connected = true;
-            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);
-            }
-            logger.info(`Redis client connected`);
-            return true;
-          } catch (e) {
-            this.connected = false;
-            logger.warn('Failed to connect to Redis');
-            return false;
-          }
-        });
-        await this.$onConnected();
-        return true;
-      } catch (e) {
-        logger.warn('Error connecting to Redis: ' + (e instanceof Error ? e.message : e));
-        return false;
-      }
-    } else {
-      try {
-        // test connection
-        await this.client.get('schema_version');
-        return true;
-      } catch (e) {
-        logger.warn('Lost connection to Redis: ' + (e instanceof Error ? e.message : e));
-        logger.warn('Attempting to reconnect in 10 seconds');
-        this.connected = false;
-        return false;
-      }
+      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);
+        }
+      });
    }
  }

-  private async $onConnected(): Promise<void> {
-    await this.$flushTransactions();
-    await this.$removeTransactions([]);
-    await this.$flushRbfQueues();
-  }
-
-  async $updateBlocks(blocks: BlockExtended[]): Promise<void> {
-    if (!config.REDIS.ENABLED) {
-      return;
-    }
-    if (!this.connected) {
-      logger.warn(`Failed to update blocks in Redis cache: Redis is not connected`);
-      return;
-    }
+  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) {
@@ -111,15 +65,9 @@ class RedisCache {
    }
  }

-  async $updateBlockSummaries(summaries: BlockSummary[]): Promise<void> {
-    if (!config.REDIS.ENABLED) {
-      return;
-    }
-    if (!this.connected) {
-      logger.warn(`Failed to update block summaries in Redis cache: Redis is not connected`);
-      return;
-    }
+  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) {
@@ -127,36 +75,31 @@ class RedisCache {
    }
  }

-  async $addTransaction(tx: MempoolTransactionExtended): Promise<void> {
-    if (!config.REDIS.ENABLED) {
-      return;
-    }
+  async $addTransaction(tx: MempoolTransactionExtended) {
    this.cacheQueue.push(tx);
    if (this.cacheQueue.length >= this.txFlushLimit) {
-      if (!this.pauseFlush) {
-        await this.$flushTransactions();
-      }
+      await this.$flushTransactions();
    }
  }

-  async $flushTransactions(): Promise<void> {
-    if (!config.REDIS.ENABLED) {
-      return;
-    }
-    if (!this.cacheQueue.length) {
-      return;
-    }
-    if (!this.connected) {
-      logger.warn(`Failed to add ${this.cacheQueue.length} transactions to Redis cache: Redis not connected`);
-      return;
+  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`);
    }
+  }

-    this.pauseFlush = false;
-
-    const toAdd = this.cacheQueue.slice(0, this.txFlushLimit);
+  private async $addTransactions(newTransactions: MempoolTransactionExtended[]): Promise<boolean> {
+    if (!newTransactions.length) {
+      return true;
+    }
    try {
-      const msetData = toAdd.map(tx => {
-        const minified: any = structuredClone(tx);
+      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;
@@ -169,53 +112,30 @@ class RedisCache {
        return [`mempool:tx:${tx.txid}`, JSON.stringify(minified)];
      });
      await this.client.MSET(msetData);
-      // successful, remove transactions from cache queue
-      this.cacheQueue = this.cacheQueue.slice(toAdd.length);
-      logger.debug(`Saved ${toAdd.length} transactions to Redis cache, ${this.cacheQueue.length} left in queue`);
+      return true;
    } catch (e) {
-      logger.warn(`Failed to add ${toAdd.length} transactions to Redis cache: ${e instanceof Error ? e.message : e}`);
-      this.pauseFlush = true;
+      logger.warn(`Failed to add ${newTransactions.length} transactions to Redis cache: ${e instanceof Error ? e.message : e}`);
+      return false;
    }
  }

-  async $removeTransactions(transactions: string[]): Promise<void> {
-    if (!config.REDIS.ENABLED) {
-      return;
-    }
-    const toRemove = this.removeQueue.concat(transactions);
-    this.removeQueue = [];
-    let failed: string[] = [];
-    let numRemoved = 0;
-    if (this.connected) {
+  async $removeTransactions(transactions: string[]) {
+    try {
+      await this.$ensureConnected();
      const sliceLength = config.REDIS.BATCH_QUERY_BASE_SIZE;
-      for (let i = 0; i < Math.ceil(toRemove.length / sliceLength); i++) {
-        const slice = toRemove.slice(i * sliceLength, (i + 1) * sliceLength);
-        try {
-          await this.client.unlink(slice.map(txid => `mempool:tx:${txid}`));
-          numRemoved+= sliceLength;
-          logger.debug(`Deleted ${slice.length} transactions from the Redis cache`);
-        } catch (e) {
-          logger.warn(`Failed to remove ${slice.length} transactions from Redis cache: ${e instanceof Error ? e.message : e}`);
-          failed = failed.concat(slice);
-        }
+      for (let i = 0; i < Math.ceil(transactions.length / sliceLength); i++) {
+        const slice = transactions.slice(i * sliceLength, (i + 1) * sliceLength);
+        await this.client.unlink(slice.map(txid => `mempool:tx:${txid}`));
+        logger.debug(`Deleted ${slice.length} transactions from the Redis cache`);
      }
-      // concat instead of replace, in case more txs have been added in the meantime
-      this.removeQueue = this.removeQueue.concat(failed);
-    } else {
-      this.removeQueue = this.removeQueue.concat(toRemove);
+    } 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> {
-    if (!config.REDIS.ENABLED) {
-      return;
-    }
-    if (!this.connected) {
-      this.rbfCacheQueue.push({ type, txid, value });
-      logger.warn(`Failed to set RBF ${type} in Redis cache: Redis is not connected`);
-      return;
-    }
    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}`);
@@ -223,55 +143,17 @@ class RedisCache {
  }

  async $removeRbfEntry(type: string, txid: string): Promise<void> {
-    if (!config.REDIS.ENABLED) {
-      return;
-    }
-    if (!this.connected) {
-      this.rbfRemoveQueue.push({ type, txid });
-      logger.warn(`Failed to remove RBF ${type} from Redis cache: Redis is not connected`);
-      return;
-    }
    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}`);
    }
  }

-  private async $flushRbfQueues(): Promise<void> {
-    if (!config.REDIS.ENABLED) {
-      return;
-    }
-    if (!this.connected) {
-      return;
-    }
-    try {
-      const toAdd = this.rbfCacheQueue;
-      this.rbfCacheQueue = [];
-      for (const { type, txid, value } of toAdd) {
-        await this.$setRbfEntry(type, txid, value);
-      }
-      logger.debug(`Saved ${toAdd.length} queued RBF entries to the Redis cache`);
-      const toRemove = this.rbfRemoveQueue;
-      this.rbfRemoveQueue = [];
-      for (const { type, txid } of toRemove) {
-        await this.$removeRbfEntry(type, txid);
-      }
-      logger.debug(`Removed ${toRemove.length} queued RBF entries from the Redis cache`);
-    } catch (e) {
-      logger.warn(`Failed to flush RBF cache event queues after reconnecting to Redis: ${e instanceof Error ? e.message : e}`);
-    }
-  }
-
  async $getBlocks(): Promise<BlockExtended[]> {
-    if (!config.REDIS.ENABLED) {
-      return [];
-    }
-    if (!this.connected) {
-      logger.warn(`Failed to retrieve blocks from Redis cache: Redis is not connected`);
-      return [];
-    }
    try {
+      await this.$ensureConnected();
      const json = await this.client.get('blocks');
      return JSON.parse(json);
    } catch (e) {
@@ -281,14 +163,8 @@ class RedisCache {
  }

  async $getBlockSummaries(): Promise<BlockSummary[]> {
-    if (!config.REDIS.ENABLED) {
-      return [];
-    }
-    if (!this.connected) {
-      logger.warn(`Failed to retrieve blocks from Redis cache: Redis is not connected`);
-      return [];
-    }
    try {
+      await this.$ensureConnected();
      const json = await this.client.get('block-summaries');
      return JSON.parse(json);
    } catch (e) {
@@ -298,16 +174,10 @@ class RedisCache {
  }

  async $getMempool(): Promise<{ [txid: string]: MempoolTransactionExtended }> {
-    if (!config.REDIS.ENABLED) {
-      return {};
-    }
-    if (!this.connected) {
-      logger.warn(`Failed to retrieve mempool from Redis cache: Redis is not connected`);
-      return {};
-    }
    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;
@@ -321,14 +191,8 @@ class RedisCache {
  }

  async $getRbfEntries(type: string): Promise<any[]> {
-    if (!config.REDIS.ENABLED) {
-      return [];
-    }
-    if (!this.connected) {
-      logger.warn(`Failed to retrieve Rbf ${type}s from Redis cache: Redis is not connected`);
-      return [];
-    }
    try {
+      await this.$ensureConnected();
      const rbfEntries = await this.scanKeys<MempoolTransactionExtended[]>(`rbf:${type}:*`);
      return rbfEntries;
    } catch (e) {
@@ -337,12 +201,11 @@ class RedisCache {
    }
  }

-  async $loadCache(): Promise<void> {
-    if (!config.REDIS.ENABLED) {
-      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);
@@ -351,14 +214,9 @@ class RedisCache {
    const rbfTrees = await this.$getRbfEntries('tree');
    const rbfExpirations = await this.$getRbfEntries('exp');

-    // Load & set block data
-    if (!this.ignoreBlocksCache) {
-      const loadedBlocks = await this.$getBlocks();
-      const loadedBlockSummaries = await this.$getBlockSummaries();
-      blocks.setBlocks(loadedBlocks || []);
-      blocks.setBlockSummaries(loadedBlockSummaries || []);
-    }
-    // Set other data
+    // Set loaded data
+    blocks.setBlocks(loadedBlocks || []);
+    blocks.setBlockSummaries(loadedBlockSummaries || []);
    await memPool.$setMempool(loadedMempool);
    await rbfCache.load({
      txs: rbfTxs,
@@ -368,7 +226,7 @@ class RedisCache {
    });
  }

-  private inflateLoadedTxs(mempool: { [txid: string]: MempoolTransactionExtended }): void {
+  private inflateLoadedTxs(mempool: { [txid: string]: MempoolTransactionExtended }) {
    for (const tx of Object.values(mempool)) {
      for (const vin of tx.vin) {
        if (vin.scriptsig) {
@@ -415,10 +273,6 @@ class RedisCache {
    }
    return result;
  }
-
-  public setIgnoreBlocksCache(): void {
-    this.ignoreBlocksCache = true;
-  }
 }

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

-type MyAccelerationStatus = 'requested' | 'accelerating' | 'done';
-
 export interface Acceleration {
  txid: string,
-  added: number,
-  effectiveVsize: number,
-  effectiveFee: number,
  feeDelta: number,
  pools: number[],
+  effectiveFee: number;
+  effectiveVsize: number;
  positions?: {
    [pool: number]: {
      block: number,
      vbytes: number,
    },
  },
-};
-
-export interface AccelerationHistory {
-  txid: string,
-  status: string,
-  feePaid: number,
-  added: number,
-  lastUpdated: number,
-  baseFee: number,
-  vsizeFee: number,
-  effectiveFee: number,
-  effectiveVsize: number,
-  feeDelta: number,
-  blockHash: string,
-  blockHeight: number,
-  pools: number[];
-};
+}

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

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

      const params: (string | number)[] = [
@@ -285,7 +285,7 @@ class StatisticsApi {

  public async $list2H(): Promise<OptimizedStatistic[]> {
    try {
-      const query = `SELECT *, UNIX_TIMESTAMP(added) as added FROM statistics WHERE added BETWEEN DATE_SUB(NOW(), INTERVAL 2 HOUR) AND NOW() ORDER BY statistics.added DESC`;
+      const query = `SELECT *, UNIX_TIMESTAMP(added) as added FROM statistics ORDER BY statistics.added DESC LIMIT 120`;
      const [rows] = await DB.query({ sql: query, timeout: this.queryTimeout });
      return this.mapStatisticToOptimizedStatistic(rows as Statistic[]);
    } catch (e) {
@@ -296,7 +296,7 @@ class StatisticsApi {

  public async $list24H(): Promise<OptimizedStatistic[]> {
    try {
-      const query = `SELECT *, UNIX_TIMESTAMP(added) as added FROM statistics WHERE added BETWEEN DATE_SUB(NOW(), INTERVAL 24 HOUR) AND NOW() ORDER BY statistics.added DESC`;
+      const query = `SELECT *, UNIX_TIMESTAMP(added) as added FROM statistics ORDER BY statistics.added DESC LIMIT 1440`;
      const [rows] = await DB.query({ sql: query, timeout: this.queryTimeout });
      return this.mapStatisticToOptimizedStatistic(rows as Statistic[]);
    } catch (e) {
@@ -456,59 +456,6 @@ class StatisticsApi {
      };
    });
  }
-
-  public mapOptimizedStatisticToStatistic(statistic: OptimizedStatistic[]): Statistic[] {
-    return statistic.map((s) => {
-      return {
-        added: s.added,
-        unconfirmed_transactions: s.count,
-        tx_per_second: 0,
-        vbytes_per_second: s.vbytes_per_second,
-        mempool_byte_weight: s.mempool_byte_weight || 0,
-        total_fee: s.total_fee || 0,
-        min_fee: s.min_fee,
-        fee_data: '',
-        vsize_1: s.vsizes[0],
-        vsize_2: s.vsizes[1],
-        vsize_3: s.vsizes[2],
-        vsize_4: s.vsizes[3],
-        vsize_5: s.vsizes[4],
-        vsize_6: s.vsizes[5],
-        vsize_8: s.vsizes[6],
-        vsize_10: s.vsizes[7],
-        vsize_12: s.vsizes[8],
-        vsize_15: s.vsizes[9],
-        vsize_20: s.vsizes[10],
-        vsize_30: s.vsizes[11],
-        vsize_40: s.vsizes[12],
-        vsize_50: s.vsizes[13],
-        vsize_60: s.vsizes[14],
-        vsize_70: s.vsizes[15],
-        vsize_80: s.vsizes[16],
-        vsize_90: s.vsizes[17],
-        vsize_100: s.vsizes[18],
-        vsize_125: s.vsizes[19],
-        vsize_150: s.vsizes[20],
-        vsize_175: s.vsizes[21],
-        vsize_200: s.vsizes[22],
-        vsize_250: s.vsizes[23],
-        vsize_300: s.vsizes[24],
-        vsize_350: s.vsizes[25],
-        vsize_400: s.vsizes[26],
-        vsize_500: s.vsizes[27],
-        vsize_600: s.vsizes[28],
-        vsize_700: s.vsizes[29],
-        vsize_800: s.vsizes[30],
-        vsize_900: s.vsizes[31],
-        vsize_1000: s.vsizes[32],
-        vsize_1200: s.vsizes[33],
-        vsize_1400: s.vsizes[34],
-        vsize_1600: s.vsizes[35],
-        vsize_1800: s.vsizes[36],
-        vsize_2000: s.vsizes[37],
-      }
-    });
-  }
 }

 export default new StatisticsApi();
--- a/backend/src/api/statistics/statistics.ts
+++ b/backend/src/api/statistics/statistics.ts
@@ -6,7 +6,6 @@ import statisticsApi from './statistics-api';

 class Statistics {
  protected intervalTimer: NodeJS.Timer | undefined;
-  protected lastRun: number = 0;
  protected newStatisticsEntryCallback: ((stats: OptimizedStatistic) => void) | undefined;

  public setNewStatisticsEntryCallback(fn: (stats: OptimizedStatistic) => void) {
@@ -24,21 +23,15 @@ class Statistics {
    setTimeout(() => {
      this.runStatistics();
      this.intervalTimer = setInterval(() => {
-        this.runStatistics(true);
+        this.runStatistics();
      }, 1 * 60 * 1000);
    }, difference);
  }

-  public async runStatistics(skipIfRecent = false): Promise<void> {
+  private async runStatistics(): Promise<void> {
    if (!memPool.isInSync()) {
      return;
    }
-
-    if (skipIfRecent && new Date().getTime() / 1000 - this.lastRun < 30) {
-      return;
-    }
-
-    this.lastRun = new Date().getTime() / 1000;
    const currentMempool = memPool.getMempool();
    const txPerSecond = memPool.getTxPerSecond();
    const vBytesPerSecond = memPool.getVBytesPerSecond();
--- a/backend/src/api/transaction-utils.ts
+++ b/backend/src/api/transaction-utils.ts
@@ -103,7 +103,7 @@ class TransactionUtils {
    }
    const feePerVbytes = (transaction.fee || 0) / (transaction.weight / 4);
    const transactionExtended: TransactionExtended = Object.assign({
-      vsize: transaction.weight / 4,
+      vsize: Math.round(transaction.weight / 4),
      feePerVsize: feePerVbytes,
      effectiveFeePerVsize: feePerVbytes,
    }, transaction);
@@ -123,7 +123,7 @@ class TransactionUtils {
    const adjustedFeePerVsize = (transaction.fee || 0) / adjustedVsize;
    const transactionExtended: MempoolTransactionExtended = Object.assign(transaction, {
      order: this.txidToOrdering(transaction.txid),
-      vsize,
+      vsize: Math.round(transaction.weight / 4),
      adjustedVsize,
      sigops,
      feePerVsize: feePerVbytes,
@@ -145,10 +145,6 @@ class TransactionUtils {
  }

  public countScriptSigops(script: string, isRawScript: boolean = false, witness: boolean = false): number {
-    if (!script?.length) {
-      return 0;
-    }
-
    let sigops = 0;
    // count OP_CHECKSIG and OP_CHECKSIGVERIFY
    sigops += (script.match(/OP_CHECKSIG/g)?.length || 0);
--- a/backend/src/api/websocket-handler.ts
+++ b/backend/src/api/websocket-handler.ts
@@ -2,8 +2,7 @@ import logger from '../logger';
 import * as WebSocket from 'ws';
 import {
  BlockExtended, TransactionExtended, MempoolTransactionExtended, WebsocketResponse,
-  OptimizedStatistic, ILoadingIndicators, GbtCandidates, TxTrackingInfo,
-  MempoolDelta, MempoolDeltaTxids
+  OptimizedStatistic, ILoadingIndicators
 } from '../mempool.interfaces';
 import blocks from './blocks';
 import memPool from './mempool';
@@ -19,21 +18,17 @@ import feeApi from './fee-api';
 import BlocksAuditsRepository from '../repositories/BlocksAuditsRepository';
 import BlocksSummariesRepository from '../repositories/BlocksSummariesRepository';
 import Audit from './audit';
+import { deepClone } from '../utils/clone';
 import priceUpdater from '../tasks/price-updater';
 import { ApiPrice } from '../repositories/PricesRepository';
 import accelerationApi from './services/acceleration';
 import mempool from './mempool';
-import statistics from './statistics/statistics';
-import accelerationRepository from '../repositories/AccelerationRepository';
-import bitcoinApi from './bitcoin/bitcoin-api-factory';

 interface AddressTransactions {
  mempool: MempoolTransactionExtended[],
  confirmed: MempoolTransactionExtended[],
  removed: MempoolTransactionExtended[],
 }
-import bitcoinSecondClient from './bitcoin/bitcoin-second-client';
-import { calculateMempoolTxCpfp } from './cpfp';

 // valid 'want' subscriptions
 const wantable = [
@@ -41,11 +36,10 @@ const wantable = [
  'mempool-blocks',
  'live-2h-chart',
  'stats',
-  'tomahawk',
 ];

 class WebsocketHandler {
-  private webSocketServers: WebSocket.Server[] = [];
+  private wss: WebSocket.Server | undefined;
  private extraInitProperties = {};

  private numClients = 0;
@@ -54,13 +48,12 @@ class WebsocketHandler {

  private socketData: { [key: string]: string } = {};
  private serializedInitData: string = '{}';
-  private lastRbfSummary: ReplacementInfo[] | null = null;
-  private mempoolSequence: number = 0;
+  private lastRbfSummary: ReplacementInfo | null = null;

  constructor() { }

-  addWebsocketServer(wss: WebSocket.Server) {
-    this.webSocketServers.push(wss);
+  setWebsocketServer(wss: WebSocket.Server) {
+    this.wss = wss;
  }

  setExtraInitData(property: string, value: any) {
@@ -85,7 +78,6 @@ class WebsocketHandler {
    const _blocks = blocks.getBlocks().slice(-config.MEMPOOL.INITIAL_BLOCKS_AMOUNT);
    const da = difficultyAdjustment.getDifficultyAdjustment();
    this.updateSocketDataFields({
-      'backend': config.MEMPOOL.BACKEND,
      'mempoolInfo': memPool.getMempoolInfo(),
      'vBytesPerSecond': memPool.getVBytesPerSecond(),
      'blocks': _blocks,
@@ -104,13 +96,11 @@ class WebsocketHandler {
  }

  setupConnectionHandling() {
-    if (!this.webSocketServers.length) {
-      throw new Error('No WebSocket.Server have been set');
+    if (!this.wss) {
+      throw new Error('WebSocket.Server is not set');
    }

-    // TODO - Fix indentation after PR is merged
-    for (const server of this.webSocketServers) {
-    server.on('connection', (client: WebSocket, req) => {
+    this.wss.on('connection', (client: WebSocket, req) => {
      this.numConnected++;
      client['remoteAddress'] = req.headers['x-forwarded-for'] || req.socket?.remoteAddress || 'unknown';
      client.on('error', (e) => {
@@ -130,7 +120,7 @@ class WebsocketHandler {
            for (const sub of wantable) {
              const key = `want-${sub}`;
              const wants = parsedMessage.data.includes(sub);
-              if (wants && !client[key]) {
+              if (wants && client['wants'] && !client[key]) {
                wantNow[key] = true;
              }
              client[key] = wants;
@@ -154,10 +144,6 @@ class WebsocketHandler {
            response['da'] = this.socketData['da'];
          }

-          if (wantNow['want-tomahawk']) {
-            response['tomahawk'] = JSON.stringify(bitcoinApi.getHealthStatus());
-          }
-
          if (parsedMessage && parsedMessage['track-tx']) {
            if (/^[a-fA-F0-9]{64}$/.test(parsedMessage['track-tx'])) {
              client['track-tx'] = parsedMessage['track-tx'];
@@ -215,52 +201,6 @@ class WebsocketHandler {
            }
          }

-          if (parsedMessage && parsedMessage['track-txs']) {
-            const txids: string[] = [];
-            if (Array.isArray(parsedMessage['track-txs'])) {
-              for (const txid of parsedMessage['track-txs']) {
-                if (/^[a-fA-F0-9]{64}$/.test(txid)) {
-                  txids.push(txid);
-                }
-              }
-            }
-
-            const txs: { [txid: string]: TxTrackingInfo } = {};
-            for (const txid of txids) {
-              const txInfo: TxTrackingInfo = {
-                confirmed: true,
-              };
-              const rbfCacheTxid = rbfCache.getReplacedBy(txid);
-              if (rbfCacheTxid) {
-                txInfo.replacedBy = rbfCacheTxid;
-                txInfo.confirmed = false;
-              }
-              const tx = memPool.getMempool()[txid];
-              if (tx && tx.position) {
-                txInfo.position = {
-                  ...tx.position
-                };
-                if (tx.acceleration) {
-                  txInfo.accelerated = tx.acceleration;
-                }
-              }
-              if (tx) {
-                txInfo.confirmed = false;
-              }
-              txs[txid] = txInfo;
-            }
-
-            if (txids.length) {
-              client['track-txs'] = txids;
-            } else {
-              client['track-txs'] = null;
-            }
-
-            if (Object.keys(txs).length) {
-              response['tracked-txs'] = JSON.stringify(txs);
-            }
-          }
-
          if (parsedMessage && parsedMessage['track-address']) {
            const validAddress = this.testAddress(parsedMessage['track-address']);
            if (validAddress) {
@@ -320,8 +260,7 @@ class WebsocketHandler {
              const mBlocksWithTransactions = mempoolBlocks.getMempoolBlocksWithTransactions();
              response['projected-block-transactions'] = JSON.stringify({
                index: index,
-                sequence: this.mempoolSequence,
-                blockTransactions: (mBlocksWithTransactions[index]?.transactions || []).map(mempoolBlocks.compressTx),
+                blockTransactions: mBlocksWithTransactions[index]?.transactions || [],
              });
            } else {
              client['track-mempool-block'] = null;
@@ -348,17 +287,6 @@ class WebsocketHandler {
            }
          }

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

-          if (parsedMessage['track-mempool-txids'] === true) {
-            client['track-mempool-txids'] = true;
-          } else if (parsedMessage['track-mempool-txids'] === false) {
-            delete client['track-mempool-txids'];
-          }
-
-          if (parsedMessage['track-mempool'] === true) {
-            client['track-mempool'] = true;
-          } else if (parsedMessage['track-mempool'] === false) {
-            delete client['track-mempool'];
+          if (parsedMessage['track-bisq-market']) {
+            if (/^[a-z]{3}_[a-z]{3}$/.test(parsedMessage['track-bisq-market'])) {
+              client['track-bisq-market'] = parsedMessage['track-bisq-market'];
+            } else {
+              client['track-bisq-market'] = null;
+            }
          }

          if (Object.keys(response).length) {
@@ -398,17 +322,14 @@ class WebsocketHandler {
        }
      });
    });
-    }
  }

  handleNewDonation(id: string) {
-    if (!this.webSocketServers.length) {
-      throw new Error('No WebSocket.Server have been set');
+    if (!this.wss) {
+      throw new Error('WebSocket.Server is not set');
    }

-    // TODO - Fix indentation after PR is merged
-    for (const server of this.webSocketServers) {
-    server.clients.forEach((client) => {
+    this.wss.clients.forEach((client) => {
      if (client.readyState !== WebSocket.OPEN) {
        return;
      }
@@ -416,50 +337,43 @@ class WebsocketHandler {
        client.send(JSON.stringify({ donationConfirmed: true }));
      }
    });
-    }
  }

  handleLoadingChanged(indicators: ILoadingIndicators) {
-    if (!this.webSocketServers.length) {
-      throw new Error('No WebSocket.Server have been set');
+    if (!this.wss) {
+      throw new Error('WebSocket.Server is not set');
    }

    this.updateSocketDataFields({ 'loadingIndicators': indicators });

    const response = JSON.stringify({ loadingIndicators: indicators });
-    // TODO - Fix indentation after PR is merged
-    for (const server of this.webSocketServers) {
-    server.clients.forEach((client) => {
+    this.wss.clients.forEach((client) => {
      if (client.readyState !== WebSocket.OPEN) {
        return;
      }
      client.send(response);
    });
-    }
  }

  handleNewConversionRates(conversionRates: ApiPrice) {
-    if (!this.webSocketServers.length) {
-      throw new Error('No WebSocket.Server have been set');
+    if (!this.wss) {
+      throw new Error('WebSocket.Server is not set');
    }

    this.updateSocketDataFields({ 'conversions': conversionRates });

    const response = JSON.stringify({ conversions: conversionRates });
-    // TODO - Fix indentation after PR is merged
-    for (const server of this.webSocketServers) {
-    server.clients.forEach((client) => {
+    this.wss.clients.forEach((client) => {
      if (client.readyState !== WebSocket.OPEN) {
        return;
      }
      client.send(response);
    });
-    }
  }

  handleNewStatistic(stats: OptimizedStatistic) {
-    if (!this.webSocketServers.length) {
-      throw new Error('No WebSocket.Server have been set');
+    if (!this.wss) {
+      throw new Error('WebSocket.Server is not set');
    }

    this.printLogs();
@@ -468,9 +382,7 @@ class WebsocketHandler {
      'live-2h-chart': stats
    });

-    // TODO - Fix indentation after PR is merged
-    for (const server of this.webSocketServers) {
-    server.clients.forEach((client) => {
+    this.wss.clients.forEach((client) => {
      if (client.readyState !== WebSocket.OPEN) {
        return;
      }
@@ -481,12 +393,11 @@ class WebsocketHandler {

      client.send(response);
    });
-    }
  }

  handleReorg(): void {
-    if (!this.webSocketServers.length) {
-      throw new Error('No WebSocket.Server have been set');
+    if (!this.wss) {
+      throw new Error('WebSocket.Server is not set');
    }

    const da = difficultyAdjustment.getDifficultyAdjustment();
@@ -497,9 +408,7 @@ class WebsocketHandler {
      'da': da?.previousTime ? da : undefined,
    });

-    // TODO - Fix indentation after PR is merged
-    for (const server of this.webSocketServers) {
-    server.clients.forEach((client) => {
+    this.wss.clients.forEach((client) => {
      if (client.readyState !== WebSocket.OPEN) {
        return;
      }
@@ -517,30 +426,24 @@ class WebsocketHandler {
        client.send(this.serializeResponse(response));
      }
    });
-    }
  }

  async $handleMempoolChange(newMempool: { [txid: string]: MempoolTransactionExtended }, mempoolSize: number,
-    newTransactions: MempoolTransactionExtended[], deletedTransactions: MempoolTransactionExtended[], accelerationDelta: string[],
-    candidates?: GbtCandidates): Promise<void> {
-    if (!this.webSocketServers.length) {
-      throw new Error('No WebSocket.Server have been set');
+    newTransactions: MempoolTransactionExtended[], deletedTransactions: MempoolTransactionExtended[], accelerationDelta: string[]): Promise<void> {
+    if (!this.wss) {
+      throw new Error('WebSocket.Server is not set');
    }

    this.printLogs();

-    const transactionIds = (memPool.limitGBT && candidates) ? Object.keys(candidates?.txs || {}) : Object.keys(newMempool);
-    let added = newTransactions;
-    let removed = deletedTransactions;
-    if (memPool.limitGBT) {
-      added = candidates?.added || [];
-      removed = candidates?.removed || [];
-    }
-
-    if (config.MEMPOOL.RUST_GBT) {
-      await mempoolBlocks.$rustUpdateBlockTemplates(transactionIds, newMempool, added, removed, candidates, true);
+    if (config.MEMPOOL.ADVANCED_GBT_MEMPOOL) {
+      if (config.MEMPOOL.RUST_GBT) {
+        await mempoolBlocks.$rustUpdateBlockTemplates(newMempool, mempoolSize, newTransactions, deletedTransactions, config.MEMPOOL_SERVICES.ACCELERATIONS);
+      } else {
+        await mempoolBlocks.$updateBlockTemplates(newMempool, newTransactions, deletedTransactions, accelerationDelta, true, config.MEMPOOL_SERVICES.ACCELERATIONS);
+      }
    } else {
-      await mempoolBlocks.$updateBlockTemplates(transactionIds, newMempool, added, removed, candidates, accelerationDelta, true, true);
+      mempoolBlocks.updateMempoolBlocks(newMempool, true);
    }

    const mBlocks = mempoolBlocks.getMempoolBlocks();
@@ -549,17 +452,15 @@ class WebsocketHandler {
    const vBytesPerSecond = memPool.getVBytesPerSecond();
    const rbfTransactions = Common.findRbfTransactions(newTransactions, deletedTransactions);
    const da = difficultyAdjustment.getDifficultyAdjustment();
-    const accelerations = memPool.getAccelerations();
    memPool.handleRbfTransactions(rbfTransactions);
    const rbfChanges = rbfCache.getRbfChanges();
    let rbfReplacements;
    let fullRbfReplacements;
    let rbfSummary;
-    if (Object.keys(rbfChanges.trees).length || !this.lastRbfSummary) {
+    if (Object.keys(rbfChanges.trees).length) {
      rbfReplacements = rbfCache.getRbfTrees(false);
      fullRbfReplacements = rbfCache.getRbfTrees(true);
-      rbfSummary = rbfCache.getLatestRbfSummary() || [];
-      this.lastRbfSummary = rbfSummary;
+      rbfSummary = rbfCache.getLatestRbfSummary();
    }

    for (const deletedTx of deletedTransactions) {
@@ -571,33 +472,6 @@ class WebsocketHandler {

    const latestTransactions = memPool.getLatestTransactions();

-    if (memPool.isInSync()) {
-      this.mempoolSequence++;
-    }
-
-    const replacedTransactions: { replaced: string, by: TransactionExtended }[] = [];
-    for (const tx of newTransactions) {
-      if (rbfTransactions[tx.txid]) {
-        for (const replaced of rbfTransactions[tx.txid]) {
-          replacedTransactions.push({ replaced: replaced.txid, by: tx });
-        }
-      }
-    }
-    const mempoolDeltaTxids: MempoolDeltaTxids = {
-      sequence: this.mempoolSequence,
-      added: newTransactions.map(tx => tx.txid),
-      removed: deletedTransactions.map(tx => tx.txid),
-      mined: [],
-      replaced: replacedTransactions.map(replacement => ({ replaced: replacement.replaced, by: replacement.by.txid })),
-    };
-    const mempoolDelta: MempoolDelta = {
-      sequence: this.mempoolSequence,
-      added: newTransactions,
-      removed: deletedTransactions.map(tx => tx.txid),
-      mined: [],
-      replaced: replacedTransactions,
-    };
-
    // update init data
    const socketDataFields = {
      'mempoolInfo': mempoolInfo,
@@ -625,19 +499,11 @@ class WebsocketHandler {
    // pre-compute new tracked outspends
    const outspendCache: { [txid: string]: { [vout: number]: { vin: number, txid: string } } } = {};
    const trackedTxs = new Set<string>();
-    // TODO - Fix indentation after PR is merged
-    for (const server of this.webSocketServers) {
-    server.clients.forEach((client) => {
+    this.wss.clients.forEach((client) => {
      if (client['track-tx']) {
        trackedTxs.add(client['track-tx']);
      }
-      if (client['track-txs']) {
-        for (const txid of client['track-txs']) {
-          trackedTxs.add(txid);
-        }
-      }
    });
-    }
    if (trackedTxs.size > 0) {
      for (const tx of newTransactions) {
        for (let i = 0; i < tx.vin.length; i++) {
@@ -657,15 +523,7 @@ class WebsocketHandler {
    const addressCache = this.makeAddressCache(newTransactions);
    const removedAddressCache = this.makeAddressCache(deletedTransactions);

-    // pre-compute acceleration delta
-    const accelerationUpdate = {
-      added: accelerationDelta.map(txid => accelerations[txid]).filter(acc => acc != null),
-      removed: accelerationDelta.filter(txid => !accelerations[txid]),
-    };
-
-    // TODO - Fix indentation after PR is merged
-    for (const server of this.webSocketServers) {
-    server.clients.forEach(async (client) => {
+    this.wss.clients.forEach(async (client) => {
      if (client.readyState !== WebSocket.OPEN) {
        return;
      }
@@ -686,10 +544,6 @@ class WebsocketHandler {
        response['mempool-blocks'] = getCachedResponse('mempool-blocks', mBlocks);
      }

-      if (client['want-tomahawk']) {
-        response['tomahawk'] = getCachedResponse('tomahawk', bitcoinApi.getHealthStatus());
-      }
-
      if (client['track-mempool-tx']) {
        const tx = newTransactions.find((t) => t.txid === client['track-mempool-tx']);
        if (tx) {
@@ -821,15 +675,9 @@ class WebsocketHandler {
            position: {
              ...mempoolTx.position,
              accelerated: mempoolTx.acceleration || undefined,
-              acceleratedBy: mempoolTx.acceleratedBy || undefined,
-              acceleratedAt: mempoolTx.acceleratedAt || undefined,
-              feeDelta: mempoolTx.feeDelta || undefined,
            },
            accelerationPositions: memPool.getAccelerationPositions(mempoolTx.txid),
          };
-          if (!mempoolTx.cpfpChecked && !mempoolTx.acceleration) {
-            calculateMempoolTxCpfp(mempoolTx, newMempool);
-          }
          if (mempoolTx.cpfpDirty) {
            positionData['cpfp'] = {
              ancestors: mempoolTx.ancestors,
@@ -845,55 +693,11 @@ class WebsocketHandler {
        }
      }

-      if (client['track-txs']) {
-        const txids = client['track-txs'];
-        const txs: { [txid: string]: TxTrackingInfo } = {};
-        for (const txid of txids) {
-          const txInfo: TxTrackingInfo = {};
-          const outspends = outspendCache[txid];
-          if (outspends && Object.keys(outspends).length) {
-            txInfo.utxoSpent = outspends;
-          }
-          const replacedBy = rbfChanges.map[txid] ? rbfCache.getReplacedBy(txid) : false;
-          if (replacedBy) {
-            txInfo.replacedBy = replacedBy;
-          }
-          const mempoolTx = newMempool[txid];
-          if (mempoolTx && mempoolTx.position) {
-            txInfo.position = {
-              ...mempoolTx.position,
-              accelerated: mempoolTx.acceleration || undefined,
-              acceleratedBy: mempoolTx.acceleratedBy || undefined,
-              acceleratedAt: mempoolTx.acceleratedAt || undefined,
-              feeDelta: mempoolTx.feeDelta || undefined,
-            };
-            if (!mempoolTx.cpfpChecked) {
-              calculateMempoolTxCpfp(mempoolTx, newMempool);
-            }
-            if (mempoolTx.cpfpDirty) {
-              txInfo.cpfp = {
-                ancestors: mempoolTx.ancestors,
-                bestDescendant: mempoolTx.bestDescendant || null,
-                descendants: mempoolTx.descendants || null,
-                effectiveFeePerVsize: mempoolTx.effectiveFeePerVsize || null,
-                sigops: mempoolTx.sigops,
-                adjustedVsize: mempoolTx.adjustedVsize,
-              };
-            }
-          }
-          txs[txid] = txInfo;
-        }
-        if (Object.keys(txs).length) {
-          response['tracked-txs'] = JSON.stringify(txs);
-        }
-      }
-
      if (client['track-mempool-block'] >= 0 && memPool.isInSync()) {
        const index = client['track-mempool-block'];
        if (mBlockDeltas[index]) {
          response['projected-block-transactions'] = getCachedResponse(`projected-block-transactions-${index}`, {
            index: index,
-            sequence: this.mempoolSequence,
            delta: mBlockDeltas[index],
          });
        }
@@ -909,42 +713,20 @@ class WebsocketHandler {
        response['rbfLatestSummary'] = getCachedResponse('rbfLatestSummary', rbfSummary);
      }

-      if (client['track-mempool-txids']) {
-        response['mempool-txids'] = getCachedResponse('mempool-txids', mempoolDeltaTxids);
-      }
-
-      if (client['track-mempool']) {
-        response['mempool-transactions'] = getCachedResponse('mempool-transactions', mempoolDelta);
-      }
-
-      if (client['track-accelerations'] && (accelerationUpdate.added.length || accelerationUpdate.removed.length)) {
-        response['accelerations'] = getCachedResponse('accelerations', accelerationUpdate);
-      }
-
      if (Object.keys(response).length) {
        client.send(this.serializeResponse(response));
      }
    });
-    }
  }
 
  async handleNewBlock(block: BlockExtended, txIds: string[], transactions: MempoolTransactionExtended[]): Promise<void> {
-    if (!this.webSocketServers.length) {
-      throw new Error('No WebSocket.Server have been set');
+    if (!this.wss) {
+      throw new Error('WebSocket.Server is not set');
    }

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

    const _memPool = memPool.getMempool();
-    const candidateTxs = await memPool.getMempoolCandidates();
-    let candidates: GbtCandidates | undefined = (memPool.limitGBT && candidateTxs) ? { txs: candidateTxs, added: [], removed: [] } : undefined;
-    let transactionIds: string[] = (memPool.limitGBT) ? Object.keys(candidates?.txs || {}) : Object.keys(_memPool);
-
-    const accelerations = Object.values(mempool.getAccelerations());
-    await accelerationRepository.$indexAccelerationsForBlock(block, accelerations, structuredClone(transactions));

    const rbfTransactions = Common.findMinedRbfTransactions(transactions, memPool.getSpendMap());
    memPool.handleMinedRbfTransactions(rbfTransactions);
@@ -952,19 +734,36 @@ class WebsocketHandler {

    if (config.MEMPOOL.AUDIT && memPool.isInSync()) {
      let projectedBlocks;
-      const auditMempool = _memPool;
-      const isAccelerated = accelerationApi.isAcceleratedBlock(block, Object.values(mempool.getAccelerations()));
-
-      if (config.MEMPOOL.RUST_GBT) {
-        const added = memPool.limitGBT ? (candidates?.added || []) : [];
-        const removed = memPool.limitGBT ? (candidates?.removed || []) : [];
-        projectedBlocks = await mempoolBlocks.$rustUpdateBlockTemplates(transactionIds, auditMempool, added, removed, candidates, isAccelerated, block.extras.pool.id);
+      let auditMempool = _memPool;
+      const isAccelerated = config.MEMPOOL_SERVICES.ACCELERATIONS && accelerationApi.isAcceleratedBlock(block, Object.values(mempool.getAccelerations()));
+      // template calculation functions have mempool side effects, so calculate audits using
+      // a cloned copy of the mempool if we're running a different algorithm for mempool updates
+      const separateAudit = config.MEMPOOL.ADVANCED_GBT_AUDIT !== config.MEMPOOL.ADVANCED_GBT_MEMPOOL;
+      if (separateAudit) {
+        auditMempool = deepClone(_memPool);
+        if (config.MEMPOOL.ADVANCED_GBT_AUDIT) {
+          if (config.MEMPOOL.RUST_GBT) {
+            projectedBlocks = await mempoolBlocks.$oneOffRustBlockTemplates(auditMempool, isAccelerated, block.extras.pool.id);
+          } else {
+            projectedBlocks = await mempoolBlocks.$makeBlockTemplates(auditMempool, false, isAccelerated, block.extras.pool.id);
+          }
+        } else {
+          projectedBlocks = mempoolBlocks.updateMempoolBlocks(auditMempool, false);
+        }
      } else {
-        projectedBlocks = await mempoolBlocks.$makeBlockTemplates(transactionIds, auditMempool, candidates, false, isAccelerated, block.extras.pool.id);
+        if ((config.MEMPOOL_SERVICES.ACCELERATIONS)) {
+          if (config.MEMPOOL.RUST_GBT) {
+            projectedBlocks = await mempoolBlocks.$rustUpdateBlockTemplates(auditMempool, Object.keys(auditMempool).length, [], [], isAccelerated, block.extras.pool.id);
+          } else {
+            projectedBlocks = await mempoolBlocks.$makeBlockTemplates(auditMempool, false, isAccelerated, block.extras.pool.id);
+          }
+        } else {
+          projectedBlocks = mempoolBlocks.getMempoolBlocksWithTransactions();
+        }
      }

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

        const stripped = projectedBlocks[0]?.transactions ? projectedBlocks[0].transactions : [];
@@ -986,13 +785,10 @@ class WebsocketHandler {
        });

        BlocksAuditsRepository.$saveAudit({
-          version: 1,
          time: block.timestamp,
          height: block.height,
          hash: block.id,
-          unseenTxs: unseen,
          addedTxs: added,
-          prioritizedTxs: prioritized,
          missingTxs: censored,
          freshTxs: fresh,
          sigopTxs: sigop,
@@ -1026,23 +822,14 @@ class WebsocketHandler {
      confirmedTxids[txId] = true;
    }

-    if (memPool.limitGBT) {
-      const minFeeMempool = memPool.limitGBT ? await bitcoinSecondClient.getRawMemPool() : null;
-      const minFeeTip = memPool.limitGBT ? await bitcoinSecondClient.getBlockCount() : -1;
-      candidates = await memPool.getNextCandidates(minFeeMempool, minFeeTip, transactions);
-      transactionIds = Object.keys(candidates?.txs || {});
+    if (config.MEMPOOL.ADVANCED_GBT_MEMPOOL) {
+      if (config.MEMPOOL.RUST_GBT) {
+        await mempoolBlocks.$rustUpdateBlockTemplates(_memPool, Object.keys(_memPool).length, [], transactions, true);
+      } else {
+        await mempoolBlocks.$makeBlockTemplates(_memPool, true, config.MEMPOOL_SERVICES.ACCELERATIONS);
+      }
    } else {
-      candidates = undefined;
-      transactionIds = Object.keys(memPool.getMempool());
-    }
-
-
-    if (config.MEMPOOL.RUST_GBT) {
-      const added = memPool.limitGBT ? (candidates?.added || []) : [];
-      const removed = memPool.limitGBT ? (candidates?.removed || []) : transactions;
-      await mempoolBlocks.$rustUpdateBlockTemplates(transactionIds, _memPool, added, removed, candidates, true);
-    } else {
-      await mempoolBlocks.$makeBlockTemplates(transactionIds, _memPool, candidates, true, true);
+      mempoolBlocks.updateMempoolBlocks(_memPool, true);
    }
    const mBlocks = mempoolBlocks.getMempoolBlocks();
    const mBlockDeltas = mempoolBlocks.getMempoolBlockDeltas();
@@ -1066,31 +853,6 @@ class WebsocketHandler {

    const mBlocksWithTransactions = mempoolBlocks.getMempoolBlocksWithTransactions();

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

-    // TODO - Fix indentation after PR is merged
-    for (const server of this.webSocketServers) {
-    server.clients.forEach((client) => {
+    this.wss.clients.forEach((client) => {
      if (client.readyState !== WebSocket.OPEN) {
        return;
      }
@@ -1126,10 +886,6 @@ class WebsocketHandler {
        response['mempool-blocks'] = getCachedResponse('mempool-blocks', mBlocks);
      }

-      if (client['want-tomahawk']) {
-        response['tomahawk'] = getCachedResponse('tomahawk', bitcoinApi.getHealthStatus());
-      }
-
      if (client['track-tx']) {
        const trackTxid = client['track-tx'];
        if (trackTxid && confirmedTxids[trackTxid]) {
@@ -1142,9 +898,6 @@ class WebsocketHandler {
              position: {
                ...mempoolTx.position,
                accelerated: mempoolTx.acceleration || undefined,
-                acceleratedBy: mempoolTx.acceleratedBy || undefined,
-                acceleratedAt: mempoolTx.acceleratedAt || undefined,
-                feeDelta: mempoolTx.feeDelta || undefined,
              },
              accelerationPositions: memPool.getAccelerationPositions(mempoolTx.txid),
            });
@@ -1152,31 +905,6 @@ class WebsocketHandler {
        }
      }

-      if (client['track-txs']) {
-        const txs: { [txid: string]: TxTrackingInfo } = {};
-        for (const txid of client['track-txs']) {
-          if (confirmedTxids[txid]) {
-            txs[txid] = { confirmed: true };
-          } else {
-            const mempoolTx = _memPool[txid];
-            if (mempoolTx && mempoolTx.position) {
-              txs[txid] = {
-                position: {
-                  ...mempoolTx.position,
-                },
-                accelerated: mempoolTx.acceleration || undefined,
-                acceleratedBy: mempoolTx.acceleratedBy || undefined,
-                acceleratedAt: mempoolTx.acceleratedAt || undefined,
-                feeDelta: mempoolTx.feeDelta || undefined,
-              };
-            }
-          }
-        }
-        if (Object.keys(txs).length) {
-          response['tracked-txs'] = JSON.stringify(txs);
-        }
-      }
-
      if (client['track-address']) {
        const foundTransactions: TransactionExtended[] = Array.from(addressCache[client['track-address']]?.values() || []);

@@ -1274,41 +1002,28 @@ class WebsocketHandler {
          if (mBlockDeltas[index].added.length > (mBlocksWithTransactions[index]?.transactions.length / 2)) {
            response['projected-block-transactions'] = getCachedResponse(`projected-block-transactions-full-${index}`, {
              index: index,
-              sequence: this.mempoolSequence,
-              blockTransactions: mBlocksWithTransactions[index].transactions.map(mempoolBlocks.compressTx),
+              blockTransactions: mBlocksWithTransactions[index].transactions,
            });
          } else {
            response['projected-block-transactions'] = getCachedResponse(`projected-block-transactions-delta-${index}`, {
              index: index,
-              sequence: this.mempoolSequence,
              delta: mBlockDeltas[index],
            });
          }
        }
      }

-      if (client['track-mempool-txids']) {
-        response['mempool-txids'] = getCachedResponse('mempool-txids', mempoolDeltaTxids);
-      }
-
-      if (client['track-mempool']) {
-        response['mempool-transactions'] = getCachedResponse('mempool-transactions', mempoolDelta);
-      }
-
      if (Object.keys(response).length) {
        client.send(this.serializeResponse(response));
      }
    });
-    }
-
-    await statistics.runStatistics();
  }

  // takes a dictionary of JSON serialized values
  // and zips it together into a valid JSON object
  private serializeResponse(response): string {
    return '{'
-        + Object.keys(response).filter(key => response[key] != null).map(key => `"${key}": ${response[key]}`).join(', ')
+        + Object.keys(response).map(key => `"${key}": ${response[key]}`).join(', ')
        + '}';
  }

@@ -1381,21 +1096,15 @@ class WebsocketHandler {
  }

  private printLogs(): void {
-    if (this.webSocketServers.length) {
+    if (this.wss) {
      let numTxSubs = 0;
-      let numTxsSubs = 0;
      let numProjectedSubs = 0;
      let numRbfSubs = 0;

-      // TODO - Fix indentation after PR is merged
-      for (const server of this.webSocketServers) {
-      server.clients.forEach((client) => {
+      this.wss.clients.forEach((client) => {
        if (client['track-tx']) {
          numTxSubs++;
        }
-        if (client['track-txs']) {
-          numTxsSubs++;
-        }
        if (client['track-mempool-block'] != null && client['track-mempool-block'] >= 0) {
          numProjectedSubs++;
        }
@@ -1403,16 +1112,12 @@ class WebsocketHandler {
          numRbfSubs++;
        }
      })
-      }

-      let count = 0;
-      for (const server of this.webSocketServers) {
-        count += server.clients?.size || 0;
-      }
+      const count = this.wss?.clients?.size || 0;
      const diff = count - this.numClients;
      this.numClients = count;
      logger.debug(`${count} websocket clients | ${this.numConnected} connected | ${this.numDisconnected} disconnected | (${diff >= 0 ? '+' : ''}${diff})`);
-      logger.debug(`websocket subscriptions: track-tx: ${numTxSubs}, track-txs: ${numTxsSubs}, track-mempool-block: ${numProjectedSubs} track-rbf: ${numRbfSubs}`);
+      logger.debug(`websocket subscriptions: track-tx: ${numTxSubs}, track-mempool-block: ${numProjectedSubs} track-rbf: ${numRbfSubs}`);
      this.numConnected = 0;
      this.numDisconnected = 0;
    }
--- a/backend/src/config.ts
+++ b/backend/src/config.ts
@@ -5,11 +5,9 @@ const configFromFile = require(
 interface IConfig {
  MEMPOOL: {
    ENABLED: boolean;
-    OFFICIAL: boolean;
    NETWORK: 'mainnet' | 'testnet' | 'signet' | 'liquid' | 'liquidtestnet';
    BACKEND: 'esplora' | 'electrum' | 'none';
    HTTP_PORT: number;
-    UNIX_SOCKET_PATH: string;
    SPAWN_CLUSTER_PROCS: number;
    API_URL_PREFIX: string;
    POLL_RATE_MS: number;
@@ -29,12 +27,13 @@ interface IConfig {
    EXTERNAL_RETRY_INTERVAL: number;
    USER_AGENT: string;
    STDOUT_LOG_MIN_PRIORITY: 'emerg' | 'alert' | 'crit' | 'err' | 'warn' | 'notice' | 'info' | 'debug';
-    AUTOMATIC_POOLS_UPDATE: boolean;
+    AUTOMATIC_BLOCK_REINDEXING: boolean;
    POOLS_JSON_URL: string,
    POOLS_JSON_TREE_URL: string,
    AUDIT: boolean;
+    ADVANCED_GBT_AUDIT: boolean;
+    ADVANCED_GBT_MEMPOOL: boolean;
    RUST_GBT: boolean;
-    LIMIT_GBT: boolean;
    CPFP_INDEXING: boolean;
    MAX_BLOCKS_BULK_QUERY: number;
    DISK_CACHE_BLOCK_INTERVAL: number;
@@ -51,7 +50,6 @@ interface IConfig {
    REQUEST_TIMEOUT: number;
    FALLBACK_TIMEOUT: number;
    FALLBACK: string[];
-    MAX_BEHIND_TIP: number;
  };
  LIGHTNING: {
    ENABLED: boolean;
@@ -105,7 +103,6 @@ interface IConfig {
    PASSWORD: string;
    TIMEOUT: number;
    PID_DIR: string;
-    POOL_SIZE: number;
  };
  SYSLOG: {
    ENABLED: boolean;
@@ -118,6 +115,10 @@ interface IConfig {
    ENABLED: boolean;
    TX_PER_SECOND_SAMPLE_PERIOD: number;
  };
+  BISQ: {
+    ENABLED: boolean;
+    DATA_PATH: string;
+  };
  SOCKS5PROXY: {
    ENABLED: boolean;
    USE_ONION: boolean;
@@ -131,6 +132,8 @@ interface IConfig {
    MEMPOOL_ONION: string;
    LIQUID_API: string;
    LIQUID_ONION: string;
+    BISQ_URL: string;
+    BISQ_ONION: string;
  };
  MAXMIND: {
    ENABLED: boolean;
@@ -142,8 +145,6 @@ interface IConfig {
    ENABLED: boolean;
    AUDIT: boolean;
    AUDIT_START_HEIGHT: number;
-    STATISTICS: boolean;
-    STATISTICS_START_TIME: number | string;
    SERVERS: string[];
  },
  MEMPOOL_SERVICES: {
@@ -155,21 +156,14 @@ interface IConfig {
    UNIX_SOCKET_PATH: string;
    BATCH_QUERY_BASE_SIZE: number;
  },
-  FIAT_PRICE: {
-    ENABLED: boolean;
-    PAID: boolean;
-    API_KEY: string;
-  },
 }

 const defaults: IConfig = {
  'MEMPOOL': {
    'ENABLED': true,
-    'OFFICIAL': false,
    'NETWORK': 'mainnet',
    'BACKEND': 'none',
    'HTTP_PORT': 8999,
-    'UNIX_SOCKET_PATH': '',
    'SPAWN_CLUSTER_PROCS': 0,
    'API_URL_PREFIX': '/api/v1/',
    'POLL_RATE_MS': 2000,
@@ -189,12 +183,13 @@ const defaults: IConfig = {
    'EXTERNAL_RETRY_INTERVAL': 0,
    'USER_AGENT': 'mempool',
    'STDOUT_LOG_MIN_PRIORITY': 'debug',
-    'AUTOMATIC_POOLS_UPDATE': false,
+    'AUTOMATIC_BLOCK_REINDEXING': false,
    'POOLS_JSON_URL': 'https://raw.githubusercontent.com/mempool/mining-pools/master/pools-v2.json',
    'POOLS_JSON_TREE_URL': 'https://api.github.com/repos/mempool/mining-pools/git/trees/master',
    'AUDIT': false,
-    'RUST_GBT': true,
-    'LIMIT_GBT': false,
+    'ADVANCED_GBT_AUDIT': false,
+    'ADVANCED_GBT_MEMPOOL': false,
+    'RUST_GBT': false,
    'CPFP_INDEXING': false,
    'MAX_BLOCKS_BULK_QUERY': 0,
    'DISK_CACHE_BLOCK_INTERVAL': 6,
@@ -211,7 +206,6 @@ const defaults: IConfig = {
    'REQUEST_TIMEOUT': 10000,
    'FALLBACK_TIMEOUT': 5000,
    'FALLBACK': [],
-    'MAX_BEHIND_TIP': 2,
  },
  'ELECTRUM': {
    'HOST': '127.0.0.1',
@@ -246,7 +240,6 @@ const defaults: IConfig = {
    'PASSWORD': 'mempool',
    'TIMEOUT': 180000,
    'PID_DIR': '',
-    'POOL_SIZE': 100,
  },
  'SYSLOG': {
    'ENABLED': true,
@@ -259,6 +252,10 @@ const defaults: IConfig = {
    'ENABLED': true,
    'TX_PER_SECOND_SAMPLE_PERIOD': 150
  },
+  'BISQ': {
+    'ENABLED': false,
+    'DATA_PATH': '/bisq/statsnode-data/btc_mainnet/db'
+  },
  'LIGHTNING': {
    'ENABLED': false,
    'BACKEND': 'lnd',
@@ -290,7 +287,9 @@ const defaults: IConfig = {
    'MEMPOOL_API': 'https://mempool.space/api/v1',
    'MEMPOOL_ONION': 'http://mempoolhqx4isw62xs7abwphsq7ldayuidyx2v2oethdhhj6mlo2r6ad.onion/api/v1',
    'LIQUID_API': 'https://liquid.network/api/v1',
-    'LIQUID_ONION': 'http://liquidmom47f6s3m53ebfxn47p76a6tlnxib3wp6deux7wuzotdr6cyd.onion/api/v1'
+    'LIQUID_ONION': 'http://liquidmom47f6s3m53ebfxn47p76a6tlnxib3wp6deux7wuzotdr6cyd.onion/api/v1',
+    'BISQ_URL': 'https://bisq.markets/api',
+    'BISQ_ONION': 'http://bisqmktse2cabavbr2xjq7xw3h6g5ottemo5rolfcwt6aly6tp5fdryd.onion/api'
  },
  'MAXMIND': {
    'ENABLED': false,
@@ -302,8 +301,6 @@ const defaults: IConfig = {
    'ENABLED': false,
    'AUDIT': false,
    'AUDIT_START_HEIGHT': 774000,
-    'STATISTICS': false,
-    'STATISTICS_START_TIME': 1481932800,
    'SERVERS': [],
  },
  'MEMPOOL_SERVICES': {
@@ -315,11 +312,6 @@ const defaults: IConfig = {
    'UNIX_SOCKET_PATH': '',
    'BATCH_QUERY_BASE_SIZE': 5000,
  },
-  'FIAT_PRICE': {
-    'ENABLED': true,
-    'PAID': false,
-    'API_KEY': '',
-  },
 };

 class Config implements IConfig {
@@ -331,6 +323,7 @@ class Config implements IConfig {
  DATABASE: IConfig['DATABASE'];
  SYSLOG: IConfig['SYSLOG'];
  STATISTICS: IConfig['STATISTICS'];
+  BISQ: IConfig['BISQ'];
  LIGHTNING: IConfig['LIGHTNING'];
  LND: IConfig['LND'];
  CLIGHTNING: IConfig['CLIGHTNING'];
@@ -340,7 +333,6 @@ class Config implements IConfig {
  REPLICATION: IConfig['REPLICATION'];
  MEMPOOL_SERVICES: IConfig['MEMPOOL_SERVICES'];
  REDIS: IConfig['REDIS'];
-  FIAT_PRICE: IConfig['FIAT_PRICE'];

  constructor() {
    const configs = this.merge(configFromFile, defaults);
@@ -352,6 +344,7 @@ class Config implements IConfig {
    this.DATABASE = configs.DATABASE;
    this.SYSLOG = configs.SYSLOG;
    this.STATISTICS = configs.STATISTICS;
+    this.BISQ = configs.BISQ;
    this.LIGHTNING = configs.LIGHTNING;
    this.LND = configs.LND;
    this.CLIGHTNING = configs.CLIGHTNING;
@@ -361,7 +354,6 @@ class Config implements IConfig {
    this.REPLICATION = configs.REPLICATION;
    this.MEMPOOL_SERVICES = configs.MEMPOOL_SERVICES;
    this.REDIS = configs.REDIS;
-    this.FIAT_PRICE = configs.FIAT_PRICE;
  }

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

@@ -20,7 +21,7 @@ import { execSync } from 'child_process';
    database: config.DATABASE.DATABASE,
    user: config.DATABASE.USERNAME,
    password: config.DATABASE.PASSWORD,
-    connectionLimit: config.DATABASE.POOL_SIZE,
+    connectionLimit: 10,
    supportBigNumbers: true,
    timezone: '+00:00',
  };
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -11,6 +11,8 @@ import memPool from './api/mempool';
 import diskCache from './api/disk-cache';
 import statistics from './api/statistics/statistics';
 import websocketHandler from './api/websocket-handler';
+import bisq from './api/bisq/bisq';
+import bisqMarkets from './api/bisq/markets';
 import logger from './logger';
 import backendInfo from './api/backend-info';
 import loadingIndicators from './api/loading-indicators';
@@ -30,6 +32,7 @@ import networkSyncService from './tasks/lightning/network-sync.service';
 import statisticsRoutes from './api/statistics/statistics.routes';
 import pricesRoutes from './api/prices/prices.routes';
 import miningRoutes from './api/mining/mining-routes';
+import bisqRoutes from './api/bisq/bisq.routes';
 import liquidRoutes from './api/liquid/liquid.routes';
 import bitcoinRoutes from './api/bitcoin/bitcoin.routes';
 import fundingTxFetcher from './tasks/lightning/sync-tasks/funding-tx-fetcher';
@@ -42,16 +45,10 @@ import { formatBytes, getBytesUnit } from './utils/format';
 import redisCache from './api/redis-cache';
 import accelerationApi from './api/services/acceleration';
 import bitcoinCoreRoutes from './api/bitcoin/bitcoin-core.routes';
-import bitcoinSecondClient from './api/bitcoin/bitcoin-second-client';
-import accelerationRoutes from './api/acceleration/acceleration.routes';
-import aboutRoutes from './api/about.routes';
-import mempoolBlocks from './api/mempool-blocks';

 class Server {
  private wss: WebSocket.Server | undefined;
-  private wssUnixSocket: WebSocket.Server | undefined;
  private server: http.Server | undefined;
-  private serverUnixSocket: http.Server | undefined;
  private app: Application;
  private currentBackendRetryInterval = 1;
  private backendRetryCount = 0;
@@ -132,25 +129,19 @@ class Server {
      })
      .use(express.urlencoded({ extended: true }))
      .use(express.text({ type: ['text/plain', 'application/base64'] }))
-      .use(express.json())
      ;

-    if (config.DATABASE.ENABLED && config.FIAT_PRICE.ENABLED) {
+    if (config.DATABASE.ENABLED) {
      await priceUpdater.$initializeLatestPriceWithDb();
    }

    this.server = http.createServer(this.app);
    this.wss = new WebSocket.Server({ server: this.server });
-    if (config.MEMPOOL.UNIX_SOCKET_PATH) {
-      this.serverUnixSocket = http.createServer(this.app);
-      this.wssUnixSocket = new WebSocket.Server({ server: this.serverUnixSocket });
-    }

    this.setUpWebsocketHandling();

    await poolsUpdater.updatePoolsJson(); // Needs to be done before loading the disk cache because we sometimes wipe it
    await syncAssets.syncAssets$();
-    await mempoolBlocks.updatePools$();
    if (config.MEMPOOL.ENABLED) {
      if (config.MEMPOOL.CACHE_ENABLED) {
        await diskCache.$loadMempoolCache();
@@ -164,22 +155,14 @@ class Server {
    }

    if (Common.isLiquid()) {
-      const refreshIcons = () => {
-        try {
-          icons.loadIcons();
-        } catch (e) {
-          logger.err('Cannot load liquid icons. Ignoring. Reason: ' + (e instanceof Error ? e.message : e));
-        }
-      };
-      // Run once on startup.
-      refreshIcons();
-      // Matches crontab refresh interval for asset db.
-      setInterval(refreshIcons, 3600_000);
+      try {
+        icons.loadIcons();
+      } catch (e) {
+        logger.err('Cannot load liquid icons. Ignoring. Reason: ' + (e instanceof Error ? e.message : e));
+      }
    }

-    if (config.FIAT_PRICE.ENABLED) {
-      priceUpdater.$run();
-    }
+    priceUpdater.$run();
    await chainTips.updateOrphanedBlocks();

    this.setUpHttpApiRoutes();
@@ -190,6 +173,13 @@ class Server {

    setInterval(() => { this.healthCheck(); }, 2500);

+    if (config.BISQ.ENABLED) {
+      bisq.startBisqService();
+      bisq.setPriceCallbackFunction((price) => websocketHandler.setExtraInitData('bsq-price', price));
+      blocks.setNewBlockCallback(bisq.handleNewBitcoinBlock.bind(bisq));
+      bisqMarkets.startBisqService();
+    }
+
    if (config.LIGHTNING.ENABLED) {
      this.$runLightningBackend();
    }
@@ -201,16 +191,6 @@ class Server {
        logger.notice(`Mempool Server is running on port ${config.MEMPOOL.HTTP_PORT}`);
      }
    });
-
-    if (this.serverUnixSocket) {
-      this.serverUnixSocket.listen(config.MEMPOOL.UNIX_SOCKET_PATH, () => {
-        if (worker) {
-          logger.info(`Mempool Server worker #${process.pid} started`);
-        } else {
-          logger.notice(`Mempool Server is listening on ${config.MEMPOOL.UNIX_SOCKET_PATH}`);
-        }
-      });
-    }
  }

  async runMainUpdateLoop(): Promise<void> {
@@ -227,18 +207,14 @@ class Server {
        }
      }
      const newMempool = await bitcoinApi.$getRawMempool();
-      const minFeeMempool = memPool.limitGBT ? await bitcoinSecondClient.getRawMemPool() : null;
-      const minFeeTip = memPool.limitGBT ? await bitcoinSecondClient.getBlockCount() : -1;
-      const newAccelerations = await accelerationApi.$updateAccelerations();
+      const newAccelerations = await accelerationApi.$fetchAccelerations();
      const numHandledBlocks = await blocks.$updateBlocks();
      const pollRate = config.MEMPOOL.POLL_RATE_MS * (indexer.indexerIsRunning() ? 10 : 1);
      if (numHandledBlocks === 0) {
-        await memPool.$updateMempool(newMempool, newAccelerations, minFeeMempool, minFeeTip, pollRate);
+        await memPool.$updateMempool(newMempool, newAccelerations, pollRate);
      }
      indexer.$run();
-      if (config.FIAT_PRICE.ENABLED) {
-        priceUpdater.$run();
-      }
+      priceUpdater.$run();

      // rerun immediately if we skipped the mempool update, otherwise wait POLL_RATE_MS
      const elapsed = Date.now() - start;
@@ -284,17 +260,12 @@ class Server {

  setUpWebsocketHandling(): void {
    if (this.wss) {
-      websocketHandler.addWebsocketServer(this.wss);
+      websocketHandler.setWebsocketServer(this.wss);
    }
-    if (this.wssUnixSocket) {
-      websocketHandler.addWebsocketServer(this.wssUnixSocket);
-    }
-
    if (Common.isLiquid() && config.DATABASE.ENABLED) {
      blocks.setNewBlockCallback(async () => {
        try {
          await elementsParser.$parse();
-          await elementsParser.$updateFederationUtxos();
        } catch (e) {
          logger.warn('Elements parsing error: ' + (e instanceof Error ? e.message : e));
        }
@@ -306,9 +277,7 @@ class Server {
      memPool.setAsyncMempoolChangedCallback(websocketHandler.$handleMempoolChange.bind(websocketHandler));
      blocks.setNewAsyncBlockCallback(websocketHandler.handleNewBlock.bind(websocketHandler));
    }
-    if (config.FIAT_PRICE.ENABLED) {
-      priceUpdater.setRatesChangedCallback(websocketHandler.handleNewConversionRates.bind(websocketHandler));
-    }
+    priceUpdater.setRatesChangedCallback(websocketHandler.handleNewConversionRates.bind(websocketHandler));
    loadingIndicators.setProgressChangedCallback(websocketHandler.handleLoadingChanged.bind(websocketHandler));
  }
  
@@ -322,6 +291,9 @@ class Server {
    if (Common.indexingEnabled() && config.MEMPOOL.ENABLED) {
      miningRoutes.initRoutes(this.app);
    }
+    if (config.BISQ.ENABLED) {
+      bisqRoutes.initRoutes(this.app);
+    }
    if (Common.isLiquid()) {
      liquidRoutes.initRoutes(this.app);
    }
@@ -330,12 +302,6 @@ class Server {
      nodesRoutes.initRoutes(this.app);
      channelsRoutes.initRoutes(this.app);
    }
-    if (config.MEMPOOL_SERVICES.ACCELERATIONS) {
-      accelerationRoutes.initRoutes(this.app);
-    }
-    if (!config.MEMPOOL.OFFICIAL) {
-      aboutRoutes.initRoutes(this.app);
-    }
  }

  healthCheck(): void {
@@ -363,12 +329,6 @@ class Server {
    if (config.DATABASE.ENABLED) {
      DB.releasePidLock();
    }
-    this.server?.close();
-    this.serverUnixSocket?.close();
-    this.wss?.close();
-    if (this.wssUnixSocket) {
-      this.wssUnixSocket.close();
-    }
    process.exit(code);
  }

--- a/backend/src/indexer.ts
+++ b/backend/src/indexer.ts
@@ -8,9 +8,6 @@ import priceUpdater from './tasks/price-updater';
 import PricesRepository from './repositories/PricesRepository';
 import config from './config';
 import auditReplicator from './replication/AuditReplication';
-import statisticsReplicator from './replication/StatisticsReplication';
-import AccelerationRepository from './repositories/AccelerationRepository';
-import BlocksAuditsRepository from './repositories/BlocksAuditsRepository';

 export interface CoreIndex {
  name: string;
@@ -119,7 +116,7 @@ class Indexer {

    switch (task) {
      case 'blocksPrices': {
-        if (!['testnet', 'signet'].includes(config.MEMPOOL.NETWORK) && config.FIAT_PRICE.ENABLED) {
+        if (!['testnet', 'signet'].includes(config.MEMPOOL.NETWORK)) {
          let lastestPriceId;
          try {
            lastestPriceId = await PricesRepository.$getLatestPriceId();
@@ -151,12 +148,10 @@ class Indexer {
      return;
    }

-    if (config.FIAT_PRICE.ENABLED) {
-      try {
-        await priceUpdater.$run();
-      } catch (e) {
-        logger.err(`Running priceUpdater failed. Reason: ` + (e instanceof Error ? e.message : e));
-      }
+    try {
+      await priceUpdater.$run();
+    } catch (e) {
+      logger.err(`Running priceUpdater failed. Reason: ` + (e instanceof Error ? e.message : e));
    }

    // Do not attempt to index anything unless Bitcoin Core is fully synced
@@ -183,7 +178,6 @@ class Indexer {
      }

      this.runSingleTask('blocksPrices');
-      await blocks.$indexCoinbaseAddresses();
      await mining.$indexDifficultyAdjustments();
      await mining.$generateNetworkHashrateHistory();
      await mining.$generatePoolHashrateHistory();
@@ -191,11 +185,7 @@ class Indexer {
      await blocks.$generateCPFPDatabase();
      await blocks.$generateAuditStats();
      await auditReplicator.$sync();
-      await statisticsReplicator.$sync();
-      await AccelerationRepository.$indexPastAccelerations();
-      await BlocksAuditsRepository.$migrateAuditsV0toV1();
-      // do not wait for classify blocks to finish
-      blocks.$classifyBlocks();
+      await blocks.$classifyBlocks();
    } catch (e) {
      this.indexerRunning = false;
      logger.err(`Indexer failed, trying again in 10 seconds. Reason: ` + (e instanceof Error ? e.message : e));
--- a/backend/src/logger.ts
+++ b/backend/src/logger.ts
@@ -86,6 +86,9 @@ class Logger {
    if (config.LIGHTNING.ENABLED) {
      return config.MEMPOOL.NETWORK === 'mainnet' ? 'lightning' : `${config.MEMPOOL.NETWORK}-lightning`; 
    }
+    if (config.BISQ.ENABLED) {
+      return 'bisq';
+    }
    if (config.MEMPOOL.NETWORK && config.MEMPOOL.NETWORK !== 'mainnet') {
      return config.MEMPOOL.NETWORK;
    }
--- a/backend/src/mempool.interfaces.ts
+++ b/backend/src/mempool.interfaces.ts
@@ -29,34 +29,18 @@ export interface PoolStats extends PoolInfo {
 }

 export interface BlockAudit {
-  version: number,
  time: number,
  height: number,
  hash: string,
-  unseenTxs: string[],
  missingTxs: string[],
  freshTxs: string[],
  sigopTxs: string[],
  fullrbfTxs: string[],
  addedTxs: string[],
-  prioritizedTxs: string[],
  acceleratedTxs: string[],
  matchRate: number,
  expectedFees?: number,
  expectedWeight?: number,
-  template?: any[];
-}
-
-export interface TransactionAudit {
-  seen?: boolean;
-  expected?: boolean;
-  added?: boolean;
-  prioritized?: boolean;
-  delayed?: number;
-  accelerated?: boolean;
-  conflict?: boolean;
-  coinbase?: boolean;
-  firstSeen?: number;
 }

 export interface AuditScore {
@@ -81,25 +65,9 @@ export interface MempoolBlockWithTransactions extends MempoolBlock {
 }

 export interface MempoolBlockDelta {
-  added: TransactionCompressed[];
+  added: TransactionClassified[];
  removed: string[];
-  changed: MempoolDeltaChange[];
-}
-
-export interface MempoolDeltaTxids {
-  sequence: number,
-  added: string[];
-  removed: string[];
-  mined: string[];
-  replaced: { replaced: string, by: string }[];
-}
-
-export interface MempoolDelta {
-  sequence: number,
-  added: MempoolTransactionExtended[];
-  removed: string[];
-  mined: string[];
-  replaced: { replaced: string, by: TransactionExtended }[];
+  changed: { txid: string, rate: number | undefined, flags?: number }[];
 }

 interface VinStrippedToScriptsig {
@@ -126,9 +94,6 @@ export interface TransactionExtended extends IEsploraApi.Transaction {
    vsize: number,
  };
  acceleration?: boolean;
-  acceleratedBy?: number[];
-  acceleratedAt?: number;
-  feeDelta?: number;
  replacement?: boolean;
  uid?: number;
  flags?: number;
@@ -142,7 +107,6 @@ export interface MempoolTransactionExtended extends TransactionExtended {
  inputs?: number[];
  lastBoosted?: number;
  cpfpDirty?: boolean;
-  cpfpUpdated?: number;
 }

 export interface AuditTransaction {
@@ -179,12 +143,6 @@ export interface CompactThreadTransaction {
  dirty?: boolean;
 }

-export interface GbtCandidates {
-  txs: { [txid: string ]: boolean },
-  added: MempoolTransactionExtended[];
-  removed: MempoolTransactionExtended[];
-}
-
 export interface ThreadTransaction {
  txid: string;
  fee: number;
@@ -223,10 +181,6 @@ export interface CpfpInfo {
  bestDescendant?: BestDescendant | null;
  descendants?: Ancestor[];
  effectiveFeePerVsize?: number;
-  sigops?: number;
-  adjustedVsize?: number,
-  acceleration?: boolean,
-  fee?: number;
 }

 export interface TransactionStripped {
@@ -236,18 +190,12 @@ export interface TransactionStripped {
  value: number;
  acc?: boolean;
  rate?: number; // effective fee rate
-  time?: number;
 }

 export interface TransactionClassified extends TransactionStripped {
  flags: number;
 }

-// [txid, fee, vsize, value, rate, flags, acceleration?]
-export type TransactionCompressed = [string, number, number, number, number, number, number, 1?];
-// [txid, rate, flags, acceleration?]
-export type MempoolDeltaChange = [string, number, number, (1|0)];
-
 // binary flags for transaction classification
 export const TransactionFlags = {
  // features
@@ -255,8 +203,6 @@ export const TransactionFlags = {
  no_rbf:                                                      0b00000010n,
  v1:                                                          0b00000100n,
  v2:                                                          0b00001000n,
-  v3:                                                          0b00010000n,
-  nonstandard:                                                 0b00100000n,
  // address types
  p2pk:                                               0b00000001_00000000n,
  p2ms:                                               0b00000010_00000000n,
@@ -273,7 +219,6 @@ export const TransactionFlags = {
  op_return:                        0b00000001_00000000_00000000_00000000n,
  fake_pubkey:                      0b00000010_00000000_00000000_00000000n,
  inscription:                      0b00000100_00000000_00000000_00000000n,
-  fake_scripthash:                  0b00001000_00000000_00000000_00000000n,
  // heuristics
  coinjoin:                0b00000001_00000000_00000000_00000000_00000000n,
  consolidation:           0b00000010_00000000_00000000_00000000_00000000n,
@@ -305,7 +250,6 @@ export interface BlockExtension {
  coinbaseRaw: string;
  orphans: OrphanedBlock[] | null;
  coinbaseAddress: string | null;
-  coinbaseAddresses: string[] | null;
  coinbaseSignature: string | null;
  coinbaseSignatureAscii: string | null;
  virtualSize: number;
@@ -385,9 +329,8 @@ export interface CpfpCluster {
 }

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

 export interface Statistic {
@@ -443,7 +386,6 @@ export interface Statistic {

 export interface OptimizedStatistic {
  added: string;
-  count: number;
  vbytes_per_second: number;
  total_fee: number;
  mempool_byte_weight: number;
@@ -451,31 +393,13 @@ export interface OptimizedStatistic {
  vsizes: number[];
 }

-export interface TxTrackingInfo {
-  replacedBy?: string,
-  position?: { block: number, vsize: number, accelerated?: boolean, acceleratedBy?: number[], acceleratedAt?: number, feeDelta?: number },
-  cpfp?: {
-    ancestors?: Ancestor[],
-    bestDescendant?: Ancestor | null,
-    descendants?: Ancestor[] | null,
-    effectiveFeePerVsize?: number | null,
-    sigops: number,
-    adjustedVsize: number,
-  },
-  utxoSpent?: { [vout: number]: { vin: number, txid: string } },
-  accelerated?: boolean,
-  acceleratedBy?: number[],
-  acceleratedAt?: number,
-  feeDelta?: number,
-  confirmed?: boolean
-}
-
 export interface WebsocketResponse {
  action: string;
  data: string[];
  'track-tx': string;
  'track-address': string;
  'watch-mempool': boolean;
+  'track-bisq-market': string;
 }

 export interface VbytesPerSecond {
@@ -497,7 +421,6 @@ export interface IBackendInfo {
  gitCommit: string;
  version: string;
  lightning: boolean;
-  backend: 'esplora' | 'electrum' | 'none';
 }

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

    logger.debug(`Fetching missing audit data for ${missingAudits.length} blocks from trusted servers`, 'Replication');
-
+    
    let totalSynced = 0;
    let totalMissed = 0;
    let loggerTimer = Date.now();
-    // process missing audits in batches of BATCH_SIZE
+    // process missing audits in batches of 
    for (let i = 0; i < missingAudits.length; i += BATCH_SIZE) {
      const slice = missingAudits.slice(i, i + BATCH_SIZE);
      const results = await Promise.all(slice.map(hash => this.$syncAudit(hash)));
@@ -109,14 +109,11 @@ class AuditReplication {
      version: 1,
    });
    await blocksAuditsRepository.$saveAudit({
-      version: auditSummary.version || 0,
      hash: blockHash,
      height: auditSummary.height,
      time: auditSummary.timestamp || auditSummary.time,
-      unseenTxs: auditSummary.unseenTxs || [],
      missingTxs: auditSummary.missingTxs || [],
      addedTxs: auditSummary.addedTxs || [],
-      prioritizedTxs: auditSummary.prioritizedTxs || [],
      freshTxs: auditSummary.freshTxs || [],
      sigopTxs: auditSummary.sigopTxs || [],
      fullrbfTxs: auditSummary.fullrbfTxs || [],
--- a/backend/src/replication/StatisticsReplication.ts
+++ b/backend/src/replication/StatisticsReplication.ts
@@ -1,237 +0,0 @@
-import DB from '../database';
-import logger from '../logger';
-import { $sync } from './replicator';
-import config from '../config';
-import { Common } from '../api/common';
-import statistics from '../api/statistics/statistics-api';
-
-interface MissingStatistics {
-  '24h': Set<number>;
-  '1w': Set<number>;
-  '1m': Set<number>;
-  '3m': Set<number>;
-  '6m': Set<number>;
-  '2y': Set<number>;
-  'all': Set<number>;
-}
-
-const steps = {
-  '24h': 60,
-  '1w': 300,
-  '1m': 1800,
-  '3m': 7200,
-  '6m': 10800,
-  '2y': 28800,
-  'all': 43200,
-};
-
-/**
- * Syncs missing statistics data from trusted servers
- */
-class StatisticsReplication {
-  inProgress: boolean = false;
-
-  public async $sync(): Promise<void> {
-    if (!config.REPLICATION.ENABLED || !config.REPLICATION.STATISTICS || !config.STATISTICS.ENABLED) {
-      // replication not enabled, or statistics not enabled
-      return;
-    }
-    if (this.inProgress) {
-      logger.info(`StatisticsReplication sync already in progress`, 'Replication');
-      return;
-    }
-    this.inProgress = true;
-
-    const missingStatistics = await this.$getMissingStatistics();
-    const missingIntervals = Object.keys(missingStatistics).filter(key => missingStatistics[key].size > 0);
-    const totalMissing =  missingIntervals.reduce((total, key) => total + missingStatistics[key].size, 0);
-
-    if (totalMissing === 0) {
-      this.inProgress = false;
-      logger.info(`Statistics table is complete, no replication needed`, 'Replication');
-      return;
-    }
-    
-    for (const interval of missingIntervals) {
-      logger.debug(`Missing ${missingStatistics[interval].size} statistics rows in '${interval}' timespan`, 'Replication');
-    }
-    logger.debug(`Fetching ${missingIntervals.join(', ')} statistics endpoints from trusted servers to fill ${totalMissing} rows missing in statistics`, 'Replication');
-    
-    let totalSynced = 0;
-    let totalMissed = 0;
-
-    for (const interval of missingIntervals) {
-      const results = await this.$syncStatistics(interval, missingStatistics[interval]);
-      totalSynced += results.synced;
-      totalMissed += results.missed;
-
-      logger.info(`Found ${totalSynced} / ${totalSynced + totalMissed} of ${totalMissing} missing statistics rows`, 'Replication');
-      await Common.sleep$(3000);
-    }
-
-    logger.debug(`Synced ${totalSynced} statistics rows, ${totalMissed} still missing`, 'Replication');
-
-    this.inProgress = false;
-  }
-
-  private async $syncStatistics(interval: string, missingTimes: Set<number>): Promise<any> {
-  
-    let success = false;
-    let synced = 0;
-    let missed = new Set(missingTimes);
-    const syncResult = await $sync(`/api/v1/statistics/${interval}`);
-    if (syncResult && syncResult.data?.length) {
-      success = true;
-      logger.info(`Fetched /api/v1/statistics/${interval} from ${syncResult.server}`);     
-    
-      for (const stat of syncResult.data) {
-        const time = this.roundToNearestStep(stat.added, steps[interval]);
-        if (missingTimes.has(time)) {
-          try {
-            await statistics.$create(statistics.mapOptimizedStatisticToStatistic([stat])[0], true);
-            if (missed.delete(time)) {
-              synced++;
-            }
-          } catch (e: any) {
-            logger.err(`Failed to insert statistics row at ${stat.added} (${interval}) from ${syncResult.server}. Reason: ` + (e instanceof Error ? e.message : e));
-          }
-        }
-      }
-
-    } else {
-      logger.warn(`An error occured when trying to fetch /api/v1/statistics/${interval}`);
-    }
-
-    return { success, synced, missed: missed.size };
-  }
-
-  private async $getMissingStatistics(): Promise<MissingStatistics> {
-    try {
-      const now = Math.floor(Date.now() / 1000);
-      const day = 60 * 60 * 24;
-
-      const startTime = this.getStartTimeFromConfig();
-
-      const missingStatistics: MissingStatistics = {
-        '24h': new Set<number>(),
-        '1w': new Set<number>(),
-        '1m': new Set<number>(),
-        '3m': new Set<number>(),
-        '6m': new Set<number>(),
-        '2y': new Set<number>(),
-        'all': new Set<number>()
-      };
-
-      const intervals = [              // [start,               end,                 label ]
-                                          [now - day + 600,     now - 60,            '24h']       , // from 24 hours ago to now = 1 minute granularity
-        startTime < now - day ?           [now - day * 7,       now - day,           '1w' ] : null, // from 1 week ago to 24 hours ago = 5 minutes granularity
-        startTime < now - day * 7 ?       [now - day * 30,      now - day * 7,       '1m' ] : null, // from 1 month ago to 1 week ago = 30 minutes granularity
-        startTime < now - day * 30 ?      [now - day * 90,      now - day * 30,      '3m' ] : null, // from 3 months ago to 1 month ago = 2 hours granularity
-        startTime < now - day * 90 ?      [now - day * 180,     now - day * 90,      '6m' ] : null, // from 6 months ago to 3 months ago = 3 hours granularity
-        startTime < now - day * 180 ?     [now - day * 365 * 2, now - day * 180,     '2y' ] : null, // from 2 years ago to 6 months ago = 8 hours granularity
-        startTime < now - day * 365 * 2 ? [startTime,           now - day * 365 * 2, 'all'] : null, // from start of statistics to 2 years ago = 12 hours granularity   
-      ];
-
-      for (const interval of intervals) {
-        if (!interval) {
-          continue;
-        }
-        missingStatistics[interval[2] as string] = await this.$getMissingStatisticsInterval(interval, startTime);
-      }
-      
-      return missingStatistics;
-    } catch (e: any) {
-      logger.err(`Cannot fetch missing statistics times from db. Reason: ` + (e instanceof Error ? e.message : e));
-      throw e;
-    }
-  }
-
-  private async $getMissingStatisticsInterval(interval: any, startTime: number): Promise<Set<number>> {
-    try {
-      const start = interval[0];
-      const end = interval[1];
-      const step = steps[interval[2]];
-
-      const [rows]: any[] = await DB.query(`
-        SELECT UNIX_TIMESTAMP(added) as added
-        FROM statistics
-        WHERE added >= FROM_UNIXTIME(?) AND added <= FROM_UNIXTIME(?)
-        GROUP BY UNIX_TIMESTAMP(added) DIV ${step} ORDER BY statistics.added DESC
-      `, [start, end]);
-
-      const startingTime = Math.max(startTime, start) - Math.max(startTime, start) % step;
-
-      const timeSteps: number[] = [];
-      for (let time = startingTime; time < end; time += step) {
-        timeSteps.push(time);
-      }
-
-      if (timeSteps.length === 0) {
-        return new Set<number>();
-      }
-      
-      const roundedTimesAlreadyHere: number[] = Array.from(new Set(rows.map(row => this.roundToNearestStep(row.added, step))));
-
-      const missingTimes = timeSteps.filter(time => !roundedTimesAlreadyHere.includes(time)).filter((time, i, arr) => {
-        // Remove outsiders
-        if (i === 0) {
-          return arr[i + 1] === time + step
-        } else if (i === arr.length - 1) {
-          return arr[i - 1] === time - step;
-        }
-        return (arr[i + 1] === time + step) && (arr[i - 1] === time - step)
-      });
-
-      // Don't bother fetching if very few rows are missing
-      if (missingTimes.length < timeSteps.length * 0.01) {
-        return new Set();
-      }
-
-      return new Set(missingTimes);
-    } catch (e: any) {
-      logger.err(`Cannot fetch missing statistics times from db. Reason: ` + (e instanceof Error ? e.message : e));
-      throw e;
-    }
-  }
-
-  private roundToNearestStep(time: number, step: number): number {
-    const remainder = time % step;
-    if (remainder < step / 2) {
-      return time - remainder;
-    } else {
-      return time + (step - remainder);
-    }
-  }
-
-  private getStartTimeFromConfig(): number {
-    const now = Math.floor(Date.now() / 1000);
-    const day = 60 * 60 * 24;
-
-    let startTime: number;
-    if (typeof(config.REPLICATION.STATISTICS_START_TIME) === 'string' && ['24h', '1w', '1m', '3m', '6m', '2y', 'all'].includes(config.REPLICATION.STATISTICS_START_TIME)) {
-      if (config.REPLICATION.STATISTICS_START_TIME === 'all') {
-        startTime = 1481932800;
-      } else if (config.REPLICATION.STATISTICS_START_TIME === '2y') {
-        startTime = now - day * 365 * 2;
-      } else if (config.REPLICATION.STATISTICS_START_TIME === '6m') {
-        startTime = now - day * 180;
-      } else if (config.REPLICATION.STATISTICS_START_TIME === '3m') {
-        startTime = now - day * 90;
-      } else if (config.REPLICATION.STATISTICS_START_TIME === '1m') {
-        startTime = now - day * 30;
-      } else if (config.REPLICATION.STATISTICS_START_TIME === '1w') {
-        startTime = now - day * 7;
-      } else {
-        startTime = now - day;
-      }
-    } else {
-      startTime = Math.max(config.REPLICATION.STATISTICS_START_TIME as number || 1481932800, 1481932800);
-    }
-
-    return startTime;
-  }
-
-}
-
-export default new StatisticsReplication();
-
--- a/backend/src/repositories/AccelerationRepository.ts
+++ b/backend/src/repositories/AccelerationRepository.ts
@@ -1,366 +0,0 @@
-import { AccelerationInfo } from '../api/acceleration/acceleration';
-import { RowDataPacket } from 'mysql2';
-import DB from '../database';
-import logger from '../logger';
-import { IEsploraApi } from '../api/bitcoin/esplora-api.interface';
-import { Common } from '../api/common';
-import config from '../config';
-import blocks from '../api/blocks';
-import accelerationApi, { Acceleration, AccelerationHistory } from '../api/services/acceleration';
-import accelerationCosts from '../api/acceleration/acceleration';
-import bitcoinApi from '../api/bitcoin/bitcoin-api-factory';
-import transactionUtils from '../api/transaction-utils';
-import { BlockExtended, MempoolTransactionExtended } from '../mempool.interfaces';
-import { makeBlockTemplate } from '../api/mini-miner';
-
-export interface PublicAcceleration {
-  txid: string,
-  height: number,
-  added: number,
-  pool: {
-    id: number,
-    slug: string,
-    name: string,
-  },
-  effective_vsize: number,
-  effective_fee: number,
-  boost_rate: number,
-  boost_cost: number,
-}
-
-class AccelerationRepository {
-  private bidBoostV2Activated = 831580;
-
-  public async $saveAcceleration(acceleration: AccelerationInfo, block: IEsploraApi.Block, pool_id: number, accelerationData: Acceleration[]): Promise<void> {
-    const accelerationMap: { [txid: string]: Acceleration } = {};
-    for (const acc of accelerationData) {
-      accelerationMap[acc.txid] = acc;
-    }
-    try {
-      await DB.query(`
-        INSERT INTO accelerations(txid, requested, added, height, pool, effective_vsize, effective_fee, boost_rate, boost_cost)
-        VALUE (?, FROM_UNIXTIME(?), FROM_UNIXTIME(?), ?, ?, ?, ?, ?, ?)
-        ON DUPLICATE KEY UPDATE
-          height = ?
-      `, [
-        acceleration.txSummary.txid,
-        accelerationMap[acceleration.txSummary.txid].added,
-        block.timestamp,
-        block.height,
-        pool_id,
-        acceleration.txSummary.effectiveVsize,
-        acceleration.txSummary.effectiveFee,
-        acceleration.targetFeeRate,
-        acceleration.cost,
-        block.height,
-      ]);
-    } catch (e: any) {
-      logger.err(`Cannot save acceleration (${acceleration.txSummary.txid}) into db. Reason: ` + (e instanceof Error ? e.message : e));
-      // We don't throw, not a critical issue if we miss some accelerations
-    }
-  }
-
-  public async $getAccelerationInfo(poolSlug: string | null = null, height: number | null = null, interval: string | null = null): Promise<PublicAcceleration[]> {
-    if (!interval || !['24h', '3d', '1w', '1m'].includes(interval)) {
-      interval = '1m';
-    }
-    interval = Common.getSqlInterval(interval);
-
-    if (!config.MEMPOOL_SERVICES.ACCELERATIONS || (interval == null && poolSlug == null && height == null)) {
-      return [];
-    }
-
-    let query = `
-      SELECT *, UNIX_TIMESTAMP(requested) as requested_timestamp, UNIX_TIMESTAMP(added) as block_timestamp FROM accelerations
-      JOIN pools on pools.unique_id = accelerations.pool
-    `;
-    let params: any[] = [];
-    let hasFilter = false;
-
-    if (interval && height === null) {
-      query += ` WHERE accelerations.added BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW() `;
-      hasFilter = true;
-    }
-
-    if (height != null) {
-      if (hasFilter) {
-        query += ` AND accelerations.height = ? `;
-      } else {
-        query += ` WHERE accelerations.height = ? `;
-      }
-      params.push(height);
-    } else if (poolSlug != null) {
-      if (hasFilter) {
-        query += ` AND pools.slug = ? `;
-      } else {
-        query += ` WHERE pools.slug = ? `;
-      }
-      params.push(poolSlug);
-    }
-
-    query += ` ORDER BY accelerations.added DESC `;
-
-    try {
-      const [rows] = await DB.query(query, params) as RowDataPacket[][];
-      if (rows?.length) {
-        return rows.map(row => ({
-          txid: row.txid,
-          height: row.height,
-          added: row.requested_timestamp || row.block_timestamp,
-          pool: {
-            id: row.id,
-            slug: row.slug,
-            name: row.name,
-          },
-          effective_vsize: row.effective_vsize,
-          effective_fee: row.effective_fee,
-          boost_rate: row.boost_rate,
-          boost_cost: row.boost_cost,
-        }));
-      } else {
-        return [];
-      }
-    } catch (e) {
-      logger.err(`Cannot query acceleration info. Reason: ` + (e instanceof Error ? e.message : e));
-      throw e;
-    }
-  }
-
-  public async $getAccelerationTotals(poolSlug: string | null = null, interval: string | null = null): Promise<{ cost: number, count: number }> {
-    interval = Common.getSqlInterval(interval);
-
-    if (!config.MEMPOOL_SERVICES.ACCELERATIONS) {
-      return { cost: 0, count: 0 };
-    }
-
-    let query = `
-      SELECT SUM(boost_cost) as total_cost, COUNT(txid) as count FROM accelerations
-      JOIN pools on pools.unique_id = accelerations.pool
-    `;
-    let params: any[] = [];
-    let hasFilter = false;
-
-    if (interval) {
-      query += ` WHERE accelerations.added BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW() `;
-      hasFilter = true;
-    }
-    if (poolSlug != null) {
-      if (hasFilter) {
-        query += ` AND pools.slug = ? `;
-      } else {
-        query += ` WHERE pools.slug = ? `;
-      }
-      params.push(poolSlug);
-    }
-
-    try {
-      const [rows] = await DB.query(query, params) as RowDataPacket[][];
-      return {
-        cost: rows[0]?.total_cost || 0,
-        count: rows[0]?.count || 0,
-      };
-    } catch (e) {
-      logger.err(`Cannot query acceleration totals. Reason: ` + (e instanceof Error ? e.message : e));
-      throw e;
-    }
-  }
-
-  public async $getLastSyncedHeight(): Promise<number> {
-    try {
-      const [rows] = await DB.query(`
-        SELECT * FROM state
-        WHERE name = 'last_acceleration_block'
-      `);
-      if (rows?.['length']) {
-        return rows[0].number;
-      }
-    } catch (e: any) {
-      logger.err(`Cannot find last acceleration sync height. Reason: ` + (e instanceof Error ? e.message : e));
-    }
-    return 0;
-  }
-
-  private async $setLastSyncedHeight(height: number): Promise<void> {
-    try {
-      await DB.query(`
-        UPDATE state
-        SET number = ?
-        WHERE name = 'last_acceleration_block'
-      `, [height]);
-    } catch (e: any) {
-      logger.err(`Cannot update last acceleration sync height. Reason: ` + (e instanceof Error ? e.message : e));
-    }
-  }
-
-  // modifies block transactions
-  public async $indexAccelerationsForBlock(block: BlockExtended, accelerations: Acceleration[], transactions: MempoolTransactionExtended[]): Promise<void> {
-    const blockTxs: { [txid: string]: MempoolTransactionExtended } = {};
-    for (const tx of transactions) {
-      blockTxs[tx.txid] = tx;
-    }
-    const successfulAccelerations = accelerations.filter(acc => acc.pools.includes(block.extras.pool.id));
-    let boostRate: number | null = null;
-    for (const acc of successfulAccelerations) {
-      if (boostRate === null) {
-        boostRate = accelerationCosts.calculateBoostRate(
-          accelerations.map(acc => ({ txid: acc.txid, max_bid: acc.feeDelta })),
-          transactions
-        );
-      }
-      if (blockTxs[acc.txid]) {
-        const tx = blockTxs[acc.txid];
-        const accelerationInfo = accelerationCosts.getAccelerationInfo(tx, boostRate, transactions);
-        accelerationInfo.cost = Math.max(0, Math.min(acc.feeDelta, accelerationInfo.cost));
-        this.$saveAcceleration(accelerationInfo, block, block.extras.pool.id, successfulAccelerations);
-      }
-    }
-    let anyConfirmed = false;
-    for (const acc of accelerations) {
-      if (blockTxs[acc.txid]) {
-        anyConfirmed = true;
-      }
-    }
-    if (anyConfirmed) {
-      accelerationApi.accelerationConfirmed();
-    }
-    const lastSyncedHeight = await this.$getLastSyncedHeight();
-    // if we've missed any blocks, let the indexer catch up from the last synced height on the next run
-    if (block.height === lastSyncedHeight + 1) {
-      await this.$setLastSyncedHeight(block.height);
-    }
-  }
-
-  /**
-   * [INDEXING] Backfill missing acceleration data
-   */
-  async $indexPastAccelerations(): Promise<void> {
-    if (config.MEMPOOL.NETWORK !== 'mainnet' || !config.MEMPOOL_SERVICES.ACCELERATIONS) {
-      // acceleration history disabled
-      return;
-    }
-    const lastSyncedHeight = await this.$getLastSyncedHeight();
-    const currentHeight = blocks.getCurrentBlockHeight();
-    if (currentHeight <= lastSyncedHeight) {
-      // already in sync
-      return;
-    }
-
-    logger.debug(`Fetching accelerations between block ${lastSyncedHeight} and ${currentHeight}`);
-
-    // Fetch accelerations from mempool.space since the last synced block;
-    const accelerationsByBlock: {[height: number]: AccelerationHistory[]} = {};
-    const blockHashes = {};
-    let done = false;
-    let page = 1;
-    let count = 0;
-    try {
-      while (!done) {
-        // don't DDoS the services backend
-        Common.sleep$(500 + (Math.random() * 1000));
-        const accelerations = await accelerationApi.$fetchAccelerationHistory(page);
-        page++;
-        if (!accelerations?.length) {
-          done = true;
-          break;
-        }
-        for (const acc of accelerations) {
-          if (acc.status !== 'completed_provisional' && acc.status !== 'completed') {
-            continue;
-          }
-          if (!lastSyncedHeight || acc.blockHeight > lastSyncedHeight) {
-            if (!accelerationsByBlock[acc.blockHeight]) {
-              accelerationsByBlock[acc.blockHeight] = [];
-              blockHashes[acc.blockHeight] = acc.blockHash;
-            }
-            accelerationsByBlock[acc.blockHeight].push(acc);
-            count++;
-          } else {
-            done = true;
-          }
-        }
-      }
-    } catch (e) {
-      logger.err(`Failed to fetch full acceleration history. Reason: ` + (e instanceof Error ? e.message : e));
-    }
-
-    logger.debug(`Indexing ${count} accelerations between block ${lastSyncedHeight} and ${currentHeight}`);
-
-    // process accelerated blocks in order
-    const heights = Object.keys(accelerationsByBlock).map(key => parseInt(key)).sort((a,b) => a - b);
-    for (const height of heights) {
-      const accelerations = accelerationsByBlock[height];
-      try {
-        const block = await blocks.$getBlock(blockHashes[height]) as BlockExtended;
-        const transactions = (await bitcoinApi.$getTxsForBlock(blockHashes[height])).map(tx => transactionUtils.extendMempoolTransaction(tx));
-
-        const blockTxs = {};
-        for (const tx of transactions) {
-          blockTxs[tx.txid] = tx;
-        }
-
-        let boostRate = 0;
-        // use Bid Boost V2 if active
-        if (height > this.bidBoostV2Activated) {
-          boostRate = accelerationCosts.calculateBoostRate(
-            accelerations.map(acc => ({ txid: acc.txid, max_bid: acc.feeDelta })),
-            transactions
-          );
-        } else {
-          // default to Bid Boost V1 (median block fee rate)
-          const template = makeBlockTemplate(
-            transactions,
-            accelerations.map(acc => ({ txid: acc.txid, max_bid: acc.feeDelta })),
-            1,
-            Infinity,
-            Infinity
-          );
-          const feeStats = Common.calcEffectiveFeeStatistics(template);
-          boostRate = feeStats.medianFee;
-        }
-        const accelerationSummaries = accelerations.map(acc => ({
-          ...acc,
-          pools: acc.pools,
-        }))
-        for (const acc of accelerations) {
-          if (blockTxs[acc.txid] && acc.pools.includes(block.extras.pool.id)) {
-            const tx = blockTxs[acc.txid];
-            const accelerationInfo = accelerationCosts.getAccelerationInfo(tx, boostRate, transactions);
-            accelerationInfo.cost = Math.max(0, Math.min(acc.feeDelta, accelerationInfo.cost));
-            await this.$saveAcceleration(accelerationInfo, block, block.extras.pool.id, accelerationSummaries);
-          }
-        }
-        await this.$setLastSyncedHeight(height);
-      } catch (e) {
-        logger.err(`Failed to process accelerations for block ${height}. Reason: ` + (e instanceof Error ? e.message : e));
-        return;
-      }
-      logger.debug(`Indexed ${accelerations.length} accelerations in block  ${height}`);
-    }
-
-    await this.$setLastSyncedHeight(currentHeight);
-
-    logger.debug(`Indexing accelerations completed`);
-  }
-
-  /**
-   * Delete accelerations from the database above blockHeight
-   */
-  public async $deleteAccelerationsFrom(blockHeight: number): Promise<void> {
-    logger.info(`Delete newer accelerations from height ${blockHeight} from the database`);
-    try {
-      const currentSyncedHeight = await this.$getLastSyncedHeight();
-      if (currentSyncedHeight >= blockHeight) {
-        await DB.query(`
-          UPDATE state
-          SET number = ?
-          WHERE name = 'last_acceleration_block'
-        `, [blockHeight - 1]);
-      }
-      await DB.query(`DELETE FROM accelerations where height >= ${blockHeight}`);
-    } catch (e) {
-      logger.err('Cannot delete indexed accelerations. Reason: ' + (e instanceof Error ? e.message : e));
-    }
-  }
-}
-
-export default new AccelerationRepository();
--- a/backend/src/repositories/BlocksAuditsRepository.ts
+++ b/backend/src/repositories/BlocksAuditsRepository.ts
@@ -1,25 +1,14 @@
+import blocks from '../api/blocks';
 import DB from '../database';
 import logger from '../logger';
-import bitcoinApi from '../api/bitcoin/bitcoin-api-factory';
-import { BlockAudit, AuditScore, TransactionAudit, TransactionStripped } from '../mempool.interfaces';
-
-interface MigrationAudit {
-  version: number,
-  height: number,
-  id: string,
-  timestamp: number,
-  prioritizedTxs: string[],
-  acceleratedTxs: string[],
-  template: TransactionStripped[],
-  transactions: TransactionStripped[],
-}
+import { BlockAudit, AuditScore } from '../mempool.interfaces';

 class BlocksAuditRepositories {
  public async $saveAudit(audit: BlockAudit): Promise<void> {
    try {
-      await DB.query(`INSERT INTO blocks_audits(version, time, height, hash, unseen_txs, missing_txs, added_txs, prioritized_txs, fresh_txs, sigop_txs, fullrbf_txs, accelerated_txs, match_rate, expected_fees, expected_weight)
-        VALUE (?, FROM_UNIXTIME(?), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [audit.version, audit.time, audit.height, audit.hash, JSON.stringify(audit.unseenTxs), JSON.stringify(audit.missingTxs),
-          JSON.stringify(audit.addedTxs), JSON.stringify(audit.prioritizedTxs), JSON.stringify(audit.freshTxs), JSON.stringify(audit.sigopTxs), JSON.stringify(audit.fullrbfTxs), JSON.stringify(audit.acceleratedTxs), audit.matchRate, audit.expectedFees, audit.expectedWeight]);
+      await DB.query(`INSERT INTO blocks_audits(time, height, hash, missing_txs, added_txs, fresh_txs, sigop_txs, fullrbf_txs, accelerated_txs, match_rate, expected_fees, expected_weight)
+        VALUE (FROM_UNIXTIME(?), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [audit.time, audit.height, audit.hash, JSON.stringify(audit.missingTxs),
+          JSON.stringify(audit.addedTxs), JSON.stringify(audit.freshTxs), JSON.stringify(audit.sigopTxs), JSON.stringify(audit.fullrbfTxs), JSON.stringify(audit.acceleratedTxs), audit.matchRate, audit.expectedFees, audit.expectedWeight]);
    } catch (e: any) {
      if (e.errno === 1062) { // ER_DUP_ENTRY - This scenario is possible upon node backend restart
        logger.debug(`Cannot save block audit for block ${audit.hash} because it has already been indexed, ignoring`);
@@ -70,36 +59,28 @@ class BlocksAuditRepositories {
    }
  }

-  public async $getBlockAudit(hash: string): Promise<BlockAudit | null> {
+  public async $getBlockAudit(hash: string): Promise<any> {
    try {
      const [rows]: any[] = await DB.query(
-        `SELECT
-          blocks_audits.version,
-          blocks_audits.height,
-          blocks_audits.hash as id,
-          UNIX_TIMESTAMP(blocks_audits.time) as timestamp,
-          template,
-          unseen_txs as unseenTxs,
-          missing_txs as missingTxs,
-          added_txs as addedTxs,
-          prioritized_txs as prioritizedTxs,
-          fresh_txs as freshTxs,
-          sigop_txs as sigopTxs,
-          fullrbf_txs as fullrbfTxs,
-          accelerated_txs as acceleratedTxs,
-          match_rate as matchRate,
-          expected_fees as expectedFees,
-          expected_weight as expectedWeight
+        `SELECT blocks_audits.height, blocks_audits.hash as id, UNIX_TIMESTAMP(blocks_audits.time) as timestamp,
+        template,
+        missing_txs as missingTxs,
+        added_txs as addedTxs,
+        fresh_txs as freshTxs,
+        sigop_txs as sigopTxs,
+        fullrbf_txs as fullrbfTxs,
+        accelerated_txs as acceleratedTxs,
+        match_rate as matchRate,
+        expected_fees as expectedFees,
+        expected_weight as expectedWeight
        FROM blocks_audits
        JOIN blocks_templates ON blocks_templates.id = blocks_audits.hash
-        WHERE blocks_audits.hash = ?
-      `, [hash]);
+        WHERE blocks_audits.hash = "${hash}"
+      `);
      
      if (rows.length) {
-        rows[0].unseenTxs = JSON.parse(rows[0].unseenTxs);
        rows[0].missingTxs = JSON.parse(rows[0].missingTxs);
        rows[0].addedTxs = JSON.parse(rows[0].addedTxs);
-        rows[0].prioritizedTxs = JSON.parse(rows[0].prioritizedTxs);
        rows[0].freshTxs = JSON.parse(rows[0].freshTxs);
        rows[0].sigopTxs = JSON.parse(rows[0].sigopTxs);
        rows[0].fullrbfTxs = JSON.parse(rows[0].fullrbfTxs);
@@ -115,49 +96,13 @@ class BlocksAuditRepositories {
    }
  }

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

 export default new BlocksAuditRepositories();
--- a/backend/src/repositories/BlocksRepository.ts
+++ b/backend/src/repositories/BlocksRepository.ts
@@ -5,7 +5,7 @@ import logger from '../logger';
 import { Common } from '../api/common';
 import PoolsRepository from './PoolsRepository';
 import HashratesRepository from './HashratesRepository';
-import { RowDataPacket } from 'mysql2';
+import { escape } from 'mysql2';
 import BlocksSummariesRepository from './BlocksSummariesRepository';
 import DifficultyAdjustmentsRepository from './DifficultyAdjustmentsRepository';
 import bitcoinClient from '../api/bitcoin/bitcoin-client';
@@ -40,7 +40,6 @@ interface DatabaseBlock {
  avgFeeRate: number;
  coinbaseRaw: string;
  coinbaseAddress: string;
-  coinbaseAddresses: string;
  coinbaseSignature: string;
  coinbaseSignatureAscii: string;
  avgTxSize: number;
@@ -83,7 +82,6 @@ const BLOCK_DB_FIELDS = `
  blocks.avg_fee_rate AS avgFeeRate,
  blocks.coinbase_raw AS coinbaseRaw,
  blocks.coinbase_address AS coinbaseAddress,
-  blocks.coinbase_addresses AS coinbaseAddresses,
  blocks.coinbase_signature AS coinbaseSignature,
  blocks.coinbase_signature_ascii AS coinbaseSignatureAscii,
  blocks.avg_tx_size AS avgTxSize,
@@ -116,7 +114,7 @@ class BlocksRepository {
        pool_id,            fees,                fee_span,          median_fee,
        reward,             version,             bits,              nonce,
        merkle_root,        previous_block_hash, avg_fee,           avg_fee_rate,
-        median_timestamp,   header,              coinbase_address,  coinbase_addresses,
+        median_timestamp,   header,              coinbase_address,
        coinbase_signature, utxoset_size,        utxoset_change,    avg_tx_size,
        total_inputs,       total_outputs,       total_input_amt,   total_output_amt,
        fee_percentiles,    segwit_total_txs,    segwit_total_size, segwit_total_weight,
@@ -127,7 +125,7 @@ class BlocksRepository {
        ?, ?, ?, ?,
        ?, ?, ?, ?,
        ?, ?, ?, ?,
-        FROM_UNIXTIME(?), ?, ?, ?,
+        FROM_UNIXTIME(?), ?, ?,
        ?, ?, ?, ?,
        ?, ?, ?, ?,
        ?, ?, ?, ?,
@@ -163,7 +161,6 @@ class BlocksRepository {
        block.mediantime,
        block.extras.header,
        block.extras.coinbaseAddress,
-        block.extras.coinbaseAddresses ? JSON.stringify(block.extras.coinbaseAddresses) : null,
        truncatedCoinbaseSignature,
        block.extras.utxoSetSize,
        block.extras.utxoSetChange,
@@ -481,7 +478,7 @@ class BlocksRepository {
  public async $getBlocksByPool(slug: string, startHeight?: number): Promise<BlockExtended[]> {
    const pool = await PoolsRepository.$getPool(slug);
    if (!pool) {
-      throw new Error('This mining pool does not exist');
+      throw new Error('This mining pool does not exist ' + escape(slug));
    }

    const params: any[] = [];
@@ -532,7 +529,7 @@ class BlocksRepository {
        return null;
      }

-      return await this.formatDbBlockIntoExtendedBlock(rows[0] as DatabaseBlock);
+      return await this.formatDbBlockIntoExtendedBlock(rows[0] as DatabaseBlock);  
    } catch (e) {
      logger.err(`Cannot get indexed block ${height}. Reason: ` + (e instanceof Error ? e.message : e));
      throw e;
@@ -666,7 +663,7 @@ class BlocksRepository {
  /**
   * Get the historical averaged block fees
   */
-  public async $getHistoricalBlockFees(div: number, interval: string | null, timespan?: {from: number, to: number}): Promise<any> {
+  public async $getHistoricalBlockFees(div: number, interval: string | null): Promise<any> {
    try {
      let query = `SELECT
        CAST(AVG(blocks.height) as INT) as avgHeight,
@@ -680,8 +677,6 @@ class BlocksRepository {

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

      query += ` GROUP BY UNIX_TIMESTAMP(blockTimestamp) DIV ${div}`;
@@ -807,10 +802,10 @@ class BlocksRepository {
  /**
   * Get a list of blocks that have been indexed
   */
-  public async $getIndexedBlocks(): Promise<{ height: number, hash: string }[]> {
+  public async $getIndexedBlocks(): Promise<any[]> {
    try {
-      const [rows] = await DB.query(`SELECT height, hash FROM blocks ORDER BY height DESC`) as RowDataPacket[][];
-      return rows as { height: number, hash: string }[];
+      const [rows]: any = await DB.query(`SELECT height, hash FROM blocks ORDER BY height DESC`);
+      return rows;
    } catch (e) {
      logger.err('Cannot generate block size and weight history. Reason: ' + (e instanceof Error ? e.message : e));
      throw e;
@@ -820,7 +815,7 @@ class BlocksRepository {
  /**
   * Get a list of blocks that have not had CPFP data indexed
   */
-   public async $getCPFPUnindexedBlocks(): Promise<number[]> {
+   public async $getCPFPUnindexedBlocks(): Promise<any[]> {
    try {
      const blockchainInfo = await bitcoinClient.getBlockchainInfo();
      const currentBlockHeight = blockchainInfo.blocks;
@@ -830,13 +825,13 @@ class BlocksRepository {
      }
      const minHeight = Math.max(0, currentBlockHeight - indexingBlockAmount + 1);

-      const [rows] = await DB.query(`
+      const [rows]: any[] = await DB.query(`
        SELECT height
        FROM compact_cpfp_clusters
        WHERE height <= ? AND height >= ?
        GROUP BY height
        ORDER BY height DESC;
-      `, [currentBlockHeight, minHeight]) as RowDataPacket[][];
+      `, [currentBlockHeight, minHeight]);

      const indexedHeights = {};
      rows.forEach((row) => { indexedHeights[row.height] = true; });
@@ -925,25 +920,6 @@ class BlocksRepository {
    }
  }

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

-  /**
-   * Save coinbase addresses
-   * 
-   * @param id
-   * @param addresses
-   */
-  public async $saveCoinbaseAddresses(id: string, addresses: string[]): Promise<void> {
-    try {
-      await DB.query(`
-        UPDATE blocks SET coinbase_addresses = ?
-        WHERE hash = ?`,
-        [JSON.stringify(addresses), id]
-      );
-    } catch (e) {
-      logger.err(`Cannot update block coinbase addresses. Reason: ` + (e instanceof Error ? e.message : e));
-      throw e;
-    }
-  }
-
-  /**
-   * Save pool
-   * 
-   * @param id
-   * @param poolId
-   */
-  public async $savePool(id: string, poolId: number): Promise<void> {
-    try {
-      await DB.query(`
-        UPDATE blocks SET pool_id = ?
-        WHERE hash = ?`,
-        [poolId, id]
-      );
-    } catch (e) {
-      logger.err(`Cannot update block pool. Reason: ` + (e instanceof Error ? e.message : e));
-      throw e;
-    }
-  }
-
  /**
   * Convert a mysql row block into a BlockExtended. Note that you
   * must provide the correct field into dbBlk object param
@@ -1059,7 +997,6 @@ class BlocksRepository {
    extras.avgFeeRate = dbBlk.avgFeeRate;
    extras.coinbaseRaw = dbBlk.coinbaseRaw;
    extras.coinbaseAddress = dbBlk.coinbaseAddress;
-    extras.coinbaseAddresses = dbBlk.coinbaseAddresses ? JSON.parse(dbBlk.coinbaseAddresses) : [];
    extras.coinbaseSignature = dbBlk.coinbaseSignature;
    extras.coinbaseSignatureAscii = dbBlk.coinbaseSignatureAscii;
    extras.avgTxSize = dbBlk.avgTxSize;
--- a/backend/src/repositories/BlocksSummariesRepository.ts
+++ b/backend/src/repositories/BlocksSummariesRepository.ts
@@ -1,4 +1,3 @@
-import { RowDataPacket } from 'mysql2';
 import DB from '../database';
 import logger from '../logger';
 import { BlockSummary, TransactionClassified } from '../mempool.interfaces';
@@ -70,7 +69,7 @@ class BlocksSummariesRepository {

  public async $getIndexedSummariesId(): Promise<string[]> {
    try {
-      const [rows] = await DB.query(`SELECT id from blocks_summaries`) as RowDataPacket[][];
+      const [rows]: any[] = await DB.query(`SELECT id from blocks_summaries`);
      return rows.map(row => row.id);
    } catch (e) {
      logger.err(`Cannot get block summaries id list. Reason: ` + (e instanceof Error ? e.message : e));
@@ -114,43 +113,6 @@ class BlocksSummariesRepository {
    return [];
  }

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

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

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

 export default new CpfpRepository();
--- a/backend/src/repositories/HashratesRepository.ts
+++ b/backend/src/repositories/HashratesRepository.ts
@@ -139,7 +139,7 @@ class HashratesRepository {
  public async $getPoolWeeklyHashrate(slug: string): Promise<any[]> {
    const pool = await PoolsRepository.$getPool(slug);
    if (!pool) {
-      throw new Error('This mining pool does not exist');
+      throw new Error('This mining pool does not exist ' + escape(slug));
    }

    // Find hashrate boundaries
--- a/backend/src/repositories/PricesRepository.ts
+++ b/backend/src/repositories/PricesRepository.ts
@@ -1,6 +1,5 @@
 import DB from '../database';
 import logger from '../logger';
-import config from '../config';
 import priceUpdater from '../tasks/price-updater';

 export interface ApiPrice {
@@ -12,81 +11,17 @@ export interface ApiPrice {
  CHF: number,
  AUD: number,
  JPY: number,
-  BGN: number,
-  BRL: number,
-  CNY: number,
-  CZK: number,
-  DKK: number,
-  HKD: number,
-  HRK: number,
-  HUF: number,
-  IDR: number,
-  ILS: number,
-  INR: number,
-  ISK: number,
-  KRW: number,
-  MXN: number,
-  MYR: number,
-  NOK: number,
-  NZD: number,
-  PHP: number,
-  PLN: number,
-  RON: number,
-  RUB: number,
-  SEK: number,
-  SGD: number,
-  THB: number,
-  TRY: number,
-  ZAR: number,
 }
-
-const ApiPriceFields = config.FIAT_PRICE.API_KEY ?
-    `
-      UNIX_TIMESTAMP(time) as time,
-      USD,
-      EUR,
-      GBP,
-      CAD,
-      CHF,
-      AUD,
-      JPY,
-      BGN,
-      BRL,
-      CNY,
-      CZK,
-      DKK,
-      HKD,
-      HRK,
-      HUF,
-      IDR,
-      ILS,
-      INR,
-      ISK,
-      KRW,
-      MXN,
-      MYR,
-      NOK,
-      NZD,
-      PHP,
-      PLN,
-      RON,
-      RUB,
-      SEK,
-      SGD,
-      THB,
-      TRY,
-      ZAR
-    `:
-    `
-      UNIX_TIMESTAMP(time) as time,
-      USD,
-      EUR,
-      GBP,
-      CAD,
-      CHF,
-      AUD,
-      JPY
-    `;
+const ApiPriceFields = `
+  UNIX_TIMESTAMP(time) as time,
+  USD,
+  EUR,
+  GBP,
+  CAD,
+  CHF,
+  AUD,
+  JPY
+`;

 export interface ExchangeRates {
  USDEUR: number,
@@ -95,32 +30,6 @@ export interface ExchangeRates {
  USDCHF: number,
  USDAUD: number,
  USDJPY: number,
-  USDBGN?: number,
-  USDBRL?: number,
-  USDCNY?: number,
-  USDCZK?: number,
-  USDDKK?: number,
-  USDHKD?: number,
-  USDHRK?: number,
-  USDHUF?: number,
-  USDIDR?: number,
-  USDILS?: number,
-  USDINR?: number,
-  USDISK?: number,
-  USDKRW?: number,
-  USDMXN?: number,
-  USDMYR?: number,
-  USDNOK?: number,
-  USDNZD?: number,
-  USDPHP?: number,
-  USDPLN?: number,
-  USDRON?: number,
-  USDRUB?: number,
-  USDSEK?: number,
-  USDSGD?: number,
-  USDTHB?: number,
-  USDTRY?: number,
-  USDZAR?: number,
 }

 export interface Conversion {
@@ -136,32 +45,6 @@ export const MAX_PRICES = {
  CHF: 100000000,
  AUD: 100000000,
  JPY: 10000000000,
-  BGN: 1000000000,
-  BRL: 1000000000,
-  CNY: 1000000000,
-  CZK: 10000000000,
-  DKK: 1000000000,
-  HKD: 1000000000,
-  HRK: 1000000000,
-  HUF: 10000000000,
-  IDR: 100000000000,
-  ILS: 1000000000,
-  INR: 10000000000,
-  ISK: 10000000000,
-  KRW: 100000000000,
-  MXN: 1000000000,
-  MYR: 1000000000,
-  NOK: 1000000000,
-  NZD: 1000000000,
-  PHP: 10000000000,
-  PLN: 1000000000,
-  RON: 1000000000,
-  RUB: 10000000000,
-  SEK: 1000000000,
-  SGD: 100000000,
-  THB: 10000000000,
-  TRY: 10000000000,
-  ZAR: 10000000000,
 };

 class PricesRepository {
@@ -181,49 +64,17 @@ class PricesRepository {
    }
    
    try {
-      if (!config.FIAT_PRICE.API_KEY) { // Store only the 7 main currencies
-          await DB.query(`
-          INSERT INTO prices(time,             USD, EUR, GBP, CAD, CHF, AUD, JPY)
-          VALUE             (FROM_UNIXTIME(?), ?,   ?,   ?,   ?,   ?,   ?,   ?  )`,
-          [time, prices.USD, prices.EUR, prices.GBP, prices.CAD, prices.CHF, prices.AUD, prices.JPY]
-        );
-      } else { // Store all 7 main currencies + all the currencies obtained with the external API
-        await DB.query(`
-          INSERT INTO prices(time,             USD, EUR, GBP, CAD, CHF, AUD, JPY, BGN, BRL, CNY, CZK, DKK, HKD, HRK, HUF, IDR, ILS, INR, ISK, KRW, MXN, MYR, NOK, NZD, PHP, PLN, RON, RUB, SEK, SGD, THB, TRY, ZAR)
-          VALUE             (FROM_UNIXTIME(?), ?,   ?,   ?,   ?,   ?,   ?,   ?,   ?  , ?,   ?,   ?,   ?,   ?,   ?,   ?,   ?  , ?,   ?,   ?,   ?,   ?,   ?,   ?,   ?,   ?,   ?,   ?,   ?,   ?,   ?,   ?,   ?  , ?  )`,
-          [time, prices.USD, prices.EUR, prices.GBP, prices.CAD, prices.CHF, prices.AUD, prices.JPY, prices.BGN, prices.BRL, prices.CNY, prices.CZK, prices.DKK, 
-                prices.HKD, prices.HRK, prices.HUF, prices.IDR, prices.ILS, prices.INR, prices.ISK, prices.KRW, prices.MXN, prices.MYR, prices.NOK, prices.NZD, 
-                prices.PHP, prices.PLN, prices.RON, prices.RUB, prices.SEK, prices.SGD, prices.THB, prices.TRY, prices.ZAR]
-        );
-      }
+      await DB.query(`
+        INSERT INTO prices(time,             USD, EUR, GBP, CAD, CHF, AUD, JPY)
+        VALUE             (FROM_UNIXTIME(?), ?,   ?,   ?,   ?,   ?,   ?,   ?  )`,
+        [time, prices.USD, prices.EUR, prices.GBP, prices.CAD, prices.CHF, prices.AUD, prices.JPY]
+      );
    } catch (e) {
      logger.err(`Cannot save exchange rate into db. Reason: ` + (e instanceof Error ? e.message : e));
      throw e;
    }
  }

-  public async $saveAdditionalCurrencyPrices(time: number, prices: ApiPrice, legacyCurrencies: string[]): Promise<void> {
-    try {
-      await DB.query(`
-        UPDATE prices
-        SET BGN = ?, BRL = ?, CNY = ?, CZK = ?, DKK = ?, HKD = ?, HRK = ?, HUF = ?, IDR = ?, ILS = ?, INR = ?, ISK = ?, KRW = ?, MXN = ?, MYR = ?, NOK = ?, NZD = ?, PHP = ?, PLN = ?, RON = ?, RUB = ?, SEK = ?, SGD = ?, THB = ?, TRY = ?, ZAR = ?
-        WHERE UNIX_TIMESTAMP(time) = ?`,
-        [prices.BGN, prices.BRL, prices.CNY, prices.CZK, prices.DKK, prices.HKD, prices.HRK, prices.HUF, prices.IDR, prices.ILS, prices.INR, prices.ISK, prices.KRW, prices.MXN, prices.MYR, prices.NOK, prices.NZD, prices.PHP, prices.PLN, prices.RON, prices.RUB, prices.SEK, prices.SGD, prices.THB, prices.TRY, prices.ZAR, time]
-      );
-      for (const currency of legacyCurrencies) {
-        await DB.query(`
-          UPDATE prices
-          SET ${currency} = ?
-          WHERE UNIX_TIMESTAMP(time) = ?`,
-          [prices[currency], time]
-        );
-      }
-    } catch (e) {
-      logger.err(`Cannot update exchange rate into db. Reason: ` + (e instanceof Error ? e.message : e));
-      throw e;
-    }
-  }
-
  public async $getOldestPriceTime(): Promise<number> {
    const [oldestRow] = await DB.query(`
      SELECT UNIX_TIMESTAMP(time) AS time
@@ -267,28 +118,6 @@ class PricesRepository {
    return times.map(time => time.time);
  }

-  public async $getPricesTimesWithMissingFields(): Promise<{time: number, USD: number, eur_missing: boolean, gbp_missing: boolean, cad_missing: boolean, chf_missing: boolean, aud_missing: boolean, jpy_missing: boolean}[]> {
-    const [times] = await DB.query(`
-      SELECT UNIX_TIMESTAMP(time) AS time, 
-             USD, 
-             CASE WHEN EUR = -1 THEN TRUE ELSE FALSE END AS eur_missing,
-             CASE WHEN GBP = -1 THEN TRUE ELSE FALSE END AS gbp_missing,
-             CASE WHEN CAD = -1 THEN TRUE ELSE FALSE END AS cad_missing,
-             CASE WHEN CHF = -1 THEN TRUE ELSE FALSE END AS chf_missing,
-             CASE WHEN AUD = -1 THEN TRUE ELSE FALSE END AS aud_missing,
-             CASE WHEN JPY = -1 THEN TRUE ELSE FALSE END AS jpy_missing
-      FROM prices
-      WHERE USD != -1 
-      AND -1 IN (EUR, GBP, CAD, CHF, AUD, JPY, BGN, BRL, CNY, CZK, DKK, HKD, HRK, HUF, IDR, ILS, INR, ISK, KRW, 
-                 MXN, MYR, NOK, NZD, PHP, PLN, RON, RUB, SEK, SGD, THB, TRY, ZAR)
-      ORDER BY time DESC
-    `);
-    if (!Array.isArray(times)) {
-      return [];
-    }
-    return times as {time: number, USD: number, eur_missing: boolean, gbp_missing: boolean, cad_missing: boolean, chf_missing: boolean, aud_missing: boolean, jpy_missing: boolean}[];
-  }
-
  public async $getPricesTimesAndId(): Promise<{time: number, id: number, USD: number}[]> {
    const [times] = await DB.query(`
      SELECT
@@ -315,7 +144,7 @@ class PricesRepository {
    return rates[0] as ApiPrice;
  }

-  public async $getNearestHistoricalPrice(timestamp: number | undefined, currency?: string): Promise<Conversion | null> {
+  public async $getNearestHistoricalPrice(timestamp: number | undefined): Promise<Conversion | null> {
    try {
      const [rates] = await DB.query(`
        SELECT ${ApiPriceFields}
@@ -329,91 +158,24 @@ class PricesRepository {
        throw Error(`Cannot get single historical price from the database`);
      }

-      const [latestPrices] = await DB.query(`
-        SELECT ${ApiPriceFields}
-        FROM prices
-        ORDER BY time DESC
-        LIMIT 1
-      `);
-      if (!Array.isArray(latestPrices)) {
-        throw Error(`Cannot get single historical price from the database`);
-      }      
-      
      // Compute fiat exchange rates
-      let latestPrice = latestPrices[0] as ApiPrice;
+      let latestPrice = rates[0] as ApiPrice;
      if (!latestPrice || latestPrice.USD === -1) {
        latestPrice = priceUpdater.getEmptyPricesObj();
      }

-      const computeFx = (usd: number, other: number): number => usd <= 0.05 ? 0 : Math.round(Math.max(other, 0) / usd * 100) / 100;
+      const computeFx = (usd: number, other: number): number =>
+        Math.round(Math.max(other, 0) / Math.max(usd, 1) * 100) / 100;
      
-      const exchangeRates: ExchangeRates = config.FIAT_PRICE.API_KEY ? 
-        {
-          USDEUR: computeFx(latestPrice.USD, latestPrice.EUR),
-          USDGBP: computeFx(latestPrice.USD, latestPrice.GBP),
-          USDCAD: computeFx(latestPrice.USD, latestPrice.CAD),
-          USDCHF: computeFx(latestPrice.USD, latestPrice.CHF),
-          USDAUD: computeFx(latestPrice.USD, latestPrice.AUD),
-          USDJPY: computeFx(latestPrice.USD, latestPrice.JPY),
-          USDBGN: computeFx(latestPrice.USD, latestPrice.BGN),
-          USDBRL: computeFx(latestPrice.USD, latestPrice.BRL),
-          USDCNY: computeFx(latestPrice.USD, latestPrice.CNY),
-          USDCZK: computeFx(latestPrice.USD, latestPrice.CZK),
-          USDDKK: computeFx(latestPrice.USD, latestPrice.DKK),
-          USDHKD: computeFx(latestPrice.USD, latestPrice.HKD),
-          USDHRK: computeFx(latestPrice.USD, latestPrice.HRK),
-          USDHUF: computeFx(latestPrice.USD, latestPrice.HUF),
-          USDIDR: computeFx(latestPrice.USD, latestPrice.IDR),
-          USDILS: computeFx(latestPrice.USD, latestPrice.ILS),
-          USDINR: computeFx(latestPrice.USD, latestPrice.INR),
-          USDISK: computeFx(latestPrice.USD, latestPrice.ISK),
-          USDKRW: computeFx(latestPrice.USD, latestPrice.KRW),
-          USDMXN: computeFx(latestPrice.USD, latestPrice.MXN),
-          USDMYR: computeFx(latestPrice.USD, latestPrice.MYR),
-          USDNOK: computeFx(latestPrice.USD, latestPrice.NOK),
-          USDNZD: computeFx(latestPrice.USD, latestPrice.NZD),
-          USDPHP: computeFx(latestPrice.USD, latestPrice.PHP),
-          USDPLN: computeFx(latestPrice.USD, latestPrice.PLN),
-          USDRON: computeFx(latestPrice.USD, latestPrice.RON),
-          USDRUB: computeFx(latestPrice.USD, latestPrice.RUB),
-          USDSEK: computeFx(latestPrice.USD, latestPrice.SEK),
-          USDSGD: computeFx(latestPrice.USD, latestPrice.SGD),
-          USDTHB: computeFx(latestPrice.USD, latestPrice.THB),
-          USDTRY: computeFx(latestPrice.USD, latestPrice.TRY),
-          USDZAR: computeFx(latestPrice.USD, latestPrice.ZAR),
-        } : {
-          USDEUR: computeFx(latestPrice.USD, latestPrice.EUR),
-          USDGBP: computeFx(latestPrice.USD, latestPrice.GBP),
-          USDCAD: computeFx(latestPrice.USD, latestPrice.CAD),
-          USDCHF: computeFx(latestPrice.USD, latestPrice.CHF),
-          USDAUD: computeFx(latestPrice.USD, latestPrice.AUD),
-          USDJPY: computeFx(latestPrice.USD, latestPrice.JPY),
+      const exchangeRates: ExchangeRates = {
+        USDEUR: computeFx(latestPrice.USD, latestPrice.EUR),
+        USDGBP: computeFx(latestPrice.USD, latestPrice.GBP),
+        USDCAD: computeFx(latestPrice.USD, latestPrice.CAD),
+        USDCHF: computeFx(latestPrice.USD, latestPrice.CHF),
+        USDAUD: computeFx(latestPrice.USD, latestPrice.AUD),
+        USDJPY: computeFx(latestPrice.USD, latestPrice.JPY),
      };

-      if (currency) {
-        if (!latestPrice[currency]) {
-          return null;
-        }
-        const filteredRates = rates.map((rate: any) => {
-          return {
-            time: rate.time,
-            [currency]: rate[currency],
-            ['USD']: rate['USD']
-          };
-        });
-        if (filteredRates.length === 0) { // No price data before 2010-07-19: add a fake entry
-          filteredRates.push({
-            time: 1279497600,
-            [currency]: 0,
-            ['USD']: 0
-          });
-        }
-        return {
-          prices: filteredRates as ApiPrice[],
-          exchangeRates: exchangeRates
-        };
-      }
-
      return {
        prices: rates as ApiPrice[],
        exchangeRates: exchangeRates
@@ -424,7 +186,7 @@ class PricesRepository {
    }
  }

-  public async $getHistoricalPrices(currency?: string): Promise<Conversion | null> {
+  public async $getHistoricalPrices(): Promise<Conversion | null> {
    try {
      const [rates] = await DB.query(`
        SELECT ${ApiPriceFields}
@@ -441,69 +203,18 @@ class PricesRepository {
        latestPrice = priceUpdater.getEmptyPricesObj();
      }

-      const computeFx = (usd: number, other: number): number => 
-        usd <= 0 ? 0 : Math.round(Math.max(other, 0) / usd * 100) / 100;
+      const computeFx = (usd: number, other: number): number =>
+        Math.round(Math.max(other, 0) / Math.max(usd, 1) * 100) / 100;
      
-      const exchangeRates: ExchangeRates = config.FIAT_PRICE.API_KEY ? 
-        {
-          USDEUR: computeFx(latestPrice.USD, latestPrice.EUR),
-          USDGBP: computeFx(latestPrice.USD, latestPrice.GBP),
-          USDCAD: computeFx(latestPrice.USD, latestPrice.CAD),
-          USDCHF: computeFx(latestPrice.USD, latestPrice.CHF),
-          USDAUD: computeFx(latestPrice.USD, latestPrice.AUD),
-          USDJPY: computeFx(latestPrice.USD, latestPrice.JPY),
-          USDBGN: computeFx(latestPrice.USD, latestPrice.BGN),
-          USDBRL: computeFx(latestPrice.USD, latestPrice.BRL),
-          USDCNY: computeFx(latestPrice.USD, latestPrice.CNY),
-          USDCZK: computeFx(latestPrice.USD, latestPrice.CZK),
-          USDDKK: computeFx(latestPrice.USD, latestPrice.DKK),
-          USDHKD: computeFx(latestPrice.USD, latestPrice.HKD),
-          USDHRK: computeFx(latestPrice.USD, latestPrice.HRK),
-          USDHUF: computeFx(latestPrice.USD, latestPrice.HUF),
-          USDIDR: computeFx(latestPrice.USD, latestPrice.IDR),
-          USDILS: computeFx(latestPrice.USD, latestPrice.ILS),
-          USDINR: computeFx(latestPrice.USD, latestPrice.INR),
-          USDISK: computeFx(latestPrice.USD, latestPrice.ISK),
-          USDKRW: computeFx(latestPrice.USD, latestPrice.KRW),
-          USDMXN: computeFx(latestPrice.USD, latestPrice.MXN),
-          USDMYR: computeFx(latestPrice.USD, latestPrice.MYR),
-          USDNOK: computeFx(latestPrice.USD, latestPrice.NOK),
-          USDNZD: computeFx(latestPrice.USD, latestPrice.NZD),
-          USDPHP: computeFx(latestPrice.USD, latestPrice.PHP),
-          USDPLN: computeFx(latestPrice.USD, latestPrice.PLN),
-          USDRON: computeFx(latestPrice.USD, latestPrice.RON),
-          USDRUB: computeFx(latestPrice.USD, latestPrice.RUB),
-          USDSEK: computeFx(latestPrice.USD, latestPrice.SEK),
-          USDSGD: computeFx(latestPrice.USD, latestPrice.SGD),
-          USDTHB: computeFx(latestPrice.USD, latestPrice.THB),
-          USDTRY: computeFx(latestPrice.USD, latestPrice.TRY),
-          USDZAR: computeFx(latestPrice.USD, latestPrice.ZAR),
-        } : {
-          USDEUR: computeFx(latestPrice.USD, latestPrice.EUR),
-          USDGBP: computeFx(latestPrice.USD, latestPrice.GBP),
-          USDCAD: computeFx(latestPrice.USD, latestPrice.CAD),
-          USDCHF: computeFx(latestPrice.USD, latestPrice.CHF),
-          USDAUD: computeFx(latestPrice.USD, latestPrice.AUD),
-          USDJPY: computeFx(latestPrice.USD, latestPrice.JPY),
+      const exchangeRates: ExchangeRates = {
+        USDEUR: computeFx(latestPrice.USD, latestPrice.EUR),
+        USDGBP: computeFx(latestPrice.USD, latestPrice.GBP),
+        USDCAD: computeFx(latestPrice.USD, latestPrice.CAD),
+        USDCHF: computeFx(latestPrice.USD, latestPrice.CHF),
+        USDAUD: computeFx(latestPrice.USD, latestPrice.AUD),
+        USDJPY: computeFx(latestPrice.USD, latestPrice.JPY),
      };

-      if (currency) {
-        if (!latestPrice[currency]) {
-          return null;
-        }
-        const filteredRates = rates.map((rate: any) => {
-          return {
-            time: rate.time,
-            [currency]: rate[currency],
-            ['USD']: rate['USD']
-          };
-        });
-        return {
-          prices: filteredRates as ApiPrice[],
-          exchangeRates: exchangeRates
-        };
-      }
-
      return {
        prices: rates as ApiPrice[],
        exchangeRates: exchangeRates
--- a/backend/src/rpc-api/commands.ts
+++ b/backend/src/rpc-api/commands.ts
@@ -11,7 +11,6 @@ module.exports = {
  encryptWallet: 'encryptwallet',
  estimateFee: 'estimatefee', // bitcoind v0.10.0x
  estimatePriority: 'estimatepriority', // bitcoind v0.10.0+
-  estimateSmartFee: 'estimatesmartfee',
  generate: 'generate', // bitcoind v0.11.0+
  getAccount: 'getaccount',
  getAccountAddress: 'getaccountaddress',
--- a/backend/src/tasks/pools-updater.ts
+++ b/backend/src/tasks/pools-updater.ts
@@ -50,10 +50,10 @@ class PoolsUpdater {

      // See backend README for more details about the mining pools update process
      if (this.currentSha !== null && // If we don't have any mining pool, download it at least once
-        config.MEMPOOL.AUTOMATIC_POOLS_UPDATE !== true && // Automatic pools update is disabled
+        config.MEMPOOL.AUTOMATIC_BLOCK_REINDEXING !== true && // Automatic pools update is disabled
        !process.env.npm_config_update_pools // We're not manually updating mining pool
      ) {
-        logger.warn(`Updated mining pools data is available (${githubSha}) but AUTOMATIC_POOLS_UPDATE is disabled`);
+        logger.warn(`Updated mining pools data is available (${githubSha}) but AUTOMATIC_BLOCK_REINDEXING is disabled`);
        logger.info(`You can update your mining pools using the --update-pools command flag. You may want to clear your nginx cache as well if applicable`);
        return;
      }
--- a/backend/src/tasks/price-feeds/free-currency-api.ts
+++ b/backend/src/tasks/price-feeds/free-currency-api.ts
@@ -1,100 +0,0 @@
-import config from '../../config';
-import { query } from '../../utils/axios-query';
-import { ConversionFeed, ConversionRates } from '../price-updater';
-
-const emptyRates = {
-  AUD: -1,
-  BGN: -1,
-  BRL: -1,
-  CAD: -1,
-  CHF: -1,
-  CNY: -1,
-  CZK: -1,
-  DKK: -1,
-  EUR: -1,
-  GBP: -1,
-  HKD: -1,
-  HRK: -1,
-  HUF: -1,
-  IDR: -1,
-  ILS: -1,
-  INR: -1,
-  ISK: -1,
-  JPY: -1,
-  KRW: -1,
-  MXN: -1,
-  MYR: -1,
-  NOK: -1,
-  NZD: -1,
-  PHP: -1,
-  PLN: -1,
-  RON: -1,
-  RUB: -1,
-  SEK: -1,
-  SGD: -1,
-  THB: -1,
-  TRY: -1,
-  USD: -1,
-  ZAR: -1,
-};
-
-type PaidCurrencyData = {
-  [key: string]: {
-      code: string;
-      value: number;
-  }
-};
-
-type FreeCurrencyData = {
-  [key: string]: number;
-};
-
-class FreeCurrencyApi implements ConversionFeed {
-  private API_KEY = config.FIAT_PRICE.API_KEY;
-  private PAID = config.FIAT_PRICE.PAID;
-  private API_URL_PREFIX: string = this.PAID ? `https://api.currencyapi.com/v3/` : `https://api.freecurrencyapi.com/v1/`;
-
-  constructor() { }
-
-  public async $getQuota(): Promise<any> {
-    const response = await query(`${this.API_URL_PREFIX}status?apikey=${this.API_KEY}`);
-    if (response && response['quotas']) {
-      return response['quotas'];
-    }
-    return null;
-  }
-
-  public async $fetchLatestConversionRates(): Promise<ConversionRates> {
-    const response = await query(`${this.API_URL_PREFIX}latest?apikey=${this.API_KEY}`);
-    if (response && response['data']) {
-      if (this.PAID) {
-        response['data'] = this.convertData(response['data']);
-      }
-      return response['data'];
-    }
-    return emptyRates;
-  }
-
-  public async $fetchConversionRates(date: string): Promise<ConversionRates> {
-    const response = await query(`${this.API_URL_PREFIX}historical?date=${date}&apikey=${this.API_KEY}`, true);
-    if (response && response['data'] && (response['data'][date] || this.PAID)) {
-      if (this.PAID) {
-        response['data'] = this.convertData(response['data']);
-        response['data'][response['meta'].last_updated_at.substr(0, 10)] = response['data'];
-      }
-      return response['data'][date];
-    }
-    return emptyRates;
-  }
-
-  private convertData(data: PaidCurrencyData): FreeCurrencyData {
-    const simplifiedData: FreeCurrencyData = {};
-    for (const key in data) {
-      simplifiedData[key] = data[key].value;
-    }
-    return simplifiedData;
-  }
-
-}
-
-export default FreeCurrencyApi;
--- a/backend/src/tasks/price-updater.ts
+++ b/backend/src/tasks/price-updater.ts
@@ -8,7 +8,6 @@ import BitflyerApi from './price-feeds/bitflyer-api';
 import CoinbaseApi from './price-feeds/coinbase-api';
 import GeminiApi from './price-feeds/gemini-api';
 import KrakenApi from './price-feeds/kraken-api';
-import FreeCurrencyApi from './price-feeds/free-currency-api';

 export interface PriceFeed {
  name: string;
@@ -24,16 +23,6 @@ export interface PriceHistory {
  [timestamp: number]: ApiPrice;
 }

-export interface ConversionFeed {
-  $getQuota(): Promise<any>;
-  $fetchLatestConversionRates(): Promise<ConversionRates>;
-  $fetchConversionRates(date: string): Promise<ConversionRates>;
-}
-
-export interface ConversionRates {
-  [currency: string]: number
-}
-
 function getMedian(arr: number[]): number {
  const sortedArr = arr.slice().sort((a, b) => a - b);
  const mid = Math.floor(sortedArr.length / 2);
@@ -44,9 +33,6 @@ function getMedian(arr: number[]): number {

 class PriceUpdater {
  public historyInserted = false;
-  private additionalCurrenciesHistoryInserted = false;
-  private additionalCurrenciesHistoryRunning = false;
-  private lastFailedHistoricalRun = 0;
  private timeBetweenUpdatesMs = 360_0000 / config.MEMPOOL.PRICE_UPDATES_PER_HOUR;
  private cyclePosition = -1;
  private firstRun = true;
@@ -56,10 +42,6 @@ class PriceUpdater {
  private feeds: PriceFeed[] = [];
  private currencies: string[] = ['USD', 'EUR', 'GBP', 'CAD', 'CHF', 'AUD', 'JPY'];
  private latestPrices: ApiPrice;
-  private currencyConversionFeed: ConversionFeed | undefined;
-  private newCurrencies: string[] = ['BGN', 'BRL', 'CNY', 'CZK', 'DKK', 'HKD', 'HRK', 'HUF', 'IDR', 'ILS', 'INR', 'ISK', 'KRW', 'MXN', 'MYR', 'NOK', 'NZD', 'PHP', 'PLN', 'RON', 'RUB', 'SEK', 'SGD', 'THB', 'TRY', 'ZAR'];
-  private lastTimeConversionsRatesFetched: number = 0;
-  private latestConversionsRatesFromFeed: ConversionRates = { USD: -1 };
  private ratesChangedCallback: ((rates: ApiPrice) => void) | undefined;

  constructor() {
@@ -71,7 +53,6 @@ class PriceUpdater {
    this.feeds.push(new BitfinexApi());
    this.feeds.push(new GeminiApi());

-    this.currencyConversionFeed = new FreeCurrencyApi();
    this.setCyclePosition();
  }

@@ -89,32 +70,6 @@ class PriceUpdater {
      CHF: -1,
      AUD: -1,
      JPY: -1,
-      BGN: -1,
-      BRL: -1,
-      CNY: -1,
-      CZK: -1,
-      DKK: -1,
-      HKD: -1,
-      HRK: -1,
-      HUF: -1,
-      IDR: -1,
-      ILS: -1,
-      INR: -1,
-      ISK: -1,
-      KRW: -1,
-      MXN: -1,
-      MYR: -1,
-      NOK: -1,
-      NZD: -1,
-      PHP: -1,
-      PLN: -1,
-      RON: -1,
-      RUB: -1,
-      SEK: -1,
-      SGD: -1,
-      THB: -1,
-      TRY: -1,
-      ZAR: -1,
    };
  }

@@ -144,23 +99,6 @@ class PriceUpdater {
    if ((Math.round(new Date().getTime() / 1000) - this.lastHistoricalRun) > 3600 * 24) {
      // Once a day, look for missing prices (could happen due to network connectivity issues)
      this.historyInserted = false;
-      this.additionalCurrenciesHistoryInserted = false;
-    }
-
-    if (this.lastFailedHistoricalRun > 0 && (Math.round(new Date().getTime() / 1000) - this.lastFailedHistoricalRun) > 60) {
-      // If the last attempt to insert missing prices failed, we try again after 60 seconds
-      this.additionalCurrenciesHistoryInserted = false;
-    }
-
-    if (config.FIAT_PRICE.API_KEY && this.currencyConversionFeed && (Math.round(new Date().getTime() / 1000) - this.lastTimeConversionsRatesFetched) > 3600 * 24) {
-      // Once a day, fetch conversion rates from api: we don't need more granularity for fiat currencies and have a limited number of requests
-      try {
-        this.latestConversionsRatesFromFeed = await this.currencyConversionFeed.$fetchLatestConversionRates();
-        this.lastTimeConversionsRatesFetched = Math.round(new Date().getTime() / 1000);
-        logger.debug(`Fetched currencies conversion rates from conversions API: ${JSON.stringify(this.latestConversionsRatesFromFeed)}`);
-      } catch (e) {
-        logger.err(`Cannot fetch conversion rates from conversions API. Reason: ${(e instanceof Error ? e.message : e)}`);
-      }
    }

    try {
@@ -168,10 +106,6 @@ class PriceUpdater {
      if (this.historyInserted === false && config.DATABASE.ENABLED === true) {
        await this.$insertHistoricalPrices();
      }
-      if (this.additionalCurrenciesHistoryInserted === false && config.DATABASE.ENABLED === true && config.FIAT_PRICE.API_KEY && !this.additionalCurrenciesHistoryRunning) {
-        await this.$insertMissingAdditionalPrices();
-      }
-
    } catch (e: any) {
      logger.err(`Cannot save BTC prices in db. Reason: ${e instanceof Error ? e.message : e}`, logger.tags.mining);
    }
@@ -251,14 +185,6 @@ class PriceUpdater {
      }
    }

-    if (config.FIAT_PRICE.API_KEY && this.latestPrices.USD > 0 && Object.keys(this.latestConversionsRatesFromFeed).length > 0) {
-      for (const conversionCurrency of this.newCurrencies) {
-        if (this.latestConversionsRatesFromFeed[conversionCurrency] > 0 && this.latestPrices.USD * this.latestConversionsRatesFromFeed[conversionCurrency] < MAX_PRICES[conversionCurrency]) {
-          this.latestPrices[conversionCurrency] = Math.round(this.latestPrices.USD * this.latestConversionsRatesFromFeed[conversionCurrency]);
-        }
-      }
-    }
-
    if (config.DATABASE.ENABLED === true && this.cyclePosition === 0) {
      // Save everything in db
      try {
@@ -327,7 +253,7 @@ class PriceUpdater {
    await this.$insertMissingRecentPrices('hour');

    this.historyInserted = true;
-    this.lastHistoricalRun = Math.round(new Date().getTime() / 1000);
+    this.lastHistoricalRun = new Date().getTime();
  }

  /**
@@ -394,96 +320,6 @@ class PriceUpdater {
      logger.debug(`Inserted ${totalInserted} ${type === 'day' ? 'dai' : 'hour'}ly historical prices into the db`, logger.tags.mining);
    }
  }
-
-  /**
-   * Find missing prices for additional currencies and insert them in the database
-   * We calculate the additional prices from the USD price and the conversion rates
-   */
-  private async $insertMissingAdditionalPrices(): Promise<void> {
-    this.lastFailedHistoricalRun = 0;
-    const priceTimesToFill = await PricesRepository.$getPricesTimesWithMissingFields();
-    if (priceTimesToFill.length === 0) {
-      return;
-    }
-    try {
-      const remainingQuota = await this.currencyConversionFeed?.$getQuota();
-      if (remainingQuota['month']['remaining'] < 500) { // We need some calls left for the daily updates
-        logger.debug(`Not enough conversions API credit to insert missing prices in ${priceTimesToFill.length} rows (${remainingQuota['month']['remaining']} calls left).`, logger.tags.mining);
-        this.additionalCurrenciesHistoryInserted = true; // Do not try again until next day
-        return;
-      }
-    } catch (e) {
-      logger.err(`Cannot fetch conversions API credit, insertion of missing prices aborted. Reason: ${(e instanceof Error ? e.message : e)}`);
-      return;
-    }
-
-    this.additionalCurrenciesHistoryRunning = true;
-    logger.debug(`Inserting missing historical conversion rates using conversions API to fill ${priceTimesToFill.length} rows`, logger.tags.mining);
-
-    let conversionRates: { [timestamp: number]: ConversionRates } = {};
-    let totalInserted = 0;
-
-    for (let i = 0; i < priceTimesToFill.length; i++) {
-      const priceTime = priceTimesToFill[i];
-      const missingLegacyCurrencies = this.getMissingLegacyCurrencies(priceTime); // In the case a legacy currency (EUR, GBP, CAD, CHF, AUD, JPY)
-      const year = new Date(priceTime.time * 1000).getFullYear();                 // is missing, we use the same process as for the new currencies
-      const month = new Date(priceTime.time * 1000).getMonth();
-      const yearMonthTimestamp = new Date(year, month, 1).getTime() / 1000;
-      if (conversionRates[yearMonthTimestamp] === undefined) {
-        try {
-          if (year === new Date().getFullYear() && month === new Date().getMonth()) { // For rows in the current month, we use the latest conversion rates
-            conversionRates[yearMonthTimestamp] = this.latestConversionsRatesFromFeed;
-          } else {
-            conversionRates[yearMonthTimestamp] = await this.currencyConversionFeed?.$fetchConversionRates(`${year}-${month + 1 < 10 ? `0${month + 1}` : `${month + 1}`}-15`) || { USD: -1 };
-          }
-
-          if (conversionRates[yearMonthTimestamp]['USD'] < 0) {
-            throw new Error('Incorrect USD conversion rate');
-          }
-        } catch (e) {
-          if ((e instanceof Error ? e.message : '').includes('429')) { // Continue 60 seconds later if and only if error is 429
-            this.lastFailedHistoricalRun = Math.round(new Date().getTime() / 1000);
-            logger.info(`Got a 429 error from conversions API. This is expected to happen a few times during the initial historical price insertion, process will resume in 60 seconds.`, logger.tags.mining);
-          } else {
-            logger.err(`Cannot fetch conversion rates from conversions API for ${year}-${month + 1 < 10 ? `0${month + 1}` : `${month + 1}`}-01, trying again next day. Error: ${(e instanceof Error ? e.message : e)}`, logger.tags.mining);
-          }
-          break;
-        }
-      }
-
-      const prices: ApiPrice = this.getEmptyPricesObj();
-      
-      let willInsert = false;
-      for (const conversionCurrency of this.newCurrencies.concat(missingLegacyCurrencies)) {
-        if (conversionRates[yearMonthTimestamp][conversionCurrency] > 0 && priceTime.USD * conversionRates[yearMonthTimestamp][conversionCurrency] < MAX_PRICES[conversionCurrency]) {
-          prices[conversionCurrency] = year >= 2013 ? Math.round(priceTime.USD * conversionRates[yearMonthTimestamp][conversionCurrency]) : Math.round(priceTime.USD * conversionRates[yearMonthTimestamp][conversionCurrency] * 100) / 100;
-          willInsert = true;
-        } else {
-          prices[conversionCurrency] = 0;
-        }
-      }
-      
-      if (willInsert) {
-        await PricesRepository.$saveAdditionalCurrencyPrices(priceTime.time, prices, missingLegacyCurrencies);
-        ++totalInserted;
-      }
-    }
-
-    logger.debug(`Inserted ${totalInserted} missing additional currency prices into the db`, logger.tags.mining);
-    this.additionalCurrenciesHistoryInserted = true;
-    this.additionalCurrenciesHistoryRunning = false;
-  }
-
-  // Helper function to get legacy missing currencies in a row (EUR, GBP, CAD, CHF, AUD, JPY)
-  private getMissingLegacyCurrencies(priceTime: any): string[] {
-    const missingCurrencies: string[] = [];
-    ['eur', 'gbp', 'cad', 'chf', 'aud', 'jpy'].forEach(currency => {
-      if (priceTime[`${currency}_missing`]) {
-        missingCurrencies.push(currency.toUpperCase());
-      }
-    });
-    return missingCurrencies;
-  }
 }

 export default new PriceUpdater();
--- a/backend/src/utils/axios-query.ts
+++ b/backend/src/utils/axios-query.ts
@@ -5,7 +5,7 @@ import config from '../config';
 import logger from '../logger';
 import * as https from 'https';

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

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

 logger.err(`Could not connect to ${path}. All ${config.MEMPOOL.EXTERNAL_MAX_RETRY} attempts failed`);
-
- if (throwOnFail && lastError) {
-    throw lastError;
-  }
-
 return undefined;
 }
--- a/backend/src/utils/bitcoin-script.ts
+++ b/backend/src/utils/bitcoin-script.ts
@@ -1,203 +0,0 @@
-const opcodes = {
-  OP_FALSE: 0,
-  OP_0: 0,
-  OP_PUSHDATA1: 76,
-  OP_PUSHDATA2: 77,
-  OP_PUSHDATA4: 78,
-  OP_1NEGATE: 79,
-  OP_PUSHNUM_NEG1: 79,
-  OP_RESERVED: 80,
-  OP_TRUE: 81,
-  OP_1: 81,
-  OP_2: 82,
-  OP_3: 83,
-  OP_4: 84,
-  OP_5: 85,
-  OP_6: 86,
-  OP_7: 87,
-  OP_8: 88,
-  OP_9: 89,
-  OP_10: 90,
-  OP_11: 91,
-  OP_12: 92,
-  OP_13: 93,
-  OP_14: 94,
-  OP_15: 95,
-  OP_16: 96,
-  OP_PUSHNUM_1: 81,
-  OP_PUSHNUM_2: 82,
-  OP_PUSHNUM_3: 83,
-  OP_PUSHNUM_4: 84,
-  OP_PUSHNUM_5: 85,
-  OP_PUSHNUM_6: 86,
-  OP_PUSHNUM_7: 87,
-  OP_PUSHNUM_8: 88,
-  OP_PUSHNUM_9: 89,
-  OP_PUSHNUM_10: 90,
-  OP_PUSHNUM_11: 91,
-  OP_PUSHNUM_12: 92,
-  OP_PUSHNUM_13: 93,
-  OP_PUSHNUM_14: 94,
-  OP_PUSHNUM_15: 95,
-  OP_PUSHNUM_16: 96,
-  OP_NOP: 97,
-  OP_VER: 98,
-  OP_IF: 99,
-  OP_NOTIF: 100,
-  OP_VERIF: 101,
-  OP_VERNOTIF: 102,
-  OP_ELSE: 103,
-  OP_ENDIF: 104,
-  OP_VERIFY: 105,
-  OP_RETURN: 106,
-  OP_TOALTSTACK: 107,
-  OP_FROMALTSTACK: 108,
-  OP_2DROP: 109,
-  OP_2DUP: 110,
-  OP_3DUP: 111,
-  OP_2OVER: 112,
-  OP_2ROT: 113,
-  OP_2SWAP: 114,
-  OP_IFDUP: 115,
-  OP_DEPTH: 116,
-  OP_DROP: 117,
-  OP_DUP: 118,
-  OP_NIP: 119,
-  OP_OVER: 120,
-  OP_PICK: 121,
-  OP_ROLL: 122,
-  OP_ROT: 123,
-  OP_SWAP: 124,
-  OP_TUCK: 125,
-  OP_CAT: 126,
-  OP_SUBSTR: 127,
-  OP_LEFT: 128,
-  OP_RIGHT: 129,
-  OP_SIZE: 130,
-  OP_INVERT: 131,
-  OP_AND: 132,
-  OP_OR: 133,
-  OP_XOR: 134,
-  OP_EQUAL: 135,
-  OP_EQUALVERIFY: 136,
-  OP_RESERVED1: 137,
-  OP_RESERVED2: 138,
-  OP_1ADD: 139,
-  OP_1SUB: 140,
-  OP_2MUL: 141,
-  OP_2DIV: 142,
-  OP_NEGATE: 143,
-  OP_ABS: 144,
-  OP_NOT: 145,
-  OP_0NOTEQUAL: 146,
-  OP_ADD: 147,
-  OP_SUB: 148,
-  OP_MUL: 149,
-  OP_DIV: 150,
-  OP_MOD: 151,
-  OP_LSHIFT: 152,
-  OP_RSHIFT: 153,
-  OP_BOOLAND: 154,
-  OP_BOOLOR: 155,
-  OP_NUMEQUAL: 156,
-  OP_NUMEQUALVERIFY: 157,
-  OP_NUMNOTEQUAL: 158,
-  OP_LESSTHAN: 159,
-  OP_GREATERTHAN: 160,
-  OP_LESSTHANOREQUAL: 161,
-  OP_GREATERTHANOREQUAL: 162,
-  OP_MIN: 163,
-  OP_MAX: 164,
-  OP_WITHIN: 165,
-  OP_RIPEMD160: 166,
-  OP_SHA1: 167,
-  OP_SHA256: 168,
-  OP_HASH160: 169,
-  OP_HASH256: 170,
-  OP_CODESEPARATOR: 171,
-  OP_CHECKSIG: 172,
-  OP_CHECKSIGVERIFY: 173,
-  OP_CHECKMULTISIG: 174,
-  OP_CHECKMULTISIGVERIFY: 175,
-  OP_NOP1: 176,
-  OP_NOP2: 177,
-  OP_CHECKLOCKTIMEVERIFY: 177,
-  OP_CLTV: 177,
-  OP_NOP3: 178,
-  OP_CHECKSEQUENCEVERIFY: 178,
-  OP_CSV: 178,
-  OP_NOP4: 179,
-  OP_NOP5: 180,
-  OP_NOP6: 181,
-  OP_NOP7: 182,
-  OP_NOP8: 183,
-  OP_NOP9: 184,
-  OP_NOP10: 185,
-  OP_CHECKSIGADD: 186,
-  OP_PUBKEYHASH: 253,
-  OP_PUBKEY: 254,
-  OP_INVALIDOPCODE: 255,
-};
-// add unused opcodes
-for (let i = 187; i <= 255; i++) {
-  opcodes[`OP_RETURN_${i}`] = i;
-}
-
-export { opcodes };
-
-/** extracts m and n from a multisig script (asm), returns nothing if it is not a multisig script */
-export function parseMultisigScript(script: string): void | { m: number, n: number } {
-  if (!script) {
-    return;
-  }
-  const ops = script.split(' ');
-  if (ops.length < 3 || ops.pop() !== 'OP_CHECKMULTISIG') {
-    return;
-  }
-  const opN = ops.pop();
-  if (!opN) {
-    return;
-  }
-  if (!opN.startsWith('OP_PUSHNUM_')) {
-    return;
-  }
-  const n = parseInt(opN.match(/[0-9]+/)?.[0] || '', 10);
-  if (ops.length < n * 2 + 1) {
-    return;
-  }
-  // pop n public keys
-  for (let i = 0; i < n; i++) {
-    if (!/^0((2|3)\w{64}|4\w{128})$/.test(ops.pop() || '')) {
-      return;
-    }
-    if (!/^OP_PUSHBYTES_(33|65)$/.test(ops.pop() || '')) {
-      return;
-    }
-  }
-  const opM = ops.pop();
-  if (!opM) {
-    return;
-  }
-  if (!opM.startsWith('OP_PUSHNUM_')) {
-    return;
-  }
-  const m = parseInt(opM.match(/[0-9]+/)?.[0] || '', 10);
-
-  if (ops.length) {
-    return;
-  }
-
-  return { m, n };
-}
-
-export function getVarIntLength(n: number): number {
-  if (n < 0xfd) {
-    return 1;
-  } else if (n <= 0xffff) {
-    return 3;
-  } else if (n <= 0xffffffff) {
-    return 5;
-  } else {
-    return 9;
-  }
-}
--- a/backend/src/utils/secp256k1.ts
+++ b/backend/src/utils/secp256k1.ts
@@ -31,9 +31,6 @@ const curveP = BigInt(`0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 * @returns {boolean} true if the point is on the SECP256K1 curve
 */
 export function isPoint(pointHex: string): boolean {
-  if (!pointHex?.length) {
-    return false;
-  }
  if (
    !(
      // is uncompressed
--- a/contributors/bitcoinmechanic.txt
+++ b/contributors/bitcoinmechanic.txt
@@ -1,3 +0,0 @@
-I hereby accept the terms of the Contributor License Agreement in the CONTRIBUTING.md file of the mempool/mempool git repository as of January 25, 2022.
-
-Signed: bitcoinmechanic
--- a/contributors/daweilv.txt
+++ b/contributors/daweilv.txt
@@ -1,3 +0,0 @@
-I hereby accept the terms of the Contributor License Agreement in the CONTRIBUTING.md file of the mempool/mempool git repository as of April 7, 2024.
-
-Signed: daweilv
--- a/contributors/hans-crypto.txt
+++ b/contributors/hans-crypto.txt
@@ -1,3 +0,0 @@
-I hereby accept the terms of the Contributor License Agreement in the CONTRIBUTING.md file of the mempool/mempool git repository as of May 21, 2024.
-
-Signed: hans-crypto
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mononaut	e2a5b90b38	Display multiple arrows for accelerated transactions	2024-02-02 21:59:18 +00:00
Mononaut	ccc127c84a	Estimate accelerated positions in partner mempools	2024-02-02 02:25:49 +00:00