Add accelerated badge to projected block tooltip

.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@f361669954a8ecfc00a3443f35f9ac8e610ffc06
         with:
           toolchain: ${{ steps.gettoolchain.outputs.toolchain }}
 
@@ -63,104 +63,11 @@ jobs:
         run: npm run build
         working-directory: ${{ matrix.node }}/${{ matrix.flavor }}/backend
 
-
-  cache:
-    name: "Cache assets for builds"
-    runs-on: "ubuntu-latest"
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          path: assets
-
-      - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node }}
-          registry-url: "https://registry.npmjs.org"
-
-      - name: Install (Prod dependencies only)
-        run: npm ci --omit=dev --omit=optional
-        working-directory: assets/frontend
-
-      - name: Restore cached mining pool assets
-        continue-on-error: true
-        id: cache-mining-pool-restore
-        uses: actions/cache/restore@v4
-        with:
-          path: |
-            mining-pool-assets.zip
-          key: mining-pool-assets-cache
-
-      - name: Restore promo video assets
-        continue-on-error: true
-        id: cache-promo-video-restore
-        uses: actions/cache/restore@v4
-        with:
-          path: |
-            promo-video-assets.zip
-          key: promo-video-assets-cache
-
-      - name: Unzip assets before building (src/resources)
-        continue-on-error: true
-        run: unzip -o mining-pool-assets.zip -d assets/frontend/src/resources/mining-pools
-
-      - name: Unzip assets before building (src/resources)
-        continue-on-error: true
-        run: unzip -o promo-video-assets.zip -d assets/frontend/src/resources/promo-video
-
-      # - name: Unzip assets before building (dist)
-      #   continue-on-error: true
-      #   run: unzip assets.zip -d assets/frontend/dist/mempool/browser/resources
-
-      - 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
-        run: zip -jrq mining-pool-assets.zip assets/frontend/src/resources/mining-pools/*
-
-      - name: Zip promo-video assets
-        run: zip -jrq promo-video-assets.zip assets/frontend/src/resources/promo-video/*
-
-      - name: Upload mining pool assets as artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: mining-pool-assets
-          path: mining-pool-assets.zip
-
-      - name: Upload promo video assets as artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: promo-video-assets
-          path: promo-video-assets.zip
-
-      - name: Save mining pool assets cache
-        id: cache-mining-pool-save
-        uses: actions/cache/save@v4
-        with:
-          path: |
-            mining-pool-assets.zip
-          key: mining-pool-assets-cache
-
-      - name: Save promo video assets cache
-        id: cache-promo-video-save
-        uses: actions/cache/save@v4
-        with:
-          path: |
-            promo-video-assets.zip
-          key: promo-video-assets-cache
-
   frontend:
-    needs: cache
     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"
@@ -196,211 +103,9 @@ jobs:
       # - name: Test
       #   run: npm run test
 
-      - name: Restore cached mining pool assets
-        continue-on-error: true
-        id: cache-mining-pool-restore
-        uses: actions/cache/restore@v4
-        with:
-          path: |
-            mining-pool-assets.zip
-          key: mining-pool-assets-cache
-
-      - name: Restore promo video assets
-        continue-on-error: true
-        id: cache-promo-video-restore
-        uses: actions/cache/restore@v4
-        with:
-          path: |
-            promo-video-assets.zip
-          key: promo-video-assets-cache
-
-      - name: Download artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: mining-pool-assets
-
-      - name: Unzip assets before building (src/resources)
-        run: unzip -o mining-pool-assets.zip -d ${{ matrix.node }}/${{ matrix.flavor }}/frontend/src/resources/mining-pools
-
-      - name: Download artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: promo-video-assets
-
-      - name: Unzip assets before building (src/resources)
-        run: unzip -o promo-video-assets.zip -d ${{ matrix.node }}/${{ matrix.flavor }}/frontend/src/resources/promo-video
-
-      # - name: Unzip assets before building (dist)
-      #   run: unzip assets.zip -d ${{ matrix.node }}/${{ matrix.flavor }}/frontend/dist/mempool/browser/resources
-
-      - name: Display resulting source tree
-        run: ls -R
-
       - name: Build
         run: npm run build
         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/')"
-    runs-on: "ubuntu-latest"
-    needs: frontend
-    strategy:
-      fail-fast: false
-      matrix:
-        module: ["mempool", "liquid", "testnet4"]
 
-    name: E2E tests for ${{ matrix.module }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          path: ${{ matrix.module }}
-
-      - name: Setup node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-          cache: "npm"
-          cache-dependency-path: ${{ matrix.module }}/frontend/package-lock.json
-
-      - name: Restore cached mining pool assets
-        continue-on-error: true
-        id: cache-mining-pool-restore
-        uses: actions/cache/restore@v4
-        with:
-          path: |
-            mining-pool-assets.zip
-          key: mining-pool-assets-cache
-  
-      - name: Restore cached promo video assets
-        continue-on-error: true
-        id: cache-promo-video-restore
-        uses: actions/cache/restore@v4
-        with:
-          path: |
-            promo-video-assets.zip
-          key: promo-video-assets-cache
-
-      - name: Download artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: mining-pool-assets
-
-      - name: Unzip assets before building (src/resources)
-        run: unzip -o mining-pool-assets.zip -d ${{ matrix.module }}/frontend/src/resources/mining-pools
-
-      - name: Download artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: promo-video-assets
-
-      - name: Unzip assets before building (src/resources)
-        run: unzip -o promo-video-assets.zip -d ${{ matrix.module }}/frontend/src/resources/promo-video
-
-      # mempool
-      - name: Chrome browser tests (${{ matrix.module }})
-        if: ${{ matrix.module == 'mempool' }}
-        uses: cypress-io/github-action@v5
-        with:
-          tag: ${{ github.event_name }}
-          working-directory: ${{ matrix.module }}/frontend
-          build: npm run config:defaults:${{ matrix.module }}
-          start: npm run start:local-staging
-          wait-on: "http://localhost:4200"
-          wait-on-timeout: 120
-          record: true
-          parallel: true
-          spec: |
-            cypress/e2e/mainnet/*.spec.ts
-            cypress/e2e/signet/*.spec.ts
-          group: Tests on Chrome (${{ matrix.module }})
-          browser: "chrome"
-          ci-build-id: "${{ github.sha }}-${{ github.workflow }}-${{ github.event_name }}"
-        env:
-          COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }}
-          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CYPRESS_PROJECT_ID: ${{ secrets.CYPRESS_PROJECT_ID }}
-
-      # liquid
-      - name: Chrome browser tests (${{ matrix.module }})
-        if: ${{ matrix.module == 'liquid' }}
-        uses: cypress-io/github-action@v5
-        with:
-          tag: ${{ github.event_name }}
-          working-directory: ${{ matrix.module }}/frontend
-          build: npm run config:defaults:${{ matrix.module }}
-          start: npm run start:local-staging
-          wait-on: "http://localhost:4200"
-          wait-on-timeout: 120
-          record: true
-          parallel: true
-          spec: |
-            cypress/e2e/liquid/liquid.spec.ts
-            cypress/e2e/liquidtestnet/liquidtestnet.spec.ts
-          group: Tests on Chrome (${{ matrix.module }})
-          browser: "chrome"
-          ci-build-id: "${{ github.sha }}-${{ github.workflow }}-${{ github.event_name }}"
-        env:
-          COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }}
-          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CYPRESS_PROJECT_ID: ${{ secrets.CYPRESS_PROJECT_ID }}
-
-      # testnet
-      - name: Chrome browser tests (${{ matrix.module }})
-        if: ${{ matrix.module == 'testnet4' }}
-        uses: cypress-io/github-action@v5
-        with:
-          tag: ${{ github.event_name }}
-          working-directory: ${{ matrix.module }}/frontend
-          build: npm run config:defaults:mempool
-          start: npm run start:local-staging
-          wait-on: "http://localhost:4200"
-          wait-on-timeout: 120
-          record: true
-          parallel: true
-          spec: |
-            cypress/e2e/testnet4/*.spec.ts
-          group: Tests on Chrome (${{ matrix.module }})
-          browser: "chrome"
-          ci-build-id: "${{ github.sha }}-${{ github.workflow }}-${{ github.event_name }}"
-        env:
-          CYPRESS_REROUTE_TESTNET: true
-          COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }}
-          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

.github/workflows/cypress.yml

@@ -0,0 +1,64 @@
+name: Cypress Tests
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    types: [opened, synchronize]
+
+jobs:
+  cypress:
+    if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')"
+    runs-on: "ubuntu-latest"
+    strategy:
+      fail-fast: false
+      matrix:
+        module: ["mempool", "liquid", "bisq"]
+        include:
+          - module: "mempool"
+            spec: |
+              cypress/e2e/mainnet/*.spec.ts
+              cypress/e2e/signet/*.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:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          path: ${{ matrix.module }}
+
+      - name: Setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20
+          cache: "npm"
+          cache-dependency-path: ${{ matrix.module }}/frontend/package-lock.json
+
+      - name: Chrome browser tests (${{ matrix.module }})
+        uses: cypress-io/github-action@v5
+        with:
+          tag: ${{ github.event_name }}
+          working-directory: ${{ matrix.module }}/frontend
+          build: npm run config:defaults:${{ matrix.module }}
+          start: npm run start:local-staging
+          wait-on: "http://localhost:4200"
+          wait-on-timeout: 120
+          record: true
+          parallel: true
+          spec: ${{ matrix.spec }}
+          group: Tests on Chrome (${{ matrix.module }})
+          browser: "chrome"
+          ci-build-id: "${{ github.sha }}-${{ github.workflow }}-${{ github.event_name }}"
+        env:
+          COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }}
+          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CYPRESS_PROJECT_ID: ${{ secrets.CYPRESS_PROJECT_ID }}

.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

.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

.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

Cargo.lock

@@ -1,69 +1,39 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 4
-
-[[package]]
-name = "addr2line"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler2"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+version = 3
 
 [[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.4.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
-
-[[package]]
-name = "backtrace"
-version = "0.3.74"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
-dependencies = [
- "addr2line",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
- "windows-targets",
-]
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "bitflags"
-version = "2.8.0"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
+checksum = "6dbe3c979c178231552ecba20214a8272df4e09f232a87aef4320cf06539aded"
 
 [[package]]
 name = "bytemuck"
-version = "1.21.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3"
+checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
 
 [[package]]
 name = "bytes"
-version = "1.9.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
+checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
 
 [[package]]
 name = "cfg-if"
@@ -82,23 +52,17 @@ dependencies = [
 
 [[package]]
 name = "ctor"
-version = "0.2.9"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501"
+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"
+version = "0.1.0"
 dependencies = [
  "bytemuck",
  "bytes",
@@ -112,54 +76,57 @@ dependencies = [
 ]
 
 [[package]]
-name = "gimli"
-version = "0.31.1"
+name = "hashbrown"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
-name = "hashbrown"
-version = "0.15.2"
+name = "hermit-abi"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
+dependencies = [
+ "libc",
+]
 
 [[package]]
 name = "indexmap"
-version = "2.7.1"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
+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.169"
+version = "0.2.146"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"
 
 [[package]]
 name = "libloading"
-version = "0.8.6"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
+checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
 dependencies = [
  "cfg-if",
- "windows-targets",
+ "winapi",
 ]
 
 [[package]]
 name = "log"
-version = "0.4.25"
+version = "0.4.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
+checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
 
 [[package]]
 name = "matchers"
@@ -167,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.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924"
-dependencies = [
- "adler2",
-]
+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
 [[package]]
 name = "napi"
-version = "2.16.13"
+version = "2.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "214f07a80874bb96a8433b3cdfc84980d56c7b02e1a0d7ba4ba0db5cef785e2b"
+checksum = "0ede2d12cd6fce44da537a4be1f5510c73be2506c2e32dfaaafd1f36968f3a0e"
 dependencies = [
  "bitflags",
  "ctor",
@@ -201,29 +159,29 @@ dependencies = [
 
 [[package]]
 name = "napi-build"
-version = "2.1.4"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db836caddef23662b94e16bf1f26c40eceb09d6aee5d5b06a7ac199320b69b19"
+checksum = "882a73d9ef23e8dc2ebbffb6a6ae2ef467c0f18ac10711e4cc59c5485d41df0e"
 
 [[package]]
 name = "napi-derive"
-version = "2.16.13"
+version = "2.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cbe2585d8ac223f7d34f13701434b9d5f4eb9c332cccce8dee57ea18ab8ab0c"
+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.75"
+version = "1.0.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1639aaa9eeb76e91c6ae66da8ce3e89e921cd3885e99ec85f4abacae72fc91bf"
+checksum = "20bbc7c69168d06a848f925ec5f0e0997f98e8c8d4f2cc30157f0da51c009e17"
 dependencies = [
  "convert_case",
  "once_cell",
@@ -231,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",
 ]
@@ -254,19 +212,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "object"
-version = "0.36.7"
+name = "num_cpus"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
+checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
 dependencies = [
- "memchr",
+ "hermit-abi",
+ "libc",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.20.2"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
 [[package]]
 name = "overload"
@@ -276,49 +235,47 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.16"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
 
 [[package]]
 name = "priority-queue"
-version = "2.1.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "714c75db297bc88a63783ffc6ab9f830698a6705aa0201416931759ef4c8183d"
+checksum = "fff39edfcaec0d64e8d0da38564fad195d2d51b680940295fcc307366e101e61"
 dependencies = [
  "autocfg",
- "equivalent",
  "indexmap",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.93"
+version = "1.0.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
+checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.38"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
+checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "regex"
-version = "1.11.1"
+version = "1.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.9",
- "regex-syntax 0.8.5",
+ "regex-syntax 0.7.2",
 ]
 
 [[package]]
@@ -330,17 +287,6 @@ dependencies = [
  "regex-syntax 0.6.29",
 ]
 
-[[package]]
-name = "regex-automata"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax 0.8.5",
-]
-
 [[package]]
 name = "regex-syntax"
 version = "0.6.29"
@@ -349,42 +295,47 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.5"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
-
-[[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.25"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03"
+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.96"
+version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
+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",
@@ -393,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",
@@ -403,20 +354,23 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.43.0"
+version = "1.28.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
+checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
 dependencies = [
- "backtrace",
+ "autocfg",
+ "num_cpus",
  "pin-project-lite",
+ "windows-sys",
 ]
 
 [[package]]
 name = "tracing"
-version = "0.1.41"
+version = "0.1.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
 dependencies = [
+ "cfg-if",
  "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
@@ -424,20 +378,20 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.28"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
+checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.20",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.33"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
+checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
 dependencies = [
  "once_cell",
  "valuable",
@@ -445,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.19"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
+checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
 dependencies = [
  "matchers",
  "nu-ansi-term",
@@ -474,21 +428,21 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.15"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11cd88e12b17c6494200a9c1b683a04fcac9573ed74cd1b62aeb2727c5592243"
+checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.12.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
 
 [[package]]
 name = "valuable"
-version = "0.1.1"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
 [[package]]
 name = "winapi"
@@ -513,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",
@@ -530,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"

Cargo.toml

@@ -0,0 +1,8 @@
+[workspace]
+members = [
+	"./backend/rust-gbt",
+]
+
+[profile.release]
+lto = true
+codegen-units = 1

LICENSE

@@ -1,30 +1,29 @@
-The Mempool Open Source Project®
-Copyright (c) 2019-2024 Mempool Space K.K. and other shadowy super-coders
+The Mempool Open Source Project
+Copyright (c) 2019-2023 The Mempool Open Source Project Developers
 
 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
-Software Foundation, either version 3 of the License or any later version
-approved by a proxy statement published on <https://mempool.space/about>.
+the terms of (at your option) either:
 
-However, this copyright license does not include an implied right or license
-to use any trademarks, service marks, logos, or trade names of Mempool Space K.K.
-or any other contributor to The Mempool Open Source Project.
+ 1) the GNU Affero General Public License as published by the Free Software
+ Foundation, either version 3 of the License or any later version approved by a
+ proxy statement published on <https://mempool.space/about>; or
 
-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.
+ 2) the GNU General Public License as published by the Free Software
+ Foundation, either version 3 of the License or any later version approved by a
+ proxy statement published on <https://mempool.space/about>.
 
-See our full Trademark Policy and Guidelines for more details, published on 
-<https://mempool.space/trademark-policy>.
+However, this copyright license does not include an implied right or license to
+use our trademarks: The Mempool Open Source Project®, mempool.space™, the
+mempool Logo™, the mempool.space Vertical Logo™, the mempool.space Horizontal
+Logo™, the mempool Square Logo™, and the mempool Blocks logo™ are registered
+trademarks or trademarks of Mempool Space K.K in Japan, the United States,
+and/or other countries. See our full Trademark Policy and Guidelines for more
+details, published on <https://mempool.space/trademark-policy>.
 
 This program is distributed in the hope that it will be useful, but WITHOUT ANY
 WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE. See the full license terms for more details.
 
 You should have received a copy of both the GNU Affero General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
+and the GNU General Public License along with this program.  If not, see
+<http://www.gnu.org/licenses/>.

LICENSE.GPL-3.md

@@ -0,0 +1,675 @@
+### GNU GENERAL PUBLIC LICENSE
+
+Version 3, 29 June 2007
+
+Copyright (C) 2007 Free Software Foundation, Inc.
+<https://fsf.org/>
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+### Preamble
+
+The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom
+to share and change all versions of a program--to make sure it remains
+free software for all its users. We, the Free Software Foundation, use
+the GNU General Public License for most of our software; it applies
+also to any other work released this way by its authors. You can apply
+it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you
+have certain responsibilities if you distribute copies of the
+software, or if you modify it: responsibilities to respect the freedom
+of others.
+
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the
+manufacturer can do so. This is fundamentally incompatible with the
+aim of protecting users' freedom to change the software. The
+systematic pattern of such abuse occurs in the area of products for
+individuals to use, which is precisely where it is most unacceptable.
+Therefore, we have designed this version of the GPL to prohibit the
+practice for those products. If such problems arise substantially in
+other domains, we stand ready to extend this provision to those
+domains in future versions of the GPL, as needed to protect the
+freedom of users.
+
+Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish
+to avoid the special danger that patents applied to a free program
+could make it effectively proprietary. To prevent this, the GPL
+assures that patents cannot be used to render the program non-free.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+### TERMS AND CONDITIONS
+
+#### 0. Definitions.
+
+"This License" refers to version 3 of the GNU General Public License.
+
+"Copyright" also means copyright-like laws that apply to other kinds
+of works, such as semiconductor masks.
+
+"The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of
+an exact copy. The resulting work is called a "modified version" of
+the earlier work or a work "based on" the earlier work.
+
+A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user
+through a computer network, with no transfer of a copy, is not
+conveying.
+
+An interactive user interface displays "Appropriate Legal Notices" to
+the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+#### 1. Source Code.
+
+The "source code" for a work means the preferred form of the work for
+making modifications to it. "Object code" means any non-source form of
+a work.
+
+A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users can
+regenerate automatically from other parts of the Corresponding Source.
+
+The Corresponding Source for a work in source code form is that same
+work.
+
+#### 2. Basic Permissions.
+
+All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not convey,
+without conditions so long as your license otherwise remains in force.
+You may convey covered works to others for the sole purpose of having
+them make modifications exclusively for you, or provide you with
+facilities for running those works, provided that you comply with the
+terms of this License in conveying all material for which you do not
+control copyright. Those thus making or running the covered works for
+you must do so exclusively on your behalf, under your direction and
+control, on terms that prohibit them from making any copies of your
+copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under the
+conditions stated below. Sublicensing is not allowed; section 10 makes
+it unnecessary.
+
+#### 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such
+circumvention is effected by exercising rights under this License with
+respect to the covered work, and you disclaim any intention to limit
+operation or modification of the work as a means of enforcing, against
+the work's users, your or third parties' legal rights to forbid
+circumvention of technological measures.
+
+#### 4. Conveying Verbatim Copies.
+
+You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+#### 5. Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these
+conditions:
+
+-   a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+-   b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under
+    section 7. This requirement modifies the requirement in section 4
+    to "keep intact all notices".
+-   c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy. This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged. This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+-   d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+#### 6. Conveying Non-Source Forms.
+
+You may convey a covered work in object code form under the terms of
+sections 4 and 5, provided that you also convey the machine-readable
+Corresponding Source under the terms of this License, in one of these
+ways:
+
+-   a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+-   b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the Corresponding
+    Source from a network server at no charge.
+-   c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source. This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+-   d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge. You need not require recipients to copy the
+    Corresponding Source along with the object code. If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source. Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+-   e) Convey the object code using peer-to-peer transmission,
+    provided you inform other peers where the object code and
+    Corresponding Source of the work are being offered to the general
+    public at no charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal,
+family, or household purposes, or (2) anything designed or sold for
+incorporation into a dwelling. In determining whether a product is a
+consumer product, doubtful cases shall be resolved in favor of
+coverage. For a particular product received by a particular user,
+"normally used" refers to a typical or common use of that class of
+product, regardless of the status of the particular user or of the way
+in which the particular user actually uses, or expects or is expected
+to use, the product. A product is a consumer product regardless of
+whether the product has substantial commercial, industrial or
+non-consumer uses, unless such uses represent the only significant
+mode of use of the product.
+
+"Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to
+install and execute modified versions of a covered work in that User
+Product from a modified version of its Corresponding Source. The
+information must suffice to ensure that the continued functioning of
+the modified object code is in no case prevented or interfered with
+solely because modification has been made.
+
+If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or
+updates for a work that has been modified or installed by the
+recipient, or for the User Product in which it has been modified or
+installed. Access to a network may be denied when the modification
+itself materially and adversely affects the operation of the network
+or violates the rules and protocols for communication across the
+network.
+
+Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+#### 7. Additional Terms.
+
+"Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders
+of that material) supplement the terms of this License with terms:
+
+-   a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+-   b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+-   c) Prohibiting misrepresentation of the origin of that material,
+    or requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+-   d) Limiting the use for publicity purposes of names of licensors
+    or authors of the material; or
+-   e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+-   f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions
+    of it) with contractual assumptions of liability to the recipient,
+    for any liability that these contractual assumptions directly
+    impose on those licensors and authors.
+
+All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions; the
+above requirements apply either way.
+
+#### 8. Termination.
+
+You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+However, if you cease all violation of this License, then your license
+from a particular copyright holder is reinstated (a) provisionally,
+unless and until the copyright holder explicitly and finally
+terminates your license, and (b) permanently, if the copyright holder
+fails to notify you of the violation by some reasonable means prior to
+60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+#### 9. Acceptance Not Required for Having Copies.
+
+You are not required to accept this License in order to receive or run
+a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+#### 10. Automatic Licensing of Downstream Recipients.
+
+Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+#### 11. Patents.
+
+A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+A contributor's "essential patent claims" are all patent claims owned
+or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+A patent license is "discriminatory" if it does not include within the
+scope of its coverage, prohibits the exercise of, or is conditioned on
+the non-exercise of one or more of the rights that are specifically
+granted under this License. You may not convey a covered work if you
+are a party to an arrangement with a third party that is in the
+business of distributing software, under which you make payment to the
+third party based on the extent of your activity of conveying the
+work, and under which the third party grants, to any of the parties
+who would receive the covered work from you, a discriminatory patent
+license (a) in connection with copies of the covered work conveyed by
+you (or copies made from those copies), or (b) primarily for and in
+connection with specific products or compilations that contain the
+covered work, unless you entered into that arrangement, or that patent
+license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+#### 12. No Surrender of Others' Freedom.
+
+If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under
+this License and any other pertinent obligations, then as a
+consequence you may not convey it at all. For example, if you agree to
+terms that obligate you to collect a royalty for further conveying
+from those to whom you convey the Program, the only way you could
+satisfy both those terms and this License would be to refrain entirely
+from conveying the Program.
+
+#### 13. Use with the GNU Affero General Public License.
+
+Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+#### 14. Revised Versions of this License.
+
+The Free Software Foundation may publish revised and/or new versions
+of the GNU General Public License from time to time. Such new versions
+will be similar in spirit to the present version, but may differ in
+detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies that a certain numbered version of the GNU General Public
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that numbered version or
+of any later version published by the Free Software Foundation. If the
+Program does not specify a version number of the GNU General Public
+License, you may choose any version ever published by the Free
+Software Foundation.
+
+If the Program specifies that a proxy can decide which future versions
+of the GNU General Public License can be used, that proxy's public
+statement of acceptance of a version permanently authorizes you to
+choose that version for the Program.
+
+Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+#### 15. Disclaimer of Warranty.
+
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
+DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
+CORRECTION.
+
+#### 16. Limitation of Liability.
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
+CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
+NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
+LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
+TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
+PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+#### 17. Interpretation of Sections 15 and 16.
+
+If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+END OF TERMS AND CONDITIONS
+
+### How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.
+
+To do so, attach the following notices to the program. It is safest to
+attach them to the start of each source file to most effectively state
+the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+        <one line to give the program's name and a brief idea of what it does.>
+        Copyright (C) <year>  <name of author>
+
+        This program is free software: you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation, either version 3 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper
+mail.
+
+If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+        <program>  Copyright (C) <year>  <name of author>
+        This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+        This is free software, and you are welcome to redistribute it
+        under certain conditions; type `show c' for details.
+
+The hypothetical commands \`show w' and \`show c' should show the
+appropriate parts of the General Public License. Of course, your
+program's commands might be different; for a GUI interface, you would
+use an "about box".
+
+You should also get your employer (if you work as a programmer) or
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. For more information on this, and how to apply and follow
+the GNU GPL, see <https://www.gnu.org/licenses/>.
+
+The GNU General Public License does not permit incorporating your
+program into proprietary programs. If your program is a subroutine
+library, you may consider it more useful to permit linking proprietary
+applications with the library. If this is what you want to do, use the
+GNU Lesser General Public License instead of this License. But first,
+please read <https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -12,9 +12,7 @@ It is an open-source project developed and operated for the benefit of the Bitco
 
 Mempool can be self-hosted on a wide variety of your own hardware, ranging from a simple one-click installation on a Raspberry Pi full-node distro all the way to a robust production instance on a powerful FreeBSD server. 
 
-Most people should use a <a href="#one-click-installation">one-click install method</a>.
-
-Other install methods are meant for developers and others with experience managing servers. If you want support for your own production instance of Mempool, or if you'd like to have your own instance of Mempool run by the mempool.space team on their own global ISP infrastructure—check out <a href="https://mempool.space/enterprise" target="_blank">Mempool Enterprise®</a>.
+**Most people should use a one-click install method.** Other install methods are meant for developers and others with experience managing servers. 
 
 <a id="one-click-installation"></a>
 ## One-Click Installation
@@ -24,7 +22,7 @@ Mempool can be conveniently installed on the following full-node distros:
 - [RaspiBlitz](https://github.com/rootzoll/raspiblitz)
 - [RoninDojo](https://code.samourai.io/ronindojo/RoninDojo)
 - [myNode](https://github.com/mynodebtc/mynode)
-- [StartOS](https://github.com/Start9Labs/start-os)
+- [Start9](https://github.com/Start9Labs/embassy-os)
 - [nix-bitcoin](https://github.com/fort-nix/nix-bitcoin/blob/a1eacce6768ca4894f365af8f79be5bbd594e1c3/examples/configuration.nix#L129)
 
 **We highly recommend you deploy your own Mempool instance this way.** No matter which option you pick, you'll be able to get your own fully-sovereign instance of Mempool up quickly without needing to fiddle with any settings.

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
   }
 }

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

backend/README.md

@@ -2,7 +2,7 @@
 
 These instructions are mostly intended for developers. 
 
-If you choose to use these instructions for a production setup, be aware that you will still probably need to do additional configuration for your specific OS, environment, use-case, etc. We do our best here to provide a good starting point, but only proceed if you know what you're doing. Mempool only provides support for custom setups to project sponsors through [Mempool Enterprise®](https://mempool.space/enterprise).
+If you choose to use these instructions for a production setup, be aware that you will still probably need to do additional configuration for your specific OS, environment, use-case, etc. We do our best here to provide a good starting point, but only proceed if you know what you're doing. Mempool only provides support for custom setups to [enterprise sponsors](https://mempool.space/enterprise).
 
 See other ways to set up Mempool on [the main README](/../../#installation-methods).
 
@@ -77,7 +77,7 @@ Query OK, 0 rows affected (0.00 sec)
 
 #### Build
 
-_Make sure to use Node.js 20.x and npm 9.x or newer_
+_Make sure to use Node.js 16.10 and npm 7._
 
 _The build process requires [Rust](https://www.rust-lang.org/tools/install) to be installed._
 
@@ -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
 

backend/jest.config.ts

@@ -7,7 +7,7 @@ const config: Config.InitialOptions = {
   automock: false,
   collectCoverage: true,
   collectCoverageFrom: ["./src/**/**.ts"],
-  coverageProvider: "v8",
+  coverageProvider: "babel",
   coverageThreshold: {
     global: {
       lines: 1

backend/mempool-config.sample.json

@@ -1,6 +1,5 @@
 {
   "MEMPOOL": {
-    "OFFICIAL": false,
     "NETWORK": "mainnet",
     "BACKEND": "electrum",
     "ENABLED": true,
@@ -17,27 +16,24 @@
     "MEMPOOL_BLOCKS_AMOUNT": 8,
     "INDEXING_BLOCKS_AMOUNT": 11000,
     "BLOCKS_SUMMARIES_INDEXING": false,
-    "GOGGLES_INDEXING": false,
     "USE_SECOND_NODE_FOR_MINFEE": false,
     "EXTERNAL_ASSETS": [],
     "EXTERNAL_MAX_RETRY": 1,
     "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",
-    "POOLS_UPDATE_DELAY": 604800,
     "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": ""
+    "PRICE_UPDATES_PER_HOUR": 1
   },
   "CORE_RPC": {
     "HOST": "127.0.0.1",
@@ -46,8 +42,7 @@
     "PASSWORD": "mempool",
     "TIMEOUT": 60000,
     "COOKIE": false,
-    "COOKIE_PATH": "/path/to/bitcoin/.cookie",
-    "DEBUG_LOG_PATH": "/path/to/bitcoin/debug.log"
+    "COOKIE_PATH": "/path/to/bitcoin/.cookie"
   },
   "ELECTRUM": {
     "HOST": "127.0.0.1",
@@ -61,8 +56,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",
@@ -101,6 +95,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",
@@ -131,7 +129,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,
@@ -142,8 +142,6 @@
     "ENABLED": false,
     "AUDIT": false,
     "AUDIT_START_HEIGHT": 774000,
-    "STATISTICS": false,
-    "STATISTICS_START_TIME": 1481932800,
     "SERVERS": [
       "list",
       "of",
@@ -152,16 +150,7 @@
     ]
   },
   "MEMPOOL_SERVICES": {
-    "API": "https://mempool.space/api/v1/services",
+    "API": "https://mempool.space/api",
     "ACCELERATIONS": false
-  },
-  "STRATUM": {
-    "ENABLED": false,
-    "API": "http://localhost:1234"
-  },
-  "FIAT_PRICE": {
-    "ENABLED": true,
-    "PAID": false,
-    "API_KEY": "your-api-key-from-freecurrencyapi.com"
   }
 }

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

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mempool-backend",
-  "version": "3.1.0-dev",
+  "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,29 +34,33 @@
     "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-build": "cd rust-gbt && npm run build-release"
   },
   "dependencies": {
+    "@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.21.1",
+    "express": "~4.18.2",
     "maxmind": "~4.3.11",
-    "mysql2": "~3.12.0",
+    "mysql2": "~3.6.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.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",

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*

backend/rust-gbt/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "gbt"
-version = "1.0.0"
-description = "An efficient re-implementation of the getBlockTemplate algorithm in Rust"
+version = "0.1.0"
+description = "An inefficient re-implementation of the getBlockTemplate algorithm in Rust"
 authors = ["mononaut"]
 edition = "2021"
 publish = false
@@ -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"

backend/rust-gbt/index.d.ts

@@ -0,0 +1,49 @@
+/* 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>>
+  constructor(blocks: Array<Array<number>>, blockWeights: Array<number>, clusters: Array<Array<number>>, rates: Array<Array<number>>)
+}

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

backend/rust-gbt/package-lock.json

@@ -0,0 +1,34 @@
+{
+  "name": "gbt",
+  "version": "3.0.0-dev",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "gbt",
+      "version": "3.0.0-dev",
+      "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"
+      }
+    }
+  }
+}

backend/rust-gbt/package.json

@@ -0,0 +1,33 @@
+{
+  "name": "gbt",
+  "version": "3.0.0-dev",
+  "description": "An inefficient re-implementation of the getBlockTemplate algorithm in Rust",
+  "main": "index.js",
+  "types": "index.d.ts",
+  "scripts": {
+    "artifacts": "napi artifacts",
+    "build": "napi build --platform",
+    "build-debug": "npm run build",
+    "build-release": "npm run build -- --release --strip",
+    "install": "npm run build-release",
+    "prepublishOnly": "napi prepublish -t npm",
+    "test": "cargo test"
+  },
+  "author": "mononaut",
+  "napi": {
+    "name": "gbt",
+    "triples": {
+      "defaults": false,
+      "additional": [
+        "x86_64-unknown-linux-gnu",
+        "x86_64-unknown-freebsd"
+      ]
+    }
+  },
+  "dependencies": {
+    "@napi-rs/cli": "^2.16.1"
+  },
+  "engines": {
+    "node": ">= 12"
+  }
+}

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,20 +53,13 @@ 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 {
         indexed_accelerations[acceleration.uid as usize] = Some(acceleration);
     }
 
-    info!("Initializing working vecs with uid capacity for {}", max_uid + 1);
     let mempool_len = mempool.len();
     let mut audit_pool: AuditPool = Vec::with_capacity(max_uid + 1);
     audit_pool.resize(max_uid + 1, None);
@@ -132,91 +127,86 @@ pub fn gbt(
         let next_from_stack = next_valid_from_stack(&mut mempool_stack, &audit_pool);
         let next_from_queue = next_valid_from_queue(&mut modified, &audit_pool);
         if next_from_stack.is_none() && next_from_queue.is_none() {
-            info!("No transactions left! {:#?} in overflow", overflow.len());
+            continue;
+        }
+        let (next_tx, from_stack) = match (next_from_stack, next_from_queue) {
+            (Some(stack_tx), Some(queue_tx)) => match queue_tx.cmp(stack_tx) {
+                std::cmp::Ordering::Less => (stack_tx, true),
+                _ => (queue_tx, false),
+            },
+            (Some(stack_tx), None) => (stack_tx, true),
+            (None, Some(queue_tx)) => (queue_tx, false),
+            (None, None) => unreachable!(),
+        };
+
+        if from_stack {
+            mempool_stack.pop();
         } else {
-            let (next_tx, from_stack) = match (next_from_stack, next_from_queue) {
-                (Some(stack_tx), Some(queue_tx)) => match queue_tx.cmp(stack_tx) {
-                    std::cmp::Ordering::Less => (stack_tx, true),
-                    _ => (queue_tx, false),
-                },
-                (Some(stack_tx), None) => (stack_tx, true),
-                (None, Some(queue_tx)) => (queue_tx, false),
-                (None, None) => unreachable!(),
-            };
+            modified.pop();
+        }
 
-            if from_stack {
-                mempool_stack.pop();
-            } else {
-                modified.pop();
+        if blocks.len() < (MAX_BLOCKS - 1)
+            && ((block_weight + (4 * next_tx.ancestor_sigop_adjusted_vsize())
+                >= 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
+            overflow.push(next_tx.uid);
+            failures += 1;
+        } else {
+            let mut package: Vec<(u32, u32, usize)> = Vec::new();
+            let mut cluster: Vec<u32> = Vec::new();
+            let is_cluster: bool = !next_tx.ancestors.is_empty();
+            for ancestor_id in &next_tx.ancestors {
+                if let Some(Some(ancestor)) = audit_pool.get(*ancestor_id as usize) {
+                    package.push((*ancestor_id, ancestor.order(), ancestor.ancestors.len()));
+                }
+            }
+            package.sort_unstable_by(|a, b| -> Ordering {
+                if a.2 != b.2 {
+                    // order by ascending ancestor count
+                    a.2.cmp(&b.2)
+                } else if a.1 != b.1 {
+                    // tie-break by ascending partial txid
+                    a.1.cmp(&b.1)
+                } else {
+                    // tie-break partial txid collisions by ascending uid
+                    a.0.cmp(&b.0)
+                }
+            });
+            package.push((next_tx.uid, next_tx.order(), next_tx.ancestors.len()));
+
+            let cluster_rate = next_tx.cluster_rate();
+
+            for (txid, _, _) in &package {
+                cluster.push(*txid);
+                if let Some(Some(tx)) = audit_pool.get_mut(*txid as usize) {
+                    tx.used = true;
+                    tx.set_dirty_if_different(cluster_rate);
+                    transactions.push(tx.uid);
+                    block_weight += tx.weight;
+                    block_sigops += tx.sigops;
+                }
+                update_descendants(*txid, &mut audit_pool, &mut modified, cluster_rate);
             }
 
-            if blocks.len() < (max_blocks - 1)
-                && ((block_weight + (4 * next_tx.ancestor_sigop_adjusted_vsize())
-                    >= max_block_weight - 4_000)
-                    || (block_sigops + next_tx.ancestor_sigops() > BLOCK_SIGOPS))
-            {
-                // hold this package in an overflow list while we check for smaller options
-                overflow.push(next_tx.uid);
-                failures += 1;
-            } else {
-                let mut package: Vec<(u32, u32, usize)> = Vec::new();
-                let mut cluster: Vec<u32> = Vec::new();
-                let is_cluster: bool = !next_tx.ancestors.is_empty();
-                for ancestor_id in &next_tx.ancestors {
-                    if let Some(Some(ancestor)) = audit_pool.get(*ancestor_id as usize) {
-                        package.push((*ancestor_id, ancestor.order(), ancestor.ancestors.len()));
-                    }
-                }
-                package.sort_unstable_by(|a, b| -> Ordering {
-                    if a.2 != b.2 {
-                        // order by ascending ancestor count
-                        a.2.cmp(&b.2)
-                    } else if a.1 != b.1 {
-                        // tie-break by ascending partial txid
-                        a.1.cmp(&b.1)
-                    } else {
-                        // tie-break partial txid collisions by ascending uid
-                        a.0.cmp(&b.0)
-                    }
-                });
-                package.push((next_tx.uid, next_tx.order(), next_tx.ancestors.len()));
-
-                let cluster_rate = next_tx.cluster_rate();
-
-                for (txid, _, _) in &package {
-                    cluster.push(*txid);
-                    if let Some(Some(tx)) = audit_pool.get_mut(*txid as usize) {
-                        tx.used = true;
-                        tx.set_dirty_if_different(cluster_rate);
-                        transactions.push(tx.uid);
-                        block_weight += tx.weight;
-                        block_sigops += tx.sigops;
-                    }
-                    update_descendants(*txid, &mut audit_pool, &mut modified, cluster_rate);
-                }
-
-                if is_cluster {
-                    clusters.push(cluster);
-                }
-
-                failures = 0;
+            if is_cluster {
+                clusters.push(cluster);
             }
+
+            failures = 0;
         }
 
         // 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());
-                break;
+            if !transactions.is_empty() {
+                blocks.push(transactions);
+                block_weights.push(block_weight);
             }
-
-            blocks.push(transactions);
-            block_weights.push(block_weight);
-
             // reset for the next block
             transactions = Vec::with_capacity(initial_txes_per_block);
             block_weight = BLOCK_RESERVED_WEIGHT;
@@ -275,7 +265,6 @@ pub fn gbt(
         block_weights,
         clusters,
         rates,
-        overflow,
     }
 }
 

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);
@@ -146,7 +133,6 @@ pub struct GbtResult {
     pub block_weights: Vec<u32>,
     pub clusters: Vec<Vec<u32>>,
     pub rates: Vec<Vec<f64>>, // Tuples not supported. u32 fits inside f64
-    pub overflow: Vec<u32>,
 }
 
 /// All on another thread, this runs an arbitrary task in between
@@ -162,8 +148,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 +165,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!(

backend/src/__fixtures__/mempool-config.template.json

@@ -1,16 +1,13 @@
 {
   "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,
@@ -28,17 +25,16 @@
     "INDEXING_BLOCKS_AMOUNT": 14,
     "POOLS_JSON_TREE_URL": "__MEMPOOL_POOLS_JSON_TREE_URL__",
     "POOLS_JSON_URL": "__MEMPOOL_POOLS_JSON_URL__",
-    "POOLS_UPDATE_DELAY": 604800,
     "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,
     "MAX_PUSH_TX_SIZE_WEIGHT": 4000000,
     "ALLOW_UNREACHABLE": true,
-    "PRICE_UPDATES_PER_HOUR": 1,
-    "MAX_TRACKED_ADDRESSES": 1
+    "PRICE_UPDATES_PER_HOUR": 1
   },
   "CORE_RPC": {
     "HOST": "__CORE_RPC_HOST__",
@@ -47,8 +43,7 @@
     "PASSWORD": "__CORE_RPC_PASSWORD__",
     "TIMEOUT": 1000,
     "COOKIE": false,
-    "COOKIE_PATH": "__CORE_RPC_COOKIE_PATH__",
-    "DEBUG_LOG_PATH": "__CORE_RPC_DEBUG_LOG_PATH__"
+    "COOKIE_PATH": "__CORE_RPC_COOKIE_PATH__"
   },
   "ELECTRUM": {
     "HOST": "__ELECTRUM_HOST__",
@@ -62,8 +57,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__",
@@ -83,8 +77,7 @@
     "USERNAME": "__DATABASE_USERNAME__",
     "PASSWORD": "__DATABASE_PASSWORD__",
     "PID_DIR": "__DATABASE_PID_FILE__",
-    "TIMEOUT": 3000,
-    "POOL_SIZE": 100
+    "TIMEOUT": 3000
   },
   "SYSLOG": {
     "ENABLED": false,
@@ -97,6 +90,10 @@
     "ENABLED": false,
     "TX_PER_SECOND_SAMPLE_PERIOD": 20
   },
+  "BISQ": {
+    "ENABLED": true,
+    "DATA_PATH": "__BISQ_DATA_PATH__"
+  },
   "SOCKS5PROXY": {
     "ENABLED": true,
     "USE_ONION": true,
@@ -109,7 +106,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,
@@ -134,8 +133,6 @@
     "ENABLED": false,
     "AUDIT": false,
     "AUDIT_START_HEIGHT": 774000,
-    "STATISTICS": false,
-    "STATISTICS_START_TIME": 1481932800,
     "SERVERS": []
   },
   "MEMPOOL_SERVICES": {
@@ -146,14 +143,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__"
-  },
-  "STRATUM": {
-    "ENABLED": false,
-    "API": "http://localhost:1234"
   }
 }

backend/src/__tests__/api/common.ts

@@ -1,40 +1,24 @@
 import { Common } from '../../api/common';
-import { MempoolTransactionExtended, TransactionExtended } from '../../mempool.interfaces';
+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]: { replaced: MempoolTransactionExtended[], replacedBy: TransactionExtended }} = 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]: { replaced: MempoolTransactionExtended[], replacedBy: TransactionExtended }} = 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');
   });
 });

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]);
     }
   });

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
-    }
-  }
-]

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
-        }
     }
 ]

backend/src/__tests__/config.test.ts

@@ -14,16 +14,13 @@ 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,
@@ -41,17 +38,16 @@ describe('Mempool Backend Config', () => {
         STDOUT_LOG_MIN_PRIORITY: 'debug',
         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',
-        POOLS_UPDATE_DELAY: 604800,
         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,
         MAX_PUSH_TX_SIZE_WEIGHT: 400000,
         ALLOW_UNREACHABLE: true,
         PRICE_UPDATES_PER_HOUR: 1,
-        MAX_TRACKED_ADDRESSES: 1,
       });
 
       expect(config.ELECTRUM).toStrictEqual({ HOST: '127.0.0.1', PORT: 3306, TLS_ENABLED: true });
@@ -64,7 +60,6 @@ describe('Mempool Backend Config', () => {
         REQUEST_TIMEOUT: 10000,
         FALLBACK_TIMEOUT: 5000,
         FALLBACK: [],
-        MAX_BEHIND_TIP: 2,
        });
 
       expect(config.CORE_RPC).toStrictEqual({
@@ -74,8 +69,7 @@ describe('Mempool Backend Config', () => {
         PASSWORD: 'mempool',
         TIMEOUT: 60000,
         COOKIE: false,
-        COOKIE_PATH: '/bitcoin/.cookie',
-        DEBUG_LOG_PATH: '',
+        COOKIE_PATH: '/bitcoin/.cookie'
       });
 
       expect(config.SECOND_CORE_RPC).toStrictEqual({
@@ -97,8 +91,7 @@ describe('Mempool Backend Config', () => {
         USERNAME: 'mempool',
         PASSWORD: 'mempool',
         TIMEOUT: 180000,
-        PID_DIR: '',
-        POOL_SIZE: 100,
+        PID_DIR: ''
       });
 
       expect(config.SYSLOG).toStrictEqual({
@@ -111,6 +104,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,
@@ -124,7 +119,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({
@@ -138,8 +135,6 @@ describe('Mempool Backend Config', () => {
         ENABLED: false,
         AUDIT: false,
         AUDIT_START_HEIGHT: 774000,
-        STATISTICS: false,
-        STATISTICS_START_TIME: 1481932800,
         SERVERS: []
       });
 
@@ -153,17 +148,6 @@ describe('Mempool Backend Config', () => {
         UNIX_SOCKET_PATH: '',
         BATCH_QUERY_BASE_SIZE: 5000,
       });
-
-      expect(config.FIAT_PRICE).toStrictEqual({
-        ENABLED: true,
-        PAID: false,
-        API_KEY: '',
-      });
-
-      expect(config.STRATUM).toStrictEqual({
-        ENABLED: false,
-        API: 'http://localhost:1234',
-      });
     });
   });
 
@@ -190,6 +174,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);

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);
 

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();

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();

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;

backend/src/api/audit.ts

@@ -2,28 +2,23 @@ import config from '../config';
 import logger from '../logger';
 import { MempoolTransactionExtended, MempoolBlockWithTransactions } from '../mempool.interfaces';
 import rbfCache from './rbf-cache';
-import transactionUtils from './transaction-utils';
 
 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
-    let prioritized: string[] = []; // higher in the block than would be expected by in-band feerate alone
-    let deprioritized: string[] = []; // lower 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;
@@ -36,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
@@ -74,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;
@@ -103,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'
@@ -118,25 +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;
     }
 
-    ({ prioritized, deprioritized } = transactionUtils.identifyPrioritizedTransactions(transactions, 'effectiveFeePerVsize'));
-
     // 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;
@@ -177,10 +153,8 @@ class Audit {
     const similarity = projectedWeight ? matchedWeight / projectedWeight : 1;
 
     return {
-      unseen,
       censored: Object.keys(isCensored),
       added,
-      prioritized,
       fresh,
       sigop: [],
       fullrbf: rbf,

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);
   }
 }

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;

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();

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;
+}

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();

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();

backend/src/api/bitcoin/bitcoin-api-abstract-factory.ts

@@ -1,4 +1,3 @@
-import { IBitcoinApi, SubmitPackageResult, TestMempoolAcceptResult } from './bitcoin-api.interface';
 import { IEsploraApi } from './esplora-api.interface';
 
 export interface AbstractBitcoinApi {
@@ -22,18 +21,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[]>;
-  $submitPackage(rawTransactions: string[], maxfeerate?: number, maxburnamount?: number): Promise<SubmitPackageResult>;
   $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>;
-  $getAddressTransactionSummary(address: string): Promise<IEsploraApi.AddressTxSummary[]>;
 
   startHealthChecks(): void;
-  getHealthStatus(): HealthCheckHost[];
 }
 export interface BitcoinRpcCredentials {
   host: string;
@@ -43,15 +37,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;
-}

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,34 +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,
-}
-
-export interface SubmitPackageResult {
-  package_msg: string;
-  "tx-results": { [wtxid: string]: TxResult };
-  "replaced-transactions"?: string[];
-}
-
-export interface TxResult {
-  txid: string;
-  "other-wtxid"?: string;
-  vsize?: number;
-  fees?: {
-    base: number;
-    "effective-feerate"?: number;
-    "effective-includes"?: string[];
-  };
-  error?: string;
-}

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, SubmitPackageResult, 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,18 +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 [];
-    }
-  }
-
-  $submitPackage(rawTransactions: string[], maxfeerate?: number, maxburnamount?: number): Promise<SubmitPackageResult> {
-    return this.bitcoindClient.submitPackage(rawTransactions, maxfeerate ?? undefined, maxburnamount ?? undefined);
-  }
-
   async $getOutspend(txId: string, vout: number): Promise<IEsploraApi.Outspend> {
     const txOut = await this.bitcoindClient.getTxOut(txId, vout, false);
     return {
@@ -250,15 +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]);
-  }
-
-  async $getAddressTransactionSummary(address: string): Promise<IEsploraApi.AddressTxSummary[]> {
-    throw new Error('Method getAddressTransactionSummary not supported by the Bitcoin RPC API.');
-  }
-
   $getEstimatedHashrate(blockHeight: number): Promise<number> {
     // 120 is the default block span in Core
     return this.bitcoindClient.getNetworkHashPs(120, blockHeight);
@@ -331,7 +296,6 @@ class BitcoinApi implements AbstractBitcoinApi {
       'witness_v1_taproot': 'v1_p2tr',
       'nonstandard': 'nonstandard',
       'multisig': 'multisig',
-      'anchor': 'anchor',
       'nulldata': 'op_return'
     };
 
@@ -418,10 +382,6 @@ class BitcoinApi implements AbstractBitcoinApi {
   }
 
   public startHealthChecks(): void {};
-
-  public getHealthStatus() {
-    return [];
-  }
 }
 
 export default BitcoinApi;

backend/src/api/bitcoin/bitcoin-core.routes.ts

@@ -1,254 +0,0 @@
-import { Application, NextFunction, Request, Response } from 'express';
-import logger from '../../logger';
-import bitcoinClient from './bitcoin-client';
-import config from '../../config';
-
-const BLOCKHASH_REGEX = /^[a-f0-9]{64}$/i;
-const TXID_REGEX = /^[a-f0-9]{64}$/i;
-const RAW_TX_REGEX = /^[a-f0-9]{2,}$/i;
-
-/**
- * Define a set of routes used by the accelerator server
- * Those routes are not designed to be public
- */
-class BitcoinBackendRoutes {
-  private static tag = 'BitcoinBackendRoutes';
-
-  public initRoutes(app: Application): void {
-    app
-      .get(config.MEMPOOL.API_URL_PREFIX + 'internal/bitcoin-core/' + 'get-mempool-entry', this.disableCache, this.$getMempoolEntry)
-      .post(config.MEMPOOL.API_URL_PREFIX + 'internal/bitcoin-core/' + 'decode-raw-transaction', this.disableCache, this.$decodeRawTransaction)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'internal/bitcoin-core/' + 'get-raw-transaction', this.disableCache, this.$getRawTransaction)
-      .post(config.MEMPOOL.API_URL_PREFIX + 'internal/bitcoin-core/' + 'send-raw-transaction', this.disableCache, this.$sendRawTransaction)
-      .post(config.MEMPOOL.API_URL_PREFIX + 'internal/bitcoin-core/' + 'test-mempool-accept', this.disableCache, this.$testMempoolAccept)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'internal/bitcoin-core/' + 'get-mempool-ancestors', this.disableCache, this.$getMempoolAncestors)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'internal/bitcoin-core/' + 'get-block', this.disableCache, this.$getBlock)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'internal/bitcoin-core/' + 'get-block-hash', this.disableCache, this.$getBlockHash)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'internal/bitcoin-core/' + 'get-block-count', this.disableCache, this.$getBlockCount)
-    ;
-  }
-
-  /**
-   * Disable caching for bitcoin core routes
-   *
-   * @param req
-   * @param res
-   * @param next
-   */
-  private disableCache(req: Request, res: Response, next: NextFunction): 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);
-    next();
-  }
-
-  /**
-   * Exeption handler to return proper details to the accelerator server
-   *
-   * @param e
-   * @param fnName
-   * @param res
-   */
-  private static handleException(e: any, fnName: string, res: Response): void {
-    if (typeof(e.code) === 'number') {
-      res.status(400).send(JSON.stringify(e, ['code']));
-    } else {
-      const err = `unknown exception in ${fnName}`;
-      logger.err(err, BitcoinBackendRoutes.tag);
-      res.status(500).send(err);
-    }
-  }
-
-  private async $getMempoolEntry(req: Request, res: Response): Promise<void> {
-    const txid = req.query.txid;
-    try {
-      if (typeof(txid) !== 'string' || txid.length !== 64 || !TXID_REGEX.test(txid)) {
-        res.status(400).send(`invalid param txid. must be 64 hexadecimal characters`);
-        return;
-      }
-      const mempoolEntry = await bitcoinClient.getMempoolEntry(txid);
-      if (!mempoolEntry) {
-        res.status(404).send();
-        return;
-      }
-      res.status(200).send(mempoolEntry);
-    } catch (e: any) {
-      BitcoinBackendRoutes.handleException(e, 'getMempoolEntry', res);
-    }
-  }
-
-  private async $decodeRawTransaction(req: Request, res: Response): Promise<void> {
-    const rawTx = req.body.rawTx;
-    try {
-      if (typeof(rawTx) !== 'string' || !RAW_TX_REGEX.test(rawTx)) {
-        res.status(400).send(`invalid param rawTx. must be a string of hexadecimal characters`);
-        return;
-      }
-      const decodedTx = await bitcoinClient.decodeRawTransaction(rawTx);
-      if (!decodedTx) {
-        res.status(400).send(`unable to decode rawTx`);
-        return;
-      }
-      res.status(200).send(decodedTx);
-    } catch (e: any) {
-      BitcoinBackendRoutes.handleException(e, 'decodeRawTransaction', res);
-    }
-  }
-
-  private async $getRawTransaction(req: Request, res: Response): Promise<void> {
-    const txid = req.query.txid;
-    const verbose = req.query.verbose;
-    try {
-      if (typeof(txid) !== 'string' || txid.length !== 64 || !TXID_REGEX.test(txid)) {
-        res.status(400).send(`invalid param txid. must be 64 hexadecimal characters`);
-        return;
-      }
-      if (typeof(verbose) !== 'string') {
-        res.status(400).send(`invalid param verbose. must be a string representing an integer`);
-        return;
-      }
-      const verboseNumber = parseInt(verbose, 10);
-      if (typeof(verboseNumber) !== 'number') {
-        res.status(400).send(`invalid param verbose. must be a valid integer`);
-        return;
-      }
-
-      const decodedTx = await bitcoinClient.getRawTransaction(txid, verboseNumber);
-      if (!decodedTx) {
-        res.status(400).send(`unable to get raw transaction`);
-        return;
-      }
-      res.status(200).send(decodedTx);
-    } catch (e: any) {
-      BitcoinBackendRoutes.handleException(e, 'decodeRawTransaction', res);
-    }
-  }
-
-  private async $sendRawTransaction(req: Request, res: Response): Promise<void> {
-    const rawTx = req.body.rawTx;
-    try {
-      if (typeof(rawTx) !== 'string' || !RAW_TX_REGEX.test(rawTx)) {
-        res.status(400).send(`invalid param rawTx. must be a string of hexadecimal characters`);
-        return;
-      }
-      const txHex = await bitcoinClient.sendRawTransaction(rawTx);
-      if (!txHex) {
-        res.status(400).send(`unable to send rawTx`);
-        return;
-      }
-      res.status(200).send(txHex);
-    } catch (e: any) {
-      BitcoinBackendRoutes.handleException(e, 'sendRawTransaction', res);
-    }
-  }
-
-  private async $testMempoolAccept(req: Request, res: Response): Promise<void> {
-    const rawTxs = req.body.rawTxs;
-    try {
-      if (typeof(rawTxs) !== 'object' || !Array.isArray(rawTxs) || rawTxs.some((tx) => typeof(tx) !== 'string' || !RAW_TX_REGEX.test(tx))) {
-        res.status(400).send(`invalid param rawTxs. must be an array of strings of hexadecimal characters`);
-        return;
-      }
-      const txHex = await bitcoinClient.testMempoolAccept(rawTxs);
-      if (typeof(txHex) !== 'object' || txHex.length === 0) {
-        res.status(400).send(`testmempoolaccept failed for raw txs, got an empty result`);
-        return;
-      }
-      res.status(200).send(txHex);
-    } catch (e: any) {
-      BitcoinBackendRoutes.handleException(e, 'testMempoolAccept', res);
-    }
-  }
-
-  private async $getMempoolAncestors(req: Request, res: Response): Promise<void> {
-    const txid = req.query.txid;
-    const verbose = req.query.verbose;
-    try {
-      if (typeof(txid) !== 'string' || txid.length !== 64 || !TXID_REGEX.test(txid)) {
-        res.status(400).send(`invalid param txid. must be 64 hexadecimal characters`);
-        return;
-      }
-      if (typeof(verbose) !== 'string' || (verbose !== 'true' && verbose !== 'false')) {
-        res.status(400).send(`invalid param verbose. must be a string ('true' | 'false')`);
-        return;
-      }
-
-      const ancestors = await bitcoinClient.getMempoolAncestors(txid, verbose === 'true' ? true : false);
-      if (!ancestors) {
-        res.status(400).send(`unable to get mempool ancestors`);
-        return;
-      }
-      res.status(200).send(ancestors);
-    } catch (e: any) {
-      BitcoinBackendRoutes.handleException(e, 'getMempoolAncestors', res);
-    }
-  }
-
-  private async $getBlock(req: Request, res: Response): Promise<void> {
-    const blockHash = req.query.hash;
-    const verbosity = req.query.verbosity;
-    try {
-      if (typeof(blockHash) !== 'string' || blockHash.length !== 64 || !BLOCKHASH_REGEX.test(blockHash)) {
-        res.status(400).send(`invalid param blockHash. must be 64 hexadecimal characters`);
-        return;
-      }
-      if (typeof(verbosity) !== 'string') {
-        res.status(400).send(`invalid param verbosity. must be a string representing an integer`);
-        return;
-      }
-      const verbosityNumber = parseInt(verbosity, 10);
-      if (typeof(verbosityNumber) !== 'number') {
-        res.status(400).send(`invalid param verbosity. must be a valid integer`);
-        return;
-      }
-
-      const block = await bitcoinClient.getBlock(blockHash, verbosityNumber);
-      if (!block) {
-        res.status(400).send(`unable to get block`);
-        return;
-      }
-      res.status(200).send(block);
-    } catch (e: any) {
-      BitcoinBackendRoutes.handleException(e, 'getBlock', res);
-    }
-  }
-
-  private async $getBlockHash(req: Request, res: Response): Promise<void> {
-    const blockHeight = req.query.height;
-    try {
-      if (typeof(blockHeight) !== 'string') {
-        res.status(400).send(`invalid param blockHeight, must be a string representing an integer`);
-        return;
-      }
-      const blockHeightNumber = parseInt(blockHeight, 10);
-      if (typeof(blockHeightNumber) !== 'number') {
-        res.status(400).send(`invalid param blockHeight. must be a valid integer`);
-        return;
-      }
-
-      const block = await bitcoinClient.getBlockHash(blockHeightNumber);
-      if (!block) {
-        res.status(400).send(`unable to get block hash`);
-        return;
-      }
-      res.status(200).send(block);
-    } catch (e: any) {
-      BitcoinBackendRoutes.handleException(e, 'getBlockHash', res);
-    }
-  }
-
-  private async $getBlockCount(req: Request, res: Response): Promise<void> {
-    try {
-      const count = await bitcoinClient.getBlockCount();
-      if (!count) {
-        res.status(400).send(`unable to get block count`);
-        return;
-      }
-      res.status(200).send(`${count}`);
-    } catch (e: any) {
-      BitcoinBackendRoutes.handleException(e, 'getBlockCount', res);
-    }
-  }
-}
-
-export default new BitcoinBackendRoutes;

backend/src/api/bitcoin/bitcoin.routes.ts

@@ -19,14 +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';
-import { handleError } from '../../utils/api';
-import poolsUpdater from '../../tasks/pools-updater';
-
-const TXID_REGEX = /^[a-f0-9]{64}$/i;
-const BLOCK_HASH_REGEX = /^[a-f0-9]{64}$/i;
-const ADDRESS_REGEX = /^[a-z0-9]{2,120}$/i;
-const SCRIPT_HASH_REGEX = /^([a-f0-9]{2})+$/i;
 
 class BitcoinRoutes {
   public initRoutes(app: Application) {
@@ -44,23 +36,69 @@ 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/tx/:txid/summary', this.getStrippedBlockTransaction)
       .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))
       .get(config.MEMPOOL.API_URL_PREFIX + 'blocks-bulk/:from/:to', this.getBlocksByBulk.bind(this))
-      // Temporarily add txs/package endpoint for all backends until esplora supports it
-      .post(config.MEMPOOL.API_URL_PREFIX + 'txs/package', this.$submitPackage)
-      // Internal routes
-      .get(config.MEMPOOL.API_URL_PREFIX + 'internal/blocks/definition/list', this.getBlockDefinitionHashes)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'internal/blocks/definition/current', this.getCurrentBlockDefinitionHash)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'internal/blocks/:definitionHash', this.getBlocksByDefinitionHash)
       ;
 
       if (config.MEMPOOL.BACKEND !== 'esplora') {
@@ -70,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)
@@ -84,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)
           ;
       }
@@ -100,7 +135,7 @@ class BitcoinRoutes {
       res.set('Content-Type', 'application/json');
       res.send(result);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get init data');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -119,22 +154,19 @@ class BitcoinRoutes {
       const result = mempoolBlocks.getMempoolBlocks();
       res.json(result);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get mempool blocks');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
   private getTransactionTimes(req: Request, res: Response) {
     if (!Array.isArray(req.query.txId)) {
-      handleError(req, res, 500, 'Not an array');
+      res.status(500).send('Not an array');
       return;
     }
     const txIds: string[] = [];
     for (const _txId in req.query.txId) {
       if (typeof req.query.txId[_txId] === 'string') {
-        const txid = req.query.txId[_txId].toString();
-        if (TXID_REGEX.test(txid)) {
-          txIds.push(txid);
-        }
+        txIds.push(req.query.txId[_txId].toString());
       }
     }
 
@@ -145,16 +177,12 @@ class BitcoinRoutes {
   private async $getBatchedOutspends(req: Request, res: Response): Promise<IEsploraApi.Outspend[][] | void> {
     const txids_csv = req.query.txids;
     if (!txids_csv || typeof txids_csv !== 'string') {
-      handleError(req, res, 500, 'Invalid txids format');
+      res.status(500).send('Invalid txids format');
       return;
     }
     const txids = txids_csv.split(',');
     if (txids.length > 50) {
-      handleError(req, res, 400, 'Too many txids requested');
-      return;
-    }
-    if (txids.some((txid) => !TXID_REGEX.test(txid))) {
-      handleError(req, res, 400, 'Invalid txids format');
+      res.status(400).send('Too many txids requested');
       return;
     }
 
@@ -162,13 +190,13 @@ class BitcoinRoutes {
       const batchedOutspends = await bitcoinApi.$getBatchedOutspends(txids);
       res.json(batchedOutspends);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get batched outspends');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
   private async $getCpfpInfo(req: Request, res: Response) {
-    if (!TXID_REGEX.test(req.params.txId)) {
-      handleError(req, res, 501, `Invalid transaction ID`);
+    if (!/^[a-fA-F0-9]{64}$/.test(req.params.txId)) {
+      res.status(501).send(`Invalid transaction ID.`);
       return;
     }
 
@@ -181,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;
@@ -201,7 +225,7 @@ class BitcoinRoutes {
         try {
           cpfpInfo = await transactionRepository.$getCpfpInfo(req.params.txId);
         } catch (e) {
-          handleError(req, res, 500, 'Failed to get CPFP info');
+          res.status(500).send('failed to get CPFP info');
           return;
         }
       }
@@ -222,10 +246,6 @@ class BitcoinRoutes {
   }
 
   private async getTransaction(req: Request, res: Response) {
-    if (!TXID_REGEX.test(req.params.txId)) {
-      handleError(req, res, 501, `Invalid transaction ID`);
-      return;
-    }
     try {
       const transaction = await transactionUtils.$getTransactionExtended(req.params.txId, true, false, false, true);
       res.json(transaction);
@@ -233,18 +253,12 @@ class BitcoinRoutes {
       let statusCode = 500;
       if (e instanceof Error && e instanceof Error && e.message && e.message.indexOf('No such mempool or blockchain transaction') > -1) {
         statusCode = 404;
-        handleError(req, res, statusCode, 'No such mempool or blockchain transaction');
-        return;
       }
-      handleError(req, res, statusCode, 'Failed to get transaction');
+      res.status(statusCode).send(e instanceof Error ? e.message : e);
     }
   }
 
   private async getRawTransaction(req: Request, res: Response) {
-    if (!TXID_REGEX.test(req.params.txId)) {
-      handleError(req, res, 501, `Invalid transaction ID`);
-      return;
-    }
     try {
       const transaction: IEsploraApi.Transaction = await bitcoinApi.$getRawTransaction(req.params.txId, true);
       res.setHeader('content-type', 'text/plain');
@@ -253,10 +267,8 @@ class BitcoinRoutes {
       let statusCode = 500;
       if (e instanceof Error && e.message && e.message.indexOf('No such mempool or blockchain transaction') > -1) {
         statusCode = 404;
-        handleError(req, res, statusCode, 'No such mempool or blockchain transaction');
-        return;
       }
-      handleError(req, res, statusCode, 'Failed to get raw transaction');
+      res.status(statusCode).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -317,22 +329,18 @@ class BitcoinRoutes {
         // Not modified
         // 422 Unprocessable Entity
         // https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/422
-        handleError(req, res, 422, `Psbt had no missing nonWitnessUtxos.`);
+        res.status(422).send(`Psbt had no missing nonWitnessUtxos.`);
       }
     } catch (e: any) {
       if (e instanceof Error && new RegExp(notFoundError).test(e.message)) {
-        handleError(req, res, 404, notFoundError);
+        res.status(404).send(e.message);
       } else {
-        handleError(req, res, 500, 'Failed to process PSBT');
+        res.status(500).send(e instanceof Error ? e.message : e);
       }
     }
   }
 
   private async getTransactionStatus(req: Request, res: Response) {
-    if (!TXID_REGEX.test(req.params.txId)) {
-      handleError(req, res, 501, `Invalid transaction ID`);
-      return;
-    }
     try {
       const transaction = await transactionUtils.$getTransactionExtended(req.params.txId, true);
       res.json(transaction.status);
@@ -340,54 +348,22 @@ class BitcoinRoutes {
       let statusCode = 500;
       if (e instanceof Error && e.message && e.message.indexOf('No such mempool or blockchain transaction') > -1) {
         statusCode = 404;
-        handleError(req, res, statusCode, 'No such mempool or blockchain transaction');
-        return;
       }
-      handleError(req, res, statusCode, 'Failed to get transaction status');
+      res.status(statusCode).send(e instanceof Error ? e.message : e);
     }
   }
 
   private async getStrippedBlockTransactions(req: Request, res: Response) {
-    if (!BLOCK_HASH_REGEX.test(req.params.hash)) {
-      handleError(req, res, 501, `Invalid block hash`);
-      return;
-    }
     try {
       const transactions = await blocks.$getStrippedBlockTransactions(req.params.hash);
       res.setHeader('Expires', new Date(Date.now() + 1000 * 3600 * 24 * 30).toUTCString());
       res.json(transactions);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get block summary');
-    }
-  }
-
-  private async getStrippedBlockTransaction(req: Request, res: Response) {
-    if (!BLOCK_HASH_REGEX.test(req.params.hash)) {
-      handleError(req, res, 501, `Invalid block hash`);
-      return;
-    }
-    if (!TXID_REGEX.test(req.params.txid)) {
-      handleError(req, res, 501, `Invalid transaction ID`);
-      return;
-    }
-    try {
-      const transaction = await blocks.$getSingleTxFromSummary(req.params.hash, req.params.txid);
-      if (!transaction) {
-        handleError(req, res, 404, `Transaction not found in summary`);
-        return;
-      }
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 3600 * 24 * 30).toUTCString());
-      res.json(transaction);
-    } catch (e) {
-      handleError(req, res, 500, 'Failed to get transaction from summary');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
   private async getBlock(req: Request, res: Response) {
-    if (!BLOCK_HASH_REGEX.test(req.params.hash)) {
-      handleError(req, res, 501, `Invalid block hash`);
-      return;
-    }
     try {
       const block = await blocks.$getBlock(req.params.hash);
 
@@ -399,69 +375,37 @@ class BitcoinRoutes {
       } else if (blockAge > 30 * day) {
         cacheDuration = 10 * day;
       } else {
-        cacheDuration = 600;
+        cacheDuration = 600
       }
 
       res.setHeader('Expires', new Date(Date.now() + 1000 * cacheDuration).toUTCString());
       res.json(block);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get block');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
   private async getBlockHeader(req: Request, res: Response) {
-    if (!BLOCK_HASH_REGEX.test(req.params.hash)) {
-      handleError(req, res, 501, `Invalid block hash`);
-      return;
-    }
     try {
       const blockHeader = await bitcoinApi.$getBlockHeader(req.params.hash);
       res.setHeader('content-type', 'text/plain');
       res.send(blockHeader);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get block header');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
   private async getBlockAuditSummary(req: Request, res: Response) {
-    if (!BLOCK_HASH_REGEX.test(req.params.hash)) {
-      handleError(req, res, 501, `Invalid block hash`);
-      return;
-    }
     try {
       const auditSummary = await blocks.$getBlockAuditSummary(req.params.hash);
       if (auditSummary) {
         res.setHeader('Expires', new Date(Date.now() + 1000 * 3600 * 24 * 30).toUTCString());
         res.json(auditSummary);
       } else {
-        handleError(req, res, 404, `Audit not available`);
-        return;
+        return res.status(404).send(`audit not available`);
       }
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get block audit summary');
-    }
-  }
-
-  private async $getBlockTxAuditSummary(req: Request, res: Response) {
-    if (!BLOCK_HASH_REGEX.test(req.params.hash)) {
-      handleError(req, res, 501, `Invalid block hash`);
-      return;
-    }
-    if (!TXID_REGEX.test(req.params.txid)) {
-      handleError(req, res, 501, `Invalid transaction ID`);
-      return;
-    }
-    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 {
-        handleError(req, res, 404, `Transaction audit not available`);
-        return;
-      }
-    } catch (e) {
-      handleError(req, res, 500, 'Failed to get transaction audit summary');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -471,53 +415,46 @@ class BitcoinRoutes {
         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) {
-      handleError(req, res, 500, 'Failed to get blocks');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
   private async getBlocksByBulk(req: Request, res: Response) {
     try {
-      if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false) { // Liquid - Not implemented
-        handleError(req, res, 404, `This API is only available for Bitcoin networks`);
-        return;
+      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) {
-        handleError(req, res, 404, `This API is disabled. Set config.MEMPOOL.MAX_BLOCKS_BULK_QUERY to a positive number to enable it.`);
-        return;
+        return res.status(404).send(`This API is disabled. Set config.MEMPOOL.MAX_BLOCKS_BULK_QUERY to a positive number to enable it.`);
       }
       if (!Common.indexingEnabled()) {
-        handleError(req, res, 404, `Indexing is required for this API`);
-        return;
+        return res.status(404).send(`Indexing is required for this API`);
       }
 
       const from = parseInt(req.params.from, 10);
       if (!req.params.from || from < 0) {
-        handleError(req, res, 400, `Parameter 'from' must be a block height (integer)`);
-        return;
+        return res.status(400).send(`Parameter 'from' must be a block height (integer)`);
       }
       const to = req.params.to === undefined ? await bitcoinApi.$getBlockHeightTip() : parseInt(req.params.to, 10);
       if (to < 0) {
-        handleError(req, res, 400, `Parameter 'to' must be a block height (integer)`);
-        return;
+        return res.status(400).send(`Parameter 'to' must be a block height (integer)`);
       }
       if (from > to) {
-        handleError(req, res, 400, `Parameter 'to' must be a higher block height than 'from'`);
-        return;
+        return res.status(400).send(`Parameter 'to' must be a higher block height than 'from'`);
       }
       if ((to - from + 1) > config.MEMPOOL.MAX_BLOCKS_BULK_QUERY) {
-        handleError(req, res, 400, `You can only query ${config.MEMPOOL.MAX_BLOCKS_BULK_QUERY} blocks at once.`);
-        return;
+        return res.status(400).send(`You can only query ${config.MEMPOOL.MAX_BLOCKS_BULK_QUERY} blocks at once.`);
       }
 
       res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
       res.json(await blocks.$getBlocksBetweenHeight(from, to));
 
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get blocks');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -552,15 +489,11 @@ class BitcoinRoutes {
       res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
       res.json(returnBlocks);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get blocks');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
-
+  
   private async getBlockTransactions(req: Request, res: Response) {
-    if (!BLOCK_HASH_REGEX.test(req.params.hash)) {
-      handleError(req, res, 501, `Invalid block hash`);
-      return;
-    }
     try {
       loadingIndicators.setProgress('blocktxs-' + req.params.hash, 0);
 
@@ -581,7 +514,7 @@ class BitcoinRoutes {
       res.json(transactions);
     } catch (e) {
       loadingIndicators.setProgress('blocktxs-' + req.params.hash, 100);
-      handleError(req, res, 500, 'Failed to get block transactions');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -590,17 +523,13 @@ class BitcoinRoutes {
       const blockHash = await bitcoinApi.$getBlockHash(parseInt(req.params.height, 10));
       res.send(blockHash);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get block at height');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
   private async getAddress(req: Request, res: Response) {
     if (config.MEMPOOL.BACKEND === 'none') {
-      handleError(req, res, 405, 'Address lookups cannot be used with bitcoind as backend.');
-      return;
-    }
-    if (!ADDRESS_REGEX.test(req.params.address)) {
-      handleError(req, res, 501, `Invalid address`);
+      res.status(405).send('Address lookups cannot be used with bitcoind as backend.');
       return;
     }
 
@@ -609,20 +538,15 @@ class BitcoinRoutes {
       res.json(addressData);
     } catch (e) {
       if (e instanceof Error && e.message && (e.message.indexOf('too long') > 0 || e.message.indexOf('confirmed status') > 0)) {
-        handleError(req, res, 413, e.message);
-        return;
+        return res.status(413).send(e instanceof Error ? e.message : e);
       }
-      handleError(req, res, 500, 'Failed to get address');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
   private async getAddressTransactions(req: Request, res: Response): Promise<void> {
     if (config.MEMPOOL.BACKEND === 'none') {
-      handleError(req, res, 405, 'Address lookups cannot be used with bitcoind as backend.');
-      return;
-    }
-    if (!ADDRESS_REGEX.test(req.params.address)) {
-      handleError(req, res, 501, `Invalid address`);
+      res.status(405).send('Address lookups cannot be used with bitcoind as backend.');
       return;
     }
 
@@ -635,27 +559,16 @@ class BitcoinRoutes {
       res.json(transactions);
     } catch (e) {
       if (e instanceof Error && e.message && (e.message.indexOf('too long') > 0 || e.message.indexOf('confirmed status') > 0)) {
-        handleError(req, res, 413, e.message);
+        res.status(413).send(e instanceof Error ? e.message : e);
         return;
       }
-      handleError(req, res, 500, 'Failed to get address transactions');
-    }
-  }
-
-  private async getAddressTransactionSummary(req: Request, res: Response): Promise<void> {
-    if (config.MEMPOOL.BACKEND !== 'esplora') {
-      handleError(req, res, 405, 'Address summary lookups require mempool/electrs backend.');
-      return;
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
   private async getScriptHash(req: Request, res: Response) {
     if (config.MEMPOOL.BACKEND === 'none') {
-      handleError(req, res, 405, 'Address lookups cannot be used with bitcoind as backend.');
-      return;
-    }
-    if (!SCRIPT_HASH_REGEX.test(req.params.scripthash)) {
-      handleError(req, res, 501, `Invalid scripthash`);
+      res.status(405).send('Address lookups cannot be used with bitcoind as backend.');
       return;
     }
 
@@ -666,20 +579,15 @@ class BitcoinRoutes {
       res.json(addressData);
     } catch (e) {
       if (e instanceof Error && e.message && (e.message.indexOf('too long') > 0 || e.message.indexOf('confirmed status') > 0)) {
-        handleError(req, res, 413, e.message);
-        return;
+        return res.status(413).send(e instanceof Error ? e.message : e);
       }
-      handleError(req, res, 500, 'Failed to get script hash');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
   private async getScriptHashTransactions(req: Request, res: Response): Promise<void> {
     if (config.MEMPOOL.BACKEND === 'none') {
-      handleError(req, res, 405, 'Address lookups cannot be used with bitcoind as backend.');
-      return;
-    }
-    if (!SCRIPT_HASH_REGEX.test(req.params.scripthash)) {
-      handleError(req, res, 501, `Invalid scripthash`);
+      res.status(405).send('Address lookups cannot be used with bitcoind as backend.');
       return;
     }
 
@@ -694,26 +602,19 @@ class BitcoinRoutes {
       res.json(transactions);
     } catch (e) {
       if (e instanceof Error && e.message && (e.message.indexOf('too long') > 0 || e.message.indexOf('confirmed status') > 0)) {
-        handleError(req, res, 413, e.message);
+        res.status(413).send(e instanceof Error ? e.message : e);
         return;
       }
-      handleError(req, res, 500, 'Failed to get script hash transactions');
-    }
-  }
-
-  private async getScriptHashTransactionSummary(req: Request, res: Response): Promise<void> {
-    if (config.MEMPOOL.BACKEND !== 'esplora') {
-      handleError(req, res, 405, 'Scripthash summary lookups require mempool/electrs backend.');
-      return;
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
   private async getAddressPrefix(req: Request, res: Response) {
     try {
-      const addressPrefix = await bitcoinApi.$getAddressPrefix(req.params.prefix);
-      res.send(addressPrefix);
+      const blockHash = await bitcoinApi.$getAddressPrefix(req.params.prefix);
+      res.send(blockHash);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get address prefix');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -740,53 +641,7 @@ class BitcoinRoutes {
       const rawMempool = await bitcoinApi.$getRawMempool();
       res.send(rawMempool);
     } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
-    }
-  }
-
-  private async getBlockDefinitionHashes(req: Request, res: Response): Promise<void> {
-    try {
-      const result = await blocks.$getBlockDefinitionHashes();
-      if (!result) {
-        handleError(req, res, 503, `Service Temporarily Unavailable`);
-        return;
-      }
-      res.setHeader('content-type', 'application/json');
-      res.send(result);
-    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
-    }
-  }
-
-  private async getCurrentBlockDefinitionHash(req: Request, res: Response): Promise<void> {
-    try {
-      const currentSha = await poolsUpdater.getShaFromDb();
-      if (!currentSha) {
-        handleError(req, res, 503, `Service Temporarily Unavailable`);
-        return;
-      }
-      res.setHeader('content-type', 'text/plain');
-      res.send(currentSha);
-    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
-    }
-  }
-
-  private async getBlocksByDefinitionHash(req: Request, res: Response): Promise<void> {
-    try {
-      if (typeof(req.params.definitionHash) !== 'string') {
-        res.status(400).send('Parameter "hash" must be a valid string');
-        return;
-      }
-      const blocksHash = await blocks.$getBlocksByDefinitionHash(req.params.definitionHash as string);
-      if (!blocksHash) {
-        handleError(req, res, 503, `Service Temporarily Unavailable`);
-        return;
-      }
-      res.setHeader('content-type', 'application/json');
-      res.send(blocksHash);
-    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -794,13 +649,12 @@ class BitcoinRoutes {
     try {
       const result = blocks.getCurrentBlockHeight();
       if (!result) {
-        handleError(req, res, 503, `Service Temporarily Unavailable`);
-        return;
+        return res.status(503).send(`Service Temporarily Unavailable`);
       }
       res.setHeader('content-type', 'text/plain');
       res.send(result.toString());
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get height at tip');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -810,55 +664,39 @@ class BitcoinRoutes {
       res.setHeader('content-type', 'text/plain');
       res.send(result);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get hash at tip');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
   private async getRawBlock(req: Request, res: Response) {
-    if (!BLOCK_HASH_REGEX.test(req.params.hash)) {
-      handleError(req, res, 501, `Invalid block hash`);
-      return;
-    }
     try {
       const result = await bitcoinApi.$getRawBlock(req.params.hash);
       res.setHeader('content-type', 'application/octet-stream');
       res.send(result);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get raw block');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
   private async getTxIdsForBlock(req: Request, res: Response) {
-    if (!BLOCK_HASH_REGEX.test(req.params.hash)) {
-      handleError(req, res, 501, `Invalid block hash`);
-      return;
-    }
     try {
       const result = await bitcoinApi.$getTxIdsForBlock(req.params.hash);
       res.json(result);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get txids for block');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
   private async validateAddress(req: Request, res: Response) {
-    if (!ADDRESS_REGEX.test(req.params.address)) {
-      handleError(req, res, 501, `Invalid address`);
-      return;
-    }
     try {
       const result = await bitcoinClient.validateAddress(req.params.address);
       res.json(result);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to validate address');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
   private async getRbfHistory(req: Request, res: Response) {
-    if (!TXID_REGEX.test(req.params.txId)) {
-      handleError(req, res, 501, `Invalid transaction ID`);
-      return;
-    }
     try {
       const replacements = rbfCache.getRbfTree(req.params.txId) || null;
       const replaces = rbfCache.getReplaces(req.params.txId) || null;
@@ -867,7 +705,7 @@ class BitcoinRoutes {
         replaces
       });
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get rbf history');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -876,7 +714,7 @@ class BitcoinRoutes {
       const result = rbfCache.getRbfTrees(false);
       res.json(result);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get rbf trees');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -885,15 +723,11 @@ class BitcoinRoutes {
       const result = rbfCache.getRbfTrees(true);
       res.json(result);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get full rbf replacements');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
   private async getCachedTx(req: Request, res: Response) {
-    if (!TXID_REGEX.test(req.params.txId)) {
-      handleError(req, res, 501, `Invalid transaction ID`);
-      return;
-    }
     try {
       const result = rbfCache.getTx(req.params.txId);
       if (result) {
@@ -902,20 +736,16 @@ class BitcoinRoutes {
         res.status(204).send();
       }
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get cached tx');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
   private async getTransactionOutspends(req: Request, res: Response) {
-    if (!TXID_REGEX.test(req.params.txId)) {
-      handleError(req, res, 501, `Invalid transaction ID`);
-      return;
-    }
     try {
       const result = await bitcoinApi.$getOutspends(req.params.txId);
       res.json(result);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get transaction outspends');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -925,10 +755,10 @@ class BitcoinRoutes {
       if (da) {
         res.json(da);
       } else {
-        handleError(req, res, 503, `Service Temporarily Unavailable`);
+        res.status(503).send(`Service Temporarily Unavailable`);
       }
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get difficulty change');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -939,8 +769,8 @@ class BitcoinRoutes {
       const txIdResult = await bitcoinApi.$sendRawTransaction(rawTx);
       res.send(txIdResult);
     } catch (e: any) {
-      handleError(req, res, 400, (e.message && e.code) ? 'sendrawtransaction RPC error: ' + JSON.stringify({ code: e.code })
-        : 'Failed to send raw transaction');
+      res.status(400).send(e.message && e.code ? 'sendrawtransaction RPC error: ' + JSON.stringify({ code: e.code, message: e.message })
+        : (e.message || 'Error'));
     }
   }
 
@@ -951,33 +781,8 @@ class BitcoinRoutes {
       const txIdResult = await bitcoinClient.sendRawTransaction(txHex);
       res.send(txIdResult);
     } catch (e: any) {
-      handleError(req, res, 400, (e.message && e.code) ? 'sendrawtransaction RPC error: ' + JSON.stringify({ code: e.code })
-        : 'Failed to send raw transaction');
-    }
-  }
-
-  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) {
-      handleError(req, res, 400, (e.message && e.code) ? 'testmempoolaccept RPC error: ' + JSON.stringify({ code: e.code })
-        : 'Failed to test transactions');
-    }
-  }
-
-  private async $submitPackage(req: Request, res: Response) {
-    try {
-      const rawTxs = Common.getTransactionsFromRequest(req);
-      const maxfeerate = parseFloat(req.query.maxfeerate as string);
-      const maxburnamount = parseFloat(req.query.maxburnamount as string);
-      const result = await bitcoinClient.submitPackage(rawTxs, maxfeerate ?? undefined, maxburnamount ?? undefined);
-      res.send(result);
-    } catch (e: any) {
-      handleError(req, res, 400, (e.message && e.code) ? 'submitpackage RPC error: ' + JSON.stringify({ code: e.code })
-        : 'Failed to submit package');
+      res.status(400).send(e.message && e.code ? 'sendrawtransaction RPC error: ' + JSON.stringify({ code: e.code, message: e.message })
+        : (e.message || 'Error'));
     }
   }
 

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;
@@ -179,11 +179,4 @@ export namespace IEsploraApi {
     burn_count: number;
   }
 
-  export interface AddressTxSummary {
-    txid: string;
-    value: number;
-    height: number;
-    time: number;
-    tx_position?: number;
-  }
 }

backend/src/api/bitcoin/esplora-api.ts

@@ -1,68 +1,42 @@
 import config from '../../config';
-import axios, { 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 { SubmitPackageResult, TestMempoolAcceptResult } from './bitcoin-api.interface';
-import os from 'os';
+
 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,
-  publicDomain: string,
-  hashes: {
-    frontend?: string,
-    backend?: string,
-    electrs?: string,
-    lastUpdated: number,
-  }
 }
 
 class FailoverRouter {
   activeHost: FailoverHost;
   fallbackHost: FailoverHost;
-  maxSlippage: number = config.ESPLORA.MAX_BEHIND_TIP ?? 2;
-  maxHeight: number = 0;
   hosts: FailoverHost[];
   multihost: boolean;
-  gitHashInterval: number = 600000; // 10 minutes
-  pollInterval: number = 60000; // 1 minute
+  pollInterval: number = 60000;
   pollTimer: NodeJS.Timeout | null = null;
   pollConnection = axios.create();
-  localHostname: string = 'localhost';
   requestConnection = axios.create({
     httpAgent: new http.Agent({ keepAlive: true })
   });
 
   constructor() {
-    try {
-      this.localHostname = os.hostname();
-    } catch (e) {
-      logger.warn('Failed to set local hostname, using "localhost"');
-    }
     // setup list of hosts
     this.hosts = (config.ESPLORA.FALLBACK || []).map(domain => {
       return {
         host: domain,
-        checked: false,
         rtts: [],
         rtt: Infinity,
         failures: 0,
-        publicDomain: 'https://' + this.extractPublicDomain(domain),
-        hashes: {
-          lastUpdated: 0,
-        },
       };
     });
     this.activeHost = {
@@ -72,11 +46,6 @@ class FailoverRouter {
       failures: 0,
       socket: !!config.ESPLORA.UNIX_SOCKET_PATH,
       preferred: true,
-      checked: false,
-      publicDomain: `http://${this.localHostname}`,
-      hashes: {
-        lastUpdated: 0,
-      },
     };
     this.fallbackHost = this.activeHost;
     this.hosts.unshift(this.activeHost);
@@ -105,110 +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;
-
-          // update esplora git hash using the x-powered-by header from the height check
-          const poweredBy = result.headers['x-powered-by'];
-          if (poweredBy) {
-            const match = poweredBy.match(/([a-fA-F0-9]{5,40})/);
-            if (match && match[1]?.length) {
-              host.hashes.electrs = match[1];
-            }
-          }
-
-          // Check front and backend git hashes less often
-          if (Date.now() - host.hashes.lastUpdated > this.gitHashInterval) {
-            await Promise.all([
-              this.$updateFrontendGitHash(host),
-              this.$updateBackendGitHash(host)
-            ]);
-            host.hashes.lastUpdated = Date.now();
-          }
-        } 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
@@ -220,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}`);
   }
 
@@ -234,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 {
@@ -242,47 +172,6 @@ class FailoverRouter {
     }
   }
 
-  // methods for retrieving git hashes by host
-  private async $updateFrontendGitHash(host: FailoverHost): Promise<void> {
-    try {
-      const url = `${host.publicDomain}/resources/config.js`;
-      const response = await this.pollConnection.get<string>(url, { timeout: config.ESPLORA.FALLBACK_TIMEOUT });
-      const match = response.data.match(/GIT_COMMIT_HASH\s*=\s*['"](.*?)['"]/);
-      if (match && match[1]?.length) {
-        host.hashes.frontend = match[1];
-      }
-    } catch (e) {
-      // failed to get frontend build hash - do nothing
-    }
-  }
-
-  private async $updateBackendGitHash(host: FailoverHost): Promise<void> {
-    try {
-      const url = `${host.publicDomain}/api/v1/backend-info`;
-      const response = await this.pollConnection.get<any>(url, { timeout: config.ESPLORA.FALLBACK_TIMEOUT });
-      if (response.data?.gitCommit) {
-        host.hashes.backend = response.data.gitCommit;
-      }
-    } catch (e) {
-      // failed to get backend build hash - do nothing
-    }
-  }
-
-  // returns the public mempool domain corresponding to an esplora server url
-  // (a bit of a hack to avoid manually specifying frontend & backend URLs for each esplora server)
-  private extractPublicDomain(url: string): string {
-    // force the url to start with a valid protocol
-    const urlWithProtocol = url.startsWith('http') ? url : `https://${url}`;
-    // parse as URL and extract the hostname
-    try {
-      const parsed = new URL(urlWithProtocol);
-      return parsed.hostname;
-    } catch (e) {
-      // fallback to the original url
-      return url;
-    }
-  }
-
   private async $query<T>(method: 'get'| 'post', path, data: any, responseType = 'json', host = this.activeHost, retry: boolean = true): Promise<T> {
     let axiosConfig;
     let url;
@@ -386,7 +275,7 @@ class ElectrsApi implements AbstractBitcoinApi {
   }
 
   $getAddress(address: string): Promise<IEsploraApi.Address> {
-    return this.failoverRouter.$get<IEsploraApi.Address>('/address/' + address);
+    throw new Error('Method getAddress not implemented.');
   }
 
   $getAddressTransactions(address: string, txId?: string): Promise<IEsploraApi.Transaction[]> {
@@ -409,14 +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.');
-  }
-
-  $submitPackage(rawTransactions: string[]): Promise<SubmitPackageResult> {
-    throw new Error('Method not implemented.');
-  }
-
   $getOutspend(txId: string, vout: number): Promise<IEsploraApi.Outspend> {
     return this.failoverRouter.$get<IEsploraApi.Outspend>('/tx/' + txId + '/outspend/' + vout);
   }
@@ -437,37 +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);
-  }
-
-  async $getAddressTransactionSummary(address: string): Promise<IEsploraApi.AddressTxSummary[]> {
-    return this.failoverRouter.$get<IEsploraApi.AddressTxSummary[]>('/address/' + address + '/txs/summary');
-  }
-
   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,
-        hashes: host.hashes,
-      }));
-    } else {
-      return [];
-    }
-  }
 }
 
 export default ElectrsApi;

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, TransactionStripped, TransactionMinerInfo, CpfpSummary, MempoolTransactionExtended } from '../mempool.interfaces';
 import { Common } from './common';
 import diskCache from './disk-cache';
 import transactionUtils from './transaction-utils';
@@ -29,12 +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 { parseDATUMTemplateCreator } from '../utils/bitcoin-script';
-import database from '../database';
 
 class Blocks {
   private blocks: BlockExtended[] = [];
@@ -43,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;
 
@@ -209,8 +201,7 @@ class Blocks {
         txid: tx.txid,
         vsize: tx.weight / 4,
         fee: tx.fee ? Math.round(tx.fee * 100000000) : 0,
-        value: Math.round(tx.vout.reduce((acc, vout) => acc + (vout.value ? vout.value : 0), 0) * 100000000),
-        flags: 0,
+        value: Math.round(tx.vout.reduce((acc, vout) => acc + (vout.value ? vout.value : 0), 0) * 100000000)
       };
     });
 
@@ -220,10 +211,10 @@ class Blocks {
     };
   }
 
-  public summarizeBlockTransactions(hash: string, height: number, transactions: TransactionExtended[]): BlockSummary {
+  public summarizeBlockTransactions(hash: string, transactions: TransactionExtended[]): BlockSummary {
     return {
       id: hash,
-      transactions: Common.classifyTransactions(transactions, height),
+      transactions: Common.stripTransactions(transactions),
     };
   }
 
@@ -300,12 +291,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;
     }
@@ -343,12 +332,7 @@ class Blocks {
           id: pool.uniqueId,
           name: pool.name,
           slug: pool.slug,
-          minerNames: null,
         };
-
-        if (extras.pool.name === 'OCEAN') {
-          extras.pool.minerNames = parseDATUMTemplateCreator(extras.coinbaseRaw);
-        }
       }
 
       extras.matchRate = null;
@@ -382,7 +366,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) {
@@ -391,9 +376,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) {
@@ -412,16 +414,8 @@ class Blocks {
     }
 
     try {
-      const blockchainInfo = await bitcoinClient.getBlockchainInfo();
-      const currentBlockHeight = blockchainInfo.blocks;
-      let indexingBlockAmount = Math.min(config.MEMPOOL.INDEXING_BLOCKS_AMOUNT, currentBlockHeight);
-      if (indexingBlockAmount <= -1) {
-        indexingBlockAmount = currentBlockHeight + 1;
-      }
-      const lastBlockToIndex = Math.max(0, currentBlockHeight - indexingBlockAmount + 1);
-
       // Get all indexed block hash
-      const indexedBlocks = (await blocksRepository.$getIndexedBlocks()).filter(block => block.height >= lastBlockToIndex);
+      const indexedBlocks = await blocksRepository.$getIndexedBlocks();
       const indexedBlockSummariesHashesArray = await BlocksSummariesRepository.$getIndexedSummariesId();
 
       const indexedBlockSummariesHashes = {}; // Use a map for faster seek during the indexing loop
@@ -454,11 +448,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
         }
@@ -568,187 +560,6 @@ class Blocks {
     logger.debug(`Indexing block audit details completed`);
   }
 
-  /**
-   * [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;
-    }
-
-    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);
-
-    // nothing to do
-    if (!unclassifiedBlocksList?.length && !unclassifiedTemplatesList?.length) {
-      return;
-    }
-
-    let timer = Date.now();
-    let indexedThisRun = 0;
-    let indexedTotal = 0;
-
-    const minHeight = Math.min(
-      unclassifiedBlocksList[unclassifiedBlocksList.length - 1]?.height ?? Infinity,
-      unclassifiedTemplatesList[unclassifiedTemplatesList.length - 1]?.height ?? Infinity,
-    );
-    const numToIndex = Math.max(
-      unclassifiedBlocksList.length,
-      unclassifiedTemplatesList.length,
-    );
-
-    const unclassifiedBlocks = {};
-    const unclassifiedTemplates = {};
-    for (const block of unclassifiedBlocksList) {
-      unclassifiedBlocks[block.height] = block.id;
-    }
-    for (const template of unclassifiedTemplatesList) {
-      unclassifiedTemplates[template.height] = template.id;
-    }
-
-    logger.debug(`Classifying blocks and templates from #${currentBlockHeight} to #${minHeight}`, logger.tags.goggles);
-
-    for (let height = currentBlockHeight; height >= 0; height--) {
-      try {
-        let txs: MempoolTransactionExtended[] | null = null;
-        if (unclassifiedBlocks[height]) {
-          const blockHash = unclassifiedBlocks[height];
-          // fetch transactions
-          txs = (await bitcoinApi.$getTxsForBlock(blockHash)).map(tx => transactionUtils.extendMempoolTransaction(tx)) || [];
-          // add CPFP
-          const cpfpSummary = calculateGoodBlockCpfp(height, txs, []);
-          // classify
-          const { transactions: classifiedTxs } = this.summarizeBlockTransactions(blockHash, height, 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 Common.sleep$(250);
-        }
-        if (unclassifiedTemplates[height]) {
-          // classify template
-          const blockHash = unclassifiedTemplates[height];
-          const template = await BlocksSummariesRepository.$getTemplate(blockHash);
-          const alreadyClassified = template?.transactions?.reduce((classified, tx) => (classified || tx.flags > 0), false);
-          let classifiedTemplate = template?.transactions || [];
-          if (!alreadyClassified) {
-            const templateTxs: (TransactionExtended | TransactionClassified)[] = [];
-            const blockTxMap: { [txid: string]: TransactionExtended } = {};
-            for (const tx of (txs || [])) {
-              blockTxMap[tx.txid] = tx;
-            }
-            for (const templateTx of (template?.transactions || [])) {
-              let tx: TransactionExtended | null = blockTxMap[templateTx.txid];
-              if (!tx) {
-                try {
-                  tx = await transactionUtils.$getTransactionExtended(templateTx.txid, false, true, false);
-                } catch (e) {
-                  // transaction probably not found
-                }
-              }
-              templateTxs.push(tx || templateTx);
-            }
-            const cpfpSummary = calculateGoodBlockCpfp(height, templateTxs?.filter(tx => tx['effectiveFeePerVsize'] != null) as MempoolTransactionExtended[], []);
-            // classify
-            const { transactions: classifiedTxs } = this.summarizeBlockTransactions(blockHash, height, cpfpSummary.transactions);
-            const classifiedTxMap: { [txid: string]: TransactionClassified } = {};
-            for (const tx of classifiedTxs) {
-              classifiedTxMap[tx.txid] = tx;
-            }
-            classifiedTemplate = classifiedTemplate.map(tx => {
-              if (classifiedTxMap[tx.txid]) {
-                tx.flags = classifiedTxMap[tx.txid].flags || 0;
-              }
-              return tx;
-            });
-          }
-          await BlocksSummariesRepository.$saveTemplate({ height, template: { id: blockHash, transactions: classifiedTemplate }, version: 1 });
-          await Common.sleep$(250);
-        }
-      } catch (e) {
-        logger.warn(`Failed to classify template or block summary at ${height}`, logger.tags.goggles);
-      }
-
-      // timing & logging
-      if (unclassifiedBlocks[height] || unclassifiedTemplates[height]) {
-        indexedThisRun++;
-        indexedTotal++;
-      }
-      const elapsedSeconds = (Date.now() - timer) / 1000;
-      if (elapsedSeconds > 5) {
-        const perSecond = indexedThisRun / elapsedSeconds;
-        logger.debug(`Classified #${height}: ${indexedTotal} / ${numToIndex} blocks (${perSecond.toFixed(1)}/s)`);
-        timer = Date.now();
-        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;
-    }
-  }
-
   /**
    * [INDEXING] Index all blocks metadata for the mining dashboard
    */
@@ -844,16 +655,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`);
@@ -898,11 +699,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}`);
@@ -919,14 +717,9 @@ 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, block.height, cpfpSummary.transactions);
+      const blockSummary: BlockSummary = this.summarizeBlockTransactions(block.id, cpfpSummary.transactions);
       this.updateTimerProgress(timer, `got block data for ${this.currentBlockHeight}`);
 
       if (Common.indexingEnabled()) {
@@ -940,19 +733,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();
@@ -1001,7 +793,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()) {
@@ -1043,9 +835,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);
@@ -1088,11 +877,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);
     }
@@ -1156,7 +945,7 @@ class Blocks {
   }
 
   public async $getStrippedBlockTransactions(hash: string, skipMemoryCache = false,
-    skipDBLookup = false, cpfpSummary?: CpfpSummary, blockHeight?: number): Promise<TransactionClassified[]>
+    skipDBLookup = false, cpfpSummary?: CpfpSummary, blockHeight?: number): Promise<TransactionStripped[]>
   {
     if (skipMemoryCache === false) {
       // Check the memory cache
@@ -1176,34 +965,23 @@ class Blocks {
 
     let height = blockHeight;
     let summary: BlockSummary;
-    let summaryVersion = 0;
     if (cpfpSummary && !Common.isLiquid()) {
       summary = {
         id: hash,
         transactions: cpfpSummary.transactions.map(tx => {
-          let flags: number = 0;
-          try {
-            flags = Common.getTransactionFlags(tx, height);
-          } 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,
+            rate: tx.effectiveFeePerVsize
           };
         }),
       };
-      summaryVersion = cpfpSummary.version;
     } else {
       if (config.MEMPOOL.BACKEND === 'esplora') {
         const txs = (await bitcoinApi.$getTxsForBlock(hash)).map(tx => transactionUtils.extendTransaction(tx));
-        summary = this.summarizeBlockTransactions(hash, height || 0, txs);
-        summaryVersion = 1;
+        summary = this.summarizeBlockTransactions(hash, txs);
       } else {
         // Call Core RPC
         const block = await bitcoinClient.getBlock(hash, 2);
@@ -1218,17 +996,12 @@ class Blocks {
 
     // Index the response if needed
     if (Common.blocksSummariesIndexingEnabled() === true) {
-      await BlocksSummariesRepository.$saveTransactions(height, hash, summary.transactions, summaryVersion);
+      await BlocksSummariesRepository.$saveTransactions(height, hash, summary.transactions);
     }
 
     return summary.transactions;
   }
 
-  public async $getSingleTxFromSummary(hash: string, txid: string): Promise<TransactionClassified | null> {
-    const txs = await this.$getStrippedBlockTransactions(hash);
-    return txs.find(tx => tx.txid === txid) || null;
-  }
-
   /**
    * Get 15 blocks
    * 
@@ -1328,7 +1101,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,
@@ -1340,18 +1112,16 @@ class Blocks {
         if (cleanBlock.fee_amt_percentiles === null) {
 
           let summary;
-          let summaryVersion = 0;
           if (config.MEMPOOL.BACKEND === 'esplora') {
             const txs = (await bitcoinApi.$getTxsForBlock(cleanBlock.hash)).map(tx => transactionUtils.extendTransaction(tx));
-            summary = this.summarizeBlockTransactions(cleanBlock.hash, cleanBlock.height, txs);
-            summaryVersion = 1;
+            summary = this.summarizeBlockTransactions(cleanBlock.hash, txs);
           } else {
             // Call Core RPC
             const block = await bitcoinClient.getBlock(cleanBlock.hash, 2);
             summary = this.summarizeBlock(block);
           }
 
-          await BlocksSummariesRepository.$saveTransactions(cleanBlock.height, cleanBlock.hash, summary.transactions, summaryVersion);
+          await BlocksSummariesRepository.$saveTransactions(cleanBlock.height, cleanBlock.hash, summary.transactions);
           cleanBlock.fee_amt_percentiles = await BlocksSummariesRepository.$getFeePercentilesByBlockId(cleanBlock.hash);
         }
         if (cleanBlock.fee_amt_percentiles !== null) {
@@ -1390,7 +1160,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 {
@@ -1398,14 +1168,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;
   }
@@ -1414,19 +1176,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);
@@ -1437,19 +1195,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> {
@@ -1462,36 +1215,6 @@ class Blocks {
       // not a fatal error, we'll try again next time the indexer runs
     }
   }
-
-  public async $getBlockDefinitionHashes(): Promise<string[] | null> {
-    try {
-      const [rows]: any = await database.query(`SELECT DISTINCT(definition_hash) FROM blocks`);
-      if (rows && Array.isArray(rows)) {
-        return rows.map(r => r.definition_hash);
-      } else {
-        logger.debug(`Unable to retreive list of blocks.definition_hash from db (no result)`);
-        return null;
-      }
-    } catch (e) {
-      logger.debug(`Unable to retreive list of blocks.definition_hash from db (exception: ${e})`);
-      return null;
-    }
-  }
-
-  public async $getBlocksByDefinitionHash(definitionHash: string): Promise<string[] | null> {
-    try {
-      const [rows]: any = await database.query(`SELECT hash FROM blocks WHERE definition_hash = ?`, [definitionHash]);
-      if (rows && Array.isArray(rows)) {
-        return rows.map(r => r.hash);
-      } else {
-        logger.debug(`Unable to retreive list of blocks for definition hash ${definitionHash} from db (no result)`);
-        return null;
-      }
-    } catch (e) {
-      logger.debug(`Unable to retreive list of blocks for definition hash ${definitionHash} from db (exception: ${e})`);
-      return null;
-    }
-  }
 }
 
 export default new Blocks();

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;
   }
 }
 

backend/src/api/common.ts

@@ -1,29 +1,9 @@
 import * as bitcoinjs from 'bitcoinjs-lib';
 import { Request } from 'express';
-import { EffectiveFeeStats, MempoolBlockWithTransactions, TransactionExtended, MempoolTransactionExtended, TransactionStripped, WorkingEffectiveFeeStats, TransactionClassified, TransactionFlags } from '../mempool.interfaces';
+import { Ancestor, CpfpInfo, CpfpSummary, CpfpCluster, EffectiveFeeStats, MempoolBlockWithTransactions, TransactionExtended, MempoolTransactionExtended, TransactionStripped, WorkingEffectiveFeeStats } 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 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'
@@ -79,8 +59,8 @@ export class Common {
     return arr;
   }
 
-  static findRbfTransactions(added: MempoolTransactionExtended[], deleted: MempoolTransactionExtended[], forceScalable = false): { [txid: string]: { replaced: MempoolTransactionExtended[], replacedBy: TransactionExtended }} {
-    const matches: { [txid: string]: { replaced: MempoolTransactionExtended[], replacedBy: TransactionExtended }} = {};
+  static findRbfTransactions(added: MempoolTransactionExtended[], deleted: MempoolTransactionExtended[], forceScalable = false): { [txid: string]: MempoolTransactionExtended[] } {
+    const matches: { [txid: string]: MempoolTransactionExtended[] } = {};
 
     // For small N, a naive nested loop is extremely fast, but it doesn't scale
     if (added.length < 1000 && deleted.length < 50 && !forceScalable) {
@@ -95,7 +75,7 @@ export class Common {
               addedTx.vin.some((vin) => vin.txid === deletedVin.txid && vin.vout === deletedVin.vout));
             });
         if (foundMatches?.length) {
-          matches[addedTx.txid] = { replaced: [...new Set(foundMatches)], replacedBy: addedTx };
+          matches[addedTx.txid] = [...new Set(foundMatches)];
         }
       });
     } else {
@@ -123,7 +103,7 @@ export class Common {
             foundMatches.add(deletedTx);
           }
           if (foundMatches.size) {
-            matches[addedTx.txid] = { replaced: [...foundMatches], replacedBy: addedTx };
+            matches[addedTx.txid] = [...foundMatches];
           }
         }
       }
@@ -138,17 +118,17 @@ export class Common {
       const replaced: Set<MempoolTransactionExtended> = new Set();
       for (let i = 0; i < tx.vin.length; i++) {
         const vin = tx.vin[i];
-        const key = `${vin.txid}:${vin.vout}`;
-        const match = spendMap.get(key);
+        const match = spendMap.get(`${vin.txid}:${vin.vout}`);
         if (match && match.txid !== tx.txid) {
           replaced.add(match);
           // remove this tx from the spendMap
           // prevents the same tx being replaced more than once
           for (const replacedVin of match.vin) {
-            const replacedKey = `${replacedVin.txid}:${replacedVin.vout}`;
-            spendMap.delete(replacedKey);
+            const key = `${replacedVin.txid}:${replacedVin.vout}`;
+            spendMap.delete(key);
           }
         }
+        const key = `${vin.txid}:${vin.vout}`;
         spendMap.delete(key);
       }
       if (replaced.size) {
@@ -158,484 +138,6 @@ export class Common {
     return matches;
   }
 
-  static setSchnorrSighashFlags(flags: bigint, witness: string[]): bigint {
-    // no witness items
-    if (!witness?.length) {
-      return flags;
-    }
-    const hasAnnex = witness.length > 1 && witness[witness.length - 1].startsWith('50');
-    if (witness?.length === (hasAnnex ? 2 : 1)) {
-      // keypath spend, signature is the only witness item
-      if (witness[0].length === 130) {
-        flags |= this.setSighashFlags(flags, witness[0]);
-      } else {
-        flags |= TransactionFlags.sighash_default;
-      }
-    } else {
-      // scriptpath spend, all items except for the script, control block and annex could be signatures
-      for (let i = 0; i < witness.length - (hasAnnex ? 3 : 2); i++) {
-        // handle probable signatures
-        if (witness[i].length === 130) {
-          flags |= this.setSighashFlags(flags, witness[i]);
-        } else if (witness[i].length === 128) {
-          flags |= TransactionFlags.sighash_default;
-        }
-      }
-    }
-    return flags;
-  }
-
-  static isDERSig(w: string): boolean {
-    // heuristic to detect probable DER signatures
-    return (w.length >= 18
-      && w.startsWith('30') // minimum DER signature length is 8 bytes + sighash flag (see https://mempool.space/testnet/tx/c6c232a36395fa338da458b86ff1327395a9afc28c5d2daa4273e410089fd433)
-      && ['01', '02', '03', '81', '82', '83'].includes(w.slice(-2)) // signature must end with a valid sighash flag
-      && (w.length === (2 * parseInt(w.slice(2, 4), 16)) + 6) // second byte encodes the combined length of the R and S components
-    );
-  }
-
-  /**
-   * 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)
-   *
-   * As standardness rules change, we'll need to apply the rules in force *at the time* to older blocks.
-   * For now, just pull out individual rules into versioned functions where necessary.
-   */
-  static isNonStandard(tx: TransactionExtended, height?: number): boolean {
-    // version
-    if (this.isNonStandardVersion(tx, height)) {
-      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;
-      } else if (this.isNonStandardAnchor(tx, height)) {
-        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;
-  }
-
-  // Individual versioned standardness rules
-
-  static V3_STANDARDNESS_ACTIVATION_HEIGHT = {
-    'testnet4': 42_000,
-    'testnet': 2_900_000,
-    'signet': 211_000,
-    '': 863_500,
-  };
-  static isNonStandardVersion(tx: TransactionExtended, height?: number): boolean {
-    let TX_MAX_STANDARD_VERSION = 3;
-    if (
-      height != null
-      && this.V3_STANDARDNESS_ACTIVATION_HEIGHT[config.MEMPOOL.NETWORK]
-      && height <= this.V3_STANDARDNESS_ACTIVATION_HEIGHT[config.MEMPOOL.NETWORK]
-    ) {
-      // V3 transactions were non-standard to spend before v28.x (scheduled for 2024/09/30 https://github.com/bitcoin/bitcoin/issues/29891)
-      TX_MAX_STANDARD_VERSION = 2;
-    }
-
-    if (tx.version > TX_MAX_STANDARD_VERSION) {
-      return true;
-    }
-    return false;
-  }
-
-  static ANCHOR_STANDARDNESS_ACTIVATION_HEIGHT = {
-    'testnet4': 42_000,
-    'testnet': 2_900_000,
-    'signet': 211_000,
-    '': 863_500,
-  };
-  static isNonStandardAnchor(tx: TransactionExtended, height?: number): boolean {
-    if (
-      height != null
-      && this.ANCHOR_STANDARDNESS_ACTIVATION_HEIGHT[config.MEMPOOL.NETWORK]
-      && height <= this.ANCHOR_STANDARDNESS_ACTIVATION_HEIGHT[config.MEMPOOL.NETWORK]
-    ) {
-      // anchor outputs were non-standard to spend before v28.x (scheduled for 2024/09/30 https://github.com/bitcoin/bitcoin/issues/29891)
-      return true;
-    }
-    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)) {
-        flags |= this.setSighashFlags(flags, w);
-      }
-    }
-    return flags;
-  }
-
-  static setLegacySighashFlags(flags: bigint, scriptsig_asm: string): bigint {
-    for (const item of scriptsig_asm.split(' ')) {
-      // skip op_codes
-      if (item.startsWith('OP_')) {
-        continue;
-      }
-      // check pushed data
-      if (this.isDERSig(item)) {
-        flags |= this.setSighashFlags(flags, item);
-      }
-    }
-    return flags;
-  }
-
-  static setSighashFlags(flags: bigint, signature: string): bigint {
-    switch(signature.slice(-2)) {
-      case '01': return flags | TransactionFlags.sighash_all;
-      case '02': return flags | TransactionFlags.sighash_none;
-      case '03': return flags | TransactionFlags.sighash_single;
-      case '81': return flags | TransactionFlags.sighash_all | TransactionFlags.sighash_acp;
-      case '82': return flags | TransactionFlags.sighash_none | TransactionFlags.sighash_acp;
-      case '83': return flags | TransactionFlags.sighash_single | TransactionFlags.sighash_acp;
-      default: return flags | TransactionFlags.sighash_default; // taproot only
-    }
-  }
-
-  static isBurnKey(pubkey: string): boolean {
-    return [
-      '022222222222222222222222222222222222222222222222222222222222222222',
-      '033333333333333333333333333333333333333333333333333333333333333333',
-      '020202020202020202020202020202020202020202020202020202020202020202',
-      '030303030303030303030303030303030303030303030303030303030303030303',
-    ].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, height?: number): 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;
-    }
-
-    // Already processed static flags, no need to do it again
-    if (tx.flags) {
-      return Number(flags);
-    }
-
-    // Process static flags
-    if (tx.version === 1) {
-      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 inValues = {};
-    const outValues = {};
-    let rbf = false;
-    for (const vin of tx.vin) {
-      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);
-            }
-          } 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
-          }
-        }
-      }
-
-      // sighash flags
-      if (vin.prevout?.scriptpubkey_type === 'v1_p2tr') {
-        flags |= this.setSchnorrSighashFlags(flags, vin.witness);
-      } else if (vin.witness) {
-        flags |= this.setSegwitSighashFlags(flags, vin.witness);
-      } else if (vin.scriptsig?.length) {
-        flags |= this.setLegacySighashFlags(flags, vin.scriptsig_asm || transactionUtils.convertScriptSigAsm(vin.scriptsig));
-      }
-
-      if (vin.prevout?.scriptpubkey_address) {
-        reusedInputAddresses[vin.prevout?.scriptpubkey_address] = (reusedInputAddresses[vin.prevout?.scriptpubkey_address] || 0) + 1;
-      }
-      inValues[vin.prevout?.value || Math.random()] = (inValues[vin.prevout?.value || Math.random()] || 0) + 1;
-    }
-    if (rbf) {
-      flags |= TransactionFlags.rbf;
-    } else {
-      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));
-        } break;
-        case 'multisig': {
-          flags |= TransactionFlags.p2ms;
-          // detect fake pubkeys (i.e. not valid DER points on the secp256k1 curve)
-          const asm = vout.scriptpubkey_asm || transactionUtils.convertScriptSigAsm(vout.scriptpubkey);
-          for (const key of (asm?.split(' ') || [])) {
-            if (!hasFakePubkey && !key.startsWith('OP_')) {
-              hasFakePubkey = hasFakePubkey || this.isBurnKey(key) || !isPoint(key);
-            }
-          }
-        } 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; break;
-        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;
-      }
-      outValues[vout.value || Math.random()] = (outValues[vout.value || Math.random()] || 0) + 1;
-    }
-    if (hasFakePubkey) {
-      flags |= TransactionFlags.fake_pubkey;
-    }
-
-    // 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;
-    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;
-    }
-    // more than 5:1 input:output ratio
-    if (tx.vin.length / tx.vout.length >= 5) {
-      flags |= TransactionFlags.consolidation;
-    }
-    // less than 1:5 input:output ratio
-    if (tx.vin.length / tx.vout.length <= 0.2) {
-      flags |= TransactionFlags.batch_payout;
-    }
-
-    if (this.isNonStandard(tx, height)) {
-      flags |= TransactionFlags.nonstandard;
-    }
-
-    return Number(flags);
-  }
-
-  static classifyTransaction(tx: TransactionExtended, height?: number): TransactionClassified {
-    let flags = 0;
-    try {
-      flags = Common.getTransactionFlags(tx, height);
-    } catch (e) {
-      logger.warn('Failed to add classification flags to transaction: ' + (e instanceof Error ? e.message : e));
-    }
-    tx.flags = flags;
-    return {
-      ...Common.stripTransaction(tx),
-      flags,
-    };
-  }
-
-  static classifyTransactions(txs: TransactionExtended[], height?: number): TransactionClassified[] {
-    return txs.map(tx => Common.classifyTransaction(tx, height));
-  }
-
   static stripTransaction(tx: TransactionExtended): TransactionStripped {
     return {
       txid: tx.txid,
@@ -644,12 +146,11 @@ 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,
     };
   }
 
   static stripTransactions(txs: TransactionExtended[]): TransactionStripped[] {
-    return txs.map(Common.stripTransaction);
+    return txs.map(this.stripTransaction);
   }
 
   static sleep$(ms: number): Promise<void> {
@@ -667,6 +168,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;
@@ -722,13 +286,6 @@ export class Common {
     );
   }
 
-  static gogglesIndexingEnabled(): boolean {
-    return (
-      Common.blocksSummariesIndexingEnabled() &&
-      config.MEMPOOL.GOGGLES_INDEXING === true
-    );
-  }
-
   static cpfpIndexingEnabled(): boolean {
     return (
       Common.indexingEnabled() &&
@@ -856,6 +413,87 @@ export class Common {
     }
   }
 
+  static calculateCpfp(height: number, transactions: TransactionExtended[]): CpfpSummary {
+    const clusters: CpfpCluster[] = []; // list of all cpfp clusters in this block
+    const clusterMap: { [txid: string]: CpfpCluster } = {}; // map transactions to their cpfp cluster
+    let clusterTxs: TransactionExtended[] = []; // working list of elements of the current cluster
+    let ancestors: { [txid: string]: boolean } = {}; // working set of ancestors of the current cluster root
+    const txMap = {};
+    // initialize the txMap
+    for (const tx of transactions) {
+      txMap[tx.txid] = tx;
+    }
+    // reverse pass to identify CPFP clusters
+    for (let i = transactions.length - 1; i >= 0; i--) {
+      const tx = transactions[i];
+      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;
+        }
+      }
+    }
+    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);
 
@@ -863,10 +501,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;
@@ -933,33 +570,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
 

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;
-}

backend/src/api/database-migration.ts

@@ -7,7 +7,7 @@ import cpfpRepository from '../repositories/CpfpRepository';
 import { RowDataPacket } from 'mysql2';
 
 class DatabaseMigration {
-  private static currentVersion = 95;
+  private static currentVersion = 66;
   private queryTimeout = 3600_000;
   private statisticsAddedIndexed = false;
   private uniqueLogs: string[] = [];
@@ -558,578 +558,6 @@ class DatabaseMigration {
       await this.$executeQuery('ALTER TABLE `statistics` ADD min_fee FLOAT UNSIGNED DEFAULT NULL');
       await this.updateToSchemaVersion(66);
     }
-
-    if (databaseSchemaVersion < 67  && isBitcoin === true) {
-      await this.$executeQuery('ALTER TABLE `blocks_summaries` ADD version INT NOT NULL DEFAULT 0');
-      await this.$executeQuery('ALTER TABLE `blocks_summaries` ADD INDEX `version` (`version`)');
-      await this.$executeQuery('ALTER TABLE `blocks_templates` ADD version INT NOT NULL DEFAULT 0');
-      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);
-    }
-
-    if (databaseSchemaVersion < 82 && isBitcoin === true && config.MEMPOOL.NETWORK === 'mainnet') {
-      await this.$fixBadV1AuditBlocks();
-      await this.updateToSchemaVersion(82);
-    }
-
-    if (databaseSchemaVersion < 83 && isBitcoin === true) {
-      await this.$executeQuery('ALTER TABLE `blocks` ADD first_seen datetime(6) DEFAULT NULL');
-      await this.updateToSchemaVersion(83);
-    }
-
-    // add new pools indexes
-    if (databaseSchemaVersion < 84 && isBitcoin === true) {
-      await this.$executeQuery(`
-        ALTER TABLE \`pools\`
-          ADD INDEX \`slug\` (\`slug\`),
-          ADD INDEX \`unique_id\` (\`unique_id\`)
-      `);
-      await this.updateToSchemaVersion(84);
-    }
-
-    // lightning channels indexes
-    if (databaseSchemaVersion < 85 && isBitcoin === true) {
-      await this.$executeQuery(`
-        ALTER TABLE \`channels\`
-          ADD INDEX \`created\` (\`created\`),
-          ADD INDEX \`capacity\` (\`capacity\`),
-          ADD INDEX \`closing_reason\` (\`closing_reason\`),
-          ADD INDEX \`closing_resolved\` (\`closing_resolved\`)
-      `);
-      await this.updateToSchemaVersion(85);
-    }
-
-    // lightning nodes indexes
-    if (databaseSchemaVersion < 86 && isBitcoin === true) {
-      await this.$executeQuery(`
-        ALTER TABLE \`nodes\`
-          ADD INDEX \`status\` (\`status\`),
-          ADD INDEX \`channels\` (\`channels\`),
-          ADD INDEX \`country_id\` (\`country_id\`),
-          ADD INDEX \`as_number\` (\`as_number\`),
-          ADD INDEX \`first_seen\` (\`first_seen\`)
-      `);
-      await this.updateToSchemaVersion(86);
-    }
-
-    // lightning node sockets indexes
-    if (databaseSchemaVersion < 87 && isBitcoin === true) {
-      await this.$executeQuery('ALTER TABLE `nodes_sockets` ADD INDEX `type` (`type`)');
-      await this.updateToSchemaVersion(87);
-    }
-
-    // lightning stats indexes
-    if (databaseSchemaVersion < 88 && isBitcoin === true) {
-      await this.$executeQuery('ALTER TABLE `lightning_stats` ADD INDEX `added` (`added`)');
-      await this.updateToSchemaVersion(88);
-    }
-
-    // geo names indexes
-    if (databaseSchemaVersion < 89 && isBitcoin === true) {
-      await this.$executeQuery('ALTER TABLE `geo_names` ADD INDEX `names` (`names`)');
-      await this.updateToSchemaVersion(89);
-    }
-
-    // hashrates indexes
-    if (databaseSchemaVersion < 90 && isBitcoin === true) {
-      await this.$executeQuery('ALTER TABLE `hashrates` ADD INDEX `type` (`type`)');
-      await this.updateToSchemaVersion(90);
-    }
-
-    // block audits indexes
-    if (databaseSchemaVersion < 91 && isBitcoin === true) {
-      await this.$executeQuery('ALTER TABLE `blocks_audits` ADD INDEX `time` (`time`)');
-      await this.updateToSchemaVersion(91);
-    }
-
-    // elements_pegs indexes
-    if (databaseSchemaVersion < 92 && config.MEMPOOL.NETWORK === 'liquid') {
-      await this.$executeQuery(`
-        ALTER TABLE \`elements_pegs\`
-          ADD INDEX \`block\` (\`block\`),
-          ADD INDEX \`datetime\` (\`datetime\`),
-          ADD INDEX \`amount\` (\`amount\`),
-          ADD INDEX \`bitcoinaddress\` (\`bitcoinaddress\`),
-          ADD INDEX \`bitcointxid\` (\`bitcointxid\`)
-      `);
-      await this.updateToSchemaVersion(92);
-    }
-
-    // federation_txos indexes
-    if (databaseSchemaVersion < 93 && config.MEMPOOL.NETWORK === 'liquid') {
-      await this.$executeQuery(`
-        ALTER TABLE \`federation_txos\`
-          ADD INDEX \`unspent\` (\`unspent\`),
-          ADD INDEX \`lastblockupdate\` (\`lastblockupdate\`),
-          ADD INDEX \`blocktime\` (\`blocktime\`),
-          ADD INDEX \`emergencyKey\` (\`emergencyKey\`),
-          ADD INDEX \`expiredAt\` (\`expiredAt\`)
-      `);
-      await this.updateToSchemaVersion(93);
-    }
-
-    // Unify database schema for all mempool netwoks
-    // versions above 94 should not use network-specific flags
-    if (databaseSchemaVersion < 94) {
-
-      if (!isBitcoin) {
-        // Apply all the bitcoin specific migrations to non-bitcoin networks: liquid, liquidtestnet and testnet4 (!)
-        // Version 5
-        await this.$executeQuery('ALTER TABLE blocks ADD `reward` double unsigned NOT NULL DEFAULT "0"');
-
-        // Version 6
-        await this.$executeQuery('ALTER TABLE blocks MODIFY `height` integer unsigned NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE blocks MODIFY `tx_count` smallint unsigned NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE blocks MODIFY `size` integer unsigned NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE blocks MODIFY `weight` integer unsigned NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE blocks MODIFY `difficulty` double NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE blocks DROP FOREIGN KEY IF EXISTS `blocks_ibfk_1`');
-        await this.$executeQuery('ALTER TABLE pools MODIFY `id` smallint unsigned AUTO_INCREMENT');
-        await this.$executeQuery('ALTER TABLE blocks MODIFY `pool_id` smallint unsigned NULL');
-        await this.$executeQuery('ALTER TABLE blocks ADD FOREIGN KEY (`pool_id`) REFERENCES `pools` (`id`)');
-        await this.$executeQuery('ALTER TABLE blocks ADD `version` integer unsigned NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE blocks ADD `bits` integer unsigned NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE blocks ADD `nonce` bigint unsigned NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE blocks ADD `merkle_root` varchar(65) NOT NULL DEFAULT ""');
-        await this.$executeQuery('ALTER TABLE blocks ADD `previous_block_hash` varchar(65) NULL');
-
-        // Version 7
-        await this.$executeQuery('DROP table IF EXISTS hashrates;');
-        await this.$executeQuery(this.getCreateDailyStatsTableQuery(), await this.$checkIfTableExists('hashrates'));
-
-        // Version 8
-        await this.$executeQuery('ALTER TABLE `hashrates` DROP INDEX `PRIMARY`');
-        await this.$executeQuery('ALTER TABLE `hashrates` ADD `id` int NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST');
-        await this.$executeQuery('ALTER TABLE `hashrates` ADD `share` float NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE `hashrates` ADD `type` enum("daily", "weekly") DEFAULT "daily"');
-
-        // Version 9
-        await this.$executeQuery('ALTER TABLE `state` CHANGE `name` `name` varchar(100)');
-        await this.$executeQuery('ALTER TABLE `hashrates` ADD UNIQUE `hashrate_timestamp_pool_id` (`hashrate_timestamp`, `pool_id`)');
-
-        // Version 10
-        await this.$executeQuery('ALTER TABLE `blocks` ADD INDEX `blockTimestamp` (`blockTimestamp`)');
-
-        // Version 11
-        await this.$executeQuery(`ALTER TABLE blocks
-          ADD avg_fee INT UNSIGNED NULL,
-          ADD avg_fee_rate INT UNSIGNED NULL
-        `);
-        await this.$executeQuery('ALTER TABLE blocks MODIFY `reward` BIGINT UNSIGNED NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE blocks MODIFY `median_fee` INT UNSIGNED NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE blocks MODIFY `fees` INT UNSIGNED NOT NULL DEFAULT "0"');
-
-        // Version 12
-        await this.$executeQuery('ALTER TABLE blocks MODIFY `fees` BIGINT UNSIGNED NOT NULL DEFAULT "0"');
-
-        // Version 13
-        await this.$executeQuery('ALTER TABLE blocks MODIFY `difficulty` DOUBLE UNSIGNED NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE blocks MODIFY `median_fee` BIGINT UNSIGNED NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE blocks MODIFY `avg_fee` BIGINT UNSIGNED NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE blocks MODIFY `avg_fee_rate` BIGINT UNSIGNED NOT NULL DEFAULT "0"');
-
-        // Version 14
-        await this.$executeQuery('ALTER TABLE `hashrates` DROP FOREIGN KEY `hashrates_ibfk_1`');
-        await this.$executeQuery('ALTER TABLE `hashrates` MODIFY `pool_id` SMALLINT UNSIGNED NOT NULL DEFAULT "0"');
-
-        // Version 17
-        await this.$executeQuery('ALTER TABLE `pools` ADD `slug` CHAR(50) NULL');
-
-        // Version 18
-        await this.$executeQuery('ALTER TABLE `blocks` ADD INDEX `hash` (`hash`);');
-
-        // Version 20
-        await this.$executeQuery(this.getCreateBlocksSummariesTableQuery(), await this.$checkIfTableExists('blocks_summaries'));
-
-        // Version 22
-        await this.$executeQuery('DROP TABLE IF EXISTS `difficulty_adjustments`');
-        await this.$executeQuery(this.getCreateDifficultyAdjustmentsTableQuery(), await this.$checkIfTableExists('difficulty_adjustments'));
-
-        // Version 24
-        await this.$executeQuery('DROP TABLE IF EXISTS `blocks_audits`');
-        await this.$executeQuery(this.getCreateBlocksAuditsTableQuery(), await this.$checkIfTableExists('blocks_audits'));
-
-        // Version 25
-        await this.$executeQuery(this.getCreateLightningStatisticsQuery(), await this.$checkIfTableExists('lightning_stats'));
-        await this.$executeQuery(this.getCreateNodesQuery(), await this.$checkIfTableExists('nodes'));
-        await this.$executeQuery(this.getCreateChannelsQuery(), await this.$checkIfTableExists('channels'));
-        await this.$executeQuery(this.getCreateNodesStatsQuery(), await this.$checkIfTableExists('node_stats'));
-
-        // Version 26
-        await this.$executeQuery('ALTER TABLE `lightning_stats` ADD tor_nodes int(11) NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE `lightning_stats` ADD clearnet_nodes int(11) NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE `lightning_stats` ADD unannounced_nodes int(11) NOT NULL DEFAULT "0"');
-
-        // Version 27
-        await this.$executeQuery('ALTER TABLE `lightning_stats` ADD avg_capacity bigint(20) unsigned NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE `lightning_stats` ADD avg_fee_rate int(11) unsigned NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE `lightning_stats` ADD avg_base_fee_mtokens bigint(20) unsigned NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE `lightning_stats` ADD med_capacity bigint(20) unsigned NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE `lightning_stats` ADD med_fee_rate int(11) unsigned NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE `lightning_stats` ADD med_base_fee_mtokens bigint(20) unsigned NOT NULL DEFAULT "0"');
-
-        // Version 28
-        await this.$executeQuery(`ALTER TABLE lightning_stats MODIFY added DATE`);
-
-        // Version 29
-        await this.$executeQuery(this.getCreateGeoNamesTableQuery(), await this.$checkIfTableExists('geo_names'));
-        await this.$executeQuery('ALTER TABLE `nodes` ADD as_number int(11) unsigned NULL DEFAULT NULL');
-        await this.$executeQuery('ALTER TABLE `nodes` ADD city_id int(11) unsigned NULL DEFAULT NULL');
-        await this.$executeQuery('ALTER TABLE `nodes` ADD country_id int(11) unsigned NULL DEFAULT NULL');
-        await this.$executeQuery('ALTER TABLE `nodes` ADD accuracy_radius int(11) unsigned NULL DEFAULT NULL');
-        await this.$executeQuery('ALTER TABLE `nodes` ADD subdivision_id int(11) unsigned NULL DEFAULT NULL');
-        await this.$executeQuery('ALTER TABLE `nodes` ADD longitude double NULL DEFAULT NULL');
-        await this.$executeQuery('ALTER TABLE `nodes` ADD latitude double NULL DEFAULT NULL');
-
-        // Version 30
-        await this.$executeQuery('ALTER TABLE `geo_names` CHANGE `type` `type` enum("city","country","division","continent","as_organization") NOT NULL');
-
-        // Version 31
-        await this.$executeQuery('ALTER TABLE `prices` ADD `id` int NULL AUTO_INCREMENT UNIQUE');
-        await this.$executeQuery('DROP TABLE IF EXISTS `blocks_prices`');
-        await this.$executeQuery(this.getCreateBlocksPricesTableQuery(), await this.$checkIfTableExists('blocks_prices'));
-
-        // Version 32
-        await this.$executeQuery('ALTER TABLE `blocks_summaries` ADD `template` JSON DEFAULT "[]"');
-
-        // Version 33
-        await this.$executeQuery('ALTER TABLE `geo_names` CHANGE `type` `type` enum("city","country","division","continent","as_organization", "country_iso_code") NOT NULL');
-
-        // Version 34
-        await this.$executeQuery('ALTER TABLE `lightning_stats` ADD clearnet_tor_nodes int(11) NOT NULL DEFAULT "0"');
-    
-        // Version 35
-        await this.$executeQuery('DELETE from `lightning_stats` WHERE added > "2021-09-19"');
-        await this.$executeQuery('ALTER TABLE `lightning_stats` ADD CONSTRAINT added_unique UNIQUE (added);');
-
-        // Version 36
-        await this.$executeQuery('ALTER TABLE `nodes` ADD status TINYINT NOT NULL DEFAULT "1"');
-    
-        // Version 37
-        await this.$executeQuery(this.getCreateLNNodesSocketsTableQuery(), await this.$checkIfTableExists('nodes_sockets'));
-        
-        // Version 38
-        await this.$executeQuery(`TRUNCATE lightning_stats`);
-        await this.$executeQuery(`TRUNCATE node_stats`);
-        await this.$executeQuery('ALTER TABLE `lightning_stats` CHANGE `added` `added` timestamp NULL');
-        await this.$executeQuery('ALTER TABLE `node_stats` CHANGE `added` `added` timestamp NULL');
-        await this.updateToSchemaVersion(38);
-      
-        // Version 39
-        await this.$executeQuery('ALTER TABLE `nodes` ADD alias_search TEXT NULL DEFAULT NULL AFTER `alias`');
-        await this.$executeQuery('ALTER TABLE nodes ADD FULLTEXT(alias_search)');
-
-        // Version 40
-        await this.$executeQuery('ALTER TABLE `nodes` ADD capacity bigint(20) unsigned DEFAULT NULL');
-        await this.$executeQuery('ALTER TABLE `nodes` ADD channels int(11) unsigned DEFAULT NULL');
-        await this.$executeQuery('ALTER TABLE `nodes` ADD INDEX `capacity` (`capacity`);');
-
-        // Version 41
-        await this.$executeQuery('UPDATE channels SET closing_reason = NULL WHERE closing_reason = 1');
-
-        // Version 42
-        await this.$executeQuery('ALTER TABLE `channels` ADD closing_resolved tinyint(1) DEFAULT 0');
-      
-        // Version 43
-        await this.$executeQuery(this.getCreateLNNodeRecordsTableQuery(), await this.$checkIfTableExists('nodes_records'));
-
-        // Version 44
-        await this.$executeQuery('UPDATE blocks_summaries SET template = NULL');
-
-        // Version 45
-        await this.$executeQuery('ALTER TABLE `blocks_audits` ADD fresh_txs JSON DEFAULT "[]"');
-    
-        // Version 48
-        await this.$executeQuery('ALTER TABLE `channels` ADD source_checked tinyint(1) DEFAULT 0');
-        await this.$executeQuery('ALTER TABLE `channels` ADD closing_fee bigint(20) unsigned DEFAULT 0');
-        await this.$executeQuery('ALTER TABLE `channels` ADD node1_funding_balance bigint(20) unsigned DEFAULT 0');
-        await this.$executeQuery('ALTER TABLE `channels` ADD node2_funding_balance bigint(20) unsigned DEFAULT 0');
-        await this.$executeQuery('ALTER TABLE `channels` ADD node1_closing_balance bigint(20) unsigned DEFAULT 0');
-        await this.$executeQuery('ALTER TABLE `channels` ADD node2_closing_balance bigint(20) unsigned DEFAULT 0');
-        await this.$executeQuery('ALTER TABLE `channels` ADD funding_ratio float unsigned DEFAULT NULL');
-        await this.$executeQuery('ALTER TABLE `channels` ADD closed_by varchar(66) DEFAULT NULL');
-        await this.$executeQuery('ALTER TABLE `channels` ADD single_funded tinyint(1) DEFAULT 0');
-        await this.$executeQuery('ALTER TABLE `channels` ADD outputs JSON DEFAULT "[]"');
-
-        // Version 57
-        await this.$executeQuery(`ALTER TABLE nodes MODIFY updated_at datetime NULL`);
-
-        // Version 60
-        await this.$executeQuery('ALTER TABLE `blocks_audits` ADD sigop_txs JSON DEFAULT "[]"');
-
-        // Version 61
-        if (! await this.$checkIfTableExists('blocks_templates')) {
-          await this.$executeQuery('CREATE TABLE blocks_templates AS SELECT id, template FROM blocks_summaries WHERE template != "[]"');
-        }
-        await this.$executeQuery('ALTER TABLE blocks_templates MODIFY template JSON DEFAULT "[]"');
-        await this.$executeQuery('ALTER TABLE blocks_templates ADD PRIMARY KEY (id)');
-        await this.$executeQuery('ALTER TABLE blocks_summaries DROP COLUMN template');
-
-        // Version 62
-        await this.$executeQuery('ALTER TABLE `blocks_audits` ADD expected_fees BIGINT UNSIGNED DEFAULT NULL');
-        await this.$executeQuery('ALTER TABLE `blocks_audits` ADD expected_weight BIGINT UNSIGNED DEFAULT NULL');
-      
-        // Version 63
-        await this.$executeQuery('ALTER TABLE `blocks_audits` ADD fullrbf_txs JSON DEFAULT "[]"');
-    
-        // Version 64
-        await this.$executeQuery('ALTER TABLE `nodes` ADD features text NULL');
-    
-        // Version 65
-        await this.$executeQuery('ALTER TABLE `blocks_audits` ADD accelerated_txs JSON DEFAULT "[]"');
-
-        // Version 67
-        await this.$executeQuery('ALTER TABLE `blocks_summaries` ADD version INT NOT NULL DEFAULT 0');
-        await this.$executeQuery('ALTER TABLE `blocks_summaries` ADD INDEX `version` (`version`)');
-        await this.$executeQuery('ALTER TABLE `blocks_templates` ADD version INT NOT NULL DEFAULT 0');
-        await this.$executeQuery('ALTER TABLE `blocks_templates` ADD INDEX `version` (`version`)');
-
-        // Version 76
-        await this.$executeQuery('ALTER TABLE `blocks_audits` ADD prioritized_txs JSON DEFAULT "[]"');
-
-        // Version 81
-        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 "[]"');
-
-        // Version 83
-        await this.$executeQuery('ALTER TABLE `blocks` ADD first_seen datetime(6) DEFAULT NULL');
-
-        // Version 84
-        await this.$executeQuery(`
-          ALTER TABLE \`pools\`
-            ADD INDEX \`slug\` (\`slug\`),
-            ADD INDEX \`unique_id\` (\`unique_id\`)
-        `);
-
-        // Version 85
-        await this.$executeQuery(`
-          ALTER TABLE \`channels\`
-            ADD INDEX \`created\` (\`created\`),
-            ADD INDEX \`capacity\` (\`capacity\`),
-            ADD INDEX \`closing_reason\` (\`closing_reason\`),
-            ADD INDEX \`closing_resolved\` (\`closing_resolved\`)
-        `);
-        
-        // Version 86        
-        await this.$executeQuery(`
-          ALTER TABLE \`nodes\`
-            ADD INDEX \`status\` (\`status\`),
-            ADD INDEX \`channels\` (\`channels\`),
-            ADD INDEX \`country_id\` (\`country_id\`),
-            ADD INDEX \`as_number\` (\`as_number\`),
-            ADD INDEX \`first_seen\` (\`first_seen\`)
-        `);
-
-        // Version 87
-        await this.$executeQuery('ALTER TABLE `nodes_sockets` ADD INDEX `type` (`type`)');
-        await this.updateToSchemaVersion(87);
-        
-        // Version 88
-        await this.$executeQuery('ALTER TABLE `lightning_stats` ADD INDEX `added` (`added`)');
-    
-        // Version 89
-        await this.$executeQuery('ALTER TABLE `geo_names` ADD INDEX `names` (`names`)');
-    
-        // Version 90
-        await this.$executeQuery('ALTER TABLE `hashrates` ADD INDEX `type` (`type`)');
-
-        // Version 91
-        await this.$executeQuery('ALTER TABLE `blocks_audits` ADD INDEX `time` (`time`)');
-      }
-      
-      if (config.MEMPOOL.NETWORK !== 'liquid') {
-        // Apply all the liquid specific migrations to all other networks
-        // Version 68
-        await this.$executeQuery('ALTER TABLE elements_pegs ADD PRIMARY KEY (txid, txindex);');
-        await this.$executeQuery(this.getCreateFederationAddressesTableQuery(), await this.$checkIfTableExists('federation_addresses'));
-        await this.$executeQuery(this.getCreateFederationTxosTableQuery(), await this.$checkIfTableExists('federation_txos'));
-
-        // Version 71
-        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');
-
-        // Version 92
-        await this.$executeQuery(`
-          ALTER TABLE \`elements_pegs\`
-            ADD INDEX \`block\` (\`block\`),
-            ADD INDEX \`datetime\` (\`datetime\`),
-            ADD INDEX \`amount\` (\`amount\`),
-            ADD INDEX \`bitcoinaddress\` (\`bitcoinaddress\`),
-            ADD INDEX \`bitcointxid\` (\`bitcointxid\`)
-        `);
-    
-        // Version 93
-        await this.$executeQuery(`
-          ALTER TABLE \`federation_txos\`
-            ADD INDEX \`unspent\` (\`unspent\`),
-            ADD INDEX \`lastblockupdate\` (\`lastblockupdate\`),
-            ADD INDEX \`blocktime\` (\`blocktime\`),
-            ADD INDEX \`emergencyKey\` (\`emergencyKey\`),
-            ADD INDEX \`expiredAt\` (\`expiredAt\`)
-        `);
-      }
-
-      if (config.MEMPOOL.NETWORK !== 'mainnet') {
-        // Apply all the mainnet specific migrations to all other networks
-        // Version 69
-        await this.$executeQuery(this.getCreateAccelerationsTableQuery(), await this.$checkIfTableExists('accelerations'));
-
-        // Version 70
-        await this.$executeQuery('ALTER TABLE accelerations MODIFY COLUMN added DATETIME;');
-
-        // Version 77
-        await this.$executeQuery('ALTER TABLE `accelerations` ADD requested datetime DEFAULT NULL');
-      }
-      await this.updateToSchemaVersion(94);
-    }
-
-    // blocks pools-v2.json hash
-    if (databaseSchemaVersion < 95) {
-      let poolJsonSha = 'f737d86571d190cf1a1a3cf5fd86b33ba9624254';
-      const [poolJsonShaDb]: any[] = await DB.query(`SELECT string FROM state WHERE name = 'pools_json_sha'`);
-      if (poolJsonShaDb?.length > 0) {
-        poolJsonSha = poolJsonShaDb[0].string;
-      }
-      await this.$executeQuery(`ALTER TABLE blocks ADD definition_hash varchar(255) NOT NULL DEFAULT "${poolJsonSha}"`);
-      await this.$executeQuery('ALTER TABLE blocks ADD INDEX `definition_hash` (`definition_hash`)');
-      await this.updateToSchemaVersion(95);
-    }
   }
 
   /**
@@ -1377,32 +805,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,
@@ -1673,23 +1075,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);
@@ -1744,28 +1129,6 @@ class DatabaseMigration {
       logger.warn(`Failed to migrate cpfp transaction data`);
     }
   }
-
-  private async $fixBadV1AuditBlocks(): Promise<void> {
-    const badBlocks = [
-      '000000000000000000011ad49227fc8c9ba0ca96ad2ebce41a862f9a244478dc',
-      '000000000000000000010ac1f68b3080153f2826ffddc87ceffdd68ed97d6960',
-      '000000000000000000024cbdafeb2660ae8bd2947d166e7fe15d1689e86b2cf7',
-      '00000000000000000002e1dbfbf6ae057f331992a058b822644b368034f87286',
-      '0000000000000000000019973b2778f08ad6d21e083302ff0833d17066921ebb',
-    ];
-
-    for (const hash of badBlocks) {
-      try {
-        await this.$executeQuery(`
-          UPDATE blocks_audits
-          SET prioritized_txs = '[]'
-          WHERE hash = '${hash}'
-        `, true);
-      } catch (e) {
-        continue;
-      }
-    }
-  }
 }
 
 export default new DatabaseMigration();

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
     );
   }

backend/src/api/disk-cache.ts

@@ -256,8 +256,6 @@ class DiskCache {
           txs: rbfData.rbf.txs.map(([txid, entry]) => ({ value: entry })),
           trees: rbfData.rbf.trees,
           expiring: rbfData.rbf.expiring.map(([txid, value]) => ({ key: txid, value })),
-          mempool: memPool.getMempool(),
-          spendMap: memPool.getSpendMap(),
         });
       }
     } catch (e) {

backend/src/api/explorer/channels.api.ts

@@ -81,7 +81,7 @@ class ChannelsApi {
   public async $searchChannelsById(search: string): Promise<any[]> {
     try {
       // restrict search to valid id/short_id prefix formats
-      let searchStripped = search.match(/^[0-9]+[0-9x]*$/)?.[0] || '';
+      let searchStripped = search.match(/[0-9]+[0-9x]*/)?.[0] || '';
       if (!searchStripped.length) {
         return [];
       }

backend/src/api/explorer/channels.routes.ts

@@ -1,9 +1,6 @@
 import config from '../../config';
 import { Application, Request, Response } from 'express';
 import channelsApi from './channels.api';
-import { handleError } from '../../utils/api';
-
-const TXID_REGEX = /^[a-f0-9]{64}$/i;
 
 class ChannelsRoutes {
   constructor() { }
@@ -25,7 +22,7 @@ class ChannelsRoutes {
       const channels = await channelsApi.$searchChannelsById(req.params.search);
       res.json(channels);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to search channels by id');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -41,7 +38,7 @@ class ChannelsRoutes {
       res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
       res.json(channel);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get channel');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -56,12 +53,10 @@ class ChannelsRoutes {
       const status: string = typeof req.query.status === 'string' ? req.query.status : '';
 
       if (index < -1) {
-        handleError(req, res, 400, 'Invalid index');
-        return;
+        res.status(400).send('Invalid index');
       }
       if (['open', 'active', 'closed'].includes(status) === false) {
-        handleError(req, res, 400, 'Invalid status');
-        return;
+        res.status(400).send('Invalid status');
       }
 
       const channels = await channelsApi.$getChannelsForNode(req.query.public_key, index, 10, status);
@@ -72,23 +67,20 @@ class ChannelsRoutes {
       res.header('X-Total-Count', channelsCount.toString());
       res.json(channels);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get channels for node');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
   private async $getChannelsByTransactionIds(req: Request, res: Response): Promise<void> {
     try {
       if (!Array.isArray(req.query.txId)) {
-        handleError(req, res, 400, 'Not an array');
+        res.status(400).send('Not an array');
         return;
       }
       const txIds: string[] = [];
       for (const _txId in req.query.txId) {
         if (typeof req.query.txId[_txId] === 'string') {
-          const txid = req.query.txId[_txId].toString();
-          if (TXID_REGEX.test(txid)) {
-            txIds.push(txid);
-          }
+          txIds.push(req.query.txId[_txId].toString());
         }
       }
       const channels = await channelsApi.$getChannelsByTransactionId(txIds);
@@ -113,7 +105,7 @@ class ChannelsRoutes {
 
       res.json(result);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get channels by transaction ids');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -125,7 +117,7 @@ class ChannelsRoutes {
       res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
       res.json(channels);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get penalty closed channels');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -138,7 +130,7 @@ class ChannelsRoutes {
       res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
       res.json(channels);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get channel geodata');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 

backend/src/api/explorer/general.routes.ts

@@ -3,8 +3,6 @@ import { Application, Request, Response } from 'express';
 import nodesApi from './nodes.api';
 import channelsApi from './channels.api';
 import statisticsApi from './statistics.api';
-import { handleError } from '../../utils/api';
-
 class GeneralLightningRoutes {
   constructor() { }
 
@@ -29,7 +27,7 @@ class GeneralLightningRoutes {
         channels: channels,
       });
     } catch (e) {
-      handleError(req, res, 500, 'Failed to search for nodes and channels');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -43,7 +41,7 @@ class GeneralLightningRoutes {
       res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
       res.json(statistics);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get lightning statistics');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -52,7 +50,7 @@ class GeneralLightningRoutes {
       const statistics = await statisticsApi.$getLatestStatistics();
       res.json(statistics);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get lightning statistics');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 }

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) {

backend/src/api/explorer/nodes.routes.ts

@@ -3,7 +3,6 @@ import { Application, Request, Response } from 'express';
 import nodesApi from './nodes.api';
 import DB from '../../database';
 import { INodesRanking } from '../../mempool.interfaces';
-import { handleError } from '../../utils/api';
 
 class NodesRoutes {
   constructor() { }
@@ -32,7 +31,7 @@ class NodesRoutes {
       const nodes = await nodesApi.$searchNodeByPublicKeyOrAlias(req.params.search);
       res.json(nodes);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to search for node');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -49,14 +48,6 @@ class NodesRoutes {
             '032850492ee61a5f7006a2fda6925e4b4ec3782f2b6de2ff0e439ef5a38c3b2470',
             '022c80bace98831c44c32fb69755f2b353434e0ee9e7fbda29507f7ef8abea1421',
             '02c3559c833e6f99f9ca05fe503e0b4e7524dea9121344edfd3e811101e0c28680',
-            '02b36a324fa2dd3af2a63ac65f241907882829bed5002b4e14171d25c219e0d470',
-            '0231b6e8f21f9f6c057f6bf8a812f79e396ee16a66ece91939a1576ce9fb9e87a5',
-            '034b6aac206bffcbd651b7ead1ab8a0991c945dfafe19ff27dcdeadc6843ebd15c',
-            '039c065f7e344acd969ebdd4a94550915b6f24e8782ae2be540bb96c8a4fcfb86b',
-            '03d9f9f4803fc75920f14dd13d83fbecc53229a65d4ee4cd2d86fdf211f7337576',
-            '0357fe48c4dece744f70865eda66e396aab5d05e09e1145cd3b7da83f11446d4cf',
-            '02bca4d642eda631f2c8659758e2a2868e518b93503f2bfcd767749c6530a10679',
-            '03f32c99c0bb9f62dae53671d1d300565773455248f34134cc02779b881561174e',
             '032c7c7819276c4f706a04df1a0f1e10a5495994a7be4c1d3d28ca766e5a2b957b',
             '025a7e38c2834dd843591a4d23d5f09cdeb77ddca85f673c2d944a14220ff14cf7',
             '0395e2731a1673ef21d7a16a727c4fc4d4c35a861c428ce2c819c53d2b81c8bd55',
@@ -69,14 +60,6 @@ class NodesRoutes {
             '039c14fdec2d958e3d14cebf657451bbd9e039196615785e82c917f274e3fb2205',
             '033589bbcb233ffc416cefd5437c7f37e9d7cb7942d405e39e72c4c846d9b37f18',
             '029293110441c6e2eacb57e1255bf6ef05c41a6a676fe474922d33c19f98a7d584',
-            '038eb09bed4532ff36d12acc1279f55cbe8d95212d19f809e057bb50de00051fba',
-            '027b7c0278366a0268e8bd0072b14539f6cb455a7bd588ae22d888bed541f65311',
-            '02f4dd78f6eda8838029b2cdbaaea6e875e2fa373cd348ee41a7c1bb177d3fca66',
-            '036b3fb692da214a3edaac5b67903b958f5ccd8712e09aa61b67ea7acfd94b40c2',
-            '023bc8915d308e0b65f8de6867f95960141372436fce3edad5cec3f364d6ac948f',
-            '0341690503ef21d0e203dddd9e62646380d0dfc32c499e055e7f698b9064d1c736',
-            '0355d573805c018a37a5b2288378d70e9b5b438f7394abd6f467cb9b47c90eeb93',
-            '0361aa68deb561a8b47b41165848edcccb98a1b56a5ea922d9d5b30a09bb7282ea',
             '0235ad0b56ed8c42c4354444c24e971c05e769ec0b5fb0ccea42880095dc02ea2c',
             '029700819a37afea630f80e6cc461f3fd3c4ace2598a21cfbbe64d1c78d0ee69a5',
             '02c2d8b2dbf87c7894af2f1d321290e2fe6db5446cd35323987cee98f06e2e0075',
@@ -93,14 +76,6 @@ class NodesRoutes {
             '0243348cb3741cfe2d8485fa8375c29c7bc7cbb67577c363cb6987a5e5fd0052cc',
             '02cb73e631af44bee600d80f8488a9194c9dc5c7590e575c421a070d1be05bc8e9',
             '0306f55ee631aa1e2cd4d9b2bfcbc14404faec5c541cef8b2e6f779061029d09c4',
-            '030bbbd8495561a894e301fe6ba5b22f8941fc661cc0e673e0206158231d8ac130',
-            '03ee1f08e516ed083475f39c6cae4fa1eec686d004d2f105218269e27d7f2da5a4',
-            '028c378b998f476ed22d6815c170dd2a3388a43fdf791a7cff70b9997349b8447a',
-            '036f19f044d19cb1b04f14d91b6e7e5443ce337217a8c14d43861f3e86dd07bd7f',
-            '03058d61869e8b88436493648b2e3e530627edf5a0b253c285cd565c1477a5c237',
-            '0279dfedc87b47a941f1797f2c422c03aa3108914ea6b519d76537d60860535a9a',
-            '0353486b8016761e58ec8aee7305ee58d5dc66b55ef5bd8cbaf49508f66d52d62e',
-            '03df5db8eccfabcae47ff15553cfdecb2d3f56979f43a0c3578f28d056b5e35104',
             '03ddab321b760433cbf561b615ef62ac7d318630c5f51d523aaf5395b90b751956',
             '033d92c7bfd213ef1b34c90e985fb5dc77f9ec2409d391492484e57a44c4aca1de',
             '02ad010dda54253c1eb9efe38b0760657a3b43ecad62198c359c051c9d99d45781',
@@ -113,14 +88,6 @@ class NodesRoutes {
             '038310e3a786340f2bd7770704c7ccfe560fd163d9a1c99d67894597419d12cbf7',
             '03e5e9d879b72c7d67ecd483bae023bd33e695bb32b981a4021260f7b9d62bc761',
             '028d16e1a0ace4c0c0a421536d8d32ce484dfe6e2f726b7b0e7c30f12a195f8cc7',
-            '0326cf9a4ca67a5b9cdffae57293dbd6f7c5113b93010dc6f6fe4af3afde1a1739',
-            '034867e16f62cebb8c2c2c22b91117c173bbece9c8a1e5bd001374a3699551cd8f',
-            '038dfb1f1b637a8c27e342ffc6f9feca20e0b47be3244e09ae78df4998e2ae83b9',
-            '03cb1cea3394d973355c11bc61c2f689f9d3e1c3db60d205f27770f5ad83200f77',
-            '03535447b592cbdb153189b3e06a455452b1011380cb3e6511a31090c15d8efc9f',
-            '028e90e9984d262ebfa3c23fb3f335a2ae061a0bdedee03f45f72b438d9e7d2ce3',
-            '03ee0176289dc4a6111fa5ef22eed5273758c420fbe58cc1d2d76def75dd7e640c',
-            '0370b2cd9f0eaf436d5c25c93fb39210d8cc06b31f688fc2f54418aabe394aed79',
             '02ff690d06c187ab994bf83c5a2114fe5bf50112c2c817af0f788f736be9fa2070',
             '02a9f570c51a2526a5ee85802e88f9281bed771eb66a0c8a7d898430dd5d0eae45',
             '038c3de773255d3bd7a50e31e58d423baac5c90826a74d75e64b74c95475de1097',
@@ -137,14 +104,6 @@ class NodesRoutes {
             '03229ab4b7f692753e094b93df90530150680f86b535b5183b0cffd75b3df583fc',
             '03a696eb7acde991c1be97a58a9daef416659539ae462b897f5e9ae361f990228e',
             '0248bf26cf3a63ab8870f34dc0ec9e6c8c6288cdba96ba3f026f34ec0f13ac4055',
-            '021b28ecdd782fd909705d6be354db268977b1a2ac5a5275186fc19e08bb8fca93',
-            '031bec1fbd8eb7fe94d2bda108c9c3cc8c22ecfc1c3a5c11d36f5881b01b4a81a6',
-            '03879c4f827a3188574d5757e002f574265a966d70aea942169785b31369b067d5',
-            '0228d4b5a4fd73a03967b76f8b8cb37b9d0b6e7039126a9397bb732c15bed78e9b',
-            '03f58dbb629f4427f5a1dbc02e6a7ec79345fdf13a0e4163d4f3b7aea2539cf095',
-            '021cdcb8123aa670cdfc9f43909dbb297363c093883409e9e7fc82e7267f7c72bd',
-            '02f2aa2c2b7b432a70dc4d0b04afa19d48715ed3b90594d49c1c8744f2e9ebb030',
-            '03709a02fb3ab4857689a8ea0bd489a6ab6f56f8a397be578bc6d5ad22efbe3756',
             '03fbc17549ec667bccf397ababbcb4cdc0e3394345e4773079ab2774612ec9be61',
             '03da9a8623241ccf95f19cd645c6cecd4019ac91570e976eb0a128bebbc4d8a437',
             '03ca5340cf85cb2e7cf076e489f785410838de174e40be62723e8a60972ad75144',
@@ -157,14 +116,6 @@ class NodesRoutes {
             '02b6b1640fe029e304c216951af9fbefdb23b0bdc9baaf327540d31b6107841fdf',
             '03694289827203a5b3156d753071ddd5bf92e371f5a462943f9555eef6d2d6606c',
             '0283d850db7c3e8ea7cc9c4abc7afaab12bbdf72b677dcba1d608350d2537d7d43',
-            '03b4dda7878d3b7b71ecd6d4738322c7f9a9c1fb583374d2724f4ccc4947f37570',
-            '0279a35f05b5acf159429549e56fd426685c4fec191431c58738968bbc77a39f25',
-            '03cb102d796ddcf08610cd03fae8b7a1df69ff48e9e8a152af315f9edf71762eb8',
-            '036b89526f4d5ac4c317f4fd23cb9f8e4ad844498bc7950a41114d060101d995d4',
-            '0313eade145959d7036db009fd5b0bf1947a739c7c3c790b491ec9161b94e6ad1e',
-            '02b670ca4c4bb2c5ea89c3b691da98a194cfc48fcd5c072df02a20290bddd60610',
-            '02a9196d5e08598211397a83cf013a5962b84bd61198abfdd204dff987e54f7a0d',
-            '036d015cd2f486fb38348182980b7e596e6c9733873102ea126fed7b4152be03b8',
             '02521287789f851268a39c9eccc9d6180d2c614315b583c9e6ae0addbd6d79df06',
             '0258c2a7b7f8af2585b4411b1ec945f70988f30412bb1df179de941f14d0b1bc3e',
             '03c3389ff1a896f84d921ed01a19fc99c6724ce8dc4b960cd3b7b2362b62cd60d7',
@@ -182,13 +133,13 @@ class NodesRoutes {
           }
         } catch (e) {}
       }
-
+      
       res.header('Pragma', 'public');
       res.header('Cache-control', 'public');
       res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
       res.json(nodes);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get node group');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -196,7 +147,7 @@ class NodesRoutes {
     try {
       const node = await nodesApi.$getNode(req.params.public_key);
       if (!node) {
-        handleError(req, res, 404, 'Node not found');
+        res.status(404).send('Node not found');
         return;
       }
       res.header('Pragma', 'public');
@@ -204,7 +155,7 @@ class NodesRoutes {
       res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
       res.json(node);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get node');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -216,7 +167,7 @@ class NodesRoutes {
       res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
       res.json(statistics);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get historical node stats');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -224,7 +175,7 @@ class NodesRoutes {
     try {
       const node = await nodesApi.$getFeeHistogram(req.params.public_key);
       if (!node) {
-        handleError(req, res, 404, 'Node not found');
+        res.status(404).send('Node not found');
         return;
       }
       res.header('Pragma', 'public');
@@ -232,7 +183,7 @@ class NodesRoutes {
       res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
       res.json(node);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get fee histogram');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -248,7 +199,7 @@ class NodesRoutes {
         topByChannels: topChannelsNodes,
       });
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get nodes ranking');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -260,7 +211,7 @@ class NodesRoutes {
       res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
       res.json(topCapacityNodes);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get top nodes by capacity');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -272,7 +223,7 @@ class NodesRoutes {
       res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
       res.json(topCapacityNodes);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get top nodes by channels');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -284,7 +235,7 @@ class NodesRoutes {
       res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
       res.json(topCapacityNodes);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get oldest nodes');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -296,7 +247,7 @@ class NodesRoutes {
       res.setHeader('Expires', new Date(Date.now() + 1000 * 600).toUTCString());
       res.json(nodesPerAs);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get ISP ranking');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -308,7 +259,7 @@ class NodesRoutes {
       res.setHeader('Expires', new Date(Date.now() + 1000 * 600).toUTCString());
       res.json(worldNodes);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get world nodes');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -323,7 +274,7 @@ class NodesRoutes {
       );
 
       if (country.length === 0) {
-        handleError(req, res, 404, `This country does not exist or does not host any lightning nodes on clearnet`);
+        res.status(404).send(`This country does not exist or does not host any lightning nodes on clearnet`);
         return;
       }
 
@@ -336,7 +287,7 @@ class NodesRoutes {
         nodes: nodes,
       });
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get nodes per country');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -350,7 +301,7 @@ class NodesRoutes {
       );
 
       if (isp.length === 0) {
-        handleError(req, res, 404, `This ISP does not exist or does not host any lightning nodes on clearnet`);
+        res.status(404).send(`This ISP does not exist or does not host any lightning nodes on clearnet`);
         return;
       }
 
@@ -363,7 +314,7 @@ class NodesRoutes {
         nodes: nodes,
       });
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get nodes per ISP');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -375,7 +326,7 @@ class NodesRoutes {
       res.setHeader('Expires', new Date(Date.now() + 1000 * 600).toUTCString());
       res.json(nodesPerAs);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get nodes per country');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 }

backend/src/api/fee-api.ts

@@ -1,10 +1,8 @@
 import { MempoolBlock } from '../mempool.interfaces';
-import config from '../config';
+import { Common } from './common';
 import mempool from './mempool';
 import projectedBlocks from './mempool-blocks';
 
-const isLiquid = config.MEMPOOL.NETWORK === 'liquid' || config.MEMPOOL.NETWORK === 'liquidtestnet';
-
 interface RecommendedFees {
   fastestFee: number,
   halfHourFee: number,
@@ -16,8 +14,8 @@ interface RecommendedFees {
 class FeeApi {
   constructor() { }
 
-  defaultFee = isLiquid ? 0.1 : 1;
-  minimumIncrement = isLiquid ? 0.1 : 1;
+  defaultFee = Common.isLiquid() ? 0.1 : 1;
+  minimumIncrement = Common.isLiquid() ? 0.1 : 1;
 
   public getRecommendedFee(): RecommendedFees {
     const pBlocks = projectedBlocks.getMempoolBlocks();
@@ -39,25 +37,15 @@ class FeeApi {
     const secondMedianFee = pBlocks[1] ? this.optimizeMedianFee(pBlocks[1], pBlocks[2], firstMedianFee) : this.defaultFee;
     const thirdMedianFee = pBlocks[2] ? this.optimizeMedianFee(pBlocks[2], pBlocks[3], secondMedianFee) : this.defaultFee;
 
-    let fastestFee = Math.max(minimumFee, firstMedianFee);
-    let halfHourFee = Math.max(minimumFee, secondMedianFee);
-    let hourFee = Math.max(minimumFee, thirdMedianFee);
-    const economyFee = Math.max(minimumFee, Math.min(2 * minimumFee, thirdMedianFee));
-
-    // ensure recommendations always increase w/ priority
-    fastestFee = Math.max(fastestFee, halfHourFee, hourFee, economyFee);
-    halfHourFee = Math.max(halfHourFee, hourFee, economyFee);
-    hourFee = Math.max(hourFee, economyFee);
-
     // explicitly enforce a minimum of ceil(mempoolminfee) on all recommendations.
     // simply rounding up recommended rates is insufficient, as the purging rate
     // can exceed the median rate of projected blocks in some extreme scenarios
     // (see https://bitcoin.stackexchange.com/a/120024)
     return {
-      'fastestFee': fastestFee,
-      'halfHourFee': halfHourFee,
-      'hourFee': hourFee,
-      'economyFee': economyFee,
+      'fastestFee': Math.max(minimumFee, firstMedianFee),
+      'halfHourFee': Math.max(minimumFee, secondMedianFee),
+      'hourFee': Math.max(minimumFee, thirdMedianFee),
+      'economyFee': Math.max(minimumFee, Math.min(2 * minimumFee, thirdMedianFee)),
       'minimumFee': minimumFee,
     };
   }

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();

backend/src/api/liquid/liquid.routes.ts

@@ -3,7 +3,6 @@ import { Application, Request, Response } from 'express';
 import config from '../../config';
 import elementsParser from './elements-parser';
 import icons from './icons';
-import { handleError } from '../../utils/api';
 
 class LiquidRoutes {
   public initRoutes(app: Application) {
@@ -16,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)
         ;
     }
   }
@@ -43,7 +28,7 @@ class LiquidRoutes {
       res.setHeader('content-length', result.length);
       res.send(result);
     } else {
-      handleError(req, res, 404, 'Asset icon not found');
+      res.status(404).send('Asset icon not found');
     }
   }
 
@@ -52,7 +37,7 @@ class LiquidRoutes {
     if (result) {
       res.json(result);
     } else {
-      handleError(req, res, 404, 'Asset icons not found');
+      res.status(404).send('Asset icons not found');
     }
   }
 
@@ -78,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) {
-      handleError(req, res, 500, 'Failed to get pegs by month');
+      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) {
-      handleError(req, res, 500, 'Failed to get reserves by month');
-    }
-  }
-
-  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) {
-      handleError(req, res, 500, 'Failed to get pegs');
-    }
-  }
-
-  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) {
-      handleError(req, res, 500, 'Failed to get reserves');
-    }
-  }
-
-  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) {
-      handleError(req, res, 500, 'Failed to get federation audit status');
-    }
-  }
-
-  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) {
-      handleError(req, res, 500, 'Failed to get federation addresses');
-    }
-  }
-
-  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) {
-      handleError(req, res, 500, 'Failed to get federation addresses');
-    }
-  }
-
-  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) {
-      handleError(req, res, 500, 'Failed to get federation utxos');
-    }
-  }
-
-  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) {
-      handleError(req, res, 500, 'Failed to get expired utxos');
-    }
-  }
-
-  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) {
-      handleError(req, res, 500, 'Failed to get federation utxos number');
-    }
-  }
-
-  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) {
-      handleError(req, res, 500, 'Failed to get emergency spent utxos');
-    }
-  }
-
-  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) {
-      handleError(req, res, 500, 'Failed to get emergency spent utxos stats');
-    }
-  }
-
-  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) {
-      handleError(req, res, 500, 'Failed to get pegs list');
-    }
-  }
-
-  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) {
-      handleError(req, res, 500, 'Failed to get pegs volume daily');
-    }
-  }
-
-  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) {
-      handleError(req, res, 500, 'Failed to get pegs count');
-    }
-  }
-
 }
 
 export default new LiquidRoutes();

backend/src/api/mempool-blocks.ts

@@ -1,13 +1,11 @@
 import { GbtGenerator, GbtResult, ThreadTransaction as RustThreadTransaction, ThreadAcceleration as RustThreadAcceleration } from 'rust-gbt';
 import logger from '../logger';
-import { MempoolBlock, MempoolTransactionExtended, MempoolBlockWithTransactions, MempoolBlockDelta, Ancestor, CompactThreadTransaction, EffectiveFeeStats, TransactionClassified, TransactionCompressed, MempoolDeltaChange, GbtCandidates, PoolTag } from '../mempool.interfaces';
+import { MempoolBlock, MempoolTransactionExtended, TransactionStripped, MempoolBlockWithTransactions, MempoolBlockDelta, Ancestor, CompactThreadTransaction, EffectiveFeeStats, PoolTag } from '../mempool.interfaces';
 import { Common, OnlineFeeStatsCalculator } from './common';
 import config from '../config';
 import { Worker } from 'worker_threads';
 import path from 'path';
 import mempool from './mempool';
-import { Acceleration } from './services/acceleration';
-import PoolsRepository from '../repositories/PoolsRepository';
 
 const MAX_UINT32 = Math.pow(2, 32) - 1;
 
@@ -16,13 +14,10 @@ class MempoolBlocks {
   private mempoolBlockDeltas: MempoolBlockDelta[] = [];
   private txSelectionWorker: Worker | null = null;
   private rustInitialized: boolean = false;
-  private rustGbtGenerator: GbtGenerator = new GbtGenerator(config.MEMPOOL.BLOCK_WEIGHT_UNITS, config.MEMPOOL.MEMPOOL_BLOCKS_AMOUNT);
+  private rustGbtGenerator: GbtGenerator = new GbtGenerator();
 
   private nextUid: number = 1;
   private uidMap: Map<number, string> = new Map(); // map short numerical uids to full txids
-  private txidMap: Map<string, number> = new Map(); // map full txids back to short numerical uids
-
-  private pools: { [id: number]: PoolTag } = {};
 
   public getMempoolBlocks(): MempoolBlock[] {
     return this.mempoolBlocks.map((block) => {
@@ -45,24 +40,138 @@ 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[] {
     const mempoolBlockDeltas: MempoolBlockDelta[] = [];
     for (let i = 0; i < Math.max(mempoolBlocks.length, prevBlocks.length); i++) {
-      let added: TransactionClassified[] = [];
+      let added: TransactionStripped[] = [];
       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 +194,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 +215,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 +224,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 +237,7 @@ class MempoolBlocks {
         };
         strippedMempool.set(entry.uid, stripped);
       }
-    }
+    });
 
     // (re)initialize tx selection worker thread
     if (!this.txSelectionWorker) {
@@ -161,7 +268,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 +279,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 +292,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 +320,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 +337,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 +366,15 @@ 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),
+      const { blocks, blockWeights, rates, clusters } = this.convertNapiResultTxids(
+        await rustGbt.make(Object.values(newMempool) as RustThreadTransaction[], convertedAccelerations as RustThreadAcceleration[], this.nextUid),
       );
       if (saveResults) {
         this.rustInitialized = true;
       }
-      const expectedSize = transactions.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);
+      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 +386,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,
@@ -324,21 +424,20 @@ class MempoolBlocks {
 
     // run the block construction algorithm in a separate thread, and wait for a result
     try {
-      const { blocks, blockWeights, rates, clusters, overflow } = this.convertNapiResultTxids(
+      const { blocks, blockWeights, rates, clusters } = 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`);
+      const resultMempoolSize = blocks.reduce((total, block) => total + block.length, 0);
+      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,27 +448,19 @@ 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, 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;
       }
     }
 
     const lastBlockIndex = blocks.length - 1;
     let hasBlockStack = blocks.length >= 8;
     let stackWeight;
-    let feeStatsCalculator: OnlineFeeStatsCalculator | null = null;
+    let feeStatsCalculator: OnlineFeeStatsCalculator | void;
     if (hasBlockStack) {
       if (blockWeights && blockWeights[7] !== null) {
         stackWeight = blockWeights[7];
@@ -380,36 +471,25 @@ class MempoolBlocks {
       feeStatsCalculator = new OnlineFeeStatsCalculator(stackWeight, 0.5, [10, 20, 30, 40, 50, 60, 70, 80, 90]);
     }
 
-    const ancestors: Ancestor[] = [];
-    const descendants: Ancestor[] = [];
-    let ancestor: MempoolTransactionExtended;
     for (const cluster of clusters) {
       for (const memberTxid of cluster) {
         const mempoolTx = mempool[memberTxid];
         if (mempoolTx) {
-          // ugly micro-optimization to avoid allocating new arrays
-          ancestors.length = 0;
-          descendants.length = 0;
+          const ancestors: Ancestor[] = [];
+          const descendants: Ancestor[] = [];
           let matched = false;
           cluster.forEach(txid => {
-            ancestor = mempool[txid];
             if (txid === memberTxid) {
               matched = true;
             } else {
-              if (!ancestor) {
-                console.log('txid missing from mempool! ', txid, candidates?.txs[txid]);
-                return;
-              }
               const relative = {
                 txid: txid,
-                fee: ancestor.fee,
-                weight: (ancestor.adjustedVsize * 4),
+                fee: mempool[txid].fee,
+                weight: (mempool[txid].adjustedVsize * 4),
               };
               if (matched) {
                 descendants.push(relative);
-                if (!mempoolTx.lastBoosted || (ancestor.firstSeen && ancestor.firstSeen > mempoolTx.lastBoosted)) {
-                  mempoolTx.lastBoosted = ancestor.firstSeen;
-                }
+                mempoolTx.lastBoosted = Math.max(mempoolTx.lastBoosted || 0, mempool[txid].firstSeen || 0);
               } else {
                 ancestors.push(relative);
               }
@@ -418,92 +498,59 @@ class MempoolBlocks {
           if (mempoolTx.ancestors?.length !== ancestors.length || mempoolTx.descendants?.length !== descendants.length) {
             mempoolTx.cpfpDirty = true;
           }
-          // ugly micro-optimization to avoid allocating new arrays or objects
-          if (mempoolTx.ancestors) {
-            mempoolTx.ancestors.length = 0;
-          } else {
-            mempoolTx.ancestors = [];
-          }
-          if (mempoolTx.descendants) {
-            mempoolTx.descendants.length = 0;
-          } else {
-            mempoolTx.descendants = [];
-          }
-          mempoolTx.ancestors.push(...ancestors);
-          mempoolTx.descendants.push(...descendants);
-          mempoolTx.cpfpChecked = true;
+          Object.assign(mempoolTx, {ancestors, descendants, bestDescendant: null, cpfpChecked: true});
         }
       }
     }
 
-    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
     let mempoolTx: MempoolTransactionExtended;
-    let acceleration: Acceleration;
-    const mempoolBlocks: MempoolBlockWithTransactions[] = [];
-    for (let blockIndex = 0; blockIndex < blocks.length; blockIndex++) {
-      const block = blocks[blockIndex];
+    const mempoolBlocks: MempoolBlockWithTransactions[] = blocks.map((block, blockIndex) => {
       let totalSize = 0;
       let totalVsize = 0;
       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 (let i = 0; i < block.length; i++) {
-        const txid = block[i];
-        if (txid in mempool) {
+      for (const txid of block) {
+        if (txid) {
           mempoolTx = mempool[txid];
           // save position in projected blocks
           mempoolTx.position = {
             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;
+          }
 
-          if (txid in accelerations) {
-            acceleration = accelerations[txid];
-            if (isAcceleratedBy[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 (!(ancestor.txid in mempool)) {
-                  continue;
-                }
-                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;
-              }
-            } else {
-              if (mempoolTx.acceleration) {
-                mempoolTx.cpfpDirty = true;
-                delete mempoolTx.acceleration;
+          const acceleration = accelerations[txid];
+          if (isAccelerated[txid] || (acceleration && (!accelerationPool || acceleration.pools.includes(accelerationPool)))) {
+            if (!mempoolTx.acceleration) {
+              mempoolTx.cpfpDirty = true;
+            }
+            mempoolTx.acceleration = true;
+            for (const ancestor of mempoolTx.ancestors || []) {
+              if (!mempool[ancestor.txid].acceleration) {
+                mempool[ancestor.txid].cpfpDirty = true;
               }
+              mempool[ancestor.txid].acceleration = true;
+              isAccelerated[ancestor.txid] = true;
             }
           } else {
             if (mempoolTx.acceleration) {
               mempoolTx.cpfpDirty = true;
-              delete mempoolTx.acceleration;
             }
+            delete mempoolTx.acceleration;
           }
 
           // online calculation of stack-of-blocks fee stats
@@ -521,7 +568,7 @@ class MempoolBlocks {
           }
         }
       }
-      mempoolBlocks[blockIndex] = this.dataToMempoolBlocks(
+      return this.dataToMempoolBlocks(
         block,
         transactions,
         totalSize,
@@ -529,13 +576,12 @@ class MempoolBlocks {
         totalFees,
         (hasBlockStack && blockIndex === lastBlockIndex && feeStatsCalculator) ? feeStatsCalculator.getRawFeeStats() : undefined,
       );
-    };
+    });
 
     if (saveResults) {
       const deltas = this.calculateMempoolDeltas(this.mempoolBlocks, mempoolBlocks);
       this.mempoolBlocks = mempoolBlocks;
       this.mempoolBlockDeltas = deltas;
-      this.updateAccelerationPositions(mempool, accelerations, mempoolBlocks);
     }
 
     return mempoolBlocks;
@@ -543,7 +589,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,
@@ -553,44 +599,36 @@ class MempoolBlocks {
       medianFee: feeStats.medianFee, // Common.percentile(transactions.map((tx) => tx.effectiveFeePerVsize), config.MEMPOOL.RECOMMENDED_FEE_PERCENTILE),
       feeRange: feeStats.feeRange, //Common.getFeesInRange(transactions, rangeLength),
       transactionIds: transactionIds,
-      transactions: transactions.map((tx) => Common.classifyTransaction(tx)),
+      transactions: transactions.map((tx) => Common.stripTransaction(tx)),
     };
   }
 
   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);
     }
   }
 
@@ -619,8 +657,8 @@ class MempoolBlocks {
     return { blocks: convertedBlocks, rates: convertedRates, clusters: convertedClusters } as { blocks: string[][], rates: { [root: string]: number }, clusters: { [root: string]: string[] }};
   }
 
-  private convertNapiResultTxids({ blocks, blockWeights, rates, clusters, overflow }: GbtResult)
-    : { blocks: string[][], blockWeights: number[], rates: [string, number][], clusters: string[][], overflow: string[] } {
+  private convertNapiResultTxids({ blocks, blockWeights, rates, clusters }: GbtResult)
+    : { blocks: string[][], blockWeights: number[], rates: [string, number][], clusters: string[][] } {
     const convertedBlocks: string[][] = blocks.map(block => block.map(uid => {
       const txid = this.uidMap.get(uid);
       if (txid !== undefined) {
@@ -638,167 +676,7 @@ class MempoolBlocks {
     for (const cluster of clusters) {
       convertedClusters.push(cluster.map(uid => this.uidMap.get(uid)) as string[]);
     }
-    const convertedOverflow: string[] = overflow.map(uid => {
-      const txid = this.uidMap.get(uid);
-      if (txid !== undefined) {
-        return txid;
-      } else {
-        throw new Error('GBT returned an unmineable transaction with unknown uid');
-      }
-    });
-    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 }[] } = {};
-    // keep track of simulated mempool blocks for each active pool
-    const pools: {
-      [pool: string]: { name: string, block: number, vsize: number, accelerations: string[], complete: boolean };
-    } = {};
-    // prepare a list of accelerations in ascending order (we'll pop items off the end of the list)
-    const accQueue: { acceleration: Acceleration, rate: number, vsize: number }[] = Object.values(accelerations).filter(acc => acc.txid in mempoolCache).map(acc => {
-      let vsize = mempoolCache[acc.txid].vsize;
-      for (const ancestor of mempoolCache[acc.txid].ancestors || []) {
-        vsize += (ancestor.weight / 4);
-      }
-      return {
-        acceleration: acc,
-        rate: mempoolCache[acc.txid].effectiveFeePerVsize,
-        vsize
-      };
-    }).sort((a, b) => a.rate - b.rate);
-    // initialize the pool tracker
-    for (const { acceleration }  of accQueue) {
-      accelerationPositions[acceleration.txid] = [];
-      for (const pool of acceleration.pools) {
-        if (!pools[pool]) {
-          pools[pool] = {
-            name: this.pools[pool]?.name || 'unknown',
-            block: 0,
-            vsize: 0,
-            accelerations: [],
-            complete: false,
-          };
-        }
-        pools[pool].accelerations.push(acceleration.txid);
-      }
-      for (const ancestor of mempoolCache[acceleration.txid].ancestors || []) {
-        accelerationPositions[ancestor.txid] = [];
-      }
-    }
-
-    for (const pool of Object.keys(pools)) {
-      // if any pools accepted *every* acceleration, we can just use the GBT result positions directly
-      if (pools[pool].accelerations.length === Object.keys(accelerations).length) {
-        pools[pool].complete = true;
-      }
-    }
-
-    let block = 0;
-    let index = 0;
-    let next = accQueue.pop();
-    // build simulated blocks for each pool by taking the best option from
-    // either the mempool or the list of accelerations.
-    while (next && block < mempoolBlocks.length) {
-      while (next && index < mempoolBlocks[block].transactions.length) {
-        const nextTx = mempoolBlocks[block].transactions[index];
-        if (next.rate >= (nextTx.rate || (nextTx.fee / nextTx.vsize))) {
-          for (const pool of next.acceleration.pools) {
-            if (pools[pool].vsize + next.vsize <= 999_000) {
-              pools[pool].vsize += next.vsize;
-            } else {
-              pools[pool].block++;
-              pools[pool].vsize = next.vsize;
-            }
-            // insert the acceleration into matching pool's blocks
-            if (pools[pool].complete && mempoolCache[next.acceleration.txid]?.position !== undefined) {
-              accelerationPositions[next.acceleration.txid].push({
-                ...mempoolCache[next.acceleration.txid].position as { block: number, vsize: number },
-                poolId: pool,
-                pool: pools[pool].name
-              });
-            } else {
-              accelerationPositions[next.acceleration.txid].push({
-                poolId: pool,
-                pool: pools[pool].name,
-                block: pools[pool].block,
-                vsize: pools[pool].vsize - (next.vsize / 2),
-              });
-            }
-            // and any accelerated ancestors
-            for (const ancestor of mempoolCache[next.acceleration.txid].ancestors || []) {
-              if (pools[pool].complete && mempoolCache[ancestor.txid]?.position !== undefined) {
-                accelerationPositions[ancestor.txid].push({
-                  ...mempoolCache[ancestor.txid].position as { block: number, vsize: number },
-                  poolId: pool,
-                  pool: pools[pool].name,
-                });
-              } else {
-                accelerationPositions[ancestor.txid].push({
-                  poolId: pool,
-                  pool: pools[pool].name,
-                  block: pools[pool].block,
-                  vsize: pools[pool].vsize - (next.vsize / 2),
-                });
-              }
-            }
-          }
-          next = accQueue.pop();
-        } else {
-          // skip accelerated transactions and their CPFP ancestors
-          if (accelerationPositions[nextTx.txid] == null) {
-            // insert into all pools' blocks
-            for (const pool of Object.keys(pools)) {
-              if (pools[pool].vsize + nextTx.vsize <= 999_000) {
-                pools[pool].vsize += nextTx.vsize;
-              } else {
-                pools[pool].block++;
-                pools[pool].vsize = nextTx.vsize;
-              }
-            }
-          }
-          index++;
-        }
-      }
-      block++;
-      index = 0;
-    }
-    mempool.setAccelerationPositions(accelerationPositions);
+    return { blocks: convertedBlocks, blockWeights, rates: convertedRates, clusters: convertedClusters };
   }
 }
 

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';
@@ -10,26 +10,21 @@ import bitcoinClient from './bitcoin/bitcoin-client';
 import bitcoinSecondClient from './bitcoin/bitcoin-second-client';
 import rbfCache from './rbf-cache';
 import { Acceleration } from './services/acceleration';
-import accelerationApi 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 recentlyDeleted: MempoolTransactionExtended[][] = []; // buffer of transactions deleted in recent mempool updates
   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;
+    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 }[] } = {};
 
   private txPerSecondArray: number[] = [];
   private txPerSecond: number = 0;
@@ -45,8 +40,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);
   }
@@ -76,13 +69,12 @@ class Mempool {
   }
 
   public setMempoolChangedCallback(fn: (newMempool: { [txId: string]: MempoolTransactionExtended; },
-    newTransactions: MempoolTransactionExtended[], deletedTransactions: MempoolTransactionExtended[][], accelerationDelta: string[]) => void): void {
+    newTransactions: MempoolTransactionExtended[], deletedTransactions: MempoolTransactionExtended[], accelerationDelta: string[]) => void): void {
     this.mempoolChangedCallback = fn;
   }
 
   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;
   }
 
@@ -94,10 +86,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;
@@ -112,17 +100,10 @@ class Mempool {
       if (this.mempoolCache[txid].order == null) {
         this.mempoolCache[txid].order = transactionUtils.txidToOrdering(txid);
       }
-      for (const vin of this.mempoolCache[txid].vin) {
-        transactionUtils.addInnerScriptsToVin(vin);
-      }
       count++;
       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();
@@ -132,7 +113,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));
   }
@@ -175,10 +156,6 @@ class Mempool {
     return newTransactions;
   }
 
-  public getMempoolCandidates(): { [txid: string]: boolean } {
-    return this.mempoolCandidates;
-  }
-
   public async $updateMemPoolInfo() {
     this.mempoolInfo = await this.$getMempoolInfo();
   }
@@ -208,7 +185,7 @@ class Mempool {
     return txTimes;
   }
 
-  public async $updateMempool(transactions: string[], accelerations: Record<string, 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
@@ -349,30 +326,23 @@ 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);
 
-    const accelerationDelta = accelerations != null ? await this.updateAccelerations(accelerations) : [];
+    const accelerationDelta = accelerations != null ? await this.$updateAccelerations(accelerations) : [];
     if (accelerationDelta.length) {
       hasChange = true;
     }
 
     this.mempoolCacheDelta = Math.abs(transactions.length - newMempoolSize);
 
-    const candidatesChanged = candidates?.added?.length || candidates?.removed?.length;
-
-    this.recentlyDeleted.unshift(deletedTransactions);
-    this.recentlyDeleted.length = Math.min(this.recentlyDeleted.length, 10); // truncate to the last 10 mempool updates
-
-    if (this.mempoolChangedCallback && (hasChange || newTransactions.length || deletedTransactions.length)) {
-      this.mempoolChangedCallback(this.mempoolCache, newTransactions, this.recentlyDeleted, accelerationDelta);
+    if (this.mempoolChangedCallback && (hasChange || deletedTransactions.length)) {
+      this.mempoolChangedCallback(this.mempoolCache, newTransactions, deletedTransactions, accelerationDelta);
     }
-    if (this.$asyncMempoolChangedCallback && (hasChange || newTransactions.length || deletedTransactions.length || candidatesChanged)) {
+    if (this.$asyncMempoolChangedCallback && (hasChange || deletedTransactions.length)) {
       this.updateTimerProgress(timer, 'running async mempool callback');
-      await this.$asyncMempoolChangedCallback(this.mempoolCache, newMempoolSize, newTransactions, this.recentlyDeleted, accelerationDelta, candidates);
+      await this.$asyncMempoolChangedCallback(this.mempoolCache, newMempoolSize, newTransactions, deletedTransactions, accelerationDelta);
       this.updateTimerProgress(timer, 'completed async mempool callback');
     }
 
@@ -400,83 +370,64 @@ class Mempool {
     return this.accelerations;
   }
 
-  public updateAccelerations(newAccelerationMap: Record<string, Acceleration>): string[] {
-    try {
-      const accelerationDelta = accelerationApi.getAccelerationDelta(this.accelerations, newAccelerationMap);
-      this.accelerations = newAccelerationMap;
-      return accelerationDelta;
-    } catch (e: any) {
-      logger.debug(`Failed to update accelerations: ` + (e instanceof Error ? e.message : e));
+  public $updateAccelerations(newAccelerations: Acceleration[]): string[] {
+    if (!config.MEMPOOL_SERVICES.ACCELERATIONS) {
       return [];
     }
-  }
 
-  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]);
+    try {
+      const changed: string[] = [];
+
+      const newAccelerationMap: { [txid: string]: Acceleration } = {};
+      for (const acceleration of newAccelerations) {
+        newAccelerationMap[acceleration.txid] = acceleration;
+        if (this.accelerations[acceleration.txid] == null) {
+          // new acceleration
+          changed.push(acceleration.txid);
+        } else {
+          if (this.accelerations[acceleration.txid].feeDelta !== acceleration.feeDelta) {
+            // feeDelta changed
+            changed.push(acceleration.txid);
+          } else if (this.accelerations[acceleration.txid].pools?.length) {
+            let poolsChanged = false;
+            const pools = new Set();
+            this.accelerations[acceleration.txid].pools.forEach(pool => {
+              pools.add(pool);
+            });
+            acceleration.pools.forEach(pool => {
+              if (!pools.has(pool)) {
+                poolsChanged = true;
+              } else {
+                pools.delete(pool);
+              }
+            });
+            if (pools.size > 0) {
+              poolsChanged = true;
+            }
+            if (poolsChanged) {
+              // pools changed
+              changed.push(acceleration.txid);
             }
           }
         }
       }
 
-      for (const txid of Object.keys(newCandidateTxMap)) {
-        if (!this.mempoolCandidates[txid]) {
-          added.push(this.mempoolCache[txid]);
+      for (const oldTxid of Object.keys(this.accelerations)) {
+        if (!newAccelerationMap[oldTxid]) {
+          // removed
+          changed.push(oldTxid);
         }
       }
 
-      this.mempoolCandidates = newCandidateTxMap;
-      return {
-        txs: this.mempoolCandidates,
-        added,
-        removed
-      };
+      this.accelerations = newAccelerationMap;
+
+      return changed;
+    } catch (e: any) {
+      logger.debug(`Failed to update accelerations: ` + (e instanceof Error ? e.message : e));
+      return [];
     }
   }
 
-  setAccelerationPositions(positions: { [txid: string]: { poolId: number, pool: string, block: number, vsize: number }[] }): void {
-    this.accelerationPositions = positions;
-  }
-
-  getAccelerationPositions(txid: string): { [pool: number]: { poolId: number, pool: string, block: number, vsize: number } } | undefined {
-    return this.accelerationPositions[txid];
-  }
-
   private startTimer() {
     const state: any = {
       start: Date.now(),
@@ -499,7 +450,16 @@ class Mempool {
     }
   }
 
-  public handleRbfTransactions(rbfTransactions: { [txid: string]: { replaced: MempoolTransactionExtended[], replacedBy: TransactionExtended }}): void {
+  public handleRbfTransactions(rbfTransactions: { [txid: string]: MempoolTransactionExtended[]; }): void {
+    for (const rbfTransaction in rbfTransactions) {
+      if (this.mempoolCache[rbfTransaction] && rbfTransactions[rbfTransaction]?.length) {
+        // Store replaced transactions
+        rbfCache.add(rbfTransactions[rbfTransaction], this.mempoolCache[rbfTransaction]);
+      }
+    }
+  }
+
+  public handleMinedRbfTransactions(rbfTransactions: { [txid: string]: { replaced: MempoolTransactionExtended[], replacedBy: TransactionExtended }}): void {
     for (const rbfTransaction in rbfTransactions) {
       if (rbfTransactions[rbfTransaction].replacedBy && rbfTransactions[rbfTransaction]?.replaced?.length) {
         // Store replaced transactions

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
-  );
-}

backend/src/api/mining/mining-routes.ts

@@ -8,9 +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';
-import { handleError } from '../../utils/api';
 
 class MiningRoutes {
   public initRoutes(app: Application) {
@@ -26,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)
@@ -38,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)
     ;
   }
 
@@ -54,25 +43,18 @@ class MiningRoutes {
       res.header('Cache-control', 'public');
       res.setHeader('Expires', new Date(Date.now() + 1000 * 300).toUTCString());
       if (['testnet', 'signet', 'liquidtestnet'].includes(config.MEMPOOL.NETWORK)) {
-        handleError(req, res, 400, 'Prices are not available on testnets.');
+        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) {
-      handleError(req, res, 500, 'Failed to get historical prices');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -85,9 +67,9 @@ class MiningRoutes {
       res.json(stats);
     } catch (e) {
       if (e instanceof Error && e.message.indexOf('This mining pool does not exist') > -1) {
-        handleError(req, res, 404, e.message);
+        res.status(404).send(e.message);
       } else {
-        handleError(req, res, 500, 'Failed to get pool');
+        res.status(500).send(e instanceof Error ? e.message : e);
       }
     }
   }
@@ -104,9 +86,9 @@ class MiningRoutes {
       res.json(poolBlocks);
     } catch (e) {
       if (e instanceof Error && e.message.indexOf('This mining pool does not exist') > -1) {
-        handleError(req, res, 404, e.message);
+        res.status(404).send(e.message);
       } else {
-        handleError(req, res, 500, 'Failed to get blocks for pool');
+        res.status(500).send(e instanceof Error ? e.message : e);
       }
     }
   }
@@ -130,7 +112,7 @@ class MiningRoutes {
         res.json(pools);
       }
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get pools');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -144,7 +126,7 @@ class MiningRoutes {
       res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
       res.json(stats);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get pools');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -158,7 +140,7 @@ class MiningRoutes {
       res.setHeader('Expires', new Date(Date.now() + 1000 * 300).toUTCString());
       res.json(hashrates);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get pools historical hashrate');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -173,9 +155,9 @@ class MiningRoutes {
       res.json(hashrates);
     } catch (e) {
       if (e instanceof Error && e.message.indexOf('This mining pool does not exist') > -1) {
-        handleError(req, res, 404, e.message);
+        res.status(404).send(e.message);
       } else {
-        handleError(req, res, 500, 'Failed to get pool historical hashrate');
+        res.status(500).send(e instanceof Error ? e.message : e);
       }
     }
   }
@@ -183,7 +165,7 @@ class MiningRoutes {
   private async $getHistoricalHashrate(req: Request, res: Response) {
     let currentHashrate = 0, currentDifficulty = 0;
     try {
-      currentHashrate = await bitcoinClient.getNetworkHashPs(1008);
+      currentHashrate = await bitcoinClient.getNetworkHashPs();
       currentDifficulty = await bitcoinClient.getDifficulty();
     } catch (e) {
       logger.debug('Bitcoin Core is not available, using zeroed value for current hashrate and difficulty');
@@ -204,7 +186,7 @@ class MiningRoutes {
         currentDifficulty: currentDifficulty,
       });
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get historical hashrate');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -218,25 +200,7 @@ class MiningRoutes {
       res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
       res.json(blockFees);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get historical block fees');
-    }
-  }
-
-  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) {
-      handleError(req, res, 500, 'Failed to get historical block fees');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -250,7 +214,7 @@ class MiningRoutes {
       res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
       res.json(blockRewards);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get historical block rewards');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -264,7 +228,7 @@ class MiningRoutes {
       res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
       res.json(blockFeeRates);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get historical block fee rates');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -282,7 +246,7 @@ class MiningRoutes {
         weights: blockWeights
       });
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get historical block size and weight');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -294,7 +258,7 @@ class MiningRoutes {
       res.setHeader('Expires', new Date(Date.now() + 1000 * 300).toUTCString());
       res.json(difficulty.map(adj => [adj.time, adj.height, adj.difficulty, adj.adjustment]));
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get historical difficulty adjustments');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -304,7 +268,7 @@ class MiningRoutes {
       res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
       res.json(response);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get reward stats');
+      res.status(500).end();
     }
   }
 
@@ -318,7 +282,7 @@ class MiningRoutes {
       res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
       res.json(blocksHealth.map(health => [health.time, health.height, health.match_rate]));
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get historical blocks health');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -327,7 +291,7 @@ class MiningRoutes {
       const audit = await BlocksAuditsRepository.$getBlockAudit(req.params.hash);
 
       if (!audit) {
-        handleError(req, res, 204, `This block has not been audited.`);
+        res.status(204).send(`This block has not been audited.`);
         return;
       }
 
@@ -336,7 +300,7 @@ class MiningRoutes {
       res.setHeader('Expires', new Date(Date.now() + 1000 * 3600 * 24).toUTCString());
       res.json(audit);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get block audit');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -359,7 +323,7 @@ class MiningRoutes {
       res.setHeader('Expires', new Date(Date.now() + 1000 * 300).toUTCString());
       res.json(result);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get height from timestamp');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -372,7 +336,7 @@ class MiningRoutes {
       res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
       res.json(await BlocksAuditsRepository.$getBlockAuditScores(height, height - 15));
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get block audit scores');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -385,95 +349,7 @@ class MiningRoutes {
       res.setHeader('Expires', new Date(Date.now() + 1000 * 3600 * 24).toUTCString());
       res.json(audit || 'null');
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get block audit score');
-    }
-  }
-
-  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)) {
-        handleError(req, res, 400, 'Acceleration data is not available.');
-        return;
-      }
-      res.status(200).send(await AccelerationRepository.$getAccelerationInfo(req.params.slug));
-    } catch (e) {
-      handleError(req, res, 500, 'Failed to get accelerations by pool');
-    }
-  }
-
-  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)) {
-        handleError(req, res, 400, '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) {
-      handleError(req, res, 500, 'Failed to get accelerations by height');
-    }
-  }
-
-  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)) {
-        handleError(req, res, 400, 'Acceleration data is not available.');
-        return;
-      }
-      res.status(200).send(await AccelerationRepository.$getAccelerationInfo(null, null, req.params.interval));
-    } catch (e) {
-      handleError(req, res, 500, 'Failed to get recent accelerations');
-    }
-  }
-
-  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)) {
-        handleError(req, res, 400, 'Acceleration data is not available.');
-        return;
-      }
-      res.status(200).send(await AccelerationRepository.$getAccelerationTotals(<string>req.query.pool, <string>req.query.interval));
-    } catch (e) {
-      handleError(req, res, 500, 'Failed to get acceleration totals');
-    }
-  }
-
-  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)) {
-        handleError(req, res, 400, 'Acceleration data is not available.');
-        return;
-      }
-      res.status(200).send(Object.values(accelerationApi.getAccelerations() || {}));
-    } catch (e) {
-      handleError(req, res, 500, 'Failed to get active accelerations');
-    }
-  }
-
-  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) {
-      handleError(req, res, 500, 'Failed to request acceleration');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 }

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
    */
@@ -136,13 +125,9 @@ class Mining {
     poolsStatistics['blockCount'] = blockCount;
 
     const totalBlock24h: number = await BlocksRepository.$blockCount(null, '24h');
-    const totalBlock3d: number = await BlocksRepository.$blockCount(null, '3d');
-    const totalBlock1w: number = await BlocksRepository.$blockCount(null, '1w');
 
     try {
       poolsStatistics['lastEstimatedHashrate'] = await bitcoinClient.getNetworkHashPs(totalBlock24h);
-      poolsStatistics['lastEstimatedHashrate3d'] = await bitcoinClient.getNetworkHashPs(totalBlock3d);
-      poolsStatistics['lastEstimatedHashrate1w'] = await bitcoinClient.getNetworkHashPs(totalBlock1w);
     } catch (e) {
       poolsStatistics['lastEstimatedHashrate'] = 0;
       logger.debug('Bitcoin Core is not available, using zeroed value for current hashrate', logger.tags.mining);
@@ -157,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);
@@ -661,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 {

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[] = [];
@@ -19,6 +16,15 @@ class PoolsParser {
     'addresses': '[]',
     'slug': 'unknown'
   };
+  private uniqueLogs: string[] = [];
+
+  private uniqueLog(loggerFunction: any, msg: string): void {
+    if (this.uniqueLogs.includes(msg)) {
+      return;
+    }
+    this.uniqueLogs.push(msg);
+    loggerFunction(msg);
+  }
 
   public setMiningPools(pools): void {
     for (const pool of pools) {
@@ -31,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
@@ -95,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);
         }
       }
     }
@@ -169,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
@@ -181,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;
   }
 }
 

backend/src/api/prices/prices.routes.ts

@@ -1,15 +1,10 @@
 import { Application, Request, Response } from 'express';
 import config from '../../config';
 import pricesUpdater from '../../tasks/price-updater';
-import logger from '../../logger';
-import PricesRepository from '../../repositories/PricesRepository';
 
 class PricesRoutes {
   public initRoutes(app: Application): void {
-    app
-      .get(config.MEMPOOL.API_URL_PREFIX + 'prices', this.$getCurrentPrices.bind(this))
-      .get(config.MEMPOOL.API_URL_PREFIX + 'internal/usd-price-history', this.$getAllPrices.bind(this))
-    ;
+    app.get(config.MEMPOOL.API_URL_PREFIX + 'prices', this.$getCurrentPrices.bind(this));
   }
 
   private $getCurrentPrices(req: Request, res: Response): void {
@@ -19,23 +14,6 @@ class PricesRoutes {
 
     res.json(pricesUpdater.getLatestPrices());
   }
-
-  private async $getAllPrices(req: Request, res: Response): Promise<void> {
-    res.header('Pragma', 'public');
-    res.header('Cache-control', 'public');
-    res.setHeader('Expires', new Date(Date.now() + 360_0000 / config.MEMPOOL.PRICE_UPDATES_PER_HOUR).toUTCString());
-
-    try {
-      const usdPriceHistory = await PricesRepository.$getPricesTimesAndId();
-      const responseData = usdPriceHistory.map(p => {
-        return { time: p.time, USD: p.USD };
-      });
-      res.status(200).json(responseData);
-    } catch (e: any) {
-      logger.err(`Exception ${e} in PricesRoutes::$getAllPrices. Code: ${e.code}. Message: ${e.message}`);
-      res.status(403).send();
-    }
-  }
 }
 
 export default new PricesRoutes();

backend/src/api/rbf-cache.ts

@@ -44,22 +44,6 @@ interface CacheEvent {
   value?: any,
 }
 
-/**
- * Singleton for tracking RBF trees
- *
- * Maintains a set of RBF trees, where each tree represents a sequence of
- * consecutive RBF replacements.
- *
- * Trees are identified by the txid of the root transaction.
- *
- * To maintain consistency, the following invariants must be upheld:
- *  - Symmetry: replacedBy(A) = B <=> A in replaces(B)
- *  - Unique id: treeMap(treeMap(X)) = treeMap(X)
- *  - Unique tree: A in replaces(B) => treeMap(A) == treeMap(B)
- *  - Existence: X in treeMap => treeMap(X) in rbfTrees
- *  - Completeness: X in replacedBy => X in treeMap, Y in replaces => Y in treeMap
- */
-
 class RbfCache {
   private replacedBy: Map<string, string> = new Map();
   private replaces: Map<string, string[]> = new Map();
@@ -77,10 +61,6 @@ class RbfCache {
     setInterval(this.cleanup.bind(this), 1000 * 60 * 10);
   }
 
-  /**
-   * Low level cache operations
-   */
-
   private addTx(txid: string, tx: MempoolTransactionExtended): void {
     this.txs.set(txid, tx);
     this.cacheQueue.push({ op: CacheOp.Add, type: 'tx', txid });
@@ -112,23 +92,11 @@ class RbfCache {
     this.cacheQueue.push({ op: CacheOp.Remove, type: 'exp', txid });
   }
 
-  /**
-   * Basic data structure operations
-   * must uphold tree invariants
-   */
-
-
   public add(replaced: MempoolTransactionExtended[], newTxExtended: MempoolTransactionExtended): void {
-    if ( !newTxExtended
-      || !replaced?.length
-      || this.txs.has(newTxExtended.txid)
-      || !(replaced.some(tx => !this.replacedBy.has(tx.txid)))
-    ) {
+    if (!newTxExtended || !replaced?.length || this.txs.has(newTxExtended.txid)) {
       return;
     }
 
-    newTxExtended.replacement = true;
-
     const newTx = Common.stripTransaction(newTxExtended) as RbfTransaction;
     const newTime = newTxExtended.firstSeen || (Date.now() / 1000);
     newTx.rbf = newTxExtended.vin.some((v) => v.sequence < 0xfffffffe);
@@ -144,10 +112,6 @@ class RbfCache {
       if (!replacedTx.rbf) {
         txFullRbf = true;
       }
-      if (this.replacedBy.has(replacedTx.txid)) {
-        // should never happen
-        continue;
-      }
       this.replacedBy.set(replacedTx.txid, newTx.txid);
       if (this.treeMap.has(replacedTx.txid)) {
         const treeId = this.treeMap.get(replacedTx.txid);
@@ -174,47 +138,18 @@ class RbfCache {
       }
     }
     newTx.fullRbf = txFullRbf;
+    const treeId = replacedTrees[0].tx.txid;
     const newTree = {
       tx: newTx,
       time: newTime,
       fullRbf: treeFullRbf,
       replaces: replacedTrees
     };
-    this.addTree(newTree.tx.txid, newTree);
-    this.updateTreeMap(newTree.tx.txid, newTree);
+    this.addTree(treeId, newTree);
+    this.updateTreeMap(treeId, newTree);
     this.replaces.set(newTx.txid, replacedTrees.map(tree => tree.tx.txid));
   }
 
-  public mined(txid): void {
-    if (!this.txs.has(txid)) {
-      return;
-    }
-    const treeId = this.treeMap.get(txid);
-    if (treeId && this.rbfTrees.has(treeId)) {
-      const tree = this.rbfTrees.get(treeId);
-      if (tree) {
-        this.setTreeMined(tree, txid);
-        tree.mined = true;
-        this.dirtyTrees.add(treeId);
-        this.cacheQueue.push({ op: CacheOp.Change, type: 'tree', txid: treeId });
-      }
-    }
-    this.evict(txid);
-  }
-
-  // flag a transaction as removed from the mempool
-  public evict(txid: string, fast: boolean = false): void {
-    this.evictionCount++;
-    if (this.txs.has(txid) && (fast || !this.expiring.has(txid))) {
-      const expiryTime = fast ? Date.now() + (1000 * 60 * 10) : Date.now() + (1000 * 86400); // 24 hours
-      this.addExpiration(txid, expiryTime);
-    }
-  }
-
-  /**
-   * Read-only public interface
-   */
-
   public has(txId: string): boolean {
     return this.txs.has(txId);
   }
@@ -295,6 +230,32 @@ class RbfCache {
     return changes;
   }
 
+  public mined(txid): void {
+    if (!this.txs.has(txid)) {
+      return;
+    }
+    const treeId = this.treeMap.get(txid);
+    if (treeId && this.rbfTrees.has(treeId)) {
+      const tree = this.rbfTrees.get(treeId);
+      if (tree) {
+        this.setTreeMined(tree, txid);
+        tree.mined = true;
+        this.dirtyTrees.add(treeId);
+        this.cacheQueue.push({ op: CacheOp.Change, type: 'tree', txid: treeId });
+      }
+    }
+    this.evict(txid);
+  }
+
+  // flag a transaction as removed from the mempool
+  public evict(txid: string, fast: boolean = false): void {
+    this.evictionCount++;
+    if (this.txs.has(txid) && (fast || !this.expiring.has(txid))) {
+      const expiryTime = fast ? Date.now() + (1000 * 60 * 10) : Date.now() + (1000 * 86400); // 24 hours
+      this.addExpiration(txid, expiryTime);
+    }
+  }
+
   // is the transaction involved in a full rbf replacement?
   public isFullRbf(txid: string): boolean {
     const treeId = this.treeMap.get(txid);
@@ -308,10 +269,6 @@ class RbfCache {
     return tree?.fullRbf;
   }
 
-  /**
-   * Cache maintenance & utility functions
-   */
-
   private cleanup(): void {
     const now = Date.now();
     for (const txid of this.expiring.keys()) {
@@ -340,6 +297,10 @@ class RbfCache {
       for (const tx of (replaces || [])) {
         // recursively remove prior versions from the cache
         this.replacedBy.delete(tx);
+        // if this is the id of a tree, remove that too
+        if (this.treeMap.get(tx) === tx) {
+          this.removeTree(tx);
+        }
         this.remove(tx);
       }
     }
@@ -407,21 +368,14 @@ class RbfCache {
     };
   }
 
-  public async load({ txs, trees, expiring, mempool, spendMap }): Promise<void> {
+  public async load({ txs, trees, expiring }): Promise<void> {
     try {
       txs.forEach(txEntry => {
         this.txs.set(txEntry.value.txid, txEntry.value);
       });
       this.staleCount = 0;
-      for (const deflatedTree of trees.sort((a, b) => Object.keys(b).length - Object.keys(a).length)) {
-        const tree = await this.importTree(mempool, deflatedTree.root, deflatedTree.root, deflatedTree, this.txs);
-        if (tree) {
-          this.addTree(tree.tx.txid, tree);
-          this.updateTreeMap(tree.tx.txid, tree);
-          if (tree.mined) {
-            this.evict(tree.tx.txid);
-          }
-        }
+      for (const deflatedTree of trees) {
+        await this.importTree(deflatedTree.root, deflatedTree.root, deflatedTree, this.txs);
       }
       expiring.forEach(expiringEntry => {
         if (this.txs.has(expiringEntry.key)) {
@@ -429,31 +383,6 @@ class RbfCache {
         }
       });
       this.staleCount = 0;
-
-      // connect cached trees to current mempool transactions
-      const conflicts: Record<string, { replacedBy: MempoolTransactionExtended, replaces: Set<MempoolTransactionExtended> }> = {};
-      for (const tree of this.rbfTrees.values()) {
-        const tx = this.getTx(tree.tx.txid);
-        if (!tx || tree.mined) {
-          continue;
-        }
-        for (const vin of tx.vin) {
-          const conflict = spendMap.get(`${vin.txid}:${vin.vout}`);
-          if (conflict && conflict.txid !== tx.txid) {
-            if (!conflicts[conflict.txid]) {
-              conflicts[conflict.txid] = {
-                replacedBy: conflict,
-                replaces: new Set(),
-              };
-            }
-            conflicts[conflict.txid].replaces.add(tx);
-          }
-        }
-      }
-      for (const { replacedBy, replaces } of Object.values(conflicts)) {
-        this.add([...replaces.values()], replacedBy);
-      }
-
       await this.checkTrees();
       logger.debug(`loaded ${txs.length} txs, ${trees.length} trees into rbf cache, ${expiring.length} due to expire, ${this.staleCount} were stale`);
       this.cleanup();
@@ -484,7 +413,7 @@ class RbfCache {
     return deflated;
   }
 
-  async importTree(mempool, root, txid, deflated, txs: Map<string, MempoolTransactionExtended>, mined: boolean = false): Promise<RbfTree | void> {
+  async importTree(root, txid, deflated, txs: Map<string, MempoolTransactionExtended>, mined: boolean = false): Promise<RbfTree | void> {
     const treeInfo = deflated[txid];
     const replaces: RbfTree[] = [];
 
@@ -495,20 +424,11 @@ class RbfCache {
       return;
     }
 
-    // if this tx is already in the cache, return early
-    if (this.treeMap.has(txid)) {
-      this.removeTree(deflated.key);
-      return;
-    }
-
     // recursively reconstruct child trees
     for (const childId of treeInfo.replaces) {
-      const replaced = await this.importTree(mempool, root, childId, deflated, txs, mined);
+      const replaced = await this.importTree(root, childId, deflated, txs, mined);
       if (replaced) {
         this.replacedBy.set(replaced.tx.txid, txid);
-        if (mempool[replaced.tx.txid]) {
-          mempool[replaced.tx.txid].replacement = true;
-        }
         replaces.push(replaced);
         if (replaced.mined) {
           mined = true;
@@ -532,6 +452,10 @@ class RbfCache {
       fullRbf: treeInfo.fullRbf,
       replaces,
     };
+    this.treeMap.set(txid, root);
+    if (root === txid) {
+      this.addTree(root, tree);
+    }
     return tree;
   }
 
@@ -582,7 +506,6 @@ class RbfCache {
       processTxs(txs);
     }
 
-    // evict missing transactions
     for (const txid of txids) {
       if (!found[txid]) {
         this.evict(txid, false);

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,25 +214,18 @@ 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,
       trees: rbfTrees.map(loadedTree => { loadedTree.value.key = loadedTree.key; return loadedTree.value; }),
       expiring: rbfExpirations,
-      mempool: memPool.getMempool(),
-      spendMap: memPool.getSpendMap(),
     });
   }
 
-  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) {
@@ -416,10 +272,6 @@ class RedisCache {
     }
     return result;
   }
-
-  public setIgnoreBlocksCache(): void {
-    this.ignoreBlocksCache = true;
-  }
 }
 
 export default new RedisCache();

backend/src/api/services/acceleration.ts

@@ -1,166 +1,22 @@
-import { WebSocket } from 'ws';
 import config from '../../config';
 import logger from '../../logger';
-import { BlockExtended } from '../../mempool.interfaces';
+import { BlockExtended, PoolTag } from '../../mempool.interfaces';
 import axios from 'axios';
-import mempool from '../mempool';
-import websocketHandler from '../websocket-handler';
-
-type MyAccelerationStatus = 'requested' | 'accelerating' | 'done';
 
 export interface Acceleration {
   txid: string,
-  added: number,
-  effectiveVsize: number,
-  effectiveFee: number,
   feeDelta: number,
   pools: 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 ws: WebSocket | null = null;
-  private useWebsocket: boolean = config.MEMPOOL.OFFICIAL && config.MEMPOOL_SERVICES.ACCELERATIONS;
-  private startedWebsocketLoop: boolean = false;
-  private websocketConnected: boolean = false;
-  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 websocketPath = config.MEMPOOL_SERVICES?.API ? `${config.MEMPOOL_SERVICES.API.replace('https://', 'wss://').replace('http://', 'ws://')}/accelerator/ws` : '/';
-  private _accelerations: Record<string, Acceleration> = {};
-  private lastPoll = 0;
-  private lastPing = Date.now();
-  private lastPong = Date.now();
-  private forcePoll = false;
-  private myAccelerations: Record<string, { status: MyAccelerationStatus, added: number, acceleration?: Acceleration }> = {};
-
-  public constructor() {}
-
-  public getAccelerations(): Record<string, Acceleration> {
-    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<Record<string, Acceleration> | null> {
-    if (this.useWebsocket && this.websocketConnected) {
-      return this._accelerations;
-    }
-    if (!this.onDemandPollingEnabled) {
-      const accelerations = await this.$fetchAccelerations();
-      if (accelerations) {
-        const latestAccelerations = {};
-        for (const acc of accelerations) {
-          latestAccelerations[acc.txid] = acc;
-        }
-        this._accelerations = latestAccelerations;
-        return this._accelerations;
-      }
-    } else {
-      return this.$updateAccelerationsOnDemand();
-    }
-    return null;
-  }
-
-  private async $updateAccelerationsOnDemand(): Promise<Record<string, 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];
-      }
-    }
-
-    const latestAccelerations = {};
-    for (const acc of Object.values(this.myAccelerations).map(({ acceleration }) => acceleration).filter(acc => acc) as Acceleration[]) {
-      latestAccelerations[acc.txid] = acc;
-    }
-    this._accelerations = latestAccelerations;
-    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 {
@@ -175,148 +31,6 @@ class AccelerationApi {
     }
     return anyAccelerated;
   }
-
-  // get a list of accelerations that have changed between two sets of accelerations
-  public getAccelerationDelta(oldAccelerationMap: Record<string, Acceleration>, newAccelerationMap: Record<string, Acceleration>): string[] {
-    const changed: string[] = [];
-    const mempoolCache = mempool.getMempool();
-
-    for (const acceleration of Object.values(newAccelerationMap)) {
-      // skip transactions we don't know about
-      if (!mempoolCache[acceleration.txid]) {
-        continue;
-      }
-      if (oldAccelerationMap[acceleration.txid] == null) {
-        // new acceleration
-        changed.push(acceleration.txid);
-      } else {
-        if (oldAccelerationMap[acceleration.txid].feeDelta !== acceleration.feeDelta) {
-          // feeDelta changed
-          changed.push(acceleration.txid);
-        } else if (oldAccelerationMap[acceleration.txid].pools?.length) {
-          let poolsChanged = false;
-          const pools = new Set();
-            oldAccelerationMap[acceleration.txid].pools.forEach(pool => {
-            pools.add(pool);
-          });
-          acceleration.pools.forEach(pool => {
-            if (!pools.has(pool)) {
-              poolsChanged = true;
-            } else {
-              pools.delete(pool);
-            }
-          });
-          if (pools.size > 0) {
-            poolsChanged = true;
-          }
-          if (poolsChanged) {
-            // pools changed
-            changed.push(acceleration.txid);
-          }
-        }
-      }
-    }
-
-    for (const oldTxid of Object.keys(oldAccelerationMap)) {
-      if (!newAccelerationMap[oldTxid]) {
-        // removed
-        changed.push(oldTxid);
-      }
-    }
-
-    return changed;
-  }
-
-  private handleWebsocketMessage(msg: any): void {
-    if (msg?.accelerations !== null) {
-      const latestAccelerations = {};
-      for (const acc of msg?.accelerations || []) {
-        latestAccelerations[acc.txid] = acc;
-      }
-      this._accelerations = latestAccelerations;
-      websocketHandler.handleAccelerationsChanged(this._accelerations);
-    }
-  }
-
-  public async connectWebsocket(): Promise<void> {
-    if (this.startedWebsocketLoop) {
-      return;
-    }
-    while (this.useWebsocket) {
-      this.startedWebsocketLoop = true;
-      if (!this.ws) {
-        this.ws = new WebSocket(this.websocketPath);
-        this.lastPing = 0;
-
-        this.ws.on('open', () => {
-          logger.info(`Acceleration websocket opened to ${this.websocketPath}`);
-          this.websocketConnected = true;
-          this.ws?.send(JSON.stringify({
-            'watch-accelerations': true
-          }));
-        });
-
-        this.ws.on('error', (error) => {
-          let errMsg = `Acceleration websocket error on ${this.websocketPath}: ${error['code']}`;
-          if (error['errors']) {
-            errMsg += ' - ' + error['errors'].join(' - ');
-          }
-          logger.err(errMsg);
-          this.ws = null;
-          this.websocketConnected = false;
-        });
-
-        this.ws.on('close', () => {
-          logger.info('Acceleration websocket closed');
-          this.ws = null;
-          this.websocketConnected = false;
-        });
-
-        this.ws.on('message', (data, isBinary) => {
-          try {
-            const msg = (isBinary ? data : data.toString()) as string;
-            const parsedMsg = msg?.length ? JSON.parse(msg) : null;
-            this.handleWebsocketMessage(parsedMsg);
-          } catch (e) {
-            logger.warn('Failed to parse acceleration websocket message: ' + (e instanceof Error ? e.message : e));
-          }
-        });
-
-        this.ws.on('ping', () => {
-          logger.debug('received ping from acceleration websocket server');
-        });
-
-        this.ws.on('pong', () => {
-          logger.debug('received pong from acceleration websocket server');
-          this.lastPong = Date.now();
-        });
-      } else if (this.websocketConnected) {
-        if (this.lastPing && this.lastPing > this.lastPong && (Date.now() - this.lastPing > 10000)) {
-          logger.warn('No pong received within 10 seconds, terminating connection');
-          try {
-            this.ws?.terminate();
-          } catch (e) {
-            logger.warn('failed to terminate acceleration websocket connection: ' + (e instanceof Error ? e.message : e));
-          } finally {
-            this.ws = null;
-            this.websocketConnected = false;
-            this.lastPing = 0;
-          }
-        } else if (!this.lastPing || (Date.now() - this.lastPing > 30000)) {
-          logger.debug('sending ping to acceleration websocket server');
-          if (this.ws?.readyState === WebSocket.OPEN) {
-            try {
-              this.ws?.ping();
-              this.lastPing = Date.now();
-            } catch (e) {
-              logger.warn('failed to send ping to acceleration websocket server: ' + (e instanceof Error ? e.message : e));
-            }
-          }
-        }
-      }
-      await new Promise(resolve => setTimeout(resolve, 5000));
-    }
-  }
 }
 
 export default new AccelerationApi();

backend/src/api/services/services-routes.ts

@@ -1,27 +0,0 @@
-import { Application, Request, Response } from 'express';
-import config from '../../config';
-import WalletApi from './wallets';
-import { handleError } from '../../utils/api';
-
-class ServicesRoutes {
-  public initRoutes(app: Application): void {
-    app
-      .get(config.MEMPOOL.API_URL_PREFIX + 'wallet/:walletId', this.$getWallet)
-    ;
-  }
-
-  private async $getWallet(req: Request, res: Response): Promise<void> {
-    try {
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 5).toUTCString());
-      const walletId = req.params.walletId;
-      const wallet = await WalletApi.getWallet(walletId);
-      res.status(200).send(wallet);
-    } catch (e) {
-      handleError(req, res, 500, 'Failed to get wallet');
-    }
-  }
-}
-
-export default new ServicesRoutes();

backend/src/api/services/stratum.ts

@@ -1,105 +0,0 @@
-import { WebSocket } from 'ws';
-import logger from '../../logger';
-import config from '../../config';
-import websocketHandler from '../websocket-handler';
-
-export interface StratumJob {
-  pool: number;
-  height: number;
-  coinbase: string;
-  scriptsig: string;
-  reward: number;
-  jobId: string;
-  extraNonce: string;
-  extraNonce2Size: number;
-  prevHash: string;
-  coinbase1: string;
-  coinbase2: string;
-  merkleBranches: string[];
-  version: string;
-  bits: string;
-  time: string;
-  timestamp: number;
-  cleanJobs: boolean;
-  received: number;
-}
-
-function isStratumJob(obj: any): obj is StratumJob {
-  return obj
-    && typeof obj === 'object'
-    && 'pool' in obj
-    && 'prevHash' in obj
-    && 'height' in obj
-    && 'received' in obj
-    && 'version' in obj
-    && 'timestamp' in obj
-    && 'bits' in obj
-    && 'merkleBranches' in obj
-    && 'cleanJobs' in obj;
-}
-
-class StratumApi {
-  private ws: WebSocket | null = null;
-  private runWebsocketLoop: boolean = false;
-  private startedWebsocketLoop: boolean = false;
-  private websocketConnected: boolean = false;
-  private jobs: Record<string, StratumJob> = {};
-
-  public constructor() {}
-
-  public getJobs(): Record<string, StratumJob> {
-    return this.jobs;
-  }
-
-  private handleWebsocketMessage(msg: any): void {
-    if (isStratumJob(msg)) {
-      this.jobs[msg.pool] = msg;
-      websocketHandler.handleNewStratumJob(this.jobs[msg.pool]);
-    }
-  }
-
-  public async connectWebsocket(): Promise<void> {
-    if (!config.STRATUM.ENABLED) {
-      return;
-    }
-    this.runWebsocketLoop = true;
-    if (this.startedWebsocketLoop) {
-      return;
-    }
-    while (this.runWebsocketLoop) {
-      this.startedWebsocketLoop = true;
-      if (!this.ws) {
-        this.ws = new WebSocket(`${config.STRATUM.API}`);
-        this.websocketConnected = true;
-
-        this.ws.on('open', () => {
-          logger.info('Stratum websocket opened');
-        });
-
-        this.ws.on('error', (error) => {
-          logger.err('Stratum websocket error: ' + error);
-          this.ws = null;
-          this.websocketConnected = false;
-        });
-
-        this.ws.on('close', () => {
-          logger.info('Stratum websocket closed');
-          this.ws = null;
-          this.websocketConnected = false;
-        });
-
-        this.ws.on('message', (data, isBinary) => {
-          try {
-            const parsedMsg = JSON.parse((isBinary ? data : data.toString()) as string);
-            this.handleWebsocketMessage(parsedMsg);
-          } catch (e) {
-            logger.warn('Failed to parse stratum websocket message: ' + (e instanceof Error ? e.message : e));
-          }
-        });
-      }
-      await new Promise(resolve => setTimeout(resolve, 5000));
-    }
-  }
-}
-
-export default new StratumApi();

backend/src/api/services/wallets.ts

@@ -1,153 +0,0 @@
-import config from '../../config';
-import logger from '../../logger';
-import { IEsploraApi } from '../bitcoin/esplora-api.interface';
-import bitcoinApi from '../bitcoin/bitcoin-api-factory';
-import axios from 'axios';
-import { TransactionExtended } from '../../mempool.interfaces';
-
-interface WalletAddress {
-  address: string;
-  active: boolean;
-  stats: {
-    funded_txo_count: number;
-    funded_txo_sum: number;
-    spent_txo_count: number;
-    spent_txo_sum: number;
-    tx_count: number;
-  };
-  transactions: IEsploraApi.AddressTxSummary[];
-  lastSync: number;
-}
-
-interface Wallet {
-  name: string;
-  addresses: Record<string, WalletAddress>;
-  lastPoll: number;
-}
-
-const POLL_FREQUENCY = 5 * 60 * 1000; // 5 minutes
-
-class WalletApi {
-  private wallets: Record<string, Wallet> = {};
-  private syncing = false;
-
-  constructor() {
-    this.wallets = config.WALLETS.ENABLED ? (config.WALLETS.WALLETS as string[]).reduce((acc, wallet) => {
-      acc[wallet] = { name: wallet, addresses: {}, lastPoll: 0 };
-      return acc;
-    }, {} as Record<string, Wallet>) : {};
-  }
-
-  public getWallet(wallet: string): Record<string, WalletAddress> {
-    return this.wallets?.[wallet]?.addresses || {};
-  }
-
-  // resync wallet addresses from the services backend
-  async $syncWallets(): Promise<void> {
-    if (!config.WALLETS.ENABLED || this.syncing) {
-      return;
-    }
-    this.syncing = true;
-    for (const walletKey of Object.keys(this.wallets)) {
-      const wallet = this.wallets[walletKey];
-      if (wallet.lastPoll < (Date.now() - POLL_FREQUENCY)) {
-        try {
-          const response = await axios.get(config.MEMPOOL_SERVICES.API + `/wallets/${wallet.name}`);
-          const addresses: Record<string, WalletAddress> = response.data;
-          const addressList: WalletAddress[] = Object.values(addresses);
-          // sync all current addresses
-          for (const address of addressList) {
-            await this.$syncWalletAddress(wallet, address);
-          }
-          // remove old addresses
-          for (const address of Object.keys(wallet.addresses)) {
-            if (!addresses[address]) {
-              delete wallet.addresses[address];
-            }
-          }
-          wallet.lastPoll = Date.now();
-          logger.debug(`Synced ${Object.keys(wallet.addresses).length} addresses for wallet ${wallet.name}`);
-        } catch (e) {
-          logger.err(`Error syncing wallet ${wallet.name}: ${(e instanceof Error ? e.message : e)}`);
-        }
-      }
-    }
-    this.syncing = false;
-  }
-
-  // resync address transactions from esplora
-  async $syncWalletAddress(wallet: Wallet, address: WalletAddress): Promise<void> {
-    // fetch full transaction data if the address is new or still active and hasn't been synced in the last hour
-    const refreshTransactions = !wallet.addresses[address.address] || (address.active && (Date.now() - wallet.addresses[address.address].lastSync) > 60 * 60 * 1000);
-    if (refreshTransactions) {
-      try {
-        const summary = await bitcoinApi.$getAddressTransactionSummary(address.address);
-        const addressInfo = await bitcoinApi.$getAddress(address.address);
-        const walletAddress: WalletAddress = {
-          address: address.address,
-          active: address.active,
-          transactions: summary,
-          stats: addressInfo.chain_stats,
-          lastSync: Date.now(),
-        };
-        wallet.addresses[address.address] = walletAddress;
-      } catch (e) {
-        logger.err(`Error syncing wallet address ${address.address}: ${(e instanceof Error ? e.message : e)}`);
-      }
-    }
-  }
-
-  // check a new block for transactions that affect wallet address balances, and add relevant transactions to wallets
-  processBlock(block: IEsploraApi.Block, blockTxs: TransactionExtended[]): Record<string, IEsploraApi.Transaction[]> {
-    const walletTransactions: Record<string, IEsploraApi.Transaction[]> = {};
-    for (const walletKey of Object.keys(this.wallets)) {
-      const wallet = this.wallets[walletKey];
-      walletTransactions[walletKey] = [];
-      for (const tx of blockTxs) {
-        const funded: Record<string, number> = {};
-        const spent: Record<string, number> = {};
-        const fundedCount: Record<string, number> = {};
-        const spentCount: Record<string, number> = {};
-        let anyMatch = false;
-        for (const vin of tx.vin) {
-          const address = vin.prevout?.scriptpubkey_address;
-          if (address && wallet.addresses[address]) {
-            anyMatch = true;
-            spent[address] = (spent[address] ?? 0) + (vin.prevout?.value ?? 0);
-            spentCount[address] = (spentCount[address] ?? 0) + 1;
-          }
-        }
-        for (const vout of tx.vout) {
-          const address = vout.scriptpubkey_address;
-          if (address && wallet.addresses[address]) {
-            anyMatch = true;
-            funded[address] = (funded[address] ?? 0) + (vout.value ?? 0);
-            fundedCount[address] = (fundedCount[address] ?? 0) + 1;
-          }
-        }
-        for (const address of Object.keys({ ...funded, ...spent })) {
-          // update address stats
-          wallet.addresses[address].stats.tx_count++;
-          wallet.addresses[address].stats.funded_txo_count += fundedCount[address] || 0;
-          wallet.addresses[address].stats.spent_txo_count += spentCount[address] || 0;
-          wallet.addresses[address].stats.funded_txo_sum += funded[address] || 0;
-          wallet.addresses[address].stats.spent_txo_sum += spent[address] || 0;
-          // add tx to summary
-          const txSummary: IEsploraApi.AddressTxSummary = {
-            txid: tx.txid,
-            value: (funded[address] ?? 0) - (spent[address] ?? 0),
-            height: block.height,
-            time: block.timestamp,
-          };
-          wallet.addresses[address].transactions?.push(txSummary);
-        }
-        if (anyMatch) {
-          walletTransactions[walletKey].push(tx);
-        }
-      }
-    }
-    return walletTransactions;
-  }
-}
-
-export default new WalletApi();

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();

backend/src/api/statistics/statistics.routes.ts

@@ -1,7 +1,7 @@
 import { Application, Request, Response } from 'express';
 import config from '../../config';
 import statisticsApi from './statistics-api';
-import { handleError } from '../../utils/api';
+
 class StatisticsRoutes {
   public initRoutes(app: Application) {
     app
@@ -65,7 +65,7 @@ class StatisticsRoutes {
       }
       res.json(result);
     } catch (e) {
-      handleError(req, res, 500, 'Failed to get statistics');
+      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 }

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();

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);
@@ -121,15 +121,14 @@ class TransactionUtils {
     const adjustedVsize = Math.max(fractionalVsize, sigops *  5); // adjusted vsize = Max(weight, sigops * bytes_per_sigop) / witness_scale_factor
     const feePerVbytes = (transaction.fee || 0) / fractionalVsize;
     const adjustedFeePerVsize = (transaction.fee || 0) / adjustedVsize;
-    const effectiveFeePerVsize = transaction['effectiveFeePerVsize'] || adjustedFeePerVsize || feePerVbytes;
     const transactionExtended: MempoolTransactionExtended = Object.assign(transaction, {
       order: this.txidToOrdering(transaction.txid),
-      vsize,
+      vsize: Math.round(transaction.weight / 4),
       adjustedVsize,
       sigops,
       feePerVsize: feePerVbytes,
       adjustedFeePerVsize: adjustedFeePerVsize,
-      effectiveFeePerVsize: effectiveFeePerVsize,
+      effectiveFeePerVsize: adjustedFeePerVsize,
     });
     if (!transactionExtended?.status?.confirmed && !transactionExtended.firstSeen) {
       transactionExtended.firstSeen = Math.round((Date.now() / 1000));
@@ -146,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);
@@ -339,87 +334,6 @@ class TransactionUtils {
     const positionOfScript = hasAnnex ? witness.length - 3 : witness.length - 2;
     return witness[positionOfScript];
   }
-
-  // calculate the most parsimonious set of prioritizations given a list of block transactions
-  // (i.e. the most likely prioritizations and deprioritizations)
-  public identifyPrioritizedTransactions(transactions: any[], rateKey: string): { prioritized: string[], deprioritized: string[] } {
-    // find the longest increasing subsequence of transactions
-    // (adapted from https://en.wikipedia.org/wiki/Longest_increasing_subsequence#Efficient_algorithms)
-    // should be O(n log n)
-    const X = transactions.slice(1).reverse().map((tx) => ({ txid: tx.txid, rate: tx[rateKey] })); // standard block order is by *decreasing* effective fee rate, but we want to iterate in increasing order (and skip the coinbase)
-    if (X.length < 2) {
-      return { prioritized: [], deprioritized: [] };
-    }
-    const N = X.length;
-    const P: number[] = new Array(N);
-    const M: number[] = new Array(N + 1);
-    M[0] = -1; // undefined so can be set to any value
-
-    let L = 0;
-    for (let i = 0; i < N; i++) {
-      // Binary search for the smallest positive l ≤ L
-      // such that X[M[l]].effectiveFeePerVsize > X[i].effectiveFeePerVsize
-      let lo = 1;
-      let hi = L + 1;
-      while (lo < hi) {
-        const mid = lo + Math.floor((hi - lo) / 2); // lo <= mid < hi
-        if (X[M[mid]].rate > X[i].rate) {
-          hi = mid;
-        } else { // if X[M[mid]].effectiveFeePerVsize < X[i].effectiveFeePerVsize
-          lo = mid + 1;
-        }
-      }
-
-      // After searching, lo == hi is 1 greater than the
-      // length of the longest prefix of X[i]
-      const newL = lo;
-
-      // The predecessor of X[i] is the last index of
-      // the subsequence of length newL-1
-      P[i] = M[newL - 1];
-      M[newL] = i;
-
-      if (newL > L) {
-        // If we found a subsequence longer than any we've
-        // found yet, update L
-        L = newL;
-      }
-    }
-
-    // Reconstruct the longest increasing subsequence
-    // It consists of the values of X at the L indices:
-    // ..., P[P[M[L]]], P[M[L]], M[L]
-    const LIS: any[] = new Array(L);
-    let k = M[L];
-    for (let j = L - 1; j >= 0; j--) {
-      LIS[j] = X[k];
-      k = P[k];
-    }
-
-    const lisMap = new Map<string, number>();
-    LIS.forEach((tx, index) => lisMap.set(tx.txid, index));
-
-    const prioritized: string[] = [];
-    const deprioritized: string[] = [];
-
-    let lastRate = X[0].rate;
-
-    for (const tx of X) {
-      if (lisMap.has(tx.txid)) {
-        lastRate = tx.rate;
-      } else {
-        if (Math.abs(tx.rate - lastRate) < 0.1) {
-          // skip if the rate is almost the same as the previous transaction
-        } else if (tx.rate <= lastRate) {
-          prioritized.push(tx.txid);
-        } else {
-          deprioritized.push(tx.txid);
-        }
-      }
-    }
-
-    return { prioritized, deprioritized };
-  }
 }
 
 export default new TransactionUtils();

backend/src/api/tx-selection-worker.ts

@@ -173,13 +173,10 @@ function makeBlockTemplates(mempool: Map<number, CompactThreadTransaction>)
     // this block is full
     const exceededPackageTries = failures > 1000 && blockWeight > (config.MEMPOOL.BLOCK_WEIGHT_UNITS - 4000);
     const queueEmpty = top >= mempoolArray.length && modified.isEmpty();
-
     if ((exceededPackageTries || queueEmpty) && blocks.length < 7) {
       // construct this block
       if (transactions.length) {
         blocks.push(transactions.map(t => t.uid));
-      } else {
-        break;
       }
       // reset for the next block
       transactions = [];

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;
@@ -22,27 +20,25 @@ interface IConfig {
     MEMPOOL_BLOCKS_AMOUNT: number;
     INDEXING_BLOCKS_AMOUNT: number;
     BLOCKS_SUMMARIES_INDEXING: boolean;
-    GOGGLES_INDEXING: boolean;
     USE_SECOND_NODE_FOR_MINFEE: boolean;
     EXTERNAL_ASSETS: string[];
     EXTERNAL_MAX_RETRY: number;
     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,
-    POOLS_UPDATE_DELAY: number,
     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;
     MAX_PUSH_TX_SIZE_WEIGHT: number;
     ALLOW_UNREACHABLE: boolean;
     PRICE_UPDATES_PER_HOUR: number;
-    MAX_TRACKED_ADDRESSES: number;
   };
   ESPLORA: {
     REST_API_URL: string;
@@ -52,7 +48,6 @@ interface IConfig {
     REQUEST_TIMEOUT: number;
     FALLBACK_TIMEOUT: number;
     FALLBACK: string[];
-    MAX_BEHIND_TIP: number;
   };
   LIGHTNING: {
     ENABLED: boolean;
@@ -86,7 +81,6 @@ interface IConfig {
     TIMEOUT: number;
     COOKIE: boolean;
     COOKIE_PATH: string;
-    DEBUG_LOG_PATH: string;
   };
   SECOND_CORE_RPC: {
     HOST: string;
@@ -107,7 +101,6 @@ interface IConfig {
     PASSWORD: string;
     TIMEOUT: number;
     PID_DIR: string;
-    POOL_SIZE: number;
   };
   SYSLOG: {
     ENABLED: boolean;
@@ -120,6 +113,10 @@ interface IConfig {
     ENABLED: boolean;
     TX_PER_SECOND_SAMPLE_PERIOD: number;
   };
+  BISQ: {
+    ENABLED: boolean;
+    DATA_PATH: string;
+  };
   SOCKS5PROXY: {
     ENABLED: boolean;
     USE_ONION: boolean;
@@ -133,6 +130,8 @@ interface IConfig {
     MEMPOOL_ONION: string;
     LIQUID_API: string;
     LIQUID_ONION: string;
+    BISQ_URL: string;
+    BISQ_ONION: string;
   };
   MAXMIND: {
     ENABLED: boolean;
@@ -144,8 +143,6 @@ interface IConfig {
     ENABLED: boolean;
     AUDIT: boolean;
     AUDIT_START_HEIGHT: number;
-    STATISTICS: boolean;
-    STATISTICS_START_TIME: number | string;
     SERVERS: string[];
   },
   MEMPOOL_SERVICES: {
@@ -157,29 +154,14 @@ interface IConfig {
     UNIX_SOCKET_PATH: string;
     BATCH_QUERY_BASE_SIZE: number;
   },
-  FIAT_PRICE: {
-    ENABLED: boolean;
-    PAID: boolean;
-    API_KEY: string;
-  },
-  WALLETS: {
-    ENABLED: boolean;
-    WALLETS: string[];
-  },
-  STRATUM: {
-    ENABLED: boolean;
-    API: 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,
@@ -192,27 +174,25 @@ const defaults: IConfig = {
     'MEMPOOL_BLOCKS_AMOUNT': 8,
     'INDEXING_BLOCKS_AMOUNT': 11000, // 0 = disable indexing, -1 = index all blocks
     'BLOCKS_SUMMARIES_INDEXING': false,
-    'GOGGLES_INDEXING': false,
     'USE_SECOND_NODE_FOR_MINFEE': false,
     'EXTERNAL_ASSETS': [],
     'EXTERNAL_MAX_RETRY': 1,
     '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',
-    'POOLS_UPDATE_DELAY': 604800, // in seconds, default is one week
     '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,
     'MAX_PUSH_TX_SIZE_WEIGHT': 400000,
     'ALLOW_UNREACHABLE': true,
     'PRICE_UPDATES_PER_HOUR': 1,
-    'MAX_TRACKED_ADDRESSES': 1,
   },
   'ESPLORA': {
     'REST_API_URL': 'http://127.0.0.1:3000',
@@ -222,7 +202,6 @@ const defaults: IConfig = {
     'REQUEST_TIMEOUT': 10000,
     'FALLBACK_TIMEOUT': 5000,
     'FALLBACK': [],
-    'MAX_BEHIND_TIP': 2,
   },
   'ELECTRUM': {
     'HOST': '127.0.0.1',
@@ -236,8 +215,7 @@ const defaults: IConfig = {
     'PASSWORD': 'mempool',
     'TIMEOUT': 60000,
     'COOKIE': false,
-    'COOKIE_PATH': '/bitcoin/.cookie',
-    'DEBUG_LOG_PATH': '',
+    'COOKIE_PATH': '/bitcoin/.cookie'
   },
   'SECOND_CORE_RPC': {
     'HOST': '127.0.0.1',
@@ -258,7 +236,6 @@ const defaults: IConfig = {
     'PASSWORD': 'mempool',
     'TIMEOUT': 180000,
     'PID_DIR': '',
-    'POOL_SIZE': 100,
   },
   'SYSLOG': {
     'ENABLED': true,
@@ -271,6 +248,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',
@@ -302,7 +283,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,
@@ -314,8 +297,6 @@ const defaults: IConfig = {
     'ENABLED': false,
     'AUDIT': false,
     'AUDIT_START_HEIGHT': 774000,
-    'STATISTICS': false,
-    'STATISTICS_START_TIME': 1481932800,
     'SERVERS': [],
   },
   'MEMPOOL_SERVICES': {
@@ -327,19 +308,6 @@ const defaults: IConfig = {
     'UNIX_SOCKET_PATH': '',
     'BATCH_QUERY_BASE_SIZE': 5000,
   },
-  'FIAT_PRICE': {
-    'ENABLED': true,
-    'PAID': false,
-    'API_KEY': '',
-  },
-  'WALLETS': {
-    'ENABLED': false,
-    'WALLETS': [],
-  },
-  'STRATUM': {
-    'ENABLED': false,
-    'API': 'http://localhost:1234',
-  }
 };
 
 class Config implements IConfig {
@@ -351,6 +319,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'];
@@ -360,9 +329,6 @@ class Config implements IConfig {
   REPLICATION: IConfig['REPLICATION'];
   MEMPOOL_SERVICES: IConfig['MEMPOOL_SERVICES'];
   REDIS: IConfig['REDIS'];
-  FIAT_PRICE: IConfig['FIAT_PRICE'];
-  WALLETS: IConfig['WALLETS'];
-  STRATUM: IConfig['STRATUM'];
 
   constructor() {
     const configs = this.merge(configFromFile, defaults);
@@ -374,6 +340,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;
@@ -383,9 +350,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;
-    this.WALLETS = configs.WALLETS;
-    this.STRATUM = configs.STRATUM;
   }
 
   merge = (...objects: object[]): IConfig => {

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',
   };

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,9 +32,9 @@ 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 servicesRoutes from './api/services/services-routes';
 import fundingTxFetcher from './tasks/lightning/sync-tasks/funding-tx-fetcher';
 import forensicsService from './tasks/lightning/forensics.service';
 import priceUpdater from './tasks/price-updater';
@@ -42,19 +44,10 @@ import v8 from 'v8';
 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';
-import walletApi from './api/services/wallets';
-import stratumApi from './api/services/stratum';
 
 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;
@@ -135,25 +128,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();
@@ -167,22 +154,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();
@@ -193,6 +172,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();
     }
@@ -204,18 +190,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}`);
-        }
-      });
-    }
-
-    poolsUpdater.$startService();
   }
 
   async runMainUpdateLoop(): Promise<void> {
@@ -232,22 +206,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 latestAccelerations = 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, latestAccelerations, minFeeMempool, minFeeTip, pollRate);
+        await memPool.$updateMempool(newMempool, newAccelerations, pollRate);
       }
       indexer.$run();
-      if (config.WALLETS.ENABLED) {
-        // might take a while, so run in the background
-        walletApi.$syncWallets();
-      }
-      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;
@@ -293,17 +259,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));
         }
@@ -315,22 +276,12 @@ 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));
-
-    accelerationApi.connectWebsocket();
-    if (config.STRATUM.ENABLED) {
-      stratumApi.connectWebsocket();
-    }
   }
-
+  
   setUpHttpApiRoutes(): void {
     bitcoinRoutes.initRoutes(this.app);
-    if (config.MEMPOOL.OFFICIAL) {
-      bitcoinCoreRoutes.initRoutes(this.app);
-    }
     pricesRoutes.initRoutes(this.app);
     if (config.STATISTICS.ENABLED && config.DATABASE.ENABLED && config.MEMPOOL.ENABLED) {
       statisticsRoutes.initRoutes(this.app);
@@ -338,6 +289,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);
     }
@@ -346,15 +300,6 @@ class Server {
       nodesRoutes.initRoutes(this.app);
       channelsRoutes.initRoutes(this.app);
     }
-    if (config.MEMPOOL_SERVICES.ACCELERATIONS) {
-      accelerationRoutes.initRoutes(this.app);
-    }
-    if (config.WALLETS.ENABLED) {
-      servicesRoutes.initRoutes(this.app);
-    }
-    if (!config.MEMPOOL.OFFICIAL) {
-      aboutRoutes.initRoutes(this.app);
-    }
   }
 
   healthCheck(): void {
@@ -382,12 +327,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);
   }
 

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,6 @@ 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();
     } catch (e) {
       this.indexerRunning = false;
       logger.err(`Indexer failed, trying again in 10 seconds. Reason: ` + (e instanceof Error ? e.message : e));

backend/src/logger.ts

@@ -35,7 +35,6 @@ class Logger {
   public tags = {
     mining: 'Mining',
     ln: 'Lightning',
-    goggles: 'Goggles',
   };  
 
   // @ts-ignore
@@ -86,6 +85,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;
     }

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 {
@@ -77,29 +61,13 @@ export interface MempoolBlock {
 
 export interface MempoolBlockWithTransactions extends MempoolBlock {
   transactionIds: string[];
-  transactions: TransactionClassified[];
+  transactions: TransactionStripped[];
 }
 
 export interface MempoolBlockDelta {
-  added: TransactionCompressed[];
+  added: TransactionStripped[];
   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 }[];
 }
 
 interface VinStrippedToScriptsig {
@@ -126,12 +94,7 @@ export interface TransactionExtended extends IEsploraApi.Transaction {
     vsize: number,
   };
   acceleration?: boolean;
-  acceleratedBy?: number[];
-  acceleratedAt?: number;
-  feeDelta?: number;
-  replacement?: boolean;
   uid?: number;
-  flags?: number;
 }
 
 export interface MempoolTransactionExtended extends TransactionExtended {
@@ -142,7 +105,6 @@ export interface MempoolTransactionExtended extends TransactionExtended {
   inputs?: number[];
   lastBoosted?: number;
   cpfpDirty?: boolean;
-  cpfpUpdated?: number;
 }
 
 export interface AuditTransaction {
@@ -179,12 +141,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 +179,6 @@ export interface CpfpInfo {
   bestDescendant?: BestDescendant | null;
   descendants?: Ancestor[];
   effectiveFeePerVsize?: number;
-  sigops?: number;
-  adjustedVsize?: number,
-  acceleration?: boolean,
-  fee?: number;
 }
 
 export interface TransactionStripped {
@@ -236,56 +188,8 @@ 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
-  rbf:                                                         0b00000001n,
-  no_rbf:                                                      0b00000010n,
-  v1:                                                          0b00000100n,
-  v2:                                                          0b00001000n,
-  v3:                                                          0b00010000n,
-  nonstandard:                                                 0b00100000n,
-  // address types
-  p2pk:                                               0b00000001_00000000n,
-  p2ms:                                               0b00000010_00000000n,
-  p2pkh:                                              0b00000100_00000000n,
-  p2sh:                                               0b00001000_00000000n,
-  p2wpkh:                                             0b00010000_00000000n,
-  p2wsh:                                              0b00100000_00000000n,
-  p2tr:                                               0b01000000_00000000n,
-  // behavior
-  cpfp_parent:                               0b00000001_00000000_00000000n,
-  cpfp_child:                                0b00000010_00000000_00000000n,
-  replacement:                               0b00000100_00000000_00000000n,
-  // data
-  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,
-  batch_payout:            0b00000100_00000000_00000000_00000000_00000000n,
-  // sighash
-  sighash_all:    0b00000001_00000000_00000000_00000000_00000000_00000000n,
-  sighash_none:   0b00000010_00000000_00000000_00000000_00000000_00000000n,
-  sighash_single: 0b00000100_00000000_00000000_00000000_00000000_00000000n,
-  sighash_default:0b00001000_00000000_00000000_00000000_00000000_00000000n,
-  sighash_acp:    0b00010000_00000000_00000000_00000000_00000000_00000000n,
-};
-
 export interface BlockExtension {
   totalFees: number;
   medianFee: number; // median fee rate
@@ -299,14 +203,12 @@ export interface BlockExtension {
     id: number; // Note - This is the `unique_id`, not to mix with the auto increment `id`
     name: string;
     slug: string;
-    minerNames: string[] | null;
   };
   avgFee: number;
   avgFeeRate: number;
   coinbaseRaw: string;
   orphans: OrphanedBlock[] | null;
   coinbaseAddress: string | null;
-  coinbaseAddresses: string[] | null;
   coinbaseSignature: string | null;
   coinbaseSignatureAscii: string | null;
   virtualSize: number;
@@ -320,13 +222,10 @@ export interface BlockExtension {
   segwitTotalSize: number;
   segwitTotalWeight: number;
   header: string;
-  firstSeen: number | null;
   utxoSetChange: number;
   // Requires coinstatsindex, will be set to NULL otherwise
   utxoSetSize: number | null;
   totalInputAmt: number | null;
-  // pools-v2.json git hash
-  definitionHash: string | undefined;
 }
 
 /**
@@ -340,8 +239,7 @@ export interface BlockExtended extends IEsploraApi.Block {
 
 export interface BlockSummary {
   id: string;
-  transactions: TransactionClassified[];
-  version?: number;
+  transactions: TransactionStripped[];
 }
 
 export interface AuditSummary extends BlockAudit {
@@ -349,8 +247,8 @@ export interface AuditSummary extends BlockAudit {
   size?: number,
   weight?: number,
   tx_count?: number,
-  transactions: TransactionClassified[];
-  template?: TransactionClassified[];
+  transactions: TransactionStripped[];
+  template?: TransactionStripped[];
 }
 
 export interface BlockPrice {
@@ -389,9 +287,8 @@ export interface CpfpCluster {
 }
 
 export interface CpfpSummary {
-  transactions: MempoolTransactionExtended[];
+  transactions: TransactionExtended[];
   clusters: CpfpCluster[];
-  version: number;
 }
 
 export interface Statistic {
@@ -447,7 +344,6 @@ export interface Statistic {
 
 export interface OptimizedStatistic {
   added: string;
-  count: number;
   vbytes_per_second: number;
   total_fee: number;
   mempool_byte_weight: number;
@@ -455,31 +351,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 {
@@ -501,7 +379,6 @@ export interface IBackendInfo {
   gitCommit: string;
   version: string;
   lightning: boolean;
-  backend: 'esplora' | 'electrum' | 'none';
 }
 
 export interface IDifficultyAdjustment {

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)));
@@ -105,18 +105,14 @@ class AuditReplication {
       template: {
         id: blockHash,
         transactions: auditSummary.template || []
-      },
-      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 || [],

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();
-