Fix backend docker config path for GeoIP data

.github/dependabot.yml

@@ -1,42 +1,24 @@
 version: 2
 updates:
   - package-ecosystem: npm
-    versioning-strategy: increase
     directory: "/backend"
     schedule:
       interval: daily
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "*"
-        update-types:
-          ["version-update:semver-major", "version-update:semver-patch"]
+        update-types: ["version-update:semver-major"]
     allow:
       - dependency-type: "production"
 
   - package-ecosystem: npm
     directory: "/frontend"
-    versioning-strategy: increase
-    groups:
-      frontend-angular-dependencies:
-        patterns:
-          - "@angular*"
-          - "@ng-*"
-          - "ngx-*"
-      frontend-jest-dependencies:
-        patterns:
-          - "@types/jest"
-          - "jest"
-      frontend-eslint-dependencies:
-        patterns:
-          - "@typescript-eslint*"
-          - "eslint"
     schedule:
       interval: daily
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "*"
-        update-types:
-          ["version-update:semver-major", "version-update:semver-patch"]
+        update-types: ["version-update:semver-major"]
     allow:
       - dependency-type: "production"
 
@@ -46,8 +28,7 @@ updates:
       interval: weekly
     ignore:
       - dependency-name: "*"
-        update-types:
-          ["version-update:semver-major", "version-update:semver-patch"]
+        update-types: ["version-update:semver-major"]
 
   - package-ecosystem: docker
     directory: "/docker/frontend"
@@ -55,8 +36,7 @@ updates:
       interval: weekly
     ignore:
       - dependency-name: "*"
-        update-types:
-          ["version-update:semver-major", "version-update:semver-patch"]
+        update-types: ["version-update:semver-major"]
 
   - package-ecosystem: "github-actions"
     directory: "/"
@@ -64,5 +44,4 @@ updates:
       interval: weekly
     ignore:
       - dependency-name: "*"
-        update-types:
-          ["version-update:semver-major", "version-update:semver-patch"]
+        update-types: ["version-update:semver-major"]

.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: ["18", "20"]
+        node: ["16.16.0", "18.14.1"]
         flavor: ["dev", "prod"]
       fail-fast: false
     runs-on: "ubuntu-latest"
@@ -27,18 +27,6 @@ jobs:
           node-version: ${{ matrix.node }}
           registry-url: "https://registry.npmjs.org"
 
-      - name: Read rust-toolchain file from repository
-        id: gettoolchain
-        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@f361669954a8ecfc00a3443f35f9ac8e610ffc06
-        with:
-          toolchain: ${{ steps.gettoolchain.outputs.toolchain }}
-
       - name: Install
         if: ${{ matrix.flavor == 'dev'}}
         run: npm ci
@@ -56,7 +44,7 @@ jobs:
 
       - name: Unit Tests
         if: ${{ matrix.flavor == 'dev'}}
-        run: npm run test:ci
+        run: npm run test
         working-directory: ${{ matrix.node }}/${{ matrix.flavor }}/backend
 
       - name: Build
@@ -67,7 +55,7 @@ jobs:
     if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')"
     strategy:
       matrix:
-        node: ["18", "20"]
+        node: ["16.16.0", "18.14.1"]
         flavor: ["dev", "prod"]
       fail-fast: false
     runs-on: "ubuntu-latest"
@@ -106,6 +94,3 @@ jobs:
       - name: Build
         run: npm run build
         working-directory: ${{ matrix.node }}/${{ matrix.flavor }}/frontend
-        env: 
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-

.github/workflows/cypress.yml

@@ -38,7 +38,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: 20
+          node-version: 16.15.0
           cache: "npm"
           cache-dependency-path: ${{ matrix.module }}/frontend/package-lock.json
 

.github/workflows/get_backend_hash.yml

@@ -1,19 +0,0 @@
-name: 'Print backend hashes'
-
-on: [workflow_dispatch]
-
-jobs:
-  print-backend-sha:
-    runs-on: 'ubuntu-latest'
-    name: Print backend hashes
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          path: repo
-
-      - name: Run script
-        working-directory: repo
-        run: |
-          chmod +x ./scripts/get_backend_hash.sh
-          sh ./scripts/get_backend_hash.sh

.github/workflows/on-tag.yml

@@ -68,17 +68,17 @@ jobs:
         run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
 
       - name: Checkout project
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Init repo for Dockerization
         run: docker/init.sh "$TAG"
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v2
         id: qemu
 
       - name: Setup Docker buildx action
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2
         id: buildx
 
       - name: Available platforms
@@ -98,7 +98,7 @@ jobs:
           docker buildx build \
           --cache-from "type=local,src=/tmp/.buildx-cache" \
           --cache-to "type=local,dest=/tmp/.buildx-cache" \
-          --platform linux/amd64,linux/arm64 \
+          --platform linux/amd64,linux/arm64,linux/arm/v7 \
           --tag ${{ secrets.DOCKER_HUB_USER }}/${{ matrix.service }}:$TAG \
           --tag ${{ secrets.DOCKER_HUB_USER }}/${{ matrix.service }}:latest \
           --output "type=registry" ./${{ matrix.service }}/ \

.gitignore

@@ -5,4 +5,3 @@ backend/mempool-config.json
 *.swp
 frontend/src/resources/config.template.js
 frontend/src/resources/config.js
-target

.nvmrc

@@ -1 +1 @@
-v20.8.0
+v16.16.0

.vscode/settings.json

@@ -1,6 +1,5 @@
 {
   "editor.tabSize": 2,
   "typescript.preferences.importModuleSpecifier": "relative",
-  "typescript.tsdk": "./backend/node_modules/typescript/lib",
-  "rust-analyzer.procMacro.ignored": { "napi-derive": ["napi"] }
+  "typescript.tsdk": "./backend/node_modules/typescript/lib"
 }

Cargo.lock

@@ -1,533 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "aho-corasick"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "bitflags"
-version = "2.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dbe3c979c178231552ecba20214a8272df4e09f232a87aef4320cf06539aded"
-
-[[package]]
-name = "bytemuck"
-version = "1.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
-
-[[package]]
-name = "bytes"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "convert_case"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "ctor"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1586fa608b1dab41f667475b4a41faec5ba680aee428bfa5de4ea520fdc6e901"
-dependencies = [
- "quote",
- "syn 2.0.20",
-]
-
-[[package]]
-name = "gbt"
-version = "0.1.0"
-dependencies = [
- "bytemuck",
- "bytes",
- "napi",
- "napi-build",
- "napi-derive",
- "priority-queue",
- "tracing",
- "tracing-log",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
-[[package]]
-name = "hermit-abi"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "indexmap"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "libc"
-version = "0.2.146"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"
-
-[[package]]
-name = "libloading"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
-dependencies = [
- "cfg-if",
- "winapi",
-]
-
-[[package]]
-name = "log"
-version = "0.4.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
-
-[[package]]
-name = "matchers"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
-dependencies = [
- "regex-automata",
-]
-
-[[package]]
-name = "memchr"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-
-[[package]]
-name = "napi"
-version = "2.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ede2d12cd6fce44da537a4be1f5510c73be2506c2e32dfaaafd1f36968f3a0e"
-dependencies = [
- "bitflags",
- "ctor",
- "napi-derive",
- "napi-sys",
- "once_cell",
- "tokio",
-]
-
-[[package]]
-name = "napi-build"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "882a73d9ef23e8dc2ebbffb6a6ae2ef467c0f18ac10711e4cc59c5485d41df0e"
-
-[[package]]
-name = "napi-derive"
-version = "2.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da1c6a8fa84d549aa8708fcd062372bf8ec6e849de39016ab921067d21bde367"
-dependencies = [
- "cfg-if",
- "convert_case",
- "napi-derive-backend",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "napi-derive-backend"
-version = "1.0.52"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20bbc7c69168d06a848f925ec5f0e0997f98e8c8d4f2cc30157f0da51c009e17"
-dependencies = [
- "convert_case",
- "once_cell",
- "proc-macro2",
- "quote",
- "regex",
- "semver",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "napi-sys"
-version = "2.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "166b5ef52a3ab5575047a9fe8d4a030cdd0f63c96f071cd6907674453b07bae3"
-dependencies = [
- "libloading",
-]
-
-[[package]]
-name = "nu-ansi-term"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
-dependencies = [
- "overload",
- "winapi",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
-
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
-
-[[package]]
-name = "priority-queue"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fff39edfcaec0d64e8d0da38564fad195d2d51b680940295fcc307366e101e61"
-dependencies = [
- "autocfg",
- "indexmap",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "regex"
-version = "1.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax 0.7.2",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax 0.6.29",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
-[[package]]
-name = "regex-syntax"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
-
-[[package]]
-name = "semver"
-version = "1.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
-
-[[package]]
-name = "sharded-slab"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
-
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-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",
- "unicode-ident",
-]
-
-[[package]]
-name = "thread_local"
-version = "1.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
-dependencies = [
- "cfg-if",
- "once_cell",
-]
-
-[[package]]
-name = "tokio"
-version = "1.28.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
-dependencies = [
- "autocfg",
- "num_cpus",
- "pin-project-lite",
- "windows-sys",
-]
-
-[[package]]
-name = "tracing"
-version = "0.1.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
-dependencies = [
- "cfg-if",
- "pin-project-lite",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.20",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
-dependencies = [
- "once_cell",
- "valuable",
-]
-
-[[package]]
-name = "tracing-log"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
-dependencies = [
- "lazy_static",
- "log",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
-dependencies = [
- "matchers",
- "nu-ansi-term",
- "once_cell",
- "regex",
- "sharded-slab",
- "smallvec",
- "thread_local",
- "tracing",
- "tracing-core",
- "tracing-log",
-]
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
-
-[[package]]
-name = "valuable"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-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_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"

Cargo.toml

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

GNUmakefile

@@ -0,0 +1,47 @@
+# If you see pwd_unknown showing up check permissions
+PWD ?= pwd_unknown
+
+# DATABASE DEPLOY FOLDER CONFIG - default ./data
+ifeq ($(data),)
+DATA := data
+export DATA
+else
+DATA := $(data)
+export DATA
+endif
+
+.PHONY: help
+help:
+	@echo ''
+	@echo ''
+	@echo '	Usage: make [COMMAND]'
+	@echo ''
+	@echo '		make all		# build init mempool and electrs'
+	@echo '		make init		# setup some useful configs'
+	@echo '		make mempool		# build q dockerized mempool.space'
+	@echo '		make electrs		# build a docker electrs image'
+	@echo ''
+
+.PHONY: init
+init:
+	@echo ''
+	mkdir -p   $(DATA) $(DATA)/mysql $(DATA)/mysql/data 
+	#REF: https://github.com/mempool/mempool/blob/master/docker/README.md
+	cat docker/docker-compose.yml > docker-compose.yml
+	cat backend/mempool-config.sample.json > backend/mempool-config.json
+.PHONY: mempool
+mempool: init
+	@echo ''
+	docker-compose up --force-recreate --always-recreate-deps
+	@echo ''
+.PHONY: electrs
+electrum:
+	#REF: https://hub.docker.com/r/beli/electrum
+	@echo ''
+	docker build -f docker/electrum/Dockerfile .
+	@echo ''
+.PHONY: all
+all: init
+	make mempool
+#######################
+-include Makefile

LICENSE

@@ -13,7 +13,7 @@ the terms of (at your option) either:
  proxy statement published on <https://mempool.space/about>.
 
 However, this copyright license does not include an implied right or license to
-use our trademarks: The Mempool Open Source Project®, mempool.space™, the
+use our trademarks: The Mempool Open Source Project™, mempool.space™, the
 mempool Logo™, the mempool.space Vertical Logo™, the mempool.space Horizontal
 Logo™, the mempool Square Logo™, and the mempool Blocks logo™ are registered
 trademarks or trademarks of Mempool Space K.K in Japan, the United States,

Makefile

@@ -0,0 +1 @@
+# For additional configs/scripting

README.md

@@ -1,13 +1,13 @@
-# The Mempool Open Source Project® [![mempool](https://img.shields.io/endpoint?url=https://dashboard.cypress.io/badge/simple/ry4br7/master&style=flat-square)](https://dashboard.cypress.io/projects/ry4br7/runs)
+# The Mempool Open Source Project™ [![mempool](https://img.shields.io/endpoint?url=https://dashboard.cypress.io/badge/simple/ry4br7/master&style=flat-square)](https://dashboard.cypress.io/projects/ry4br7/runs)
 
-https://user-images.githubusercontent.com/93150691/226236121-375ea64f-b4a1-4cc0-8fad-a6fb33226840.mp4
-
-<br>
+https://user-images.githubusercontent.com/232186/222445818-234aa6c9-c233-4c52-b3f0-e32b8232893b.mp4
 
 Mempool is the fully-featured mempool visualizer, explorer, and API service running at [mempool.space](https://mempool.space/). 
 
 It is an open-source project developed and operated for the benefit of the Bitcoin community, with a focus on the emerging transaction fee market that is evolving Bitcoin into a multi-layer ecosystem.
 
+![mempool](https://mempool.space/resources/screenshots/v2.4.0-dashboard.png)
+
 # Installation Methods
 
 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. 
@@ -23,7 +23,6 @@ Mempool can be conveniently installed on the following full-node distros:
 - [RoninDojo](https://code.samourai.io/ronindojo/RoninDojo)
 - [myNode](https://github.com/mynodebtc/mynode)
 - [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/.dockerignore

@@ -1 +0,0 @@
-Dockerfile

backend/.gitignore

@@ -45,6 +45,3 @@ testem.log
 #System Files
 .DS_Store
 Thumbs.db
-
-# package folder (npm run package output)
-/package

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 [enterprise sponsors](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 does not provide support for custom setups.
 
 See other ways to set up Mempool on [the main README](/../../#installation-methods).
 
@@ -79,13 +79,11 @@ Query OK, 0 rows affected (0.00 sec)
 
 _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._
-
 Install dependencies with `npm` and build the backend:
 
 ```
 cd backend
-npm install --no-install-links # npm@9.4.2 and later can omit the --no-install-links
+npm install
 npm run build
 ```
 

backend/mempool-config.sample.json

@@ -8,7 +8,6 @@
     "API_URL_PREFIX": "/api/v1/",
     "POLL_RATE_MS": 2000,
     "CACHE_DIR": "./cache",
-    "CACHE_ENABLED": true,
     "CLEAR_PROTECTION_MINUTES": 20,
     "RECOMMENDED_FEE_PERCENTILE": 50,
     "BLOCK_WEIGHT_UNITS": 4000000,
@@ -28,21 +27,13 @@
     "AUDIT": 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
+    "CPFP_INDEXING": false
   },
   "CORE_RPC": {
     "HOST": "127.0.0.1",
     "PORT": 8332,
     "USERNAME": "mempool",
-    "PASSWORD": "mempool",
-    "TIMEOUT": 60000,
-    "COOKIE": false,
-    "COOKIE_PATH": "/path/to/bitcoin/.cookie"
+    "PASSWORD": "mempool"
   },
   "ELECTRUM": {
     "HOST": "127.0.0.1",
@@ -50,22 +41,13 @@
     "TLS_ENABLED": true
   },
   "ESPLORA": {
-    "REST_API_URL": "http://127.0.0.1:3000",
-    "UNIX_SOCKET_PATH": "/tmp/esplora-bitcoin-mainnet",
-    "BATCH_QUERY_BASE_SIZE": 1000,
-    "RETRY_UNIX_SOCKET_AFTER": 30000,
-    "REQUEST_TIMEOUT": 10000,
-    "FALLBACK_TIMEOUT": 5000,
-    "FALLBACK": []
+    "REST_API_URL": "http://127.0.0.1:3000"
   },
   "SECOND_CORE_RPC": {
     "HOST": "127.0.0.1",
     "PORT": 8332,
     "USERNAME": "mempool",
-    "PASSWORD": "mempool",
-    "TIMEOUT": 60000,
-    "COOKIE": false,
-    "COOKIE_PATH": "/path/to/bitcoin/.cookie"
+    "PASSWORD": "mempool"
   },
   "DATABASE": {
     "ENABLED": true,
@@ -74,9 +56,7 @@
     "SOCKET": "/var/run/mysql/mysql.sock",
     "DATABASE": "mempool",
     "USERNAME": "mempool",
-    "PASSWORD": "mempool",
-    "TIMEOUT": 180000,
-    "PID_DIR": ""
+    "PASSWORD": "mempool"
   },
   "SYSLOG": {
     "ENABLED": true,
@@ -111,8 +91,7 @@
   "LND": {
     "TLS_CERT_PATH": "tls.cert",
     "MACAROON_PATH": "readonly.macaroon",
-    "REST_API_URL": "https://localhost:8080",
-    "TIMEOUT": 10000
+    "REST_API_URL": "https://localhost:8080"
   },
   "CLIGHTNING": {
     "SOCKET": "lightning-rpc"
@@ -125,6 +104,10 @@
     "USERNAME": "",
     "PASSWORD": ""
   },
+  "PRICE_DATA_SERVER": {
+    "TOR_URL": "http://wizpriceje6q5tdrxkyiazsgu7irquiqjy2dptezqhrtu7l2qelqktid.onion/getAllMarketPrices",
+    "CLEARNET_URL": "https://price.bisq.wiz.biz/getAllMarketPrices"
+  },
   "EXTERNAL_DATA_SERVER": {
     "MEMPOOL_API": "https://mempool.space/api/v1",
     "MEMPOOL_ONION": "http://mempoolhqx4isw62xs7abwphsq7ldayuidyx2v2oethdhhj6mlo2r6ad.onion/api/v1",
@@ -132,25 +115,5 @@
     "LIQUID_ONION": "http://liquidmom47f6s3m53ebfxn47p76a6tlnxib3wp6deux7wuzotdr6cyd.onion/api/v1",
     "BISQ_URL": "https://bisq.markets/api",
     "BISQ_ONION": "http://bisqmktse2cabavbr2xjq7xw3h6g5ottemo5rolfcwt6aly6tp5fdryd.onion/api"
-  },
-  "REDIS": {
-    "ENABLED": false,
-    "UNIX_SOCKET_PATH": "/tmp/redis.sock",
-    "BATCH_QUERY_BASE_SIZE": 5000
-  },
-  "REPLICATION": {
-    "ENABLED": false,
-    "AUDIT": false,
-    "AUDIT_START_HEIGHT": 774000,
-    "SERVERS": [
-      "list",
-      "of",
-      "trusted",
-      "servers"
-    ]
-  },
-  "MEMPOOL_SERVICES": {
-    "API": "https://mempool.space/api",
-    "ACCELERATIONS": false
   }
 }

backend/npm_package.sh

@@ -1,17 +0,0 @@
-#/bin/sh
-set -e
-
-# Remove previous dist folder
-rm -rf dist
-# Build new dist folder
-npm run build
-# Remove previous package folder
-rm -rf package
-# Move JS and deps
-mv dist package
-cp -R node_modules package
-# Remove symlink for rust-gbt and insert real folder
-rm package/node_modules/rust-gbt
-cp -R rust-gbt package/node_modules
-# Clean up deps
-npm run package-rm-build-deps

backend/npm_package_rm_build_deps.sh

@@ -1,12 +0,0 @@
-#/bin/sh
-set -e
-
-# Cleaning up inside the node_modules folder
-cd package/node_modules
-rm -r \
-  typescript \
-  @typescript-eslint \
-  @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.0.0-dev",
+  "version": "2.5.0-dev",
   "description": "Bitcoin mempool visualizer and blockchain explorer backend",
   "license": "GNU Affero General Public License v3.0",
   "homepage": "https://mempool.space",
@@ -22,52 +22,47 @@
   "main": "index.ts",
   "scripts": {
     "tsc": "./node_modules/typescript/bin/tsc -p tsconfig.build.json",
-    "build": "npm run rust-build && npm run tsc && npm run create-resources",
+    "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",
+    "package": "npm run build && rm -rf package && mv dist package && mv node_modules package && npm run package-rm-build-deps",
+    "package-rm-build-deps": "(cd package/node_modules; rm -r typescript @typescript-eslint)",
     "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",
-    "reindex-all-blocks": "npm run start-production --update-pools --reindex-blocks",
     "test": "./node_modules/.bin/jest --coverage",
-    "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}\"",
-    "rust-build": "cd rust-gbt && npm run build-release"
+    "prettier": "./node_modules/.bin/prettier --write \"src/**/*.{js,ts}\""
   },
   "dependencies": {
-    "@babel/core": "^7.23.2",
-    "@mempool/electrum-client": "1.1.9",
-    "@types/node": "^18.15.3",
-    "axios": "~1.6.1",
-    "bitcoinjs-lib": "~6.1.3",
-    "crypto-js": "~4.2.0",
+    "@babel/core": "^7.20.12",
+    "@mempool/electrum-client": "^1.1.7",
+    "@types/node": "^16.18.11",
+    "axios": "~0.27.2",
+    "bitcoinjs-lib": "~6.1.0",
+    "crypto-js": "~4.1.1",
     "express": "~4.18.2",
-    "maxmind": "~4.3.11",
-    "mysql2": "~3.6.0",
-    "rust-gbt": "file:./rust-gbt",
-    "redis": "^4.6.6",
+    "maxmind": "~4.3.8",
+    "mysql2": "~2.3.3",
+    "node-worker-threads-pool": "~1.5.1",
     "socks-proxy-agent": "~7.0.0",
-    "typescript": "~4.9.3",
-    "ws": "~8.13.0"
+    "typescript": "~4.7.4",
+    "ws": "~8.11.0"
   },
   "devDependencies": {
+    "@babel/core": "^7.20.7",
     "@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.5",
-    "@typescript-eslint/eslint-plugin": "^5.55.0",
-    "@typescript-eslint/parser": "^5.55.0",
-    "eslint": "^8.36.0",
-    "eslint-config-prettier": "^8.8.0",
-    "jest": "^29.5.0",
-    "prettier": "^3.0.0",
-    "ts-jest": "^29.1.1",
+    "@types/express": "^4.17.15",
+    "@types/jest": "^29.2.5",
+    "@types/ws": "~8.5.4",
+    "@typescript-eslint/eslint-plugin": "^5.48.1",
+    "@typescript-eslint/parser": "^5.48.1",
+    "eslint": "^8.31.0",
+    "eslint-config-prettier": "^8.5.0",
+    "jest": "^29.3.1",
+    "prettier": "^2.8.2",
+    "ts-jest": "^29.0.3",
     "ts-node": "^10.9.1"
   }
 }

backend/rust-gbt/.gitignore

@@ -1,4 +0,0 @@
-*.node
-**/node_modules
-**/.DS_Store
-npm-debug.log*

backend/rust-gbt/Cargo.toml

@@ -1,25 +0,0 @@
-[package]
-name = "gbt"
-version = "0.1.0"
-description = "An inefficient re-implementation of the getBlockTemplate algorithm in Rust"
-authors = ["mononaut"]
-edition = "2021"
-publish = false
-
-[lib]
-crate-type = ["cdylib"]
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-priority-queue = "1.3.2"
-bytes = "1.4.0"
-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.1.3"
-tracing-subscriber = { version = "0.3.15", features = ["env-filter"]}
-
-[build-dependencies]
-napi-build = "2.0.1"

backend/rust-gbt/README.md

@@ -1,123 +0,0 @@
-# gbt
-
-**gbt:** rust implementation of the getBlockTemplate algorithm
-
-This project was bootstrapped by [napi](https://www.npmjs.com/package/@napi-rs/cli).
-
-## Installing gbt
-
-Installing gbt requires a [supported version of Node and Rust](https://github.com/napi-rs/napi-rs#platform-support).
-
-The build process also requires [Rust](https://www.rust-lang.org/tools/install) to be installed.
-
-You can install the project with npm. In the project directory, run:
-
-```sh
-$ npm install
-```
-
-This fully installs the project, including installing any dependencies and running the build.
-
-## Building gbt
-
-If you have already installed the project and only want to run the build, run:
-
-```sh
-$ npm run build
-```
-
-This command uses the [napi build](https://www.npmjs.com/package/@napi-rs/cli) utility to run the Rust build and copy the built library into `./gbt.[TARGET_TRIPLE].node`.
-
-## Exploring gbt
-
-After building gbt, you can explore its exports at the Node REPL:
-
-```sh
-$ npm install
-$ node
-> require('.').hello()
-"hello node"
-```
-
-## Available Scripts
-
-In the project directory, you can run:
-
-### `npm install`
-
-Installs the project, including running `npm run build-release`.
-
-### `npm build`
-
-Builds the Node addon (`gbt.[TARGET_TRIPLE].node`) from source.
-
-Additional [`cargo build`](https://doc.rust-lang.org/cargo/commands/cargo-build.html) arguments may be passed to `npm build` and `npm build-*` commands. For example, to enable a [cargo feature](https://doc.rust-lang.org/cargo/reference/features.html):
-
-```
-npm run build -- --feature=beetle
-```
-
-#### `npm build-debug`
-
-Alias for `npm build`.
-
-#### `npm build-release`
-
-Same as [`npm build`](#npm-build) but, builds the module with the [`release`](https://doc.rust-lang.org/cargo/reference/profiles.html#release) profile. Release builds will compile slower, but run faster.
-
-### `npm test`
-
-Runs the unit tests by calling `cargo test`. You can learn more about [adding tests to your Rust code](https://doc.rust-lang.org/book/ch11-01-writing-tests.html) from the [Rust book](https://doc.rust-lang.org/book/).
-
-## Project Layout
-
-The directory structure of this project is:
-
-```
-gbt/
-├── Cargo.toml
-├── README.md
-├── gbt.[TARGET_TRIPLE].node
-├── package.json
-├── src/
-|   └── lib.rs
-└── target/
-```
-
-### Cargo.toml
-
-The Cargo [manifest file](https://doc.rust-lang.org/cargo/reference/manifest.html), which informs the `cargo` command.
-
-### README.md
-
-This file.
-
-### gbt.\[TARGET_TRIPLE\].node
-
-The Node addon—i.e., a binary Node module—generated by building the project. This is the main module for this package, as dictated by the `"main"` key in `package.json`.
-
-Under the hood, a [Node addon](https://nodejs.org/api/addons.html) is a [dynamically-linked shared object](https://en.wikipedia.org/wiki/Library_(computing)#Shared_libraries). The `"build"` script produces this file by copying it from within the `target/` directory, which is where the Rust build produces the shared object.
-
-### package.json
-
-The npm [manifest file](https://docs.npmjs.com/cli/v7/configuring-npm/package-json), which informs the `npm` command.
-
-### src/
-
-The directory tree containing the Rust source code for the project.
-
-### src/lib.rs
-
-The Rust library's main module.
-
-### target/
-
-Binary artifacts generated by the Rust build.
-
-## Learn More
-
-To learn more about Neon, see the [Napi-RS documentation](https://napi.rs/docs/introduction/getting-started).
-
-To learn more about Rust, see the [Rust documentation](https://www.rust-lang.org).
-
-To learn more about Node, see the [Node documentation](https://nodejs.org).

backend/rust-gbt/build.rs

@@ -1,3 +0,0 @@
-fn main() {
-    napi_build::setup();
-}

backend/rust-gbt/index.d.ts

@@ -1,49 +0,0 @@
-/* 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

@@ -1,258 +0,0 @@
-/* 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

@@ -1,34 +0,0 @@
-{
-  "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

@@ -1,33 +0,0 @@
-{
-  "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/audit_transaction.rs

@@ -1,225 +0,0 @@
-use crate::{
-    u32_hasher_types::{u32hashset_new, U32HasherState},
-    ThreadTransaction, thread_acceleration::ThreadAcceleration,
-};
-use std::{
-    cmp::Ordering,
-    collections::HashSet,
-    hash::{Hash, Hasher},
-};
-
-#[allow(clippy::struct_excessive_bools)]
-#[derive(Clone, Debug)]
-pub struct AuditTransaction {
-    pub uid: u32,
-    order: u32,
-    pub fee: u64,
-    pub weight: u32,
-    // exact sigop-adjusted weight
-    pub sigop_adjusted_weight: u32,
-    // sigop-adjusted vsize rounded up the the next integer
-    pub sigop_adjusted_vsize: u32,
-    pub sigops: u32,
-    adjusted_fee_per_vsize: f64,
-    pub effective_fee_per_vsize: f64,
-    pub dependency_rate: f64,
-    pub inputs: Vec<u32>,
-    pub relatives_set_flag: bool,
-    pub ancestors: HashSet<u32, U32HasherState>,
-    pub children: HashSet<u32, U32HasherState>,
-    ancestor_fee: u64,
-    ancestor_sigop_adjusted_weight: u32,
-    ancestor_sigop_adjusted_vsize: u32,
-    ancestor_sigops: u32,
-    // Safety: Must be private to prevent NaN breaking Ord impl.
-    score: f64,
-    pub used: bool,
-    /// whether this transaction has been moved to the "modified" priority queue
-    pub modified: bool,
-    pub dirty: bool,
-}
-
-impl Hash for AuditTransaction {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        self.uid.hash(state);
-    }
-}
-
-impl PartialEq for AuditTransaction {
-    fn eq(&self, other: &Self) -> bool {
-        self.uid == other.uid
-    }
-}
-
-impl Eq for AuditTransaction {}
-
-#[inline]
-pub fn partial_cmp_uid_score(a: (u32, u32, f64), b: (u32, u32, f64)) -> Option<Ordering> {
-    // If either score is NaN, this is false,
-    // and partial_cmp will return None
-    if a.2 != b.2 {
-        // compare by score (sorts by ascending score)
-        a.2.partial_cmp(&b.2)
-    } else if a.1 != b.1 {
-        // tie-break by comparing partial txids (sorts by descending txid)
-        Some(b.1.cmp(&a.1))
-    } else {
-        // tie-break partial txid collisions by comparing uids (sorts by descending uid)
-        Some(b.0.cmp(&a.0))
-    }
-}
-
-impl PartialOrd for AuditTransaction {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        partial_cmp_uid_score(
-            (self.uid, self.order, self.score),
-            (other.uid, other.order, other.score),
-        )
-    }
-}
-
-impl Ord for AuditTransaction {
-    fn cmp(&self, other: &Self) -> Ordering {
-        // Safety: The only possible values for score are f64
-        // that are not NaN. This is because outside code can not
-        // freely assign score. Also, calc_new_score guarantees no NaN.
-        self.partial_cmp(other).expect("score will never be NaN")
-    }
-}
-
-#[inline]
-fn calc_fee_rate(fee: u64, vsize: f64) -> f64 {
-    (fee as f64) / (if vsize == 0.0 { 1.0 } else { vsize })
-}
-
-impl AuditTransaction {
-    pub fn from_thread_transaction(tx: &ThreadTransaction, maybe_acceleration: Option<Option<&ThreadAcceleration>>) -> Self {
-        let fee_delta = match maybe_acceleration {
-            Some(Some(acceleration)) => acceleration.delta,
-            _ => 0.0
-        };
-        let fee = (tx.fee as u64) + (fee_delta as u64);
-        // rounded up to the nearest integer
-        let is_adjusted = tx.weight < (tx.sigops * 20);
-        let sigop_adjusted_vsize = ((tx.weight + 3) / 4).max(tx.sigops * 5);
-        let sigop_adjusted_weight = tx.weight.max(tx.sigops * 20);
-        let effective_fee_per_vsize = if is_adjusted || fee_delta > 0.0 {
-            calc_fee_rate(fee, f64::from(sigop_adjusted_weight) / 4.0)
-        } else {
-            tx.effective_fee_per_vsize
-        };
-        Self {
-            uid: tx.uid,
-            order: tx.order,
-            fee,
-            weight: tx.weight,
-            sigop_adjusted_weight,
-            sigop_adjusted_vsize,
-            sigops: tx.sigops,
-            adjusted_fee_per_vsize: calc_fee_rate(fee, f64::from(sigop_adjusted_vsize)),
-            effective_fee_per_vsize,
-            dependency_rate: f64::INFINITY,
-            inputs: tx.inputs.clone(),
-            relatives_set_flag: false,
-            ancestors: u32hashset_new(),
-            children: u32hashset_new(),
-            ancestor_fee: fee,
-            ancestor_sigop_adjusted_weight: sigop_adjusted_weight,
-            ancestor_sigop_adjusted_vsize: sigop_adjusted_vsize,
-            ancestor_sigops: tx.sigops,
-            score: 0.0,
-            used: false,
-            modified: false,
-            dirty: effective_fee_per_vsize != tx.effective_fee_per_vsize || fee_delta > 0.0,
-        }
-    }
-
-    #[inline]
-    pub const fn score(&self) -> f64 {
-        self.score
-    }
-
-    #[inline]
-    pub const fn order(&self) -> u32 {
-        self.order
-    }
-
-    #[inline]
-    pub const fn ancestor_sigop_adjusted_vsize(&self) -> u32 {
-        self.ancestor_sigop_adjusted_vsize
-    }
-
-    #[inline]
-    pub const fn ancestor_sigops(&self) -> u32 {
-        self.ancestor_sigops
-    }
-
-    #[inline]
-    pub fn cluster_rate(&self) -> f64 {
-        // Safety: self.ancestor_weight can never be 0.
-        // Even if it could, as it approaches 0, the value inside the min() call
-        // grows, so if we think of 0 as "grew infinitely" then dependency_rate would be
-        // the smaller of the two. If either side is NaN, the other side is returned.
-        self.dependency_rate.min(calc_fee_rate(
-            self.ancestor_fee,
-            f64::from(self.ancestor_sigop_adjusted_weight) / 4.0,
-        ))
-    }
-
-    pub fn set_dirty_if_different(&mut self, cluster_rate: f64) {
-        if self.effective_fee_per_vsize != cluster_rate {
-            self.effective_fee_per_vsize = cluster_rate;
-            self.dirty = true;
-        }
-    }
-
-    /// Safety: This function must NEVER set score to NaN.
-    #[inline]
-    fn calc_new_score(&mut self) {
-        self.score = self.adjusted_fee_per_vsize.min(calc_fee_rate(
-            self.ancestor_fee,
-            f64::from(self.ancestor_sigop_adjusted_vsize),
-        ));
-    }
-
-    #[inline]
-    pub fn set_ancestors(
-        &mut self,
-        ancestors: HashSet<u32, U32HasherState>,
-        total_fee: u64,
-        total_sigop_adjusted_weight: u32,
-        total_sigop_adjusted_vsize: u32,
-        total_sigops: u32,
-    ) {
-        self.ancestors = ancestors;
-        self.ancestor_fee = self.fee + total_fee;
-        self.ancestor_sigop_adjusted_weight =
-            self.sigop_adjusted_weight + total_sigop_adjusted_weight;
-        self.ancestor_sigop_adjusted_vsize = self.sigop_adjusted_vsize + total_sigop_adjusted_vsize;
-        self.ancestor_sigops = self.sigops + total_sigops;
-        self.calc_new_score();
-        self.relatives_set_flag = true;
-    }
-
-    #[inline]
-    pub fn remove_root(
-        &mut self,
-        root_txid: u32,
-        root_fee: u64,
-        root_sigop_adjusted_weight: u32,
-        root_sigop_adjusted_vsize: u32,
-        root_sigops: u32,
-        cluster_rate: f64,
-    ) -> f64 {
-        let old_score = self.score();
-        self.dependency_rate = self.dependency_rate.min(cluster_rate);
-        if self.ancestors.remove(&root_txid) {
-            self.ancestor_fee -= root_fee;
-            self.ancestor_sigop_adjusted_weight -= root_sigop_adjusted_weight;
-            self.ancestor_sigop_adjusted_vsize -= root_sigop_adjusted_vsize;
-            self.ancestor_sigops -= root_sigops;
-            self.calc_new_score();
-        }
-        old_score
-    }
-}

backend/rust-gbt/src/gbt.rs

@@ -1,430 +0,0 @@
-use priority_queue::PriorityQueue;
-use std::{cmp::Ordering, collections::HashSet, mem::ManuallyDrop};
-use tracing::{info, trace};
-
-use crate::{
-    audit_transaction::{partial_cmp_uid_score, AuditTransaction},
-    u32_hasher_types::{u32hashset_new, u32priority_queue_with_capacity, U32HasherState},
-    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>;
-
-#[derive(Debug)]
-struct TxPriority {
-    uid: u32,
-    order: u32,
-    score: f64,
-}
-impl PartialEq for TxPriority {
-    fn eq(&self, other: &Self) -> bool {
-        self.uid == other.uid
-    }
-}
-impl Eq for TxPriority {}
-impl PartialOrd for TxPriority {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        partial_cmp_uid_score(
-            (self.uid, self.order, self.score),
-            (other.uid, other.order, other.score),
-        )
-    }
-}
-impl Ord for TxPriority {
-    fn cmp(&self, other: &Self) -> Ordering {
-        self.partial_cmp(other).expect("score will never be NaN")
-    }
-}
-
-/// Build projected mempool blocks using an approximation of the transaction selection algorithm from Bitcoin Core.
-///
-/// See `BlockAssembler` in Bitcoin Core's
-/// [miner.cpp](https://github.com/bitcoin/bitcoin/blob/master/src/node/miner.cpp).
-/// Ported from mempool backend's
-/// [tx-selection-worker.ts](https://github.com/mempool/mempool/blob/master/backend/src/api/tx-selection-worker.ts).
-//
-// 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) -> 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);
-    }
-
-    let mempool_len = mempool.len();
-    let mut audit_pool: AuditPool = Vec::with_capacity(max_uid + 1);
-    audit_pool.resize(max_uid + 1, None);
-    let mut mempool_stack: Vec<u32> = Vec::with_capacity(mempool_len);
-    let mut clusters: Vec<Vec<u32>> = Vec::new();
-    let mut block_weights: Vec<u32> = Vec::new();
-
-    info!("Initializing working structs");
-    for (uid, tx) in &mut *mempool {
-        let acceleration = indexed_accelerations.get(*uid as usize);
-        let audit_tx = AuditTransaction::from_thread_transaction(tx, acceleration.copied());
-        // Safety: audit_pool and mempool_stack must always contain the same transactions
-        audit_pool[*uid as usize] = Some(ManuallyDrop::new(audit_tx));
-        mempool_stack.push(*uid);
-    }
-
-    info!("Building relatives graph & calculate ancestor scores");
-    for txid in &mempool_stack {
-        set_relatives(*txid, &mut audit_pool);
-    }
-    trace!("Post relative graph Audit Pool: {:#?}", audit_pool);
-
-    info!("Sorting by descending ancestor score");
-    let mut mempool_stack: Vec<(u32, u32, f64)> = mempool_stack
-        .into_iter()
-        .map(|txid| {
-            let atx = audit_pool
-                .get(txid as usize)
-                .and_then(Option::as_ref)
-                .expect("All txids are from audit_pool");
-            (txid, atx.order(), atx.score())
-        })
-        .collect();
-    mempool_stack.sort_unstable_by(|a, b| partial_cmp_uid_score(*a, *b).expect("Not NaN"));
-    let mut mempool_stack: Vec<u32> = mempool_stack.into_iter().map(|(txid, _, _)| txid).collect();
-
-    info!("Building blocks by greedily choosing the highest feerate package");
-    info!("(i.e. the package rooted in the transaction with the best ancestor score)");
-    let mut blocks: Vec<Vec<u32>> = Vec::new();
-    let mut block_weight: u32 = BLOCK_RESERVED_WEIGHT;
-    let mut block_sigops: u32 = BLOCK_RESERVED_SIGOPS;
-    // No need to be bigger than 4096 transactions for the per-block transaction Vec.
-    let initial_txes_per_block: usize = 4096.min(mempool_len);
-    let mut transactions: Vec<u32> = Vec::with_capacity(initial_txes_per_block);
-    let mut modified: ModifiedQueue = u32priority_queue_with_capacity(mempool_len);
-    let mut overflow: Vec<u32> = Vec::new();
-    let mut failures = 0;
-    while !mempool_stack.is_empty() || !modified.is_empty() {
-        // This trace log storm is big, so to make scrolling through
-        // Each iteration easier, leaving a bunch of empty rows
-        // And a header of ======
-        trace!("\n\n\n\n\n\n\n\n\n\n==================================");
-        trace!("mempool_array: {:#?}", mempool_stack);
-        trace!("clusters: {:#?}", clusters);
-        trace!("modified: {:#?}", modified);
-        trace!("audit_pool: {:#?}", audit_pool);
-        trace!("blocks: {:#?}", blocks);
-        trace!("block_weight: {:#?}", block_weight);
-        trace!("block_sigops: {:#?}", block_sigops);
-        trace!("transactions: {:#?}", transactions);
-        trace!("overflow: {:#?}", overflow);
-        trace!("failures: {:#?}", failures);
-        trace!("\n==================================");
-
-        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() {
-            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 {
-            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 is_cluster {
-                clusters.push(cluster);
-            }
-
-            failures = 0;
-        }
-
-        // this block is full
-        let exceeded_package_tries =
-            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) {
-            // finalize this block
-            if !transactions.is_empty() {
-                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;
-            block_sigops = BLOCK_RESERVED_SIGOPS;
-            failures = 0;
-            // 'overflow' packages didn't fit in this block, but are valid candidates for the next
-            overflow.reverse();
-            for overflowed in &overflow {
-                if let Some(Some(overflowed_tx)) = audit_pool.get(*overflowed as usize) {
-                    if overflowed_tx.modified {
-                        modified.push(
-                            *overflowed,
-                            TxPriority {
-                                uid: *overflowed,
-                                order: overflowed_tx.order(),
-                                score: overflowed_tx.score(),
-                            },
-                        );
-                    } else {
-                        mempool_stack.push(*overflowed);
-                    }
-                }
-            }
-            overflow = Vec::new();
-        }
-    }
-    info!("add the final unbounded block if it contains any transactions");
-    if !transactions.is_empty() {
-        blocks.push(transactions);
-        block_weights.push(block_weight);
-    }
-
-    info!("make a list of dirty transactions and their new rates");
-    let mut rates: Vec<Vec<f64>> = Vec::new();
-    for (uid, thread_tx) in mempool {
-        // Takes ownership of the audit_tx and replaces with None
-        if let Some(Some(audit_tx)) = audit_pool.get_mut(*uid as usize).map(Option::take) {
-            trace!("txid: {}, is_dirty: {}", uid, audit_tx.dirty);
-            if audit_tx.dirty {
-                rates.push(vec![f64::from(*uid), audit_tx.effective_fee_per_vsize]);
-                thread_tx.effective_fee_per_vsize = audit_tx.effective_fee_per_vsize;
-            }
-            // Drops the AuditTransaction manually
-            // There are no audit_txs that are not in the mempool HashMap
-            // So there is guaranteed to be no memory leaks.
-            ManuallyDrop::into_inner(audit_tx);
-        }
-    }
-    trace!("\n\n\n\n\n====================");
-    trace!("blocks: {:#?}", blocks);
-    trace!("clusters: {:#?}", clusters);
-    trace!("rates: {:#?}\n====================\n\n\n\n\n", rates);
-
-    GbtResult {
-        blocks,
-        block_weights,
-        clusters,
-        rates,
-    }
-}
-
-fn next_valid_from_stack<'a>(
-    mempool_stack: &mut Vec<u32>,
-    audit_pool: &'a AuditPool,
-) -> Option<&'a AuditTransaction> {
-    while let Some(next_txid) = mempool_stack.last() {
-        match audit_pool.get(*next_txid as usize) {
-            Some(Some(tx)) if !tx.used && !tx.modified => {
-                return Some(tx);
-            }
-            _ => {
-                mempool_stack.pop();
-            }
-        }
-    }
-    None
-}
-
-fn next_valid_from_queue<'a>(
-    queue: &mut ModifiedQueue,
-    audit_pool: &'a AuditPool,
-) -> Option<&'a AuditTransaction> {
-    while let Some((next_txid, _)) = queue.peek() {
-        match audit_pool.get(*next_txid as usize) {
-            Some(Some(tx)) if !tx.used => {
-                return Some(tx);
-            }
-            _ => {
-                queue.pop();
-            }
-        }
-    }
-    None
-}
-
-fn set_relatives(txid: u32, audit_pool: &mut AuditPool) {
-    let mut parents: HashSet<u32, U32HasherState> = u32hashset_new();
-    if let Some(Some(tx)) = audit_pool.get(txid as usize) {
-        if tx.relatives_set_flag {
-            return;
-        }
-        for input in &tx.inputs {
-            parents.insert(*input);
-        }
-    } else {
-        return;
-    }
-
-    let mut ancestors: HashSet<u32, U32HasherState> = u32hashset_new();
-    for parent_id in &parents {
-        set_relatives(*parent_id, audit_pool);
-
-        if let Some(Some(parent)) = audit_pool.get_mut(*parent_id as usize) {
-            // Safety: ancestors must always contain only txes in audit_pool
-            ancestors.insert(*parent_id);
-            parent.children.insert(txid);
-            for ancestor in &parent.ancestors {
-                ancestors.insert(*ancestor);
-            }
-        }
-    }
-
-    let mut total_fee: u64 = 0;
-    let mut total_sigop_adjusted_weight: u32 = 0;
-    let mut total_sigop_adjusted_vsize: u32 = 0;
-    let mut total_sigops: u32 = 0;
-
-    for ancestor_id in &ancestors {
-        if let Some(ancestor) = audit_pool
-            .get(*ancestor_id as usize)
-            .expect("audit_pool contains all ancestors")
-        {
-            total_fee += ancestor.fee;
-            total_sigop_adjusted_weight += ancestor.sigop_adjusted_weight;
-            total_sigop_adjusted_vsize += ancestor.sigop_adjusted_vsize;
-            total_sigops += ancestor.sigops;
-        } else { todo!() };
-    }
-
-    if let Some(Some(tx)) = audit_pool.get_mut(txid as usize) {
-        tx.set_ancestors(
-            ancestors,
-            total_fee,
-            total_sigop_adjusted_weight,
-            total_sigop_adjusted_vsize,
-            total_sigops,
-        );
-    }
-}
-
-// iterate over remaining descendants, removing the root as a valid ancestor & updating the ancestor score
-fn update_descendants(
-    root_txid: u32,
-    audit_pool: &mut AuditPool,
-    modified: &mut ModifiedQueue,
-    cluster_rate: f64,
-) {
-    let mut visited: HashSet<u32, U32HasherState> = u32hashset_new();
-    let mut descendant_stack: Vec<u32> = Vec::new();
-    let root_fee: u64;
-    let root_sigop_adjusted_weight: u32;
-    let root_sigop_adjusted_vsize: u32;
-    let root_sigops: u32;
-    if let Some(Some(root_tx)) = audit_pool.get(root_txid as usize) {
-        for descendant_id in &root_tx.children {
-            if !visited.contains(descendant_id) {
-                descendant_stack.push(*descendant_id);
-                visited.insert(*descendant_id);
-            }
-        }
-        root_fee = root_tx.fee;
-        root_sigop_adjusted_weight = root_tx.sigop_adjusted_weight;
-        root_sigop_adjusted_vsize = root_tx.sigop_adjusted_vsize;
-        root_sigops = root_tx.sigops;
-    } else {
-        return;
-    }
-    while let Some(next_txid) = descendant_stack.pop() {
-        if let Some(Some(descendant)) = audit_pool.get_mut(next_txid as usize) {
-            // remove root tx as ancestor
-            let old_score = descendant.remove_root(
-                root_txid,
-                root_fee,
-                root_sigop_adjusted_weight,
-                root_sigop_adjusted_vsize,
-                root_sigops,
-                cluster_rate,
-            );
-            // add to priority queue or update priority if score has changed
-            if descendant.score() < old_score {
-                descendant.modified = true;
-                modified.push_decrease(
-                    descendant.uid,
-                    TxPriority {
-                        uid: descendant.uid,
-                        order: descendant.order(),
-                        score: descendant.score(),
-                    },
-                );
-            } else if descendant.score() > old_score {
-                descendant.modified = true;
-                modified.push_increase(
-                    descendant.uid,
-                    TxPriority {
-                        uid: descendant.uid,
-                        order: descendant.order(),
-                        score: descendant.score(),
-                    },
-                );
-            }
-
-            // add this node's children to the stack
-            for child_id in &descendant.children {
-                if !visited.contains(child_id) {
-                    descendant_stack.push(*child_id);
-                    visited.insert(*child_id);
-                }
-            }
-        }
-    }
-}

backend/rust-gbt/src/lib.rs

@@ -1,183 +0,0 @@
-#![warn(clippy::all)]
-#![warn(clippy::pedantic)]
-#![warn(clippy::nursery)]
-#![allow(clippy::cast_precision_loss)]
-#![allow(clippy::cast_possible_truncation)]
-#![allow(clippy::cast_sign_loss)]
-#![allow(clippy::float_cmp)]
-
-use napi::bindgen_prelude::Result;
-use napi_derive::napi;
-use thread_transaction::ThreadTransaction;
-use thread_acceleration::ThreadAcceleration;
-use tracing::{debug, info, trace};
-use tracing_log::LogTracer;
-use tracing_subscriber::{EnvFilter, FmtSubscriber};
-
-use std::collections::HashMap;
-use std::sync::{Arc, Mutex};
-
-mod audit_transaction;
-mod gbt;
-mod thread_transaction;
-mod thread_acceleration;
-mod u32_hasher_types;
-
-use u32_hasher_types::{u32hashmap_with_capacity, U32HasherState};
-
-/// This is the initial capacity of the `GbtGenerator` struct's inner `HashMap`.
-///
-/// Note: This doesn't *have* to be a power of 2. (uwu)
-const STARTING_CAPACITY: usize = 1_048_576;
-
-type ThreadTransactionsMap = HashMap<u32, ThreadTransaction, U32HasherState>;
-
-#[napi]
-pub struct GbtGenerator {
-    thread_transactions: Arc<Mutex<ThreadTransactionsMap>>,
-}
-
-#[napi::module_init]
-fn init() {
-    // Set all `tracing` logs to print to STDOUT
-    // Note: Passing RUST_LOG env variable to the node process
-    //       will change the log level for the rust module.
-    tracing::subscriber::set_global_default(
-        FmtSubscriber::builder()
-            .with_env_filter(EnvFilter::from_default_env())
-            .with_ansi(
-                // Default to no-color logs.
-                // Setting RUST_LOG_COLOR to 1 or true|TRUE|True etc.
-                // will enable color
-                std::env::var("RUST_LOG_COLOR")
-                    .map(|s| ["1", "true"].contains(&&*s.to_lowercase()))
-                    .unwrap_or(false),
-            )
-            .finish(),
-    )
-    .expect("Logging subscriber failed");
-    // Convert all `log` logs into `tracing` events
-    LogTracer::init().expect("Legacy log subscriber failed");
-}
-
-#[napi]
-impl GbtGenerator {
-    #[napi(constructor)]
-    #[allow(clippy::new_without_default)]
-    #[must_use]
-    pub fn new() -> Self {
-        debug!("Created new GbtGenerator");
-        Self {
-            thread_transactions: Arc::new(Mutex::new(u32hashmap_with_capacity(STARTING_CAPACITY))),
-        }
-    }
-
-    /// # Errors
-    ///
-    /// 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> {
-        trace!("make: Current State {:#?}", self.thread_transactions);
-        run_task(
-            Arc::clone(&self.thread_transactions),
-            accelerations,
-            max_uid as usize,
-            move |map| {
-                for tx in mempool {
-                    map.insert(tx.uid, tx);
-                }
-            },
-        )
-        .await
-    }
-
-    /// # Errors
-    ///
-    /// Rejects if the thread panics or if the Mutex is poisoned.
-    #[napi]
-    pub async fn update(
-        &self,
-        new_txs: Vec<ThreadTransaction>,
-        remove_txs: Vec<u32>,
-        accelerations: Vec<ThreadAcceleration>,
-        max_uid: u32,
-    ) -> Result<GbtResult> {
-        trace!("update: Current State {:#?}", self.thread_transactions);
-        run_task(
-            Arc::clone(&self.thread_transactions),
-            accelerations,
-            max_uid as usize,
-            move |map| {
-                for tx in new_txs {
-                    map.insert(tx.uid, tx);
-                }
-                for txid in &remove_txs {
-                    map.remove(txid);
-                }
-            },
-        )
-        .await
-    }
-}
-
-/// 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)
-#[napi(constructor)]
-pub struct GbtResult {
-    pub blocks: Vec<Vec<u32>>,
-    pub block_weights: Vec<u32>,
-    pub clusters: Vec<Vec<u32>>,
-    pub rates: Vec<Vec<f64>>, // Tuples not supported. u32 fits inside f64
-}
-
-/// All on another thread, this runs an arbitrary task in between
-/// taking the lock and running gbt.
-///
-/// Rather than filling / updating the `HashMap` on the main thread,
-/// this allows for `HashMap` modifying tasks to be run before running and returning gbt results.
-///
-/// `thread_transactions` is a cloned `Arc` of the `Mutex` for the `HashMap` state.
-/// `callback` is a `'static + Send` `FnOnce` closure/function that takes a mutable reference
-/// to the `HashMap` as the only argument. (A move closure is recommended to meet the bounds)
-async fn run_task<F>(
-    thread_transactions: Arc<Mutex<ThreadTransactionsMap>>,
-    accelerations: Vec<ThreadAcceleration>,
-    max_uid: usize,
-    callback: F,
-) -> Result<GbtResult>
-where
-    F: FnOnce(&mut ThreadTransactionsMap) + Send + 'static,
-{
-    debug!("Spawning thread...");
-    let handle = napi::tokio::task::spawn_blocking(move || {
-        debug!(
-            "Getting lock for thread_transactions from thread {:?}...",
-            std::thread::current().id()
-        );
-        let mut map = thread_transactions
-            .lock()
-            .map_err(|_| napi::Error::from_reason("THREAD_TRANSACTIONS Mutex poisoned"))?;
-        callback(&mut map);
-
-        info!("Starting gbt algorithm for {} elements...", map.len());
-        let result = gbt::gbt(&mut map, &accelerations, max_uid);
-        info!("Finished gbt algorithm for {} elements...", map.len());
-
-        debug!(
-            "Releasing lock for thread_transactions from thread {:?}...",
-            std::thread::current().id()
-        );
-        drop(map);
-
-        Ok(result)
-    });
-
-    handle
-        .await
-        .map_err(|_| napi::Error::from_reason("thread panicked"))?
-}

backend/rust-gbt/src/thread_acceleration.rs

@@ -1,8 +0,0 @@
-use napi_derive::napi;
-
-#[derive(Debug)]
-#[napi(object)]
-pub struct ThreadAcceleration {
-    pub uid: u32,
-    pub delta: f64, // fee delta
-}

backend/rust-gbt/src/thread_transaction.rs

@@ -1,13 +0,0 @@
-use napi_derive::napi;
-
-#[derive(Debug)]
-#[napi(object)]
-pub struct ThreadTransaction {
-    pub uid: u32,
-    pub order: u32,
-    pub fee: f64,
-    pub weight: u32,
-    pub sigops: u32,
-    pub effective_fee_per_vsize: f64,
-    pub inputs: Vec<u32>,
-}

backend/rust-gbt/src/u32_hasher_types.rs

@@ -1,132 +0,0 @@
-use priority_queue::PriorityQueue;
-use std::{
-    collections::{HashMap, HashSet},
-    fmt::Debug,
-    hash::{BuildHasher, Hasher},
-};
-
-/// This is the only way to create a `HashMap` with the `U32HasherState` and capacity
-pub fn u32hashmap_with_capacity<V>(capacity: usize) -> HashMap<u32, V, U32HasherState> {
-    HashMap::with_capacity_and_hasher(capacity, U32HasherState(()))
-}
-
-/// This is the only way to create a `PriorityQueue` with the `U32HasherState` and capacity
-pub fn u32priority_queue_with_capacity<V: Ord>(
-    capacity: usize,
-) -> PriorityQueue<u32, V, U32HasherState> {
-    PriorityQueue::with_capacity_and_hasher(capacity, U32HasherState(()))
-}
-
-/// This is the only way to create a `HashSet` with the `U32HasherState`
-pub fn u32hashset_new() -> HashSet<u32, U32HasherState> {
-    HashSet::with_hasher(U32HasherState(()))
-}
-
-/// A private unit type is contained so no one can make an instance of it.
-#[derive(Clone)]
-pub struct U32HasherState(());
-
-impl Debug for U32HasherState {
-    fn fmt(&self, _: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        Ok(())
-    }
-}
-
-impl BuildHasher for U32HasherState {
-    type Hasher = U32Hasher;
-
-    fn build_hasher(&self) -> Self::Hasher {
-        U32Hasher(0)
-    }
-}
-
-/// This also can't be created outside this module due to private field.
-pub struct U32Hasher(u32);
-
-impl Hasher for U32Hasher {
-    fn finish(&self) -> u64 {
-        // Safety: Two u32s next to each other will make a u64
-        bytemuck::cast([self.0, 0])
-    }
-
-    fn write(&mut self, bytes: &[u8]) {
-        // Assert in debug builds (testing too) that only 4 byte keys (u32, i32, f32, etc.) run
-        debug_assert!(bytes.len() == 4);
-        // Safety: We know that the size of the key is 4 bytes
-        // We also know that the only way to get an instance of HashMap using this "hasher"
-        // is through the public functions in this module which set the key type to u32.
-        self.0 = *bytemuck::from_bytes(bytes);
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::U32HasherState;
-    use priority_queue::PriorityQueue;
-    use std::collections::HashMap;
-
-    #[test]
-    fn test_hashmap() {
-        let mut hm: HashMap<u32, String, U32HasherState> = HashMap::with_hasher(U32HasherState(()));
-
-        // Testing basic operations with the custom hasher
-        hm.insert(0, String::from("0"));
-        hm.insert(42, String::from("42"));
-        hm.insert(256, String::from("256"));
-        hm.insert(u32::MAX, String::from("MAX"));
-        hm.insert(u32::MAX >> 2, String::from("MAX >> 2"));
-
-        assert_eq!(hm.get(&0), Some(&String::from("0")));
-        assert_eq!(hm.get(&42), Some(&String::from("42")));
-        assert_eq!(hm.get(&256), Some(&String::from("256")));
-        assert_eq!(hm.get(&u32::MAX), Some(&String::from("MAX")));
-        assert_eq!(hm.get(&(u32::MAX >> 2)), Some(&String::from("MAX >> 2")));
-        assert_eq!(hm.get(&(u32::MAX >> 4)), None);
-        assert_eq!(hm.get(&3), None);
-        assert_eq!(hm.get(&43), None);
-    }
-
-    #[test]
-    fn test_priority_queue() {
-        let mut pq: PriorityQueue<u32, i32, U32HasherState> =
-            PriorityQueue::with_hasher(U32HasherState(()));
-
-        // Testing basic operations with the custom hasher
-        assert_eq!(pq.push(1, 5), None);
-        assert_eq!(pq.push(2, -10), None);
-        assert_eq!(pq.push(3, 7), None);
-        assert_eq!(pq.push(4, 20), None);
-        assert_eq!(pq.push(u32::MAX, -42), None);
-
-        assert_eq!(pq.push_increase(1, 4), Some(4));
-        assert_eq!(pq.push_increase(2, -8), Some(-10));
-        assert_eq!(pq.push_increase(3, 5), Some(5));
-        assert_eq!(pq.push_increase(4, 21), Some(20));
-        assert_eq!(pq.push_increase(u32::MAX, -99), Some(-99));
-        assert_eq!(pq.push_increase(42, 1337), None);
-
-        assert_eq!(pq.push_decrease(1, 4), Some(5));
-        assert_eq!(pq.push_decrease(2, -10), Some(-8));
-        assert_eq!(pq.push_decrease(3, 5), Some(7));
-        assert_eq!(pq.push_decrease(4, 20), Some(21));
-        assert_eq!(pq.push_decrease(u32::MAX, 100), Some(100));
-        assert_eq!(pq.push_decrease(69, 420), None);
-
-        assert_eq!(pq.peek(), Some((&42, &1337)));
-        assert_eq!(pq.pop(), Some((42, 1337)));
-        assert_eq!(pq.peek(), Some((&69, &420)));
-        assert_eq!(pq.pop(), Some((69, 420)));
-        assert_eq!(pq.peek(), Some((&4, &20)));
-        assert_eq!(pq.pop(), Some((4, 20)));
-        assert_eq!(pq.peek(), Some((&3, &5)));
-        assert_eq!(pq.pop(), Some((3, 5)));
-        assert_eq!(pq.peek(), Some((&1, &4)));
-        assert_eq!(pq.pop(), Some((1, 4)));
-        assert_eq!(pq.peek(), Some((&2, &-10)));
-        assert_eq!(pq.pop(), Some((2, -10)));
-        assert_eq!(pq.peek(), Some((&u32::MAX, &-42)));
-        assert_eq!(pq.pop(), Some((u32::MAX, -42)));
-        assert_eq!(pq.peek(), None);
-        assert_eq!(pq.pop(), None);
-    }
-}

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

@@ -10,40 +10,31 @@
     "AUTOMATIC_BLOCK_REINDEXING": false,
     "POLL_RATE_MS": 3,
     "CACHE_DIR": "__MEMPOOL_CACHE_DIR__",
-    "CACHE_ENABLED": true,
     "CLEAR_PROTECTION_MINUTES": 4,
     "RECOMMENDED_FEE_PERCENTILE": 5,
     "BLOCK_WEIGHT_UNITS": 6,
     "INITIAL_BLOCKS_AMOUNT": 7,
     "MEMPOOL_BLOCKS_AMOUNT": 8,
     "USE_SECOND_NODE_FOR_MINFEE": 10,
-    "EXTERNAL_ASSETS": [],
+    "EXTERNAL_ASSETS": 11,
     "EXTERNAL_MAX_RETRY": 12,
     "EXTERNAL_RETRY_INTERVAL": 13,
     "USER_AGENT": "__MEMPOOL_USER_AGENT__",
     "STDOUT_LOG_MIN_PRIORITY": "__MEMPOOL_STDOUT_LOG_MIN_PRIORITY__",
     "INDEXING_BLOCKS_AMOUNT": 14,
-    "POOLS_JSON_TREE_URL": "__MEMPOOL_POOLS_JSON_TREE_URL__",
-    "POOLS_JSON_URL": "__MEMPOOL_POOLS_JSON_URL__",
-    "AUDIT": true,
-    "ADVANCED_GBT_AUDIT": true,
-    "ADVANCED_GBT_MEMPOOL": true,
-    "RUST_GBT": false,
-    "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
+    "POOLS_JSON_TREE_URL": "__POOLS_JSON_TREE_URL__",
+    "POOLS_JSON_URL": "__POOLS_JSON_URL__",
+    "AUDIT": "__MEMPOOL_AUDIT__",
+    "ADVANCED_GBT_AUDIT": "__MEMPOOL_ADVANCED_GBT_AUDIT__",
+    "ADVANCED_GBT_MEMPOOL": "__MEMPOOL_ADVANCED_GBT_MEMPOOL__",
+    "CPFP_INDEXING": "__MEMPOOL_CPFP_INDEXING__",
+    "MAX_BLOCKS_BULK_QUERY": "__MEMPOOL_MAX_BLOCKS_BULK_QUERY__"
   },
   "CORE_RPC": {
     "HOST": "__CORE_RPC_HOST__",
     "PORT": 15,
     "USERNAME": "__CORE_RPC_USERNAME__",
-    "PASSWORD": "__CORE_RPC_PASSWORD__",
-    "TIMEOUT": 1000,
-    "COOKIE": false,
-    "COOKIE_PATH": "__CORE_RPC_COOKIE_PATH__"
+    "PASSWORD": "__CORE_RPC_PASSWORD__"
   },
   "ELECTRUM": {
     "HOST": "__ELECTRUM_HOST__",
@@ -51,22 +42,13 @@
     "TLS_ENABLED": true
   },
   "ESPLORA": {
-    "REST_API_URL": "__ESPLORA_REST_API_URL__",
-    "UNIX_SOCKET_PATH": "__ESPLORA_UNIX_SOCKET_PATH__",
-    "BATCH_QUERY_BASE_SIZE": 1000,
-    "RETRY_UNIX_SOCKET_AFTER": 888,
-    "REQUEST_TIMEOUT": 10000,
-    "FALLBACK_TIMEOUT": 5000,
-    "FALLBACK": []
+    "REST_API_URL": "__ESPLORA_REST_API_URL__"
   },
   "SECOND_CORE_RPC": {
     "HOST": "__SECOND_CORE_RPC_HOST__",
     "PORT": 17,
     "USERNAME": "__SECOND_CORE_RPC_USERNAME__",
-    "PASSWORD": "__SECOND_CORE_RPC_PASSWORD__",
-    "TIMEOUT": 2000,
-    "COOKIE": false,
-    "COOKIE_PATH": "__SECOND_CORE_RPC_COOKIE_PATH__"
+    "PASSWORD": "__SECOND_CORE_RPC_PASSWORD__"
   },
   "DATABASE": {
     "ENABLED": false,
@@ -75,9 +57,7 @@
     "PORT": 18,
     "DATABASE": "__DATABASE_DATABASE__",
     "USERNAME": "__DATABASE_USERNAME__",
-    "PASSWORD": "__DATABASE_PASSWORD__",
-    "PID_DIR": "__DATABASE_PID_FILE__",
-    "TIMEOUT": 3000
+    "PASSWORD": "__DATABASE_PASSWORD__"
   },
   "SYSLOG": {
     "ENABLED": false,
@@ -102,6 +82,10 @@
     "USERNAME": "__SOCKS5PROXY_USERNAME__",
     "PASSWORD": "__SOCKS5PROXY_PASSWORD__"
   },
+  "PRICE_DATA_SERVER": {
+    "TOR_URL": "__PRICE_DATA_SERVER_TOR_URL__",
+    "CLEARNET_URL": "__PRICE_DATA_SERVER_CLEARNET_URL__"
+  },
   "EXTERNAL_DATA_SERVER": {
     "MEMPOOL_API": "__EXTERNAL_DATA_SERVER_MEMPOOL_API__",
     "MEMPOOL_ONION": "__EXTERNAL_DATA_SERVER_MEMPOOL_ONION__",
@@ -111,37 +95,21 @@
     "BISQ_ONION": "__EXTERNAL_DATA_SERVER_BISQ_ONION__"
   },
   "LIGHTNING": {
-    "ENABLED": true,
+    "ENABLED": "__LIGHTNING_ENABLED__",
     "BACKEND": "__LIGHTNING_BACKEND__",
     "TOPOLOGY_FOLDER": "__LIGHTNING_TOPOLOGY_FOLDER__",
     "STATS_REFRESH_INTERVAL": 600,
     "GRAPH_REFRESH_INTERVAL": 600,
     "LOGGER_UPDATE_INTERVAL": 30,
     "FORENSICS_INTERVAL": 43200,
-    "FORENSICS_RATE_LIMIT": 1234
+    "FORENSICS_RATE_LIMIT": "__FORENSICS_RATE_LIMIT__"
   },
   "LND": {
     "TLS_CERT_PATH": "",
     "MACAROON_PATH": "",
-    "REST_API_URL": "https://localhost:8080",
-    "TIMEOUT": 10000
+    "REST_API_URL": "https://localhost:8080"
   },
   "CLIGHTNING": {
     "SOCKET": "__CLIGHTNING_SOCKET__"
-  },
-  "REPLICATION": {
-    "ENABLED": false,
-    "AUDIT": false,
-    "AUDIT_START_HEIGHT": 774000,
-    "SERVERS": []
-  },
-  "MEMPOOL_SERVICES": {
-    "API": "",
-    "ACCELERATIONS": false
-  },
-  "REDIS": {
-    "ENABLED": false,
-    "UNIX_SOCKET_PATH": "/tmp/redis.sock",
-    "BATCH_QUERY_BASE_SIZE": 5000
   }
 }

backend/src/__tests__/api/common.ts

@@ -1,24 +0,0 @@
-import { Common } from '../../api/common';
-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');
-
-describe('Mempool Utils', () => {
-  test('should detect RBF transactions with fast method', () => {
-    const newTransactions = rbfTransactions.concat(randomTransactions);
-    const result: { [txid: string]: MempoolTransactionExtended[] } = Common.findRbfTransactions(newTransactions, replacedTransactions);
-    expect(Object.values(result).length).toEqual(2);
-    expect(result).toHaveProperty('7219d95161f3718335991ac6d967d24eedec370908c9879bb1e192e6d797d0a6');
-    expect(result).toHaveProperty('5387881d695d4564d397026dc5f740f816f8390b4b2c5ec8c20309122712a875');
-  });
-
-  test.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

@@ -1,8 +1,4 @@
-import {
-  calcBitsDifference,
-  calcDifficultyAdjustment,
-  DifficultyAdjustment,
-} from '../../api/difficulty-adjustment';
+import { calcDifficultyAdjustment, DifficultyAdjustment } from '../../api/difficulty-adjustment';
 
 describe('Mempool Difficulty Adjustment', () => {
   test('should calculate Difficulty Adjustments properly', () => {
@@ -18,11 +14,11 @@ describe('Mempool Difficulty Adjustment', () => {
           750134,                         // Current block height
           0.6280047707459726,             // 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)
+          0,                              // If not testnet, not used
         ],
         { // Expected Result
           progressPercent: 9.027777777777777,
-          difficultyChange: 13.180707740199772,
+          difficultyChange: 12.562233927411782,
           estimatedRetargetDate: 1661895424692,
           remainingBlocks: 1834,
           remainingTime: 977591692,
@@ -45,7 +41,7 @@ describe('Mempool Difficulty Adjustment', () => {
         ],
         { // Expected Result is same other than timeOffset
           progressPercent: 9.027777777777777,
-          difficultyChange: 13.180707740199772,
+          difficultyChange: 12.562233927411782,
           estimatedRetargetDate: 1661895424692,
           remainingBlocks: 1834,
           remainingTime: 977591692,
@@ -58,29 +54,6 @@ describe('Mempool Difficulty Adjustment', () => {
           expectedBlocks: 161.68833333333333,
         },
       ],
-      [ // Vector 3 (mainnet lock-in (epoch ending 788255))
-        [ // Inputs
-          dt('2023-04-20T09:57:33.000Z'), // Last DA time (in seconds)
-          dt('2023-05-04T14:54:09.000Z'), // Current time (now) (in seconds)
-          788255,                         // Current block height
-          1.7220298879531821,             // Previous retarget % (Passed through)
-          'mainnet',                      // Network (if testnet, next value is non-zero)
-          dt('2023-05-04T14:54:26.000Z'), // Latest block timestamp in seconds
-        ],
-        { // Expected Result
-          progressPercent: 99.95039682539682,
-          difficultyChange: -1.4512637555574193,
-          estimatedRetargetDate: 1683212658129,
-          remainingBlocks: 1,
-          remainingTime: 609129,
-          previousRetarget: 1.7220298879531821,
-          previousTime: 1681984653,
-          nextRetargetHeight: 788256,
-          timeAvg: 609129,
-          timeOffset: 0,
-          expectedBlocks: 2045.66,
-        },
-      ],
     ] as [[number, number, number, number, string, number], DifficultyAdjustment][];
 
     for (const vector of vectors) {
@@ -90,46 +63,4 @@ describe('Mempool Difficulty Adjustment', () => {
       expect(result).toStrictEqual(vector[1]);
     }
   });
-
-  test('should calculate Difficulty change from bits fields of two blocks', () => {
-    // Check same exponent + check min max for output
-    expect(calcBitsDifference(0x1d000200, 0x1d000100)).toEqual(100);
-    expect(calcBitsDifference(0x1d000400, 0x1d000100)).toEqual(300);
-    expect(calcBitsDifference(0x1d000800, 0x1d000100)).toEqual(300); // Actually 700
-    expect(calcBitsDifference(0x1d000100, 0x1d000200)).toEqual(-50);
-    expect(calcBitsDifference(0x1d000100, 0x1d000400)).toEqual(-75);
-    expect(calcBitsDifference(0x1d000100, 0x1d000800)).toEqual(-75); // Actually -87.5
-    // Check new higher exponent
-    expect(calcBitsDifference(0x1c000200, 0x1d000001)).toEqual(100);
-    expect(calcBitsDifference(0x1c000400, 0x1d000001)).toEqual(300);
-    expect(calcBitsDifference(0x1c000800, 0x1d000001)).toEqual(300);
-    expect(calcBitsDifference(0x1c000100, 0x1d000002)).toEqual(-50);
-    expect(calcBitsDifference(0x1c000100, 0x1d000004)).toEqual(-75);
-    expect(calcBitsDifference(0x1c000100, 0x1d000008)).toEqual(-75);
-    // Check new lower exponent
-    expect(calcBitsDifference(0x1d000002, 0x1c000100)).toEqual(100);
-    expect(calcBitsDifference(0x1d000004, 0x1c000100)).toEqual(300);
-    expect(calcBitsDifference(0x1d000008, 0x1c000100)).toEqual(300);
-    expect(calcBitsDifference(0x1d000001, 0x1c000200)).toEqual(-50);
-    expect(calcBitsDifference(0x1d000001, 0x1c000400)).toEqual(-75);
-    expect(calcBitsDifference(0x1d000001, 0x1c000800)).toEqual(-75);
-    // Check error when exponents are too far apart
-    expect(() => calcBitsDifference(0x1d000001, 0x1a000800)).toThrow(
-      /Impossible exponent difference/
-    );
-    // Check invalid inputs
-    expect(() => calcBitsDifference(0x7f000001, 0x1a000800)).toThrow(
-      /Invalid bits/
-    );
-    expect(() => calcBitsDifference(0, 0x1a000800)).toThrow(/Invalid bits/);
-    expect(() => calcBitsDifference(100.2783, 0x1a000800)).toThrow(
-      /Invalid bits/
-    );
-    expect(() => calcBitsDifference(0x00800000, 0x1a000800)).toThrow(
-      /Invalid bits/
-    );
-    expect(() => calcBitsDifference(0x1c000000, 0x1a000800)).toThrow(
-      /Invalid bits/
-    );
-  });
 });

backend/src/__tests__/api/test-data/transactions-random.json

@@ -1,277 +0,0 @@
-[
-    {
-        "txid": "13f007241d78e8b0b4e57d2ae3fd37bcfe3226534d7cadeba5a549860d960db0",
-        "version": 2,
-        "locktime": 0,
-        "vin": [
-            {
-                "txid": "cb8f206f4e88bec97107089f3e9e61d50cde53d4541992ae19759b71103cf75c",
-                "vout": 0,
-                "prevout": {
-                    "scriptpubkey": "0014fd6d15ff832c12f1ff04a5ccd5039f7227b260bd",
-                    "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 fd6d15ff832c12f1ff04a5ccd5039f7227b260bd",
-                    "scriptpubkey_type": "v0_p2wpkh",
-                    "scriptpubkey_address": "bc1ql4k3tlur9sf0rlcy5hxd2qulwgnmyc9akehvth",
-                    "value": 610677
-                },
-                "scriptsig": "",
-                "scriptsig_asm": "",
-                "witness": [
-                    "304302205c430b36ebd2bb327951d83440af1f58f127871b2baada4c4dde2bc0b6721f56021f3445099f1a40e35baeda32e8e3727b505ffba0d882b11f498c7762f4184e9901",
-                    "0236b5edd4fbbcfb045960e42ec8a9968944084785932e32940e8cd2583b37da67"
-                ],
-                "is_coinbase": false,
-                "sequence": 2147483648
-            }
-        ],
-        "vout": [
-            {
-                "scriptpubkey": "76a9149d32ef812385f3811634e0c0117dd153a5de10a488ac",
-                "scriptpubkey_asm": "OP_DUP OP_HASH160 OP_PUSHBYTES_20 9d32ef812385f3811634e0c0117dd153a5de10a4 OP_EQUALVERIFY OP_CHECKSIG",
-                "scriptpubkey_type": "p2pkh",
-                "scriptpubkey_address": "1FLC7Bag7okAkKPCyZbgZZg3Hh1EuGZ5Rd",
-                "value": 344697
-            },
-            {
-                "scriptpubkey": "00147dee8a7a38abbfb00dbfba365c8d6712934cc491",
-                "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 7dee8a7a38abbfb00dbfba365c8d6712934cc491",
-                "scriptpubkey_type": "v0_p2wpkh",
-                "scriptpubkey_address": "bc1q0hhg573c4wlmqrdlhgm9ert8z2f5e3y3lf9hvx",
-                "value": 265396
-            }
-        ],
-        "size": 224,
-        "weight": 572,
-        "fee": 584,
-        "status": {
-            "confirmed": false
-        },
-        "order": 2953680397,
-        "vsize": 143,
-        "adjustedVsize": 143,
-        "sigops": 5,
-        "feePerVsize": 4.083916083916084,
-        "adjustedFeePerVsize": 4.083916083916084,
-        "effectiveFeePerVsize": 4.083916083916084,
-        "firstSeen": 1691222538,
-        "uid": 526973,
-        "inputs": [
-            526728
-        ],
-        "position": {
-            "block": 7,
-            "vsize": 21429708.5
-        },
-        "bestDescendant": null,
-        "cpfpChecked": true
-    },
-    {
-        "txid": "8e89b20f8a7fadb0e4cdbe57a00eee224f5076bac5387fc276916724e7c4a16a",
-        "version": 2,
-        "locktime": 800571,
-        "vin": [
-            {
-                "txid": "35e16762459539f3a8e52c5dee6a9ccaa9e9268efed33aa2c6e1b7805e849f24",
-                "vout": 0,
-                "prevout": {
-                    "scriptpubkey": "0014d4f16ef275b3e1c4a4ecbef55a164933e0f6460f",
-                    "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 d4f16ef275b3e1c4a4ecbef55a164933e0f6460f",
-                    "scriptpubkey_type": "v0_p2wpkh",
-                    "scriptpubkey_address": "bc1q6nckaun4k0suff8vhm6459jfx0s0v3s0ff4ukl",
-                    "value": 1528924
-                },
-                "scriptsig": "",
-                "scriptsig_asm": "",
-                "witness": [
-                    "3044022019008b26e885bb43da25a11ffac147a057722072eedb68411f114f6e7eb82ebc02201b618264bb97756b88fc3bbc365b73044ac18b33b1067e31cfd5bcd0f50ed2c701",
-                    "039b71145070bd3e8af28e27fa577f2e12ab6bb4e212d3eeaef08b4bc39e8cbc13"
-                ],
-                "is_coinbase": false,
-                "sequence": 4294967293
-            },
-            {
-                "txid": "67c27ed0f767526234bcd5f795a31fab8ec4d0251bf12c68f2746951f4110d90",
-                "vout": 3,
-                "prevout": {
-                    "scriptpubkey": "0014a7c3d613b321375054b2ac9b6114367bc034ad6f",
-                    "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 a7c3d613b321375054b2ac9b6114367bc034ad6f",
-                    "scriptpubkey_type": "v0_p2wpkh",
-                    "scriptpubkey_address": "bc1q5lpavyanyym4q49j4jdkz9pk00qrftt0yqzvk3",
-                    "value": 436523
-                },
-                "scriptsig": "",
-                "scriptsig_asm": "",
-                "witness": [
-                    "304402204e67285fc656bc45ed082499b076d5dba2fa21d0d7e64a0ae52b19d69a11760002200f037d81ee540b74397844513b72b08ed92b06db76bd20b08f7a0a3b36ab13d501",
-                    "02a3ebae85f0225b6fbb5ff060afce683a4683507a57544605a29ee7d287e591b4"
-                ],
-                "is_coinbase": false,
-                "sequence": 4294967293
-            },
-            {
-                "txid": "21c38fb9a2521e438c614f53b19ddd7a5594bcc4b77480e762fd4b702fad3374",
-                "vout": 1,
-                "prevout": {
-                    "scriptpubkey": "00149660e34ef88106536c816c037b5b28dd64a812e2",
-                    "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 9660e34ef88106536c816c037b5b28dd64a812e2",
-                    "scriptpubkey_type": "v0_p2wpkh",
-                    "scriptpubkey_address": "bc1qjeswxnhcsyr9xmypdsphkkegm4j2syhztgzxv4",
-                    "value": 758149
-                },
-                "scriptsig": "",
-                "scriptsig_asm": "",
-                "witness": [
-                    "3044022021b556f0aa99329076bcc435338aceaf534963efcab306931b1b2b0461e16e0c02203a78942a3745c4da656bddfd8cf16b85dc04d652904e88682127cdd9ca63339001",
-                    "0298963be4a8f66aca9fcf1c6dc95547aeaa82347543190c91e094c2321142b9f0"
-                ],
-                "is_coinbase": false,
-                "sequence": 4294967293
-            },
-            {
-                "txid": "aa998dbae65240a7386bf7d468459551d99c3de8e2f9057ff5f2d38e17daf788",
-                "vout": 0,
-                "prevout": {
-                    "scriptpubkey": "00147bb7413a39943b21ded98ad5e6ad7a222d273e17",
-                    "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 7bb7413a39943b21ded98ad5e6ad7a222d273e17",
-                    "scriptpubkey_type": "v0_p2wpkh",
-                    "scriptpubkey_address": "bc1q0wm5zw3ejsajrhke3t27dtt6ygkjw0sh9lltg6",
-                    "value": 1067200
-                },
-                "scriptsig": "",
-                "scriptsig_asm": "",
-                "witness": [
-                    "304402205e2269f7d4ee0513b34354c38e920aef2dabac6f4350afb2dd105ff3ee43ae7b02202870322f2cb85cb0b2b0e38152f018bfff271dc3ec5aed0515854d0b259aaf3d01",
-                    "03b87320cf3263a644a0d3f89c1b4a7304d9dfda9eb8c891560716abcb73e88b99"
-                ],
-                "is_coinbase": false,
-                "sequence": 4294967293
-            },
-            {
-                "txid": "230253d195d779d4688ba16993985cd27b2e7a687d8b889b3bc63f19ece36f20",
-                "vout": 0,
-                "prevout": {
-                    "scriptpubkey": "001439647bd997819d12dfc72b0fb9ff9ffcb84946f8",
-                    "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 39647bd997819d12dfc72b0fb9ff9ffcb84946f8",
-                    "scriptpubkey_type": "v0_p2wpkh",
-                    "scriptpubkey_address": "bc1q89j8hkvhsxw39h789v8mnlulljuyj3hc9zve97",
-                    "value": 361950
-                },
-                "scriptsig": "",
-                "scriptsig_asm": "",
-                "witness": [
-                    "304402204f7ca868bb9b92a07fecdc6b9dd56e4e1d007ca1405952f98ed6bc416345b5f2022055320a97791417abf6628fcf6513ac5785b06c630f854d8595e96ea06c3841d301",
-                    "03a3ffe8e3ef2eea129b227e9658164bae0a6d21c17da6de9973ba34d9e04b21a0"
-                ],
-                "is_coinbase": false,
-                "sequence": 4294967293
-            },
-            {
-                "txid": "670771e265a0b62dbd3c1fec2b865177eaf0bafd0ae49dd40a1c9fcd9a847a81",
-                "vout": 0,
-                "prevout": {
-                    "scriptpubkey": "0014d45d1b0022c7387e42c5452ced561bdb8fd4b521",
-                    "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 d45d1b0022c7387e42c5452ced561bdb8fd4b521",
-                    "scriptpubkey_type": "v0_p2wpkh",
-                    "scriptpubkey_address": "bc1q63w3kqpzcuu8usk9g5kw64smmw8afdfpxmc2m0",
-                    "value": 453275
-                },
-                "scriptsig": "",
-                "scriptsig_asm": "",
-                "witness": [
-                    "3044022071312921800441903b2099e723add8702dd0f92ec11526ff87acf6967ec64cbd02203deabe7ed56d5daaa9a95c5a607b1ab705ff1c46bc6984a6dca120e63a91768601",
-                    "0257302ac8d9c4c8f9b1744f19bb432359326b9cc7bdddeeab9202749a6d92be58"
-                ],
-                "is_coinbase": false,
-                "sequence": 4294967293
-            },
-            {
-                "txid": "0af82159eee2b69242f2ff032636e410b67ec1ace52e55fb0d20ed814cd64803",
-                "vout": 0,
-                "prevout": {
-                    "scriptpubkey": "001459e4d6bfefc6b45f955a69c4aeca26348e9d54ed",
-                    "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 59e4d6bfefc6b45f955a69c4aeca26348e9d54ed",
-                    "scriptpubkey_type": "v0_p2wpkh",
-                    "scriptpubkey_address": "bc1qt8jdd0l0c669l926d8z2aj3xxj8f648dtyn7tc",
-                    "value": 439961
-                },
-                "scriptsig": "",
-                "scriptsig_asm": "",
-                "witness": [
-                    "3044022027540322e92c23c5513aa2587e7feb56a8ce82f879269d6b3cbd425634b44f8e022045572dee7262b02130bfe32d8aa8abbfaa64e101abfc819bba5380c78876692d01",
-                    "03fe02262d87f4a5289d3dd66e3d9a74cd49fa1cad0249284a7451896a827249a5"
-                ],
-                "is_coinbase": false,
-                "sequence": 4294967293
-            },
-            {
-                "txid": "68cf9c784870a4f888f044755f7ce318557f652461db8ef887d279672f186018",
-                "vout": 0,
-                "prevout": {
-                    "scriptpubkey": "001454822b2d5d52597a78b630921cf439a41e32f2f9",
-                    "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 54822b2d5d52597a78b630921cf439a41e32f2f9",
-                    "scriptpubkey_type": "v0_p2wpkh",
-                    "scriptpubkey_address": "bc1q2jpzkt2a2fvh579kxzfpeape5s0r9uhewhl5n4",
-                    "value": 227639
-                },
-                "scriptsig": "",
-                "scriptsig_asm": "",
-                "witness": [
-                    "304402203ad511d6a8730748b8828bc38897d360451adf620ebdc1d229c08c097c80bef202202f50c793d95b5200cf2258e03896a3be7720df0eb3b8c810c86db74341a7e83e01",
-                    "0294992e9f4546e6e119741f908411ae531e9d1ff732d69b4dff8172aaf2a4b216"
-                ],
-                "is_coinbase": false,
-                "sequence": 4294967293
-            },
-            {
-                "txid": "793f01dfdb19bf41f958fd917c16d9c4dd5d5e1a5c0434bfdb367212659d1b5b",
-                "vout": 0,
-                "prevout": {
-                    "scriptpubkey": "0014f54edf8ae647b5300e2674523254e923d93d169f",
-                    "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 f54edf8ae647b5300e2674523254e923d93d169f",
-                    "scriptpubkey_type": "v0_p2wpkh",
-                    "scriptpubkey_address": "bc1q748dlzhxg76nqr3xw3fry48fy0vn695lvhlkxv",
-                    "value": 227070
-                },
-                "scriptsig": "",
-                "scriptsig_asm": "",
-                "witness": [
-                    "304402206e807ab616f4f2887ba703ae744d856142d9aca8128698419bbb67fb4fad8177022060fc65c7cd66baa88ad1e1d317a6edd5f6cb52fe8bff6e5405ffa1acf9d945d901",
-                    "02a0ad0167c6e9edf62677404d74d3b80ea276e47e758ffaa6ca17bd65ac79f7aa"
-                ],
-                "is_coinbase": false,
-                "sequence": 4294967293
-            }
-        ],
-        "vout": [
-            {
-                "scriptpubkey": "00148a5c45ccfc29d209940d94525e2edb7743a1ad8a",
-                "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 8a5c45ccfc29d209940d94525e2edb7743a1ad8a",
-                "scriptpubkey_type": "v0_p2wpkh",
-                "scriptpubkey_address": "bc1q3fwytn8u98fqn9qdj3f9utkmwap6rtv2ym33zm",
-                "value": 5500000
-            }
-        ],
-        "size": 1375,
-        "weight": 2605,
-        "fee": 691,
-        "status": {
-            "confirmed": false
-        },
-        "order": 1788986599,
-        "vsize": 651,
-        "adjustedVsize": 651.25,
-        "sigops": 9,
-        "feePerVsize": 1.0610364683301343,
-        "adjustedFeePerVsize": 1.0610364683301343,
-        "effectiveFeePerVsize": 1.0610364683301343,
-        "firstSeen": 1691163298,
-        "uid": 120494,
-        "inputs": [],
-        "position": {
-            "block": 7,
-            "vsize": 93780091.5
-        },
-        "bestDescendant": null,
-        "cpfpChecked": true
-    }
-]

backend/src/__tests__/api/test-data/transactions-rbfs.json

@@ -1,121 +0,0 @@
-[
-    {
-        "txid": "7219d95161f3718335991ac6d967d24eedec370908c9879bb1e192e6d797d0a6",
-        "version": 1,
-        "locktime": 0,
-        "vin": [
-            {
-                "txid": "d863deb706de5a611028f7547e16ea81d7819e44beb640fb30a9ba30c585140f",
-                "vout": 0,
-                "prevout": {
-                    "scriptpubkey": "76a914cd5b6566b455d043558829f6932edaae5d8f0ad388ac",
-                    "scriptpubkey_asm": "OP_DUP OP_HASH160 OP_PUSHBYTES_20 cd5b6566b455d043558829f6932edaae5d8f0ad3 OP_EQUALVERIFY OP_CHECKSIG",
-                    "scriptpubkey_type": "p2pkh",
-                    "scriptpubkey_address": "1Kiq1dyVBzYLWGrBPWjChvKyzB2H95x5RJ",
-                    "value": 799995000
-                },
-                "scriptsig": "483045022100aeeddfb9785c5a4b70e90d0445785c68b7a44e28853441134a70ddc4da39527602203dfe1ec1a377aaacb64ae65c7c944caf1398d2dc063f712251b4cf696d44d3cb01210314338e3e191aea3ac9e9292611faeedf0379bbe62c30fd76c7450722a1ac47c6",
-                "scriptsig_asm": "OP_PUSHBYTES_72 3045022100aeeddfb9785c5a4b70e90d0445785c68b7a44e28853441134a70ddc4da39527602203dfe1ec1a377aaacb64ae65c7c944caf1398d2dc063f712251b4cf696d44d3cb01 OP_PUSHBYTES_33 0314338e3e191aea3ac9e9292611faeedf0379bbe62c30fd76c7450722a1ac47c6",
-                "is_coinbase": false,
-                "sequence": 4294967293
-            }
-        ],
-        "vout": [
-            {
-                "scriptpubkey": "6a4c5058325b8669baa9259e082f064005bc92274b559337ac317798f5d76f2d0577ed5a96042fce8c33d841b6c47a99f9597000ab04a10b34cd419fc19784d9e36f1a33fd7b000c3bce00b6000c1d1e00614b",
-                "scriptpubkey_asm": "OP_RETURN OP_PUSHDATA1 58325b8669baa9259e082f064005bc92274b559337ac317798f5d76f2d0577ed5a96042fce8c33d841b6c47a99f9597000ab04a10b34cd419fc19784d9e36f1a33fd7b000c3bce00b6000c1d1e00614b",
-                "scriptpubkey_type": "op_return",
-                "value": 0
-            },
-            {
-                "scriptpubkey": "a9144890aae025c84cb72a9730b49ca12595d6f6088d87",
-                "scriptpubkey_asm": "OP_HASH160 OP_PUSHBYTES_20 4890aae025c84cb72a9730b49ca12595d6f6088d OP_EQUAL",
-                "scriptpubkey_type": "p2sh",
-                "scriptpubkey_address": "38Jht2bzmJL4EwoFvvyFzejhfEb4J7KxLb",
-                "value": 155000
-            },
-            {
-                "scriptpubkey": "76a91486e7dad6617303942a448b7f8afe9653e5624a5e88ac",
-                "scriptpubkey_asm": "OP_DUP OP_HASH160 OP_PUSHBYTES_20 86e7dad6617303942a448b7f8afe9653e5624a5e OP_EQUALVERIFY OP_CHECKSIG",
-                "scriptpubkey_type": "p2pkh",
-                "scriptpubkey_address": "1DJKJGApgX4W8BSQ8FRPLqX78UaCskT4r2",
-                "value": 155000
-            },
-            {
-                "scriptpubkey": "76a914cd5b6566b455d043558829f6932edaae5d8f0ad388ac",
-                "scriptpubkey_asm": "OP_DUP OP_HASH160 OP_PUSHBYTES_20 cd5b6566b455d043558829f6932edaae5d8f0ad3 OP_EQUALVERIFY OP_CHECKSIG",
-                "scriptpubkey_type": "p2pkh",
-                "scriptpubkey_address": "1Kiq1dyVBzYLWGrBPWjChvKyzB2H95x5RJ",
-                "value": 799675549
-            }
-        ],
-        "size": 350,
-        "weight": 1400,
-        "fee": 9451,
-        "status": {
-            "confirmed": false
-        },
-        "order": 2798688215,
-        "vsize": 350,
-        "adjustedVsize": 350,
-        "sigops": 8,
-        "feePerVsize": 27.002857142857142,
-        "adjustedFeePerVsize": 27.002857142857142,
-        "effectiveFeePerVsize": 27.002857142857142,
-        "firstSeen": 1691218536,
-        "uid": 513598,
-        "inputs": [],
-        "position": {
-            "block": 0,
-            "vsize": 22166
-        },
-        "bestDescendant": null,
-        "cpfpChecked": true
-    },
-    {
-        "txid": "5387881d695d4564d397026dc5f740f816f8390b4b2c5ec8c20309122712a875",
-        "version": 2,
-        "locktime": 0,
-        "vin": [
-            {
-                "txid": "b50225a04a1d6fbbfa7a2122bc0580396f614027b3957f476229633576f06130",
-                "vout": 0,
-                "prevout": {
-                    "scriptpubkey": "0014a24f913f8a9c30a4c302c2c78f2fd7addb08fd07",
-                    "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 a24f913f8a9c30a4c302c2c78f2fd7addb08fd07",
-                    "scriptpubkey_type": "v0_p2wpkh",
-                    "scriptpubkey_address": "bc1q5f8ez0u2nsc2fsczctrc7t7h4hds3lg82ewqhz",
-                    "value": 612917
-                },
-                "scriptsig": "",
-                "scriptsig_asm": "",
-                "witness": [
-                    "3045022100a0c23953ace5d022b7a6d45d1ae1730bf20a4d594bb5d4fa7aa80e4881b44d320220008f9b144805bb91995fc0f452a56e09f4ad16fa149d71ae9b5d57c742e8e2cc01",
-                    "03dc2c7b687019b40a68d713322675206cc266e34e5340ec982c13ff0222c3b2b6"
-                ],
-                "is_coinbase": false,
-                "sequence": 2147483649
-            }
-        ],
-        "vout": [
-            {
-                "scriptpubkey": "0014199a98f9589364ffe5ef5bbae45ce5dfcbb873bd",
-                "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 199a98f9589364ffe5ef5bbae45ce5dfcbb873bd",
-                "scriptpubkey_type": "v0_p2wpkh",
-                "scriptpubkey_address": "bc1qrxdf372cjdj0le00twawgh89ml9msuaau62gk4",
-                "value": 611909
-            }
-        ],
-        "size": 192,
-        "weight": 438,
-        "fee": 1008,
-        "status": {
-            "confirmed": false
-        },
-        "bestDescendant": null,
-        "descendants": null,
-        "adjustedFeePerVsize": 10.2283,
-        "sigops": 1,
-        "adjustedVsize": 109.5
-    }
-]

backend/src/__tests__/api/test-data/transactions-replaced.json

@@ -1,139 +0,0 @@
-[
-    {
-        "txid": "008592364e21c1e3d62ba9538ac78a81779897b52100af5707ab063df98964f2",
-        "version": 1,
-        "locktime": 0,
-        "vin": [
-            {
-                "txid": "d863deb706de5a611028f7547e16ea81d7819e44beb640fb30a9ba30c585140f",
-                "vout": 0,
-                "prevout": {
-                    "scriptpubkey": "76a914cd5b6566b455d043558829f6932edaae5d8f0ad388ac",
-                    "scriptpubkey_asm": "OP_DUP OP_HASH160 OP_PUSHBYTES_20 cd5b6566b455d043558829f6932edaae5d8f0ad3 OP_EQUALVERIFY OP_CHECKSIG",
-                    "scriptpubkey_type": "p2pkh",
-                    "scriptpubkey_address": "1Kiq1dyVBzYLWGrBPWjChvKyzB2H95x5RJ",
-                    "value": 799995000
-                },
-                "scriptsig": "483045022100c1fb331d155a7d299a0451d14fa1122b328e0e239afc9ba8dc2aff449ddc5a3a02201c1e19030d1efa432f5069cd369d7ad09a67f68501345e4db35f7b799605f55601210314338e3e191aea3ac9e9292611faeedf0379bbe62c30fd76c7450722a1ac47c6",
-                "scriptsig_asm": "OP_PUSHBYTES_72 3045022100c1fb331d155a7d299a0451d14fa1122b328e0e239afc9ba8dc2aff449ddc5a3a02201c1e19030d1efa432f5069cd369d7ad09a67f68501345e4db35f7b799605f55601 OP_PUSHBYTES_33 0314338e3e191aea3ac9e9292611faeedf0379bbe62c30fd76c7450722a1ac47c6",
-                "is_coinbase": false,
-                "sequence": 4294967293
-            }
-        ],
-        "vout": [
-            {
-                "scriptpubkey": "6a4c5058325b78064160b631b5a15d9078d99c0db066449fb4c59bbfa4d987ba906e2990088b2fce8c33d841b6c47a99f9597000ab04a10b34cd419fc19784d9e36f1a33fd7b000c3bce00b6000c1d1e00614b",
-                "scriptpubkey_asm": "OP_RETURN OP_PUSHDATA1 58325b78064160b631b5a15d9078d99c0db066449fb4c59bbfa4d987ba906e2990088b2fce8c33d841b6c47a99f9597000ab04a10b34cd419fc19784d9e36f1a33fd7b000c3bce00b6000c1d1e00614b",
-                "scriptpubkey_type": "op_return",
-                "value": 0
-            },
-            {
-                "scriptpubkey": "a9144890aae025c84cb72a9730b49ca12595d6f6088d87",
-                "scriptpubkey_asm": "OP_HASH160 OP_PUSHBYTES_20 4890aae025c84cb72a9730b49ca12595d6f6088d OP_EQUAL",
-                "scriptpubkey_type": "p2sh",
-                "scriptpubkey_address": "38Jht2bzmJL4EwoFvvyFzejhfEb4J7KxLb",
-                "value": 155000
-            },
-            {
-                "scriptpubkey": "76a91486e7dad6617303942a448b7f8afe9653e5624a5e88ac",
-                "scriptpubkey_asm": "OP_DUP OP_HASH160 OP_PUSHBYTES_20 86e7dad6617303942a448b7f8afe9653e5624a5e OP_EQUALVERIFY OP_CHECKSIG",
-                "scriptpubkey_type": "p2pkh",
-                "scriptpubkey_address": "1DJKJGApgX4W8BSQ8FRPLqX78UaCskT4r2",
-                "value": 155000
-            },
-            {
-                "scriptpubkey": "76a914cd5b6566b455d043558829f6932edaae5d8f0ad388ac",
-                "scriptpubkey_asm": "OP_DUP OP_HASH160 OP_PUSHBYTES_20 cd5b6566b455d043558829f6932edaae5d8f0ad3 OP_EQUALVERIFY OP_CHECKSIG",
-                "scriptpubkey_type": "p2pkh",
-                "scriptpubkey_address": "1Kiq1dyVBzYLWGrBPWjChvKyzB2H95x5RJ",
-                "value": 799676250
-            }
-        ],
-        "size": 350,
-        "weight": 1400,
-        "fee": 8750,
-        "status": {
-            "confirmed": false
-        },
-        "order": 4066675193,
-        "vsize": 350,
-        "adjustedVsize": 350,
-        "sigops": 8,
-        "feePerVsize": 25,
-        "adjustedFeePerVsize": 25,
-        "effectiveFeePerVsize": 25,
-        "firstSeen": 1691218516,
-        "uid": 512584,
-        "inputs": [],
-        "position": {
-            "block": 0,
-            "vsize": 13846
-        },
-        "bestDescendant": null,
-        "cpfpChecked": true
-    },
-    {
-        "txid": "b7981a624e4261c11f1246314d41e74be56af82eb557bcd054a5e0f94c023668",
-        "version": 2,
-        "locktime": 0,
-        "vin": [
-            {
-                "txid": "b50225a04a1d6fbbfa7a2122bc0580396f614027b3957f476229633576f06130",
-                "vout": 0,
-                "prevout": {
-                    "scriptpubkey": "0014a24f913f8a9c30a4c302c2c78f2fd7addb08fd07",
-                    "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 a24f913f8a9c30a4c302c2c78f2fd7addb08fd07",
-                    "scriptpubkey_type": "v0_p2wpkh",
-                    "scriptpubkey_address": "bc1q5f8ez0u2nsc2fsczctrc7t7h4hds3lg82ewqhz",
-                    "value": 612917
-                },
-                "scriptsig": "",
-                "scriptsig_asm": "",
-                "witness": [
-                    "304402204dd10f14afa41bc76d8278140ff1ec3d3f87f2c207bbb5418cc76dab30d7f6a402207877cc9c6a2c724b6ea7a1c24ac00022469f194fd1a4bd8030bbca1787d3f5f301",
-                    "03dc2c7b687019b40a68d713322675206cc266e34e5340ec982c13ff0222c3b2b6"
-                ],
-                "is_coinbase": false,
-                "sequence": 2147483648
-            }
-        ],
-        "vout": [
-            {
-                "scriptpubkey": "76a9149d32ef812385f3811634e0c0117dd153a5de10a488ac",
-                "scriptpubkey_asm": "OP_DUP OP_HASH160 OP_PUSHBYTES_20 9d32ef812385f3811634e0c0117dd153a5de10a4 OP_EQUALVERIFY OP_CHECKSIG",
-                "scriptpubkey_type": "p2pkh",
-                "scriptpubkey_address": "1FLC7Bag7okAkKPCyZbgZZg3Hh1EuGZ5Rd",
-                "value": 344697
-            },
-            {
-                "scriptpubkey": "00144c2671336ca8761863b4c68d64d4672491fec1b9",
-                "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 4c2671336ca8761863b4c68d64d4672491fec1b9",
-                "scriptpubkey_type": "v0_p2wpkh",
-                "scriptpubkey_address": "bc1qfsn8zvmv4pmpsca5c6xkf4r8yjglasdesrawcx",
-                "value": 267636
-            }
-        ],
-        "size": 225,
-        "weight": 573,
-        "fee": 584,
-        "status": {
-            "confirmed": false
-        },
-        "order": 1748369996,
-        "vsize": 143,
-        "adjustedVsize": 143.25,
-        "sigops": 5,
-        "feePerVsize": 4.076788830715532,
-        "adjustedFeePerVsize": 4.076788830715532,
-        "effectiveFeePerVsize": 4.076788830715532,
-        "firstSeen": 1691222376,
-        "uid": 526515,
-        "inputs": [],
-        "position": {
-            "block": 7,
-            "vsize": 22021095.5
-        },
-        "bestDescendant": null,
-        "cpfpChecked": true
-    }
-]

backend/src/__tests__/config.test.ts

@@ -23,7 +23,6 @@ describe('Mempool Backend Config', () => {
         AUTOMATIC_BLOCK_REINDEXING: false,
         POLL_RATE_MS: 2000,
         CACHE_DIR: './cache',
-        CACHE_ENABLED: true,
         CLEAR_PROTECTION_MINUTES: 20,
         RECOMMENDED_FEE_PERCENTILE: 50,
         BLOCK_WEIGHT_UNITS: 4000000,
@@ -41,45 +40,26 @@ describe('Mempool Backend Config', () => {
         AUDIT: 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,
       });
 
       expect(config.ELECTRUM).toStrictEqual({ HOST: '127.0.0.1', PORT: 3306, TLS_ENABLED: true });
 
-      expect(config.ESPLORA).toStrictEqual({
-        REST_API_URL: 'http://127.0.0.1:3000',
-        UNIX_SOCKET_PATH: null,
-        BATCH_QUERY_BASE_SIZE: 1000,
-        RETRY_UNIX_SOCKET_AFTER: 30000,
-        REQUEST_TIMEOUT: 10000,
-        FALLBACK_TIMEOUT: 5000,
-        FALLBACK: [],
-       });
+      expect(config.ESPLORA).toStrictEqual({ REST_API_URL: 'http://127.0.0.1:3000' });
 
       expect(config.CORE_RPC).toStrictEqual({
         HOST: '127.0.0.1',
         PORT: 8332,
         USERNAME: 'mempool',
-        PASSWORD: 'mempool',
-        TIMEOUT: 60000,
-        COOKIE: false,
-        COOKIE_PATH: '/bitcoin/.cookie'
+        PASSWORD: 'mempool'
       });
 
       expect(config.SECOND_CORE_RPC).toStrictEqual({
         HOST: '127.0.0.1',
         PORT: 8332,
         USERNAME: 'mempool',
-        PASSWORD: 'mempool',
-        TIMEOUT: 60000,
-        COOKIE: false,
-        COOKIE_PATH: '/bitcoin/.cookie'
+        PASSWORD: 'mempool'
       });
 
       expect(config.DATABASE).toStrictEqual({
@@ -89,9 +69,7 @@ describe('Mempool Backend Config', () => {
         PORT: 3306,
         DATABASE: 'mempool',
         USERNAME: 'mempool',
-        PASSWORD: 'mempool',
-        TIMEOUT: 180000,
-        PID_DIR: ''
+        PASSWORD: 'mempool'
       });
 
       expect(config.SYSLOG).toStrictEqual({
@@ -115,6 +93,11 @@ describe('Mempool Backend Config', () => {
         PASSWORD: ''
       });
 
+      expect(config.PRICE_DATA_SERVER).toStrictEqual({
+        TOR_URL: 'http://wizpriceje6q5tdrxkyiazsgu7irquiqjy2dptezqhrtu7l2qelqktid.onion/getAllMarketPrices',
+        CLEARNET_URL: 'https://price.bisq.wiz.biz/getAllMarketPrices'
+      });
+
       expect(config.EXTERNAL_DATA_SERVER).toStrictEqual({
         MEMPOOL_API: 'https://mempool.space/api/v1',
         MEMPOOL_ONION: 'http://mempoolhqx4isw62xs7abwphsq7ldayuidyx2v2oethdhhj6mlo2r6ad.onion/api/v1',
@@ -125,28 +108,10 @@ describe('Mempool Backend Config', () => {
       });
 
       expect(config.MAXMIND).toStrictEqual({
-        ENABLED: false,
-        GEOLITE2_CITY: '/usr/local/share/GeoIP/GeoLite2-City.mmdb',
-        GEOLITE2_ASN: '/usr/local/share/GeoIP/GeoLite2-ASN.mmdb',
-        GEOIP2_ISP: '/usr/local/share/GeoIP/GeoIP2-ISP.mmdb'
-      });
-
-      expect(config.REPLICATION).toStrictEqual({
-        ENABLED: false,
-        AUDIT: false,
-        AUDIT_START_HEIGHT: 774000,
-        SERVERS: []
-      });
-
-      expect(config.MEMPOOL_SERVICES).toStrictEqual({
-        API: "",
-        ACCELERATIONS: false,
-      });
-
-      expect(config.REDIS).toStrictEqual({
-        ENABLED: false,
-        UNIX_SOCKET_PATH: '',
-        BATCH_QUERY_BASE_SIZE: 5000,
+        ENABLED: true,
+        GEOLITE2_CITY: './backend/GeoIP/GeoLite2-City.mmdb',
+        GEOLITE2_ASN: './backend/GeoIP/GeoLite2-ASN.mmdb',
+        GEOIP2_ISP: ''
       });
     });
   });
@@ -178,110 +143,9 @@ describe('Mempool Backend Config', () => {
 
       expect(config.SOCKS5PROXY).toStrictEqual(fixture.SOCKS5PROXY);
 
+      expect(config.PRICE_DATA_SERVER).toStrictEqual(fixture.PRICE_DATA_SERVER);
+
       expect(config.EXTERNAL_DATA_SERVER).toStrictEqual(fixture.EXTERNAL_DATA_SERVER);
-
-      expect(config.MEMPOOL_SERVICES).toStrictEqual(fixture.MEMPOOL_SERVICES);
-
-      expect(config.REDIS).toStrictEqual(fixture.REDIS);
     });
   });
-
-  test('should ensure the docker start.sh script has default values', () => {
-    jest.isolateModules(() => {
-      const startSh = fs.readFileSync(`${__dirname}/../../../docker/backend/start.sh`, 'utf-8');
-      const fixture = JSON.parse(fs.readFileSync(`${__dirname}/../__fixtures__/mempool-config.template.json`, 'utf8'));
-
-      function parseJson(jsonObj, root?) {
-        for (const [key, value] of Object.entries(jsonObj)) {
-          // We have a few cases where we can't follow the pattern
-          if (root === 'MEMPOOL' && key === 'HTTP_PORT') {
-            if (process.env.CI) {
-              console.log('skipping check for MEMPOOL_HTTP_PORT');
-            }
-            continue;
-          }
-
-          if (root) {
-              //The flattened string, i.e, __MEMPOOL_ENABLED__
-              const replaceStr = `${root ? '__' + root + '_' : '__'}${key}__`;
-
-              //The string used as the environment variable, i.e, MEMPOOL_ENABLED
-              const envVarStr = `${root ? root : ''}_${key}`;
-
-              let defaultEntry;
-              //The string used as the default value, to be checked as a regex, i.e, __MEMPOOL_ENABLED__=${MEMPOOL_ENABLED:=(.*)}
-              if (Array.isArray(value)) {
-                defaultEntry = `${replaceStr}=\${${envVarStr}:=[]}`;
-                if (process.env.CI) {
-                  console.log(`looking for ${defaultEntry} in the start.sh script`);
-                }
-                //Regex matching does not work with the array values
-                expect(startSh).toContain(defaultEntry);
-              } else {
-                 defaultEntry = replaceStr + '=' + '\\${' + envVarStr + ':=(.*)' + '}';
-                 if (process.env.CI) {
-                  console.log(`looking for ${defaultEntry} in the start.sh script`);
-                }
-                const re = new RegExp(defaultEntry);
-                expect(startSh).toMatch(re);
-              }
-
-              //The string that actually replaces the values in the config file
-              const sedStr = 'sed -i "s!' + replaceStr + '!${' + replaceStr + '}!g" mempool-config.json';
-              if (process.env.CI) {
-                console.log(`looking for ${sedStr} in the start.sh script`);
-              }
-              expect(startSh).toContain(sedStr);
-            }
-          else {
-            parseJson(value, key);
-          }
-        }
-      }
-
-      parseJson(fixture);
-    });
-  });
-
-  test('should ensure that the mempool-config.json Docker template has all the keys', () => {
-    jest.isolateModules(() => {
-      const fixture = JSON.parse(fs.readFileSync(`${__dirname}/../__fixtures__/mempool-config.template.json`, 'utf8'));
-      const dockerJson = fs.readFileSync(`${__dirname}/../../../docker/backend/mempool-config.json`, 'utf-8');
-
-      function parseJson(jsonObj, root?) {
-        for (const [key, value] of Object.entries(jsonObj)) {
-          switch (typeof value) {
-            case 'object': {
-              if (Array.isArray(value)) {
-                // numbers, arrays and booleans won't be enclosed by quotes
-                const replaceStr = `${root ? '__' + root + '_' : '__'}${key}__`;
-                expect(dockerJson).toContain(`"${key}": ${replaceStr}`);
-                break;
-              } else {
-                //Check for top level config keys
-                expect(dockerJson).toContain(`"${key}"`);
-                parseJson(value, key);
-                break;
-              }
-            }
-            case 'string': {
-              // strings should be enclosed by quotes
-              const replaceStr = `${root ? '__' + root + '_' : '__'}${key}__`;
-              expect(dockerJson).toContain(`"${key}": "${replaceStr}"`);
-              break;
-            }
-            default: {
-              // numbers, arrays and booleans won't be enclosed by quotes
-              const replaceStr = `${root ? '__' + root + '_' : '__'}${key}__`;
-              expect(dockerJson).toContain(`"${key}": ${replaceStr}`);
-              break;
-            }
-          }
-        };
-      }
-      parseJson(fixture);
-    });
-  });
-
-
 });

backend/src/__tests__/gbt/gbt-tests.ts

@@ -1,68 +0,0 @@
-import fs from 'fs';
-import { GbtGenerator, ThreadTransaction } from 'rust-gbt';
-import path from 'path';
-
-const baseline = require('./test-data/target-template.json');
-const testVector = require('./test-data/test-data-ids.json');
-const vectorUidMap: Map<number, string> = new Map(testVector.map(x => [x[0], x[1]]));
-const vectorTxidMap: Map<string, number>  = new Map(testVector.map(x => [x[1], x[0]]));
-// Note that this test buffer is specially constructed
-// such that uids are assigned in numerical txid order
-// so that ties break the same way as in Core's implementation
-const vectorBuffer: Buffer = fs.readFileSync(path.join(__dirname, './', './test-data/test-buffer.bin'));
-
-describe('Rust GBT', () => {
-  test('should produce the same template as getBlockTemplate from Bitcoin Core', async () => {
-    const rustGbt = new GbtGenerator();
-    const { mempool, maxUid } = mempoolFromArrayBuffer(vectorBuffer.buffer);
-    const result = await rustGbt.make(mempool, [], maxUid);
-
-    const blocks: [string, number][][] = result.blocks.map(block => {
-      return block.map(uid => [vectorUidMap.get(uid) || 'missing', uid]);
-    });
-    const template = baseline.map(tx => [tx.txid, vectorTxidMap.get(tx.txid)]);
-
-    expect(blocks[0].length).toEqual(baseline.length);
-    expect(blocks[0]).toEqual(template);
-  });
-});
-
-function mempoolFromArrayBuffer(buf: ArrayBuffer): { mempool: ThreadTransaction[], maxUid: number } {
-  let maxUid = 0;
-  const view = new DataView(buf);
-  const count = view.getUint32(0, false);
-  const txs: ThreadTransaction[] = [];
-  let offset = 4;
-  for (let i = 0; i < count; i++) {
-    const uid = view.getUint32(offset, false);
-    maxUid = Math.max(maxUid, uid);
-    const tx: ThreadTransaction = {
-      uid,
-      order: txidToOrdering(vectorUidMap.get(uid) as string),
-      fee: view.getFloat64(offset + 4, false),
-      weight: view.getUint32(offset + 12, false),
-      sigops: view.getUint32(offset + 16, false),
-      // feePerVsize: view.getFloat64(offset + 20, false),
-      effectiveFeePerVsize: view.getFloat64(offset + 28, false),
-      inputs: [],
-    };
-    const numInputs = view.getUint32(offset + 36, false);
-    offset += 40;
-    for (let j = 0; j < numInputs; j++) {
-      tx.inputs.push(view.getUint32(offset, false));
-      offset += 4;
-    }
-    txs.push(tx);
-  }
-  return { mempool: txs, maxUid };
-}
-
-function txidToOrdering(txid: string): number {
-  return parseInt(
-    txid.substr(62, 2) +
-      txid.substr(60, 2) +
-      txid.substr(58, 2) +
-      txid.substr(56, 2),
-    16
-  );
-}

backend/src/api/audit.ts

@@ -1,22 +1,18 @@
 import config from '../config';
-import logger from '../logger';
-import { MempoolTransactionExtended, MempoolBlockWithTransactions } from '../mempool.interfaces';
-import rbfCache from './rbf-cache';
+import { TransactionExtended, MempoolBlockWithTransactions } from '../mempool.interfaces';
 
 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(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 } {
+  auditBlock(transactions: TransactionExtended[], projectedBlocks: MempoolBlockWithTransactions[], mempool: { [txId: string]: TransactionExtended })
+   : { censored: string[], added: string[], fresh: string[], score: number, similarity: number } {
     if (!projectedBlocks?.[0]?.transactionIds || !mempool) {
-      return { censored: [], added: [], fresh: [], sigop: [], fullrbf: [], accelerated: [], score: 1, similarity: 1 };
+      return { censored: [], added: [], fresh: [], score: 0, similarity: 1 };
     }
 
     const matches: string[] = []; // present in both mined block and template
     const added: string[] = []; // present in mined block, not in template
-    const fresh: string[] = []; // missing, but firstSeen or lastBoosted within PROPAGATION_MARGIN
-    const rbf: string[] = []; // either missing or present, and either part of a full-rbf replacement, or a conflict with the mined block
-    const accelerated: string[] = []; // prioritized by the mempool accelerator
+    const fresh: string[] = []; // missing, but firstSeen within PROPAGATION_MARGIN
     const isCensored = {}; // missing, without excuse
     const isDisplaced = {};
     let displacedWeight = 0;
@@ -29,9 +25,6 @@ class Audit {
     const now = Math.round((Date.now() / 1000));
     for (const tx of transactions) {
       inBlock[tx.txid] = tx;
-      if (mempool[tx.txid] && mempool[tx.txid].acceleration) {
-        accelerated.push(tx.txid);
-      }
     }
     // coinbase is always expected
     if (transactions[0]) {
@@ -40,31 +33,23 @@ class Audit {
     // look for transactions that were expected in the template, but missing from the mined block
     for (const txid of projectedBlocks[0].transactionIds) {
       if (!inBlock[txid]) {
-        // allow missing transactions which either belong to a full rbf tree, or conflict with any transaction in the mined block
-        if (rbfCache.has(txid) && (rbfCache.isFullRbf(txid) || rbfCache.anyInSameTree(txid, (tx) => inBlock[tx.txid]))) {
-          rbf.push(txid);
-        } else if (mempool[txid]?.firstSeen != null && (now - (mempool[txid]?.firstSeen || 0)) <= PROPAGATION_MARGIN) {
-          // tx is recent, may have reached the miner too late for inclusion
-          fresh.push(txid);
-        } else if (mempool[txid]?.lastBoosted != null && (now - (mempool[txid]?.lastBoosted || 0)) <= PROPAGATION_MARGIN) {
-          // tx was recently cpfp'd, miner may not have the latest effective rate
+        // tx is recent, may have reached the miner too late for inclusion
+        if (mempool[txid]?.firstSeen != null && (now - (mempool[txid]?.firstSeen || 0)) <= PROPAGATION_MARGIN) {
           fresh.push(txid);
         } else {
           isCensored[txid] = true;
         }
-        displacedWeight += mempool[txid]?.weight || 0;
+        displacedWeight += mempool[txid].weight;
       } else {
-        matchedWeight += mempool[txid]?.weight || 0;
+        matchedWeight += mempool[txid].weight;
       }
-      projectedWeight += mempool[txid]?.weight || 0;
+      projectedWeight += mempool[txid].weight;
       inTemplate[txid] = true;
     }
 
-    if (transactions[0]) {
-      displacedWeight += (4000 - transactions[0].weight);
-      projectedWeight += transactions[0].weight;
-      matchedWeight += transactions[0].weight;
-    }
+    displacedWeight += (4000 - transactions[0].weight);
+    projectedWeight += transactions[0].weight;
+    matchedWeight += transactions[0].weight;
 
     // 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
@@ -74,24 +59,19 @@ class Audit {
     let failures = 0;
     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;
-        const feeMatches = tx.effectiveFeePerVsize >= lastFeeRate;
-        if (fits || feeMatches) {
-          isDisplaced[txid] = true;
-          if (fits) {
-            lastFeeRate = Math.min(lastFeeRate, tx.effectiveFeePerVsize);
-          }
-          if (tx.firstSeen == null || (now - (tx?.firstSeen || 0)) > PROPAGATION_MARGIN) {
-            displacedWeightRemaining -= tx.weight;
-          }
-          failures = 0;
-        } else {
-          failures++;
+      const fits = (mempool[txid].weight - displacedWeightRemaining) < 4000;
+      const feeMatches = mempool[txid].effectiveFeePerVsize >= lastFeeRate;
+      if (fits || feeMatches) {
+        isDisplaced[txid] = true;
+        if (fits) {
+          lastFeeRate = Math.min(lastFeeRate, mempool[txid].effectiveFeePerVsize);
         }
+        if (mempool[txid].firstSeen == null || (now - (mempool[txid]?.firstSeen || 0)) > PROPAGATION_MARGIN) {
+          displacedWeightRemaining -= mempool[txid].weight;
+        }
+        failures = 0;
       } else {
-        logger.warn('projected transaction missing from mempool cache');
+        failures++;
       }
       index++;
     }
@@ -103,11 +83,19 @@ class Audit {
       if (inTemplate[tx.txid]) {
         matches.push(tx.txid);
       } else {
-        if (rbfCache.has(tx.txid)) {
-          rbf.push(tx.txid);
-        } else if (!isDisplaced[tx.txid]) {
+        if (!isDisplaced[tx.txid]) {
           added.push(tx.txid);
+        } else {
         }
+        let blockIndex = -1;
+        let index = -1;
+        projectedBlocks.forEach((block, bi) => {
+          const i = block.transactionIds.indexOf(tx.txid);
+          if (i >= 0) {
+            blockIndex = bi;
+            index = i;
+          }
+        });
         overflowWeight += tx.weight;
       }
       totalWeight += tx.weight;
@@ -120,45 +108,32 @@ class Audit {
     index = projectedBlocks[0].transactionIds.length - 1;
     while (index >= 0) {
       const txid = projectedBlocks[0].transactionIds[index];
-      const tx = mempool[txid];
-      if (tx) {
-        if (overflowWeightRemaining > 0) {
-          if (isCensored[txid]) {
-            delete isCensored[txid];
-          }
-          if (tx.effectiveFeePerVsize > maxOverflowRate) {
-            maxOverflowRate = tx.effectiveFeePerVsize;
-            rateThreshold = (Math.ceil(maxOverflowRate * 100) / 100) + 0.005;
-          }
-        } else if (tx.effectiveFeePerVsize <= rateThreshold) { // tolerance of 0.01 sat/vb + rounding
-          if (isCensored[txid]) {
-            delete isCensored[txid];
-          }
+      if (overflowWeightRemaining > 0) {
+        if (isCensored[txid]) {
+          delete isCensored[txid];
+        }
+        if (mempool[txid].effectiveFeePerVsize > maxOverflowRate) {
+          maxOverflowRate = mempool[txid].effectiveFeePerVsize;
+          rateThreshold = (Math.ceil(maxOverflowRate * 100) / 100) + 0.005;
+        }
+      } else if (mempool[txid].effectiveFeePerVsize <= rateThreshold) { // tolerance of 0.01 sat/vb + rounding
+        if (isCensored[txid]) {
+          delete isCensored[txid];
         }
-        overflowWeightRemaining -= (mempool[txid]?.weight || 0);
-      } else {
-        logger.warn('projected transaction missing from mempool cache');
       }
+      overflowWeightRemaining -= (mempool[txid]?.weight || 0);
       index--;
     }
 
     const numCensored = Object.keys(isCensored).length;
     const numMatches = matches.length - 1; // adjust for coinbase tx
-    let score = 0;
-    if (numMatches <= 0 && numCensored <= 0) {
-      score = 1;
-    } else if (numMatches > 0) {
-      score = (numMatches / (numMatches + numCensored));
-    }
+    const score = numMatches > 0 ? (numMatches / (numMatches + numCensored)) : 0;
     const similarity = projectedWeight ? matchedWeight / projectedWeight : 1;
 
     return {
       censored: Object.keys(isCensored),
       added,
       fresh,
-      sigop: [],
-      fullrbf: rbf,
-      accelerated,
       score,
       similarity,
     };

backend/src/api/bisq/bisq.ts

@@ -7,6 +7,7 @@ import { SocksProxyAgent } from 'socks-proxy-agent';
 import { BisqBlocks, BisqBlock, BisqTransaction, BisqStats, BisqTrade } from './interfaces';
 import { Common } from '../common';
 import { BlockExtended } from '../../mempool.interfaces';
+import { StaticPool } from 'node-worker-threads-pool';
 import backendInfo from '../backend-info';
 import logger from '../../logger';
 
@@ -30,6 +31,10 @@ class Bisq {
   private priceUpdateCallbackFunction: ((price: number) => void) | undefined;
   private topDirectoryWatcher: fs.FSWatcher | undefined;
   private subdirectoryWatcher: fs.FSWatcher | undefined;
+  private jsonParsePool = new StaticPool({
+    size: 4,
+    task: (blob: string) => JSON.parse(blob),
+  });
 
   constructor() {}
 

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

@@ -3,14 +3,10 @@ import { IEsploraApi } from './esplora-api.interface';
 export interface AbstractBitcoinApi {
   $getRawMempool(): Promise<IEsploraApi.Transaction['txid'][]>;
   $getRawTransaction(txId: string, skipConversion?: boolean, addPrevout?: boolean, lazyPrevouts?: boolean): Promise<IEsploraApi.Transaction>;
-  $getRawTransactions(txids: string[]): Promise<IEsploraApi.Transaction[]>;
-  $getMempoolTransactions(txids: string[]): Promise<IEsploraApi.Transaction[]>;
-  $getAllMempoolTransactions(lastTxid?: string, max_txs?: number);
   $getTransactionHex(txId: string): Promise<string>;
   $getBlockHeightTip(): Promise<number>;
   $getBlockHashTip(): Promise<string>;
   $getTxIdsForBlock(hash: string): Promise<string[]>;
-  $getTxsForBlock(hash: string): Promise<IEsploraApi.Transaction[]>;
   $getBlockHash(height: number): Promise<string>;
   $getBlockHeader(hash: string): Promise<string>;
   $getBlock(hash: string): Promise<IEsploraApi.Block>;
@@ -18,16 +14,10 @@ export interface AbstractBitcoinApi {
   $getAddress(address: string): Promise<IEsploraApi.Address>;
   $getAddressTransactions(address: string, lastSeenTxId: string): Promise<IEsploraApi.Transaction[]>;
   $getAddressPrefix(prefix: string): string[];
-  $getScriptHash(scripthash: string): Promise<IEsploraApi.ScriptHash>;
-  $getScriptHashTransactions(address: string, lastSeenTxId: string): Promise<IEsploraApi.Transaction[]>;
   $sendRawTransaction(rawTransaction: string): Promise<string>;
   $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[]>;
-
-  startHealthChecks(): void;
 }
 export interface BitcoinRpcCredentials {
   host: string;
@@ -35,5 +25,4 @@ export interface BitcoinRpcCredentials {
   user: string;
   pass: string;
   timeout: number;
-  cookie?: string;
 }

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

@@ -5,7 +5,6 @@ import { IEsploraApi } from './esplora-api.interface';
 import blocks from '../blocks';
 import mempool from '../mempool';
 import { TransactionExtended } from '../../mempool.interfaces';
-import transactionUtils from '../transaction-utils';
 
 class BitcoinApi implements AbstractBitcoinApi {
   private rawMempoolCache: IBitcoinApi.RawMempool | null = null;
@@ -30,7 +29,6 @@ class BitcoinApi implements AbstractBitcoinApi {
       weight: block.weight,
       previousblockhash: block.previousblockhash,
       mediantime: block.mediantime,
-      stale: block.confirmations === -1,
     };
   }
 
@@ -60,46 +58,23 @@ class BitcoinApi implements AbstractBitcoinApi {
       });
   }
 
-  async $getRawTransactions(txids: string[]): Promise<IEsploraApi.Transaction[]> {
-    const txs: IEsploraApi.Transaction[] = [];
-    for (const txid of txids) {
-      try {
-        const tx = await this.$getRawTransaction(txid, false, true);
-        txs.push(tx);
-      } catch (err) {
-        // skip failures
-      }
-    }
-    return txs;
-  }
-
-  $getMempoolTransactions(txids: string[]): Promise<IEsploraApi.Transaction[]> {
-    throw new Error('Method getMempoolTransactions not supported by the Bitcoin RPC API.');
-  }
-
-  $getAllMempoolTransactions(lastTxid?: string, max_txs?: number): Promise<IEsploraApi.Transaction[]> {
-    throw new Error('Method getAllMempoolTransactions not supported by the Bitcoin RPC API.');
-
-  }
-
-  async $getTransactionHex(txId: string): Promise<string> {
-    const txInMempool = mempool.getMempool()[txId];
-    if (txInMempool && txInMempool.hex) {
-      return txInMempool.hex;
-    }
-
-    return this.bitcoindClient.getRawTransaction(txId, true)
-      .then((transaction: IBitcoinApi.Transaction) => {
-        return transaction.hex;
-      });
+  $getTransactionHex(txId: string): Promise<string> {
+    return this.$getRawTransaction(txId, true)
+      .then((tx) => tx.hex || '');
   }
 
   $getBlockHeightTip(): Promise<number> {
-    return this.bitcoindClient.getBlockCount();
+    return this.bitcoindClient.getChainTips()
+      .then((result: IBitcoinApi.ChainTips[]) => {
+        return result.find(tip => tip.status === 'active')!.height;
+      });
   }
 
   $getBlockHashTip(): Promise<string> {
-    return this.bitcoindClient.getBestBlockHash();
+    return this.bitcoindClient.getChainTips()
+      .then((result: IBitcoinApi.ChainTips[]) => {
+        return result.find(tip => tip.status === 'active')!.hash;
+      });
   }
 
   $getTxIdsForBlock(hash: string): Promise<string[]> {
@@ -107,10 +82,6 @@ class BitcoinApi implements AbstractBitcoinApi {
       .then((rpcBlock: IBitcoinApi.Block) => rpcBlock.tx);
   }
 
-  $getTxsForBlock(hash: string): Promise<IEsploraApi.Transaction[]> {
-    throw new Error('Method getTxsForBlock not supported by the Bitcoin RPC API.');
-  }
-
   $getRawBlock(hash: string): Promise<Buffer> {
     return this.bitcoindClient.getBlock(hash, 0)
       .then((raw: string) => Buffer.from(raw, "hex"));
@@ -142,14 +113,6 @@ class BitcoinApi implements AbstractBitcoinApi {
     throw new Error('Method getAddressTransactions not supported by the Bitcoin RPC API.');
   }
 
-  $getScriptHash(scripthash: string): Promise<IEsploraApi.ScriptHash> {
-    throw new Error('Method getScriptHash not supported by the Bitcoin RPC API.');
-  }
-
-  $getScriptHashTransactions(scripthash: string, lastSeenTxId: string): Promise<IEsploraApi.Transaction[]> {
-    throw new Error('Method getScriptHashTransactions not supported by the Bitcoin RPC API.');
-  }
-
   $getRawMempool(): Promise<IEsploraApi.Transaction['txid'][]> {
     return this.bitcoindClient.getRawMemPool();
   }
@@ -211,19 +174,6 @@ class BitcoinApi implements AbstractBitcoinApi {
     return outspends;
   }
 
-  async $getBatchedOutspendsInternal(txId: string[]): Promise<IEsploraApi.Outspend[][]> {
-    return this.$getBatchedOutspends(txId);
-  }
-
-  async $getOutSpendsByOutpoint(outpoints: { txid: string, vout: number }[]): Promise<IEsploraApi.Outspend[]> {
-    const outspends: IEsploraApi.Outspend[] = [];
-    for (const outpoint of outpoints) {
-      const outspend = await this.$getOutspend(outpoint.txid, outpoint.vout);
-      outspends.push(outspend);
-    }
-    return outspends;
-  }
-
   $getEstimatedHashrate(blockHeight: number): Promise<number> {
     // 120 is the default block span in Core
     return this.bitcoindClient.getNetworkHashPs(120, blockHeight);
@@ -248,7 +198,7 @@ class BitcoinApi implements AbstractBitcoinApi {
         scriptpubkey: vout.scriptPubKey.hex,
         scriptpubkey_address: vout.scriptPubKey && vout.scriptPubKey.address ? vout.scriptPubKey.address
           : vout.scriptPubKey.addresses ? vout.scriptPubKey.addresses[0] : '',
-        scriptpubkey_asm: vout.scriptPubKey.asm ? transactionUtils.convertScriptSigAsm(vout.scriptPubKey.hex) : '',
+        scriptpubkey_asm: vout.scriptPubKey.asm ? this.convertScriptSigAsm(vout.scriptPubKey.hex) : '',
         scriptpubkey_type: this.translateScriptPubKeyType(vout.scriptPubKey.type),
       };
     });
@@ -258,7 +208,7 @@ class BitcoinApi implements AbstractBitcoinApi {
         is_coinbase: !!vin.coinbase,
         prevout: null,
         scriptsig: vin.scriptSig && vin.scriptSig.hex || vin.coinbase || '',
-        scriptsig_asm: vin.scriptSig && transactionUtils.convertScriptSigAsm(vin.scriptSig.hex) || '',
+        scriptsig_asm: vin.scriptSig && this.convertScriptSigAsm(vin.scriptSig.hex) || '',
         sequence: vin.sequence,
         txid: vin.txid || '',
         vout: vin.vout || 0,
@@ -330,7 +280,7 @@ class BitcoinApi implements AbstractBitcoinApi {
       }
       const innerTx = await this.$getRawTransaction(vin.txid, false, false);
       vin.prevout = innerTx.vout[vin.vout];
-      transactionUtils.addInnerScriptsToVin(vin);
+      this.addInnerScriptsToVin(vin);
     }
     return transaction;
   }
@@ -369,7 +319,7 @@ class BitcoinApi implements AbstractBitcoinApi {
       }
       const innerTx = await this.$getRawTransaction(transaction.vin[i].txid, false, false);
       transaction.vin[i].prevout = innerTx.vout[transaction.vin[i].vout];
-      transactionUtils.addInnerScriptsToVin(transaction.vin[i]);
+      this.addInnerScriptsToVin(transaction.vin[i]);
       totalIn += innerTx.vout[transaction.vin[i].vout].value;
     }
     if (lazyPrevouts && transaction.vin.length > 12) {
@@ -381,7 +331,96 @@ class BitcoinApi implements AbstractBitcoinApi {
     return transaction;
   }
 
-  public startHealthChecks(): void {};
+  private convertScriptSigAsm(hex: string): string {
+    const buf = Buffer.from(hex, 'hex');
+
+    const b: string[] = [];
+
+    let i = 0;
+    while (i < buf.length) {
+      const op = buf[i];
+      if (op >= 0x01 && op <= 0x4e) {
+        i++;
+        let push: number;
+        if (op === 0x4c) {
+          push = buf.readUInt8(i);
+          b.push('OP_PUSHDATA1');
+          i += 1;
+        } else if (op === 0x4d) {
+          push = buf.readUInt16LE(i);
+          b.push('OP_PUSHDATA2');
+          i += 2;
+        } else if (op === 0x4e) {
+          push = buf.readUInt32LE(i);
+          b.push('OP_PUSHDATA4');
+          i += 4;
+        } else {
+          push = op;
+          b.push('OP_PUSHBYTES_' + push);
+        }
+
+        const data = buf.slice(i, i + push);
+        if (data.length !== push) {
+          break;
+        }
+
+        b.push(data.toString('hex'));
+        i += data.length;
+      } else {
+        if (op === 0x00) {
+          b.push('OP_0');
+        } else if (op === 0x4f) {
+          b.push('OP_PUSHNUM_NEG1');
+        } else if (op === 0xb1) {
+          b.push('OP_CLTV');
+        } else if (op === 0xb2) {
+          b.push('OP_CSV');
+        } else if (op === 0xba) {
+          b.push('OP_CHECKSIGADD');
+        } else {
+          const opcode = bitcoinjs.script.toASM([ op ]);
+          if (opcode && op < 0xfd) {
+            if (/^OP_(\d+)$/.test(opcode)) {
+              b.push(opcode.replace(/^OP_(\d+)$/, 'OP_PUSHNUM_$1'));
+            } else {
+              b.push(opcode);
+            }
+          } else {
+            b.push('OP_RETURN_' + op);
+          }
+        }
+        i += 1;
+      }
+    }
+
+    return b.join(' ');
+  }
+
+  private addInnerScriptsToVin(vin: IEsploraApi.Vin): void {
+    if (!vin.prevout) {
+      return;
+    }
+
+    if (vin.prevout.scriptpubkey_type === 'p2sh') {
+      const redeemScript = vin.scriptsig_asm.split(' ').reverse()[0];
+      vin.inner_redeemscript_asm = this.convertScriptSigAsm(redeemScript);
+      if (vin.witness && vin.witness.length > 2) {
+        const witnessScript = vin.witness[vin.witness.length - 1];
+        vin.inner_witnessscript_asm = this.convertScriptSigAsm(witnessScript);
+      }
+    }
+
+    if (vin.prevout.scriptpubkey_type === 'v0_p2wsh' && vin.witness) {
+      const witnessScript = vin.witness[vin.witness.length - 1];
+      vin.inner_witnessscript_asm = this.convertScriptSigAsm(witnessScript);
+    }
+
+    if (vin.prevout.scriptpubkey_type === 'v1_p2tr' && vin.witness && vin.witness.length > 1) {
+      const witnessScript = vin.witness[vin.witness.length - 2];
+      vin.inner_witnessscript_asm = this.convertScriptSigAsm(witnessScript);
+    }
+  }
+
 }
 
 export default BitcoinApi;

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

@@ -7,8 +7,7 @@ const nodeRpcCredentials: BitcoinRpcCredentials = {
   port: config.CORE_RPC.PORT,
   user: config.CORE_RPC.USERNAME,
   pass: config.CORE_RPC.PASSWORD,
-  timeout: config.CORE_RPC.TIMEOUT,
-  cookie: config.CORE_RPC.COOKIE ? config.CORE_RPC.COOKIE_PATH : undefined,
+  timeout: 60000,
 };
 
 export default new bitcoin.Client(nodeRpcCredentials);

backend/src/api/bitcoin/bitcoin-second-client.ts

@@ -7,8 +7,7 @@ const nodeRpcCredentials: BitcoinRpcCredentials = {
   port: config.SECOND_CORE_RPC.PORT,
   user: config.SECOND_CORE_RPC.USERNAME,
   pass: config.SECOND_CORE_RPC.PASSWORD,
-  timeout: config.SECOND_CORE_RPC.TIMEOUT,
-  cookie: config.SECOND_CORE_RPC.COOKIE ? config.SECOND_CORE_RPC.COOKIE_PATH : undefined,
+  timeout: 60000,
 };
 
 export default new bitcoin.Client(nodeRpcCredentials);

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

@@ -6,7 +6,7 @@ import websocketHandler from '../websocket-handler';
 import mempool from '../mempool';
 import feeApi from '../fee-api';
 import mempoolBlocks from '../mempool-blocks';
-import bitcoinApi from './bitcoin-api-factory';
+import bitcoinApi, { bitcoinCoreApi } from './bitcoin-api-factory';
 import { Common } from '../common';
 import backendInfo from '../backend-info';
 import transactionUtils from '../transaction-utils';
@@ -24,6 +24,7 @@ class BitcoinRoutes {
   public initRoutes(app: Application) {
     app
       .get(config.MEMPOOL.API_URL_PREFIX + 'transaction-times', this.getTransactionTimes)
+      .get(config.MEMPOOL.API_URL_PREFIX + 'outspends', this.$getBatchedOutspends)
       .get(config.MEMPOOL.API_URL_PREFIX + 'cpfp/:txId', this.$getCpfpInfo)
       .get(config.MEMPOOL.API_URL_PREFIX + 'difficulty-adjustment', this.getDifficultyChange)
       .get(config.MEMPOOL.API_URL_PREFIX + 'fees/recommended', this.getRecommendedFees)
@@ -31,10 +32,8 @@ class BitcoinRoutes {
       .get(config.MEMPOOL.API_URL_PREFIX + 'backend-info', this.getBackendInfo)
       .get(config.MEMPOOL.API_URL_PREFIX + 'init-data', this.getInitData)
       .get(config.MEMPOOL.API_URL_PREFIX + 'validate-address/:address', this.validateAddress)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'tx/:txId/rbf', this.getRbfHistory)
+      .get(config.MEMPOOL.API_URL_PREFIX + 'tx/:txId/replaces', this.getRbfHistory)
       .get(config.MEMPOOL.API_URL_PREFIX + 'tx/:txId/cached', this.getCachedTx)
-      .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 {
@@ -95,7 +94,6 @@ class BitcoinRoutes {
       .get(config.MEMPOOL.API_URL_PREFIX + 'block/:hash', this.getBlock)
       .get(config.MEMPOOL.API_URL_PREFIX + 'block/:hash/summary', this.getStrippedBlockTransactions)
       .get(config.MEMPOOL.API_URL_PREFIX + 'block/:hash/audit-summary', this.getBlockAuditSummary)
-      .get(config.MEMPOOL.API_URL_PREFIX + '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))
@@ -111,8 +109,8 @@ class BitcoinRoutes {
           .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)
-          .get(config.MEMPOOL.API_URL_PREFIX + 'txs/outspends', this.$getBatchedOutspends)
           .get(config.MEMPOOL.API_URL_PREFIX + 'block/:hash/header', this.getBlockHeader)
+          .get(config.MEMPOOL.API_URL_PREFIX + 'blocks/tip/height', this.getBlockTipHeight)
           .get(config.MEMPOOL.API_URL_PREFIX + 'blocks/tip/hash', this.getBlockTipHash)
           .get(config.MEMPOOL.API_URL_PREFIX + 'block/:hash/raw', this.getRawBlock)
           .get(config.MEMPOOL.API_URL_PREFIX + 'block/:hash/txids', this.getTxIdsForBlock)
@@ -121,8 +119,7 @@ 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 + 'scripthash/:scripthash', this.getScriptHash)
-          .get(config.MEMPOOL.API_URL_PREFIX + 'scripthash/:scripthash/txs', this.getScriptHashTransactions)
+          .get(config.MEMPOOL.API_URL_PREFIX + 'address/:address/txs/chain/:txId', this.getAddressTransactions)
           .get(config.MEMPOOL.API_URL_PREFIX + 'address-prefix/:prefix', this.getAddressPrefix)
           ;
       }
@@ -131,9 +128,8 @@ class BitcoinRoutes {
 
   private getInitData(req: Request, res: Response) {
     try {
-      const result = websocketHandler.getSerializedInitData();
-      res.set('Content-Type', 'application/json');
-      res.send(result);
+      const result = websocketHandler.getInitData();
+      res.json(result);
     } catch (e) {
       res.status(500).send(e instanceof Error ? e.message : e);
     }
@@ -174,20 +170,24 @@ class BitcoinRoutes {
     res.json(times);
   }
 
-  private async $getBatchedOutspends(req: Request, res: Response): Promise<IEsploraApi.Outspend[][] | void> {
-    const txids_csv = req.query.txids;
-    if (!txids_csv || typeof txids_csv !== 'string') {
-      res.status(500).send('Invalid txids format');
+  private async $getBatchedOutspends(req: Request, res: Response) {
+    if (!Array.isArray(req.query.txId)) {
+      res.status(500).send('Not an array');
       return;
     }
-    const txids = txids_csv.split(',');
-    if (txids.length > 50) {
+    if (req.query.txId.length > 50) {
       res.status(400).send('Too many txids requested');
       return;
     }
+    const txIds: string[] = [];
+    for (const _txId in req.query.txId) {
+      if (typeof req.query.txId[_txId] === 'string') {
+        txIds.push(req.query.txId[_txId].toString());
+      }
+    }
 
     try {
-      const batchedOutspends = await bitcoinApi.$getBatchedOutspends(txids);
+      const batchedOutspends = await bitcoinApi.$getBatchedOutspends(txIds);
       res.json(batchedOutspends);
     } catch (e) {
       res.status(500).send(e instanceof Error ? e.message : e);
@@ -208,9 +208,6 @@ class BitcoinRoutes {
           bestDescendant: tx.bestDescendant || null,
           descendants: tx.descendants || null,
           effectiveFeePerVsize: tx.effectiveFeePerVsize || null,
-          sigops: tx.sigops,
-          adjustedVsize: tx.adjustedVsize,
-          acceleration: tx.acceleration
         });
         return;
       }
@@ -222,12 +219,7 @@ class BitcoinRoutes {
     } else {
       let cpfpInfo;
       if (config.DATABASE.ENABLED) {
-        try {
-          cpfpInfo = await transactionRepository.$getCpfpInfo(req.params.txId);
-        } catch (e) {
-          res.status(500).send('failed to get CPFP info');
-          return;
-        }
+        cpfpInfo = await transactionRepository.$getCpfpInfo(req.params.txId);
       }
       if (cpfpInfo) {
         res.json(cpfpInfo);
@@ -247,7 +239,7 @@ class BitcoinRoutes {
 
   private async getTransaction(req: Request, res: Response) {
     try {
-      const transaction = await transactionUtils.$getTransactionExtended(req.params.txId, true, false, false, true);
+      const transaction = await transactionUtils.$getTransactionExtended(req.params.txId, true);
       res.json(transaction);
     } catch (e) {
       let statusCode = 500;
@@ -397,13 +389,9 @@ class BitcoinRoutes {
 
   private async getBlockAuditSummary(req: Request, res: Response) {
     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 {
-        return res.status(404).send(`audit not available`);
-      }
+      const transactions = await blocks.$getBlockAuditSummary(req.params.hash);
+      res.setHeader('Expires', new Date(Date.now() + 1000 * 3600 * 24 * 30).toUTCString());
+      res.json(transactions);
     } catch (e) {
       res.status(500).send(e instanceof Error ? e.message : e);
     }
@@ -474,13 +462,13 @@ class BitcoinRoutes {
       }
 
       let nextHash = startFromHash;
-      for (let i = 0; i < 15 && nextHash; i++) {
+      for (let i = 0; i < 10 && nextHash; i++) {
         const localBlock = blocks.getBlocks().find((b) => b.id === nextHash);
         if (localBlock) {
           returnBlocks.push(localBlock);
           nextHash = localBlock.previousblockhash;
         } else {
-          const block = await bitcoinApi.$getBlock(nextHash);
+          const block = await bitcoinCoreApi.$getBlock(nextHash);
           returnBlocks.push(block);
           nextHash = block.previousblockhash;
         }
@@ -544,39 +532,15 @@ class BitcoinRoutes {
     }
   }
 
-  private async getAddressTransactions(req: Request, res: Response): Promise<void> {
+  private async getAddressTransactions(req: Request, res: Response) {
     if (config.MEMPOOL.BACKEND === 'none') {
       res.status(405).send('Address lookups cannot be used with bitcoind as backend.');
       return;
     }
 
     try {
-      let lastTxId: string = '';
-      if (req.query.after_txid && typeof req.query.after_txid === 'string') {
-        lastTxId = req.query.after_txid;
-      }
-      const transactions = await bitcoinApi.$getAddressTransactions(req.params.address, lastTxId);
+      const transactions = await bitcoinApi.$getAddressTransactions(req.params.address, req.params.txId);
       res.json(transactions);
-    } catch (e) {
-      if (e instanceof Error && e.message && (e.message.indexOf('too long') > 0 || e.message.indexOf('confirmed status') > 0)) {
-        res.status(413).send(e instanceof Error ? e.message : e);
-        return;
-      }
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
-  private async getScriptHash(req: Request, res: Response) {
-    if (config.MEMPOOL.BACKEND === 'none') {
-      res.status(405).send('Address lookups cannot be used with bitcoind as backend.');
-      return;
-    }
-
-    try {
-      // electrum expects scripthashes in little-endian
-      const electrumScripthash = req.params.scripthash.match(/../g)?.reverse().join('') ?? '';
-      const addressData = await bitcoinApi.$getScriptHash(electrumScripthash);
-      res.json(addressData);
     } catch (e) {
       if (e instanceof Error && e.message && (e.message.indexOf('too long') > 0 || e.message.indexOf('confirmed status') > 0)) {
         return res.status(413).send(e instanceof Error ? e.message : e);
@@ -585,28 +549,8 @@ class BitcoinRoutes {
     }
   }
 
-  private async getScriptHashTransactions(req: Request, res: Response): Promise<void> {
-    if (config.MEMPOOL.BACKEND === 'none') {
-      res.status(405).send('Address lookups cannot be used with bitcoind as backend.');
-      return;
-    }
-
-    try {
-      // electrum expects scripthashes in little-endian
-      const electrumScripthash = req.params.scripthash.match(/../g)?.reverse().join('') ?? '';
-      let lastTxId: string = '';
-      if (req.query.after_txid && typeof req.query.after_txid === 'string') {
-        lastTxId = req.query.after_txid;
-      }
-      const transactions = await bitcoinApi.$getScriptHashTransactions(electrumScripthash, lastTxId);
-      res.json(transactions);
-    } catch (e) {
-      if (e instanceof Error && e.message && (e.message.indexOf('too long') > 0 || e.message.indexOf('confirmed status') > 0)) {
-        res.status(413).send(e instanceof Error ? e.message : e);
-        return;
-      }
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
+  private async getAdressTxChain(req: Request, res: Response) {
+    res.status(501).send('Not implemented');
   }
 
   private async getAddressPrefix(req: Request, res: Response) {
@@ -645,14 +589,10 @@ class BitcoinRoutes {
     }
   }
 
-  private getBlockTipHeight(req: Request, res: Response) {
+  private async getBlockTipHeight(req: Request, res: Response) {
     try {
-      const result = blocks.getCurrentBlockHeight();
-      if (!result) {
-        return res.status(503).send(`Service Temporarily Unavailable`);
-      }
-      res.setHeader('content-type', 'text/plain');
-      res.send(result.toString());
+      const result = await bitcoinApi.$getBlockHeightTip();
+      res.json(result);
     } catch (e) {
       res.status(500).send(e instanceof Error ? e.message : e);
     }
@@ -698,30 +638,8 @@ class BitcoinRoutes {
 
   private async getRbfHistory(req: Request, res: Response) {
     try {
-      const replacements = rbfCache.getRbfTree(req.params.txId) || null;
-      const replaces = rbfCache.getReplaces(req.params.txId) || null;
-      res.json({
-        replacements,
-        replaces
-      });
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
-  private async getRbfReplacements(req: Request, res: Response) {
-    try {
-      const result = rbfCache.getRbfTrees(false);
-      res.json(result);
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
-  private async getFullRbfReplacements(req: Request, res: Response) {
-    try {
-      const result = rbfCache.getRbfTrees(true);
-      res.json(result);
+      const result = rbfCache.getReplaces(req.params.txId);
+      res.json(result || []);
     } catch (e) {
       res.status(500).send(e instanceof Error ? e.message : e);
     }
@@ -765,7 +683,12 @@ class BitcoinRoutes {
   private async $postTransaction(req: Request, res: Response) {
     res.setHeader('content-type', 'text/plain');
     try {
-      const rawTx = Common.getTransactionFromRequest(req, false);
+      let rawTx;
+      if (typeof req.body === 'object') {
+        rawTx = Object.keys(req.body)[0];
+      } else {
+        rawTx = req.body;
+      }
       const txIdResult = await bitcoinApi.$sendRawTransaction(rawTx);
       res.send(txIdResult);
     } catch (e: any) {
@@ -776,8 +699,12 @@ class BitcoinRoutes {
 
   private async $postTransactionForm(req: Request, res: Response) {
     res.setHeader('content-type', 'text/plain');
+    const matches = /tx=([a-z0-9]+)/.exec(req.body);
+    let txHex = '';
+    if (matches && matches[1]) {
+      txHex = matches[1];
+    }
     try {
-      const txHex = Common.getTransactionFromRequest(req, true);
       const txIdResult = await bitcoinClient.sendRawTransaction(txHex);
       res.send(txIdResult);
     } catch (e: any) {

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

@@ -16,7 +16,7 @@ class BitcoindElectrsApi extends BitcoinApi implements AbstractBitcoinApi {
     super(bitcoinClient);
 
     const electrumConfig = { client: 'mempool-v2', version: '1.4' };
-    const electrumPersistencePolicy = { retryPeriod: 1000, maxRetry: Number.MAX_SAFE_INTEGER, callback: null };
+    const electrumPersistencePolicy = { retryPeriod: 10000, maxRetry: 1000, callback: null };
 
     const electrumCallbacks = {
       onConnect: (client, versionInfo) => { logger.info(`Connected to Electrum Server at ${config.ELECTRUM.HOST}:${config.ELECTRUM.PORT} (${JSON.stringify(versionInfo)})`); },
@@ -126,77 +126,6 @@ class BitcoindElectrsApi extends BitcoinApi implements AbstractBitcoinApi {
     }
   }
 
-  async $getScriptHash(scripthash: string): Promise<IEsploraApi.ScriptHash> {
-    try {
-      const balance = await this.electrumClient.blockchainScripthash_getBalance(scripthash);
-      let history = memoryCache.get<IElectrumApi.ScriptHashHistory[]>('Scripthash_getHistory', scripthash);
-      if (!history) {
-        history = await this.electrumClient.blockchainScripthash_getHistory(scripthash);
-        memoryCache.set('Scripthash_getHistory', scripthash, history, 2);
-      }
-
-      const unconfirmed = history ? history.filter((h) => h.fee).length : 0;
-
-      return {
-        'scripthash': scripthash,
-        'chain_stats': {
-          'funded_txo_count': 0,
-          'funded_txo_sum': balance.confirmed ? balance.confirmed : 0,
-          'spent_txo_count': 0,
-          'spent_txo_sum': balance.confirmed < 0 ? balance.confirmed : 0,
-          'tx_count': (history?.length || 0) - unconfirmed,
-        },
-        'mempool_stats': {
-          'funded_txo_count': 0,
-          'funded_txo_sum': balance.unconfirmed > 0 ? balance.unconfirmed : 0,
-          'spent_txo_count': 0,
-          'spent_txo_sum': balance.unconfirmed < 0 ? -balance.unconfirmed : 0,
-          'tx_count': unconfirmed,
-        },
-        'electrum': true,
-      };
-    } catch (e: any) {
-      throw new Error(typeof e === 'string' ? e : e && e.message || e);
-    }
-  }
-
-  async $getScriptHashTransactions(scripthash: string, lastSeenTxId?: string): Promise<IEsploraApi.Transaction[]> {
-    try {
-      loadingIndicators.setProgress('address-' + scripthash, 0);
-
-      const transactions: IEsploraApi.Transaction[] = [];
-      let history = memoryCache.get<IElectrumApi.ScriptHashHistory[]>('Scripthash_getHistory', scripthash);
-      if (!history) {
-        history = await this.electrumClient.blockchainScripthash_getHistory(scripthash);
-        memoryCache.set('Scripthash_getHistory', scripthash, history, 2);
-      }
-      if (!history) {
-        throw new Error('failed to get scripthash history');
-      }
-      history.sort((a, b) => (b.height || 9999999) - (a.height || 9999999));
-
-      let startingIndex = 0;
-      if (lastSeenTxId) {
-        const pos = history.findIndex((historicalTx) => historicalTx.tx_hash === lastSeenTxId);
-        if (pos) {
-          startingIndex = pos + 1;
-        }
-      }
-      const endIndex = Math.min(startingIndex + 10, history.length);
-
-      for (let i = startingIndex; i < endIndex; i++) {
-        const tx = await this.$getRawTransaction(history[i].tx_hash, false, true);
-        transactions.push(tx);
-        loadingIndicators.setProgress('address-' + scripthash, (i + 1) / endIndex * 100);
-      }
-
-      return transactions;
-    } catch (e: any) {
-      loadingIndicators.setProgress('address-' + scripthash, 100);
-      throw new Error(typeof e === 'string' ? e : e && e.message || e);
-    }
-  }
-
   private $getScriptHashBalance(scriptHash: string): Promise<IElectrumApi.ScriptHashBalance> {
     return this.electrumClient.blockchainScripthash_getBalance(this.encodeScriptHash(scriptHash));
   }

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

@@ -6,7 +6,6 @@ export namespace IEsploraApi {
     size: number;
     weight: number;
     fee: number;
-    sigops?: number;
     vin: Vin[];
     vout: Vout[];
     status: Status;
@@ -90,7 +89,6 @@ export namespace IEsploraApi {
     weight: number;
     previousblockhash: string;
     mediantime: number;
-    stale: boolean;
   }
 
   export interface Address {
@@ -100,13 +98,6 @@ export namespace IEsploraApi {
     electrum?: boolean;
   }
 
-  export interface ScriptHash {
-    scripthash: string;
-    chain_stats: ChainStats;
-    mempool_stats: MempoolStats;
-    electrum?: boolean;
-  }
-
   export interface ChainStats {
     funded_txo_count: number;
     funded_txo_sum: number;

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

@@ -1,276 +1,67 @@
 import config from '../../config';
-import axios, { AxiosResponse } from 'axios';
+import axios, { AxiosRequestConfig } from 'axios';
 import http from 'http';
 import { AbstractBitcoinApi } from './bitcoin-api-abstract-factory';
 import { IEsploraApi } from './esplora-api.interface';
-import logger from '../../logger';
 
-interface FailoverHost {
-  host: string,
-  rtts: number[],
-  rtt: number,
-  failures: number,
-  latestHeight?: number,
-  socket?: boolean,
-  outOfSync?: boolean,
-  unreachable?: boolean,
-  preferred?: boolean,
-}
-
-class FailoverRouter {
-  activeHost: FailoverHost;
-  fallbackHost: FailoverHost;
-  hosts: FailoverHost[];
-  multihost: boolean;
-  pollInterval: number = 60000;
-  pollTimer: NodeJS.Timeout | null = null;
-  pollConnection = axios.create();
-  requestConnection = axios.create({
-    httpAgent: new http.Agent({ keepAlive: true })
-  });
-
-  constructor() {
-    // setup list of hosts
-    this.hosts = (config.ESPLORA.FALLBACK || []).map(domain => {
-      return {
-        host: domain,
-        rtts: [],
-        rtt: Infinity,
-        failures: 0,
-      };
-    });
-    this.activeHost = {
-      host: config.ESPLORA.UNIX_SOCKET_PATH || config.ESPLORA.REST_API_URL,
-      rtts: [],
-      rtt: 0,
-      failures: 0,
-      socket: !!config.ESPLORA.UNIX_SOCKET_PATH,
-      preferred: true,
-    };
-    this.fallbackHost = this.activeHost;
-    this.hosts.unshift(this.activeHost);
-    this.multihost = this.hosts.length > 1;
-  }
-
-  public startHealthChecks(): void {
-    // use axios interceptors to measure request rtt
-    this.pollConnection.interceptors.request.use((config) => {
-      config['meta'] = { startTime: Date.now() };
-      return config;
-    });
-    this.pollConnection.interceptors.response.use((response) => {
-      response.config['meta'].rtt = Date.now() - response.config['meta'].startTime;
-      return response;
-    });
-
-    if (this.multihost) {
-      this.pollHosts();
-    }
-  }
-
-  // start polling hosts to measure availability & rtt
-  private async pollHosts(): Promise<void> {
-    if (this.pollTimer) {
-      clearTimeout(this.pollTimer);
-    }
-
-    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 (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;
-        } else {
-          host.outOfSync = false;
-        }
-        host.unreachable = false;
-      } else {
-        host.outOfSync = true;
-        host.unreachable = true;
-      }
-    }
-
-    this.sortHosts();
-
-    logger.debug(`Tomahawk ranking:\n${this.hosts.map((host, index) => this.formatRanking(index, host, this.activeHost, maxHeight)).join('\n')}`);
-
-    // 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.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
-  private sortHosts(): void {
-    // sort by connection quality
-    this.hosts.sort((a, b) => {
-      if ((a.unreachable || a.outOfSync) === (b.unreachable || b.outOfSync)) {
-        if  (a.preferred === b.preferred) {
-          // lower rtt is best
-          return a.rtt - b.rtt;
-        } else { // unless we have a preferred host
-          return a.preferred ? -1 : 1;
-        }
-      } else { // or the host is out of sync
-        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;
-    this.sortHosts();
-    this.activeHost = this.hosts[0];
-    logger.warn(`Switching esplora host to ${this.activeHost.host}`);
-  }
-
-  private addFailure(host: FailoverHost): FailoverHost {
-    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.electHost();
-      return this.activeHost;
-    } else {
-      return this.fallbackHost;
-    }
-  }
-
-  private async $query<T>(method: 'get'| 'post', path, data: any, responseType = 'json', host = this.activeHost, retry: boolean = true): Promise<T> {
-    let axiosConfig;
-    let url;
-    if (host.socket) {
-      axiosConfig = { socketPath: host.host, timeout: config.ESPLORA.REQUEST_TIMEOUT, responseType };
-      url = path;
-    } else {
-      axiosConfig = { timeout: config.ESPLORA.REQUEST_TIMEOUT, responseType };
-      url = host.host + path;
-    }
-    if (data?.params) {
-      axiosConfig.params = data.params;
-    }
-    return (method === 'post'
-        ? this.requestConnection.post<T>(url, data, axiosConfig)
-        : this.requestConnection.get<T>(url, axiosConfig)
-    ).then((response) => { host.failures = Math.max(0, host.failures - 1); return response.data; })
-      .catch((e) => {
-        let fallbackHost = this.fallbackHost;
-        if (e?.response?.status !== 404) {
-          logger.warn(`esplora request failed ${e?.response?.status} ${host.host}${path}`);
-          logger.warn(e instanceof Error ? e.message : e);
-          fallbackHost = this.addFailure(host);
-        }
-        if (retry && e?.code === 'ECONNREFUSED' && this.multihost) {
-          // Retry immediately
-          return this.$query(method, path, data, responseType, fallbackHost, false);
-        } else {
-          throw e;
-        }
-      });
-  }
-
-  public async $get<T>(path, responseType = 'json', params: any = null): Promise<T> {
-    return this.$query<T>('get', path, params ? { params } : null, responseType);
-  }
-
-  public async $post<T>(path, data: any, responseType = 'json'): Promise<T> {
-    return this.$query<T>('post', path, data, responseType);
-  }
-}
+const axiosConnection = axios.create({
+  httpAgent: new http.Agent({ keepAlive: true })
+});
 
 class ElectrsApi implements AbstractBitcoinApi {
-  private failoverRouter = new FailoverRouter();
+  axiosConfig: AxiosRequestConfig = {
+    timeout: 10000,
+  };
+
+  constructor() { }
 
   $getRawMempool(): Promise<IEsploraApi.Transaction['txid'][]> {
-    return this.failoverRouter.$get<IEsploraApi.Transaction['txid'][]>('/mempool/txids');
+    return axiosConnection.get<IEsploraApi.Transaction['txid'][]>(config.ESPLORA.REST_API_URL + '/mempool/txids', this.axiosConfig)
+      .then((response) => response.data);
   }
 
   $getRawTransaction(txId: string): Promise<IEsploraApi.Transaction> {
-    return this.failoverRouter.$get<IEsploraApi.Transaction>('/tx/' + txId);
-  }
-
-  async $getRawTransactions(txids: string[]): Promise<IEsploraApi.Transaction[]> {
-    return this.failoverRouter.$post<IEsploraApi.Transaction[]>('/internal/txs', txids, 'json');
-  }
-
-  async $getMempoolTransactions(txids: string[]): Promise<IEsploraApi.Transaction[]> {
-    return this.failoverRouter.$post<IEsploraApi.Transaction[]>('/internal/mempool/txs', txids, 'json');
-  }
-
-  async $getAllMempoolTransactions(lastSeenTxid?: string, max_txs?: number): Promise<IEsploraApi.Transaction[]> {
-    return this.failoverRouter.$get<IEsploraApi.Transaction[]>('/internal/mempool/txs' + (lastSeenTxid ? '/' + lastSeenTxid : ''), 'json', max_txs ? { max_txs } : null);
+    return axiosConnection.get<IEsploraApi.Transaction>(config.ESPLORA.REST_API_URL + '/tx/' + txId, this.axiosConfig)
+      .then((response) => response.data);
   }
 
   $getTransactionHex(txId: string): Promise<string> {
-    return this.failoverRouter.$get<string>('/tx/' + txId + '/hex');
+    return axiosConnection.get<string>(config.ESPLORA.REST_API_URL + '/tx/' + txId + '/hex', this.axiosConfig)
+      .then((response) => response.data);
   }
 
   $getBlockHeightTip(): Promise<number> {
-    return this.failoverRouter.$get<number>('/blocks/tip/height');
+    return axiosConnection.get<number>(config.ESPLORA.REST_API_URL + '/blocks/tip/height', this.axiosConfig)
+      .then((response) => response.data);
   }
 
   $getBlockHashTip(): Promise<string> {
-    return this.failoverRouter.$get<string>('/blocks/tip/hash');
+    return axiosConnection.get<string>(config.ESPLORA.REST_API_URL + '/blocks/tip/hash', this.axiosConfig)
+      .then((response) => response.data);
   }
 
   $getTxIdsForBlock(hash: string): Promise<string[]> {
-    return this.failoverRouter.$get<string[]>('/block/' + hash + '/txids');
-  }
-
-  $getTxsForBlock(hash: string): Promise<IEsploraApi.Transaction[]> {
-    return this.failoverRouter.$get<IEsploraApi.Transaction[]>('/internal/block/' + hash + '/txs');
+    return axiosConnection.get<string[]>(config.ESPLORA.REST_API_URL + '/block/' + hash + '/txids', this.axiosConfig)
+      .then((response) => response.data);
   }
 
   $getBlockHash(height: number): Promise<string> {
-    return this.failoverRouter.$get<string>('/block-height/' + height);
+    return axiosConnection.get<string>(config.ESPLORA.REST_API_URL + '/block-height/' + height, this.axiosConfig)
+      .then((response) => response.data);
   }
 
   $getBlockHeader(hash: string): Promise<string> {
-    return this.failoverRouter.$get<string>('/block/' + hash + '/header');
+    return axiosConnection.get<string>(config.ESPLORA.REST_API_URL + '/block/' + hash + '/header', this.axiosConfig)
+      .then((response) => response.data);
   }
 
   $getBlock(hash: string): Promise<IEsploraApi.Block> {
-    return this.failoverRouter.$get<IEsploraApi.Block>('/block/' + hash);
+    return axiosConnection.get<IEsploraApi.Block>(config.ESPLORA.REST_API_URL + '/block/' + hash, this.axiosConfig)
+      .then((response) => response.data);
   }
 
   $getRawBlock(hash: string): Promise<Buffer> {
-    return this.failoverRouter.$get<any>('/block/' + hash + '/raw', 'arraybuffer')
+    return axiosConnection.get<string>(config.ESPLORA.REST_API_URL + '/block/' + hash + "/raw", { ...this.axiosConfig, responseType: 'arraybuffer' })
       .then((response) => { return Buffer.from(response.data); });
   }
 
@@ -282,14 +73,6 @@ class ElectrsApi implements AbstractBitcoinApi {
     throw new Error('Method getAddressTransactions not implemented.');
   }
 
-  $getScriptHash(scripthash: string): Promise<IEsploraApi.ScriptHash> {
-    throw new Error('Method getScriptHash not implemented.');
-  }
-
-  $getScriptHashTransactions(scripthash: string, txId?: string): Promise<IEsploraApi.Transaction[]> {
-    throw new Error('Method getScriptHashTransactions not implemented.');
-  }
-
   $getAddressPrefix(prefix: string): string[] {
     throw new Error('Method not implemented.');
   }
@@ -299,27 +82,22 @@ class ElectrsApi implements AbstractBitcoinApi {
   }
 
   $getOutspend(txId: string, vout: number): Promise<IEsploraApi.Outspend> {
-    return this.failoverRouter.$get<IEsploraApi.Outspend>('/tx/' + txId + '/outspend/' + vout);
+    return axiosConnection.get<IEsploraApi.Outspend>(config.ESPLORA.REST_API_URL + '/tx/' + txId + '/outspend/' + vout, this.axiosConfig)
+      .then((response) => response.data);
   }
 
   $getOutspends(txId: string): Promise<IEsploraApi.Outspend[]> {
-    return this.failoverRouter.$get<IEsploraApi.Outspend[]>('/tx/' + txId + '/outspends');
+    return axiosConnection.get<IEsploraApi.Outspend[]>(config.ESPLORA.REST_API_URL + '/tx/' + txId + '/outspends', this.axiosConfig)
+      .then((response) => response.data);
   }
 
-  async $getBatchedOutspends(txids: string[]): Promise<IEsploraApi.Outspend[][]> {
-    throw new Error('Method not implemented.');
-  }
-
-  async $getBatchedOutspendsInternal(txids: string[]): Promise<IEsploraApi.Outspend[][]> {
-    return this.failoverRouter.$post<IEsploraApi.Outspend[][]>('/internal/txs/outspends/by-txid', txids, 'json');
-  }
-
-  async $getOutSpendsByOutpoint(outpoints: { txid: string, vout: number }[]): Promise<IEsploraApi.Outspend[]> {
-    return this.failoverRouter.$post<IEsploraApi.Outspend[]>('/internal/txs/outspends/by-outpoint', outpoints.map(out => `${out.txid}:${out.vout}`), 'json');
-  }
-
-  public startHealthChecks(): void {
-    this.failoverRouter.startHealthChecks();
+  async $getBatchedOutspends(txId: string[]): Promise<IEsploraApi.Outspend[][]> {
+    const outspends: IEsploraApi.Outspend[][] = [];
+    for (const tx of txId) {
+      const outspend = await this.$getOutspends(tx);
+      outspends.push(outspend);
+    }
+    return outspends;
   }
 }
 

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, TransactionStripped, TransactionMinerInfo, CpfpSummary, MempoolTransactionExtended } from '../mempool.interfaces';
+import { BlockExtended, BlockExtension, BlockSummary, PoolTag, TransactionExtended, TransactionStripped, TransactionMinerInfo } from '../mempool.interfaces';
 import { Common } from './common';
 import diskCache from './disk-cache';
 import transactionUtils from './transaction-utils';
@@ -25,22 +25,16 @@ import DifficultyAdjustmentsRepository from '../repositories/DifficultyAdjustmen
 import PricesRepository from '../repositories/PricesRepository';
 import priceUpdater from '../tasks/price-updater';
 import chainTips from './chain-tips';
-import websocketHandler from './websocket-handler';
-import redisCache from './redis-cache';
-import rbfCache from './rbf-cache';
-import { calcBitsDifference } from './difficulty-adjustment';
 
 class Blocks {
   private blocks: BlockExtended[] = [];
   private blockSummaries: BlockSummary[] = [];
   private currentBlockHeight = 0;
-  private currentBits = 0;
+  private currentDifficulty = 0;
   private lastDifficultyAdjustmentTime = 0;
   private previousDifficultyRetarget = 0;
   private newBlockCallbacks: ((block: BlockExtended, txIds: string[], transactions: TransactionExtended[]) => void)[] = [];
-  private newAsyncBlockCallbacks: ((block: BlockExtended, txIds: string[], transactions: MempoolTransactionExtended[]) => Promise<void>)[] = [];
-
-  private mainLoopTimeout: number = 120000;
+  private newAsyncBlockCallbacks: ((block: BlockExtended, txIds: string[], transactions: TransactionExtended[]) => Promise<void>)[] = [];
 
   constructor() { }
 
@@ -64,7 +58,7 @@ class Blocks {
     this.newBlockCallbacks.push(fn);
   }
 
-  public setNewAsyncBlockCallback(fn: (block: BlockExtended, txIds: string[], transactions: MempoolTransactionExtended[]) => Promise<void>) {
+  public setNewAsyncBlockCallback(fn: (block: BlockExtended, txIds: string[], transactions: TransactionExtended[]) => Promise<void>) {
     this.newAsyncBlockCallbacks.push(fn);
   }
 
@@ -73,118 +67,74 @@ class Blocks {
    * @param blockHash
    * @param blockHeight
    * @param onlyCoinbase - Set to true if you only need the coinbase transaction
-   * @param txIds - optional ordered list of transaction ids if already known
-   * @param quiet - don't print non-essential logs
-   * @param addMempoolData - calculate sigops etc
    * @returns Promise<TransactionExtended[]>
    */
   private async $getTransactionsExtended(
     blockHash: string,
     blockHeight: number,
-    blockTime: number,
     onlyCoinbase: boolean,
-    txIds: string[] | null = null,
     quiet: boolean = false,
-    addMempoolData: boolean = false,
   ): Promise<TransactionExtended[]> {
-    const isEsplora = config.MEMPOOL.BACKEND === 'esplora';
-    const transactionMap: { [txid: string]: TransactionExtended } = {};
-
-    if (!txIds) {
-      txIds = await bitcoinApi.$getTxIdsForBlock(blockHash);
-    }
+    const transactions: TransactionExtended[] = [];
+    const txIds: string[] = await bitcoinApi.$getTxIdsForBlock(blockHash);
 
     const mempool = memPool.getMempool();
-    let foundInMempool = 0;
-    let totalFound = 0;
+    let transactionsFound = 0;
+    let transactionsFetched = 0;
 
-    // Copy existing transactions from the mempool
-    if (!onlyCoinbase) {
-      for (const txid of txIds) {
-        if (mempool[txid]) {
-          mempool[txid].status = {
-            confirmed: true,
-            block_height: blockHeight,
-            block_hash: blockHash,
-            block_time: blockTime,
-          };
-          transactionMap[txid] = mempool[txid];
-          foundInMempool++;
-          totalFound++;
+    for (let i = 0; i < txIds.length; i++) {
+      if (mempool[txIds[i]]) {
+        // We update blocks before the mempool (index.ts), therefore we can
+        // optimize here by directly fetching txs in the "outdated" mempool
+        transactions.push(mempool[txIds[i]]);
+        transactionsFound++;
+      } else if (config.MEMPOOL.BACKEND === 'esplora' || !memPool.hasPriority() || i === 0) {
+        // Otherwise we fetch the tx data through backend services (esplora, electrum, core rpc...)
+        if (!quiet && (i % (Math.round((txIds.length) / 10)) === 0 || i + 1 === txIds.length)) { // Avoid log spam
+          logger.debug(`Indexing tx ${i + 1} of ${txIds.length} in block #${blockHeight}`);
         }
-      }
-    }
-
-    if (onlyCoinbase) {
-      try {
-        const coinbase = await transactionUtils.$getTransactionExtendedRetry(txIds[0], false, false, false, addMempoolData);
-        if (coinbase && coinbase.vin[0].is_coinbase) {
-          return [coinbase];
-        } else {
-          const msg = `Expected a coinbase tx, but the backend API returned something else`;
-          logger.err(msg);
-          throw new Error(msg);
-        }
-      } catch (e) {
-        const msg = `Cannot fetch coinbase tx ${txIds[0]}. Reason: ` + (e instanceof Error ? e.message : e);
-        logger.err(msg);
-        throw new Error(msg);
-      }
-    }
-
-    // Fetch remaining txs in bulk
-    if (isEsplora && (txIds.length - totalFound > 500)) {
-      try {
-        const rawTransactions = await bitcoinApi.$getTxsForBlock(blockHash);
-        for (const tx of rawTransactions) {
-          if (!transactionMap[tx.txid]) {
-            transactionMap[tx.txid] = addMempoolData ? transactionUtils.extendMempoolTransaction(tx) : transactionUtils.extendTransaction(tx);
-            totalFound++;
+        try {
+          const tx = await transactionUtils.$getTransactionExtended(txIds[i]);
+          transactions.push(tx);
+          transactionsFetched++;
+        } catch (e) {
+          try {
+            if (config.MEMPOOL.BACKEND === 'esplora') {
+              // Try again with core
+              const tx = await transactionUtils.$getTransactionExtended(txIds[i], false, false, true);
+              transactions.push(tx);
+              transactionsFetched++;
+            } else {
+              throw e;
+            }
+          } catch (e) {
+            if (i === 0) {
+              const msg = `Cannot fetch coinbase tx ${txIds[i]}. Reason: ` + (e instanceof Error ? e.message : e); 
+              logger.err(msg);
+              throw new Error(msg);
+            } else {
+              logger.err(`Cannot fetch tx ${txIds[i]}. Reason: ` + (e instanceof Error ? e.message : e));
+            }
           }
         }
-      } catch (e) {
-        logger.err(`Cannot fetch bulk txs for block ${blockHash}. Reason: ` + (e instanceof Error ? e.message : e));
+      }
+
+      if (onlyCoinbase === true) {
+        break; // Fetch the first transaction and exit
       }
     }
 
-    // Fetch remaining txs individually
-    for (const txid of txIds.filter(txid => !transactionMap[txid])) {
-      if (!quiet && (totalFound % (Math.round((txIds.length) / 10)) === 0 || totalFound + 1 === txIds.length)) { // Avoid log spam
-        logger.debug(`Indexing tx ${totalFound + 1} of ${txIds.length} in block #${blockHeight}`);
+    transactions.forEach((tx) => {
+      if (!tx.cpfpChecked) {
+        Common.setRelativesAndGetCpfpInfo(tx, mempool); // Child Pay For Parent
       }
-      try {
-        const tx = await transactionUtils.$getTransactionExtendedRetry(txid, false, false, false, addMempoolData);
-        transactionMap[txid] = tx;
-        totalFound++;
-      } catch (e) {
-        const msg = `Cannot fetch tx ${txid}. Reason: ` + (e instanceof Error ? e.message : e);
-        logger.err(msg);
-        throw new Error(msg);
-      }
-    }
+    });
 
     if (!quiet) {
-      logger.debug(`${foundInMempool} of ${txIds.length} found in mempool. ${totalFound - foundInMempool} fetched through backend service.`);
+      logger.debug(`${transactionsFound} of ${txIds.length} found in mempool. ${transactionsFetched} fetched through backend service.`);
     }
 
-    // Require the first transaction to be a coinbase
-    const coinbase = transactionMap[txIds[0]];
-    if (!coinbase || !coinbase.vin[0].is_coinbase) {
-      const msg = `Expected first tx in a block to be a coinbase, but found something else`;
-      logger.err(msg);
-      throw new Error(msg);
-    }
-
-    // Require all transactions to be present
-    // (we should have thrown an error already if a tx request failed)
-    if (txIds.some(txid => !transactionMap[txid])) {
-      const msg = `Failed to fetch ${txIds.length - totalFound} transactions from block`;
-      logger.err(msg);
-      throw new Error(msg);
-    }
-
-    // Return list of transactions, preserving block order
-    return txIds.map(txid => transactionMap[txid]);
+    return transactions;
   }
 
   /**
@@ -211,18 +161,9 @@ class Blocks {
     };
   }
 
-  public summarizeBlockTransactions(hash: string, transactions: TransactionExtended[]): BlockSummary {
-    return {
-      id: hash,
-      transactions: Common.stripTransactions(transactions),
-    };
-  }
-
   private convertLiquidFees(block: IBitcoinApi.VerboseBlock): IBitcoinApi.VerboseBlock {
     block.tx.forEach(tx => {
-      if (!isFinite(Number(tx.fee))) {
-        tx.fee = Object.values(tx.fee || {}).reduce((total, output) => total + output, 0);
-      }
+      tx.fee = Object.values(tx.fee || {}).reduce((total, output) => total + output, 0);
     });
     return block;
   }
@@ -259,15 +200,8 @@ class Blocks {
       extras.segwitTotalWeight = 0;
     } else {
       const stats: IBitcoinApi.BlockStats = await bitcoinClient.getBlockStats(block.id);
-      let feeStats = {
-        medianFee: stats.feerate_percentiles[2], // 50th percentiles
-        feeRange: [stats.minfeerate, stats.feerate_percentiles, stats.maxfeerate].flat(),
-      };
-      if (transactions?.length > 1) {
-        feeStats = Common.calcEffectiveFeeStatistics(transactions);
-      }
-      extras.medianFee = feeStats.medianFee;
-      extras.feeRange = feeStats.feeRange;
+      extras.medianFee = stats.feerate_percentiles[2]; // 50th percentiles
+      extras.feeRange = [stats.minfeerate, stats.feerate_percentiles, stats.maxfeerate].flat();
       extras.totalFees = stats.totalfee;
       extras.avgFee = stats.avgfee;
       extras.avgFeeRate = stats.avgfeerate;
@@ -336,14 +270,10 @@ class Blocks {
       }
 
       extras.matchRate = null;
-      extras.expectedFees = null;
-      extras.expectedWeight = null;
       if (config.MEMPOOL.AUDIT) {
         const auditScore = await BlocksAuditsRepository.$getBlockAuditScore(block.id);
         if (auditScore != null) {
           extras.matchRate = auditScore.matchRate;
-          extras.expectedFees = auditScore.expectedFees;
-          extras.expectedWeight = auditScore.expectedWeight;
         }
       }
     }
@@ -367,7 +297,7 @@ class Blocks {
     }
 
     const asciiScriptSig = transactionUtils.hex2ascii(txMinerInfo.vin[0].scriptsig);
-    const addresses = txMinerInfo.vout.map((vout) => vout.scriptpubkey_address).filter((address) => address);
+    const address = txMinerInfo.vout[0].scriptpubkey_address;
 
     let pools: PoolTag[] = [];
     if (config.DATABASE.ENABLED === true) {
@@ -377,13 +307,11 @@ class Blocks {
     }
 
     for (let i = 0; i < pools.length; ++i) {
-      if (addresses.length) {
-        const poolAddresses: string[] = typeof pools[i].addresses === 'string' ?
+      if (address !== undefined) {
+        const addresses: 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];
-          }
+        if (addresses.indexOf(address) !== -1) {
+          return pools[i];
         }
       }
 
@@ -427,8 +355,8 @@ class Blocks {
       let newlyIndexed = 0;
       let totalIndexed = indexedBlockSummariesHashesArray.length;
       let indexedThisRun = 0;
-      let timer = Date.now() / 1000;
-      const startedAt = Date.now() / 1000;
+      let timer = new Date().getTime() / 1000;
+      const startedAt = new Date().getTime() / 1000;
 
       for (const block of indexedBlocks) {
         if (indexedBlockSummariesHashes[block.hash] === true) {
@@ -436,24 +364,17 @@ class Blocks {
         }
 
         // Logging
-        const elapsedSeconds = (Date.now() / 1000) - timer;
+        const elapsedSeconds = Math.max(1, Math.round((new Date().getTime() / 1000) - timer));
         if (elapsedSeconds > 5) {
-          const runningFor = (Date.now() / 1000) - startedAt;
-          const blockPerSeconds = indexedThisRun / elapsedSeconds;
+          const runningFor = Math.max(1, Math.round((new Date().getTime() / 1000) - startedAt));
+          const blockPerSeconds = Math.max(1, indexedThisRun / elapsedSeconds);
           const progress = Math.round(totalIndexed / indexedBlocks.length * 10000) / 100;
-          logger.debug(`Indexing block summary for #${block.height} | ~${blockPerSeconds.toFixed(2)} blocks/sec | total: ${totalIndexed}/${indexedBlocks.length} (${progress}%) | elapsed: ${runningFor.toFixed(2)} seconds`, logger.tags.mining);
-          timer = Date.now() / 1000;
+          logger.debug(`Indexing block summary for #${block.height} | ~${blockPerSeconds.toFixed(2)} blocks/sec | total: ${totalIndexed}/${indexedBlocks.length} (${progress}%) | elapsed: ${runningFor} seconds`, logger.tags.mining);
+          timer = new Date().getTime() / 1000;
           indexedThisRun = 0;
         }
 
-
-        if (config.MEMPOOL.BACKEND === 'esplora') {
-          const txs = (await bitcoinApi.$getTxsForBlock(block.hash)).map(tx => transactionUtils.extendTransaction(tx));
-          const cpfpSummary = await this.$indexCPFP(block.hash, block.height, txs);
-          await this.$getStrippedBlockTransactions(block.hash, true, true, cpfpSummary, block.height); // This will index the block summary
-        } else {
-          await this.$getStrippedBlockTransactions(block.hash, true, true); // This will index the block summary
-        }
+        await this.$getStrippedBlockTransactions(block.hash, true, true); // This will index the block summary
 
         // Logging
         indexedThisRun++;
@@ -482,28 +403,27 @@ class Blocks {
     try {
       // Get all indexed block hash
       const unindexedBlockHeights = await blocksRepository.$getCPFPUnindexedBlocks();
+      logger.info(`Indexing cpfp data for ${unindexedBlockHeights.length} blocks`);
 
       if (!unindexedBlockHeights?.length) {
         return;
       }
 
-      logger.info(`Indexing cpfp data for ${unindexedBlockHeights.length} blocks`);
-
       // Logging
       let count = 0;
       let countThisRun = 0;
-      let timer = Date.now() / 1000;
-      const startedAt = Date.now() / 1000;
+      let timer = new Date().getTime() / 1000;
+      const startedAt = new Date().getTime() / 1000;
       for (const height of unindexedBlockHeights) {
         // Logging
         const hash = await bitcoinApi.$getBlockHash(height);
-        const elapsedSeconds = (Date.now() / 1000) - timer;
+        const elapsedSeconds = Math.max(1, new Date().getTime() / 1000 - timer);
         if (elapsedSeconds > 5) {
-          const runningFor = (Date.now() / 1000) - startedAt;
-          const blockPerSeconds = countThisRun / elapsedSeconds;
+          const runningFor = Math.max(1, Math.round((new Date().getTime() / 1000) - startedAt));
+          const blockPerSeconds = (countThisRun / elapsedSeconds);
           const progress = Math.round(count / unindexedBlockHeights.length * 10000) / 100;
-          logger.debug(`Indexing cpfp clusters for #${height} | ~${blockPerSeconds.toFixed(2)} blocks/sec | total: ${count}/${unindexedBlockHeights.length} (${progress}%) | elapsed: ${runningFor.toFixed(2)} seconds`);
-          timer = Date.now() / 1000;
+          logger.debug(`Indexing cpfp clusters for #${height} | ~${blockPerSeconds.toFixed(2)} blocks/sec | total: ${count}/${unindexedBlockHeights.length} (${progress}%) | elapsed: ${runningFor} seconds`);
+          timer = new Date().getTime() / 1000;
           countThisRun = 0;
         }
 
@@ -520,46 +440,6 @@ class Blocks {
     }
   }
 
-  /**
-   * [INDEXING] Index expected fees & weight for all audited blocks
-   */
-  public async $generateAuditStats(): Promise<void> {
-    const blockIds = await BlocksAuditsRepository.$getBlocksWithoutSummaries();
-    if (!blockIds?.length) {
-      return;
-    }
-    let timer = Date.now();
-    let indexedThisRun = 0;
-    let indexedTotal = 0;
-    logger.debug(`Indexing ${blockIds.length} block audit details`);
-    for (const hash of blockIds) {
-      const summary = await BlocksSummariesRepository.$getTemplate(hash);
-      let totalFees = 0;
-      let totalWeight = 0;
-      for (const tx of summary?.transactions || []) {
-        totalFees += tx.fee;
-        totalWeight += (tx.vsize * 4);
-      }
-      await BlocksAuditsRepository.$setSummary(hash, totalFees, totalWeight);
-      const cachedBlock = this.blocks.find(block => block.id === hash);
-      if (cachedBlock) {
-        cachedBlock.extras.expectedFees = totalFees;
-        cachedBlock.extras.expectedWeight = totalWeight;
-      }
-
-      indexedThisRun++;
-      indexedTotal++;
-      const elapsedSeconds = (Date.now() - timer) / 1000;
-      if (elapsedSeconds > 5) {
-        const blockPerSeconds = indexedThisRun / elapsedSeconds;
-        logger.debug(`Indexed ${indexedTotal} / ${blockIds.length} block audit details (${blockPerSeconds.toFixed(1)}/s)`);
-        timer = Date.now();
-        indexedThisRun = 0;
-      }
-    }
-    logger.debug(`Indexing block audit details completed`);
-  }
-
   /**
    * [INDEXING] Index all blocks metadata for the mining dashboard
    */
@@ -582,8 +462,8 @@ class Blocks {
       let totalIndexed = await blocksRepository.$blockCountBetweenHeight(currentBlockHeight, lastBlockToIndex);
       let indexedThisRun = 0;
       let newlyIndexed = 0;
-      const startedAt = Date.now() / 1000;
-      let timer = Date.now() / 1000;
+      const startedAt = new Date().getTime() / 1000;
+      let timer = new Date().getTime() / 1000;
 
       while (currentBlockHeight >= lastBlockToIndex) {
         const endBlock = Math.max(0, lastBlockToIndex, currentBlockHeight - chunkSize + 1);
@@ -603,19 +483,19 @@ class Blocks {
           }
           ++indexedThisRun;
           ++totalIndexed;
-          const elapsedSeconds = (Date.now() / 1000) - timer;
+          const elapsedSeconds = Math.max(1, new Date().getTime() / 1000 - timer);
           if (elapsedSeconds > 5 || blockHeight === lastBlockToIndex) {
-            const runningFor = (Date.now() / 1000) - startedAt;
-            const blockPerSeconds = indexedThisRun / elapsedSeconds;
+            const runningFor = Math.max(1, Math.round((new Date().getTime() / 1000) - startedAt));
+            const blockPerSeconds = Math.max(1, indexedThisRun / elapsedSeconds);
             const progress = Math.round(totalIndexed / indexingBlockAmount * 10000) / 100;
-            logger.debug(`Indexing block #${blockHeight} | ~${blockPerSeconds.toFixed(2)} blocks/sec | total: ${totalIndexed}/${indexingBlockAmount} (${progress.toFixed(2)}%) | elapsed: ${runningFor.toFixed(2)} seconds`, logger.tags.mining);
-            timer = Date.now() / 1000;
+            logger.debug(`Indexing block #${blockHeight} | ~${blockPerSeconds.toFixed(2)} blocks/sec | total: ${totalIndexed}/${indexingBlockAmount} (${progress}%) | elapsed: ${runningFor} seconds`, logger.tags.mining);
+            timer = new Date().getTime() / 1000;
             indexedThisRun = 0;
             loadingIndicators.setProgress('block-indexing', progress, false);
           }
           const blockHash = await bitcoinApi.$getBlockHash(blockHeight);
-          const block: IEsploraApi.Block = await bitcoinApi.$getBlock(blockHash);
-          const transactions = await this.$getTransactionsExtended(blockHash, block.height, block.timestamp, true, null, true);
+          const block: IEsploraApi.Block = await bitcoinCoreApi.$getBlock(blockHash);
+          const transactions = await this.$getTransactionsExtended(blockHash, block.height, true, true);
           const blockExtended = await this.$getBlockExtended(block, transactions);
 
           newlyIndexed++;
@@ -639,16 +519,9 @@ class Blocks {
     return await BlocksRepository.$validateChain();
   }
 
-  public async $updateBlocks(): Promise<number> {
-    // warn if this run stalls the main loop for more than 2 minutes
-    const timer = this.startTimer();
-
-    diskCache.lock();
-
+  public async $updateBlocks() {
     let fastForwarded = false;
-    let handledBlocks = 0;
-    const blockHeightTip = await bitcoinCoreApi.$getBlockHeightTip();
-    this.updateTimerProgress(timer, 'got block height tip');
+    const blockHeightTip = await bitcoinApi.$getBlockHeightTip();
 
     if (this.blocks.length === 0) {
       this.currentBlockHeight = Math.max(blockHeightTip - config.MEMPOOL.INITIAL_BLOCKS_AMOUNT, -1);
@@ -666,26 +539,17 @@ class Blocks {
 
     if (!this.lastDifficultyAdjustmentTime) {
       const blockchainInfo = await bitcoinClient.getBlockchainInfo();
-      this.updateTimerProgress(timer, 'got blockchain info for initial difficulty adjustment');
       if (blockchainInfo.blocks === blockchainInfo.headers) {
         const heightDiff = blockHeightTip % 2016;
         const blockHash = await bitcoinApi.$getBlockHash(blockHeightTip - heightDiff);
-        this.updateTimerProgress(timer, 'got block hash for initial difficulty adjustment');
-        const block: IEsploraApi.Block = await bitcoinApi.$getBlock(blockHash);
-        this.updateTimerProgress(timer, 'got block for initial difficulty adjustment');
+        const block: IEsploraApi.Block = await bitcoinCoreApi.$getBlock(blockHash);
         this.lastDifficultyAdjustmentTime = block.timestamp;
-        this.currentBits = block.bits;
+        this.currentDifficulty = block.difficulty;
 
         if (blockHeightTip >= 2016) {
           const previousPeriodBlockHash = await bitcoinApi.$getBlockHash(blockHeightTip - heightDiff - 2016);
-          this.updateTimerProgress(timer, 'got previous block hash for initial difficulty adjustment');
-          const previousPeriodBlock: IEsploraApi.Block = await bitcoinApi.$getBlock(previousPeriodBlockHash);
-          this.updateTimerProgress(timer, 'got previous block for initial difficulty adjustment');
-          if (['liquid', 'liquidtestnet'].includes(config.MEMPOOL.NETWORK)) {
-            this.previousDifficultyRetarget = NaN;
-          } else {
-            this.previousDifficultyRetarget = calcBitsDifference(previousPeriodBlock.bits, block.bits);
-          }
+          const previousPeriodBlock: IEsploraApi.Block = await bitcoinCoreApi.$getBlock(previousPeriodBlockHash);
+          this.previousDifficultyRetarget = (block.difficulty - previousPeriodBlock.difficulty) / previousPeriodBlock.difficulty * 100;
           logger.debug(`Initial difficulty adjustment data set.`);
         }
       } else {
@@ -694,143 +558,87 @@ class Blocks {
     }
 
     while (this.currentBlockHeight < blockHeightTip) {
-      if (this.currentBlockHeight === 0) {
+      if (this.currentBlockHeight < blockHeightTip - config.MEMPOOL.INITIAL_BLOCKS_AMOUNT) {
         this.currentBlockHeight = blockHeightTip;
       } else {
         this.currentBlockHeight++;
         logger.debug(`New block found (#${this.currentBlockHeight})!`);
-        this.updateTimerProgress(timer, `getting orphaned blocks for ${this.currentBlockHeight}`);
         await chainTips.updateOrphanedBlocks();
       }
 
-      this.updateTimerProgress(timer, `getting block data for ${this.currentBlockHeight}`);
-      const blockHash = await bitcoinCoreApi.$getBlockHash(this.currentBlockHeight);
+      const blockHash = await bitcoinApi.$getBlockHash(this.currentBlockHeight);
       const verboseBlock = await bitcoinClient.getBlock(blockHash, 2);
       const block = BitcoinApi.convertBlock(verboseBlock);
-      const txIds: string[] = verboseBlock.tx.map(tx => tx.txid);
-      const transactions = await this.$getTransactionsExtended(blockHash, block.height, block.timestamp, false, txIds, false, true) as MempoolTransactionExtended[];
+      const txIds: string[] = await bitcoinApi.$getTxIdsForBlock(blockHash);
+      const transactions = await this.$getTransactionsExtended(blockHash, block.height, false);
+      const blockExtended: BlockExtended = await this.$getBlockExtended(block, transactions);
+      const blockSummary: BlockSummary = this.summarizeBlock(verboseBlock);
 
-      // fill in missing transaction fee data from verboseBlock
-      for (let i = 0; i < transactions.length; i++) {
-        if (!transactions[i].fee && transactions[i].txid === verboseBlock.tx[i].txid) {
-          transactions[i].fee = (verboseBlock.tx[i].fee * 100_000_000) || 0;
-        }
-      }
-
-      const cpfpSummary: CpfpSummary = Common.calculateCpfp(block.height, transactions);
-      const blockExtended: BlockExtended = await this.$getBlockExtended(block, cpfpSummary.transactions);
-      const blockSummary: BlockSummary = this.summarizeBlockTransactions(block.id, cpfpSummary.transactions);
-      this.updateTimerProgress(timer, `got block data for ${this.currentBlockHeight}`);
+      // start async callbacks
+      const callbackPromises = this.newAsyncBlockCallbacks.map((cb) => cb(blockExtended, txIds, transactions));
 
       if (Common.indexingEnabled()) {
         if (!fastForwarded) {
           const lastBlock = await blocksRepository.$getBlockByHeight(blockExtended.height - 1);
-          this.updateTimerProgress(timer, `got block by height for ${this.currentBlockHeight}`);
           if (lastBlock !== null && blockExtended.previousblockhash !== lastBlock.id) {
-            logger.warn(`Chain divergence detected at block ${lastBlock.height}, re-indexing most recent data`, logger.tags.mining);
+            logger.warn(`Chain divergence detected at block ${lastBlock.height}, re-indexing most recent data`);
             // We assume there won't be a reorg with more than 10 block depth
-            this.updateTimerProgress(timer, `rolling back diverged chain from ${this.currentBlockHeight}`);
             await BlocksRepository.$deleteBlocksFrom(lastBlock.height - 10);
             await HashratesRepository.$deleteLastEntries();
+            await BlocksSummariesRepository.$deleteBlocksFrom(lastBlock.height - 10);
             await cpfpRepository.$deleteClustersFrom(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 cpfpSummary;
+              await this.$getStrippedBlockTransactions(newBlock.id, true, true);
               if (config.MEMPOOL.CPFP_INDEXING) {
-                cpfpSummary = await this.$indexCPFP(newBlock.id, lastBlock.height - i);
-                this.updateTimerProgress(timer, `reindexed block cpfp`);
+                await this.$indexCPFP(newBlock.id, lastBlock.height - i);
               }
-              await this.$getStrippedBlockTransactions(newBlock.id, true, true, cpfpSummary, newBlock.height);
-              this.updateTimerProgress(timer, `reindexed block summary`);
             }
             await mining.$indexDifficultyAdjustments();
             await DifficultyAdjustmentsRepository.$deleteLastAdjustment();
-            this.updateTimerProgress(timer, `reindexed difficulty adjustments`);
-            logger.info(`Re-indexed 10 blocks and summaries. Also re-indexed the last difficulty adjustments. Will re-index latest hashrates in a few seconds.`, logger.tags.mining);
+            logger.info(`Re-indexed 10 blocks and summaries. Also re-indexed the last difficulty adjustments. Will re-index latest hashrates in a few seconds.`);
             indexer.reindex();
-
-            websocketHandler.handleReorg();
           }
-        }
+          await blocksRepository.$saveBlockInDatabase(blockExtended);
 
-        await blocksRepository.$saveBlockInDatabase(blockExtended);
-        this.updateTimerProgress(timer, `saved ${this.currentBlockHeight} to database`);
-
-        if (!fastForwarded) {
-          let lastestPriceId;
-          try {
-            lastestPriceId = await PricesRepository.$getLatestPriceId();
-            this.updateTimerProgress(timer, `got latest price id ${this.currentBlockHeight}`);
-          } catch (e) {
-            logger.debug('failed to fetch latest price id from db: ' + (e instanceof Error ? e.message : e));
-          }
+          const lastestPriceId = await PricesRepository.$getLatestPriceId();
           if (priceUpdater.historyInserted === true && lastestPriceId !== null) {
             await blocksRepository.$saveBlockPrices([{
               height: blockExtended.height,
               priceId: lastestPriceId,
             }]);
-            this.updateTimerProgress(timer, `saved prices for ${this.currentBlockHeight}`);
           } else {
-            logger.debug(`Cannot save block price for ${blockExtended.height} because the price updater hasnt completed yet. Trying again in 10 seconds.`, logger.tags.mining);
-            indexer.scheduleSingleTask('blocksPrices', 10000);
+            logger.info(`Cannot save block price for ${blockExtended.height} because the price updater hasnt completed yet. Trying again in 10 seconds.`, logger.tags.mining);
+            setTimeout(() => {
+              indexer.runSingleTask('blocksPrices');
+            }, 10000);
           }
 
           // Save blocks summary for visualization if it's enabled
           if (Common.blocksSummariesIndexingEnabled() === true) {
-            await this.$getStrippedBlockTransactions(blockExtended.id, true, false, cpfpSummary, blockExtended.height);
-            this.updateTimerProgress(timer, `saved block summary for ${this.currentBlockHeight}`);
+            await this.$getStrippedBlockTransactions(blockExtended.id, true);
           }
           if (config.MEMPOOL.CPFP_INDEXING) {
-            this.$saveCpfp(blockExtended.id, this.currentBlockHeight, cpfpSummary);
-            this.updateTimerProgress(timer, `saved cpfp for ${this.currentBlockHeight}`);
+            this.$indexCPFP(blockExtended.id, this.currentBlockHeight);
           }
         }
       }
 
-      // start async callbacks
-      this.updateTimerProgress(timer, `starting async callbacks for ${this.currentBlockHeight}`);
-      const callbackPromises = this.newAsyncBlockCallbacks.map((cb) => cb(blockExtended, txIds, transactions));
-
       if (block.height % 2016 === 0) {
         if (Common.indexingEnabled()) {
-          let adjustment;
-          if (['liquid', 'liquidtestnet'].includes(config.MEMPOOL.NETWORK)) {
-            adjustment = NaN;
-          } else {
-            adjustment = Math.round(
-              // calcBitsDifference returns +- percentage, +100 returns to positive, /100 returns to ratio.
-              // Instead of actually doing /100, just reduce the multiplier.
-              (calcBitsDifference(this.currentBits, block.bits) + 100) * 10000
-            ) / 1000000; // Remove float point noise
-          }
-
           await DifficultyAdjustmentsRepository.$saveAdjustments({
             time: block.timestamp,
             height: block.height,
             difficulty: block.difficulty,
-            adjustment,
+            adjustment: Math.round((block.difficulty / this.currentDifficulty) * 1000000) / 1000000, // Remove float point noise
           });
-          this.updateTimerProgress(timer, `saved difficulty adjustment for ${this.currentBlockHeight}`);
         }
 
-        if (['liquid', 'liquidtestnet'].includes(config.MEMPOOL.NETWORK)) {
-          this.previousDifficultyRetarget = NaN;
-        } else {
-          this.previousDifficultyRetarget = calcBitsDifference(this.currentBits, block.bits);
-        }
+        this.previousDifficultyRetarget = (block.difficulty - this.currentDifficulty) / this.currentDifficulty * 100;
         this.lastDifficultyAdjustmentTime = block.timestamp;
-        this.currentBits = block.bits;
+        this.currentDifficulty = block.difficulty;
       }
 
-      // wait for pending async callbacks to finish
-      this.updateTimerProgress(timer, `waiting for async callbacks to complete for ${this.currentBlockHeight}`);
-      await Promise.all(callbackPromises);
-      this.updateTimerProgress(timer, `async callbacks completed for ${this.currentBlockHeight}`);
-
       this.blocks.push(blockExtended);
       if (this.blocks.length > config.MEMPOOL.INITIAL_BLOCKS_AMOUNT * 4) {
         this.blocks = this.blocks.slice(-config.MEMPOOL.INITIAL_BLOCKS_AMOUNT * 4);
@@ -843,47 +651,12 @@ class Blocks {
       if (this.newBlockCallbacks.length) {
         this.newBlockCallbacks.forEach((cb) => cb(blockExtended, txIds, transactions));
       }
-      if (config.MEMPOOL.CACHE_ENABLED && !memPool.hasPriority() && (block.height % config.MEMPOOL.DISK_CACHE_BLOCK_INTERVAL === 0)) {
+      if (!memPool.hasPriority() && (block.height % 6 === 0)) {
         diskCache.$saveCacheToDisk();
       }
 
-      // Update Redis cache
-      if (config.REDIS.ENABLED) {
-        await redisCache.$updateBlocks(this.blocks);
-        await redisCache.$updateBlockSummaries(this.blockSummaries);
-        await redisCache.$removeTransactions(txIds);
-        await rbfCache.updateCache();
-      }
-
-      handledBlocks++;
-    }
-
-    diskCache.unlock();
-
-    this.clearTimer(timer);
-
-    return handledBlocks;
-  }
-
-  private startTimer() {
-    const state: any = {
-      start: Date.now(),
-      progress: 'begin $updateBlocks',
-      timer: null,
-    };
-    state.timer = setTimeout(() => {
-      logger.err(`$updateBlocks stalled at "${state.progress}"`);
-    }, this.mainLoopTimeout);
-    return state;
-  }
-
-  private updateTimerProgress(state, msg) {
-    state.progress = msg;
-  }
-
-  private clearTimer(state) {
-    if (state.timer) {
-      clearTimeout(state.timer);
+      // wait for pending async callbacks to finish
+      await Promise.all(callbackPromises);
     }
   }
 
@@ -899,8 +672,8 @@ class Blocks {
     }
 
     const blockHash = await bitcoinApi.$getBlockHash(height);
-    const block: IEsploraApi.Block = await bitcoinApi.$getBlock(blockHash);
-    const transactions = await this.$getTransactionsExtended(blockHash, block.height, block.timestamp, true);
+    const block: IEsploraApi.Block = await bitcoinCoreApi.$getBlock(blockHash);
+    const transactions = await this.$getTransactionsExtended(blockHash, block.height, true);
     const blockExtended = await this.$getBlockExtended(block, transactions);
 
     if (Common.indexingEnabled()) {
@@ -910,16 +683,6 @@ class Blocks {
     return blockExtended;
   }
 
-  public async $indexStaleBlock(hash: string): Promise<BlockExtended> {
-    const block: IEsploraApi.Block = await bitcoinApi.$getBlock(hash);
-    const transactions = await this.$getTransactionsExtended(hash, block.height, block.timestamp, true);
-    const blockExtended = await this.$getBlockExtended(block, transactions);
-
-    blockExtended.canonical = await bitcoinApi.$getBlockHash(block.height);
-
-    return blockExtended;
-  }
-
   /**
    * Get one block by its hash
    */
@@ -936,16 +699,12 @@ class Blocks {
     }
 
     // Bitcoin network, add our custom data on top
-    const block: IEsploraApi.Block = await bitcoinApi.$getBlock(hash);
-    if (block.stale) {
-      return await this.$indexStaleBlock(hash);
-    } else {
-      return await this.$indexBlock(block.height);
-    }
+    const block: IEsploraApi.Block = await bitcoinCoreApi.$getBlock(hash);
+    return await this.$indexBlock(block.height);
   }
 
   public async $getStrippedBlockTransactions(hash: string, skipMemoryCache = false,
-    skipDBLookup = false, cpfpSummary?: CpfpSummary, blockHeight?: number): Promise<TransactionStripped[]>
+    skipDBLookup = false): Promise<TransactionStripped[]>
   {
     if (skipMemoryCache === false) {
       // Check the memory cache
@@ -963,40 +722,13 @@ class Blocks {
       }
     }
 
-    let height = blockHeight;
-    let summary: BlockSummary;
-    if (cpfpSummary && !Common.isLiquid()) {
-      summary = {
-        id: hash,
-        transactions: cpfpSummary.transactions.map(tx => {
-          return {
-            txid: tx.txid,
-            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
-          };
-        }),
-      };
-    } else {
-      if (config.MEMPOOL.BACKEND === 'esplora') {
-        const txs = (await bitcoinApi.$getTxsForBlock(hash)).map(tx => transactionUtils.extendTransaction(tx));
-        summary = this.summarizeBlockTransactions(hash, txs);
-      } else {
-        // Call Core RPC
-        const block = await bitcoinClient.getBlock(hash, 2);
-        summary = this.summarizeBlock(block);
-        height = block.height;
-      }
-    }
-    if (height == null) {
-      const block = await bitcoinApi.$getBlock(hash);
-      height = block.height;
-    }
+    // Call Core RPC
+    const block = await bitcoinClient.getBlock(hash, 2);
+    const summary = this.summarizeBlock(block);
 
     // Index the response if needed
     if (Common.blocksSummariesIndexingEnabled() === true) {
-      await BlocksSummariesRepository.$saveTransactions(height, hash, summary.transactions);
+      await BlocksSummariesRepository.$saveSummary({height: block.height, mined: summary});
     }
 
     return summary.transactions;
@@ -1110,23 +842,13 @@ class Blocks {
       if (Common.blocksSummariesIndexingEnabled() && cleanBlock.fee_amt_percentiles === null) {
         cleanBlock.fee_amt_percentiles = await BlocksSummariesRepository.$getFeePercentilesByBlockId(cleanBlock.hash);
         if (cleanBlock.fee_amt_percentiles === null) {
-
-          let summary;
-          if (config.MEMPOOL.BACKEND === 'esplora') {
-            const txs = (await bitcoinApi.$getTxsForBlock(cleanBlock.hash)).map(tx => transactionUtils.extendTransaction(tx));
-            summary = this.summarizeBlockTransactions(cleanBlock.hash, txs);
-          } else {
-            // Call Core RPC
-            const block = await bitcoinClient.getBlock(cleanBlock.hash, 2);
-            summary = this.summarizeBlock(block);
-          }
-
-          await BlocksSummariesRepository.$saveTransactions(cleanBlock.height, cleanBlock.hash, summary.transactions);
+          const block = await bitcoinClient.getBlock(cleanBlock.hash, 2);
+          const summary = this.summarizeBlock(block);
+          await BlocksSummariesRepository.$saveSummary({ height: block.height, mined: summary });
           cleanBlock.fee_amt_percentiles = await BlocksSummariesRepository.$getFeePercentilesByBlockId(cleanBlock.hash);
         }
         if (cleanBlock.fee_amt_percentiles !== null) {
           cleanBlock.median_fee_amt = cleanBlock.fee_amt_percentiles[3];
-          await blocksRepository.$updateFeeAmounts(cleanBlock.hash, cleanBlock.fee_amt_percentiles, cleanBlock.median_fee_amt);
         }
       }
 
@@ -1161,11 +883,19 @@ class Blocks {
   }
 
   public async $getBlockAuditSummary(hash: string): Promise<any> {
+    let summary;
     if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK)) {
-      return BlocksAuditsRepository.$getBlockAudit(hash);
-    } else {
-      return null;
+      summary = await BlocksAuditsRepository.$getBlockAudit(hash);
     }
+
+    // fallback to non-audited transaction summary
+    if (!summary?.transactions?.length) {
+      const strippedTransactions = await this.$getStrippedBlockTransactions(hash);
+      summary = {
+        transactions: strippedTransactions
+      };
+    }
+    return summary;
   }
 
   public getLastDifficultyAdjustmentTime(): number {
@@ -1180,39 +910,47 @@ class Blocks {
     return this.currentBlockHeight;
   }
 
-  public async $indexCPFP(hash: string, height: number, txs?: TransactionExtended[]): Promise<CpfpSummary> {
-    let transactions = txs;
-    if (!transactions) {
-      if (config.MEMPOOL.BACKEND === 'esplora') {
-        transactions = (await bitcoinApi.$getTxsForBlock(hash)).map(tx => transactionUtils.extendTransaction(tx));
-      }
-      if (!transactions) {
-        const block = await bitcoinClient.getBlock(hash, 2);
-        transactions = block.tx.map(tx => {
-          tx.fee *= 100_000_000;
-          return tx;
+  public async $indexCPFP(hash: string, height: number): Promise<void> {
+    const block = await bitcoinClient.getBlock(hash, 2);
+    const transactions = block.tx.map(tx => {
+      tx.vsize = tx.weight / 4;
+      tx.fee *= 100_000_000;
+      return tx;
+    });
+
+    const clusters: any[] = [];
+
+    let cluster: TransactionStripped[] = [];
+    let ancestors: { [txid: string]: boolean } = {};
+    for (let i = transactions.length - 1; i >= 0; i--) {
+      const tx = transactions[i];
+      if (!ancestors[tx.txid]) {
+        let totalFee = 0;
+        let totalVSize = 0;
+        cluster.forEach(tx => {
+          totalFee += tx?.fee || 0;
+          totalVSize += tx.vsize;
         });
+        const effectiveFeePerVsize = totalFee / totalVSize;
+        if (cluster.length > 1) {
+          clusters.push({
+            root: cluster[0].txid,
+            height,
+            txs: cluster.map(tx => { return { txid: tx.txid, weight: tx.vsize * 4, fee: tx.fee || 0 }; }),
+            effectiveFeePerVsize,
+          });
+        }
+        cluster = [];
+        ancestors = {};
       }
+      cluster.push(tx);
+      tx.vin.forEach(vin => {
+        ancestors[vin.txid] = true;
+      });
     }
-
-    const summary = Common.calculateCpfp(height, transactions as TransactionExtended[]);
-
-    await this.$saveCpfp(hash, height, summary);
-
-    const effectiveFeeStats = Common.calcEffectiveFeeStatistics(summary.transactions);
-    await blocksRepository.$saveEffectiveFeeStats(hash, effectiveFeeStats);
-
-    return summary;
-  }
-
-  public async $saveCpfp(hash: string, height: number, cpfpSummary: CpfpSummary): Promise<void> {
-    try {
-      const result = await cpfpRepository.$batchSaveClusters(cpfpSummary.clusters);
-      if (!result) {
-        await cpfpRepository.$insertProgressMarker(height);
-      }
-    } catch (e) {
-      // not a fatal error, we'll try again next time the indexer runs
+    const result = await cpfpRepository.$batchSaveClusters(clusters);
+    if (!result) {
+      await cpfpRepository.$insertProgressMarker(height);
     }
   }
 }

backend/src/api/common.ts

@@ -1,6 +1,4 @@
-import * as bitcoinjs from 'bitcoinjs-lib';
-import { Request } from 'express';
-import { Ancestor, CpfpInfo, CpfpSummary, CpfpCluster, EffectiveFeeStats, MempoolBlockWithTransactions, TransactionExtended, MempoolTransactionExtended, TransactionStripped, WorkingEffectiveFeeStats } from '../mempool.interfaces';
+import { CpfpInfo, MempoolBlockWithTransactions, TransactionExtended, TransactionStripped } from '../mempool.interfaces';
 import config from '../config';
 import { NodeSocket } from '../repositories/NodesSocketsRepository';
 import { isIP } from 'net';
@@ -59,100 +57,35 @@ export class Common {
     return arr;
   }
 
-  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) {
-      added.forEach((addedTx) => {
-        const foundMatches = deleted.filter((deletedTx) => {
+  static findRbfTransactions(added: TransactionExtended[], deleted: TransactionExtended[]): { [txid: string]: TransactionExtended } {
+    const matches: { [txid: string]: TransactionExtended } = {};
+    deleted
+      .forEach((deletedTx) => {
+        const foundMatches = added.find((addedTx) => {
           // The new tx must, absolutely speaking, pay at least as much fee as the replaced tx.
           return addedTx.fee > deletedTx.fee
             // The new transaction must pay more fee per kB than the replaced tx.
-            && addedTx.adjustedFeePerVsize > deletedTx.adjustedFeePerVsize
+            && addedTx.feePerVsize > deletedTx.feePerVsize
             // Spends one or more of the same inputs
             && deletedTx.vin.some((deletedVin) =>
               addedTx.vin.some((vin) => vin.txid === deletedVin.txid && vin.vout === deletedVin.vout));
             });
-        if (foundMatches?.length) {
-          matches[addedTx.txid] = [...new Set(foundMatches)];
+        if (foundMatches) {
+          matches[deletedTx.txid] = foundMatches;
         }
       });
-    } else {
-      // for large N, build a lookup table of prevouts we can check in ~constant time
-      const deletedSpendMap: { [txid: string]: { [vout: number]: MempoolTransactionExtended } } = {};
-      for (const tx of deleted) {
-        for (const vin of tx.vin) {
-          if (!deletedSpendMap[vin.txid]) {
-            deletedSpendMap[vin.txid] = {};
-          }
-          deletedSpendMap[vin.txid][vin.vout] = tx;
-        }
-      }
-
-      for (const addedTx of added) {
-        const foundMatches = new Set<MempoolTransactionExtended>();
-        for (const vin of addedTx.vin) {
-          const deletedTx = deletedSpendMap[vin.txid]?.[vin.vout];
-          if (deletedTx && deletedTx.txid !== addedTx.txid
-              // The new tx must, absolutely speaking, pay at least as much fee as the replaced tx.
-              && addedTx.fee > deletedTx.fee
-              // The new transaction must pay more fee per kB than the replaced tx.
-              && addedTx.adjustedFeePerVsize > deletedTx.adjustedFeePerVsize
-          ) {
-            foundMatches.add(deletedTx);
-          }
-          if (foundMatches.size) {
-            matches[addedTx.txid] = [...foundMatches];
-          }
-        }
-      }
-    }
-
-    return matches;
-  }
-
-  static findMinedRbfTransactions(minedTransactions: TransactionExtended[], spendMap: Map<string, MempoolTransactionExtended>): { [txid: string]: { replaced: MempoolTransactionExtended[], replacedBy: TransactionExtended }} {
-    const matches: { [txid: string]: { replaced: MempoolTransactionExtended[], replacedBy: TransactionExtended }} = {};
-    for (const tx of minedTransactions) {
-      const replaced: Set<MempoolTransactionExtended> = new Set();
-      for (let i = 0; i < tx.vin.length; i++) {
-        const vin = tx.vin[i];
-        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 key = `${replacedVin.txid}:${replacedVin.vout}`;
-            spendMap.delete(key);
-          }
-        }
-        const key = `${vin.txid}:${vin.vout}`;
-        spendMap.delete(key);
-      }
-      if (replaced.size) {
-        matches[tx.txid] = { replaced: Array.from(replaced), replacedBy: tx };
-      }
-    }
     return matches;
   }
 
   static stripTransaction(tx: TransactionExtended): TransactionStripped {
     return {
       txid: tx.txid,
-      fee: tx.fee || 0,
+      fee: tx.fee,
       vsize: tx.weight / 4,
       value: tx.vout.reduce((acc, vout) => acc + (vout.value ? vout.value : 0), 0),
-      acc: tx.acceleration || undefined,
-      rate: tx.effectiveFeePerVsize,
     };
   }
 
-  static stripTransactions(txs: TransactionExtended[]): TransactionStripped[] {
-    return txs.map(this.stripTransaction);
-  }
-
   static sleep$(ms: number): Promise<void> {
     return new Promise((resolve) => {
        setTimeout(() => {
@@ -168,18 +101,18 @@ export class Common {
     }
   }
 
-  static setRelativesAndGetCpfpInfo(tx: MempoolTransactionExtended, memPool: { [txid: string]: MempoolTransactionExtended }): CpfpInfo {
+  static setRelativesAndGetCpfpInfo(tx: TransactionExtended, memPool: { [txid: string]: TransactionExtended }): CpfpInfo {
     const parents = this.findAllParents(tx, memPool);
-    const lowerFeeParents = parents.filter((parent) => parent.adjustedFeePerVsize < tx.effectiveFeePerVsize);
+    const lowerFeeParents = parents.filter((parent) => parent.feePerVsize < tx.effectiveFeePerVsize);
 
-    let totalWeight = (tx.adjustedVsize * 4) + lowerFeeParents.reduce((prev, val) => prev + (val.adjustedVsize * 4), 0);
+    let totalWeight = tx.weight + lowerFeeParents.reduce((prev, val) => prev + val.weight, 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),
+          weight: t.weight,
           fee: t.fee,
         };
       });
@@ -200,8 +133,8 @@ export class Common {
   }
 
 
-  private static findAllParents(tx: MempoolTransactionExtended, memPool: { [txid: string]: MempoolTransactionExtended }): MempoolTransactionExtended[] {
-    let parents: MempoolTransactionExtended[] = [];
+  private static findAllParents(tx: TransactionExtended, memPool: { [txid: string]: TransactionExtended }): TransactionExtended[] {
+    let parents: TransactionExtended[] = [];
     tx.vin.forEach((parent) => {
       if (parents.find((p) => p.txid === parent.txid)) {
         return;
@@ -209,17 +142,17 @@ export class Common {
 
       const parentTx = memPool[parent.txid];
       if (parentTx) {
-        if (tx.bestDescendant && tx.bestDescendant.fee / (tx.bestDescendant.weight / 4) > parentTx.adjustedFeePerVsize) {
+        if (tx.bestDescendant && tx.bestDescendant.fee / (tx.bestDescendant.weight / 4) > parentTx.feePerVsize) {
           if (parentTx.bestDescendant && parentTx.bestDescendant.fee < tx.fee + tx.bestDescendant.fee) {
             parentTx.bestDescendant = {
-              weight: (tx.adjustedVsize * 4) + tx.bestDescendant.weight,
+              weight: tx.weight + tx.bestDescendant.weight,
               fee: tx.fee + tx.bestDescendant.fee,
               txid: tx.txid,
             };
           }
-        } else if (tx.adjustedFeePerVsize > parentTx.adjustedFeePerVsize) {
+        } else if (tx.feePerVsize > parentTx.feePerVsize) {
           parentTx.bestDescendant = {
-            weight: (tx.adjustedVsize * 4),
+            weight: tx.weight,
             fee: tx.fee,
             txid: tx.txid
           };
@@ -412,364 +345,4 @@ 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);
-
-    let weightCount = 0;
-    let medianFee = 0;
-    let medianWeight = 0;
-
-    // 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;
-      if (right > leftBound) {
-        const weight = Math.min(right, rightBound) - Math.max(left, leftBound);
-        medianFee += (sortedTxs[i].rate * (weight / 4) );
-        medianWeight += weight;
-      }
-      weightCount += sortedTxs[i].weight;
-    }
-    const medianFeeRate = medianWeight ? (medianFee / (medianWeight / 4)) : 0;
-
-    // minimum effective fee heuristic:
-    // lowest of
-    // a) the 1st percentile of effective fee rates
-    // b) the minimum effective fee rate in the last 2% of transactions (in block order)
-    const minFee = Math.min(
-      Common.getNthPercentile(1, sortedTxs).rate,
-      transactions.slice(-transactions.length / 50).reduce((min, tx) => { return Math.min(min, tx.effectiveFeePerVsize || ((tx.fee || 0) / (tx.weight / 4))); }, Infinity)
-    );
-
-    // maximum effective fee heuristic:
-    // highest of
-    // a) the 99th percentile of effective fee rates
-    // b) the maximum effective fee rate in the first 2% of transactions (in block order)
-    const maxFee = Math.max(
-      Common.getNthPercentile(99, sortedTxs).rate,
-      transactions.slice(0, transactions.length / 50).reduce((max, tx) => { return Math.max(max, tx.effectiveFeePerVsize || ((tx.fee || 0) / (tx.weight / 4))); }, 0)
-    );
-
-    return {
-      medianFee: medianFeeRate,
-      feeRange: [
-        minFee,
-        [10,25,50,75,90].map(n => Common.getNthPercentile(n, sortedTxs).rate),
-        maxFee,
-      ].flat(),
-    };
-  }
-
-  static getNthPercentile(n: number, sortedDistribution: any[]): any {
-    return sortedDistribution[Math.floor((sortedDistribution.length - 1) * (n / 100))];
-  }
-
-  static getTransactionFromRequest(req: Request, form: boolean): string {
-    let rawTx: any = typeof req.body === 'object' && form
-      ? Object.values(req.body)[0] as any
-      : req.body;
-    if (typeof rawTx !== 'string') {
-      throw Object.assign(new Error('Non-string request body'), { code: -1 });
-    }
-
-    // Support both upper and lower case hex
-    // Support both txHash= Form and direct API POST
-    const reg = form ? /^txHash=((?:[a-fA-F0-9]{2})+)$/ : /^((?:[a-fA-F0-9]{2})+)$/;
-    const matches = reg.exec(rawTx);
-    if (!matches || !matches[1]) {
-      throw Object.assign(new Error('Non-hex request body'), { 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
-
-    // We assume txhex to be valid hex (output of getTransactionFromRequest above)
-
-    // Check 1: Valid transaction parse
-    let tx: bitcoinjs.Transaction;
-    try {
-      tx = bitcoinjs.Transaction.fromHex(txhex);
-    } catch(e) {
-      throw Object.assign(new Error('Invalid transaction (could not parse)'), { code: -4 });
-    }
-
-    // Check 2: Simple size check
-    if (tx.weight() > config.MEMPOOL.MAX_PUSH_TX_SIZE_WEIGHT) {
-      throw Object.assign(new Error(`Transaction too large (max ${config.MEMPOOL.MAX_PUSH_TX_SIZE_WEIGHT} weight units)`), { code: -3 });
-    }
-
-    // Check 3: Check unreachable script in taproot (if not allowed)
-    if (!config.MEMPOOL.ALLOW_UNREACHABLE) {
-      tx.ins.forEach(input => {
-        const witness = input.witness;
-        // See BIP 341: Script validation rules
-        const hasAnnex = witness.length >= 2 &&
-          witness[witness.length - 1][0] === 0x50;
-        const scriptSpendMinLength = hasAnnex ? 3 : 2;
-        const maybeScriptSpend = witness.length >= scriptSpendMinLength;
-
-        if (maybeScriptSpend) {
-          const controlBlock = witness[witness.length - scriptSpendMinLength + 1];
-          if (controlBlock.length === 0 || !this.isValidLeafVersion(controlBlock[0])) {
-            // Skip this input, it's not taproot
-            return;
-          }
-          // Definitely taproot. Get script
-          const script = witness[witness.length - scriptSpendMinLength];
-          const decompiled = bitcoinjs.script.decompile(script);
-          if (!decompiled || decompiled.length < 2) {
-            // Skip this input
-            return;
-          }
-          // Iterate up to second last (will look ahead 1 item)
-          for (let i = 0; i < decompiled.length - 1; i++) {
-            const first = decompiled[i];
-            const second = decompiled[i + 1];
-            if (
-              first === bitcoinjs.opcodes.OP_FALSE &&
-              second === bitcoinjs.opcodes.OP_IF
-            ) {
-              throw Object.assign(new Error('Unreachable taproot scripts not allowed'), { code: -5 });
-            }
-          }
-        }
-      })
-    }
-
-    // Pass through the input string untouched
-    return txhex;
-  }
-
-  private static isValidLeafVersion(leafVersion: number): boolean {
-    // See Note 7 in BIP341
-    // https://github.com/bitcoin/bips/blob/66a1a8151021913047934ebab3f8883f2f8ca75b/bip-0341.mediawiki#cite_note-7
-    // "What constraints are there on the leaf version?"
-
-    // Must be an integer between 0 and 255
-    // Since we're parsing a byte
-    if (Math.floor(leafVersion) !== leafVersion || leafVersion < 0 || leafVersion > 255) {
-      return false;
-    }
-    // "the leaf version cannot be odd"
-    if ((leafVersion & 0x01) === 1) {
-      return false;
-    }
-    // "The values that comply to this rule are
-    // the 32 even values between 0xc0 and 0xfe
-    if (leafVersion >= 0xc0 && leafVersion <= 0xfe) {
-      return true;
-    }
-    // and also 0x66, 0x7e, 0x80, 0x84, 0x96, 0x98, 0xba, 0xbc, 0xbe."
-    if ([0x66, 0x7e, 0x80, 0x84, 0x96, 0x98, 0xba, 0xbc, 0xbe].includes(leafVersion)) {
-      return true;
-    }
-    // Otherwise, invalid
-    return false;
-  }
-}
-
-/**
- * Class to calculate average fee rates of a list of transactions
- * at certain weight percentiles, in a single pass
- * 
- * init with:
- *   maxWeight - the total weight to measure percentiles relative to (e.g. 4MW for a single block)
- *   percentileBandWidth - how many weight units to average over for each percentile (as a % of maxWeight)
- *   percentiles - an array of weight percentiles to compute, in %
- * 
- * then call .processNext(tx) for each transaction, in descending order
- * 
- * retrieve the final results with .getFeeStats()
- */
-export class OnlineFeeStatsCalculator {
-  private maxWeight: number;
-  private percentiles = [10,25,50,75,90];
-
-  private bandWidthPercent = 2;
-  private bandWidth: number = 0;
-  private bandIndex = 0;
-  private leftBound = 0;
-  private rightBound = 0;
-  private inBand = false;
-  private totalBandFee = 0;
-  private totalBandWeight = 0;
-  private minBandRate = Infinity;
-  private maxBandRate = 0;
-
-  private feeRange: { avg: number, min: number, max: number }[] = [];
-  private totalWeight: number = 0;
-
-  constructor (maxWeight: number, percentileBandWidth?: number, percentiles?: number[]) {
-    this.maxWeight = maxWeight;
-    if (percentiles && percentiles.length) {
-      this.percentiles = percentiles;
-    }
-    if (percentileBandWidth != null) {
-      this.bandWidthPercent = percentileBandWidth;
-    }
-    this.bandWidth = this.maxWeight * (this.bandWidthPercent / 100);
-    // add min/max percentiles aligned to the ends of the range
-    this.percentiles.unshift(this.bandWidthPercent / 2);
-    this.percentiles.push(100 - (this.bandWidthPercent / 2));
-    this.setNextBounds();
-  }
-
-  processNext(tx: { weight: number, fee: number, effectiveFeePerVsize?: number, feePerVsize?: number, rate?: number, txid: string }): void {
-    let left = this.totalWeight;
-    const right = this.totalWeight + tx.weight;
-    if (!this.inBand && right <= this.leftBound) {
-      this.totalWeight += tx.weight;
-      return;
-    }
-
-    while (left < right) {
-      if (right > this.leftBound) {
-        this.inBand = true;
-        const txRate = (tx.rate || tx.effectiveFeePerVsize || tx.feePerVsize || 0);
-        const weight = Math.min(right, this.rightBound) - Math.max(left, this.leftBound);
-        this.totalBandFee += (txRate * weight);
-        this.totalBandWeight += weight;
-        this.maxBandRate = Math.max(this.maxBandRate, txRate);
-        this.minBandRate = Math.min(this.minBandRate, txRate);
-      }
-      left = Math.min(right, this.rightBound);
-
-      if (left >= this.rightBound) {
-        this.inBand = false;
-        const avgBandFeeRate = this.totalBandWeight ? (this.totalBandFee / this.totalBandWeight) : 0;
-        this.feeRange.unshift({ avg: avgBandFeeRate, min: this.minBandRate, max: this.maxBandRate });
-        this.bandIndex++;
-        this.setNextBounds();
-        this.totalBandFee = 0;
-        this.totalBandWeight = 0;
-        this.minBandRate = Infinity;
-        this.maxBandRate = 0;
-      }
-    }
-    this.totalWeight += tx.weight;
-  }
-
-  private setNextBounds(): void {
-    const nextPercentile = this.percentiles[this.bandIndex];
-    if (nextPercentile != null) {
-      this.leftBound = ((nextPercentile / 100) * this.maxWeight) - (this.bandWidth / 2);
-      this.rightBound = this.leftBound + this.bandWidth;
-    } else {
-      this.leftBound = Infinity;
-      this.rightBound = Infinity;
-    }
-  }
-
-  getRawFeeStats(): WorkingEffectiveFeeStats {
-    if (this.totalBandWeight > 0) {
-      const avgBandFeeRate = this.totalBandWeight ? (this.totalBandFee / this.totalBandWeight) : 0;
-      this.feeRange.unshift({ avg: avgBandFeeRate, min: this.minBandRate, max: this.maxBandRate });
-    }
-    while (this.feeRange.length < this.percentiles.length) {
-      this.feeRange.unshift({ avg: 0, min: 0, max: 0 });
-    }
-    return {
-      minFee: this.feeRange[0].min,
-      medianFee: this.feeRange[Math.floor(this.feeRange.length / 2)].avg,
-      maxFee: this.feeRange[this.feeRange.length - 1].max,
-      feeRange: this.feeRange.map(f => f.avg),
-    };
-  }
-
-  getFeeStats(): EffectiveFeeStats {
-    const stats = this.getRawFeeStats();
-    stats.feeRange[0] = stats.minFee;
-    stats.feeRange[stats.feeRange.length - 1] = stats.maxFee;
-    return stats;
-  }
 }

backend/src/api/database-migration.ts

@@ -7,7 +7,7 @@ import cpfpRepository from '../repositories/CpfpRepository';
 import { RowDataPacket } from 'mysql2';
 
 class DatabaseMigration {
-  private static currentVersion = 66;
+  private static currentVersion = 59;
   private queryTimeout = 3600_000;
   private statisticsAddedIndexed = false;
   private uniqueLogs: string[] = [];
@@ -497,7 +497,6 @@ class DatabaseMigration {
       this.uniqueLog(logger.notice, this.blocksTruncatedMessage);
       await this.$executeQuery('DELETE FROM `pools`');
       await this.$executeQuery('ALTER TABLE pools AUTO_INCREMENT = 1');
-      await this.$executeQuery(`UPDATE state SET string = NULL WHERE name = 'pools_json_sha'`);
       this.uniqueLog(logger.notice, '`pools` table has been truncated`');
       await this.updateToSchemaVersion(56);
     }
@@ -516,48 +515,6 @@ class DatabaseMigration {
       // https://github.com/mempool/mempool/issues/3360
       await this.$executeQuery(`TRUNCATE prices`);
     }
-
-    if (databaseSchemaVersion < 60 && isBitcoin === true) {
-      await this.$executeQuery('ALTER TABLE `blocks_audits` ADD sigop_txs JSON DEFAULT "[]"');
-      await this.updateToSchemaVersion(60);
-    }
-
-    if (databaseSchemaVersion < 61 && isBitcoin === true) {
-      // Break block templates into their own table
-      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');
-      await this.updateToSchemaVersion(61);
-    }
-
-    if (databaseSchemaVersion < 62 && isBitcoin === true) {
-      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');
-      await this.updateToSchemaVersion(62);
-    }
-
-    if (databaseSchemaVersion < 63 && isBitcoin === true) {
-      await this.$executeQuery('ALTER TABLE `blocks_audits` ADD fullrbf_txs JSON DEFAULT "[]"');
-      await this.updateToSchemaVersion(63);
-    }
-
-    if (databaseSchemaVersion < 64 && isBitcoin === true) {
-      await this.$executeQuery('ALTER TABLE `nodes` ADD features text NULL');
-      await this.updateToSchemaVersion(64);
-    }
-
-    if (databaseSchemaVersion < 65 && isBitcoin === true) {
-      await this.$executeQuery('ALTER TABLE `blocks_audits` ADD accelerated_txs JSON DEFAULT "[]"');
-      await this.updateToSchemaVersion(65);
-    }
-
-    if (databaseSchemaVersion < 66) {
-      await this.$executeQuery('ALTER TABLE `statistics` ADD min_fee FLOAT UNSIGNED DEFAULT NULL');
-      await this.updateToSchemaVersion(66);
-    }
   }
 
   /**
@@ -1076,7 +1033,7 @@ class DatabaseMigration {
   }
 
   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`);
+    logger.warn(`Truncating pools, blocks and hashrates for re-indexing (using '--reindex-blocks'). You can cancel this command within 5 seconds`);
     await Common.sleep$(5000);
 
     await this.$executeQuery(`TRUNCATE blocks`);

backend/src/api/difficulty-adjustment.ts

@@ -16,68 +16,6 @@ export interface DifficultyAdjustment {
   expectedBlocks: number;         // Block count
 }
 
-/**
- * Calculate the difficulty increase/decrease by using the `bits` integer contained in two
- * block headers.
- *
- * Warning: Only compare `bits` from blocks in two adjacent difficulty periods. This code
- * assumes the maximum difference is x4 or /4 (as per the protocol) and will throw an
- * error if an exponent difference of 2 or more is seen.
- *
- * @param {number} oldBits The 32 bit `bits` integer from a block header.
- * @param {number} newBits The 32 bit `bits` integer from a block header in the next difficulty period.
- * @returns {number} A floating point decimal of the difficulty change from old to new.
- *          (ie. 21.3 means 21.3% increase in difficulty, -21.3 is a 21.3% decrease in difficulty)
- */
-export function calcBitsDifference(oldBits: number, newBits: number): number {
-  // Must be
-  // - integer
-  // - highest exponent is 0x20, so max value (as integer) is 0x207fffff
-  // - min value is 1 (exponent = 0)
-  // - highest bit of the number-part is +- sign, it must not be 1
-  const verifyBits = (bits: number): void => {
-    if (
-      Math.floor(bits) !== bits ||
-      bits > 0x207fffff ||
-      bits < 1 ||
-      (bits & 0x00800000) !== 0 ||
-      (bits & 0x007fffff) === 0
-    ) {
-      throw new Error('Invalid bits');
-    }
-  };
-  verifyBits(oldBits);
-  verifyBits(newBits);
-
-  // No need to mask exponents because we checked the bounds above
-  const oldExp = oldBits >> 24;
-  const newExp = newBits >> 24;
-  const oldNum = oldBits & 0x007fffff;
-  const newNum = newBits & 0x007fffff;
-  // The diff can only possibly be 1, 0, -1
-  // (because maximum difficulty change is x4 or /4 (2 bits up or down))
-  let result: number;
-  switch (newExp - oldExp) {
-    // New less than old, target lowered, difficulty increased
-    case -1:
-      result = ((oldNum << 8) * 100) / newNum - 100;
-      break;
-    // Same exponent, compare numbers as is.
-    case 0:
-      result = (oldNum * 100) / newNum - 100;
-      break;
-    // Old less than new, target raised, difficulty decreased
-    case 1:
-      result = (oldNum * 100) / (newNum << 8) - 100;
-      break;
-    default:
-      throw new Error('Impossible exponent difference');
-  }
-
-  // Min/Max values
-  return result > 300 ? 300 : result < -75 ? -75 : result;
-}
-
 export function calcDifficultyAdjustment(
   DATime: number,
   nowSeconds: number,
@@ -86,29 +24,31 @@ export function calcDifficultyAdjustment(
   network: string,
   latestBlockTimestamp: number,
 ): DifficultyAdjustment {
+  const ESTIMATE_LAG_BLOCKS = 146; // For first 7.2% of epoch, don't estimate.
   const EPOCH_BLOCK_LENGTH = 2016; // Bitcoin mainnet
   const BLOCK_SECONDS_TARGET = 600; // Bitcoin mainnet
   const TESTNET_MAX_BLOCK_SECONDS = 1200; // Bitcoin testnet
 
-  const diffSeconds = Math.max(0, nowSeconds - DATime);
+  const diffSeconds = nowSeconds - DATime;
   const blocksInEpoch = (blockHeight >= 0) ? blockHeight % EPOCH_BLOCK_LENGTH : 0;
   const progressPercent = (blockHeight >= 0) ? blocksInEpoch / EPOCH_BLOCK_LENGTH * 100 : 100;
   const remainingBlocks = EPOCH_BLOCK_LENGTH - blocksInEpoch;
   const nextRetargetHeight = (blockHeight >= 0) ? blockHeight + remainingBlocks : 0;
   const expectedBlocks = diffSeconds / BLOCK_SECONDS_TARGET;
-  const actualTimespan = (blocksInEpoch === 2015 ? latestBlockTimestamp : nowSeconds) - DATime;
 
   let difficultyChange = 0;
-  let timeAvgSecs = blocksInEpoch ? diffSeconds / blocksInEpoch : BLOCK_SECONDS_TARGET;
-
-  difficultyChange = (BLOCK_SECONDS_TARGET / (actualTimespan / (blocksInEpoch + 1)) - 1) * 100;
-  // Max increase is x4 (+300%)
-  if (difficultyChange > 300) {
-    difficultyChange = 300;
-  }
-  // Max decrease is /4 (-75%)
-  if (difficultyChange < -75) {
-    difficultyChange = -75;
+  let timeAvgSecs = diffSeconds / blocksInEpoch;
+  // Only calculate the estimate once we have 7.2% of blocks in current epoch
+  if (blocksInEpoch >= ESTIMATE_LAG_BLOCKS) {
+    difficultyChange = (BLOCK_SECONDS_TARGET / timeAvgSecs - 1) * 100;
+    // Max increase is x4 (+300%)
+    if (difficultyChange > 300) {
+      difficultyChange = 300;
+    }
+    // Max decrease is /4 (-75%)
+    if (difficultyChange < -75) {
+      difficultyChange = -75;
+    }
   }
 
   // Testnet difficulty is set to 1 after 20 minutes of no blocks,

backend/src/api/disk-cache.ts

@@ -7,39 +7,33 @@ import logger from '../logger';
 import config from '../config';
 import { TransactionExtended } from '../mempool.interfaces';
 import { Common } from './common';
-import rbfCache from './rbf-cache';
 
 class DiskCache {
   private cacheSchemaVersion = 3;
-  private rbfCacheSchemaVersion = 1;
 
   private static TMP_FILE_NAME = config.MEMPOOL.CACHE_DIR + '/tmp-cache.json';
   private static TMP_FILE_NAMES = config.MEMPOOL.CACHE_DIR + '/tmp-cache{number}.json';
   private static FILE_NAME = config.MEMPOOL.CACHE_DIR + '/cache.json';
   private static FILE_NAMES = config.MEMPOOL.CACHE_DIR + '/cache{number}.json';
-  private static TMP_RBF_FILE_NAME = config.MEMPOOL.CACHE_DIR + '/tmp-rbfcache.json';
-  private static RBF_FILE_NAME = config.MEMPOOL.CACHE_DIR + '/rbfcache.json';
   private static CHUNK_FILES = 25;
   private isWritingCache = false;
-  private ignoreBlocksCache = false;
-
-  private semaphore: { resume: (() => void)[], locks: number } = {
-    resume: [],
-    locks: 0,
-  };
 
   constructor() {
-    if (!cluster.isPrimary || !config.MEMPOOL.CACHE_ENABLED) {
+    if (!cluster.isMaster) {
       return;
     }
     process.on('SIGINT', (e) => {
-      this.$saveCacheToDisk(true);
-      process.exit(0);
+      this.saveCacheToDiskSync();
+      process.exit(2);
+    });
+    process.on('SIGTERM', (e) => {
+      this.saveCacheToDiskSync();
+      process.exit(2);
     });
   }
 
-  async $saveCacheToDisk(sync: boolean = false): Promise<void> {
-    if (!cluster.isPrimary || !config.MEMPOOL.CACHE_ENABLED) {
+  async $saveCacheToDisk(): Promise<void> {
+    if (!cluster.isPrimary) {
       return;
     }
     if (this.isWritingCache) {
@@ -47,95 +41,87 @@ class DiskCache {
       return;
     }
     try {
-      logger.debug(`Writing mempool and blocks data to disk cache (${ sync ? 'sync' : 'async' })...`);
+      logger.debug('Writing mempool and blocks data to disk cache (async)...');
       this.isWritingCache = true;
 
       const mempool = memPool.getMempool();
       const mempoolArray: TransactionExtended[] = [];
       for (const tx in mempool) {
-        if (mempool[tx]) {
-          mempoolArray.push(mempool[tx]);
-        }
+        mempoolArray.push(mempool[tx]);
       }
 
       Common.shuffleArray(mempoolArray);
 
       const chunkSize = Math.floor(mempoolArray.length / DiskCache.CHUNK_FILES);
 
-      if (sync) {
-        fs.writeFileSync(DiskCache.TMP_FILE_NAME, JSON.stringify({
-          network: config.MEMPOOL.NETWORK,
-          cacheSchemaVersion: this.cacheSchemaVersion,
-          blocks: blocks.getBlocks(),
-          blockSummaries: blocks.getBlockSummaries(),
+      await fsPromises.writeFile(DiskCache.FILE_NAME, JSON.stringify({
+        network: config.MEMPOOL.NETWORK,
+        cacheSchemaVersion: this.cacheSchemaVersion,
+        blocks: blocks.getBlocks(),
+        blockSummaries: blocks.getBlockSummaries(),
+        mempool: {},
+        mempoolArray: mempoolArray.splice(0, chunkSize),
+      }), { flag: 'w' });
+      for (let i = 1; i < DiskCache.CHUNK_FILES; i++) {
+        await fsPromises.writeFile(DiskCache.FILE_NAMES.replace('{number}', i.toString()), JSON.stringify({
           mempool: {},
           mempoolArray: mempoolArray.splice(0, chunkSize),
         }), { flag: 'w' });
-        for (let i = 1; i < DiskCache.CHUNK_FILES; i++) {
-          fs.writeFileSync(DiskCache.TMP_FILE_NAMES.replace('{number}', i.toString()), JSON.stringify({
-            mempool: {},
-            mempoolArray: mempoolArray.splice(0, chunkSize),
-          }), { flag: 'w' });
-        }
-
-        fs.renameSync(DiskCache.TMP_FILE_NAME, DiskCache.FILE_NAME);
-        for (let i = 1; i < DiskCache.CHUNK_FILES; i++) {
-          fs.renameSync(DiskCache.TMP_FILE_NAMES.replace('{number}', i.toString()), DiskCache.FILE_NAMES.replace('{number}', i.toString()));
-        }
-      } else {
-        await this.$yield();
-        await fsPromises.writeFile(DiskCache.TMP_FILE_NAME, JSON.stringify({
-          network: config.MEMPOOL.NETWORK,
-          cacheSchemaVersion: this.cacheSchemaVersion,
-          blocks: blocks.getBlocks(),
-          blockSummaries: blocks.getBlockSummaries(),
-          mempool: {},
-          mempoolArray: mempoolArray.splice(0, chunkSize),
-        }), { flag: 'w' });
-        for (let i = 1; i < DiskCache.CHUNK_FILES; i++) {
-          await this.$yield();
-          await fsPromises.writeFile(DiskCache.TMP_FILE_NAMES.replace('{number}', i.toString()), JSON.stringify({
-            mempool: {},
-            mempoolArray: mempoolArray.splice(0, chunkSize),
-          }), { flag: 'w' });
-        }
-
-        await fsPromises.rename(DiskCache.TMP_FILE_NAME, DiskCache.FILE_NAME);
-        for (let i = 1; i < DiskCache.CHUNK_FILES; i++) {
-          await fsPromises.rename(DiskCache.TMP_FILE_NAMES.replace('{number}', i.toString()), DiskCache.FILE_NAMES.replace('{number}', i.toString()));
-        }
       }
-
       logger.debug('Mempool and blocks data saved to disk cache');
       this.isWritingCache = false;
     } catch (e) {
       logger.warn('Error writing to cache file: ' + (e instanceof Error ? e.message : e));
       this.isWritingCache = false;
     }
+  }
 
+  saveCacheToDiskSync(): void {
+    if (!cluster.isPrimary) {
+      return;
+    }
+    if (this.isWritingCache) {
+      logger.debug('Saving cache already in progress. Skipping.');
+      return;
+    }
     try {
-      logger.debug('Writing rbf data to disk cache (async)...');
+      logger.debug('Writing mempool and blocks data to disk cache (sync)...');
       this.isWritingCache = true;
-      const rbfData = rbfCache.dump();
-      if (sync) {
-        fs.writeFileSync(DiskCache.TMP_RBF_FILE_NAME, JSON.stringify({
-          network: config.MEMPOOL.NETWORK,
-          rbfCacheSchemaVersion: this.rbfCacheSchemaVersion,
-          rbf: rbfData,
-        }), { flag: 'w' });
-        fs.renameSync(DiskCache.TMP_RBF_FILE_NAME, DiskCache.RBF_FILE_NAME);
-      } else {
-        await fsPromises.writeFile(DiskCache.TMP_RBF_FILE_NAME, JSON.stringify({
-          network: config.MEMPOOL.NETWORK,
-          rbfCacheSchemaVersion: this.rbfCacheSchemaVersion,
-          rbf: rbfData,
-        }), { flag: 'w' });
-        await fsPromises.rename(DiskCache.TMP_RBF_FILE_NAME, DiskCache.RBF_FILE_NAME);
+
+      const mempool = memPool.getMempool();
+      const mempoolArray: TransactionExtended[] = [];
+      for (const tx in mempool) {
+        mempoolArray.push(mempool[tx]);
       }
-      logger.debug('Rbf data saved to disk cache');
+
+      Common.shuffleArray(mempoolArray);
+
+      const chunkSize = Math.floor(mempoolArray.length / DiskCache.CHUNK_FILES);
+
+      fs.writeFileSync(DiskCache.TMP_FILE_NAME, JSON.stringify({
+        network: config.MEMPOOL.NETWORK,
+        cacheSchemaVersion: this.cacheSchemaVersion,
+        blocks: blocks.getBlocks(),
+        blockSummaries: blocks.getBlockSummaries(),
+        mempool: {},
+        mempoolArray: mempoolArray.splice(0, chunkSize),
+      }), { flag: 'w' });
+      for (let i = 1; i < DiskCache.CHUNK_FILES; i++) {
+        fs.writeFileSync(DiskCache.TMP_FILE_NAMES.replace('{number}', i.toString()), JSON.stringify({
+          mempool: {},
+          mempoolArray: mempoolArray.splice(0, chunkSize),
+        }), { flag: 'w' });
+      }
+
+      fs.renameSync(DiskCache.TMP_FILE_NAME, DiskCache.FILE_NAME);
+      for (let i = 1; i < DiskCache.CHUNK_FILES; i++) {
+        fs.renameSync(DiskCache.TMP_FILE_NAMES.replace('{number}', i.toString()), DiskCache.FILE_NAMES.replace('{number}', i.toString()));
+      }
+
+      logger.debug('Mempool and blocks data saved to disk cache');
       this.isWritingCache = false;
     } catch (e) {
-      logger.warn('Error writing rbf data to cache file: ' + (e instanceof Error ? e.message : e));
+      logger.warn('Error writing to cache file: ' + (e instanceof Error ? e.message : e));
       this.isWritingCache = false;
     }
   }
@@ -162,24 +148,11 @@ class DiskCache {
     }
   }
 
-  wipeRbfCache() {
-    logger.notice(`Wipping nodejs backend cache/rbfcache.json file`);
-
-    try {
-      fs.unlinkSync(DiskCache.RBF_FILE_NAME);
-    } catch (e: any) {
-      if (e?.code !== 'ENOENT') {
-        logger.err(`Cannot wipe cache file ${DiskCache.RBF_FILE_NAME}. Exception ${JSON.stringify(e)}`);
-      }
-    }
-  }
-
-  async $loadMempoolCache(): Promise<void> {
-    if (!config.MEMPOOL.CACHE_ENABLED || !fs.existsSync(DiskCache.FILE_NAME)) {
+  loadMempoolCache(): void {
+    if (!fs.existsSync(DiskCache.FILE_NAME)) {
       return;
     }
     try {
-      const start = Date.now();
       let data: any = {};
       const cacheData = fs.readFileSync(DiskCache.FILE_NAME, 'utf8');
       if (cacheData) {
@@ -196,7 +169,6 @@ class DiskCache {
 
         if (data.mempoolArray) {
           for (const tx of data.mempoolArray) {
-            delete tx.uid;
             data.mempool[tx.txid] = tx;
           }
         }
@@ -209,7 +181,6 @@ class DiskCache {
             const cacheData2 = JSON.parse(fs.readFileSync(fileName, 'utf8'));
             if (cacheData2.mempoolArray) {
               for (const tx of cacheData2.mempoolArray) {
-                delete tx.uid;
                 data.mempool[tx.txid] = tx;
               }
             } else {
@@ -217,80 +188,16 @@ class DiskCache {
             }
           }
         } catch (e) {
-          logger.err('Error parsing ' + fileName + '. Skipping. Reason: ' + (e instanceof Error ? e.message : e));
+          logger.info('Error parsing ' + fileName + '. Skipping. Reason: ' + (e instanceof Error ? e.message : e));
         }
       }
 
-      logger.info(`Loaded mempool from disk cache in ${Date.now() - start} ms`);
-
-      await memPool.$setMempool(data.mempool);
-      if (!this.ignoreBlocksCache) {
-        blocks.setBlocks(data.blocks);
-        blocks.setBlockSummaries(data.blockSummaries || []);
-      } else {
-        logger.info('Re-saving cache with empty recent blocks data');
-        await this.$saveCacheToDisk(true);
-      }
+      memPool.setMempool(data.mempool);
+      blocks.setBlocks(data.blocks);
+      blocks.setBlockSummaries(data.blockSummaries || []);
     } catch (e) {
       logger.warn('Failed to parse mempoool and blocks cache. Skipping. Reason: ' + (e instanceof Error ? e.message : e));
     }
-
-    try {
-      let rbfData: any = {};
-      const rbfCacheData = fs.readFileSync(DiskCache.RBF_FILE_NAME, 'utf8');
-      if (rbfCacheData) {
-        logger.info('Restoring rbf data from disk cache');
-        rbfData = JSON.parse(rbfCacheData);
-        if (rbfData.rbfCacheSchemaVersion === undefined || rbfData.rbfCacheSchemaVersion !== this.rbfCacheSchemaVersion) {
-          logger.notice('Rbf disk cache contains an outdated schema version. Clearing it and skipping the cache loading.');
-          return this.wipeRbfCache();
-        }
-        if (rbfData.network && rbfData.network !== config.MEMPOOL.NETWORK) {
-          logger.notice('Rbf disk cache contains data from a different network. Clearing it and skipping the cache loading.');
-          return this.wipeRbfCache();
-        }
-      }
-
-      if (rbfData?.rbf) {
-        rbfCache.load({
-          txs: rbfData.rbf.txs.map(([txid, entry]) => ({ value: entry })),
-          trees: rbfData.rbf.trees,
-          expiring: rbfData.rbf.expiring.map(([txid, value]) => ({ key: txid, value })),
-        });
-      }
-    } catch (e) {
-      logger.warn('Failed to parse rbf cache. Skipping. Reason: ' + (e instanceof Error ? e.message : e));
-    }
-  }
-
-  private $yield(): Promise<void> {
-    if (this.semaphore.locks) {
-      logger.debug('Pause writing mempool and blocks data to disk cache (async)');
-      return new Promise((resolve) => {
-        this.semaphore.resume.push(resolve);
-      });
-    } else {
-      return Promise.resolve();
-    }
-  }
-
-  public lock(): void {
-    this.semaphore.locks++;
-  }
-
-  public unlock(): void {
-    this.semaphore.locks = Math.max(0, this.semaphore.locks - 1);
-    if (!this.semaphore.locks && this.semaphore.resume.length) {
-      const nextResume = this.semaphore.resume.shift();
-      if (nextResume) {
-        logger.debug('Resume writing mempool and blocks data to disk cache (async)');
-        nextResume();
-      }
-    }
-  }
-
-  public setIgnoreBlocksCache(): void {
-    this.ignoreBlocksCache = true;
   }
 }
 

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

@@ -80,13 +80,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] || '';
-      if (!searchStripped.length) {
-        return [];
-      }
-      // add wildcard to search by prefix
-      searchStripped += '%';
+      const searchStripped = search.replace('%', '') + '%';
       const query = `SELECT id, short_id, capacity, status FROM channels WHERE id LIKE ? OR short_id LIKE ? LIMIT 10`;
       const [rows]: any = await DB.query(query, [searchStripped, searchStripped]);
       return rows;
@@ -123,26 +117,6 @@ class ChannelsApi {
     }
   }
 
-  public async $getPenaltyClosedChannels(): Promise<any[]> {
-    try {
-      const query = `
-        SELECT n1.alias AS alias_left,
-          n2.alias AS alias_right,
-          channels.*
-        FROM channels
-        LEFT JOIN nodes AS n1 ON n1.public_key = channels.node1_public_key
-        LEFT JOIN nodes AS n2 ON n2.public_key = channels.node2_public_key
-        WHERE channels.status = 2 AND channels.closing_reason = 3
-        ORDER BY closing_date DESC
-      `;
-      const [rows]: any = await DB.query(query);
-      return rows;
-    } catch (e) {
-      logger.err('$getPenaltyClosedChannels error: ' + (e instanceof Error ? e.message : e));
-      throw e;
-    }
-  }
-
   public async $getUnresolvedClosedChannels(): Promise<any[]> {
     try {
       const query = `SELECT * FROM channels WHERE status = 2 AND closing_reason = 2 AND closing_resolved = 0 AND closing_transaction_id != ''`;

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

@@ -11,7 +11,6 @@ class ChannelsRoutes {
       .get(config.MEMPOOL.API_URL_PREFIX + 'lightning/channels/search/:search', this.$searchChannelsById)
       .get(config.MEMPOOL.API_URL_PREFIX + 'lightning/channels/:short_id', this.$getChannel)
       .get(config.MEMPOOL.API_URL_PREFIX + 'lightning/channels', this.$getChannelsForNode)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'lightning/penalties', this.$getPenaltyClosedChannels)
       .get(config.MEMPOOL.API_URL_PREFIX + 'lightning/channels-geo', this.$getAllChannelsGeo)
       .get(config.MEMPOOL.API_URL_PREFIX + 'lightning/channels-geo/:publicKey', this.$getAllChannelsGeo)
     ;
@@ -109,18 +108,6 @@ class ChannelsRoutes {
     }
   }
 
-  private async $getPenaltyClosedChannels(req: Request, res: Response): Promise<void> {
-    try {
-      const channels = await channelsApi.$getPenaltyClosedChannels();
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
-      res.json(channels);
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
   private async $getAllChannelsGeo(req: Request, res: Response) {
     try {
       const style: string = typeof req.query.style === 'string' ? req.query.style : '';

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

@@ -3,7 +3,6 @@ import DB from '../../database';
 import { ResultSetHeader } from 'mysql2';
 import { ILightningApi } from '../lightning/lightning-api.interface';
 import { ITopNodesPerCapacity, ITopNodesPerChannels } from '../../mempool.interfaces';
-import { bin2hex } from '../../utils/format';
 
 class NodesApi {
   public async $getWorldNodes(): Promise<any> {
@@ -57,8 +56,7 @@ class NodesApi {
           UNIX_TIMESTAMP(updated_at) AS updated_at, color, sockets as sockets,
           as_number, city_id, country_id, subdivision_id, longitude, latitude,
           geo_names_iso.names as iso_code, geo_names_as.names as as_organization, geo_names_city.names as city,
-          geo_names_country.names as country, geo_names_subdivision.names as subdivision,
-          features
+          geo_names_country.names as country, geo_names_subdivision.names as subdivision
         FROM nodes
         LEFT JOIN geo_names geo_names_as on geo_names_as.id = as_number
         LEFT JOIN geo_names geo_names_city on geo_names_city.id = city_id
@@ -78,23 +76,6 @@ class NodesApi {
       node.city = JSON.parse(node.city);
       node.country = JSON.parse(node.country);
 
-      // Features      
-      node.features = JSON.parse(node.features);
-      node.featuresBits = null;
-      if (node.features) {
-        let maxBit = 0;
-        for (const feature of node.features) {
-          maxBit = Math.max(maxBit, feature.bit);
-        }
-        maxBit = Math.ceil(maxBit / 4) * 4 - 1;
-        
-        node.featuresBits = new Array(maxBit + 1).fill(0);
-        for (const feature of node.features) {
-          node.featuresBits[feature.bit] = 1;
-        }
-        node.featuresBits = bin2hex(node.featuresBits.reverse().join(''));
-      }
-
       // Active channels and capacity
       const activeChannelsStats: any = await this.$getActiveChannelsStats(public_key);
       node.active_channel_count = activeChannelsStats.active_channel_count ?? 0;
@@ -392,7 +373,7 @@ class NodesApi {
 
   public async $searchNodeByPublicKeyOrAlias(search: string) {
     try {
-      const publicKeySearch = search.replace(/[^a-zA-Z0-9]/g, '') + '%';
+      const publicKeySearch = search.replace('%', '') + '%';
       const aliasSearch = search
         .replace(/[-_.]/g, ' ') // Replace all -_. characters with empty space. Eg: "ln.nicehash" becomes "ln nicehash".  
         .replace(/[^a-zA-Z0-9 ]/g, '') // Remove all special characters and keep just A to Z, 0 to 9.
@@ -675,19 +656,10 @@ class NodesApi {
           alias_search,
           color,
           sockets,
-          status,
-          features
+          status
         )
-        VALUES (?, NOW(), FROM_UNIXTIME(?), ?, ?, ?, ?, 1, ?)
-        ON DUPLICATE KEY UPDATE
-          updated_at = FROM_UNIXTIME(?),
-          alias = ?,
-          alias_search = ?,
-          color = ?,
-          sockets = ?,
-          status = 1,
-          features = ?
-      `;
+        VALUES (?, NOW(), FROM_UNIXTIME(?), ?, ?, ?, ?, 1)
+        ON DUPLICATE KEY UPDATE updated_at = FROM_UNIXTIME(?), alias = ?, alias_search = ?, color = ?, sockets = ?, status = 1`;
 
       await DB.query(query, [
         node.pub_key,
@@ -696,13 +668,11 @@ class NodesApi {
         this.aliasToSearchText(node.alias),
         node.color,
         sockets,
-        JSON.stringify(node.features),
         node.last_update,
         node.alias,
         this.aliasToSearchText(node.alias),
         node.color,
         sockets,
-        JSON.stringify(node.features),
       ]);
     } catch (e) {
       logger.err('$saveNode() error: ' + (e instanceof Error ? e.message : e));

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

@@ -42,12 +42,6 @@ class NodesRoutes {
       switch (config.MEMPOOL.NETWORK) {
         case 'testnet':
           nodesList = [
-            '0259db43b4e4ac0ff12a805f2d81e521253ba2317f6739bc611d8e2fa156d64256',
-            '0352b9944b9a52bd2116c91f1ba70c4ef851ac5ba27e1b20f1d92da3ade010dd10',
-            '03424f5a7601eaa47482cb17100b31a84a04d14fb44b83a57eeceffd8e299878e3',
-            '032850492ee61a5f7006a2fda6925e4b4ec3782f2b6de2ff0e439ef5a38c3b2470',
-            '022c80bace98831c44c32fb69755f2b353434e0ee9e7fbda29507f7ef8abea1421',
-            '02c3559c833e6f99f9ca05fe503e0b4e7524dea9121344edfd3e811101e0c28680',
             '032c7c7819276c4f706a04df1a0f1e10a5495994a7be4c1d3d28ca766e5a2b957b',
             '025a7e38c2834dd843591a4d23d5f09cdeb77ddca85f673c2d944a14220ff14cf7',
             '0395e2731a1673ef21d7a16a727c4fc4d4c35a861c428ce2c819c53d2b81c8bd55',
@@ -70,12 +64,6 @@ class NodesRoutes {
           break;
         case 'signet':
           nodesList = [
-            '029fe3621fc0c6e08056a14b868f8fb9acca1aa28a129512f6cea0f0d7654d9f92',
-            '02f60cd7a3a4f1c953dd9554a6ebd51a34f8b10b8124b7fc43a0b381139b55c883',
-            '03cbbf581774700865eebd1be42d022bc004ba30881274ab304e088a25d70e773d',
-            '0243348cb3741cfe2d8485fa8375c29c7bc7cbb67577c363cb6987a5e5fd0052cc',
-            '02cb73e631af44bee600d80f8488a9194c9dc5c7590e575c421a070d1be05bc8e9',
-            '0306f55ee631aa1e2cd4d9b2bfcbc14404faec5c541cef8b2e6f779061029d09c4',
             '03ddab321b760433cbf561b615ef62ac7d318630c5f51d523aaf5395b90b751956',
             '033d92c7bfd213ef1b34c90e985fb5dc77f9ec2409d391492484e57a44c4aca1de',
             '02ad010dda54253c1eb9efe38b0760657a3b43ecad62198c359c051c9d99d45781',
@@ -98,12 +86,6 @@ class NodesRoutes {
           break;
         default:
           nodesList = [
-            '02b12b889fe3c943cb05645921040ef13d6d397a2e7a4ad000e28500c505ff26d6',
-            '0302240ac9d71b39617cbde2764837ec3d6198bd6074b15b75d2ff33108e89d2e1',
-            '03364a8ace313376e5e4b68c954e287c6388e16df9e9fdbaf0363ecac41105cbf6',
-            '03229ab4b7f692753e094b93df90530150680f86b535b5183b0cffd75b3df583fc',
-            '03a696eb7acde991c1be97a58a9daef416659539ae462b897f5e9ae361f990228e',
-            '0248bf26cf3a63ab8870f34dc0ec9e6c8c6288cdba96ba3f026f34ec0f13ac4055',
             '03fbc17549ec667bccf397ababbcb4cdc0e3394345e4773079ab2774612ec9be61',
             '03da9a8623241ccf95f19cd645c6cecd4019ac91570e976eb0a128bebbc4d8a437',
             '03ca5340cf85cb2e7cf076e489f785410838de174e40be62723e8a60972ad75144',

backend/src/api/fee-api.ts

@@ -3,31 +3,21 @@ import { Common } from './common';
 import mempool from './mempool';
 import projectedBlocks from './mempool-blocks';
 
-interface RecommendedFees {
-  fastestFee: number,
-  halfHourFee: number,
-  hourFee: number,
-  economyFee: number,
-  minimumFee: number,
-}
-
 class FeeApi {
   constructor() { }
 
   defaultFee = Common.isLiquid() ? 0.1 : 1;
-  minimumIncrement = Common.isLiquid() ? 0.1 : 1;
 
-  public getRecommendedFee(): RecommendedFees {
+  public getRecommendedFee() {
     const pBlocks = projectedBlocks.getMempoolBlocks();
     const mPool = mempool.getMempoolInfo();
-    const minimumFee = this.roundUpToNearest(mPool.mempoolminfee * 100000, this.minimumIncrement);
-    const defaultMinFee = Math.max(minimumFee, this.defaultFee);
+    const minimumFee = Math.ceil(mPool.mempoolminfee * 100000);
 
     if (!pBlocks.length) {
       return {
-        'fastestFee': defaultMinFee,
-        'halfHourFee': defaultMinFee,
-        'hourFee': defaultMinFee,
+        'fastestFee': this.defaultFee,
+        'halfHourFee': this.defaultFee,
+        'hourFee': this.defaultFee,
         'economyFee': minimumFee,
         'minimumFee': minimumFee,
       };
@@ -37,15 +27,11 @@ 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;
 
-    // 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': Math.max(minimumFee, firstMedianFee),
-      'halfHourFee': Math.max(minimumFee, secondMedianFee),
-      'hourFee': Math.max(minimumFee, thirdMedianFee),
-      'economyFee': Math.max(minimumFee, Math.min(2 * minimumFee, thirdMedianFee)),
+      'fastestFee': firstMedianFee,
+      'halfHourFee': secondMedianFee,
+      'hourFee': thirdMedianFee,
+      'economyFee': Math.min(2 * minimumFee, thirdMedianFee),
       'minimumFee': minimumFee,
     };
   }
@@ -59,11 +45,7 @@ class FeeApi {
       const multiplier = (pBlock.blockVSize - 500000) / 500000;
       return Math.max(Math.round(useFee * multiplier), this.defaultFee);
     }
-    return this.roundUpToNearest(useFee, this.minimumIncrement);
-  }
-
-  private roundUpToNearest(value: number, nearest: number): number {
-    return Math.ceil(value / nearest) * nearest;
+    return Math.ceil(useFee);
   }
 }
 

backend/src/api/lightning/clightning/clightning-convert.ts

@@ -2,99 +2,8 @@ import { ILightningApi } from '../lightning-api.interface';
 import FundingTxFetcher from '../../../tasks/lightning/sync-tasks/funding-tx-fetcher';
 import logger from '../../../logger';
 import { Common } from '../../common';
-import { hex2bin } from '../../../utils/format';
 import config from '../../../config';
 
-// https://github.com/lightningnetwork/lnd/blob/master/lnwire/features.go
-export enum FeatureBits {
-	DataLossProtectRequired = 0,
-	DataLossProtectOptional = 1,
-	InitialRoutingSync = 3,
-	UpfrontShutdownScriptRequired = 4,
-	UpfrontShutdownScriptOptional = 5,
-	GossipQueriesRequired = 6,
-	GossipQueriesOptional = 7,
-	TLVOnionPayloadRequired = 8,
-	TLVOnionPayloadOptional = 9,
-	StaticRemoteKeyRequired = 12,
-	StaticRemoteKeyOptional = 13,
-	PaymentAddrRequired = 14,
-	PaymentAddrOptional = 15,
-	MPPRequired = 16,
-	MPPOptional = 17,
-	WumboChannelsRequired = 18,
-	WumboChannelsOptional = 19,
-	AnchorsRequired = 20,
-	AnchorsOptional = 21,
-	AnchorsZeroFeeHtlcTxRequired = 22,
-	AnchorsZeroFeeHtlcTxOptional = 23,
-	ShutdownAnySegwitRequired = 26,
-	ShutdownAnySegwitOptional = 27,
-	AMPRequired = 30,
-	AMPOptional = 31,
-	ExplicitChannelTypeRequired = 44,
-	ExplicitChannelTypeOptional = 45,
-	ScidAliasRequired = 46,
-	ScidAliasOptional = 47,
-	PaymentMetadataRequired = 48,
-	PaymentMetadataOptional = 49,
-	ZeroConfRequired = 50,
-	ZeroConfOptional = 51,
-	KeysendRequired = 54,
-	KeysendOptional = 55,
-	ScriptEnforcedLeaseRequired = 2022,
-	ScriptEnforcedLeaseOptional = 2023,
-	SimpleTaprootChannelsRequiredFinal = 80,
-	SimpleTaprootChannelsOptionalFinal = 81,
-	SimpleTaprootChannelsRequiredStaging = 180,
-	SimpleTaprootChannelsOptionalStaging = 181,
-	MaxBolt11Feature = 5114,
-};
-
-export const FeaturesMap = new Map<FeatureBits, string>([
-	[FeatureBits.DataLossProtectRequired, 'data-loss-protect'],
-	[FeatureBits.DataLossProtectOptional, 'data-loss-protect'],
-	[FeatureBits.InitialRoutingSync, 'initial-routing-sync'],
-	[FeatureBits.UpfrontShutdownScriptRequired, 'upfront-shutdown-script'],
-	[FeatureBits.UpfrontShutdownScriptOptional, 'upfront-shutdown-script'],
-	[FeatureBits.GossipQueriesRequired, 'gossip-queries'],
-	[FeatureBits.GossipQueriesOptional, 'gossip-queries'],
-	[FeatureBits.TLVOnionPayloadRequired, 'tlv-onion'],
-	[FeatureBits.TLVOnionPayloadOptional, 'tlv-onion'],
-	[FeatureBits.StaticRemoteKeyOptional, 'static-remote-key'],
-	[FeatureBits.StaticRemoteKeyRequired, 'static-remote-key'],
-	[FeatureBits.PaymentAddrOptional, 'payment-addr'],
-	[FeatureBits.PaymentAddrRequired, 'payment-addr'],
-	[FeatureBits.MPPOptional, 'multi-path-payments'],
-	[FeatureBits.MPPRequired, 'multi-path-payments'],
-	[FeatureBits.AnchorsRequired, 'anchor-commitments'],
-	[FeatureBits.AnchorsOptional, 'anchor-commitments'],
-	[FeatureBits.AnchorsZeroFeeHtlcTxRequired, 'anchors-zero-fee-htlc-tx'],
-	[FeatureBits.AnchorsZeroFeeHtlcTxOptional, 'anchors-zero-fee-htlc-tx'],
-	[FeatureBits.WumboChannelsRequired, 'wumbo-channels'],
-	[FeatureBits.WumboChannelsOptional, 'wumbo-channels'],
-	[FeatureBits.AMPRequired, 'amp'],
-	[FeatureBits.AMPOptional, 'amp'],
-	[FeatureBits.PaymentMetadataOptional, 'payment-metadata'],
-	[FeatureBits.PaymentMetadataRequired, 'payment-metadata'],
-	[FeatureBits.ExplicitChannelTypeOptional, 'explicit-commitment-type'],
-	[FeatureBits.ExplicitChannelTypeRequired, 'explicit-commitment-type'],
-	[FeatureBits.KeysendOptional, 'keysend'],
-	[FeatureBits.KeysendRequired, 'keysend'],
-	[FeatureBits.ScriptEnforcedLeaseRequired, 'script-enforced-lease'],
-	[FeatureBits.ScriptEnforcedLeaseOptional, 'script-enforced-lease'],
-	[FeatureBits.ScidAliasRequired, 'scid-alias'],
-	[FeatureBits.ScidAliasOptional, 'scid-alias'],
-	[FeatureBits.ZeroConfRequired, 'zero-conf'],
-	[FeatureBits.ZeroConfOptional, 'zero-conf'],
-	[FeatureBits.ShutdownAnySegwitRequired, 'shutdown-any-segwit'],
-	[FeatureBits.ShutdownAnySegwitOptional, 'shutdown-any-segwit'],
-	[FeatureBits.SimpleTaprootChannelsRequiredFinal, 'taproot-channels'],
-	[FeatureBits.SimpleTaprootChannelsOptionalFinal, 'taproot-channels'],
-	[FeatureBits.SimpleTaprootChannelsRequiredStaging, 'taproot-channels-staging'],
-	[FeatureBits.SimpleTaprootChannelsOptionalStaging, 'taproot-channels-staging'],
-]);
-
 /**
  * Convert a clightning "listnode" entry to a lnd node entry
  */
@@ -108,36 +17,10 @@ export function convertNode(clNode: any): ILightningApi.Node {
       custom_records = undefined;
     }
   }
-
-  const nodeFeatures: ILightningApi.Feature[] = [];
-  const nodeFeaturesBinary = hex2bin(clNode.features).split('').reverse().join('');
-
-  for (let i = 0; i < nodeFeaturesBinary.length; i++) {
-    if (nodeFeaturesBinary[i] === '0') {
-      continue;
-    }
-    const feature = FeaturesMap.get(i);
-    if (!feature) {
-      nodeFeatures.push({
-        bit: i,
-        name: 'unknown',
-        is_required: i % 2 === 0,
-        is_known: false
-      });
-    } else {
-      nodeFeatures.push({
-        bit: i,
-        name: feature,
-        is_required: i % 2 === 0,
-        is_known: true
-      });
-    }
-  }
-
   return {
     alias: clNode.alias ?? '',
     color: `#${clNode.color ?? ''}`,
-    features: nodeFeatures,
+    features: [], // TODO parse and return clNode.feature
     pub_key: clNode.nodeid,
     addresses: clNode.addresses?.map((addr) => {
       let address = addr.address;
@@ -225,7 +108,7 @@ async function buildFullChannel(clChannelA: any, clChannelB: any): Promise<ILigh
 
   return {
     channel_id: Common.channelShortIdToIntegerId(clChannelA.short_channel_id),
-    capacity: (clChannelA.amount_msat / 1000).toString(),
+    capacity: clChannelA.satoshis,
     last_update: lastUpdate,
     node1_policy: convertPolicy(clChannelA),
     node2_policy: convertPolicy(clChannelB),
@@ -249,7 +132,7 @@ async function buildIncompleteChannel(clChannel: any): Promise<ILightningApi.Cha
 
   return {
     channel_id: Common.channelShortIdToIntegerId(clChannel.short_channel_id),
-    capacity: (clChannel.amount_msat / 1000).toString(),
+    capacity: clChannel.satoshis,
     last_update: clChannel.last_update ?? 0,
     node1_policy: convertPolicy(clChannel),
     node2_policy: null,
@@ -265,8 +148,8 @@ async function buildIncompleteChannel(clChannel: any): Promise<ILightningApi.Cha
 function convertPolicy(clChannel: any): ILightningApi.RoutingPolicy {
   return {
     time_lock_delta: clChannel.delay,
-    min_htlc: clChannel.htlc_minimum_msat.toString(),
-    max_htlc_msat: clChannel.htlc_maximum_msat.toString(),
+    min_htlc: clChannel.htlc_minimum_msat.slice(0, -4),
+    max_htlc_msat: clChannel.htlc_maximum_msat.slice(0, -4),
     fee_base_msat: clChannel.base_fee_millisatoshi,
     fee_rate_milli_msat: clChannel.fee_per_millionth,
     disabled: !clChannel.active,

backend/src/api/lightning/lightning-api.interface.ts

@@ -79,7 +79,6 @@ export namespace ILightningApi {
   }
 
   export interface Feature {
-    bit: number;
     name: string;
     is_required: boolean;
     is_known: boolean;

backend/src/api/lightning/lnd/lnd-api.ts

@@ -4,29 +4,21 @@ import * as fs from 'fs';
 import { AbstractLightningApi } from '../lightning-api-abstract-factory';
 import { ILightningApi } from '../lightning-api.interface';
 import config from '../../../config';
-import logger from '../../../logger';
 
 class LndApi implements AbstractLightningApi {
   axiosConfig: AxiosRequestConfig = {};
 
   constructor() {
-    if (!config.LIGHTNING.ENABLED) {
-      return;
-    }
-    try {
+    if (config.LIGHTNING.ENABLED) {
       this.axiosConfig = {
         headers: {
-          'Grpc-Metadata-macaroon': fs.readFileSync(config.LND.MACAROON_PATH).toString('hex'),
+          'Grpc-Metadata-macaroon': fs.readFileSync(config.LND.MACAROON_PATH).toString('hex')
         },
         httpsAgent: new Agent({
           ca: fs.readFileSync(config.LND.TLS_CERT_PATH)
         }),
-        timeout: config.LND.TIMEOUT
+        timeout: 10000
       };
-    } catch (e) {
-      config.LIGHTNING.ENABLED = false;
-      logger.updateNetwork();
-      logger.err(`Could not initialize LND Macaroon/TLS Cert. Disabling LIGHTNING. ` + (e instanceof Error ? e.message : e));
     }
   }
 
@@ -41,23 +33,8 @@ class LndApi implements AbstractLightningApi {
   }
 
   async $getNetworkGraph(): Promise<ILightningApi.NetworkGraph> {
-    const graph = await axios.get<ILightningApi.NetworkGraph>(config.LND.REST_API_URL + '/v1/graph', this.axiosConfig)
+    return axios.get<ILightningApi.NetworkGraph>(config.LND.REST_API_URL + '/v1/graph', this.axiosConfig)
       .then((response) => response.data);
-
-    for (const node of graph.nodes) {
-      const nodeFeatures: ILightningApi.Feature[] = [];
-      for (const bit in node.features) {        
-        nodeFeatures.push({
-          bit: parseInt(bit, 10),
-          name: node.features[bit].name,  
-          is_required: node.features[bit].is_required,
-          is_known: node.features[bit].is_known,
-        });
-      }
-      node.features = nodeFeatures;
-    }
-
-    return graph;
   }
 }
 

backend/src/api/liquid/icons.ts

@@ -2,7 +2,7 @@ import * as fs from 'fs';
 import logger from '../../logger';
 
 class Icons {
-  private static FILE_NAME = '/elements/asset_registry_db/icons.json';
+  private static FILE_NAME = './icons.json';
   private iconIds: string[] = [];
   private icons: { [assetId: string]: string; } = {};
 

backend/src/api/memory-cache.ts

@@ -31,7 +31,7 @@ class MemoryCache {
   }
 
   private cleanup() {
-    this.cache = this.cache.filter((cache) => cache.expires > (new Date()));
+    this.cache = this.cache.filter((cache) => cache.expires < (new Date()));
   }
 }
 

backend/src/api/mempool-blocks.ts

@@ -1,23 +1,16 @@
-import { GbtGenerator, GbtResult, ThreadTransaction as RustThreadTransaction, ThreadAcceleration as RustThreadAcceleration } from 'rust-gbt';
 import logger from '../logger';
-import { MempoolBlock, MempoolTransactionExtended, TransactionStripped, MempoolBlockWithTransactions, MempoolBlockDelta, Ancestor, CompactThreadTransaction, EffectiveFeeStats, PoolTag } from '../mempool.interfaces';
-import { Common, OnlineFeeStatsCalculator } from './common';
+import { MempoolBlock, TransactionExtended, ThreadTransaction, TransactionStripped, MempoolBlockWithTransactions, MempoolBlockDelta, Ancestor } from '../mempool.interfaces';
+import { Common } from './common';
 import config from '../config';
 import { Worker } from 'worker_threads';
 import path from 'path';
-import mempool from './mempool';
-
-const MAX_UINT32 = Math.pow(2, 32) - 1;
 
 class MempoolBlocks {
   private mempoolBlocks: MempoolBlockWithTransactions[] = [];
   private mempoolBlockDeltas: MempoolBlockDelta[] = [];
   private txSelectionWorker: Worker | null = null;
-  private rustInitialized: boolean = false;
-  private rustGbtGenerator: GbtGenerator = new GbtGenerator();
 
-  private nextUid: number = 1;
-  private uidMap: Map<number, string> = new Map(); // map short numerical uids to full txids
+  constructor() {}
 
   public getMempoolBlocks(): MempoolBlock[] {
     return this.mempoolBlocks.map((block) => {
@@ -40,11 +33,13 @@ class MempoolBlocks {
     return this.mempoolBlockDeltas;
   }
 
-  public updateMempoolBlocks(memPool: { [txid: string]: MempoolTransactionExtended }, saveResults: boolean = false): MempoolBlockWithTransactions[] {
+  public updateMempoolBlocks(memPool: { [txid: string]: TransactionExtended }, saveResults: boolean = false): MempoolBlockWithTransactions[] {
     const latestMempool = memPool;
-    const memPoolArray: MempoolTransactionExtended[] = [];
+    const memPoolArray: TransactionExtended[] = [];
     for (const i in latestMempool) {
-      memPoolArray.push(latestMempool[i]);
+      if (latestMempool.hasOwnProperty(i)) {
+        memPoolArray.push(latestMempool[i]);
+      }
     }
     const start = new Date().getTime();
 
@@ -54,24 +49,17 @@ class MempoolBlocks {
       tx.ancestors = [];
       tx.cpfpChecked = false;
       if (!tx.effectiveFeePerVsize) {
-        tx.effectiveFeePerVsize = tx.adjustedFeePerVsize;
+        tx.effectiveFeePerVsize = tx.feePerVsize;
       }
     });
 
     // 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;
-      }
-    });
+    memPoolArray.sort((a, b) => b.feePerVsize - a.feePerVsize);
 
     // 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) => {
+    memPoolArray.forEach((tx, i) => {
       sizes += tx.weight;
       if (sizes > 4000000 * 8) {
         return;
@@ -80,20 +68,13 @@ class MempoolBlocks {
     });
 
     // 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;
-      }
-    });
+    memPoolArray.sort((a, b) => 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);
+    const blocks = this.calculateMempoolBlocks(memPoolArray, this.mempoolBlocks);
 
     if (saveResults) {
       const deltas = this.calculateMempoolDeltas(this.mempoolBlocks, blocks);
@@ -104,63 +85,26 @@ class MempoolBlocks {
     return blocks;
   }
 
-  private calculateMempoolBlocks(transactionsSorted: MempoolTransactionExtended[]): MempoolBlockWithTransactions[] {
+  private calculateMempoolBlocks(transactionsSorted: TransactionExtended[], prevBlocks: MempoolBlockWithTransactions[]): 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) => {
+    let blockSize = 0;
+    let transactions: TransactionExtended[] = [];
+    transactionsSorted.forEach((tx) => {
       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);
-        }
+        transactions.push(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;
+        mempoolBlocks.push(this.dataToMempoolBlocks(transactions, mempoolBlocks.length));
         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));
+      mempoolBlocks.push(this.dataToMempoolBlocks(transactions, mempoolBlocks.length));
     }
 
     return mempoolBlocks;
@@ -171,7 +115,6 @@ class MempoolBlocks {
     for (let i = 0; i < Math.max(mempoolBlocks.length, prevBlocks.length); i++) {
       let added: TransactionStripped[] = [];
       let removed: string[] = [];
-      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]) {
@@ -180,7 +123,7 @@ class MempoolBlocks {
         const prevIds = {};
         const newIds = {};
         prevBlocks[i].transactions.forEach(tx => {
-          prevIds[tx.txid] = tx;
+          prevIds[tx.txid] = true;
         });
         mempoolBlocks[i].transactions.forEach(tx => {
           newIds[tx.txid] = true;
@@ -193,50 +136,30 @@ class MempoolBlocks {
         mempoolBlocks[i].transactions.forEach(tx => {
           if (!prevIds[tx.txid]) {
             added.push(tx);
-          } else if (tx.rate !== prevIds[tx.txid].rate || tx.acc !== prevIds[tx.txid].acc) {
-            changed.push({ txid: tx.txid, rate: tx.rate, acc: tx.acc });
           }
         });
       }
       mempoolBlockDeltas.push({
         added,
-        removed,
-        changed,
+        removed
       });
     }
     return mempoolBlockDeltas;
   }
 
-  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
-    if (saveResults) {
-      this.resetUids();
-    }
-    // set missing short ids
-    for (const tx of Object.values(newMempool)) {
-      this.setUid(tx, !saveResults);
-    }
-
-    const accelerations = useAccelerations ? mempool.getAccelerations() : {};
-
+  public async makeBlockTemplates(newMempool: { [txid: string]: TransactionExtended }, saveResults: boolean = false): Promise<MempoolBlockWithTransactions[]> {
     // 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();
+    const strippedMempool: { [txid: string]: ThreadTransaction } = {};
     Object.values(newMempool).forEach(entry => {
-      if (entry.uid !== null && entry.uid !== undefined) {
-        const stripped = {
-          uid: entry.uid,
-          fee: entry.fee + (useAccelerations && (!accelerationPool || accelerations[entry.txid]?.pools?.includes(accelerationPool)) ? (accelerations[entry.txid]?.feeDelta || 0) : 0),
-          weight: (entry.adjustedVsize * 4),
-          sigops: entry.sigops,
-          feePerVsize: entry.adjustedFeePerVsize || entry.feePerVsize,
-          effectiveFeePerVsize: entry.effectiveFeePerVsize || entry.adjustedFeePerVsize || entry.feePerVsize,
-          inputs: entry.vin.map(v => this.getUid(newMempool[v.txid])).filter(uid => (uid !== null && uid !== undefined)) as number[],
-        };
-        strippedMempool.set(entry.uid, stripped);
-      }
+      strippedMempool[entry.txid] = {
+        txid: entry.txid,
+        fee: entry.fee,
+        weight: entry.weight,
+        feePerVsize: entry.fee / (entry.weight / 4),
+        effectiveFeePerVsize: entry.fee / (entry.weight / 4),
+        vin: entry.vin.map(v => v.txid),
+      };
     });
 
     // (re)initialize tx selection worker thread
@@ -255,7 +178,7 @@ class MempoolBlocks {
     // run the block construction algorithm in a separate thread, and wait for a result
     let threadErrorListener;
     try {
-      const workerResultPromise = new Promise<{ blocks: number[][], rates: Map<number, number>, clusters: Map<number, number[]> }>((resolve, reject) => {
+      const workerResultPromise = new Promise<{ blocks: ThreadTransaction[][], clusters: { [root: string]: string[] } }>((resolve, reject) => {
         threadErrorListener = reject;
         this.txSelectionWorker?.once('message', (result): void => {
           resolve(result);
@@ -263,319 +186,102 @@ class MempoolBlocks {
         this.txSelectionWorker?.once('error', reject);
       });
       this.txSelectionWorker.postMessage({ type: 'set', mempool: strippedMempool });
-      const { blocks, rates, clusters } = this.convertResultTxids(await workerResultPromise);
+      const { blocks, clusters } = await workerResultPromise;
 
       // clean up thread error listener
       this.txSelectionWorker?.removeListener('error', threadErrorListener);
 
-      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`);
-
-      return processed;
+      return this.processBlockTemplates(newMempool, blocks, clusters, saveResults);
     } catch (e) {
       logger.err('makeBlockTemplates failed. ' + (e instanceof Error ? e.message : e));
     }
     return this.mempoolBlocks;
   }
 
-  public async $updateBlockTemplates(newMempool: { [txid: string]: MempoolTransactionExtended }, added: MempoolTransactionExtended[], removed: MempoolTransactionExtended[], accelerationDelta: string[] = [], saveResults: boolean = false, useAccelerations: boolean = false): Promise<void> {
+  public async updateBlockTemplates(newMempool: { [txid: string]: TransactionExtended }, added: TransactionExtended[], removed: string[], saveResults: boolean = false): Promise<void> {
     if (!this.txSelectionWorker) {
       // need to reset the worker
-      await this.$makeBlockTemplates(newMempool, saveResults, useAccelerations);
+      this.makeBlockTemplates(newMempool, saveResults);
       return;
     }
-
-    const start = Date.now();
-
-    const accelerations = useAccelerations ? mempool.getAccelerations() : {};
-    const addedAndChanged: MempoolTransactionExtended[] = useAccelerations ? accelerationDelta.map(txid => newMempool[txid]).filter(tx => tx != null).concat(added) : added;
-
-    for (const tx of addedAndChanged) {
-      this.setUid(tx, true);
-    }
-    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
-    const addedStripped: CompactThreadTransaction[] = addedAndChanged.filter(entry => entry.uid != null).map(entry => {
+    const addedStripped: ThreadTransaction[] = added.map(entry => {
       return {
-        uid: entry.uid || 0,
-        fee: entry.fee + (useAccelerations ? (accelerations[entry.txid]?.feeDelta || 0) : 0),
-        weight: (entry.adjustedVsize * 4),
-        sigops: entry.sigops,
-        feePerVsize: entry.adjustedFeePerVsize || entry.feePerVsize,
-        effectiveFeePerVsize: entry.effectiveFeePerVsize || entry.adjustedFeePerVsize || entry.feePerVsize,
-        inputs: entry.vin.map(v => this.getUid(newMempool[v.txid])).filter(uid => (uid !== null && uid !== undefined)) as number[],
+        txid: entry.txid,
+        fee: entry.fee,
+        weight: entry.weight,
+        feePerVsize: entry.fee / (entry.weight / 4),
+        effectiveFeePerVsize: entry.fee / (entry.weight / 4),
+        vin: entry.vin.map(v => v.txid),
       };
     });
 
     // run the block construction algorithm in a separate thread, and wait for a result
     let threadErrorListener;
     try {
-      const workerResultPromise = new Promise<{ blocks: number[][], rates: Map<number, number>, clusters: Map<number, number[]> }>((resolve, reject) => {
+      const workerResultPromise = new Promise<{ blocks: ThreadTransaction[][], clusters: { [root: string]: string[] } }>((resolve, reject) => {
         threadErrorListener = reject;
         this.txSelectionWorker?.once('message', (result): void => {
           resolve(result);
         });
         this.txSelectionWorker?.once('error', reject);
       });
-      this.txSelectionWorker.postMessage({ type: 'update', added: addedStripped, removed: removedUids });
-      const { blocks, rates, clusters } = this.convertResultTxids(await workerResultPromise);
-
-      this.removeUids(removedUids);
+      this.txSelectionWorker.postMessage({ type: 'update', added: addedStripped, removed });
+      const { blocks, clusters } = await workerResultPromise;
 
       // clean up thread error listener
       this.txSelectionWorker?.removeListener('error', threadErrorListener);
 
-      this.processBlockTemplates(newMempool, blocks, null, Object.entries(rates), Object.values(clusters), accelerations, null, saveResults);
-      logger.debug(`updateBlockTemplates completed in ${(Date.now() - start) / 1000} seconds`);
+      this.processBlockTemplates(newMempool, blocks, clusters, saveResults);
     } catch (e) {
       logger.err('updateBlockTemplates failed. ' + (e instanceof Error ? e.message : e));
     }
   }
 
-  private resetRustGbt(): void {
-    this.rustInitialized = false;
-    this.rustGbtGenerator = new GbtGenerator();
-  }
-
-  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();
-    }
-    // set missing short ids
-    for (const tx of Object.values(newMempool)) {
-      this.setUid(tx, !saveResults);
-    }
-    // set short ids for transaction inputs
-    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 => {
-      return {
-        uid: this.getUid(newMempool[acc.txid]),
-        delta: acc.feeDelta,
-      };
-    });
-
-    // run the block construction algorithm in a separate thread, and wait for a result
-    const rustGbt = saveResults ? this.rustGbtGenerator : new GbtGenerator();
-    try {
-      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 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) {
-      logger.err('RUST makeBlockTemplates failed. ' + (e instanceof Error ? e.message : e));
-      if (saveResults) {
-        this.resetRustGbt();
-      }
-    }
-    return this.mempoolBlocks;
-  }
-
-  public async $oneOffRustBlockTemplates(newMempool: { [txid: string]: MempoolTransactionExtended }, useAccelerations: boolean, accelerationPool?: number): Promise<MempoolBlockWithTransactions[]> {
-    return this.$rustMakeBlockTemplates(newMempool, false, useAccelerations, accelerationPool);
-  }
-
-  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 * mempoolSize), MAX_UINT32)) {
-      this.resetRustGbt();
-    }
-
-    if (!this.rustInitialized) {
-      // need to reset the worker
-      return this.$rustMakeBlockTemplates(newMempool, true, useAccelerations, accelerationPool);
-    }
-
-    const start = Date.now();
-    // set missing short ids
-    for (const tx of added) {
-      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 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 => {
-      return {
-        uid: this.getUid(newMempool[acc.txid]),
-        delta: acc.feeDelta,
-      };
-    });
-
-    // run the block construction algorithm in a separate thread, and wait for a result
-    try {
-      const { blocks, blockWeights, rates, clusters } = this.convertNapiResultTxids(
-        await this.rustGbtGenerator.update(
-          added as RustThreadTransaction[],
-          removedUids,
-          convertedAccelerations as RustThreadAcceleration[],
-          this.nextUid,
-        ),
-      );
-      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, accelerations, accelerationPool, true);
-        this.removeUids(removedUids);
-        logger.debug(`RUST updateBlockTemplates completed in ${(Date.now() - start)/1000} seconds`);
-        return processed;
-      }
-    } catch (e) {
-      logger.err('RUST updateBlockTemplates failed. ' + (e instanceof Error ? e.message : e));
-      this.resetRustGbt();
-      return this.mempoolBlocks;
-    }
-  }
-
-  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 = false;
-      }
-    }
-
-    const lastBlockIndex = blocks.length - 1;
-    let hasBlockStack = blocks.length >= 8;
-    let stackWeight;
-    let feeStatsCalculator: OnlineFeeStatsCalculator | void;
-    if (hasBlockStack) {
-      if (blockWeights && blockWeights[7] !== null) {
-        stackWeight = blockWeights[7];
-      } else {
-        stackWeight = blocks[lastBlockIndex].reduce((total, tx) => total + (mempool[tx]?.weight || 0), 0);
-      }
-      hasBlockStack = stackWeight > config.MEMPOOL.BLOCK_WEIGHT_UNITS;
-      feeStatsCalculator = new OnlineFeeStatsCalculator(stackWeight, 0.5, [10, 20, 30, 40, 50, 60, 70, 80, 90]);
-    }
-
-    for (const cluster of clusters) {
-      for (const memberTxid of cluster) {
-        const mempoolTx = mempool[memberTxid];
-        if (mempoolTx) {
-          const ancestors: Ancestor[] = [];
-          const descendants: Ancestor[] = [];
-          let matched = false;
-          cluster.forEach(txid => {
-            if (txid === memberTxid) {
-              matched = true;
-            } else {
-              const relative = {
-                txid: txid,
-                fee: mempool[txid].fee,
-                weight: (mempool[txid].adjustedVsize * 4),
-              };
-              if (matched) {
-                descendants.push(relative);
-                mempoolTx.lastBoosted = Math.max(mempoolTx.lastBoosted || 0, mempool[txid].firstSeen || 0);
-              } 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 isAccelerated : { [txid: string]: boolean } = {};
-
-    const sizeLimit = (config.MEMPOOL.BLOCK_WEIGHT_UNITS / 4) * 1.2;
+  private processBlockTemplates(mempool, blocks, clusters, saveResults): MempoolBlockWithTransactions[] {
     // update this thread's mempool with the results
-    let mempoolTx: MempoolTransactionExtended;
-    const mempoolBlocks: MempoolBlockWithTransactions[] = blocks.map((block, blockIndex) => {
-      let totalSize = 0;
-      let totalVsize = 0;
-      let totalWeight = 0;
-      let totalFees = 0;
-      const transactions: MempoolTransactionExtended[] = [];
-      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;
+    blocks.forEach(block => {
+      block.forEach(tx => {
+        if (tx.txid in mempool) {
+          if (tx.effectiveFeePerVsize != null) {
+            mempool[tx.txid].effectiveFeePerVsize = tx.effectiveFeePerVsize;
           }
-
-          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;
+          if (tx.cpfpRoot && tx.cpfpRoot in clusters) {
+            const ancestors: Ancestor[] = [];
+            const descendants: Ancestor[] = [];
+            const cluster = clusters[tx.cpfpRoot];
+            let matched = false;
+            cluster.forEach(txid => {
+              if (txid === tx.txid) {
+                matched = true;
+              } else {
+                const relative = {
+                  txid: txid,
+                  fee: mempool[txid].fee,
+                  weight: mempool[txid].weight,
+                };
+                if (matched) {
+                  descendants.push(relative);
+                } else {
+                  ancestors.push(relative);
+                }
               }
-              mempool[ancestor.txid].acceleration = true;
-              isAccelerated[ancestor.txid] = true;
-            }
-          } else {
-            if (mempoolTx.acceleration) {
-              mempoolTx.cpfpDirty = true;
-            }
-            delete mempoolTx.acceleration;
-          }
-
-          // online calculation of stack-of-blocks fee stats
-          if (hasBlockStack && blockIndex === lastBlockIndex && feeStatsCalculator) {
-            feeStatsCalculator.processNext(mempoolTx);
-          }
-
-          totalSize += mempoolTx.size;
-          totalVsize += mempoolTx.vsize;
-          totalWeight += mempoolTx.weight;
-          totalFees += mempoolTx.fee;
-
-          if (totalVsize <= sizeLimit) {
-            transactions.push(mempoolTx);
+            });
+            mempool[tx.txid].ancestors = ancestors;
+            mempool[tx.txid].descendants = descendants;
+            mempool[tx.txid].bestDescendant = null;
           }
+          mempool[tx.txid].cpfpChecked = tx.cpfpChecked;
         }
-      }
-      return this.dataToMempoolBlocks(
-        block,
-        transactions,
-        totalSize,
-        totalWeight,
-        totalFees,
-        (hasBlockStack && blockIndex === lastBlockIndex && feeStatsCalculator) ? feeStatsCalculator.getRawFeeStats() : undefined,
-      );
+      });
+    });
+
+    // unpack the condensed blocks into proper mempool blocks
+    const mempoolBlocks = blocks.map((transactions, blockIndex) => {
+      return this.dataToMempoolBlocks(transactions.map(tx => {
+        return mempool[tx.txid] || null;
+      }).filter(tx => !!tx), blockIndex);
     });
 
     if (saveResults) {
@@ -587,97 +293,37 @@ class MempoolBlocks {
     return mempoolBlocks;
   }
 
-  private dataToMempoolBlocks(transactionIds: string[], transactions: MempoolTransactionExtended[], totalSize: number, totalWeight: number, totalFees: number, feeStats?: EffectiveFeeStats ): MempoolBlockWithTransactions {
-    if (!feeStats) {
-      feeStats = Common.calcEffectiveFeeStatistics(transactions.filter(tx => !tx.acceleration));
+  private dataToMempoolBlocks(transactions: TransactionExtended[], blocksIndex: number): MempoolBlockWithTransactions {
+    let totalSize = 0;
+    let totalWeight = 0;
+    const fitTransactions: TransactionExtended[] = [];
+    transactions.forEach(tx => {
+      totalSize += tx.size;
+      totalWeight += tx.weight;
+      if ((totalWeight + tx.weight) <= config.MEMPOOL.BLOCK_WEIGHT_UNITS * 1.2) {
+        fitTransactions.push(tx);
+      }
+    });
+    let rangeLength = 4;
+    if (blocksIndex === 0) {
+      rangeLength = 8;
+    }
+    if (transactions.length > 4000) {
+      rangeLength = 6;
+    } else if (transactions.length > 10000) {
+      rangeLength = 8;
     }
     return {
       blockSize: totalSize,
-      blockVSize: (totalWeight / 4), // fractional vsize to avoid rounding errors
-      nTx: transactionIds.length,
-      totalFees: totalFees,
-      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.stripTransaction(tx)),
+      blockVSize: totalWeight / 4,
+      nTx: transactions.length,
+      totalFees: transactions.reduce((acc, cur) => acc + cur.fee, 0),
+      medianFee: Common.percentile(transactions.map((tx) => tx.effectiveFeePerVsize), config.MEMPOOL.RECOMMENDED_FEE_PERCENTILE),
+      feeRange: Common.getFeesInRange(transactions, rangeLength),
+      transactionIds: transactions.map((tx) => tx.txid),
+      transactions: fitTransactions.map((tx) => Common.stripTransaction(tx)),
     };
   }
-
-  private resetUids(): void {
-    this.uidMap.clear();
-    this.nextUid = 1;
-  }
-
-  private setUid(tx: MempoolTransactionExtended, skipSet = false): number {
-    if (tx.uid === null || tx.uid === undefined || !skipSet) {
-      const uid = this.nextUid;
-      this.nextUid++;
-      this.uidMap.set(uid, tx.txid);
-      tx.uid = uid;
-      return uid;
-    } else {
-      return tx.uid;
-    }
-  }
-
-  private getUid(tx: MempoolTransactionExtended): number | void {
-    if (tx?.uid !== null && tx?.uid !== undefined && this.uidMap.has(tx.uid)) {
-      return tx.uid;
-    }
-  }
-
-  private removeUids(uids: number[]): void {
-    for (const uid of uids) {
-      this.uidMap.delete(uid);
-    }
-  }
-
-  private convertResultTxids({ blocks, rates, clusters }: { blocks: number[][], rates: Map<number, number>, clusters: Map<number, number[]>})
-    : { blocks: string[][], rates: { [root: string]: number }, clusters: { [root: string]: string[] }} {
-    const convertedBlocks: string[][] = blocks.map(block => block.map(uid => {
-      return this.uidMap.get(uid) || '';
-    }));
-    const convertedRates = {};
-    for (const rateUid of rates.keys()) {
-      const rateTxid = this.uidMap.get(rateUid);
-      if (rateTxid) {
-        convertedRates[rateTxid] = rates.get(rateUid);
-      }
-    }
-    const convertedClusters = {};
-    for (const rootUid of clusters.keys()) {
-      const rootTxid = this.uidMap.get(rootUid);
-      if (rootTxid) {
-        const members = clusters.get(rootUid)?.map(uid => {
-          return this.uidMap.get(uid);
-        });
-        convertedClusters[rootTxid] = members;
-      }
-    }
-    return { blocks: convertedBlocks, rates: convertedRates, clusters: convertedClusters } as { blocks: string[][], rates: { [root: string]: number }, clusters: { [root: string]: 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) {
-        return txid;
-      } else {
-        throw new Error('GBT returned a block containing a transaction with unknown uid');
-      }
-    }));
-    const convertedRates: [string, number][] = [];
-    for (const [rateUid, rate] of rates) {
-      const rateTxid = this.uidMap.get(rateUid) as string;
-      convertedRates.push([rateTxid, rate]);
-    }
-    const convertedClusters: string[][] = [];
-    for (const cluster of clusters) {
-      convertedClusters.push(cluster.map(uid => this.uidMap.get(uid)) as string[]);
-    }
-    return { blocks: convertedBlocks, blockWeights, rates: convertedRates, clusters: convertedClusters };
-  }
 }
 
 export default new MempoolBlocks();

backend/src/api/mempool.ts

@@ -1,6 +1,6 @@
 import config from '../config';
 import bitcoinApi from './bitcoin/bitcoin-api-factory';
-import { MempoolTransactionExtended, TransactionExtended, VbytesPerSecond } from '../mempool.interfaces';
+import { TransactionExtended, VbytesPerSecond } from '../mempool.interfaces';
 import logger from '../logger';
 import { Common } from './common';
 import transactionUtils from './transaction-utils';
@@ -9,22 +9,19 @@ import loadingIndicators from './loading-indicators';
 import bitcoinClient from './bitcoin/bitcoin-client';
 import bitcoinSecondClient from './bitcoin/bitcoin-second-client';
 import rbfCache from './rbf-cache';
-import { Acceleration } from './services/acceleration';
-import redisCache from './redis-cache';
 
 class Mempool {
+  private static WEBSOCKET_REFRESH_RATE_MS = 10000;
+  private static LAZY_DELETE_AFTER_SECONDS = 30;
   private inSync: boolean = false;
   private mempoolCacheDelta: number = -1;
-  private mempoolCache: { [txId: string]: MempoolTransactionExtended } = {};
-  private spendMap = new Map<string, MempoolTransactionExtended>();
+  private mempoolCache: { [txId: string]: TransactionExtended } = {};
   private mempoolInfo: IBitcoinApi.MempoolInfo = { loaded: false, size: 0, bytes: 0, usage: 0, total_fee: 0,
-                                                    maxmempool: 300000000, mempoolminfee: Common.isLiquid() ? 0.00000100 : 0.00001000, minrelaytxfee: Common.isLiquid() ? 0.00000100 : 0.00001000 };
-  private mempoolChangedCallback: ((newMempool: {[txId: string]: MempoolTransactionExtended; }, newTransactions: MempoolTransactionExtended[],
-    deletedTransactions: MempoolTransactionExtended[], accelerationDelta: string[]) => void) | undefined;
-  private $asyncMempoolChangedCallback: ((newMempool: {[txId: string]: MempoolTransactionExtended; }, mempoolSize: number, newTransactions: MempoolTransactionExtended[],
-    deletedTransactions: MempoolTransactionExtended[], accelerationDelta: string[]) => Promise<void>) | undefined;
-
-  private accelerations: { [txId: string]: Acceleration } = {};
+                                                    maxmempool: 300000000, mempoolminfee: 0.00001000, minrelaytxfee: 0.00001000 };
+  private mempoolChangedCallback: ((newMempool: {[txId: string]: TransactionExtended; }, newTransactions: TransactionExtended[],
+    deletedTransactions: TransactionExtended[]) => void) | undefined;
+  private asyncMempoolChangedCallback: ((newMempool: {[txId: string]: TransactionExtended; }, newTransactions: TransactionExtended[],
+    deletedTransactions: TransactionExtended[]) => Promise<void>) | undefined;
 
   private txPerSecondArray: number[] = [];
   private txPerSecond: number = 0;
@@ -38,10 +35,10 @@ class Mempool {
   private SAMPLE_TIME = 10000; // In ms
   private timer = new Date().getTime();
   private missingTxCount = 0;
-  private mainLoopTimeout: number = 120000;
 
   constructor() {
     setInterval(this.updateTxPerSecond.bind(this), 1000);
+    setInterval(this.deleteExpiredTransactions.bind(this), 20000);
   }
 
   /**
@@ -68,92 +65,28 @@ class Mempool {
     return this.latestTransactions;
   }
 
-  public setMempoolChangedCallback(fn: (newMempool: { [txId: string]: MempoolTransactionExtended; },
-    newTransactions: MempoolTransactionExtended[], deletedTransactions: MempoolTransactionExtended[], accelerationDelta: string[]) => void): void {
+  public setMempoolChangedCallback(fn: (newMempool: { [txId: string]: TransactionExtended; },
+    newTransactions: TransactionExtended[], deletedTransactions: TransactionExtended[]) => void) {
     this.mempoolChangedCallback = fn;
   }
 
-  public setAsyncMempoolChangedCallback(fn: (newMempool: { [txId: string]: MempoolTransactionExtended; }, mempoolSize: number,
-    newTransactions: MempoolTransactionExtended[], deletedTransactions: MempoolTransactionExtended[], accelerationDelta: string[]) => Promise<void>): void {
-    this.$asyncMempoolChangedCallback = fn;
+  public setAsyncMempoolChangedCallback(fn: (newMempool: { [txId: string]: TransactionExtended; },
+    newTransactions: TransactionExtended[], deletedTransactions: TransactionExtended[]) => Promise<void>) {
+    this.asyncMempoolChangedCallback = fn;
   }
 
-  public getMempool(): { [txid: string]: MempoolTransactionExtended } {
+  public getMempool(): { [txid: string]: TransactionExtended } {
     return this.mempoolCache;
   }
 
-  public getSpendMap(): Map<string, MempoolTransactionExtended> {
-    return this.spendMap;
-  }
-
-  public async $setMempool(mempoolData: { [txId: string]: MempoolTransactionExtended }) {
+  public setMempool(mempoolData: { [txId: string]: TransactionExtended }) {
     this.mempoolCache = mempoolData;
-    let count = 0;
-    const redisTimer = Date.now();
-    if (config.MEMPOOL.CACHE_ENABLED && config.REDIS.ENABLED) {
-      logger.debug(`Migrating ${Object.keys(this.mempoolCache).length} transactions from disk cache to Redis cache`);
-    }
-    for (const txid of Object.keys(this.mempoolCache)) {
-      if (!this.mempoolCache[txid].adjustedVsize || this.mempoolCache[txid].sigops == null || this.mempoolCache[txid].effectiveFeePerVsize == null) {
-        this.mempoolCache[txid] = transactionUtils.extendMempoolTransaction(this.mempoolCache[txid]);
-      }
-      if (this.mempoolCache[txid].order == null) {
-        this.mempoolCache[txid].order = transactionUtils.txidToOrdering(txid);
-      }
-      count++;
-      if (config.MEMPOOL.CACHE_ENABLED && config.REDIS.ENABLED) {
-        await redisCache.$addTransaction(this.mempoolCache[txid]);
-      }
-    }
-    if (config.MEMPOOL.CACHE_ENABLED && config.REDIS.ENABLED) {
-      await redisCache.$flushTransactions();
-      logger.debug(`Finished migrating cache transactions in ${((Date.now() - redisTimer) / 1000).toFixed(2)} seconds`);
-    }
     if (this.mempoolChangedCallback) {
-      this.mempoolChangedCallback(this.mempoolCache, [], [], []);
+      this.mempoolChangedCallback(this.mempoolCache, [], []);
     }
-    if (this.$asyncMempoolChangedCallback) {
-      await this.$asyncMempoolChangedCallback(this.mempoolCache, count, [], [], []);
+    if (this.asyncMempoolChangedCallback) {
+      this.asyncMempoolChangedCallback(this.mempoolCache, [], []);
     }
-    this.addToSpendMap(Object.values(this.mempoolCache));
-  }
-
-  public async $reloadMempool(expectedCount: number): Promise<MempoolTransactionExtended[]> {
-    let count = 0;
-    let done = false;
-    let last_txid;
-    const newTransactions: MempoolTransactionExtended[] = [];
-    loadingIndicators.setProgress('mempool', count / expectedCount * 100);
-    while (!done) {
-      try {
-        const result = await bitcoinApi.$getAllMempoolTransactions(last_txid, config.ESPLORA.BATCH_QUERY_BASE_SIZE);
-        if (result) {
-          for (const tx of result) {
-            const extendedTransaction = transactionUtils.extendMempoolTransaction(tx);
-            if (!this.mempoolCache[extendedTransaction.txid]) {
-              newTransactions.push(extendedTransaction);
-              this.mempoolCache[extendedTransaction.txid] = extendedTransaction;
-            }
-            count++;
-          }
-          logger.info(`Fetched ${count} of ${expectedCount} mempool transactions from esplora`);
-          if (result.length > 0) {
-            last_txid = result[result.length - 1].txid;
-          } else {
-            done = true;
-          }
-          if (Math.floor((count / expectedCount) * 100) < 100) {
-            loadingIndicators.setProgress('mempool', count / expectedCount * 100);
-          }
-        } else {
-          done = true;
-        }
-      } catch(err) {
-        logger.err('failed to fetch bulk mempool transactions from esplora');
-      }
-    }
-    logger.info(`Done inserting loaded mempool transactions into local cache`);
-    return newTransactions;
   }
 
   public async $updateMemPoolInfo() {
@@ -185,23 +118,19 @@ class Mempool {
     return txTimes;
   }
 
-  public async $updateMempool(transactions: string[], accelerations: Acceleration[] | null, pollRate: number): Promise<void> {
+  public async $updateMempool(): Promise<void> {
     logger.debug(`Updating mempool...`);
-
-    // warn if this run stalls the main loop for more than 2 minutes
-    const timer = this.startTimer();
-
     const start = new Date().getTime();
     let hasChange: boolean = false;
     const currentMempoolSize = Object.keys(this.mempoolCache).length;
-    this.updateTimerProgress(timer, 'got raw mempool');
+    const transactions = await bitcoinApi.$getRawMempool();
     const diff = transactions.length - currentMempoolSize;
-    let newTransactions: MempoolTransactionExtended[] = [];
+    const newTransactions: TransactionExtended[] = [];
 
     this.mempoolCacheDelta = Math.abs(diff);
 
     if (!this.inSync) {
-      loadingIndicators.setProgress('mempool', currentMempoolSize / transactions.length * 100);
+      loadingIndicators.setProgress('mempool', Object.keys(this.mempoolCache).length / transactions.length * 100);
     }
 
     // https://github.com/mempool/mempool/issues/3283
@@ -214,36 +143,11 @@ class Mempool {
       }
     };
 
-    let intervalTimer = Date.now();
-
-    let loaded = false;
-    if (config.MEMPOOL.BACKEND === 'esplora' && currentMempoolSize < transactions.length * 0.5 && transactions.length > 20_000) {
-      this.inSync = false;
-      logger.info(`Missing ${transactions.length - currentMempoolSize} mempool transactions, attempting to reload in bulk from esplora`);
-      try {
-        newTransactions = await this.$reloadMempool(transactions.length);
-        if (config.REDIS.ENABLED) {
-          for (const tx of newTransactions) {
-            await redisCache.$addTransaction(tx);
-          }
-        }
-        loaded = true;
-      } catch (e) {
-        logger.err('failed to load mempool in bulk from esplora, falling back to fetching individual transactions');
-      }
-    }
-
-    if (!loaded) {
-      const remainingTxids = transactions.filter(txid => !this.mempoolCache[txid]);
-      const sliceLength = config.ESPLORA.BATCH_QUERY_BASE_SIZE;
-      for (let i = 0; i < Math.ceil(remainingTxids.length / sliceLength); i++) {
-        const slice = remainingTxids.slice(i * sliceLength, (i + 1) * sliceLength);
-        const txs = await transactionUtils.$getMempoolTransactionsExtended(slice, false, false, false);
-        logger.debug(`fetched ${txs.length} transactions`);
-        this.updateTimerProgress(timer, 'fetched new transactions');
-
-        for (const transaction of txs) {
-          this.mempoolCache[transaction.txid] = transaction;
+    for (const txid of transactions) {
+      if (!this.mempoolCache[txid]) {
+        try {
+          const transaction = await transactionUtils.$getTransactionExtended(txid);
+          this.mempoolCache[txid] = transaction;
           if (this.inSync) {
             this.txPerSecondArray.push(new Date().getTime());
             this.vBytesPerSecondArray.push({
@@ -253,35 +157,16 @@ class Mempool {
           }
           hasChange = true;
           newTransactions.push(transaction);
-
-          if (config.REDIS.ENABLED) {
-            await redisCache.$addTransaction(transaction);
+        } catch (e: any) {
+          if (config.MEMPOOL.BACKEND === 'esplora' && e.response?.status === 404) {
+            this.missingTxCount++;
           }
+          logger.debug(`Error finding transaction '${txid}' in the mempool: ` + (e instanceof Error ? e.message : e));
         }
+      }
 
-        if (txs.length < slice.length) {
-          const missing = slice.length - txs.length;
-          if (config.MEMPOOL.BACKEND === 'esplora') {
-            this.missingTxCount += missing;
-          }
-          logger.debug(`Error finding ${missing} transactions in the mempool: `);
-        }
-
-        if (Date.now() - intervalTimer > Math.max(pollRate * 2, 5_000)) {
-          if (this.inSync) {
-            // Break and restart mempool loop if we spend too much time processing
-            // new transactions that may lead to falling behind on block height
-            logger.debug('Breaking mempool loop because the 5s time limit exceeded.');
-            break;
-          } else {
-            const progress = (currentMempoolSize + newTransactions.length) / transactions.length * 100;
-            logger.debug(`Mempool is synchronizing. Processed ${newTransactions.length}/${diff} txs (${Math.round(progress)}%)`);
-            if (Math.floor(progress) < 100) {
-              loadingIndicators.setProgress('mempool', progress);
-            }
-            intervalTimer = Date.now();
-          }
-        }
+      if ((new Date().getTime()) - start > Mempool.WEBSOCKET_REFRESH_RATE_MS) {
+        break;
       }
     }
 
@@ -303,11 +188,11 @@ class Mempool {
       logger.warn(`Mempool clear protection triggered because transactions.length: ${transactions.length} and currentMempoolSize: ${currentMempoolSize}.`);
       setTimeout(() => {
         this.mempoolProtection = 2;
-        logger.warn('Mempool clear protection ended, normal operation resumed.');
+        logger.warn('Mempool clear protection resumed.');
       }, 1000 * 60 * config.MEMPOOL.CLEAR_PROTECTION_MINUTES);
     }
 
-    const deletedTransactions: MempoolTransactionExtended[] = [];
+    const deletedTransactions: TransactionExtended[] = [];
 
     if (this.mempoolProtection !== 1) {
       this.mempoolProtection = 0;
@@ -315,174 +200,45 @@ class Mempool {
       const transactionsObject = {};
       transactions.forEach((txId) => transactionsObject[txId] = true);
 
-      // Delete evicted transactions from mempool
+      // Flag transactions for lazy deletion
       for (const tx in this.mempoolCache) {
-        if (!transactionsObject[tx]) {
+        if (!transactionsObject[tx] && !this.mempoolCache[tx].deleteAfter) {
           deletedTransactions.push(this.mempoolCache[tx]);
+          this.mempoolCache[tx].deleteAfter = new Date().getTime() + Mempool.LAZY_DELETE_AFTER_SECONDS * 1000;
         }
       }
-      for (const tx of deletedTransactions) {
-        delete this.mempoolCache[tx.txid];
-      }
     }
 
-    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) : [];
-    if (accelerationDelta.length) {
-      hasChange = true;
-    }
-
-    this.mempoolCacheDelta = Math.abs(transactions.length - newMempoolSize);
-
-    if (this.mempoolChangedCallback && (hasChange || deletedTransactions.length)) {
-      this.mempoolChangedCallback(this.mempoolCache, newTransactions, deletedTransactions, accelerationDelta);
-    }
-    if (this.$asyncMempoolChangedCallback && (hasChange || deletedTransactions.length)) {
-      this.updateTimerProgress(timer, 'running async mempool callback');
-      await this.$asyncMempoolChangedCallback(this.mempoolCache, newMempoolSize, newTransactions, deletedTransactions, accelerationDelta);
-      this.updateTimerProgress(timer, 'completed async mempool callback');
-    }
-
-    if (!this.inSync && transactions.length === newMempoolSize) {
+    if (!this.inSync && transactions.length === Object.keys(this.mempoolCache).length) {
       this.inSync = true;
       logger.notice('The mempool is now in sync!');
       loadingIndicators.setProgress('mempool', 100);
     }
 
-    // Update Redis cache
-    if (config.REDIS.ENABLED) {
-      await redisCache.$flushTransactions();
-      await redisCache.$removeTransactions(deletedTransactions.map(tx => tx.txid));
-      await rbfCache.updateCache();
+    this.mempoolCacheDelta = Math.abs(transactions.length - Object.keys(this.mempoolCache).length);
+
+    if (this.mempoolChangedCallback && (hasChange || deletedTransactions.length)) {
+      this.mempoolChangedCallback(this.mempoolCache, newTransactions, deletedTransactions);
+    }
+    if (this.asyncMempoolChangedCallback && (hasChange || deletedTransactions.length)) {
+      await this.asyncMempoolChangedCallback(this.mempoolCache, newTransactions, deletedTransactions);
     }
 
     const end = new Date().getTime();
     const time = end - start;
     logger.debug(`Mempool updated in ${time / 1000} seconds. New size: ${Object.keys(this.mempoolCache).length} (${diff > 0 ? '+' + diff : diff})`);
-
-    this.clearTimer(timer);
   }
 
-  public getAccelerations(): { [txid: string]: Acceleration } {
-    return this.accelerations;
-  }
-
-  public $updateAccelerations(newAccelerations: Acceleration[]): string[] {
-    if (!config.MEMPOOL_SERVICES.ACCELERATIONS) {
-      return [];
-    }
-
-    try {
-      const changed: string[] = [];
-
-      const newAccelerationMap: { [txid: string]: Acceleration } = {};
-      for (const acceleration of newAccelerations) {
-        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 oldTxid of Object.keys(this.accelerations)) {
-        if (!newAccelerationMap[oldTxid]) {
-          // removed
-          changed.push(oldTxid);
-        }
-      }
-
-      this.accelerations = newAccelerationMap;
-
-      return changed;
-    } catch (e: any) {
-      logger.debug(`Failed to update accelerations: ` + (e instanceof Error ? e.message : e));
-      return [];
-    }
-  }
-
-  private startTimer() {
-    const state: any = {
-      start: Date.now(),
-      progress: 'begin $updateMempool',
-      timer: null,
-    };
-    state.timer = setTimeout(() => {
-      logger.err(`$updateMempool stalled at "${state.progress}"`);
-    }, this.mainLoopTimeout);
-    return state;
-  }
-
-  private updateTimerProgress(state, msg) {
-    state.progress = msg;
-  }
-
-  private clearTimer(state) {
-    if (state.timer) {
-      clearTimeout(state.timer);
-    }
-  }
-
-  public handleRbfTransactions(rbfTransactions: { [txid: string]: MempoolTransactionExtended[]; }): void {
+  public handleRbfTransactions(rbfTransactions: { [txid: string]: TransactionExtended; }) {
     for (const rbfTransaction in rbfTransactions) {
-      if (this.mempoolCache[rbfTransaction] && rbfTransactions[rbfTransaction]?.length) {
+      if (this.mempoolCache[rbfTransaction]) {
         // 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
-        rbfCache.add(rbfTransactions[rbfTransaction].replaced, transactionUtils.extendMempoolTransaction(rbfTransactions[rbfTransaction].replacedBy));
-      }
-    }
-  }
-
-  public addToSpendMap(transactions: MempoolTransactionExtended[]): void {
-    for (const tx of transactions) {
-      for (const vin of tx.vin) {
-        this.spendMap.set(`${vin.txid}:${vin.vout}`, tx);
-      }
-    }
-  }
-
-  public removeFromSpendMap(transactions: TransactionExtended[]): void {
-    for (const tx of transactions) {
-      for (const vin of tx.vin) {
-        const key = `${vin.txid}:${vin.vout}`;
-        if (this.spendMap.get(key)?.txid === tx.txid) {
-          this.spendMap.delete(key);
-        }
+        rbfCache.add(this.mempoolCache[rbfTransaction], rbfTransactions[rbfTransaction].txid);
+        // Erase the replaced transactions from the local mempool
+        delete this.mempoolCache[rbfTransaction];
       }
     }
   }
@@ -500,6 +256,17 @@ class Mempool {
     }
   }
 
+  private deleteExpiredTransactions() {
+    const now = new Date().getTime();
+    for (const tx in this.mempoolCache) {
+      const lazyDeleteAt = this.mempoolCache[tx].deleteAfter;
+      if (lazyDeleteAt && lazyDeleteAt < now) {
+        delete this.mempoolCache[tx];
+        rbfCache.evict(tx);
+      }
+    }
+  }
+
   private $getMempoolInfo() {
     if (config.MEMPOOL.USE_SECOND_NODE_FOR_MINFEE) {
       return Promise.all([

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

@@ -12,7 +12,6 @@ import PricesRepository from '../../repositories/PricesRepository';
 class MiningRoutes {
   public initRoutes(app: Application) {
     app
-      .get(config.MEMPOOL.API_URL_PREFIX + 'mining/pools', this.$listPools)
       .get(config.MEMPOOL.API_URL_PREFIX + 'mining/pools/:interval', this.$getPools)
       .get(config.MEMPOOL.API_URL_PREFIX + 'mining/pool/:slug/hashrate', this.$getPoolHistoricalHashrate)
       .get(config.MEMPOOL.API_URL_PREFIX + 'mining/pool/:slug/blocks', this.$getPoolBlocks)
@@ -27,7 +26,7 @@ class MiningRoutes {
       .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)
       .get(config.MEMPOOL.API_URL_PREFIX + 'mining/difficulty-adjustments/:interval', this.$getDifficultyAdjustments)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/predictions/:interval', this.$getHistoricalBlocksHealth)
+      .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/predictions/:interval', this.$getHistoricalBlockPrediction)
       .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/audit/scores', this.$getBlockAuditScores)
       .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/audit/scores/:height', this.$getBlockAuditScores)
       .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/audit/score/:hash', this.$getBlockAuditScore)
@@ -42,10 +41,6 @@ class MiningRoutes {
       res.header('Pragma', 'public');
       res.header('Cache-control', 'public');
       res.setHeader('Expires', new Date(Date.now() + 1000 * 300).toUTCString());
-      if (['testnet', 'signet', 'liquidtestnet'].includes(config.MEMPOOL.NETWORK)) {
-        res.status(400).send('Prices are not available on testnets.');
-        return;
-      }
       if (req.query.timestamp) {
         res.status(200).send(await PricesRepository.$getNearestHistoricalPrice(
           parseInt(<string>req.query.timestamp ?? 0, 10)
@@ -93,29 +88,6 @@ class MiningRoutes {
     }
   }
 
-  private async $listPools(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());
-
-      const pools = await mining.$listPools();
-      if (!pools) {
-        res.status(500).end();
-        return;
-      }
-
-      res.header('X-total-count', pools.length.toString());
-      if (pools.length === 0) {
-        res.status(204).send();
-      } else {
-        res.json(pools);
-      }
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
   private async $getPools(req: Request, res: Response) {
     try {
       const stats = await mining.$getPoolsStats(req.params.interval);
@@ -272,15 +244,15 @@ class MiningRoutes {
     }
   }
 
-  private async $getHistoricalBlocksHealth(req: Request, res: Response) {
+  private async $getHistoricalBlockPrediction(req: Request, res: Response) {
     try {
-      const blocksHealth = await mining.$getBlocksHealthHistory(req.params.interval);
-      const blockCount = await BlocksAuditsRepository.$getBlocksHealthCount();
+      const blockPredictions = await mining.$getBlockPredictionsHistory(req.params.interval);
+      const blockCount = await BlocksAuditsRepository.$getPredictionsCount();
       res.header('Pragma', 'public');
       res.header('Cache-control', 'public');
       res.header('X-total-count', blockCount.toString());
       res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
-      res.json(blocksHealth.map(health => [health.time, health.height, health.match_rate]));
+      res.json(blockPredictions.map(prediction => [prediction.time, prediction.height, prediction.match_rate]));
     } catch (e) {
       res.status(500).send(e instanceof Error ? e.message : e);
     }

backend/src/api/mining/mining.ts

@@ -11,30 +11,20 @@ import DifficultyAdjustmentsRepository from '../../repositories/DifficultyAdjust
 import config from '../../config';
 import BlocksAuditsRepository from '../../repositories/BlocksAuditsRepository';
 import PricesRepository from '../../repositories/PricesRepository';
-import bitcoinApi from '../bitcoin/bitcoin-api-factory';
+import { bitcoinCoreApi } from '../bitcoin/bitcoin-api-factory';
 import { IEsploraApi } from '../bitcoin/esplora-api.interface';
 import database from '../../database';
 
-interface DifficultyBlock {
-  timestamp: number,
-  height: number,
-  bits: number,
-  difficulty: number,
-}
-
 class Mining {
   private blocksPriceIndexingRunning = false;
   public lastHashrateIndexingDate: number | null = null;
   public lastWeeklyHashrateIndexingDate: number | null = null;
-  
-  public reindexHashrateRequested = false;
-  public reindexDifficultyAdjustmentRequested = false;
 
   /**
-   * Get historical blocks health
+   * Get historical block predictions match rate
    */
-  public async $getBlocksHealthHistory(interval: string | null = null): Promise<any> {
-    return await BlocksAuditsRepository.$getBlocksHealthHistory(
+   public async $getBlockPredictionsHistory(interval: string | null = null): Promise<any> {
+    return await BlocksAuditsRepository.$getBlockPredictionsHistory(
       this.getTimeRange(interval),
       Common.getSqlInterval(interval)
     );
@@ -63,7 +53,7 @@ class Mining {
   /**
    * Get historical block fee rates percentiles
    */
-  public async $getHistoricalBlockFeeRates(interval: string | null = null): Promise<any> {
+   public async $getHistoricalBlockFeeRates(interval: string | null = null): Promise<any> {
     return await BlocksRepository.$getHistoricalBlockFeeRates(
       this.getTimeRange(interval),
       Common.getSqlInterval(interval)
@@ -73,7 +63,7 @@ class Mining {
   /**
    * Get historical block sizes
    */
-  public async $getHistoricalBlockSizes(interval: string | null = null): Promise<any> {
+   public async $getHistoricalBlockSizes(interval: string | null = null): Promise<any> {
     return await BlocksRepository.$getHistoricalBlockSizes(
       this.getTimeRange(interval),
       Common.getSqlInterval(interval)
@@ -83,7 +73,7 @@ class Mining {
   /**
    * Get historical block weights
    */
-  public async $getHistoricalBlockWeights(interval: string | null = null): Promise<any> {
+   public async $getHistoricalBlockWeights(interval: string | null = null): Promise<any> {
     return await BlocksRepository.$getHistoricalBlockWeights(
       this.getTimeRange(interval),
       Common.getSqlInterval(interval)
@@ -113,8 +103,6 @@ class Mining {
         emptyBlocks: emptyBlocksCount.length > 0 ? emptyBlocksCount[0]['count'] : 0,
         slug: poolInfo.slug,
         avgMatchRate: poolInfo.avgMatchRate !== null ? Math.round(100 * poolInfo.avgMatchRate) / 100 : null,
-        avgFeeDelta: poolInfo.avgFeeDelta,
-        poolUniqueId: poolInfo.poolUniqueId
       };
       poolsStats.push(poolStat);
     });
@@ -209,7 +197,7 @@ class Mining {
     try {
       const oldestConsecutiveBlockTimestamp = 1000 * (await BlocksRepository.$getOldestConsecutiveBlock()).timestamp;
 
-      const genesisBlock: IEsploraApi.Block = await bitcoinApi.$getBlock(await bitcoinApi.$getBlockHash(0));
+      const genesisBlock: IEsploraApi.Block = await bitcoinCoreApi.$getBlock(await bitcoinClient.getBlockHash(0));
       const genesisTimestamp = genesisBlock.timestamp * 1000;
 
       const indexedTimestamp = await HashratesRepository.$getWeeklyHashrateTimestamps();
@@ -302,14 +290,6 @@ class Mining {
    * Generate daily hashrate data
    */
   public async $generateNetworkHashrateHistory(): Promise<void> {
-    // If a re-index was requested, truncate first
-    if (this.reindexHashrateRequested === true) {
-      logger.notice(`hashrates will now be re-indexed`);
-      await database.query(`TRUNCATE hashrates`);
-      this.lastHashrateIndexingDate = 0;
-      this.reindexHashrateRequested = false;
-    }
-
     // We only run this once a day around midnight
     const today = new Date().getUTCDate();
     if (today === this.lastHashrateIndexingDate) {
@@ -320,7 +300,7 @@ class Mining {
     const oldestConsecutiveBlockTimestamp = 1000 * (await BlocksRepository.$getOldestConsecutiveBlock()).timestamp;
 
     try {
-      const genesisBlock: IEsploraApi.Block = await bitcoinApi.$getBlock(await bitcoinApi.$getBlockHash(0));
+      const genesisBlock: IEsploraApi.Block = await bitcoinCoreApi.$getBlock(await bitcoinClient.getBlockHash(0));
       const genesisTimestamp = genesisBlock.timestamp * 1000;
       const indexedTimestamp = (await HashratesRepository.$getRawNetworkDailyHashrate(null)).map(hashrate => hashrate.timestamp);
       const lastMidnight = this.getDateMidnight(new Date());
@@ -415,24 +395,15 @@ class Mining {
    * Index difficulty adjustments
    */
   public async $indexDifficultyAdjustments(): Promise<void> {
-    // If a re-index was requested, truncate first
-    if (this.reindexDifficultyAdjustmentRequested === true) {
-      logger.notice(`difficulty_adjustments will now be re-indexed`);
-      await database.query(`TRUNCATE difficulty_adjustments`);
-      this.reindexDifficultyAdjustmentRequested = false;
-    }
-
     const indexedHeightsArray = await DifficultyAdjustmentsRepository.$getAdjustmentsHeights();
     const indexedHeights = {};
     for (const height of indexedHeightsArray) {
       indexedHeights[height] = true;
     }
 
-    // gets {time, height, difficulty, bits} of blocks in ascending order of height
     const blocks: any = await BlocksRepository.$getBlocksDifficulty();
-    const genesisBlock: IEsploraApi.Block = await bitcoinApi.$getBlock(await bitcoinApi.$getBlockHash(0));
+    const genesisBlock: IEsploraApi.Block = await bitcoinCoreApi.$getBlock(await bitcoinClient.getBlockHash(0));
     let currentDifficulty = genesisBlock.difficulty;
-    let currentBits = genesisBlock.bits;
     let totalIndexed = 0;
 
     if (config.MEMPOOL.INDEXING_BLOCKS_AMOUNT === -1 && indexedHeights[0] !== true) {
@@ -444,51 +415,44 @@ class Mining {
       });
     }
 
-    if (!blocks?.length) {
-      // no blocks in database yet
-      return;
+    const oldestConsecutiveBlock = await BlocksRepository.$getOldestConsecutiveBlock();
+    if (config.MEMPOOL.INDEXING_BLOCKS_AMOUNT !== -1) {
+      currentDifficulty = oldestConsecutiveBlock.difficulty;
     }
 
-    const oldestConsecutiveBlock = this.getOldestConsecutiveBlock(blocks);
-
-    currentBits = oldestConsecutiveBlock.bits;
-    currentDifficulty = oldestConsecutiveBlock.difficulty;
-
     let totalBlockChecked = 0;
     let timer = new Date().getTime() / 1000;
 
     for (const block of blocks) {
-      // skip until the first block after the oldest consecutive block
-      if (block.height <= oldestConsecutiveBlock.height) {
-        continue;
-      }
-
-      // difficulty has changed between two consecutive blocks!
-      if (block.bits !== currentBits) {
-        // skip if already indexed
-        if (indexedHeights[block.height] !== true) {
-          let adjustment = block.difficulty / currentDifficulty;
-          adjustment = Math.round(adjustment * 1000000) / 1000000; // Remove float point noise
-
-          await DifficultyAdjustmentsRepository.$saveAdjustments({
-            time: block.time,
-            height: block.height,
-            difficulty: block.difficulty,
-            adjustment: adjustment,
-          });
-
-          totalIndexed++;
+      if (block.difficulty !== currentDifficulty) {
+        if (indexedHeights[block.height] === true) { // Already indexed
+          if (block.height >= oldestConsecutiveBlock.height) {
+            currentDifficulty = block.difficulty;
+          }
+          continue;          
         }
-        // update the current difficulty
-        currentDifficulty = block.difficulty;
-        currentBits = block.bits;
-      }
+
+        let adjustment = block.difficulty / currentDifficulty;
+        adjustment = Math.round(adjustment * 1000000) / 1000000; // Remove float point noise
+
+        await DifficultyAdjustmentsRepository.$saveAdjustments({
+          time: block.time,
+          height: block.height,
+          difficulty: block.difficulty,
+          adjustment: adjustment,
+        });
+
+        totalIndexed++;
+        if (block.height >= oldestConsecutiveBlock.height) {
+          currentDifficulty = block.difficulty;
+        }
+    }
 
       totalBlockChecked++;
       const elapsedSeconds = Math.max(1, Math.round((new Date().getTime() / 1000) - timer));
       if (elapsedSeconds > 5) {
         const progress = Math.round(totalBlockChecked / blocks.length * 100);
-        logger.debug(`Indexing difficulty adjustment at block #${block.height} | Progress: ${progress}%`, logger.tags.mining);
+        logger.info(`Indexing difficulty adjustment at block #${block.height} | Progress: ${progress}%`, logger.tags.mining);
         timer = new Date().getTime() / 1000;
       }
     }
@@ -509,11 +473,11 @@ class Mining {
     }
     this.blocksPriceIndexingRunning = true;
 
-    let totalInserted = 0;
     try {
       const prices: any[] = await PricesRepository.$getPricesTimesAndId();    
       const blocksWithoutPrices: any[] = await BlocksRepository.$getBlocksWithoutPrice();
 
+      let totalInserted = 0;
       const blocksPrices: BlockPrice[] = [];
 
       for (const block of blocksWithoutPrices) {
@@ -558,13 +522,7 @@ class Mining {
       }
     } catch (e) {
       this.blocksPriceIndexingRunning = false;
-      logger.err(`Cannot index block prices. ${e}`);
-    }
-
-    if (totalInserted > 0) {
-      logger.info(`Indexing blocks prices completed. Indexed ${totalInserted}`, logger.tags.mining);
-    } else {
-      logger.debug(`Indexing blocks prices completed. Indexed 0.`, logger.tags.mining);
+      throw e;
     }
 
     this.blocksPriceIndexingRunning = false;
@@ -600,27 +558,11 @@ class Mining {
       currentBlockHeight -= 10000;
     }
 
-    if (totalIndexed > 0) {
-      logger.info(`Indexing missing coinstatsindex data completed. Indexed ${totalIndexed}`, logger.tags.mining);
-    } else {
-      logger.debug(`Indexing missing coinstatsindex data completed. Indexed 0.`, logger.tags.mining);
+    if (totalIndexed) {
+      logger.info(`Indexing missing coinstatsindex data completed`, logger.tags.mining);
     }
   }
 
-  /**
-   * List existing mining pools
-   */
-  public async $listPools(): Promise<{name: string, slug: string, unique_id: number}[] | null> {
-    const [rows] = await database.query(`
-      SELECT
-        name,
-        slug,
-        unique_id
-      FROM pools`
-    );
-    return rows as {name: string, slug: string, unique_id: number}[];
-  }
-
   private getDateMidnight(date: Date): Date {
     date.setUTCHours(0);
     date.setUTCMinutes(0);
@@ -645,17 +587,6 @@ class Mining {
       default: return 86400 * 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 {
-    for (let i = blocks.length - 1; i > 0; i--) {
-      if ((blocks[i].height - blocks[i - 1].height) > 1) {
-        return blocks[i];
-      }
-    }
-    return blocks[0];
-  }
 }
 
 export default new Mining();

backend/src/api/pools-parser.ts

@@ -4,7 +4,6 @@ import config from '../config';
 import PoolsRepository from '../repositories/PoolsRepository';
 import { PoolTag } from '../mempool.interfaces';
 import diskCache from './disk-cache';
-import mining from './mining/mining';
 
 class PoolsParser {
   miningPools: any[] = [];
@@ -42,7 +41,7 @@ class PoolsParser {
   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();
+    diskCache.wipeCache();
 
     await this.$insertUnknownPool();
 
@@ -74,12 +73,14 @@ class PoolsParser {
         if (JSON.stringify(pool.addresses) !== poolDB.addresses ||
           JSON.stringify(pool.regexes) !== poolDB.regexes) {
           // Pool addresses changed or coinbase tags changed
-          logger.notice(`Updating addresses and/or coinbase tags for ${pool.name} mining pool.`);
+          logger.notice(`Updating addresses and/or coinbase tags for ${pool.name} mining pool. If 'AUTOMATIC_BLOCK_REINDEXING' is enabled, we will re-index its blocks and 'unknown' blocks`);
           await PoolsRepository.$updateMiningPoolTags(poolDB.id, pool.addresses, pool.regexes);
           await this.$deleteBlocksForPool(poolDB);
         }
       }
     }
+
+    logger.info('Mining pools-v2.json import completed');
   }
 
   /**
@@ -117,6 +118,10 @@ class PoolsParser {
    * @param pool 
    */
   private async $deleteBlocksForPool(pool: PoolTag): Promise<void> {
+    if (config.MEMPOOL.AUTOMATIC_BLOCK_REINDEXING === false) {
+      return;
+    }
+
     // 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(`
@@ -127,15 +132,7 @@ class PoolsParser {
       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
-    } else if (config.MEMPOOL.NETWORK === 'signet') {
-      firstKnownBlockPool = 0;
-    }
-
-    const oldestBlockHeight = oldestPoolBlock.length ?? 0 > 0 ? oldestPoolBlock[0].height : firstKnownBlockPool;
+    const oldestBlockHeight = oldestPoolBlock.length ?? 0 > 0 ? oldestPoolBlock[0].height : 130635;
     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(`
@@ -149,31 +146,16 @@ class PoolsParser {
       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`);
+    this.uniqueLog(logger.notice, `Deleting blocks with unknown mining pool from height 130635 for re-indexing`);
     await DB.query(`
       DELETE FROM blocks
-      WHERE pool_id = ? AND height >= ${firstKnownBlockPool}`,
+      WHERE pool_id = ? AND height >= 130635`,
       [unknownPool[0].id]
     );
-
-    // Re-index hashrates and difficulty adjustments later
-    mining.reindexHashrateRequested = true;
-    mining.reindexDifficultyAdjustmentRequested = true;
   }
 }
 

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

@@ -1,19 +0,0 @@
-import { Application, Request, Response } from 'express';
-import config from '../../config';
-import pricesUpdater from '../../tasks/price-updater';
-
-class PricesRoutes {
-  public initRoutes(app: Application): void {
-    app.get(config.MEMPOOL.API_URL_PREFIX + 'prices', this.$getCurrentPrices.bind(this));
-  }
-
-  private $getCurrentPrices(req: Request, res: Response): 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());
-
-    res.json(pricesUpdater.getLatestPrices());
-  }
-}
-
-export default new PricesRoutes();

backend/src/api/rbf-cache.ts

@@ -1,538 +1,65 @@
-import config from "../config";
-import logger from "../logger";
-import { MempoolTransactionExtended, TransactionStripped } from "../mempool.interfaces";
-import bitcoinApi from './bitcoin/bitcoin-api-factory';
-import { IEsploraApi } from "./bitcoin/esplora-api.interface";
-import { Common } from "./common";
-import redisCache from "./redis-cache";
-
-export interface RbfTransaction extends TransactionStripped {
-  rbf?: boolean;
-  mined?: boolean;
-  fullRbf?: boolean;
-}
-
-export interface RbfTree {
-  tx: RbfTransaction;
-  time: number;
-  interval?: number;
-  mined?: boolean;
-  fullRbf: boolean;
-  replaces: RbfTree[];
-}
-
-export interface ReplacementInfo {
-  mined: boolean;
-  fullRbf: boolean;
-  txid: string;
-  oldFee: number;
-  oldVsize: number;
-  newFee: number;
-  newVsize: number;
-}
-
-enum CacheOp {
-  Remove = 0,
-  Add = 1,
-  Change = 2,
-}
-
-interface CacheEvent {
-  op: CacheOp;
-  type: 'tx' | 'tree' | 'exp';
-  txid: string,
-  value?: any,
-}
+import { TransactionExtended } from "../mempool.interfaces";
 
 class RbfCache {
-  private replacedBy: Map<string, string> = new Map();
-  private replaces: Map<string, string[]> = new Map();
-  private rbfTrees: Map<string, RbfTree> = new Map(); // sequences of consecutive replacements
-  private dirtyTrees: Set<string> = new Set();
-  private treeMap: Map<string, string> = new Map(); // map of txids to sequence ids
-  private txs: Map<string, MempoolTransactionExtended> = new Map();
-  private expiring: Map<string, number> = new Map();
-  private cacheQueue: CacheEvent[] = [];
-
-  private evictionCount = 0;
-  private staleCount = 0;
+  private replacedBy: { [txid: string]: string; } = {};
+  private replaces: { [txid: string]: string[] } = {};
+  private txs: { [txid: string]: TransactionExtended } = {};
+  private expiring: { [txid: string]: Date } = {};
 
   constructor() {
-    setInterval(this.cleanup.bind(this), 1000 * 60 * 10);
+    setInterval(this.cleanup.bind(this), 1000 * 60 * 60);
   }
 
-  private addTx(txid: string, tx: MempoolTransactionExtended): void {
-    this.txs.set(txid, tx);
-    this.cacheQueue.push({ op: CacheOp.Add, type: 'tx', txid });
-  }
-
-  private addTree(txid: string, tree: RbfTree): void {
-    this.rbfTrees.set(txid, tree);
-    this.dirtyTrees.add(txid);
-    this.cacheQueue.push({ op: CacheOp.Add, type: 'tree', txid });
-  }
-
-  private addExpiration(txid: string, expiry: number): void {
-    this.expiring.set(txid, expiry);
-    this.cacheQueue.push({ op: CacheOp.Add, type: 'exp', txid, value: expiry });
-  }
-
-  private removeTx(txid: string): void {
-    this.txs.delete(txid);
-    this.cacheQueue.push({ op: CacheOp.Remove, type: 'tx', txid });
-  }
-
-  private removeTree(txid: string): void {
-    this.rbfTrees.delete(txid);
-    this.cacheQueue.push({ op: CacheOp.Remove, type: 'tree', txid });
-  }
-
-  private removeExpiration(txid: string): void {
-    this.expiring.delete(txid);
-    this.cacheQueue.push({ op: CacheOp.Remove, type: 'exp', txid });
-  }
-
-  public add(replaced: MempoolTransactionExtended[], newTxExtended: MempoolTransactionExtended): void {
-    if (!newTxExtended || !replaced?.length || this.txs.has(newTxExtended.txid)) {
-      return;
+  public add(replacedTx: TransactionExtended, newTxId: string): void {
+    this.replacedBy[replacedTx.txid] = newTxId;
+    this.txs[replacedTx.txid] = replacedTx;
+    if (!this.replaces[newTxId]) {
+      this.replaces[newTxId] = [];
     }
-
-    const newTx = Common.stripTransaction(newTxExtended) as RbfTransaction;
-    const newTime = newTxExtended.firstSeen || (Date.now() / 1000);
-    newTx.rbf = newTxExtended.vin.some((v) => v.sequence < 0xfffffffe);
-    this.addTx(newTx.txid, newTxExtended);
-
-    // maintain rbf trees
-    let txFullRbf = false;
-    let treeFullRbf = false;
-    const replacedTrees: RbfTree[] = [];
-    for (const replacedTxExtended of replaced) {
-      const replacedTx = Common.stripTransaction(replacedTxExtended) as RbfTransaction;
-      replacedTx.rbf = replacedTxExtended.vin.some((v) => v.sequence < 0xfffffffe);
-      if (!replacedTx.rbf) {
-        txFullRbf = true;
-      }
-      this.replacedBy.set(replacedTx.txid, newTx.txid);
-      if (this.treeMap.has(replacedTx.txid)) {
-        const treeId = this.treeMap.get(replacedTx.txid);
-        if (treeId) {
-          const tree = this.rbfTrees.get(treeId);
-          this.removeTree(treeId);
-          if (tree) {
-            tree.interval = newTime - tree?.time;
-            replacedTrees.push(tree);
-            treeFullRbf = treeFullRbf || tree.fullRbf || !tree.tx.rbf;
-          }
-        }
-      } else {
-        const replacedTime = replacedTxExtended.firstSeen || (Date.now() / 1000);
-        replacedTrees.push({
-          tx: replacedTx,
-          time: replacedTime,
-          interval: newTime - replacedTime,
-          fullRbf: !replacedTx.rbf,
-          replaces: [],
-        });
-        treeFullRbf = treeFullRbf || !replacedTx.rbf;
-        this.addTx(replacedTx.txid, replacedTxExtended);
-      }
-    }
-    newTx.fullRbf = txFullRbf;
-    const treeId = replacedTrees[0].tx.txid;
-    const newTree = {
-      tx: newTx,
-      time: newTime,
-      fullRbf: treeFullRbf,
-      replaces: replacedTrees
-    };
-    this.addTree(treeId, newTree);
-    this.updateTreeMap(treeId, newTree);
-    this.replaces.set(newTx.txid, replacedTrees.map(tree => tree.tx.txid));
-  }
-
-  public has(txId: string): boolean {
-    return this.txs.has(txId);
-  }
-
-  public anyInSameTree(txId: string, predicate: (tx: RbfTransaction) => boolean): boolean {
-    const tree = this.getRbfTree(txId);
-    if (!tree) {
-      return false;
-    }
-    const txs = this.getTransactionsInTree(tree);
-    for (const tx of txs) {
-      if (predicate(tx)) {
-        return true;
-      }
-    }
-    return false;
+    this.replaces[newTxId].push(replacedTx.txid);
   }
 
   public getReplacedBy(txId: string): string | undefined {
-    return this.replacedBy.get(txId);
+    return this.replacedBy[txId];
   }
 
   public getReplaces(txId: string): string[] | undefined {
-    return this.replaces.get(txId);
+    return this.replaces[txId];
   }
 
-  public getTx(txId: string): MempoolTransactionExtended | undefined {
-    return this.txs.get(txId);
-  }
-
-  public getRbfTree(txId: string): RbfTree | void {
-    return this.rbfTrees.get(this.treeMap.get(txId) || '');
-  }
-
-  // get a paginated list of RbfTrees
-  // ordered by most recent replacement time
-  public getRbfTrees(onlyFullRbf: boolean, after?: string): RbfTree[] {
-    const limit = 25;
-    const trees: RbfTree[] = [];
-    const used = new Set<string>();
-    const replacements: string[][] = Array.from(this.replacedBy).reverse();
-    const afterTree = after ? this.treeMap.get(after) : null;
-    let ready = !afterTree;
-    for (let i = 0; i < replacements.length && trees.length <= limit - 1; i++) {
-      const txid = replacements[i][1];
-      const treeId = this.treeMap.get(txid) || '';
-      if (treeId === afterTree) {
-        ready = true;
-      } else if (ready) {
-        if (!used.has(treeId)) {
-          const tree = this.rbfTrees.get(treeId);
-          used.add(treeId);
-          if (tree && (!onlyFullRbf || tree.fullRbf)) {
-            trees.push(tree);
-          }
-        }
-      }
-    }
-    return trees;
-  }
-
-  // get map of rbf trees that have been updated since the last call
-  public getRbfChanges(): { trees: {[id: string]: RbfTree }, map: { [txid: string]: string }} {
-    const changes: { trees: {[id: string]: RbfTree }, map: { [txid: string]: string }} = {
-      trees: {},
-      map: {},
-    };
-    this.dirtyTrees.forEach(id => {
-      const tree = this.rbfTrees.get(id);
-      if (tree) {
-        changes.trees[id] = tree;
-        this.getTransactionsInTree(tree).forEach(tx => {
-          changes.map[tx.txid] = id;
-        });
-      }
-    });
-    this.dirtyTrees = new Set();
-    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);
+  public getTx(txId: string): TransactionExtended | undefined {
+    return this.txs[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);
-    if (!treeId) {
-      return false;
-    }
-    const tree = this.rbfTrees.get(treeId);
-    if (!tree) {
-      return false;
-    }
-    return tree?.fullRbf;
+  public evict(txid): void {
+    this.expiring[txid] = new Date(Date.now() + 1000 * 86400); // 24 hours
   }
 
   private cleanup(): void {
-    const now = Date.now();
-    for (const txid of this.expiring.keys()) {
-      if ((this.expiring.get(txid) || 0) < now) {
-        this.removeExpiration(txid);
+    const currentDate = new Date();
+    for (const txid in this.expiring) {
+      if (this.expiring[txid] < currentDate) {
+        delete this.expiring[txid];
         this.remove(txid);
       }
     }
-    logger.debug(`rbf cache contains ${this.txs.size} txs, ${this.rbfTrees.size} trees, ${this.expiring.size} due to expire (${this.evictionCount} newly expired)`);
-    this.evictionCount = 0;
   }
 
   // remove a transaction & all previous versions from the cache
   private remove(txid): void {
-    // don't remove a transaction if a newer version remains in the mempool
-    if (!this.replacedBy.has(txid)) {
-      const root = this.treeMap.get(txid);
-      const replaces = this.replaces.get(txid);
-      this.replaces.delete(txid);
-      this.treeMap.delete(txid);
-      this.removeTx(txid);
-      this.removeExpiration(txid);
-      if (root === txid) {
-        this.removeTree(txid);
-      }
-      for (const tx of (replaces || [])) {
+    // don't remove a transaction while a newer version remains in the mempool
+    if (this.replaces[txid] && !this.replacedBy[txid]) {
+      const replaces = this.replaces[txid];
+      delete this.replaces[txid];
+      for (const tx of replaces) {
         // recursively remove prior versions from the cache
-        this.replacedBy.delete(tx);
-        // if this is the id of a tree, remove that too
-        if (this.treeMap.get(tx) === tx) {
-          this.removeTree(tx);
-        }
+        delete this.replacedBy[tx];
+        delete this.txs[tx];
         this.remove(tx);
       }
     }
   }
-
-  private updateTreeMap(newId: string, tree: RbfTree): void {
-    this.treeMap.set(tree.tx.txid, newId);
-    tree.replaces.forEach(subtree => {
-      this.updateTreeMap(newId, subtree);
-    });
-  }
-
-  private getTransactionsInTree(tree: RbfTree, txs: RbfTransaction[] = []): RbfTransaction[] {
-    txs.push(tree.tx);
-    tree.replaces.forEach(subtree => {
-      this.getTransactionsInTree(subtree, txs);
-    });
-    return txs;
-  }
-
-  private setTreeMined(tree: RbfTree, txid: string): void {
-    if (tree.tx.txid === txid) {
-      tree.tx.mined = true;
-    } else {
-      tree.replaces.forEach(subtree => {
-        this.setTreeMined(subtree, txid);
-      });
-    }
-  }
-
-  public async updateCache(): Promise<void> {
-    if (!config.REDIS.ENABLED) {
-      return;
-    }
-    // Update the Redis cache by replaying queued events
-    for (const e of this.cacheQueue) {
-      if (e.op === CacheOp.Add || e.op === CacheOp.Change) {
-        let value = e.value;
-          switch(e.type) {
-            case 'tx': {
-              value = this.txs.get(e.txid);
-            } break;
-            case 'tree': {
-              const tree = this.rbfTrees.get(e.txid);
-              value = tree ? this.exportTree(tree) : null;
-            } break;
-          }
-          if (value != null) {
-            await redisCache.$setRbfEntry(e.type, e.txid, value);
-          }
-      } else if (e.op === CacheOp.Remove) {
-        await redisCache.$removeRbfEntry(e.type, e.txid);
-      }
-    }
-    this.cacheQueue = [];
-  }
-
-  public dump(): any {
-    const trees = Array.from(this.rbfTrees.values()).map((tree: RbfTree) => { return this.exportTree(tree); });
-
-    return {
-      txs: Array.from(this.txs.entries()),
-      trees,
-      expiring: Array.from(this.expiring.entries()),
-    };
-  }
-
-  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) {
-        await this.importTree(deflatedTree.root, deflatedTree.root, deflatedTree, this.txs);
-      }
-      expiring.forEach(expiringEntry => {
-        if (this.txs.has(expiringEntry.key)) {
-          this.expiring.set(expiringEntry.key, new Date(expiringEntry.value).getTime());
-        }
-      });
-      this.staleCount = 0;
-      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();
-
-    } catch (e) {
-      logger.err('failed to restore RBF cache: ' + (e instanceof Error ? e.message : e));
-    }
-  }
-
-  exportTree(tree: RbfTree, deflated: any = null) {
-    if (!deflated) {
-      deflated = {
-        root: tree.tx.txid,
-      };
-    }
-    deflated[tree.tx.txid] = {
-      tx: tree.tx.txid,
-      txMined: tree.tx.mined,
-      time: tree.time,
-      interval: tree.interval,
-      mined: tree.mined,
-      fullRbf: tree.fullRbf,
-      replaces: tree.replaces.map(child => child.tx.txid),
-    };
-    tree.replaces.forEach(child => {
-      this.exportTree(child, deflated);
-    });
-    return deflated;
-  }
-
-  async importTree(root, txid, deflated, txs: Map<string, MempoolTransactionExtended>, mined: boolean = false): Promise<RbfTree | void> {
-    const treeInfo = deflated[txid];
-    const replaces: RbfTree[] = [];
-
-    // if the root tx is unknown, remove this tree and return early
-    if (root === txid && !txs.has(txid)) {
-      this.staleCount++;
-      this.removeTree(deflated.key);
-      return;
-    }
-
-    // recursively reconstruct child trees
-    for (const childId of treeInfo.replaces) {
-      const replaced = await this.importTree(root, childId, deflated, txs, mined);
-      if (replaced) {
-        this.replacedBy.set(replaced.tx.txid, txid);
-        replaces.push(replaced);
-        if (replaced.mined) {
-          mined = true;
-        }
-      }
-    }
-    this.replaces.set(txid, replaces.map(t => t.tx.txid));
-
-    const tx = txs.get(txid);
-    if (!tx) {
-      return;
-    }
-    const strippedTx = Common.stripTransaction(tx) as RbfTransaction;
-    strippedTx.rbf = tx.vin.some((v) => v.sequence < 0xfffffffe);
-    strippedTx.mined = treeInfo.txMined;
-    const tree = {
-      tx: strippedTx,
-      time: treeInfo.time,
-      interval: treeInfo.interval,
-      mined: mined,
-      fullRbf: treeInfo.fullRbf,
-      replaces,
-    };
-    this.treeMap.set(txid, root);
-    if (root === txid) {
-      this.addTree(root, tree);
-    }
-    return tree;
-  }
-
-  private async checkTrees(): Promise<void> {
-    const found: { [txid: string]: boolean } = {};
-    const txids = Array.from(this.txs.values()).map(tx => tx.txid).filter(txid => {
-      return !this.expiring.has(txid) && !this.getRbfTree(txid)?.mined;
-    });
-
-    const processTxs = (txs: IEsploraApi.Transaction[]): void => {
-      for (const tx of txs) {
-        found[tx.txid] = true;
-        if (tx.status?.confirmed) {
-          const tree = this.getRbfTree(tx.txid);
-          if (tree) {
-            this.setTreeMined(tree, tx.txid);
-            tree.mined = true;
-            this.evict(tx.txid, false);
-          }
-        }
-      }
-    };
-
-    if (config.MEMPOOL.BACKEND === 'esplora') {
-      let processedCount = 0;
-      const sliceLength = Math.ceil(config.ESPLORA.BATCH_QUERY_BASE_SIZE / 40);
-      for (let i = 0; i < Math.ceil(txids.length / sliceLength); i++) {
-        const slice = txids.slice(i * sliceLength, (i + 1) * sliceLength);
-        processedCount += slice.length;
-        try {
-          const txs = await bitcoinApi.$getRawTransactions(slice);
-          processTxs(txs);
-          logger.debug(`fetched and processed ${processedCount} of ${txids.length} cached rbf transactions (${(processedCount / txids.length * 100).toFixed(2)}%)`);
-        } catch (err) {
-          logger.err(`failed to fetch or process ${slice.length} cached rbf transactions`);
-        }
-      }
-    } else {
-      const txs: IEsploraApi.Transaction[] = [];
-      for (const txid of txids) {
-        try {
-          const tx = await bitcoinApi.$getRawTransaction(txid, true, false);
-          txs.push(tx);
-        } catch (err) {
-          // some 404s are expected, so continue quietly
-        }
-      }
-      processTxs(txs);
-    }
-
-    for (const txid of txids) {
-      if (!found[txid]) {
-        this.evict(txid, false);
-      }
-    }
-  }
-
-  public getLatestRbfSummary(): ReplacementInfo[] {
-    const rbfList = this.getRbfTrees(false);
-    return rbfList.slice(0, 6).map(rbfTree => {
-      let oldFee = 0;
-      let oldVsize = 0;
-      for (const replaced of rbfTree.replaces) {
-        oldFee += replaced.tx.fee;
-        oldVsize += replaced.tx.vsize;
-      }
-      return {
-        txid: rbfTree.tx.txid,
-        mined: !!rbfTree.tx.mined,
-        fullRbf: !!rbfTree.tx.fullRbf,
-        oldFee,
-        oldVsize,
-        newFee: rbfTree.tx.fee,
-        newVsize: rbfTree.tx.vsize,
-      };
-    });
-  }
 }
 
 export default new RbfCache();

backend/src/api/redis-cache.ts

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

backend/src/api/services/acceleration.ts

@@ -1,36 +0,0 @@
-import config from '../../config';
-import logger from '../../logger';
-import { BlockExtended, PoolTag } from '../../mempool.interfaces';
-import axios from 'axios';
-
-export interface Acceleration {
-  txid: string,
-  feeDelta: number,
-  pools: number[],
-}
-
-class AccelerationApi {
-  public async $fetchAccelerations(): Promise<Acceleration[] | null> {
-    if (config.MEMPOOL_SERVICES.ACCELERATIONS) {
-      try {
-        const response = await axios.get(`${config.MEMPOOL_SERVICES.API}/accelerator/accelerations`, { responseType: 'json', timeout: 10000 });
-        return response.data as Acceleration[];
-      } catch (e) {
-        logger.warn('Failed to fetch current accelerations from the mempool services backend: ' + (e instanceof Error ? e.message : e));
-        return null;
-      }
-    } else {
-      return [];
-    }
-  }
-
-  public isAcceleratedBlock(block: BlockExtended, accelerations: Acceleration[]): boolean {
-    let anyAccelerated = false;
-    for (let i = 0; i < accelerations.length && !anyAccelerated; i++) {
-      anyAccelerated = anyAccelerated || accelerations[i].pools?.includes(block.extras.pool.id);
-    }
-    return anyAccelerated;
-  }
-}
-
-export default new AccelerationApi();

backend/src/api/statistics/statistics-api.ts

@@ -15,7 +15,6 @@ class StatisticsApi {
               mempool_byte_weight,
               fee_data,
               total_fee,
-              min_fee,
               vsize_1,
               vsize_2,
               vsize_3,
@@ -55,7 +54,7 @@ class StatisticsApi {
               vsize_1800,
               vsize_2000
             )
-            VALUES (NOW(), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            VALUES (NOW(), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)`;
       const [result]: any = await DB.query(query);
       return result.insertId;
@@ -74,7 +73,6 @@ class StatisticsApi {
               mempool_byte_weight,
               fee_data,
               total_fee,
-              min_fee,
               vsize_1,
               vsize_2,
               vsize_3,
@@ -114,7 +112,7 @@ class StatisticsApi {
               vsize_1800,
               vsize_2000
             )
-            VALUES (${statistics.added}, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
+            VALUES (${statistics.added}, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
                ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`;
 
       const params: (string | number)[] = [
@@ -124,7 +122,6 @@ class StatisticsApi {
         statistics.mempool_byte_weight,
         statistics.fee_data,
         statistics.total_fee,
-        statistics.min_fee,
         statistics.vsize_1,
         statistics.vsize_2,
         statistics.vsize_3,
@@ -174,9 +171,7 @@ class StatisticsApi {
   private getQueryForDaysAvg(div: number, interval: string) {
     return `SELECT
       UNIX_TIMESTAMP(added) as added,
-      CAST(avg(unconfirmed_transactions) as DOUBLE) as unconfirmed_transactions,
       CAST(avg(vbytes_per_second) as DOUBLE) as vbytes_per_second,
-      CAST(avg(min_fee) as DOUBLE) as min_fee,
       CAST(avg(vsize_1) as DOUBLE) as vsize_1,
       CAST(avg(vsize_2) as DOUBLE) as vsize_2,
       CAST(avg(vsize_3) as DOUBLE) as vsize_3,
@@ -216,7 +211,7 @@ class StatisticsApi {
       CAST(avg(vsize_1800) as DOUBLE) as vsize_1800,
       CAST(avg(vsize_2000) as DOUBLE) as vsize_2000 \
       FROM statistics \
-      ${interval === 'all' ? '' : `WHERE added BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()`} \
+      WHERE added BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW() \
       GROUP BY UNIX_TIMESTAMP(added) DIV ${div} \
       ORDER BY statistics.added DESC;`;
   }
@@ -224,9 +219,7 @@ class StatisticsApi {
   private getQueryForDays(div: number, interval: string) {
     return `SELECT
       UNIX_TIMESTAMP(added) as added,
-      CAST(avg(unconfirmed_transactions) as DOUBLE) as unconfirmed_transactions,
       CAST(avg(vbytes_per_second) as DOUBLE) as vbytes_per_second,
-      CAST(avg(min_fee) as DOUBLE) as min_fee,
       vsize_1,
       vsize_2,
       vsize_3,
@@ -266,7 +259,7 @@ class StatisticsApi {
       vsize_1800,
       vsize_2000 \
       FROM statistics \
-      ${interval === 'all' ? '' : `WHERE added BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()`} \
+      WHERE added BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW() \
       GROUP BY UNIX_TIMESTAMP(added) DIV ${div} \
       ORDER BY statistics.added DESC;`;
   }
@@ -393,26 +386,13 @@ class StatisticsApi {
     }
   }
 
-  public async $listAll(): Promise<OptimizedStatistic[]> {
-    try {
-      const query = this.getQueryForDays(43200, 'all'); // 12h interval
-      const [rows] = await DB.query({ sql: query, timeout: this.queryTimeout });
-      return this.mapStatisticToOptimizedStatistic(rows as Statistic[]);
-    } catch (e) {
-      logger.err('$listAll() error' + (e instanceof Error ? e.message : e));
-      return [];
-    }
-  }
-
   private mapStatisticToOptimizedStatistic(statistic: Statistic[]): OptimizedStatistic[] {
     return statistic.map((s) => {
       return {
         added: s.added,
-        count: s.unconfirmed_transactions,
         vbytes_per_second: s.vbytes_per_second,
         mempool_byte_weight: s.mempool_byte_weight,
         total_fee: s.total_fee,
-        min_fee: s.min_fee,
         vsizes: [
           s.vsize_1,
           s.vsize_2,

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

@@ -15,11 +15,10 @@ class StatisticsRoutes {
       .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/2y', this.$getStatisticsByTime.bind(this, '2y'))
       .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/3y', this.$getStatisticsByTime.bind(this, '3y'))
       .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/4y', this.$getStatisticsByTime.bind(this, '4y'))
-      .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/all', this.$getStatisticsByTime.bind(this, 'all'))
     ;
   }
 
-  private async $getStatisticsByTime(time: '2h' | '24h' | '1w' | '1m' | '3m' | '6m' | '1y' | '2y' | '3y' | '4y' | 'all', req: Request, res: Response) {
+  private async $getStatisticsByTime(time: '2h' | '24h' | '1w' | '1m' | '3m' | '6m' | '1y' | '2y' | '3y' | '4y', req: Request, res: Response) {
     res.header('Pragma', 'public');
     res.header('Cache-control', 'public');
     res.setHeader('Expires', new Date(Date.now() + 1000 * 300).toUTCString());
@@ -27,6 +26,10 @@ class StatisticsRoutes {
     try {
       let result;
       switch (time as string) {
+        case '2h':
+          result = await statisticsApi.$list2H();
+          res.setHeader('Expires', new Date(Date.now() + 1000 * 30).toUTCString());
+          break;
         case '24h':
           result = await statisticsApi.$list24H();
           res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
@@ -55,13 +58,8 @@ class StatisticsRoutes {
         case '4y':
           result = await statisticsApi.$list4Y();
           break;
-        case 'all':
-          result = await statisticsApi.$listAll();
-          break;
         default:
           result = await statisticsApi.$list2H();
-          res.setHeader('Expires', new Date(Date.now() + 1000 * 30).toUTCString());
-          break;
       }
       res.json(result);
     } catch (e) {

backend/src/api/statistics/statistics.ts

@@ -89,9 +89,6 @@ class Statistics {
       }
     });
 
-    // get minFee and convert to sats/vb
-    const minFee = memPool.getMempoolInfo().mempoolminfee * 100000;
-
     try {
       const insertId = await statisticsApi.$create({
         added: 'NOW()',
@@ -101,7 +98,6 @@ class Statistics {
         mempool_byte_weight: totalWeight,
         total_fee: totalFee,
         fee_data: '',
-        min_fee: minFee,
         vsize_1: weightVsizeFees['1'] || 0,
         vsize_2: weightVsizeFees['2'] || 0,
         vsize_3: weightVsizeFees['3'] || 0,

backend/src/api/transaction-utils.ts

@@ -1,11 +1,7 @@
-import { TransactionExtended, MempoolTransactionExtended, TransactionMinerInfo } from '../mempool.interfaces';
+import { TransactionExtended, TransactionMinerInfo } from '../mempool.interfaces';
 import { IEsploraApi } from './bitcoin/esplora-api.interface';
 import { Common } from './common';
 import bitcoinApi, { bitcoinCoreApi } from './bitcoin/bitcoin-api-factory';
-import * as bitcoinjs from 'bitcoinjs-lib';
-import logger from '../logger';
-import config from '../config';
-import pLimit from '../utils/p-limit';
 
 class TransactionUtils {
   constructor() { }
@@ -25,113 +21,37 @@ class TransactionUtils {
     };
   }
 
-  // Wrapper for $getTransactionExtended with an automatic retry direct to Core if the first API request fails.
-  // Propagates any error from the retry request.
-  public async $getTransactionExtendedRetry(txid: string, addPrevouts = false, lazyPrevouts = false, forceCore = false, addMempoolData = false): Promise<TransactionExtended> {
-    try {
-      const result = await this.$getTransactionExtended(txid, addPrevouts, lazyPrevouts, forceCore, addMempoolData);
-      if (result) {
-        return result;
-      } else {
-        logger.err(`Cannot fetch tx ${txid}. Reason: backend returned null data`);
-      }
-    } catch (e) {
-      logger.err(`Cannot fetch tx ${txid}. Reason: ` + (e instanceof Error ? e.message : e));
-    }
-    // retry direct from Core if first request failed
-    return this.$getTransactionExtended(txid, addPrevouts, lazyPrevouts, true, addMempoolData);
-  }
-
   /**
-   * @param txId
-   * @param addPrevouts
-   * @param lazyPrevouts
+   * @param txId 
+   * @param addPrevouts 
+   * @param lazyPrevouts 
    * @param forceCore - See https://github.com/mempool/mempool/issues/2904
    */
-  public async $getTransactionExtended(txId: string, addPrevouts = false, lazyPrevouts = false, forceCore = false, addMempoolData = false): Promise<TransactionExtended> {
+  public async $getTransactionExtended(txId: string, addPrevouts = false, lazyPrevouts = false, forceCore = false): Promise<TransactionExtended> {
     let transaction: IEsploraApi.Transaction;
     if (forceCore === true) {
-      transaction  = await bitcoinCoreApi.$getRawTransaction(txId, false, addPrevouts, lazyPrevouts);
+      transaction  = await bitcoinCoreApi.$getRawTransaction(txId, true);
     } else {
       transaction  = await bitcoinApi.$getRawTransaction(txId, false, addPrevouts, lazyPrevouts);
     }
-
-    if (Common.isLiquid()) {
-      if (!isFinite(Number(transaction.fee))) {
-        transaction.fee = Object.values(transaction.fee || {}).reduce((total, output) => total + output, 0);
-      }
-    }
-
-    if (addMempoolData || !transaction?.status?.confirmed) {
-      return this.extendMempoolTransaction(transaction);
-    } else {
-      return this.extendTransaction(transaction);
-    }
+    return this.extendTransaction(transaction);
   }
 
-  public async $getMempoolTransactionExtended(txId: string, addPrevouts = false, lazyPrevouts = false, forceCore = false): Promise<MempoolTransactionExtended> {
-    return (await this.$getTransactionExtended(txId, addPrevouts, lazyPrevouts, forceCore, true)) as MempoolTransactionExtended;
-  }
-
-  public async $getMempoolTransactionsExtended(txids: string[], addPrevouts = false, lazyPrevouts = false, forceCore = false): Promise<MempoolTransactionExtended[]> {
-    if (forceCore || config.MEMPOOL.BACKEND !== 'esplora') {
-      const limiter = pLimit(8); // Run 8 requests at a time
-      const results = await Promise.allSettled(txids.map(
-        txid => limiter(() => this.$getMempoolTransactionExtended(txid, addPrevouts, lazyPrevouts, forceCore))
-      ));
-      return results.filter(reply => reply.status === 'fulfilled')
-        .map(r => (r as PromiseFulfilledResult<MempoolTransactionExtended>).value);
-    } else {
-      const transactions = await bitcoinApi.$getMempoolTransactions(txids);
-      return transactions.map(transaction => {
-        if (Common.isLiquid()) {
-          if (!isFinite(Number(transaction.fee))) {
-            transaction.fee = Object.values(transaction.fee || {}).reduce((total, output) => total + output, 0);
-          }
-        }
-
-        return this.extendMempoolTransaction(transaction);
-      });
-    }
-  }
-
-  public extendTransaction(transaction: IEsploraApi.Transaction): TransactionExtended {
+  private extendTransaction(transaction: IEsploraApi.Transaction): TransactionExtended {
     // @ts-ignore
     if (transaction.vsize) {
       // @ts-ignore
       return transaction;
     }
-    const feePerVbytes = (transaction.fee || 0) / (transaction.weight / 4);
+    const feePerVbytes = Math.max(Common.isLiquid() ? 0.1 : 1,
+      (transaction.fee || 0) / (transaction.weight / 4));
     const transactionExtended: TransactionExtended = Object.assign({
       vsize: Math.round(transaction.weight / 4),
       feePerVsize: feePerVbytes,
       effectiveFeePerVsize: feePerVbytes,
     }, transaction);
-    if (!transaction?.status?.confirmed && !transactionExtended.firstSeen) {
-      transactionExtended.firstSeen = Math.round((Date.now() / 1000));
-    }
-    return transactionExtended;
-  }
-
-  public extendMempoolTransaction(transaction: IEsploraApi.Transaction): MempoolTransactionExtended {
-    const vsize = Math.ceil(transaction.weight / 4);
-    const fractionalVsize = (transaction.weight / 4);
-    let sigops = Common.isLiquid() ? 0 : (transaction.sigops != null ? transaction.sigops : this.countSigops(transaction));
-    // https://github.com/bitcoin/bitcoin/blob/e9262ea32a6e1d364fb7974844fadc36f931f8c6/src/policy/policy.cpp#L295-L298
-    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 transactionExtended: MempoolTransactionExtended = Object.assign(transaction, {
-      order: this.txidToOrdering(transaction.txid),
-      vsize: Math.round(transaction.weight / 4),
-      adjustedVsize,
-      sigops,
-      feePerVsize: feePerVbytes,
-      adjustedFeePerVsize: adjustedFeePerVsize,
-      effectiveFeePerVsize: adjustedFeePerVsize,
-    });
-    if (!transactionExtended?.status?.confirmed && !transactionExtended.firstSeen) {
-      transactionExtended.firstSeen = Math.round((Date.now() / 1000));
+    if (!transaction.status.confirmed) {
+      transactionExtended.firstSeen = Math.round((new Date().getTime() / 1000));
     }
     return transactionExtended;
   }
@@ -143,197 +63,6 @@ class TransactionUtils {
     }
     return str;
   }
-
-  public countScriptSigops(script: string, isRawScript: boolean = false, witness: boolean = false): number {
-    let sigops = 0;
-    // count OP_CHECKSIG and OP_CHECKSIGVERIFY
-    sigops += (script.match(/OP_CHECKSIG/g)?.length || 0);
-
-    // count OP_CHECKMULTISIG and OP_CHECKMULTISIGVERIFY
-    if (isRawScript) {
-      // in scriptPubKey or scriptSig, always worth 20
-      sigops += 20 * (script.match(/OP_CHECKMULTISIG/g)?.length || 0);
-    } else {
-      // in redeem scripts and witnesses, worth N if preceded by OP_N, 20 otherwise
-      const matches = script.matchAll(/(?:OP_(?:PUSHNUM_)?(\d+))? OP_CHECKMULTISIG/g);
-      for (const match of matches) {
-        const n = parseInt(match[1]);
-        if (Number.isInteger(n)) {
-          sigops += n;
-        } else {
-          sigops += 20;
-        }
-      }
-    }
-
-    return witness ? sigops : (sigops * 4);
-  }
-
-  public countSigops(transaction: IEsploraApi.Transaction): number {
-    let sigops = 0;
-
-    for (const input of transaction.vin) {
-      if (input.scriptsig_asm) {
-        sigops += this.countScriptSigops(input.scriptsig_asm, true);
-      }
-      if (input.prevout) {
-        switch (true) {
-          case input.prevout.scriptpubkey_type === 'p2sh' && input.witness?.length === 2 && input.scriptsig && input.scriptsig.startsWith('160014'):
-          case input.prevout.scriptpubkey_type === 'v0_p2wpkh':
-            sigops += 1;
-            break;
-
-          case input.prevout?.scriptpubkey_type === 'p2sh' && input.witness?.length && input.scriptsig && input.scriptsig.startsWith('220020'):
-          case input.prevout.scriptpubkey_type === 'v0_p2wsh':
-            if (input.witness?.length) {
-              sigops += this.countScriptSigops(bitcoinjs.script.toASM(Buffer.from(input.witness[input.witness.length - 1], 'hex')), false, true);
-            }
-            break;
-
-          case input.prevout.scriptpubkey_type === 'p2sh':
-            if (input.inner_redeemscript_asm) {
-              sigops += this.countScriptSigops(input.inner_redeemscript_asm);
-            }
-            break;
-        }
-      }
-    }
-
-    for (const output of transaction.vout) {
-      if (output.scriptpubkey_asm) {
-        sigops += this.countScriptSigops(output.scriptpubkey_asm, true);
-      }
-    }
-
-    return sigops;
-  }
-
-  // returns the most significant 4 bytes of the txid as an integer
-  public txidToOrdering(txid: string): number {
-    return parseInt(
-      txid.substr(62, 2) +
-        txid.substr(60, 2) +
-        txid.substr(58, 2) +
-        txid.substr(56, 2),
-      16
-    );
-  }
-
-  public addInnerScriptsToVin(vin: IEsploraApi.Vin): void {
-    if (!vin.prevout) {
-      return;
-    }
-
-    if (vin.prevout.scriptpubkey_type === 'p2sh') {
-      const redeemScript = vin.scriptsig_asm.split(' ').reverse()[0];
-      vin.inner_redeemscript_asm = this.convertScriptSigAsm(redeemScript);
-      if (vin.witness && vin.witness.length > 2) {
-        const witnessScript = vin.witness[vin.witness.length - 1];
-        vin.inner_witnessscript_asm = this.convertScriptSigAsm(witnessScript);
-      }
-    }
-
-    if (vin.prevout.scriptpubkey_type === 'v0_p2wsh' && vin.witness) {
-      const witnessScript = vin.witness[vin.witness.length - 1];
-      vin.inner_witnessscript_asm = this.convertScriptSigAsm(witnessScript);
-    }
-
-    if (vin.prevout.scriptpubkey_type === 'v1_p2tr' && vin.witness) {
-      const witnessScript = this.witnessToP2TRScript(vin.witness);
-      if (witnessScript !== null) {
-        vin.inner_witnessscript_asm = this.convertScriptSigAsm(witnessScript);
-      }
-    }
-  }
-
-  public convertScriptSigAsm(hex: string): string {
-    const buf = Buffer.from(hex, 'hex');
-
-    const b: string[] = [];
-
-    let i = 0;
-    while (i < buf.length) {
-      const op = buf[i];
-      if (op >= 0x01 && op <= 0x4e) {
-        i++;
-        let push: number;
-        if (op === 0x4c) {
-          push = buf.readUInt8(i);
-          b.push('OP_PUSHDATA1');
-          i += 1;
-        } else if (op === 0x4d) {
-          push = buf.readUInt16LE(i);
-          b.push('OP_PUSHDATA2');
-          i += 2;
-        } else if (op === 0x4e) {
-          push = buf.readUInt32LE(i);
-          b.push('OP_PUSHDATA4');
-          i += 4;
-        } else {
-          push = op;
-          b.push('OP_PUSHBYTES_' + push);
-        }
-
-        const data = buf.slice(i, i + push);
-        if (data.length !== push) {
-          break;
-        }
-
-        b.push(data.toString('hex'));
-        i += data.length;
-      } else {
-        if (op === 0x00) {
-          b.push('OP_0');
-        } else if (op === 0x4f) {
-          b.push('OP_PUSHNUM_NEG1');
-        } else if (op === 0xb1) {
-          b.push('OP_CLTV');
-        } else if (op === 0xb2) {
-          b.push('OP_CSV');
-        } else if (op === 0xba) {
-          b.push('OP_CHECKSIGADD');
-        } else {
-          const opcode = bitcoinjs.script.toASM([ op ]);
-          if (opcode && op < 0xfd) {
-            if (/^OP_(\d+)$/.test(opcode)) {
-              b.push(opcode.replace(/^OP_(\d+)$/, 'OP_PUSHNUM_$1'));
-            } else {
-              b.push(opcode);
-            }
-          } else {
-            b.push('OP_RETURN_' + op);
-          }
-        }
-        i += 1;
-      }
-    }
-
-    return b.join(' ');
-  }
-
-  /**
-   * This function must only be called when we know the witness we are parsing
-   * is a taproot witness.
-   * @param witness An array of hex strings that represents the witness stack of
-   *                the input.
-   * @returns null if the witness is not a script spend, and the hex string of
-   *          the script item if it is a script spend.
-   */
-  public witnessToP2TRScript(witness: string[]): string | null {
-    if (witness.length < 2) return null;
-    // Note: see BIP341 for parsing details of witness stack
-
-    // If there are at least two witness elements, and the first byte of the
-    // last element is 0x50, this last element is called annex a and
-    // is removed from the witness stack.
-    const hasAnnex = witness[witness.length - 1].substring(0, 2) === '50';
-    // If there are at least two witness elements left, script path spending is used.
-    // Call the second-to-last stack element s, the script.
-    // (Note: this phrasing from BIP341 assumes we've *removed* the annex from the stack)
-    if (hasAnnex && witness.length < 3) return null;
-    const positionOfScript = hasAnnex ? witness.length - 3 : witness.length - 2;
-    return witness[positionOfScript];
-  }
 }
 
 export default new TransactionUtils();

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

@@ -1,10 +1,11 @@
 import config from '../config';
 import logger from '../logger';
-import { CompactThreadTransaction, AuditTransaction } from '../mempool.interfaces';
+import { ThreadTransaction, MempoolBlockWithTransactions, AuditTransaction } from '../mempool.interfaces';
 import { PairingHeap } from '../utils/pairing-heap';
+import { Common } from './common';
 import { parentPort } from 'worker_threads';
 
-let mempool: Map<number, CompactThreadTransaction> = new Map();
+let mempool: { [txid: string]: ThreadTransaction } = {};
 
 if (parentPort) {
   parentPort.on('message', (params) => {
@@ -12,18 +13,18 @@ if (parentPort) {
       mempool = params.mempool;
     } else if (params.type === 'update') {
       params.added.forEach(tx => {
-        mempool.set(tx.uid, tx);
+        mempool[tx.txid] = tx;
       });
-      params.removed.forEach(uid => {
-        mempool.delete(uid);
+      params.removed.forEach(txid => {
+        delete mempool[txid];
       });
     }
     
-    const { blocks, rates, clusters } = makeBlockTemplates(mempool);
+    const { blocks, clusters } = makeBlockTemplates(mempool);
 
     // return the result to main thread.
     if (parentPort) {
-      parentPort.postMessage({ blocks, rates, clusters });
+     parentPort.postMessage({ blocks, clusters });
     }
   });
 }
@@ -32,36 +33,35 @@ if (parentPort) {
 * Build projected mempool blocks 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)
 */
-function makeBlockTemplates(mempool: Map<number, CompactThreadTransaction>)
-  : { blocks: number[][], rates: Map<number, number>, clusters: Map<number, number[]> } {
+function makeBlockTemplates(mempool: { [txid: string]: ThreadTransaction })
+  : { blocks: ThreadTransaction[][], clusters: { [root: string]: string[] } } {
   const start = Date.now();
-  const auditPool: Map<number, AuditTransaction> = new Map();
+  const auditPool: { [txid: string]: AuditTransaction } = {};
   const mempoolArray: AuditTransaction[] = [];
-  const cpfpClusters: Map<number, number[]> = new Map();
+  const restOfArray: ThreadTransaction[] = [];
+  const cpfpClusters: { [root: string]: string[] } = {};
   
-  mempool.forEach(tx => {
-    tx.dirty = false;
+  // grab the top feerate txs up to maxWeight
+  Object.values(mempool).sort((a, b) => b.feePerVsize - a.feePerVsize).forEach(tx => {
     // initializing everything up front helps V8 optimize property access later
-    auditPool.set(tx.uid, {
-      uid: tx.uid,
+    auditPool[tx.txid] = {
+      txid: tx.txid,
       fee: tx.fee,
       weight: tx.weight,
       feePerVsize: tx.feePerVsize,
       effectiveFeePerVsize: tx.feePerVsize,
-      sigops: tx.sigops,
-      inputs: tx.inputs || [],
+      vin: tx.vin,
       relativesSet: false,
-      ancestorMap: new Map<number, AuditTransaction>(),
+      ancestorMap: new Map<string, AuditTransaction>(),
       children: new Set<AuditTransaction>(),
       ancestorFee: 0,
       ancestorWeight: 0,
-      ancestorSigops: 0,
       score: 0,
       used: false,
       modified: false,
       modifiedNode: null,
-    });
-    mempoolArray.push(auditPool.get(tx.uid) as AuditTransaction);
+    };
+    mempoolArray.push(auditPool[tx.txid]);
   });
 
   // Build relatives graph & calculate ancestor scores
@@ -72,29 +72,15 @@ function makeBlockTemplates(mempool: Map<number, CompactThreadTransaction>)
   }
 
   // Sort by descending ancestor score
-  mempoolArray.sort((a, b) => {
-    if (b.score === a.score) {
-      // tie-break by uid for stability
-      return a.uid < b.uid ? -1 : 1;
-    } else {
-      return (b.score || 0) - (a.score || 0);
-    }
-  });
+  mempoolArray.sort((a, b) => (b.score || 0) - (a.score || 0));
 
   // 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[][] = [];
+  const blocks: ThreadTransaction[][] = [];
   let blockWeight = 4000;
-  let blockSigops = 0;
+  let blockSize = 0;
   let transactions: AuditTransaction[] = [];
-  const modified: PairingHeap<AuditTransaction> = new PairingHeap((a, b): boolean => {
-    if (a.score === b.score) {
-      // tie-break by uid for stability
-      return a.uid > b.uid;
-    } else {
-      return (a.score || 0) > (b.score || 0);
-    }
-  });
+  const modified: PairingHeap<AuditTransaction> = new PairingHeap((a, b): boolean => (a.score || 0) > (b.score || 0));
   let overflow: AuditTransaction[] = [];
   let failures = 0;
   let top = 0;
@@ -121,36 +107,30 @@ function makeBlockTemplates(mempool: Map<number, CompactThreadTransaction>)
 
     if (nextTx && !nextTx?.used) {
       // Check if the package fits into this block
-      if (blocks.length >= 7 || ((blockWeight + nextTx.ancestorWeight < config.MEMPOOL.BLOCK_WEIGHT_UNITS) && (blockSigops + nextTx.ancestorSigops <= 80000))) {
+      if (blockWeight + nextTx.ancestorWeight < config.MEMPOOL.BLOCK_WEIGHT_UNITS) {
         const ancestors: AuditTransaction[] = 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];
         let isCluster = false;
         if (sortedTxSet.length > 1) {
-          cpfpClusters.set(nextTx.uid, sortedTxSet.map(tx => tx.uid));
+          cpfpClusters[nextTx.txid] = sortedTxSet.map(tx => tx.txid);
           isCluster = true;
         }
-        const effectiveFeeRate = Math.min(nextTx.dependencyRate || Infinity, nextTx.ancestorFee / (nextTx.ancestorWeight / 4));
+        const effectiveFeeRate = nextTx.ancestorFee / (nextTx.ancestorWeight / 4);
         const used: AuditTransaction[] = [];
         while (sortedTxSet.length) {
           const ancestor = sortedTxSet.pop();
-          const mempoolTx = mempool.get(ancestor.uid);
-          if (!mempoolTx) {
-            continue;
-          }
+          const mempoolTx = mempool[ancestor.txid];
           ancestor.used = true;
-          ancestor.usedBy = nextTx.uid;
+          ancestor.usedBy = nextTx.txid;
           // update original copy of this tx with effective fee rate & relatives data
-          if (mempoolTx.effectiveFeePerVsize !== effectiveFeeRate) {
-            mempoolTx.effectiveFeePerVsize = effectiveFeeRate;
-            mempoolTx.dirty = true;
-          }
-          if (mempoolTx.cpfpRoot !== nextTx.uid) {
-            mempoolTx.cpfpRoot = isCluster ? nextTx.uid : null;
-            mempoolTx.dirty;
+          mempoolTx.effectiveFeePerVsize = effectiveFeeRate;
+          if (isCluster) {
+            mempoolTx.cpfpRoot = nextTx.txid;
           }
           mempoolTx.cpfpChecked = true;
           transactions.push(ancestor);
+          blockSize += ancestor.size;
           blockWeight += ancestor.weight;
           used.push(ancestor);
         }
@@ -158,7 +138,7 @@ function makeBlockTemplates(mempool: Map<number, CompactThreadTransaction>)
         // remove these as valid package ancestors for any descendants remaining in the mempool
         if (used.length) {
           used.forEach(tx => {
-            updateDescendants(tx, auditPool, modified, effectiveFeeRate);
+            updateDescendants(tx, auditPool, modified);
           });
         }
 
@@ -176,10 +156,11 @@ function makeBlockTemplates(mempool: Map<number, CompactThreadTransaction>)
     if ((exceededPackageTries || queueEmpty) && blocks.length < 7) {
       // construct this block
       if (transactions.length) {
-        blocks.push(transactions.map(t => t.uid));
+        blocks.push(transactions.map(t => mempool[t.txid]));
       }
       // reset for the next block
       transactions = [];
+      blockSize = 0;
       blockWeight = 4000;
 
       // 'overflow' packages didn't fit in this block, but are valid candidates for the next
@@ -194,38 +175,50 @@ function makeBlockTemplates(mempool: Map<number, CompactThreadTransaction>)
       overflow = [];
     }
   }
-
-  if (overflow.length > 0) {
-    logger.warn('GBT overflow list unexpectedly non-empty after final block constructed');
-  }
-  // add the final unbounded block if it contains any transactions
-  if (transactions.length > 0) {
-    blocks.push(transactions.map(t => t.uid));
-  }
-
-  // get map of dirty transactions
-  const rates = new Map<number, number>();
-  for (const tx of mempool.values()) {
-    if (tx?.dirty) {
-      rates.set(tx.uid, tx.effectiveFeePerVsize || tx.feePerVsize);
+  // pack any leftover transactions into the last block
+  for (const tx of overflow) {
+    if (!tx || tx?.used) {
+      continue;
     }
+    blockWeight += tx.weight;
+    const mempoolTx = mempool[tx.txid];
+    // update original copy of this tx with effective fee rate & relatives data
+    mempoolTx.effectiveFeePerVsize = tx.score;
+    if (tx.ancestorMap.size > 0) {
+      cpfpClusters[tx.txid] = Array.from(tx.ancestorMap?.values()).map(a => a.txid);
+      mempoolTx.cpfpRoot = tx.txid;
+    }
+    mempoolTx.cpfpChecked = true;
+    transactions.push(tx);
+    tx.used = true;
   }
+  const blockTransactions = transactions.map(t => mempool[t.txid]);
+  restOfArray.forEach(tx => {
+    blockWeight += tx.weight;
+    tx.effectiveFeePerVsize = tx.feePerVsize;
+    tx.cpfpChecked = false;
+    blockTransactions.push(tx);
+  });
+  if (blockTransactions.length) {
+    blocks.push(blockTransactions);
+  }
+  transactions = [];
 
   const end = Date.now();
   const time = end - start;
   logger.debug('Mempool templates calculated in ' + time / 1000 + ' seconds');
 
-  return { blocks, rates, clusters: cpfpClusters };
+  return { blocks, clusters: cpfpClusters };
 }
 
 // traverse in-mempool ancestors
 // recursion unavoidable, but should be limited to depth < 25 by mempool policy
 function setRelatives(
   tx: AuditTransaction,
-  mempool: Map<number, AuditTransaction>,
+  mempool: { [txid: string]: AuditTransaction },
 ): void {
-  for (const parent of tx.inputs) {
-    const parentTx = mempool.get(parent);
+  for (const parent of tx.vin) {
+    const parentTx = mempool[parent];
     if (parentTx && !tx.ancestorMap?.has(parent)) {
       tx.ancestorMap.set(parent, parentTx);
       parentTx.children.add(tx);
@@ -234,17 +227,15 @@ function setRelatives(
         setRelatives(parentTx, mempool);
       }
       parentTx.ancestorMap.forEach((ancestor) => {
-        tx.ancestorMap.set(ancestor.uid, ancestor);
+        tx.ancestorMap.set(ancestor.txid, ancestor);
       });
     }
   };
   tx.ancestorFee = tx.fee || 0;
   tx.ancestorWeight = tx.weight || 0;
-  tx.ancestorSigops = tx.sigops || 0;
   tx.ancestorMap.forEach((ancestor) => {
     tx.ancestorFee += ancestor.fee;
     tx.ancestorWeight += ancestor.weight;
-    tx.ancestorSigops += ancestor.sigops;
   });
   tx.score = tx.ancestorFee / ((tx.ancestorWeight / 4) || 1);
   tx.relativesSet = true;
@@ -254,9 +245,8 @@ function setRelatives(
 // avoids recursion to limit call stack depth
 function updateDescendants(
   rootTx: AuditTransaction,
-  mempool: Map<number, AuditTransaction>,
+  mempool: { [txid: string]: AuditTransaction },
   modified: PairingHeap<AuditTransaction>,
-  clusterRate: number,
 ): void {
   const descendantSet: Set<AuditTransaction> = new Set();
   // stack of nodes left to visit
@@ -271,15 +261,13 @@ function updateDescendants(
   });
   while (descendants.length) {
     descendantTx = descendants.pop();
-    if (descendantTx && descendantTx.ancestorMap && descendantTx.ancestorMap.has(rootTx.uid)) {
+    if (descendantTx && descendantTx.ancestorMap && descendantTx.ancestorMap.has(rootTx.txid)) {
       // remove tx as ancestor
-      descendantTx.ancestorMap.delete(rootTx.uid);
+      descendantTx.ancestorMap.delete(rootTx.txid);
       descendantTx.ancestorFee -= rootTx.fee;
       descendantTx.ancestorWeight -= rootTx.weight;
-      descendantTx.ancestorSigops -= rootTx.sigops;
       tmpScore = descendantTx.score;
       descendantTx.score = descendantTx.ancestorFee / (descendantTx.ancestorWeight / 4);
-      descendantTx.dependencyRate = descendantTx.dependencyRate ? Math.min(descendantTx.dependencyRate, clusterRate) : clusterRate;
 
       if (!descendantTx.modifiedNode) {
         descendantTx.modified = true;

backend/src/config.ts

@@ -12,7 +12,6 @@ interface IConfig {
     API_URL_PREFIX: string;
     POLL_RATE_MS: number;
     CACHE_DIR: string;
-    CACHE_ENABLED: boolean;
     CLEAR_PROTECTION_MINUTES: number;
     RECOMMENDED_FEE_PERCENTILE: number;
     BLOCK_WEIGHT_UNITS: number;
@@ -32,22 +31,11 @@ interface IConfig {
     AUDIT: boolean;
     ADVANCED_GBT_AUDIT: boolean;
     ADVANCED_GBT_MEMPOOL: boolean;
-    RUST_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;
   };
   ESPLORA: {
     REST_API_URL: string;
-    UNIX_SOCKET_PATH: string | void | null;
-    BATCH_QUERY_BASE_SIZE: number;
-    RETRY_UNIX_SOCKET_AFTER: number;
-    REQUEST_TIMEOUT: number;
-    FALLBACK_TIMEOUT: number;
-    FALLBACK: string[];
   };
   LIGHTNING: {
     ENABLED: boolean;
@@ -63,7 +51,6 @@ interface IConfig {
     TLS_CERT_PATH: string;
     MACAROON_PATH: string;
     REST_API_URL: string;
-    TIMEOUT: number;
   };
   CLIGHTNING: {
     SOCKET: string;
@@ -78,18 +65,12 @@ interface IConfig {
     PORT: number;
     USERNAME: string;
     PASSWORD: string;
-    TIMEOUT: number;
-    COOKIE: boolean;
-    COOKIE_PATH: string;
   };
   SECOND_CORE_RPC: {
     HOST: string;
     PORT: number;
     USERNAME: string;
     PASSWORD: string;
-    TIMEOUT: number;
-    COOKIE: boolean;
-    COOKIE_PATH: string;
   };
   DATABASE: {
     ENABLED: boolean;
@@ -99,8 +80,6 @@ interface IConfig {
     DATABASE: string;
     USERNAME: string;
     PASSWORD: string;
-    TIMEOUT: number;
-    PID_DIR: string;
   };
   SYSLOG: {
     ENABLED: boolean;
@@ -125,6 +104,10 @@ interface IConfig {
     USERNAME: string;
     PASSWORD: string;
   };
+  PRICE_DATA_SERVER: {
+    TOR_URL: string;
+    CLEARNET_URL: string;
+  };
   EXTERNAL_DATA_SERVER: {
     MEMPOOL_API: string;
     MEMPOOL_ONION: string;
@@ -139,21 +122,6 @@ interface IConfig {
     GEOLITE2_ASN: string;
     GEOIP2_ISP: string;
   },
-  REPLICATION: {
-    ENABLED: boolean;
-    AUDIT: boolean;
-    AUDIT_START_HEIGHT: number;
-    SERVERS: string[];
-  },
-  MEMPOOL_SERVICES: {
-    API: string;
-    ACCELERATIONS: boolean;
-  },
-  REDIS: {
-    ENABLED: boolean;
-    UNIX_SOCKET_PATH: string;
-    BATCH_QUERY_BASE_SIZE: number;
-  },
 }
 
 const defaults: IConfig = {
@@ -166,7 +134,6 @@ const defaults: IConfig = {
     'API_URL_PREFIX': '/api/v1/',
     'POLL_RATE_MS': 2000,
     'CACHE_DIR': './cache',
-    'CACHE_ENABLED': true,
     'CLEAR_PROTECTION_MINUTES': 20,
     'RECOMMENDED_FEE_PERCENTILE': 50,
     'BLOCK_WEIGHT_UNITS': 4000000,
@@ -186,22 +153,11 @@ const defaults: IConfig = {
     'AUDIT': 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,
   },
   'ESPLORA': {
     'REST_API_URL': 'http://127.0.0.1:3000',
-    'UNIX_SOCKET_PATH': null,
-    'BATCH_QUERY_BASE_SIZE': 1000,
-    'RETRY_UNIX_SOCKET_AFTER': 30000,
-    'REQUEST_TIMEOUT': 10000,
-    'FALLBACK_TIMEOUT': 5000,
-    'FALLBACK': [],
   },
   'ELECTRUM': {
     'HOST': '127.0.0.1',
@@ -212,19 +168,13 @@ const defaults: IConfig = {
     'HOST': '127.0.0.1',
     'PORT': 8332,
     'USERNAME': 'mempool',
-    'PASSWORD': 'mempool',
-    'TIMEOUT': 60000,
-    'COOKIE': false,
-    'COOKIE_PATH': '/bitcoin/.cookie'
+    'PASSWORD': 'mempool'
   },
   'SECOND_CORE_RPC': {
     'HOST': '127.0.0.1',
     'PORT': 8332,
     'USERNAME': 'mempool',
-    'PASSWORD': 'mempool',
-    'TIMEOUT': 60000,
-    'COOKIE': false,
-    'COOKIE_PATH': '/bitcoin/.cookie'
+    'PASSWORD': 'mempool'
   },
   'DATABASE': {
     'ENABLED': true,
@@ -233,9 +183,7 @@ const defaults: IConfig = {
     'PORT': 3306,
     'DATABASE': 'mempool',
     'USERNAME': 'mempool',
-    'PASSWORD': 'mempool',
-    'TIMEOUT': 180000,
-    'PID_DIR': '',
+    'PASSWORD': 'mempool'
   },
   'SYSLOG': {
     'ENABLED': true,
@@ -266,7 +214,6 @@ const defaults: IConfig = {
     'TLS_CERT_PATH': '',
     'MACAROON_PATH': '',
     'REST_API_URL': 'https://localhost:8080',
-    'TIMEOUT': 10000,
   },
   'CLIGHTNING': {
     'SOCKET': '',
@@ -279,6 +226,10 @@ const defaults: IConfig = {
     'USERNAME': '',
     'PASSWORD': ''
   },
+  'PRICE_DATA_SERVER': {
+    'TOR_URL': 'http://wizpriceje6q5tdrxkyiazsgu7irquiqjy2dptezqhrtu7l2qelqktid.onion/getAllMarketPrices',
+    'CLEARNET_URL': 'https://price.bisq.wiz.biz/getAllMarketPrices'
+  },
   'EXTERNAL_DATA_SERVER': {
     'MEMPOOL_API': 'https://mempool.space/api/v1',
     'MEMPOOL_ONION': 'http://mempoolhqx4isw62xs7abwphsq7ldayuidyx2v2oethdhhj6mlo2r6ad.onion/api/v1',
@@ -293,21 +244,6 @@ const defaults: IConfig = {
     'GEOLITE2_ASN': '/usr/local/share/GeoIP/GeoLite2-ASN.mmdb',
     'GEOIP2_ISP': '/usr/local/share/GeoIP/GeoIP2-ISP.mmdb'
   },
-  'REPLICATION': {
-    'ENABLED': false,
-    'AUDIT': false,
-    'AUDIT_START_HEIGHT': 774000,
-    'SERVERS': [],
-  },
-  'MEMPOOL_SERVICES': {
-    'API': '',
-    'ACCELERATIONS': false,
-  },
-  'REDIS': {
-    'ENABLED': false,
-    'UNIX_SOCKET_PATH': '',
-    'BATCH_QUERY_BASE_SIZE': 5000,
-  },
 };
 
 class Config implements IConfig {
@@ -324,11 +260,9 @@ class Config implements IConfig {
   LND: IConfig['LND'];
   CLIGHTNING: IConfig['CLIGHTNING'];
   SOCKS5PROXY: IConfig['SOCKS5PROXY'];
+  PRICE_DATA_SERVER: IConfig['PRICE_DATA_SERVER'];
   EXTERNAL_DATA_SERVER: IConfig['EXTERNAL_DATA_SERVER'];
   MAXMIND: IConfig['MAXMIND'];
-  REPLICATION: IConfig['REPLICATION'];
-  MEMPOOL_SERVICES: IConfig['MEMPOOL_SERVICES'];
-  REDIS: IConfig['REDIS'];
 
   constructor() {
     const configs = this.merge(configFromFile, defaults);
@@ -345,11 +279,9 @@ class Config implements IConfig {
     this.LND = configs.LND;
     this.CLIGHTNING = configs.CLIGHTNING;
     this.SOCKS5PROXY = configs.SOCKS5PROXY;
+    this.PRICE_DATA_SERVER = configs.PRICE_DATA_SERVER;
     this.EXTERNAL_DATA_SERVER = configs.EXTERNAL_DATA_SERVER;
     this.MAXMIND = configs.MAXMIND;
-    this.REPLICATION = configs.REPLICATION;
-    this.MEMPOOL_SERVICES = configs.MEMPOOL_SERVICES;
-    this.REDIS = configs.REDIS;
   }
 
   merge = (...objects: object[]): IConfig => {

backend/src/database.ts

@@ -1,11 +1,7 @@
-import * as fs from 'fs';
-import path from 'path';
 import config from './config';
 import { createPool, Pool, PoolConnection } from 'mysql2/promise';
-import { LogLevel } from './logger';
 import logger from './logger';
 import { FieldPacket, OkPacket, PoolOptions, ResultSetHeader, RowDataPacket } from 'mysql2/typings/mysql';
-import { execSync } from 'child_process';
 
  class DB {
   constructor() {
@@ -34,82 +30,11 @@ import { execSync } from 'child_process';
   }
 
   public async query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket |
-    OkPacket[] | ResultSetHeader>(query, params?, errorLogLevel: LogLevel | 'silent' = 'debug', connection?: PoolConnection): Promise<[T, FieldPacket[]]>
+    OkPacket[] | ResultSetHeader>(query, params?): Promise<[T, FieldPacket[]]>
   {
     this.checkDBFlag();
-    let hardTimeout;
-    if (query?.timeout != null) {
-      hardTimeout = Math.floor(query.timeout * 1.1);
-    } else {
-      hardTimeout = config.DATABASE.TIMEOUT;
-    }
-    if (hardTimeout > 0) {
-      return new Promise((resolve, reject) => {
-        const timer = setTimeout(() => {
-          reject(new Error(`DB query failed to return, reject or time out within ${hardTimeout / 1000}s - ${query?.sql?.slice(0, 160) || (typeof(query) === 'string' || query instanceof String ? query?.slice(0, 160) : 'unknown query')}`));
-        }, hardTimeout);
-
-        // Use a specific connection if provided, otherwise delegate to the pool
-        const connectionPromise = connection ? Promise.resolve(connection) : this.getPool();
-        connectionPromise.then((pool: PoolConnection | Pool) => {
-          return pool.query(query, params) as Promise<[T, FieldPacket[]]>;
-        }).then(result => {
-          resolve(result);
-        }).catch(error => {
-          if (errorLogLevel !== 'silent') {
-            logger[errorLogLevel](`database query "${query?.sql?.slice(0, 160) || (typeof(query) === 'string' || query instanceof String ? query?.slice(0, 160) : 'unknown query')}" failed!`);
-          }
-          reject(error);
-        }).finally(() => {
-          clearTimeout(timer);
-        });
-      });
-    } else {
-      try {
-        const pool = await this.getPool();
-        return pool.query(query, params);
-      } catch (e) {
-        if (errorLogLevel !== 'silent') {
-          logger[errorLogLevel](`database query "${query?.sql?.slice(0, 160) || (typeof(query) === 'string' || query instanceof String ? query?.slice(0, 160) : 'unknown query')}" failed!`);
-        }
-        throw e;
-      }
-    }
-  }
-
-  private async $rollbackAtomic(connection: PoolConnection): Promise<void> {
-    try {
-      await connection.rollback();
-      await connection.release();
-    } catch (e) {
-      logger.warn('Failed to rollback incomplete db transaction: ' + (e instanceof Error ? e.message : e));
-    }
-  }
-
-  public async $atomicQuery<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket |
-    OkPacket[] | ResultSetHeader>(queries: { query, params }[], errorLogLevel: LogLevel | 'silent' = 'debug'): Promise<[T, FieldPacket[]][]>
-  {
     const pool = await this.getPool();
-    const connection = await pool.getConnection();
-    try {
-      await connection.beginTransaction();
-
-      const results: [T, FieldPacket[]][]  = [];
-      for (const query of queries) {
-        const result = await this.query(query.query, query.params, errorLogLevel, connection) as [T, FieldPacket[]];
-        results.push(result);
-      }
-
-      await connection.commit();
-
-      return results;
-    } catch (e) {
-      logger.warn('Could not complete db transaction, rolling back: ' + (e instanceof Error ? e.message : e));
-      this.$rollbackAtomic(connection);
-      throw e;
-    } finally {
-      connection.release();
-    }
+    return pool.query(query, params);
   }
 
   public async checkDbConnection() {
@@ -123,50 +48,6 @@ import { execSync } from 'child_process';
     }
   }
 
-  public getPidLock(): boolean {
-    const filePath = path.join(config.DATABASE.PID_DIR || __dirname, `/mempool-${config.DATABASE.DATABASE}.pid`);
-    this.enforcePidLock(filePath);
-    fs.writeFileSync(filePath, `${process.pid}`);
-    return true;
-  }
-
-  private enforcePidLock(filePath: string): void {
-    if (fs.existsSync(filePath)) {
-      const pid = parseInt(fs.readFileSync(filePath, 'utf-8'));
-      if (pid === process.pid) {
-        logger.warn('PID file already exists for this process');
-        return;
-      }
-
-      let cmd;
-      try {
-        cmd = execSync(`ps -p ${pid} -o args=`);
-      } catch (e) {
-        logger.warn(`Stale PID file at ${filePath}, but no process running on that PID ${pid}`);
-        return;
-      }
-
-      if (cmd && cmd.toString()?.includes('node')) {
-        const msg = `Another mempool nodejs process is already running on PID ${pid}`;
-        logger.err(msg);
-        throw new Error(msg);
-      } else {
-        logger.warn(`Stale PID file at ${filePath}, but the PID ${pid} does not belong to a running mempool instance`);
-      }
-    }
-  }
-
-  public releasePidLock(): void {
-    const filePath = path.join(config.DATABASE.PID_DIR || __dirname, `/mempool-${config.DATABASE.DATABASE}.pid`);
-    if (fs.existsSync(filePath)) {
-      const pid = parseInt(fs.readFileSync(filePath, 'utf-8'));
-      // only release our own pid file
-      if (pid === process.pid) {
-        fs.unlinkSync(filePath);
-      }
-    }
-  }
-
   private async getPool(): Promise<Pool> {
     if (this.pool === null) {
       this.pool = createPool(this.poolConfig);

backend/src/index.ts

@@ -2,7 +2,6 @@ import express from 'express';
 import { Application, Request, Response, NextFunction } from 'express';
 import * as http from 'http';
 import * as WebSocket from 'ws';
-import bitcoinApi from './api/bitcoin/bitcoin-api-factory';
 import cluster from 'cluster';
 import DB from './database';
 import config from './config';
@@ -30,7 +29,6 @@ import generalLightningRoutes from './api/explorer/general.routes';
 import lightningStatsUpdater from './tasks/lightning/stats-updater.service';
 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';
@@ -42,15 +40,12 @@ import chainTips from './api/chain-tips';
 import { AxiosError } from 'axios';
 import v8 from 'v8';
 import { formatBytes, getBytesUnit } from './utils/format';
-import redisCache from './api/redis-cache';
-import accelerationApi from './api/services/acceleration';
 
 class Server {
   private wss: WebSocket.Server | undefined;
   private server: http.Server | undefined;
   private app: Application;
-  private currentBackendRetryInterval = 1;
-  private backendRetryCount = 0;
+  private currentBackendRetryInterval = 5;
 
   private maxHeapSize: number = 0;
   private heapLogInterval: number = 60;
@@ -92,24 +87,7 @@ class Server {
   async startServer(worker = false): Promise<void> {
     logger.notice(`Starting Mempool Server${worker ? ' (worker)' : ''}... (${backendInfo.getShortCommitHash()})`);
 
-    // Register cleanup listeners for exit events
-    ['exit', 'SIGHUP', 'SIGINT', 'SIGTERM', 'SIGUSR1', 'SIGUSR2'].forEach(event => {
-      process.on(event, () => { this.onExit(event); });
-    });
-    process.on('uncaughtException', (error) => {
-      this.onUnhandledException('uncaughtException', error);
-    });
-    process.on('unhandledRejection', (reason, promise) => {
-      this.onUnhandledException('unhandledRejection', reason);
-    });
-
-    if (config.MEMPOOL.BACKEND === 'esplora') {
-      bitcoinApi.startHealthChecks();
-    }
-
     if (config.DATABASE.ENABLED) {
-      DB.getPidLock();
-
       await DB.checkDbConnection();
       try {
         if (process.env.npm_config_reindex_blocks === 'true') { // Re-index requests
@@ -142,11 +120,7 @@ class Server {
     await poolsUpdater.updatePoolsJson(); // Needs to be done before loading the disk cache because we sometimes wipe it
     await syncAssets.syncAssets$();
     if (config.MEMPOOL.ENABLED) {
-      if (config.MEMPOOL.CACHE_ENABLED) {
-        await diskCache.$loadMempoolCache();
-      } else if (config.REDIS.ENABLED) {
-        await redisCache.$loadCache();
-      }
+      diskCache.loadMempoolCache();
     }
 
     if (config.STATISTICS.ENABLED && config.DATABASE.ENABLED && cluster.isPrimary) {
@@ -174,7 +148,7 @@ class Server {
 
     if (config.BISQ.ENABLED) {
       bisq.startBisqService();
-      bisq.setPriceCallbackFunction((price) => websocketHandler.setExtraInitData('bsq-price', price));
+      bisq.setPriceCallbackFunction((price) => websocketHandler.setExtraInitProperties('bsq-price', price));
       blocks.setNewBlockCallback(bisq.handleNewBitcoinBlock.bind(bisq));
       bisqMarkets.startBisqService();
     }
@@ -193,7 +167,6 @@ class Server {
   }
 
   async runMainUpdateLoop(): Promise<void> {
-    const start = Date.now();
     try {
       try {
         await memPool.$updateMemPoolInfo();
@@ -205,31 +178,22 @@ class Server {
           logger.debug(msg);
         }
       }
-      const newMempool = await bitcoinApi.$getRawMempool();
-      const newAccelerations = await accelerationApi.$fetchAccelerations();
-      const numHandledBlocks = await blocks.$updateBlocks();
-      const pollRate = config.MEMPOOL.POLL_RATE_MS * (indexer.indexerIsRunning() ? 10 : 1);
-      if (numHandledBlocks === 0) {
-        await memPool.$updateMempool(newMempool, newAccelerations, pollRate);
-      }
+      await blocks.$updateBlocks();
+      await memPool.$updateMempool();
       indexer.$run();
-      priceUpdater.$run();
 
-      // rerun immediately if we skipped the mempool update, otherwise wait POLL_RATE_MS
-      const elapsed = Date.now() - start;
-      const remainingTime = Math.max(0, pollRate - elapsed);
-      setTimeout(this.runMainUpdateLoop.bind(this), numHandledBlocks > 0 ? 0 : remainingTime);
-      this.backendRetryCount = 0;
+      setTimeout(this.runMainUpdateLoop.bind(this), config.MEMPOOL.POLL_RATE_MS);
+      this.currentBackendRetryInterval = 5;
     } catch (e: any) {
-      this.backendRetryCount++;
-      let loggerMsg = `Exception in runMainUpdateLoop() (count: ${this.backendRetryCount}). Retrying in ${this.currentBackendRetryInterval} sec.`;
+      let loggerMsg = `Exception in runMainUpdateLoop(). Retrying in ${this.currentBackendRetryInterval} sec.`;
       loggerMsg += ` Reason: ${(e instanceof Error ? e.message : e)}.`;
       if (e?.stack) {
         loggerMsg += ` Stack trace: ${e.stack}`;
       }
       // When we get a first Exception, only `logger.debug` it and retry after 5 seconds
       // From the second Exception, `logger.warn` the Exception and increase the retry delay
-      if (this.backendRetryCount >= 5) {
+      // Maximum retry delay is 60 seconds
+      if (this.currentBackendRetryInterval > 5) {
         logger.warn(loggerMsg);
         mempool.setOutOfSync();
       } else {
@@ -239,8 +203,8 @@ class Server {
         logger.debug(`AxiosError: ${e?.message}`);
       }
       setTimeout(this.runMainUpdateLoop.bind(this), 1000 * this.currentBackendRetryInterval);
-    } finally {
-      diskCache.unlock();
+      this.currentBackendRetryInterval *= 2;
+      this.currentBackendRetryInterval = Math.min(this.currentBackendRetryInterval, 60);
     }
   }
 
@@ -251,11 +215,11 @@ class Server {
       await lightningStatsUpdater.$startService();
       await forensicsService.$startService();
     } catch(e) {
-      logger.err(`Exception in $runLightningBackend. Restarting in 1 minute. Reason: ${(e instanceof Error ? e.message : e)}`);
+      logger.err(`Nodejs lightning backend crashed. Restarting in 1 minute. Reason: ${(e instanceof Error ? e.message : e)}`);
       await Common.sleep$(1000 * 60);
       this.$runLightningBackend();
     };
-  }
+}
 
   setUpWebsocketHandling(): void {
     if (this.wss) {
@@ -273,7 +237,7 @@ class Server {
     websocketHandler.setupConnectionHandling();
     if (config.MEMPOOL.ENABLED) {
       statistics.setNewStatisticsEntryCallback(websocketHandler.handleNewStatistic.bind(websocketHandler));
-      memPool.setAsyncMempoolChangedCallback(websocketHandler.$handleMempoolChange.bind(websocketHandler));
+      memPool.setAsyncMempoolChangedCallback(websocketHandler.handleMempoolChange.bind(websocketHandler));
       blocks.setNewAsyncBlockCallback(websocketHandler.handleNewBlock.bind(websocketHandler));
     }
     priceUpdater.setRatesChangedCallback(websocketHandler.handleNewConversionRates.bind(websocketHandler));
@@ -282,7 +246,6 @@ class Server {
   
   setUpHttpApiRoutes(): void {
     bitcoinRoutes.initRoutes(this.app);
-    pricesRoutes.initRoutes(this.app);
     if (config.STATISTICS.ENABLED && config.DATABASE.ENABLED && config.MEMPOOL.ENABLED) {
       statisticsRoutes.initRoutes(this.app);
     }
@@ -312,7 +275,7 @@ class Server {
 
     if (!this.warnedHeapCritical && this.maxHeapSize > warnThreshold) {
       this.warnedHeapCritical = true;
-      logger.warn(`Used ${(this.maxHeapSize / stats.heap_size_limit * 100).toFixed(2)}% of heap limit (${formatBytes(this.maxHeapSize, byteUnits, true)} / ${formatBytes(stats.heap_size_limit, byteUnits)})!`);
+      logger.warn(`Used ${(this.maxHeapSize / stats.heap_size_limit).toFixed(2)}% of heap limit (${formatBytes(this.maxHeapSize, byteUnits, true)} / ${formatBytes(stats.heap_size_limit, byteUnits)})!`);
     }
     if (this.lastHeapLogTime === null || (now - this.lastHeapLogTime) > (this.heapLogInterval * 1000)) {
       logger.debug(`Memory usage: ${formatBytes(this.maxHeapSize, byteUnits)} / ${formatBytes(stats.heap_size_limit, byteUnits)}`);
@@ -321,19 +284,6 @@ class Server {
       this.lastHeapLogTime = now;
     }
   }
-
-  onExit(exitEvent, code = 0): void {
-    logger.debug(`onExit for signal: ${exitEvent}`);
-    if (config.DATABASE.ENABLED) {
-      DB.releasePidLock();
-    }
-    process.exit(code);
-  }
-
-  onUnhandledException(type, error): void {
-    console.error(`${type}:`, error);
-    this.onExit(type, 1);
-  }
 }
 
 ((): Server => new Server())();

backend/src/indexer.ts

@@ -6,8 +6,6 @@ import logger from './logger';
 import bitcoinClient from './api/bitcoin/bitcoin-client';
 import priceUpdater from './tasks/price-updater';
 import PricesRepository from './repositories/PricesRepository';
-import config from './config';
-import auditReplicator from './replication/AuditReplication';
 
 export interface CoreIndex {
   name: string;
@@ -15,18 +13,11 @@ export interface CoreIndex {
   best_block_height: number;
 }
 
-type TaskName = 'blocksPrices' | 'coinStatsIndex';
-
 class Indexer {
-  private runIndexer = true;
-  private indexerRunning = false;
-  private tasksRunning: { [key in TaskName]?: boolean; } = {};
-  private tasksScheduled: { [key in TaskName]?: NodeJS.Timeout; } = {};
-  private coreIndexes: CoreIndex[] = [];
-
-  public indexerIsRunning(): boolean {
-    return this.indexerRunning;
-  }
+  runIndexer = true;
+  indexerRunning = false;
+  tasksRunning: string[] = [];
+  coreIndexes: CoreIndex[] = [];
 
   /**
    * Check which core index is available for indexing
@@ -76,69 +67,33 @@ class Indexer {
     }
   }
 
-  /**
-   * schedules a single task to run in `timeout` ms
-   * only one task of each type may be scheduled
-   *
-   * @param {TaskName} task - the type of task
-   * @param {number} timeout - delay in ms
-   * @param {boolean} replace - `true` replaces any already scheduled task (works like a debounce), `false` ignores subsequent requests (works like a throttle)
-   */
-  public scheduleSingleTask(task: TaskName, timeout: number = 10000, replace = false): void {
-    if (this.tasksScheduled[task]) {
-      if (!replace) { //throttle
-        return;
-      } else { // debounce
-        clearTimeout(this.tasksScheduled[task]);
-      }
-    }
-    this.tasksScheduled[task] = setTimeout(async () => {
-      try {
-        await this.runSingleTask(task);
-      } catch (e) {
-        logger.err(`Unexpected error in scheduled task ${task}: ` + (e instanceof Error ? e.message : e));
-      } finally {
-        clearTimeout(this.tasksScheduled[task]);
-      }
-    }, timeout);
-  }
-
-  /**
-   * Runs a single task immediately
-   *
-   * (use `scheduleSingleTask` instead to queue a task to run after some timeout)
-   */
-  public async runSingleTask(task: TaskName): Promise<void> {
-    if (!Common.indexingEnabled() || this.tasksRunning[task]) {
+  public async runSingleTask(task: 'blocksPrices' | 'coinStatsIndex'): Promise<void> {
+    if (!Common.indexingEnabled()) {
       return;
     }
-    this.tasksRunning[task] = true;
 
-    switch (task) {
-      case 'blocksPrices': {
-        if (!['testnet', 'signet'].includes(config.MEMPOOL.NETWORK)) {
-          let lastestPriceId;
-          try {
-            lastestPriceId = await PricesRepository.$getLatestPriceId();
-          } catch (e) {
-            logger.debug('failed to fetch latest price id from db: ' + (e instanceof Error ? e.message : e));
-          }          if (priceUpdater.historyInserted === false || lastestPriceId === null) {
-            logger.debug(`Blocks prices indexer is waiting for the price updater to complete`, logger.tags.mining);
-            this.scheduleSingleTask(task, 10000);
-          } else {
-            logger.debug(`Blocks prices indexer will run now`, logger.tags.mining);
-            await mining.$indexBlockPrices();
-          }
-        }
-      } break;
-
-      case 'coinStatsIndex': {
-        logger.debug(`Indexing coinStatsIndex now`);
-        await mining.$indexCoinStatsIndex();
-      } break;
+    if (task === 'blocksPrices' && !this.tasksRunning.includes(task)) {
+      this.tasksRunning.push(task);
+      const lastestPriceId = await PricesRepository.$getLatestPriceId();
+      if (priceUpdater.historyInserted === false || lastestPriceId === null) {
+        logger.debug(`Blocks prices indexer is waiting for the price updater to complete`, logger.tags.mining);
+        setTimeout(() => {
+          this.tasksRunning = this.tasksRunning.filter(runningTask => runningTask !== task);
+          this.runSingleTask('blocksPrices');
+        }, 10000);
+      } else {
+        logger.debug(`Blocks prices indexer will run now`, logger.tags.mining);
+        await mining.$indexBlockPrices();
+        this.tasksRunning = this.tasksRunning.filter(runningTask => runningTask !== task);
+      }
     }
 
-    this.tasksRunning[task] = false;
+    if (task === 'coinStatsIndex' && !this.tasksRunning.includes(task)) {
+      this.tasksRunning.push(task);
+      logger.debug(`Indexing coinStatsIndex now`);
+      await mining.$indexCoinStatsIndex();
+      this.tasksRunning = this.tasksRunning.filter(runningTask => runningTask !== task);
+    }
   }
 
   public async $run(): Promise<void> {
@@ -148,12 +103,6 @@ class Indexer {
       return;
     }
 
-    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
     const blockchainInfo = await bitcoinClient.getBlockchainInfo();
     if (blockchainInfo.blocks !== blockchainInfo.headers) {
@@ -168,6 +117,8 @@ class Indexer {
     await this.checkAvailableCoreIndexes();
 
     try {
+      await priceUpdater.$run();
+
       const chainValid = await blocks.$generateBlockDatabase();
       if (chainValid === false) {
         // Chain of block hash was invalid, so we need to reindex. Stop here and continue at the next iteration
@@ -183,8 +134,6 @@ class Indexer {
       await mining.$generatePoolHashrateHistory();
       await blocks.$generateBlocksSummariesDatabase();
       await blocks.$generateCPFPDatabase();
-      await blocks.$generateAuditStats();
-      await auditReplicator.$sync();
     } 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

@@ -69,10 +69,6 @@ class Logger {
     this.network = this.getNetwork();
   }
 
-  public updateNetwork(): void {
-    this.network = this.getNetwork();
-  }
-
   private addprio(prio): void {
     this[prio] = (function(_this) {
       return function(msg, tag?: string) {
@@ -157,6 +153,4 @@ class Logger {
   }
 }
 
-export type LogLevel = 'emerg' | 'alert' | 'crit' | 'err' | 'warn' | 'notice' | 'info' | 'debug';
-
 export default new Logger();

backend/src/mempool.interfaces.ts

@@ -19,8 +19,6 @@ export interface PoolInfo {
   blockCount: number;
   slug: string;
   avgMatchRate: number | null;
-  avgFeeDelta: number | null;
-  poolUniqueId: number;
 }
 
 export interface PoolStats extends PoolInfo {
@@ -34,20 +32,13 @@ export interface BlockAudit {
   hash: string,
   missingTxs: string[],
   freshTxs: string[],
-  sigopTxs: string[],
-  fullrbfTxs: string[],
   addedTxs: string[],
-  acceleratedTxs: string[],
   matchRate: number,
-  expectedFees?: number,
-  expectedWeight?: number,
 }
 
 export interface AuditScore {
   hash: string,
   matchRate?: number,
-  expectedFees?: number
-  expectedWeight?: number
 }
 
 export interface MempoolBlock {
@@ -67,7 +58,6 @@ export interface MempoolBlockWithTransactions extends MempoolBlock {
 export interface MempoolBlockDelta {
   added: TransactionStripped[];
   removed: string[];
-  changed: { txid: string, rate: number | undefined }[];
 }
 
 interface VinStrippedToScriptsig {
@@ -89,56 +79,25 @@ export interface TransactionExtended extends IEsploraApi.Transaction {
   descendants?: Ancestor[];
   bestDescendant?: BestDescendant | null;
   cpfpChecked?: boolean;
-  position?: {
-    block: number,
-    vsize: number,
-  };
-  acceleration?: boolean;
-  uid?: number;
-}
-
-export interface MempoolTransactionExtended extends TransactionExtended {
-  order: number;
-  sigops: number;
-  adjustedVsize: number;
-  adjustedFeePerVsize: number;
-  inputs?: number[];
-  lastBoosted?: number;
-  cpfpDirty?: boolean;
+  deleteAfter?: number;
 }
 
 export interface AuditTransaction {
-  uid: number;
+  txid: string;
   fee: number;
   weight: number;
   feePerVsize: number;
   effectiveFeePerVsize: number;
-  sigops: number;
-  inputs: number[];
+  vin: string[];
   relativesSet: boolean;
-  ancestorMap: Map<number, AuditTransaction>;
+  ancestorMap: Map<string, AuditTransaction>;
   children: Set<AuditTransaction>;
   ancestorFee: number;
   ancestorWeight: number;
-  ancestorSigops: number;
   score: number;
   used: boolean;
   modified: boolean;
   modifiedNode: HeapNode<AuditTransaction>;
-  dependencyRate?: number;
-}
-
-export interface CompactThreadTransaction {
-  uid: number;
-  fee: number;
-  weight: number;
-  sigops: number;
-  feePerVsize: number;
-  effectiveFeePerVsize: number;
-  inputs: number[];
-  cpfpRoot?: number;
-  cpfpChecked?: boolean;
-  dirty?: boolean;
 }
 
 export interface ThreadTransaction {
@@ -147,7 +106,7 @@ export interface ThreadTransaction {
   weight: number;
   feePerVsize: number;
   effectiveFeePerVsize?: number;
-  inputs: number[];
+  vin: string[];
   cpfpRoot?: string;
   cpfpChecked?: boolean;
 }
@@ -186,8 +145,6 @@ export interface TransactionStripped {
   fee: number;
   vsize: number;
   value: number;
-  acc?: boolean;
-  rate?: number; // effective fee rate
 }
 
 export interface BlockExtension {
@@ -196,8 +153,6 @@ export interface BlockExtension {
   feeRange: number[]; // fee rate percentiles
   reward: number;
   matchRate: number | null;
-  expectedFees: number | null;
-  expectedWeight: number | null;
   similarity?: number;
   pool: {
     id: number; // Note - This is the `unique_id`, not to mix with the auto increment `id`
@@ -234,7 +189,6 @@ export interface BlockExtension {
  */
 export interface BlockExtended extends IEsploraApi.Block {
   extras: BlockExtension;
-  canonical?: string;
 }
 
 export interface BlockSummary {
@@ -242,15 +196,6 @@ export interface BlockSummary {
   transactions: TransactionStripped[];
 }
 
-export interface AuditSummary extends BlockAudit {
-  timestamp?: number,
-  size?: number,
-  weight?: number,
-  tx_count?: number,
-  transactions: TransactionStripped[];
-  template?: TransactionStripped[];
-}
-
 export interface BlockPrice {
   height: number;
   priceId: number;
@@ -269,28 +214,6 @@ export interface MempoolStats {
   tx_count: number;
 }
 
-export interface EffectiveFeeStats {
-  medianFee: number; // median effective fee rate
-  feeRange: number[]; // 2nd, 10th, 25th, 50th, 75th, 90th, 98th percentiles
-}
-
-export interface WorkingEffectiveFeeStats extends EffectiveFeeStats {
-  minFee: number;
-  maxFee: number;
-}
-
-export interface CpfpCluster {
-  root: string,
-  height: number,
-  txs: Ancestor[],
-  effectiveFeePerVsize: number,
-}
-
-export interface CpfpSummary {
-  transactions: TransactionExtended[];
-  clusters: CpfpCluster[];
-}
-
 export interface Statistic {
   id?: number;
   added: string;
@@ -300,7 +223,6 @@ export interface Statistic {
   total_fee: number;
   mempool_byte_weight: number;
   fee_data: string;
-  min_fee: number;
 
   vsize_1: number;
   vsize_2: number;
@@ -347,7 +269,6 @@ export interface OptimizedStatistic {
   vbytes_per_second: number;
   total_fee: number;
   mempool_byte_weight: number;
-  min_fee: number;
   vsizes: number[];
 }
 
@@ -388,11 +309,9 @@ export interface IDifficultyAdjustment {
   remainingBlocks: number;
   remainingTime: number;
   previousRetarget: number;
-  previousTime: number;
   nextRetargetHeight: number;
   timeAvg: number;
   timeOffset: number;
-  expectedBlocks: number;
 }
 
 export interface IndexedDifficultyAdjustment {

backend/src/replication/AuditReplication.ts

@@ -1,135 +0,0 @@
-import DB from '../database';
-import logger from '../logger';
-import { AuditSummary } from '../mempool.interfaces';
-import blocksAuditsRepository from '../repositories/BlocksAuditsRepository';
-import blocksSummariesRepository from '../repositories/BlocksSummariesRepository';
-import { $sync } from './replicator';
-import config from '../config';
-import { Common } from '../api/common';
-import blocks from '../api/blocks';
-
-const BATCH_SIZE = 16;
-
-/**
- * Syncs missing block template and audit data from trusted servers
- */
-class AuditReplication {
-  inProgress: boolean = false;
-  skip: Set<string> = new Set();
-
-  public async $sync(): Promise<void> {
-    if (!config.REPLICATION.ENABLED || !config.REPLICATION.AUDIT) {
-      // replication not enabled
-      return;
-    }
-    if (this.inProgress) {
-      logger.info(`AuditReplication sync already in progress`, 'Replication');
-      return;
-    }
-    this.inProgress = true;
-
-    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 
-    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)));
-      const synced = results.reduce((total, status) => status ? total + 1 : total, 0);
-      totalSynced += synced;
-      totalMissed += (slice.length - synced);
-      if (Date.now() - loggerTimer > 10000) {
-        loggerTimer = Date.now();
-        logger.info(`Found ${totalSynced} / ${totalSynced + totalMissed} of ${missingAudits.length} missing audits`, 'Replication');
-      }
-      await Common.sleep$(1000);
-    }
-
-    logger.debug(`Fetched ${totalSynced} audits, ${totalMissed} still missing`, 'Replication');
-
-    this.inProgress = false;
-  }
-
-  private async $syncAudit(hash: string): Promise<boolean> {
-    if (this.skip.has(hash)) {
-      // we already know none of our trusted servers have this audit
-      return false;
-    }
-
-    let success = false;
-    // start with a random server so load is uniformly spread
-    const syncResult = await $sync(`/api/v1/block/${hash}/audit-summary`);
-    if (syncResult) {
-      if (syncResult.data?.template?.length) {
-        await this.$saveAuditData(hash, syncResult.data);
-        logger.info(`Imported audit data from ${syncResult.server} for block ${syncResult.data.height} (${hash})`);
-        success = true;
-      }
-      if (!syncResult.data && !syncResult.exists) {
-        this.skip.add(hash);
-      }
-    }
-
-    return success;
-  }
-
-  private async $getMissingAuditBlocks(): Promise<string[]> {
-    try {
-      const startHeight = config.REPLICATION.AUDIT_START_HEIGHT || 0;
-      const [rows]: any[] = await DB.query(`
-        SELECT auditable.hash, auditable.height
-        FROM (
-          SELECT hash, height
-          FROM blocks
-          WHERE height >= ?
-        ) AS auditable
-        LEFT JOIN blocks_audits ON auditable.hash = blocks_audits.hash
-        WHERE blocks_audits.hash IS NULL
-        ORDER BY auditable.height DESC
-      `, [startHeight]);
-      return rows.map(row => row.hash);
-    } catch (e: any) {
-      logger.err(`Cannot fetch missing audit blocks from db. Reason: ` + (e instanceof Error ? e.message : e));
-      throw e;
-    }
-  }
-
-  private async $saveAuditData(blockHash: string, auditSummary: AuditSummary): Promise<void> {
-    // save audit & template to DB
-    await blocksSummariesRepository.$saveTemplate({
-      height: auditSummary.height,
-      template: {
-        id: blockHash,
-        transactions: auditSummary.template || []
-      }
-    });
-    await blocksAuditsRepository.$saveAudit({
-      hash: blockHash,
-      height: auditSummary.height,
-      time: auditSummary.timestamp || auditSummary.time,
-      missingTxs: auditSummary.missingTxs || [],
-      addedTxs: auditSummary.addedTxs || [],
-      freshTxs: auditSummary.freshTxs || [],
-      sigopTxs: auditSummary.sigopTxs || [],
-      fullrbfTxs: auditSummary.fullrbfTxs || [],
-      acceleratedTxs: auditSummary.acceleratedTxs || [],
-      matchRate: auditSummary.matchRate,
-      expectedFees: auditSummary.expectedFees,
-      expectedWeight: auditSummary.expectedWeight,
-    });
-    // add missing data to cached blocks
-    const cachedBlock = blocks.getBlocks().find(block => block.id === blockHash);
-    if (cachedBlock) {
-      cachedBlock.extras.matchRate = auditSummary.matchRate;
-      cachedBlock.extras.expectedFees = auditSummary.expectedFees || null;
-      cachedBlock.extras.expectedWeight = auditSummary.expectedWeight || null;
-    }
-  }
-}
-
-export default new AuditReplication();
-

backend/src/replication/replicator.ts

@@ -1,70 +0,0 @@
-import config from '../config';
-import backendInfo from '../api/backend-info';
-import axios, { AxiosResponse } from 'axios';
-import { SocksProxyAgent } from 'socks-proxy-agent';
-import * as https from 'https';
-
-export async function $sync(path): Promise<{ data?: any, exists: boolean, server?: string }> {
-  // start with a random server so load is uniformly spread
-  let allMissing = true;
-  const offset = Math.floor(Math.random() * config.REPLICATION.SERVERS.length);
-  for (let i = 0; i < config.REPLICATION.SERVERS.length; i++) {
-    const server = config.REPLICATION.SERVERS[(i + offset) % config.REPLICATION.SERVERS.length];
-    // don't query ourself
-    if (server === backendInfo.getBackendInfo().hostname) {
-      continue;
-    }
-    
-    try {
-      const result = await query(`https://${server}${path}`);
-      if (result) {
-        return { data: result, exists: true, server };
-      }
-    } catch (e: any) {
-      if (e?.response?.status === 404) {
-        // this server is also missing this data
-      } else {
-        // something else went wrong
-        allMissing = false;
-      }
-    }
-  }
-
-  return { exists: !allMissing };
-}
-
-export async function query(path): Promise<object> {
-  type axiosOptions = {
-    headers: {
-      'User-Agent': string
-    };
-    timeout: number;
-    httpsAgent?: https.Agent;
-  };
-  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
-  };
-
-  if (config.SOCKS5PROXY.ENABLED) {
-    const socksOptions = {
-      agentOptions: {
-        keepAlive: true,
-      },
-      hostname: config.SOCKS5PROXY.HOST,
-      port: config.SOCKS5PROXY.PORT,
-      username: config.SOCKS5PROXY.USERNAME || 'circuit0',
-      password: config.SOCKS5PROXY.PASSWORD,
-    };
-
-    axiosOptions.httpsAgent = new SocksProxyAgent(socksOptions);
-  }
-
-  const data: AxiosResponse = await axios.get(path, axiosOptions);
-  if (data.statusText === 'error' || !data.data) {
-    throw new Error(`${data.status}`);
-  }
-  return data.data;
-}

backend/src/repositories/BlocksAuditsRepository.ts

@@ -6,32 +6,20 @@ import { BlockAudit, AuditScore } from '../mempool.interfaces';
 class BlocksAuditRepositories {
   public async $saveAudit(audit: BlockAudit): Promise<void> {
     try {
-      await DB.query(`INSERT INTO blocks_audits(time, height, hash, missing_txs, added_txs, fresh_txs, sigop_txs, fullrbf_txs, accelerated_txs, match_rate, expected_fees, expected_weight)
-        VALUE (FROM_UNIXTIME(?), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [audit.time, audit.height, audit.hash, JSON.stringify(audit.missingTxs),
-          JSON.stringify(audit.addedTxs), JSON.stringify(audit.freshTxs), JSON.stringify(audit.sigopTxs), JSON.stringify(audit.fullrbfTxs), JSON.stringify(audit.acceleratedTxs), audit.matchRate, audit.expectedFees, audit.expectedWeight]);
+      await DB.query(`INSERT INTO blocks_audits(time, height, hash, missing_txs, added_txs, fresh_txs, match_rate)
+        VALUE (FROM_UNIXTIME(?), ?, ?, ?, ?, ?, ?)`, [audit.time, audit.height, audit.hash, JSON.stringify(audit.missingTxs),
+          JSON.stringify(audit.addedTxs), JSON.stringify(audit.freshTxs), audit.matchRate]);
     } catch (e: any) {
       if (e.errno === 1062) { // ER_DUP_ENTRY - This scenario is possible upon node backend restart
         logger.debug(`Cannot save block audit for block ${audit.hash} because it has already been indexed, ignoring`);
       } else {
         logger.err(`Cannot save block audit into db. Reason: ` + (e instanceof Error ? e.message : e));
+        throw e;
       }
     }
   }
 
-  public async $setSummary(hash: string, expectedFees: number, expectedWeight: number) {
-    try {
-      await DB.query(`
-        UPDATE blocks_audits SET
-        expected_fees = ?,
-        expected_weight = ?
-        WHERE hash = ?
-      `, [expectedFees, expectedWeight, hash]);
-    } catch (e: any) {
-      logger.err(`Cannot update block audit in db. Reason: ` + (e instanceof Error ? e.message : e));
-    }
-  }
-
-  public async $getBlocksHealthHistory(div: number, interval: string | null): Promise<any> {
+  public async $getBlockPredictionsHistory(div: number, interval: string | null): Promise<any> {
     try {
       let query = `SELECT UNIX_TIMESTAMP(time) as time, height, match_rate FROM blocks_audits`;
 
@@ -44,17 +32,17 @@ class BlocksAuditRepositories {
       const [rows] = await DB.query(query);
       return rows;
     } catch (e: any) {
-      logger.err(`Cannot fetch blocks health history. Reason: ` + (e instanceof Error ? e.message : e));
+      logger.err(`Cannot fetch block prediction history. Reason: ` + (e instanceof Error ? e.message : e));
       throw e;
     }
   }
 
-  public async $getBlocksHealthCount(): Promise<number> {
+  public async $getPredictionsCount(): Promise<number> {
     try {
       const [rows] = await DB.query(`SELECT count(hash) as count FROM blocks_audits`);
       return rows[0].count;
     } catch (e: any) {
-      logger.err(`Cannot fetch blocks health count. Reason: ` + (e instanceof Error ? e.message : e));
+      logger.err(`Cannot fetch block prediction history. Reason: ` + (e instanceof Error ? e.message : e));
       throw e;
     }
   }
@@ -62,19 +50,12 @@ class BlocksAuditRepositories {
   public async $getBlockAudit(hash: string): Promise<any> {
     try {
       const [rows]: any[] = await DB.query(
-        `SELECT blocks_audits.height, blocks_audits.hash as id, UNIX_TIMESTAMP(blocks_audits.time) as timestamp,
-        template,
-        missing_txs as missingTxs,
-        added_txs as addedTxs,
-        fresh_txs as freshTxs,
-        sigop_txs as sigopTxs,
-        fullrbf_txs as fullrbfTxs,
-        accelerated_txs as acceleratedTxs,
-        match_rate as matchRate,
-        expected_fees as expectedFees,
-        expected_weight as expectedWeight
+        `SELECT blocks.height, blocks.hash as id, UNIX_TIMESTAMP(blocks.blockTimestamp) as timestamp, blocks.size,
+        blocks.weight, blocks.tx_count,
+        transactions, template, missing_txs as missingTxs, added_txs as addedTxs, fresh_txs as freshTxs, match_rate as matchRate
         FROM blocks_audits
-        JOIN blocks_templates ON blocks_templates.id = blocks_audits.hash
+        JOIN blocks ON blocks.hash = blocks_audits.hash
+        JOIN blocks_summaries ON blocks_summaries.id = blocks_audits.hash
         WHERE blocks_audits.hash = "${hash}"
       `);
       
@@ -82,12 +63,12 @@ class BlocksAuditRepositories {
         rows[0].missingTxs = JSON.parse(rows[0].missingTxs);
         rows[0].addedTxs = JSON.parse(rows[0].addedTxs);
         rows[0].freshTxs = JSON.parse(rows[0].freshTxs);
-        rows[0].sigopTxs = JSON.parse(rows[0].sigopTxs);
-        rows[0].fullrbfTxs = JSON.parse(rows[0].fullrbfTxs);
-        rows[0].acceleratedTxs = JSON.parse(rows[0].acceleratedTxs);
+        rows[0].transactions = JSON.parse(rows[0].transactions);
         rows[0].template = JSON.parse(rows[0].template);
 
-        return rows[0];
+        if (rows[0].transactions.length) {
+          return rows[0];
+        }
       }
       return null;
     } catch (e: any) {
@@ -99,7 +80,7 @@ class BlocksAuditRepositories {
   public async $getBlockAuditScore(hash: string): Promise<AuditScore> {
     try {
       const [rows]: any[] = await DB.query(
-        `SELECT hash, match_rate as matchRate, expected_fees as expectedFees, expected_weight as expectedWeight
+        `SELECT hash, match_rate as matchRate
         FROM blocks_audits
         WHERE blocks_audits.hash = "${hash}"
       `);
@@ -113,7 +94,7 @@ class BlocksAuditRepositories {
   public async $getBlockAuditScores(maxHeight: number, minHeight: number): Promise<AuditScore[]> {
     try {
       const [rows]: any[] = await DB.query(
-        `SELECT hash, match_rate as matchRate, expected_fees as expectedFees, expected_weight as expectedWeight
+        `SELECT hash, match_rate as matchRate
         FROM blocks_audits
         WHERE blocks_audits.height BETWEEN ? AND ?
       `, [minHeight, maxHeight]);
@@ -123,32 +104,6 @@ class BlocksAuditRepositories {
       throw e;
     }
   }
-
-  public async $getBlocksWithoutSummaries(): Promise<string[]> {
-    try {
-      const [fromRows]: any[] = await DB.query(`
-        SELECT height
-        FROM blocks_audits
-        WHERE expected_fees IS NULL
-        ORDER BY height DESC
-        LIMIT 1
-      `);
-      if (!fromRows?.length) {
-        return [];
-      }
-      const fromHeight = fromRows[0].height;
-      const [idRows]: any[] = await DB.query(`
-        SELECT hash
-        FROM blocks_audits
-        WHERE height <= ?
-        ORDER BY height DESC
-      `, [fromHeight]);
-      return idRows.map(row => row.hash);
-    } catch (e: any) {
-      logger.err(`Cannot fetch block audit from db. Reason: ` + (e instanceof Error ? e.message : e));
-      throw e;
-    }
-  }
 }
 
 export default new BlocksAuditRepositories();

backend/src/repositories/BlocksRepository.ts

@@ -1,5 +1,4 @@
-import bitcoinApi from '../api/bitcoin/bitcoin-api-factory';
-import { BlockExtended, BlockExtension, BlockPrice, EffectiveFeeStats } from '../mempool.interfaces';
+import { BlockExtended, BlockExtension, BlockPrice } from '../mempool.interfaces';
 import DB from '../database';
 import logger from '../logger';
 import { Common } from '../api/common';
@@ -13,49 +12,6 @@ import config from '../config';
 import chainTips from '../api/chain-tips';
 import blocks from '../api/blocks';
 import BlocksAuditsRepository from './BlocksAuditsRepository';
-import transactionUtils from '../api/transaction-utils';
-
-interface DatabaseBlock {
-  id: string;
-  height: number;
-  version: number;
-  timestamp: number;
-  bits: number;
-  nonce: number;
-  difficulty: number;
-  merkle_root: string;
-  tx_count: number;
-  size: number;
-  weight: number;
-  previousblockhash: string;
-  mediantime: number;
-  totalFees: number;
-  medianFee: number;
-  feeRange: string;
-  reward: number;
-  poolId: number;
-  poolName: string;
-  poolSlug: string;
-  avgFee: number;
-  avgFeeRate: number;
-  coinbaseRaw: string;
-  coinbaseAddress: string;
-  coinbaseSignature: string;
-  coinbaseSignatureAscii: string;
-  avgTxSize: number;
-  totalInputs: number;
-  totalOutputs: number;
-  totalOutputAmt: number;
-  medianFeeAmt: number;
-  feePercentiles: string;
-  segwitTotalTxs: number;
-  segwitTotalSize: number;
-  segwitTotalWeight: number;
-  header: string;
-  utxoSetChange: number;
-  utxoSetSize: number;
-  totalInputAmt: number;
-}
 
 const BLOCK_DB_FIELDS = `
   blocks.hash AS id,
@@ -96,7 +52,7 @@ const BLOCK_DB_FIELDS = `
   blocks.header,
   blocks.utxoset_change AS utxoSetChange,
   blocks.utxoset_size AS utxoSetSize,
-  blocks.total_input_amt AS totalInputAmt
+  blocks.total_input_amt AS totalInputAmts
 `;
 
 class BlocksRepository {
@@ -215,32 +171,6 @@ class BlocksRepository {
     }
   }
 
-  /**
-   * Update missing fee amounts fields
-   *
-   * @param blockHash 
-   * @param feeAmtPercentiles 
-   * @param medianFeeAmt 
-   */
-  public async $updateFeeAmounts(blockHash: string, feeAmtPercentiles, medianFeeAmt) : Promise<void> {
-    try {
-      const query = `
-        UPDATE blocks
-        SET fee_percentiles = ?, median_fee_amt = ?
-        WHERE hash = ?
-      `;
-      const params: any[] = [
-        JSON.stringify(feeAmtPercentiles),
-        medianFeeAmt,
-        blockHash
-      ];
-      await DB.query(query, params);
-    } catch (e: any) {
-      logger.err(`Cannot update fee amounts for block ${blockHash}. Reason: ' + ${e instanceof Error ? e.message : e}`);
-      throw e;
-    }
-  }
-
   /**
    * Get all block height that have not been indexed between [startHeight, endHeight]
    */
@@ -403,7 +333,7 @@ class BlocksRepository {
   /**
    * Get average block health for all blocks for a single pool
    */
-  public async $getAvgBlockHealthPerPoolId(poolId: number): Promise<number | null> {
+  public async $getAvgBlockHealthPerPoolId(poolId: number): Promise<number> {
     const params: any[] = [];
     const query = `
       SELECT AVG(blocks_audits.match_rate) AS avg_match_rate
@@ -415,8 +345,8 @@ class BlocksRepository {
 
     try {
       const [rows] = await DB.query(query, params);
-      if (!rows[0] || rows[0].avg_match_rate == null) {
-        return null;
+      if (!rows[0] || !rows[0].avg_match_rate) {
+        return 0;
       }
       return Math.round(rows[0].avg_match_rate * 100) / 100;
     } catch (e) {
@@ -502,7 +432,7 @@ class BlocksRepository {
 
       const blocks: BlockExtended[] = [];
       for (const block of rows) {
-        blocks.push(await this.formatDbBlockIntoExtendedBlock(block as DatabaseBlock));
+        blocks.push(await this.formatDbBlockIntoExtendedBlock(block));
       }
 
       return blocks;
@@ -529,19 +459,43 @@ class BlocksRepository {
         return null;
       }
 
-      return await this.formatDbBlockIntoExtendedBlock(rows[0] as DatabaseBlock);  
+      return await this.formatDbBlockIntoExtendedBlock(rows[0]);  
     } catch (e) {
       logger.err(`Cannot get indexed block ${height}. Reason: ` + (e instanceof Error ? e.message : e));
       throw e;
     }
   }
 
+  /**
+   * Get one block by hash
+   */
+  public async $getBlockByHash(hash: string): Promise<object | null> {
+    try {
+      const query = `
+        SELECT ${BLOCK_DB_FIELDS}
+        FROM blocks
+        JOIN pools ON blocks.pool_id = pools.id
+        WHERE hash = ?;
+      `;
+      const [rows]: any[] = await DB.query(query, [hash]);
+
+      if (rows.length <= 0) {
+        return null;
+      }
+ 
+      return await this.formatDbBlockIntoExtendedBlock(rows[0]);
+    } catch (e) {
+      logger.err(`Cannot get indexed block ${hash}. Reason: ` + (e instanceof Error ? e.message : e));
+      throw e;
+    }
+  }
+
   /**
    * Return blocks difficulty
    */
   public async $getBlocksDifficulty(): Promise<object[]> {
     try {
-      const [rows]: any[] = await DB.query(`SELECT UNIX_TIMESTAMP(blockTimestamp) as time, height, difficulty, bits FROM blocks ORDER BY height ASC`);
+      const [rows]: any[] = await DB.query(`SELECT UNIX_TIMESTAMP(blockTimestamp) as time, height, difficulty FROM blocks`);
       return rows;
     } catch (e) {
       logger.err('Cannot get blocks difficulty list from the db. Reason: ' + (e instanceof Error ? e.message : e));
@@ -579,6 +533,19 @@ class BlocksRepository {
     }
   }
 
+  /**
+   * Return blocks height
+   */
+   public async $getBlocksHeightsAndTimestamp(): Promise<object[]> {
+    try {
+      const [rows]: any[] = await DB.query(`SELECT height, blockTimestamp as timestamp FROM blocks`);
+      return rows;
+    } catch (e) {
+      logger.err('Cannot get blocks height and timestamp from the db. Reason: ' + (e instanceof Error ? e.message : e));
+      throw e;
+    }
+  }
+
   /**
    * Get general block stats
    */
@@ -632,6 +599,7 @@ class BlocksRepository {
         if (blocks[idx].previous_block_hash !== blocks[idx - 1].hash) {
           logger.warn(`Chain divergence detected at block ${blocks[idx - 1].height}`);
           await this.$deleteBlocksFrom(blocks[idx - 1].height);
+          await BlocksSummariesRepository.$deleteBlocksFrom(blocks[idx - 1].height);
           await HashratesRepository.$deleteHashratesFromTimestamp(blocks[idx - 1].timestamp - 604800);
           await DifficultyAdjustmentsRepository.$deleteAdjustementsFromHeight(blocks[idx - 1].height);
           return false;
@@ -651,7 +619,7 @@ class BlocksRepository {
    * Delete blocks from the database from blockHeight
    */
   public async $deleteBlocksFrom(blockHeight: number) {
-    logger.info(`Delete newer blocks from height ${blockHeight} from the database`, logger.tags.mining);
+    logger.info(`Delete newer blocks from height ${blockHeight} from the database`);
 
     try {
       await DB.query(`DELETE FROM blocks where height >= ${blockHeight}`);
@@ -850,7 +818,7 @@ class BlocksRepository {
    */
   public async $getOldestConsecutiveBlock(): Promise<any> {
     try {
-      const [rows]: any = await DB.query(`SELECT height, UNIX_TIMESTAMP(blockTimestamp) as timestamp, difficulty, bits FROM blocks ORDER BY height DESC`);
+      const [rows]: any = await DB.query(`SELECT height, UNIX_TIMESTAMP(blockTimestamp) as timestamp, difficulty FROM blocks ORDER BY height DESC`);
       for (let i = 0; i < rows.length - 1; ++i) {
         if (rows[i].height - rows[i + 1].height > 1) {
           return rows[i];
@@ -866,7 +834,7 @@ class BlocksRepository {
   /**
    * Get all blocks which have not be linked to a price yet
    */
-  public async $getBlocksWithoutPrice(): Promise<object[]> {
+   public async $getBlocksWithoutPrice(): Promise<object[]> {
     try {
       const [rows]: any[] = await DB.query(`
         SELECT UNIX_TIMESTAMP(blocks.blockTimestamp) as timestamp, blocks.height
@@ -878,7 +846,7 @@ class BlocksRepository {
       return rows;
     } catch (e) {
       logger.err('Cannot get blocks height and timestamp from the db. Reason: ' + (e instanceof Error ? e.message : e));
-      return [];
+      throw e;
     }
   }
 
@@ -898,6 +866,7 @@ class BlocksRepository {
         logger.debug(`Cannot save blocks prices for blocks [${blockPrices[0].height} to ${blockPrices[blockPrices.length - 1].height}] because it has already been indexed, ignoring`);
       } else {
         logger.err(`Cannot save blocks prices for blocks [${blockPrices[0].height} to ${blockPrices[blockPrices.length - 1].height}] into db. Reason: ` + (e instanceof Error ? e.message : e));
+        throw e;
       }
     }
   }
@@ -916,7 +885,7 @@ class BlocksRepository {
       return blocks;
     } catch (e) {
       logger.err(`Cannot get blocks with missing coinstatsindex. Reason: ` + (e instanceof Error ? e.message : e));
-      return [];
+      throw e;
     }
   }
 
@@ -939,32 +908,13 @@ class BlocksRepository {
     }
   }
 
-  /**
-   * Save indexed effective fee statistics
-   * 
-   * @param id 
-   * @param feeStats 
-   */
-  public async $saveEffectiveFeeStats(id: string, feeStats: EffectiveFeeStats): Promise<void> {
-    try {
-      await DB.query(`
-        UPDATE blocks SET median_fee = ?, fee_span = ?
-        WHERE hash = ?`,
-        [feeStats.medianFee, JSON.stringify(feeStats.feeRange), id]
-      );
-    } catch (e) {
-      logger.err(`Cannot update block fee stats. Reason: ` + (e instanceof Error ? e.message : e));
-      throw e;
-    }
-  }
-
   /**
    * Convert a mysql row block into a BlockExtended. Note that you
    * must provide the correct field into dbBlk object param
    * 
    * @param dbBlk 
    */
-  private async formatDbBlockIntoExtendedBlock(dbBlk: DatabaseBlock): Promise<BlockExtended> {
+  private async formatDbBlockIntoExtendedBlock(dbBlk: any): Promise<BlockExtended> {
     const blk: Partial<BlockExtended> = {};
     const extras: Partial<BlockExtension> = {};
 
@@ -1020,41 +970,26 @@ class BlocksRepository {
 
     // Match rate is not part of the blocks table, but it is part of APIs so we must include it
     extras.matchRate = null;
-    extras.expectedFees = null;
-    extras.expectedWeight = null;
     if (config.MEMPOOL.AUDIT) {
       const auditScore = await BlocksAuditsRepository.$getBlockAuditScore(dbBlk.id);
       if (auditScore != null) {
         extras.matchRate = auditScore.matchRate;
-        extras.expectedFees = auditScore.expectedFees;
-        extras.expectedWeight = auditScore.expectedWeight;
       }
     }
 
     // If we're missing block summary related field, check if we can populate them on the fly now
-    // This is for example triggered upon re-org
     if (Common.blocksSummariesIndexingEnabled() &&
       (extras.medianFeeAmt === null || extras.feePercentiles === null))
     {
       extras.feePercentiles = await BlocksSummariesRepository.$getFeePercentilesByBlockId(dbBlk.id);
       if (extras.feePercentiles === null) {
-
-        let summary;
-        if (config.MEMPOOL.BACKEND === 'esplora') {
-          const txs = (await bitcoinApi.$getTxsForBlock(dbBlk.id)).map(tx => transactionUtils.extendTransaction(tx));
-          summary = blocks.summarizeBlockTransactions(dbBlk.id, txs);
-        } else {
-          // Call Core RPC
-          const block = await bitcoinClient.getBlock(dbBlk.id, 2);
-          summary = blocks.summarizeBlock(block);
-        }
-
-        await BlocksSummariesRepository.$saveTransactions(dbBlk.height, dbBlk.id, summary.transactions);
+        const block = await bitcoinClient.getBlock(dbBlk.id, 2);
+        const summary = blocks.summarizeBlock(block);
+        await BlocksSummariesRepository.$saveSummary({ height: block.height, mined: summary });
         extras.feePercentiles = await BlocksSummariesRepository.$getFeePercentilesByBlockId(dbBlk.id);
       }
       if (extras.feePercentiles !== null) {
         extras.medianFeeAmt = extras.feePercentiles[3];
-        await this.$updateFeeAmounts(dbBlk.id, extras.feePercentiles, extras.medianFeeAmt);
       }
     }
 

backend/src/repositories/BlocksSummariesRepository.ts

@@ -1,6 +1,6 @@
 import DB from '../database';
 import logger from '../logger';
-import { BlockSummary, TransactionStripped } from '../mempool.interfaces';
+import { BlockSummary } from '../mempool.interfaces';
 
 class BlocksSummariesRepository {
   public async $getByBlockId(id: string): Promise<BlockSummary | undefined> {
@@ -17,17 +17,23 @@ class BlocksSummariesRepository {
     return undefined;
   }
 
-  public async $saveTransactions(blockHeight: number, blockId: string, transactions: TransactionStripped[]): Promise<void> {
+  public async $saveSummary(params: { height: number, mined?: BlockSummary}) {
+    const blockId = params.mined?.id;
     try {
-      const transactionsStr = JSON.stringify(transactions);
+      const transactions = JSON.stringify(params.mined?.transactions || []);
       await DB.query(`
-        INSERT INTO blocks_summaries
-        SET height = ?, transactions = ?, id = ?
-        ON DUPLICATE KEY UPDATE transactions = ?`,
-        [blockHeight, transactionsStr, blockId, transactionsStr]);
+        INSERT INTO blocks_summaries (height, id, transactions, template)
+        VALUE (?, ?, ?, ?)
+        ON DUPLICATE KEY UPDATE
+          transactions = ?
+      `, [params.height, blockId, transactions, '[]', transactions]);
     } catch (e: any) {
-      logger.debug(`Cannot save block summary transactions for ${blockId}. Reason: ${e instanceof Error ? e.message : e}`);
-      throw e;
+      if (e.errno === 1062) { // ER_DUP_ENTRY - This scenario is possible upon node backend restart
+        logger.debug(`Cannot save block summary for ${blockId} because it has already been indexed, ignoring`);
+      } else {
+        logger.debug(`Cannot save block summary for ${blockId}. Reason: ${e instanceof Error ? e.message : e}`);
+        throw e;
+      }
     }
   }
 
@@ -36,35 +42,21 @@ class BlocksSummariesRepository {
     try {
       const transactions = JSON.stringify(params.template?.transactions || []);
       await DB.query(`
-        INSERT INTO blocks_templates (id, template)
-        VALUE (?, ?)
+        INSERT INTO blocks_summaries (height, id, transactions, template)
+        VALUE (?, ?, ?, ?)
         ON DUPLICATE KEY UPDATE
           template = ?
-      `, [blockId, transactions, transactions]);
+      `, [params.height, blockId, '[]', transactions, transactions]);
     } catch (e: any) {
       if (e.errno === 1062) { // ER_DUP_ENTRY - This scenario is possible upon node backend restart
         logger.debug(`Cannot save block template for ${blockId} because it has already been indexed, ignoring`);
       } else {
-        logger.warn(`Cannot save block template for ${blockId}. Reason: ${e instanceof Error ? e.message : e}`);
+        logger.debug(`Cannot save block template for ${blockId}. Reason: ${e instanceof Error ? e.message : e}`);
+        throw e;
       }
     }
   }
 
-  public async $getTemplate(id: string): Promise<BlockSummary | undefined> {
-    try {
-      const [templates]: any[] = await DB.query(`SELECT * from blocks_templates WHERE id = ?`, [id]);
-      if (templates.length > 0) {
-        return {
-          id: templates[0].id,
-          transactions: JSON.parse(templates[0].template),
-        };
-      }
-    } catch (e) {
-      logger.err(`Cannot get block template for block id ${id}. Reason: ` + (e instanceof Error ? e.message : e));
-    }
-    return undefined;
-  }
-
   public async $getIndexedSummariesId(): Promise<string[]> {
     try {
       const [rows]: any[] = await DB.query(`SELECT id from blocks_summaries`);
@@ -76,6 +68,19 @@ class BlocksSummariesRepository {
     return [];
   }
 
+  /**
+   * Delete blocks from the database from blockHeight
+   */
+  public async $deleteBlocksFrom(blockHeight: number) {
+    logger.info(`Delete newer blocks summary from height ${blockHeight} from the database`);
+
+    try {
+      await DB.query(`DELETE FROM blocks_summaries where height >= ${blockHeight}`);
+    } catch (e) {
+      logger.err('Cannot delete indexed blocks summaries. Reason: ' + (e instanceof Error ? e.message : e));
+    }
+  }
+
   /**
    * Get the fee percentiles if the block has already been indexed, [] otherwise
    * 

backend/src/repositories/CpfpRepository.ts

@@ -1,19 +1,62 @@
+import cluster, { Cluster } from 'cluster';
 import { RowDataPacket } from 'mysql2';
 import DB from '../database';
 import logger from '../logger';
-import { Ancestor, CpfpCluster } from '../mempool.interfaces';
+import { Ancestor } from '../mempool.interfaces';
 import transactionRepository from '../repositories/TransactionRepository';
 
 class CpfpRepository {
-  public async $batchSaveClusters(clusters: { root: string, height: number, txs: Ancestor[], effectiveFeePerVsize: number }[]): Promise<boolean> {
+  public async $saveCluster(clusterRoot: string, height: number, txs: Ancestor[], effectiveFeePerVsize: number): Promise<boolean> {
+    if (!txs[0]) {
+      return false;
+    }
+    // skip clusters of transactions with the same fees
+    const roundedEffectiveFee = Math.round(effectiveFeePerVsize * 100) / 100;
+    const equalFee = txs.reduce((acc, tx) => {
+      return (acc && Math.round(((tx.fee || 0) / (tx.weight / 4)) * 100) / 100 === roundedEffectiveFee);
+    }, true);
+    if (equalFee) {
+      return false;
+    }
+
     try {
-      const clusterValues: [string, number, Buffer, number][] = [];
-      const txs: { txid: string, cluster: string }[] = [];
+      const packedTxs = Buffer.from(this.pack(txs));
+      await DB.query(
+        `
+          INSERT INTO compact_cpfp_clusters(root, height, txs, fee_rate)
+          VALUE (UNHEX(?), ?, ?, ?)
+          ON DUPLICATE KEY UPDATE
+            height = ?,
+            txs = ?,
+            fee_rate = ?
+        `,
+        [clusterRoot, height, packedTxs, effectiveFeePerVsize, height, packedTxs, effectiveFeePerVsize]
+      );
+      const maxChunk = 10;
+      let chunkIndex = 0;
+      while (chunkIndex < txs.length) {
+        const chunk = txs.slice(chunkIndex, chunkIndex + maxChunk).map(tx => {
+          return { txid: tx.txid, cluster: clusterRoot };
+        });
+        await transactionRepository.$batchSetCluster(chunk);
+        chunkIndex += maxChunk;
+      }
+      return true;
+    } catch (e: any) {
+      logger.err(`Cannot save cpfp cluster into db. Reason: ` + (e instanceof Error ? e.message : e));
+      throw e;
+    }
+  }
+
+  public async $batchSaveClusters(clusters: { root: string, height: number, txs: any, effectiveFeePerVsize: number}[]): Promise<boolean> {
+    try {
+      const clusterValues: any[] = [];
+      const txs: any[] = [];
 
       for (const cluster of clusters) {
-        if (cluster.txs?.length) {
+        if (cluster.txs?.length > 1) {
           const roundedEffectiveFee = Math.round(cluster.effectiveFeePerVsize * 100) / 100;
-          const equalFee = cluster.txs.length > 1 && cluster.txs.reduce((acc, tx) => {
+          const equalFee = cluster.txs.reduce((acc, tx) => {
             return (acc && Math.round(((tx.fee || 0) / (tx.weight / 4)) * 100) / 100 === roundedEffectiveFee);
           }, true);
           if (!equalFee) {
@@ -34,10 +77,16 @@ class CpfpRepository {
         return false;
       }
 
-      const queries: { query, params }[] = [];
-
       const maxChunk = 100;
       let chunkIndex = 0;
+      // insert transactions in batches of up to 100 rows
+      while (chunkIndex < txs.length) {
+        const chunk = txs.slice(chunkIndex, chunkIndex + maxChunk);
+        await transactionRepository.$batchSetCluster(chunk);
+        chunkIndex += maxChunk;
+      }
+
+      chunkIndex = 0;
       // insert clusters in batches of up to 100 rows
       while (chunkIndex < clusterValues.length) {
         const chunk = clusterValues.slice(chunkIndex, chunkIndex + maxChunk);
@@ -49,23 +98,12 @@ class CpfpRepository {
           return (' (UNHEX(?), ?, ?, ?)');
         }) + ';';
         const values = chunk.flat();
-        queries.push({
+        await DB.query(
           query,
-          params: values,
-        });
+          values
+        );
         chunkIndex += maxChunk;
       }
-
-      chunkIndex = 0;
-      // insert transactions in batches of up to 100 rows
-      while (chunkIndex < txs.length) {
-        const chunk = txs.slice(chunkIndex, chunkIndex + maxChunk);
-        queries.push(transactionRepository.buildBatchSetQuery(chunk));
-        chunkIndex += maxChunk;
-      }
-
-      await DB.$atomicQuery(queries);
-
       return true;
     } catch (e: any) {
       logger.err(`Cannot save cpfp clusters into db. Reason: ` + (e instanceof Error ? e.message : e));
@@ -73,7 +111,7 @@ class CpfpRepository {
     }
   }
 
-  public async $getCluster(clusterRoot: string): Promise<CpfpCluster | void> {
+  public async $getCluster(clusterRoot: string): Promise<Cluster | void> {
     const [clusterRows]: any = await DB.query(
       `
         SELECT *
@@ -84,7 +122,6 @@ class CpfpRepository {
     );
     const cluster = clusterRows[0];
     if (cluster?.txs) {
-      cluster.effectiveFeePerVsize = cluster.fee_rate;
       cluster.txs = this.unpack(cluster.txs);
       return cluster;
     }

backend/src/repositories/HashratesRepository.ts

@@ -220,7 +220,7 @@ class HashratesRepository {
    * Delete hashrates from the database from timestamp
    */
   public async $deleteHashratesFromTimestamp(timestamp: number) {
-    logger.info(`Delete newer hashrates from timestamp ${new Date(timestamp * 1000).toUTCString()} from the database`, logger.tags.mining);
+    logger.info(`Delete newer hashrates from timestamp ${new Date(timestamp * 1000).toUTCString()} from the database`);
 
     try {
       await DB.query(`DELETE FROM hashrates WHERE hashrate_timestamp >= FROM_UNIXTIME(?)`, [timestamp]);