Display multiple arrows for accelerated transactions

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ jobs:
     if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')"
     strategy:
       matrix:
-        node: ["20", "21"]
+        node: ["18", "20"]
         flavor: ["dev", "prod"]
       fail-fast: false
     runs-on: "ubuntu-latest"
@@ -29,13 +29,13 @@ jobs:
 
       - name: Read rust-toolchain file from repository
         id: gettoolchain
-        run: echo "::set-output name=toolchain::$(cat ./rust/gbt/rust-toolchain)"
+        run: echo "::set-output name=toolchain::$(cat rust-toolchain)"
         working-directory: ${{ matrix.node }}/${{ matrix.flavor }}
 
       - name: Install ${{ steps.gettoolchain.outputs.toolchain }} Rust toolchain
         # Latest version available on this commit is 1.71.1
         # Commit date is Aug 3, 2023
-        uses: dtolnay/rust-toolchain@dc6353516c68da0f06325f42ad880f76a5e77ec9
+        uses: dtolnay/rust-toolchain@be73d7920c329f220ce78e0234b8f96b7ae60248
         with:
           toolchain: ${{ steps.gettoolchain.outputs.toolchain }}
 
@@ -115,10 +115,6 @@ jobs:
 
       - name: Sync-assets
         run: npm run sync-assets-dev
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          MEMPOOL_CDN: 1
-          VERBOSE: 1
         working-directory: assets/frontend
 
       - name: Zip mining-pool assets
@@ -160,7 +156,7 @@ jobs:
     if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')"
     strategy:
       matrix:
-        node: ["20", "21"]
+        node: ["18", "20"]
         flavor: ["dev", "prod"]
       fail-fast: false
     runs-on: "ubuntu-latest"
@@ -241,8 +237,6 @@ jobs:
         working-directory: ${{ matrix.node }}/${{ matrix.flavor }}/frontend
         env: 
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          MEMPOOL_CDN: 1
-          VERBOSE: 1
   
   e2e:
     if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')"
@@ -251,6 +245,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        # module: ["mempool", "liquid", "bisq"] Disabling bisq support for now
         module: ["mempool", "liquid"]
         include:
           - module: "mempool"
@@ -262,6 +257,9 @@ jobs:
             spec: |
               cypress/e2e/liquid/liquid.spec.ts
               cypress/e2e/liquidtestnet/liquidtestnet.spec.ts
+          # - module: "bisq"
+          #   spec: |
+          #     cypress/e2e/bisq/bisq.spec.ts
 
     name: E2E tests for ${{ matrix.module }}
     steps:
@@ -331,32 +329,4 @@ jobs:
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CYPRESS_PROJECT_ID: ${{ secrets.CYPRESS_PROJECT_ID }}
-
-  validate_docker_json:
-    if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')"
-    runs-on: "ubuntu-latest"
-    name: Validate generated backend Docker JSON
-
-    steps: 
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          path: docker
-      
-      - name: Install jq
-        run: sudo apt-get install jq -y
-
-      - name: Create new start script to run on CI
-        run: |
-          sed '$d' start.sh > start_ci.sh
-        working-directory: docker/docker/backend
-
-      - name: Run the script to generate the sample JSON
-        run: |
-          sh start_ci.sh
-        working-directory: docker/docker/backend
-
-      - name: Validate JSON syntax
-        run: |
-          cat mempool-config.json | jq
-        working-directory: docker/docker/backend
+        

.github/workflows/get_backend_block_height.yml

@@ -1,19 +0,0 @@
-name: 'Check if servers are in sync'
-
-on: [workflow_dispatch]
-
-jobs:
-  print-backend-sha:
-    runs-on: 'ubuntu-latest'
-    name: Get block height
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          path: repo
-
-      - name: Run script
-        working-directory: repo
-        run: |
-          chmod +x ./scripts/get_block_tip_height.sh
-          sh ./scripts/get_block_tip_height.sh

.github/workflows/on-tag.yml

@@ -101,7 +101,5 @@ jobs:
           --platform linux/amd64,linux/arm64 \
           --tag ${{ secrets.DOCKER_HUB_USER }}/${{ matrix.service }}:$TAG \
           --tag ${{ secrets.DOCKER_HUB_USER }}/${{ matrix.service }}:latest \
-          --build-context rustgbt=./rust \
-          --build-context backend=./backend \
           --output "type=registry" ./${{ matrix.service }}/ \
           --build-arg commitHash=$SHORT_SHA

.gitignore

@@ -6,4 +6,3 @@ backend/mempool-config.json
 frontend/src/resources/config.template.js
 frontend/src/resources/config.js
 target
-docker/backend/start_ci.sh

Cargo.lock

@@ -2,26 +2,11 @@
 # It is not intended for manual editing.
 version = 3
 
-[[package]]
-name = "addr2line"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
 [[package]]
 name = "aho-corasick"
-version = "1.1.2"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04"
 dependencies = [
  "memchr",
 ]
@@ -32,44 +17,23 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
-[[package]]
-name = "backtrace"
-version = "0.3.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
-]
-
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "6dbe3c979c178231552ecba20214a8272df4e09f232a87aef4320cf06539aded"
 
 [[package]]
 name = "bytemuck"
-version = "1.14.3"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f"
+checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
 
 [[package]]
 name = "bytes"
-version = "1.5.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
-
-[[package]]
-name = "cc"
-version = "1.0.90"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
+checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
 
 [[package]]
 name = "cfg-if"
@@ -88,20 +52,14 @@ dependencies = [
 
 [[package]]
 name = "ctor"
-version = "0.2.7"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad291aa74992b9b7a7e88c38acbbf6ad7e107f1d90ee8775b7bc1fc3394f485c"
+checksum = "1586fa608b1dab41f667475b4a41faec5ba680aee428bfa5de4ea520fdc6e901"
 dependencies = [
  "quote",
- "syn",
+ "syn 2.0.20",
 ]
 
-[[package]]
-name = "equivalent"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
-
 [[package]]
 name = "gbt"
 version = "1.0.0"
@@ -117,31 +75,28 @@ dependencies = [
  "tracing-subscriber",
 ]
 
-[[package]]
-name = "gimli"
-version = "0.28.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
-
 [[package]]
 name = "hashbrown"
-version = "0.14.3"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.9"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
+dependencies = [
+ "libc",
+]
 
 [[package]]
 name = "indexmap"
-version = "2.2.5"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
- "equivalent",
+ "autocfg",
  "hashbrown",
 ]
 
@@ -153,25 +108,25 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.146"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"
 
 [[package]]
 name = "libloading"
-version = "0.8.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
+checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
 dependencies = [
  "cfg-if",
- "windows-targets",
+ "winapi",
 ]
 
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
 
 [[package]]
 name = "matchers"
@@ -179,29 +134,20 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
 dependencies = [
- "regex-automata 0.1.10",
+ "regex-automata",
 ]
 
 [[package]]
 name = "memchr"
-version = "2.7.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
-
-[[package]]
-name = "miniz_oxide"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
-dependencies = [
- "adler",
-]
+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
 [[package]]
 name = "napi"
-version = "2.16.0"
+version = "2.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54a63d0570e4c3e0daf7a8d380563610e159f538e20448d6c911337246f40e84"
+checksum = "0ede2d12cd6fce44da537a4be1f5510c73be2506c2e32dfaaafd1f36968f3a0e"
 dependencies = [
  "bitflags",
  "ctor",
@@ -213,29 +159,29 @@ dependencies = [
 
 [[package]]
 name = "napi-build"
-version = "2.1.2"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f9130fccc5f763cf2069b34a089a18f0d0883c66aceb81f2fad541a3d823c43"
+checksum = "882a73d9ef23e8dc2ebbffb6a6ae2ef467c0f18ac10711e4cc59c5485d41df0e"
 
 [[package]]
 name = "napi-derive"
-version = "2.16.0"
+version = "2.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05bb7c37e3c1dda9312fdbe4a9fc7507fca72288ba154ec093e2d49114e727ce"
+checksum = "da1c6a8fa84d549aa8708fcd062372bf8ec6e849de39016ab921067d21bde367"
 dependencies = [
  "cfg-if",
  "convert_case",
  "napi-derive-backend",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "napi-derive-backend"
-version = "1.0.62"
+version = "1.0.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f785a8b8d7b83e925f5aa6d2ae3c159d17fe137ac368dc185bef410e7acdaeb4"
+checksum = "20bbc7c69168d06a848f925ec5f0e0997f98e8c8d4f2cc30157f0da51c009e17"
 dependencies = [
  "convert_case",
  "once_cell",
@@ -243,14 +189,14 @@ dependencies = [
  "quote",
  "regex",
  "semver",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "napi-sys"
-version = "2.3.0"
+version = "2.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2503fa6af34dc83fb74888df8b22afe933b58d37daf7d80424b1c60c68196b8b"
+checksum = "166b5ef52a3ab5575047a9fe8d4a030cdd0f63c96f071cd6907674453b07bae3"
 dependencies = [
  "libloading",
 ]
@@ -267,28 +213,19 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.16.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
 dependencies = [
  "hermit-abi",
  "libc",
 ]
 
-[[package]]
-name = "object"
-version = "0.32.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
 [[package]]
 name = "overload"
@@ -298,49 +235,47 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.13"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
 
 [[package]]
 name = "priority-queue"
-version = "2.0.2"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "509354d8a769e8d0b567d6821b84495c60213162761a732d68ce87c964bd347f"
+checksum = "fff39edfcaec0d64e8d0da38564fad195d2d51b680940295fcc307366e101e61"
 dependencies = [
  "autocfg",
- "equivalent",
  "indexmap",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.3"
+version = "1.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
+checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.6",
- "regex-syntax 0.8.2",
+ "regex-syntax 0.7.2",
 ]
 
 [[package]]
@@ -352,17 +287,6 @@ dependencies = [
  "regex-syntax 0.6.29",
 ]
 
-[[package]]
-name = "regex-automata"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax 0.8.2",
-]
-
 [[package]]
 name = "regex-syntax"
 version = "0.6.29"
@@ -371,42 +295,47 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.2"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
 
 [[package]]
 name = "semver"
-version = "1.0.22"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
+checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
 
 [[package]]
 name = "sharded-slab"
-version = "0.1.7"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
 dependencies = [
  "lazy_static",
 ]
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
 
 [[package]]
 name = "syn"
-version = "2.0.52"
+version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcb8d4cebc40aa517dfb69618fa647a346562e67228e2236ae0042ee6ac14775"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -415,9 +344,9 @@ dependencies = [
 
 [[package]]
 name = "thread_local"
-version = "1.1.8"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -425,21 +354,23 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.36.0"
+version = "1.28.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
+checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
 dependencies = [
- "backtrace",
+ "autocfg",
  "num_cpus",
  "pin-project-lite",
+ "windows-sys",
 ]
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
 dependencies = [
+ "cfg-if",
  "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
@@ -447,20 +378,20 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.27"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.20",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
 dependencies = [
  "once_cell",
  "valuable",
@@ -468,20 +399,20 @@ dependencies = [
 
 [[package]]
 name = "tracing-log"
-version = "0.2.0"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
+checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
 dependencies = [
+ "lazy_static",
  "log",
- "once_cell",
  "tracing-core",
 ]
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.18"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
 dependencies = [
  "matchers",
  "nu-ansi-term",
@@ -497,15 +428,15 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.11.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
 
 [[package]]
 name = "valuable"
@@ -536,10 +467,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
-name = "windows-targets"
-version = "0.52.4"
+name = "windows-sys"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
+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",
@@ -552,42 +492,42 @@ dependencies = [
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.4"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.4"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.4"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.4"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.4"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.4"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.4"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"

Cargo.toml

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

backend/.gitignore

@@ -7,12 +7,6 @@ mempool-config.json
 pools.json
 icons.json
 
-# docker
-Dockerfile
-GeoIP
-start.sh
-wait-for-it.sh
-
 # compiled output
 /dist
 /tmp
@@ -54,6 +48,3 @@ Thumbs.db
 
 # package folder (npm run package output)
 /package
-
-# Rust GBT folder (We build externally first)
-/rust-gbt

backend/mempool-config.sample.json

@@ -1,6 +1,5 @@
 {
   "MEMPOOL": {
-    "OFFICIAL": false,
     "NETWORK": "mainnet",
     "BACKEND": "electrum",
     "ENABLED": true,
@@ -28,8 +27,9 @@
     "POOLS_JSON_URL": "https://raw.githubusercontent.com/mempool/mining-pools/master/pools-v2.json",
     "POOLS_JSON_TREE_URL": "https://api.github.com/repos/mempool/mining-pools/git/trees/master",
     "AUDIT": false,
+    "ADVANCED_GBT_AUDIT": false,
+    "ADVANCED_GBT_MEMPOOL": false,
     "RUST_GBT": false,
-    "LIMIT_GBT": false,
     "CPFP_INDEXING": false,
     "DISK_CACHE_BLOCK_INTERVAL": 6,
     "MAX_PUSH_TX_SIZE_WEIGHT": 4000000,
@@ -97,6 +97,10 @@
     "GEOLITE2_ASN": "/usr/local/share/GeoIP/GeoLite2-ASN.mmdb",
     "GEOIP2_ISP": "/usr/local/share/GeoIP/GeoIP2-ISP.mmdb"
   },
+  "BISQ": {
+    "ENABLED": false,
+    "DATA_PATH": "/bisq/statsnode-data/btc_mainnet/db"
+  },
   "LIGHTNING": {
     "ENABLED": false,
     "BACKEND": "lnd",
@@ -127,7 +131,9 @@
     "MEMPOOL_API": "https://mempool.space/api/v1",
     "MEMPOOL_ONION": "http://mempoolhqx4isw62xs7abwphsq7ldayuidyx2v2oethdhhj6mlo2r6ad.onion/api/v1",
     "LIQUID_API": "https://liquid.network/api/v1",
-    "LIQUID_ONION": "http://liquidmom47f6s3m53ebfxn47p76a6tlnxib3wp6deux7wuzotdr6cyd.onion/api/v1"
+    "LIQUID_ONION": "http://liquidmom47f6s3m53ebfxn47p76a6tlnxib3wp6deux7wuzotdr6cyd.onion/api/v1",
+    "BISQ_URL": "https://bisq.markets/api",
+    "BISQ_ONION": "http://bisqmktse2cabavbr2xjq7xw3h6g5ottemo5rolfcwt6aly6tp5fdryd.onion/api"
   },
   "REDIS": {
     "ENABLED": false,
@@ -146,11 +152,7 @@
     ]
   },
   "MEMPOOL_SERVICES": {
-    "API": "https://mempool.space/api/v1/services",
+    "API": "https://mempool.space/api",
     "ACCELERATIONS": false
-  },
-  "FIAT_PRICE": {
-    "ENABLED": true,
-    "API_KEY": "your-api-key-from-freecurrencyapi.com"
   }
 }

backend/npm_package_rm_build_deps.sh

@@ -3,7 +3,10 @@ set -e
 
 # Cleaning up inside the node_modules folder
 cd package/node_modules
-rm -rf \
+rm -r \
   typescript \
   @typescript-eslint \
-  @napi-rs
+  @napi-rs \
+  ./rust-gbt/src \
+  ./rust-gbt/Cargo.toml \
+  ./rust-gbt/build.rs

backend/package.json

@@ -22,12 +22,10 @@
   "main": "index.ts",
   "scripts": {
     "tsc": "./node_modules/typescript/bin/tsc -p tsconfig.build.json",
-    "build": "npm run tsc && npm run create-resources",
-    "clean": "rm -rf ./dist/ ./node_modules/ ./package/ ./rust-gbt/",
+    "build": "npm run rust-build && npm run tsc && npm run create-resources",
     "create-resources": "cp ./src/tasks/price-feeds/mtgox-weekly.json ./dist/tasks && node dist/api/fetch-version.js",
     "package": "./npm_package.sh",
     "package-rm-build-deps": "./npm_package_rm_build_deps.sh",
-    "preinstall": "cd ../rust/gbt && npm run build-release && npm run to-backend",
     "start": "node --max-old-space-size=2048 dist/index.js",
     "start-production": "node --max-old-space-size=16384 dist/index.js",
     "reindex-updated-pools": "npm run start-production --update-pools",
@@ -36,32 +34,34 @@
     "test:ci": "CI=true ./node_modules/.bin/jest --coverage",
     "lint": "./node_modules/.bin/eslint . --ext .ts",
     "lint:fix": "./node_modules/.bin/eslint . --ext .ts --fix",
-    "prettier": "./node_modules/.bin/prettier --write \"src/**/*.{js,ts}\""
+    "prettier": "./node_modules/.bin/prettier --write \"src/**/*.{js,ts}\"",
+    "rust-clean": "cd rust-gbt && rm -f *.node index.d.ts index.js && rm -rf target && cd ../",
+    "rust-build": "npm run rust-clean && cd rust-gbt && npm run build-release"
   },
   "dependencies": {
-    "@babel/core": "^7.24.0",
+    "@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",
-    "express": "~4.19.2",
+    "express": "~4.18.2",
     "maxmind": "~4.3.11",
-    "mysql2": "~3.9.1",
+    "mysql2": "~3.7.0",
     "rust-gbt": "file:./rust-gbt",
     "redis": "^4.6.6",
     "socks-proxy-agent": "~7.0.0",
     "typescript": "~4.9.3",
-    "ws": "~8.16.0"
+    "ws": "~8.13.0"
   },
   "devDependencies": {
     "@babel/code-frame": "^7.18.6",
-    "@babel/core": "^7.24.0",
+    "@babel/core": "^7.23.2",
     "@types/compression": "^1.7.2",
     "@types/crypto-js": "^4.1.1",
     "@types/express": "^4.17.17",
     "@types/jest": "^29.5.0",
-    "@types/ws": "~8.5.10",
+    "@types/ws": "~8.5.5",
     "@typescript-eslint/eslint-plugin": "^5.55.0",
     "@typescript-eslint/parser": "^5.55.0",
     "eslint": "^8.36.0",

backend/rust-gbt/.gitignore

@@ -1,8 +1,4 @@
-package-lock.json
-index.js
-index.d.ts
 *.node
 **/node_modules
-**/target
 **/.DS_Store
 npm-debug.log*

backend/rust-gbt/Cargo.toml

@@ -12,18 +12,14 @@ crate-type = ["cdylib"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-priority-queue = "2.0.2"
+priority-queue = "1.3.2"
 bytes = "1.4.0"
-napi = { version = "2.16.0", features = ["napi8", "tokio_rt"] }
-napi-derive = "2.16.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.2.0"
+tracing-log = "0.1.3"
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"]}
 
 [build-dependencies]
-napi-build = "2.1.2"
-
-[profile.release]
-lto = true
-codegen-units = 1
+napi-build = "2.0.1"

backend/rust-gbt/index.d.ts

@@ -0,0 +1,50 @@
+/* tslint:disable */
+/* eslint-disable */
+
+/* auto-generated by NAPI-RS */
+
+export interface ThreadTransaction {
+  uid: number
+  order: number
+  fee: number
+  weight: number
+  sigops: number
+  effectiveFeePerVsize: number
+  inputs: Array<number>
+}
+export interface ThreadAcceleration {
+  uid: number
+  delta: number
+}
+export class GbtGenerator {
+  constructor()
+  /**
+   * # Errors
+   *
+   * Rejects if the thread panics or if the Mutex is poisoned.
+   */
+  make(mempool: Array<ThreadTransaction>, accelerations: Array<ThreadAcceleration>, maxUid: number): Promise<GbtResult>
+  /**
+   * # Errors
+   *
+   * Rejects if the thread panics or if the Mutex is poisoned.
+   */
+  update(newTxs: Array<ThreadTransaction>, removeTxs: Array<number>, accelerations: Array<ThreadAcceleration>, maxUid: number): Promise<GbtResult>
+}
+/**
+ * The result from calling the gbt function.
+ *
+ * This tuple contains the following:
+ *        blocks: A 2D Vector of transaction IDs (u32), the inner Vecs each represent a block.
+ * block_weights: A Vector of total weights per block.
+ *      clusters: A 2D Vector of transaction IDs representing clusters of dependent mempool transactions
+ *         rates: A Vector of tuples containing transaction IDs (u32) and effective fee per vsize (f64)
+ */
+export class GbtResult {
+  blocks: Array<Array<number>>
+  blockWeights: Array<number>
+  clusters: Array<Array<number>>
+  rates: Array<Array<number>>
+  overflow: Array<number>
+  constructor(blocks: Array<Array<number>>, blockWeights: Array<number>, clusters: Array<Array<number>>, rates: Array<Array<number>>, overflow: Array<number>)
+}

backend/rust-gbt/index.js

@@ -0,0 +1,258 @@
+/* tslint:disable */
+/* eslint-disable */
+/* prettier-ignore */
+
+/* auto-generated by NAPI-RS */
+
+const { existsSync, readFileSync } = require('fs')
+const { join } = require('path')
+
+const { platform, arch } = process
+
+let nativeBinding = null
+let localFileExisted = false
+let loadError = null
+
+function isMusl() {
+  // For Node 10
+  if (!process.report || typeof process.report.getReport !== 'function') {
+    try {
+      const lddPath = require('child_process').execSync('which ldd').toString().trim()
+      return readFileSync(lddPath, 'utf8').includes('musl')
+    } catch (e) {
+      return true
+    }
+  } else {
+    const { glibcVersionRuntime } = process.report.getReport().header
+    return !glibcVersionRuntime
+  }
+}
+
+switch (platform) {
+  case 'android':
+    switch (arch) {
+      case 'arm64':
+        localFileExisted = existsSync(join(__dirname, 'gbt.android-arm64.node'))
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./gbt.android-arm64.node')
+          } else {
+            nativeBinding = require('gbt-android-arm64')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      case 'arm':
+        localFileExisted = existsSync(join(__dirname, 'gbt.android-arm-eabi.node'))
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./gbt.android-arm-eabi.node')
+          } else {
+            nativeBinding = require('gbt-android-arm-eabi')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      default:
+        throw new Error(`Unsupported architecture on Android ${arch}`)
+    }
+    break
+  case 'win32':
+    switch (arch) {
+      case 'x64':
+        localFileExisted = existsSync(
+          join(__dirname, 'gbt.win32-x64-msvc.node')
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./gbt.win32-x64-msvc.node')
+          } else {
+            nativeBinding = require('gbt-win32-x64-msvc')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      case 'ia32':
+        localFileExisted = existsSync(
+          join(__dirname, 'gbt.win32-ia32-msvc.node')
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./gbt.win32-ia32-msvc.node')
+          } else {
+            nativeBinding = require('gbt-win32-ia32-msvc')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      case 'arm64':
+        localFileExisted = existsSync(
+          join(__dirname, 'gbt.win32-arm64-msvc.node')
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./gbt.win32-arm64-msvc.node')
+          } else {
+            nativeBinding = require('gbt-win32-arm64-msvc')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      default:
+        throw new Error(`Unsupported architecture on Windows: ${arch}`)
+    }
+    break
+  case 'darwin':
+    localFileExisted = existsSync(join(__dirname, 'gbt.darwin-universal.node'))
+    try {
+      if (localFileExisted) {
+        nativeBinding = require('./gbt.darwin-universal.node')
+      } else {
+        nativeBinding = require('gbt-darwin-universal')
+      }
+      break
+    } catch {}
+    switch (arch) {
+      case 'x64':
+        localFileExisted = existsSync(join(__dirname, 'gbt.darwin-x64.node'))
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./gbt.darwin-x64.node')
+          } else {
+            nativeBinding = require('gbt-darwin-x64')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      case 'arm64':
+        localFileExisted = existsSync(
+          join(__dirname, 'gbt.darwin-arm64.node')
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./gbt.darwin-arm64.node')
+          } else {
+            nativeBinding = require('gbt-darwin-arm64')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      default:
+        throw new Error(`Unsupported architecture on macOS: ${arch}`)
+    }
+    break
+  case 'freebsd':
+    if (arch !== 'x64') {
+      throw new Error(`Unsupported architecture on FreeBSD: ${arch}`)
+    }
+    localFileExisted = existsSync(join(__dirname, 'gbt.freebsd-x64.node'))
+    try {
+      if (localFileExisted) {
+        nativeBinding = require('./gbt.freebsd-x64.node')
+      } else {
+        nativeBinding = require('gbt-freebsd-x64')
+      }
+    } catch (e) {
+      loadError = e
+    }
+    break
+  case 'linux':
+    switch (arch) {
+      case 'x64':
+        if (isMusl()) {
+          localFileExisted = existsSync(
+            join(__dirname, 'gbt.linux-x64-musl.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./gbt.linux-x64-musl.node')
+            } else {
+              nativeBinding = require('gbt-linux-x64-musl')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        } else {
+          localFileExisted = existsSync(
+            join(__dirname, 'gbt.linux-x64-gnu.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./gbt.linux-x64-gnu.node')
+            } else {
+              nativeBinding = require('gbt-linux-x64-gnu')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        }
+        break
+      case 'arm64':
+        if (isMusl()) {
+          localFileExisted = existsSync(
+            join(__dirname, 'gbt.linux-arm64-musl.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./gbt.linux-arm64-musl.node')
+            } else {
+              nativeBinding = require('gbt-linux-arm64-musl')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        } else {
+          localFileExisted = existsSync(
+            join(__dirname, 'gbt.linux-arm64-gnu.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./gbt.linux-arm64-gnu.node')
+            } else {
+              nativeBinding = require('gbt-linux-arm64-gnu')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        }
+        break
+      case 'arm':
+        localFileExisted = existsSync(
+          join(__dirname, 'gbt.linux-arm-gnueabihf.node')
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./gbt.linux-arm-gnueabihf.node')
+          } else {
+            nativeBinding = require('gbt-linux-arm-gnueabihf')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      default:
+        throw new Error(`Unsupported architecture on Linux: ${arch}`)
+    }
+    break
+  default:
+    throw new Error(`Unsupported OS: ${platform}, architecture: ${arch}`)
+}
+
+if (!nativeBinding) {
+  if (loadError) {
+    throw loadError
+  }
+  throw new Error(`Failed to load native binding`)
+}
+
+const { GbtGenerator, GbtResult } = nativeBinding
+
+module.exports.GbtGenerator = GbtGenerator
+module.exports.GbtResult = GbtResult

backend/rust-gbt/package-lock.json

@@ -0,0 +1,34 @@
+{
+  "name": "gbt",
+  "version": "3.0.1",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "gbt",
+      "version": "3.0.1",
+      "hasInstallScript": true,
+      "dependencies": {
+        "@napi-rs/cli": "2.16.1"
+      },
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/@napi-rs/cli": {
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/cli/-/cli-2.16.1.tgz",
+      "integrity": "sha512-L0Gr5iEQIDEbvWdDr1HUaBOxBSHL1VZhWSk1oryawoT8qJIY+KGfLFelU+Qma64ivCPbxYpkfPoKYVG3rcoGIA==",
+      "bin": {
+        "napi": "scripts/index.js"
+      },
+      "engines": {
+        "node": ">= 10"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/Brooooooklyn"
+      }
+    }
+  }
+}

backend/rust-gbt/package.json

@@ -6,12 +6,10 @@
   "types": "index.d.ts",
   "scripts": {
     "artifacts": "napi artifacts",
-    "build": "npm install --no-save @napi-rs/cli@2.18.0 && npm run check-cargo-version && napi build --platform",
+    "build": "napi build --platform",
     "build-debug": "npm run build",
     "build-release": "npm run build -- --release --strip",
-    "check-cargo-version": "VER=$(cat rust-toolchain) ; if ! cargo version | grep \"cargo $VER\" >/dev/null ; then echo -e \"\\033[1;35m[[[[WARNING]]]]: cargo version mismatch with ./rust-toolchain version ($VER)!!!\\033[0m\" >&2; fi",
-    "clean": "rm -rf ./target/ ./node_modules/ *.node package-lock.json",
-    "to-backend": "FD=${FD:-../../backend/rust-gbt/} ; rm -rf $FD && mkdir $FD && cp index.js index.d.ts package.json *.node $FD",
+    "install": "npm run build-release",
     "prepublishOnly": "napi prepublish -t npm",
     "test": "cargo test"
   },
@@ -26,6 +24,9 @@
       ]
     }
   },
+  "dependencies": {
+    "@napi-rs/cli": "2.16.1"
+  },
   "engines": {
     "node": ">= 12"
   }

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

@@ -1,7 +1,6 @@
 {
   "MEMPOOL": {
     "ENABLED": true,
-    "OFFICIAL": false,
     "NETWORK": "__MEMPOOL_NETWORK__",
     "BACKEND": "__MEMPOOL_BACKEND__",
     "BLOCKS_SUMMARIES_INDEXING": true,
@@ -28,8 +27,9 @@
     "POOLS_JSON_TREE_URL": "__MEMPOOL_POOLS_JSON_TREE_URL__",
     "POOLS_JSON_URL": "__MEMPOOL_POOLS_JSON_URL__",
     "AUDIT": true,
+    "ADVANCED_GBT_AUDIT": true,
+    "ADVANCED_GBT_MEMPOOL": true,
     "RUST_GBT": false,
-    "LIMIT_GBT": false,
     "CPFP_INDEXING": true,
     "MAX_BLOCKS_BULK_QUERY": 999,
     "DISK_CACHE_BLOCK_INTERVAL": 999,
@@ -79,8 +79,7 @@
     "USERNAME": "__DATABASE_USERNAME__",
     "PASSWORD": "__DATABASE_PASSWORD__",
     "PID_DIR": "__DATABASE_PID_FILE__",
-    "TIMEOUT": 3000,
-    "POOL_SIZE": 100
+    "TIMEOUT": 3000
   },
   "SYSLOG": {
     "ENABLED": false,
@@ -93,6 +92,10 @@
     "ENABLED": false,
     "TX_PER_SECOND_SAMPLE_PERIOD": 20
   },
+  "BISQ": {
+    "ENABLED": true,
+    "DATA_PATH": "__BISQ_DATA_PATH__"
+  },
   "SOCKS5PROXY": {
     "ENABLED": true,
     "USE_ONION": true,
@@ -105,7 +108,9 @@
     "MEMPOOL_API": "__EXTERNAL_DATA_SERVER_MEMPOOL_API__",
     "MEMPOOL_ONION": "__EXTERNAL_DATA_SERVER_MEMPOOL_ONION__",
     "LIQUID_API": "__EXTERNAL_DATA_SERVER_LIQUID_API__",
-    "LIQUID_ONION": "__EXTERNAL_DATA_SERVER_LIQUID_ONION__"
+    "LIQUID_ONION": "__EXTERNAL_DATA_SERVER_LIQUID_ONION__",
+    "BISQ_URL": "__EXTERNAL_DATA_SERVER_BISQ_URL__",
+    "BISQ_ONION": "__EXTERNAL_DATA_SERVER_BISQ_ONION__"
   },
   "LIGHTNING": {
     "ENABLED": true,
@@ -140,9 +145,5 @@
     "ENABLED": false,
     "UNIX_SOCKET_PATH": "/tmp/redis.sock",
     "BATCH_QUERY_BASE_SIZE": 5000
-  },
-  "FIAT_PRICE": {
-    "ENABLED": true,
-    "API_KEY": "__MEMPOOL_CURRENCY_API_KEY__"
   }
 }

backend/src/__tests__/api/difficulty-adjustment.test.ts

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

backend/src/__tests__/config.test.ts

@@ -14,7 +14,6 @@ describe('Mempool Backend Config', () => {
 
       expect(config.MEMPOOL).toStrictEqual({
         ENABLED: true,
-        OFFICIAL: false,
         NETWORK: 'mainnet',
         BACKEND: 'none',
         BLOCKS_SUMMARIES_INDEXING: false,
@@ -41,8 +40,9 @@ describe('Mempool Backend Config', () => {
         POOLS_JSON_TREE_URL: 'https://api.github.com/repos/mempool/mining-pools/git/trees/master',
         POOLS_JSON_URL: 'https://raw.githubusercontent.com/mempool/mining-pools/master/pools-v2.json',
         AUDIT: false,
+        ADVANCED_GBT_AUDIT: false,
+        ADVANCED_GBT_MEMPOOL: false,
         RUST_GBT: false,
-        LIMIT_GBT: false,
         CPFP_INDEXING: false,
         MAX_BLOCKS_BULK_QUERY: 0,
         DISK_CACHE_BLOCK_INTERVAL: 6,
@@ -93,8 +93,7 @@ describe('Mempool Backend Config', () => {
         USERNAME: 'mempool',
         PASSWORD: 'mempool',
         TIMEOUT: 180000,
-        PID_DIR: '',
-        POOL_SIZE: 100,
+        PID_DIR: ''
       });
 
       expect(config.SYSLOG).toStrictEqual({
@@ -107,6 +106,8 @@ describe('Mempool Backend Config', () => {
 
       expect(config.STATISTICS).toStrictEqual({ ENABLED: true, TX_PER_SECOND_SAMPLE_PERIOD: 150 });
 
+      expect(config.BISQ).toStrictEqual({ ENABLED: false, DATA_PATH: '/bisq/statsnode-data/btc_mainnet/db' });
+
       expect(config.SOCKS5PROXY).toStrictEqual({
         ENABLED: false,
         USE_ONION: true,
@@ -120,7 +121,9 @@ describe('Mempool Backend Config', () => {
         MEMPOOL_API: 'https://mempool.space/api/v1',
         MEMPOOL_ONION: 'http://mempoolhqx4isw62xs7abwphsq7ldayuidyx2v2oethdhhj6mlo2r6ad.onion/api/v1',
         LIQUID_API: 'https://liquid.network/api/v1',
-        LIQUID_ONION: 'http://liquidmom47f6s3m53ebfxn47p76a6tlnxib3wp6deux7wuzotdr6cyd.onion/api/v1'
+        LIQUID_ONION: 'http://liquidmom47f6s3m53ebfxn47p76a6tlnxib3wp6deux7wuzotdr6cyd.onion/api/v1',
+        BISQ_URL: 'https://bisq.markets/api',
+        BISQ_ONION: 'http://bisqmktse2cabavbr2xjq7xw3h6g5ottemo5rolfcwt6aly6tp5fdryd.onion/api'
       });
 
       expect(config.MAXMIND).toStrictEqual({
@@ -147,11 +150,6 @@ describe('Mempool Backend Config', () => {
         UNIX_SOCKET_PATH: '',
         BATCH_QUERY_BASE_SIZE: 5000,
       });
-
-      expect(config.FIAT_PRICE).toStrictEqual({
-        ENABLED: true,
-        API_KEY: '',
-      });
     });
   });
 
@@ -178,6 +176,8 @@ describe('Mempool Backend Config', () => {
 
       expect(config.STATISTICS).toStrictEqual(fixture.STATISTICS);
 
+      expect(config.BISQ).toStrictEqual(fixture.BISQ);
+
       expect(config.SOCKS5PROXY).toStrictEqual(fixture.SOCKS5PROXY);
 
       expect(config.EXTERNAL_DATA_SERVER).toStrictEqual(fixture.EXTERNAL_DATA_SERVER);

backend/src/api/about.routes.ts

@@ -1,87 +0,0 @@
-import { Application } from "express";
-import config from "../config";
-import axios from "axios";
-import logger from "../logger";
-
-class AboutRoutes {
-  public initRoutes(app: Application) {
-    app
-      .get(config.MEMPOOL.API_URL_PREFIX + 'donations', async (req, res) => {
-        try {
-          const response = await axios.get(`${config.EXTERNAL_DATA_SERVER.MEMPOOL_API}/donations`, { responseType: 'stream', timeout: 10000 });
-          response.data.pipe(res);
-        } catch (e) {
-          res.status(500).end();
-        }
-      })
-      .get(config.MEMPOOL.API_URL_PREFIX + 'donations/images/:id', async (req, res) => {
-        try {
-          const response = await axios.get(`${config.EXTERNAL_DATA_SERVER.MEMPOOL_API}/donations/images/${req.params.id}`, {
-            responseType: 'stream', timeout: 10000
-          });
-          response.data.pipe(res);
-        } catch (e) {
-          res.status(500).end();
-        }
-      })
-      .get(config.MEMPOOL.API_URL_PREFIX + 'contributors', async (req, res) => {
-        try {
-          const response = await axios.get(`${config.EXTERNAL_DATA_SERVER.MEMPOOL_API}/contributors`, { responseType: 'stream', timeout: 10000 });
-          response.data.pipe(res);
-        } catch (e) {
-          res.status(500).end();
-        }
-      })
-      .get(config.MEMPOOL.API_URL_PREFIX + 'contributors/images/:id', async (req, res) => {
-        try {
-          const response = await axios.get(`${config.EXTERNAL_DATA_SERVER.MEMPOOL_API}/contributors/images/${req.params.id}`, {
-            responseType: 'stream', timeout: 10000
-          });
-          response.data.pipe(res);
-        } catch (e) {
-          res.status(500).end();
-        }
-      })
-      .get(config.MEMPOOL.API_URL_PREFIX + 'translators', async (req, res) => {
-        try {
-          const response = await axios.get(`${config.EXTERNAL_DATA_SERVER.MEMPOOL_API}/translators`, { responseType: 'stream', timeout: 10000 });
-          response.data.pipe(res);
-        } catch (e) {
-          res.status(500).end();
-        }
-      })
-      .get(config.MEMPOOL.API_URL_PREFIX + 'translators/images/:id', async (req, res) => {
-        try {
-          const response = await axios.get(`${config.EXTERNAL_DATA_SERVER.MEMPOOL_API}/translators/images/${req.params.id}`, {
-            responseType: 'stream', timeout: 10000
-          });
-          response.data.pipe(res);
-        } catch (e) {
-          res.status(500).end();
-        }
-      })
-      .get(config.MEMPOOL.API_URL_PREFIX + 'services/sponsors', async (req, res) => {
-        const url = `${config.MEMPOOL_SERVICES.API}/${req.originalUrl.replace('/api/v1/services/', '')}`;
-        try {
-          const response = await axios.get(url, { responseType: 'stream', timeout: 10000 });
-          response.data.pipe(res);
-        } catch (e) {
-          logger.err(`Unable to fetch sponsors from ${url}. ${e}`, 'About Page');
-          res.status(500).end();
-        }
-      })
-      .get(config.MEMPOOL.API_URL_PREFIX + 'services/account/images/:username', async (req, res) => {
-        const url = `${config.MEMPOOL_SERVICES.API}/${req.originalUrl.replace('/api/v1/services/', '')}`;
-        try {
-          const response = await axios.get(url, { responseType: 'stream', timeout: 10000 });
-          response.data.pipe(res);
-        } catch (e) {
-          logger.err(`Unable to fetch sponsor profile image from ${url}. ${e}`, 'About Page');
-          res.status(500).end();
-        }
-      })
-    ;
-  }
-}
-
-export default new AboutRoutes();

backend/src/api/acceleration/acceleration.routes.ts

@@ -1,75 +0,0 @@
-import { Application, Request, Response } from "express";
-import config from "../../config";
-import axios from "axios";
-import logger from "../../logger";
-
-class AccelerationRoutes {
-  private tag = 'Accelerator';
-
-  public initRoutes(app: Application) {
-    app
-      .get(config.MEMPOOL.API_URL_PREFIX + 'services/accelerator/accelerations', this.$getAcceleratorAccelerations.bind(this))
-      .get(config.MEMPOOL.API_URL_PREFIX + 'services/accelerator/accelerations/history', this.$getAcceleratorAccelerationsHistory.bind(this))
-      .get(config.MEMPOOL.API_URL_PREFIX + 'services/accelerator/accelerations/history/aggregated', this.$getAcceleratorAccelerationsHistoryAggregated.bind(this))
-      .get(config.MEMPOOL.API_URL_PREFIX + 'services/accelerator/accelerations/stats', this.$getAcceleratorAccelerationsStats.bind(this))
-    ;
-  }
-
-  private async $getAcceleratorAccelerations(req: Request, res: Response) {
-    const url = `${config.MEMPOOL_SERVICES.API}/${req.originalUrl.replace('/api/v1/services/', '')}`;
-    try {
-      const response = await axios.get(url, { responseType: 'stream', timeout: 10000 });
-      for (const key in response.headers) {
-        res.setHeader(key, response.headers[key]); 
-      }      
-      response.data.pipe(res);
-    } catch (e) {
-      logger.err(`Unable to get current accelerations from ${url} in $getAcceleratorAccelerations(), ${e}`, this.tag);
-      res.status(500).end();
-    }
-  }
-
-  private async $getAcceleratorAccelerationsHistory(req: Request, res: Response) {
-    const url = `${config.MEMPOOL_SERVICES.API}/${req.originalUrl.replace('/api/v1/services/', '')}`;
-    try {
-      const response = await axios.get(url, { responseType: 'stream', timeout: 10000 });
-      for (const key in response.headers) {
-        res.setHeader(key, response.headers[key]); 
-      }      
-      response.data.pipe(res);
-    } catch (e) {
-      logger.err(`Unable to get acceleration history from ${url} in $getAcceleratorAccelerationsHistory(), ${e}`, this.tag);
-      res.status(500).end();
-    }
-  }
-
-  private async $getAcceleratorAccelerationsHistoryAggregated(req: Request, res: Response) {
-    const url = `${config.MEMPOOL_SERVICES.API}/${req.originalUrl.replace('/api/v1/services/', '')}`;
-    try {
-      const response = await axios.get(url, { responseType: 'stream', timeout: 10000 });
-      for (const key in response.headers) {
-        res.setHeader(key, response.headers[key]); 
-      }      
-      response.data.pipe(res);
-    } catch (e) {
-      logger.err(`Unable to get aggregated acceleration history from ${url} in $getAcceleratorAccelerationsHistoryAggregated(), ${e}`, this.tag);
-      res.status(500).end();
-    }
-  }
-
-  private async $getAcceleratorAccelerationsStats(req: Request, res: Response) {
-    const url = `${config.MEMPOOL_SERVICES.API}/${req.originalUrl.replace('/api/v1/services/', '')}`;
-    try {
-      const response = await axios.get(url, { responseType: 'stream', timeout: 10000 });
-      for (const key in response.headers) {
-        res.setHeader(key, response.headers[key]); 
-      }      
-      response.data.pipe(res);
-    } catch (e) {
-      logger.err(`Unable to get acceleration stats from ${url} in $getAcceleratorAccelerationsStats(), ${e}`, this.tag);
-      res.status(500).end();
-    }
-  }
-}
-
-export default new AccelerationRoutes();

backend/src/api/acceleration/acceleration.ts

@@ -1,738 +0,0 @@
-import logger from '../../logger';
-import { MempoolTransactionExtended } from '../../mempool.interfaces';
-import { IEsploraApi } from '../bitcoin/esplora-api.interface';
-
-const BLOCK_WEIGHT_UNITS = 4_000_000;
-const BLOCK_SIGOPS = 80_000;
-const MAX_RELATIVE_GRAPH_SIZE = 200;
-const BID_BOOST_WINDOW = 40_000;
-const BID_BOOST_MIN_OFFSET = 10_000;
-const BID_BOOST_MAX_OFFSET = 400_000;
-
-type Acceleration = {
-  txid: string;
-  max_bid: number;
-};
-
-interface TxSummary {
-  txid: string; // txid of the current transaction
-  effectiveVsize: number; // Total vsize of the dependency tree
-  effectiveFee: number;  // Total fee of the dependency tree in sats
-  ancestorCount: number; // Number of ancestors
-}
-
-export interface AccelerationInfo {
-  txSummary: TxSummary;
-  targetFeeRate: number; // target fee rate (recommended next block fee, or median fee for mined block)
-  nextBlockFee: number; // fee in sats required to be in the next block (using recommended next block fee, or median fee for mined block)
-  cost: number; // additional cost to accelerate ((cost + txSummary.effectiveFee) / txSummary.effectiveVsize) >= targetFeeRate
-}
-
-interface GraphTx {
-  txid: string;
-  vsize: number;
-  weight: number;
-  fees: {
-    base: number; // in sats
-  };
-  depends: string[];
-  spentby: string[];
-}
-
-interface MempoolTx extends GraphTx {
-  ancestorcount: number;
-  ancestorsize: number;
-  fees: { // in sats
-    base: number;
-    ancestor: number;
-  };
-
-  ancestors: Map<string, MempoolTx>,
-  ancestorRate: number;
-  individualRate: number;
-  score: number;
-}
-
-class AccelerationCosts {
-  /**
-   * Takes a list of accelerations and verbose block data
-   * Returns the "fair" boost rate to charge accelerations
-   *
-   * @param accelerationsx
-   * @param verboseBlock
-   */
-  public calculateBoostRate(accelerations: Acceleration[], blockTxs: IEsploraApi.Transaction[]): number {
-    // Run GBT ourselves to calculate accurate effective fee rates
-    // the list of transactions comes from a mined block, so we already know everything fits within consensus limits
-    const template = makeBlockTemplate(blockTxs, accelerations, 1, Infinity, Infinity);
-
-    // initialize working maps for fast tx lookups
-    const accMap = {};
-    const txMap = {};
-    for (const acceleration of accelerations) {
-      accMap[acceleration.txid] = acceleration;
-    }
-    for (const tx of template) {
-      txMap[tx.txid] = tx;
-    }
-
-    // Identify and exclude accelerated and otherwise prioritized transactions
-    const excludeMap = {};
-    let totalWeight = 0;
-    let minAcceleratedPackage = Infinity;
-    let lastEffectiveRate = 0;
-    // Iterate over the mined template from bottom to top.
-    // Transactions should appear in ascending order of mining priority.
-    for (const blockTx of [...blockTxs].reverse()) {
-      const txid = blockTx.txid;
-      const tx = txMap[txid];
-      totalWeight += tx.weight;
-      const isAccelerated = accMap[txid] != null;
-      // If a cluster has a in-band effective fee rate than the previous cluster,
-      // it must have been prioritized out-of-band (in order to have a higher mining priority)
-      // so exclude from the analysis.
-      const isPrioritized = tx.effectiveFeePerVsize < lastEffectiveRate;
-      if (isPrioritized || isAccelerated) {
-        let packageWeight = 0;
-        // exclude this whole CPFP cluster
-        for (const clusterTxid of tx.cluster) {
-          packageWeight += txMap[clusterTxid].weight;
-          if (!excludeMap[clusterTxid]) {
-            excludeMap[clusterTxid] = true;
-          }
-        }
-        // keep track of the smallest accelerated CPFP cluster for later
-        if (isAccelerated) {
-          minAcceleratedPackage = Math.min(minAcceleratedPackage, packageWeight);
-        }
-      }
-      if (!isPrioritized) {
-        if (!isAccelerated) {
-          lastEffectiveRate = tx.effectiveFeePerVsize;
-        }
-      }
-    }
-
-    // The Bid Boost Rate is calculated by disregarding the bottom X weight units of the block,
-    // where X is the larger of BID_BOOST_MIN_OFFSET or the smallest accelerated package weight (the "offset"),
-    // then taking the average fee rate of the following BID_BOOST_WINDOW weight units
-    // (ignoring accelerated transactions and their ancestors).
-    //
-    // Transactions within the offset might pay less than the fair rate due to bin-packing effects
-    // But the average rate paid by the next chunk of non-accelerated transactions provides a good
-    // upper bound on the "next best rate" of alternatives to including the accelerated transactions
-    // (since, if there were any better options, they would have been included instead)
-    const spareWeight = BLOCK_WEIGHT_UNITS - totalWeight;
-    const windowOffset = Math.min(Math.max(minAcceleratedPackage, BID_BOOST_MIN_OFFSET, spareWeight), BID_BOOST_MAX_OFFSET);
-    const leftBound = windowOffset;
-    const rightBound = windowOffset + BID_BOOST_WINDOW;
-    let totalFeeInWindow = 0;
-    let totalWeightInWindow = Math.max(0, spareWeight - leftBound);
-    let txIndex = blockTxs.length - 1;
-    for (let offset = spareWeight; offset < BLOCK_WEIGHT_UNITS && txIndex >= 0; txIndex--) {
-      const txid = blockTxs[txIndex].txid;
-      const tx = txMap[txid];
-      if (excludeMap[txid]) {
-        // skip prioritized transactions and their ancestors
-        continue;
-      }
-
-      const left = offset;
-      const right = offset + tx.weight;
-      offset += tx.weight;
-      if (right < leftBound) {
-        // not within window yet
-        continue;
-      }
-      if (left > rightBound) {
-        // past window
-        break;
-      }
-      // count fees for weight units within the window
-      const overlapLeft = Math.max(leftBound, left);
-      const overlapRight = Math.min(rightBound, right);
-      const overlapUnits = overlapRight - overlapLeft;
-      totalFeeInWindow += (tx.effectiveFeePerVsize * (overlapUnits / 4));
-      totalWeightInWindow += overlapUnits;
-    }
-
-    if (totalWeightInWindow < BID_BOOST_WINDOW) {
-      // not enough un-prioritized transactions to calculate a fair rate
-      // just charge everyone their max bids
-      return Infinity;
-    }
-    // Divide the total fee by the size of the BID_BOOST_WINDOW in vbytes
-    const averageRate = totalFeeInWindow / (BID_BOOST_WINDOW / 4);
-    return averageRate;
-  }
-
-
-  /**
-   * Takes an accelerated mined txid and a target rate
-   * Returns the total vsize, fees and acceleration cost (in sats) of the tx and all same-block ancestors
-   * 
-   * @param txid 
-   * @param medianFeeRate 
-   */
-  public getAccelerationInfo(tx: MempoolTransactionExtended, targetFeeRate: number, transactions: MempoolTransactionExtended[]): AccelerationInfo {
-    // Get same-block transaction ancestors
-    const allRelatives = this.getSameBlockRelatives(tx, transactions);
-    const relativesMap = this.initializeRelatives(allRelatives);
-    const rootTx = relativesMap.get(tx.txid) as MempoolTx;
-
-    // Calculate cost to boost
-    return this.calculateAccelerationAncestors(rootTx, relativesMap, targetFeeRate);
-  }
-
-  /**
-   * Takes a raw transaction, and builds a graph of same-block relatives,
-   * and returns as a MempoolTx
-   * 
-   * @param tx 
-   */
-  private getSameBlockRelatives(tx: MempoolTransactionExtended, transactions: MempoolTransactionExtended[]): Map<string, GraphTx> {
-    const blockTxs = new Map<string, MempoolTransactionExtended>(); // map of txs in this block
-    const spendMap = new Map<string, string>(); // map of outpoints to spending txids
-    for (const tx of transactions) {
-      blockTxs.set(tx.txid, tx);
-      for (const vin of tx.vin) {
-        spendMap.set(`${vin.txid}:${vin.vout}`, tx.txid);
-      }
-    }
-
-    const relatives: Map<string, GraphTx> = new Map();
-    const stack: string[] = [tx.txid];
-
-    // build set of same-block ancestors
-    while (stack.length > 0) {
-      const nextTxid = stack.pop();
-      const nextTx = nextTxid ? blockTxs.get(nextTxid) : null;
-      if (!nextTx || relatives.has(nextTx.txid)) {
-        continue;
-      }
-
-      const mempoolTx = this.convertToGraphTx(nextTx);
-
-      mempoolTx.fees.base = nextTx.fee || 0;
-      mempoolTx.depends = nextTx.vin.map(vin => vin.txid).filter(inTxid => inTxid && blockTxs.has(inTxid)) as string[];
-      mempoolTx.spentby = nextTx.vout.map((vout, index) => spendMap.get(`${nextTx.txid}:${index}`)).filter(outTxid => outTxid && blockTxs.has(outTxid)) as string[];
-
-      for (const txid of [...mempoolTx.depends, ...mempoolTx.spentby]) {
-        if (txid) {
-          stack.push(txid);
-        }
-      }
-
-      relatives.set(mempoolTx.txid, mempoolTx);
-    }
-
-    return relatives;
-  }
-
-  /**
-   * Takes a raw transaction and converts it to MempoolTx format
-   * fee and ancestor data is initialized with dummy/null values
-   * 
-   * @param tx 
-   */
-  private convertToGraphTx(tx: MempoolTransactionExtended): GraphTx {
-    return {
-      txid: tx.txid,
-      vsize: Math.ceil(tx.weight / 4),
-      weight: tx.weight,
-      fees: {
-        base: 0, // dummy
-      },
-      depends: [], // dummy
-      spentby: [], //dummy
-    };
-  }
-
-  private convertGraphToMempoolTx(tx: GraphTx): MempoolTx {
-    return {
-      ...tx,
-      fees: {
-        base: tx.fees.base,
-        ancestor: tx.fees.base,
-      },
-      ancestorcount: 1,
-      ancestorsize: Math.ceil(tx.weight / 4),
-      ancestors: new Map<string, MempoolTx>(),
-      ancestorRate: 0,
-      individualRate: 0,
-      score: 0,
-    };
-  }
-
-  /**
-   * Given a root transaction, a list of in-mempool ancestors, and a target fee rate,
-   * Calculate the minimum set of transactions to fee-bump, their total vsize + fees
-   * 
-   * @param tx
-   * @param ancestors
-   */
-  private calculateAccelerationAncestors(tx: MempoolTx, relatives: Map<string, MempoolTx>, targetFeeRate: number): AccelerationInfo {
-    // add root tx to the ancestor map
-    relatives.set(tx.txid, tx);
-
-    // Check for high-sigop transactions (not supported)
-    relatives.forEach(entry => {
-      if (entry.vsize > Math.ceil(entry.weight / 4)) {
-        throw new Error(`high_sigop_tx`);
-      }
-    });
-
-    // Initialize individual & ancestor fee rates
-    relatives.forEach(entry => this.setAncestorScores(entry));
-
-    // Sort by descending ancestor score
-    let sortedRelatives = Array.from(relatives.values()).sort(this.mempoolComparator);
-
-    let includedInCluster: Map<string, MempoolTx> | null = null;
-
-    // While highest score >= targetFeeRate
-    let maxIterations = MAX_RELATIVE_GRAPH_SIZE;
-    while (sortedRelatives.length && sortedRelatives[0].score && sortedRelatives[0].score >= targetFeeRate && maxIterations > 0) {
-      maxIterations--;
-      // Grab the highest scoring entry
-      const best = sortedRelatives.shift();
-      if (best) {
-        const cluster = new Map<string, MempoolTx>(best.ancestors?.entries() || []);
-        if (best.ancestors.has(tx.txid)) {
-          includedInCluster = cluster;
-        }
-        cluster.set(best.txid, best);
-        // Remove this cluster (it already pays over the target rate, so doesn't need to be boosted)
-        // and update scores, ancestor totals and dependencies for the survivors
-        this.removeAncestors(cluster, relatives);
-
-        // re-sort
-        sortedRelatives = Array.from(relatives.values()).sort(this.mempoolComparator);
-      }
-    }
-
-    // sanity check for infinite loops / too many ancestors (should never happen)
-    if (maxIterations <= 0) {
-      logger.warn(`acceleration dependency calculation failed: calculateAccelerationAncestors loop exceeded ${MAX_RELATIVE_GRAPH_SIZE} iterations, unable to proceed`);
-      throw new Error('invalid_tx_dependencies');
-    }
-
-    let totalFee = tx.fees.ancestor;
-
-    // transaction is already CPFP-d above the target rate by some descendant
-    if (includedInCluster) {
-      let clusterSize = 0;
-      let clusterFee = 0;
-      includedInCluster.forEach(entry => {
-        clusterSize += entry.vsize;
-        clusterFee += entry.fees.base;
-      });
-      const clusterRate = clusterFee / clusterSize;
-      totalFee = Math.ceil(tx.ancestorsize * clusterRate);
-    }
-
-    // Whatever remains in the accelerated tx's dependencies needs to be boosted to the targetFeeRate
-    // Cost = (totalVsize * targetFeeRate) - totalFee
-    return {
-      txSummary: {
-        txid: tx.txid,
-        effectiveVsize: tx.ancestorsize,
-        effectiveFee: totalFee,
-        ancestorCount: tx.ancestorcount,
-      },
-      cost: Math.max(0, Math.ceil(tx.ancestorsize * targetFeeRate) - totalFee),
-      targetFeeRate,
-      nextBlockFee: Math.ceil(tx.ancestorsize * targetFeeRate),
-    };
-  }
-
-  /**
-   * Recursively traverses an in-mempool dependency graph, and sets a Map of in-mempool ancestors
-   * for each transaction.
-   * 
-   * @param tx 
-   * @param all 
-   */
-  private setAncestors(tx: MempoolTx, all: Map<string, MempoolTx>, visited: Map<string, Map<string, MempoolTx>>, depth: number = 0): Map<string, MempoolTx> {
-    // sanity check for infinite recursion / too many ancestors (should never happen)
-    if (depth >= 100) {
-      logger.warn('acceleration dependency calculation failed: setAncestors reached depth of 100, unable to proceed', `Accelerator`);
-      throw new Error('invalid_tx_dependencies');
-    }
-    
-    // initialize the ancestor map for this tx
-    tx.ancestors = new Map<string, MempoolTx>();
-    tx.depends.forEach(parentId => {
-      const parent = all.get(parentId);
-      if (parent) {
-        // add the parent
-        tx.ancestors?.set(parentId, parent);
-        // check for a cached copy of this parent's ancestors
-        let ancestors = visited.get(parent.txid);
-        if (!ancestors) {
-          // recursively fetch the parent's ancestors
-          ancestors = this.setAncestors(parent, all, visited, depth + 1);
-        }
-        // and add to this tx's map
-        ancestors.forEach((ancestor, ancestorId) => {
-          tx.ancestors?.set(ancestorId, ancestor);
-        });
-      }
-    });
-    visited.set(tx.txid, tx.ancestors);
-
-    return tx.ancestors;
-  }
-
-  /**
-   * Efficiently sets a Map of in-mempool ancestors for each member of an expanded relative graph
-   * by running setAncestors on each leaf, and caching intermediate results.
-   * then initializes ancestor data for each transaction
-   * 
-   * @param all 
-   */
-  private initializeRelatives(all: Map<string, GraphTx>): Map<string, MempoolTx> {
-    const mempoolTxs = new Map<string, MempoolTx>();
-    all.forEach(entry => {
-      mempoolTxs.set(entry.txid, this.convertGraphToMempoolTx(entry));
-    });
-    const visited: Map<string, Map<string, MempoolTx>> = new Map();
-    const leaves: MempoolTx[] = Array.from(mempoolTxs.values()).filter(entry => entry.spentby.length === 0);
-    for (const leaf of leaves) {
-      this.setAncestors(leaf, mempoolTxs, visited);
-    }
-    mempoolTxs.forEach(entry => {
-      entry.ancestors?.forEach(ancestor => {
-        entry.ancestorcount++;
-        entry.ancestorsize += ancestor.vsize;
-        entry.fees.ancestor += ancestor.fees.base;
-      });
-      this.setAncestorScores(entry);
-    });
-    return mempoolTxs;
-  }
-
-  /**
-   * Remove a cluster of transactions from an in-mempool dependency graph
-   * and update the survivors' scores and ancestors
-   * 
-   * @param cluster 
-   * @param ancestors 
-   */
-  private removeAncestors(cluster: Map<string, MempoolTx>, all: Map<string, MempoolTx>): void {
-    // remove
-    cluster.forEach(tx => {
-      all.delete(tx.txid);
-    });
-
-    // update survivors
-    all.forEach(tx => {
-      cluster.forEach(remove => {
-        if (tx.ancestors?.has(remove.txid)) {
-          // remove as dependency
-          tx.ancestors.delete(remove.txid);
-          tx.depends = tx.depends.filter(parent => parent !== remove.txid);
-          // update ancestor sizes and fees
-          tx.ancestorsize -= remove.vsize;
-          tx.fees.ancestor -= remove.fees.base;
-        }
-      });
-      // recalculate fee rates
-      this.setAncestorScores(tx);
-    });
-  }
-
-  /**
-   * Take a mempool transaction, and set the fee rates and ancestor score
-   * 
-   * @param tx 
-   */
-  private setAncestorScores(tx: MempoolTx): void {
-    tx.individualRate = tx.fees.base / tx.vsize;
-    tx.ancestorRate = tx.fees.ancestor / tx.ancestorsize;
-    tx.score = Math.min(tx.individualRate, tx.ancestorRate);
-  }
-
-  // Sort by descending score
-  private mempoolComparator(a, b): number {
-    return b.score - a.score;
-  }
-}
-
-export default new AccelerationCosts;
-
-interface TemplateTransaction {
-  txid: string;
-  order: number;
-  weight: number;
-  adjustedVsize: number; // sigop-adjusted vsize, rounded up to the nearest integer
-  sigops: number;
-  fee: number;
-  feeDelta: number;
-  ancestors: string[];
-  cluster: string[];
-  effectiveFeePerVsize: number;
-}
-
-interface MinerTransaction extends TemplateTransaction {
-  inputs: string[];
-  feePerVsize: number;
-  relativesSet: boolean;
-  ancestorMap: Map<string, MinerTransaction>;
-  children: Set<MinerTransaction>;
-  ancestorFee: number;
-  ancestorVsize: number;
-  ancestorSigops: number;
-  score: number;
-  used: boolean;
-  modified: boolean;
-  dependencyRate: number;
-}
-
-/*
-* Build a block using an approximation of the transaction selection algorithm from Bitcoin Core
-* (see BlockAssembler in https://github.com/bitcoin/bitcoin/blob/master/src/node/miner.cpp)
-*/
-export function makeBlockTemplate(candidates: IEsploraApi.Transaction[], accelerations: Acceleration[], maxBlocks: number = 8, weightLimit: number = BLOCK_WEIGHT_UNITS, sigopLimit: number = BLOCK_SIGOPS): TemplateTransaction[] {
-  const auditPool: Map<string, MinerTransaction> = new Map();
-  const mempoolArray: MinerTransaction[] = [];
-  
-  candidates.forEach(tx => {
-    // initializing everything up front helps V8 optimize property access later
-    const adjustedVsize = Math.ceil(Math.max(tx.weight / 4, 5 * (tx.sigops || 0)));
-    const feePerVsize = (tx.fee / adjustedVsize);
-    auditPool.set(tx.txid, {
-      txid: tx.txid,
-      order: txidToOrdering(tx.txid),
-      fee: tx.fee,
-      feeDelta: 0,
-      weight: tx.weight,
-      adjustedVsize,
-      feePerVsize: feePerVsize,
-      effectiveFeePerVsize: feePerVsize,
-      dependencyRate: feePerVsize,
-      sigops: tx.sigops || 0,
-      inputs: (tx.vin?.map(vin => vin.txid) || []) as string[],
-      relativesSet: false,
-      ancestors: [],
-      cluster: [],
-      ancestorMap: new Map<string, MinerTransaction>(),
-      children: new Set<MinerTransaction>(),
-      ancestorFee: 0,
-      ancestorVsize: 0,
-      ancestorSigops: 0,
-      score: 0,
-      used: false,
-      modified: false,
-    });
-    mempoolArray.push(auditPool.get(tx.txid) as MinerTransaction);
-  });
-
-  // set accelerated effective fee
-  for (const acceleration of accelerations) {
-    const tx = auditPool.get(acceleration.txid);
-    if (tx) {
-      tx.feeDelta = acceleration.max_bid;
-      tx.feePerVsize = ((tx.fee + tx.feeDelta) / tx.adjustedVsize);
-      tx.effectiveFeePerVsize = tx.feePerVsize;
-      tx.dependencyRate = tx.feePerVsize;
-    }
-  }
-
-  // Build relatives graph & calculate ancestor scores
-  for (const tx of mempoolArray) {
-    if (!tx.relativesSet) {
-      setRelatives(tx, auditPool);
-    }
-  }
-
-  // Sort by descending ancestor score
-  mempoolArray.sort(priorityComparator);
-
-  // Build blocks by greedily choosing the highest feerate package
-  // (i.e. the package rooted in the transaction with the best ancestor score)
-  const blocks: number[][] = [];
-  let blockWeight = 0;
-  let blockSigops = 0;
-  const transactions: MinerTransaction[] = [];
-  let modified: MinerTransaction[] = [];
-  const overflow: MinerTransaction[] = [];
-  let failures = 0;
-  while (mempoolArray.length || modified.length) {
-    // skip invalid transactions
-    while (mempoolArray[0].used || mempoolArray[0].modified) {
-      mempoolArray.shift();
-    }
-
-    // Select best next package
-    let nextTx;
-    const nextPoolTx = mempoolArray[0];
-    const nextModifiedTx = modified[0];
-    if (nextPoolTx && (!nextModifiedTx || (nextPoolTx.score || 0) > (nextModifiedTx.score || 0))) {
-      nextTx = nextPoolTx;
-      mempoolArray.shift();
-    } else {
-      modified.shift();
-      if (nextModifiedTx) {
-        nextTx = nextModifiedTx;
-      }
-    }
-
-    if (nextTx && !nextTx?.used) {
-      // Check if the package fits into this block
-      if (blocks.length >= (maxBlocks - 1) || ((blockWeight + (4 * nextTx.ancestorVsize) < weightLimit) && (blockSigops + nextTx.ancestorSigops <= sigopLimit))) {
-        const ancestors: MinerTransaction[] = Array.from(nextTx.ancestorMap.values());
-        // sort ancestors by dependency graph (equivalent to sorting by ascending ancestor count)
-        const sortedTxSet = [...ancestors.sort((a, b) => { return (a.ancestorMap.size || 0) - (b.ancestorMap.size || 0); }), nextTx];
-        const clusterTxids = sortedTxSet.map(tx => tx.txid);
-        const effectiveFeeRate = Math.min(nextTx.dependencyRate || Infinity, nextTx.ancestorFee / nextTx.ancestorVsize);
-        const used: MinerTransaction[] = [];
-        while (sortedTxSet.length) {
-          const ancestor = sortedTxSet.pop();
-          if (!ancestor) {
-            continue;
-          }
-          ancestor.used = true;
-          ancestor.usedBy = nextTx.txid;
-          // update this tx with effective fee rate & relatives data
-          if (ancestor.effectiveFeePerVsize !== effectiveFeeRate) {
-            ancestor.effectiveFeePerVsize = effectiveFeeRate;
-          }
-          ancestor.cluster = clusterTxids;
-          transactions.push(ancestor);
-          blockWeight += ancestor.weight;
-          blockSigops += ancestor.sigops;
-          used.push(ancestor);
-        }
-
-        // remove these as valid package ancestors for any descendants remaining in the mempool
-        if (used.length) {
-          used.forEach(tx => {
-            modified = updateDescendants(tx, auditPool, modified, effectiveFeeRate);
-          });
-        }
-
-        failures = 0;
-      } else {
-        // hold this package in an overflow list while we check for smaller options
-        overflow.push(nextTx);
-        failures++;
-      }
-    }
-
-    // this block is full
-    const exceededPackageTries = failures > 1000 && blockWeight > (weightLimit - 4000);
-    const queueEmpty = !mempoolArray.length && !modified.length;
-
-    if (exceededPackageTries || queueEmpty) {
-      break;
-    }
-  }
-
-  for (const tx of transactions) {
-    tx.ancestors = Object.values(tx.ancestorMap);
-  }
-
-  return transactions;
-}
-
-// traverse in-mempool ancestors
-// recursion unavoidable, but should be limited to depth < 25 by mempool policy
-function setRelatives(
-  tx: MinerTransaction,
-  mempool: Map<string, MinerTransaction>,
-): void {
-  for (const parent of tx.inputs) {
-    const parentTx = mempool.get(parent);
-    if (parentTx && !tx.ancestorMap?.has(parent)) {
-      tx.ancestorMap.set(parent, parentTx);
-      parentTx.children.add(tx);
-      // visit each node only once
-      if (!parentTx.relativesSet) {
-        setRelatives(parentTx, mempool);
-      }
-      parentTx.ancestorMap.forEach((ancestor) => {
-        tx.ancestorMap.set(ancestor.txid, ancestor);
-      });
-    }
-  };
-  tx.ancestorFee = (tx.fee + tx.feeDelta);
-  tx.ancestorVsize = tx.adjustedVsize || 0;
-  tx.ancestorSigops = tx.sigops || 0;
-  tx.ancestorMap.forEach((ancestor) => {
-    tx.ancestorFee += (ancestor.fee + ancestor.feeDelta);
-    tx.ancestorVsize += ancestor.adjustedVsize;
-    tx.ancestorSigops += ancestor.sigops;
-  });
-  tx.score = tx.ancestorFee / tx.ancestorVsize;
-  tx.relativesSet = true;
-}
-
-// iterate over remaining descendants, removing the root as a valid ancestor & updating the ancestor score
-// avoids recursion to limit call stack depth
-function updateDescendants(
-  rootTx: MinerTransaction,
-  mempool: Map<string, MinerTransaction>,
-  modified: MinerTransaction[],
-  clusterRate: number,
-): MinerTransaction[] {
-  const descendantSet: Set<MinerTransaction> = new Set();
-  // stack of nodes left to visit
-  const descendants: MinerTransaction[] = [];
-  let descendantTx: MinerTransaction | undefined;
-  rootTx.children.forEach(childTx => {
-    if (!descendantSet.has(childTx)) {
-      descendants.push(childTx);
-      descendantSet.add(childTx);
-    }
-  });
-  while (descendants.length) {
-    descendantTx = descendants.pop();
-    if (descendantTx && descendantTx.ancestorMap && descendantTx.ancestorMap.has(rootTx.txid)) {
-      // remove tx as ancestor
-      descendantTx.ancestorMap.delete(rootTx.txid);
-      descendantTx.ancestorFee -= (rootTx.fee + rootTx.feeDelta);
-      descendantTx.ancestorVsize -= rootTx.adjustedVsize;
-      descendantTx.ancestorSigops -= rootTx.sigops;
-      descendantTx.score = descendantTx.ancestorFee / descendantTx.ancestorVsize;
-      descendantTx.dependencyRate = descendantTx.dependencyRate ? Math.min(descendantTx.dependencyRate, clusterRate) : clusterRate;
-
-      if (!descendantTx.modified) {
-        descendantTx.modified = true;
-        modified.push(descendantTx);
-      }
-
-      // add this node's children to the stack
-      descendantTx.children.forEach(childTx => {
-        // visit each node only once
-        if (!descendantSet.has(childTx)) {
-          descendants.push(childTx);
-          descendantSet.add(childTx);
-        }
-      });
-    }
-  }
-  // return new, resorted modified list
-  return modified.sort(priorityComparator);
-}
-
-// Used to sort an array of MinerTransactions by descending ancestor score
-function priorityComparator(a: MinerTransaction, b: MinerTransaction): number {
-  if (b.score === a.score) {
-    // tie-break by txid for stability
-    return a.order - b.order;
-  } else {
-    return b.score - a.score;
-  }
-}
-
-// returns the most significant 4 bytes of the txid as an integer
-function txidToOrdering(txid: string): number {
-  return parseInt(
-    txid.substring(62, 64) +
-      txid.substring(60, 62) +
-      txid.substring(58, 60) +
-      txid.substring(56, 58),
-    16
-  );
-}

backend/src/api/audit.ts

@@ -7,14 +7,13 @@ const PROPAGATION_MARGIN = 180; // in seconds, time since a transaction is first
 
 class Audit {
   auditBlock(transactions: MempoolTransactionExtended[], projectedBlocks: MempoolBlockWithTransactions[], mempool: { [txId: string]: MempoolTransactionExtended }, useAccelerations: boolean = false)
-   : { censored: string[], added: string[], prioritized: string[], fresh: string[], sigop: string[], fullrbf: string[], accelerated: string[], score: number, similarity: number } {
+   : { censored: string[], added: string[], fresh: string[], sigop: string[], fullrbf: string[], accelerated: string[], score: number, similarity: number } {
     if (!projectedBlocks?.[0]?.transactionIds || !mempool) {
-      return { censored: [], added: [], prioritized: [], fresh: [], sigop: [], fullrbf: [], accelerated: [], score: 1, similarity: 1 };
+      return { censored: [], added: [], fresh: [], sigop: [], fullrbf: [], accelerated: [], score: 1, similarity: 1 };
     }
 
     const matches: string[] = []; // present in both mined block and template
     const added: string[] = []; // present in mined block, not in template
-    const prioritized: string[] = [] // present in the mined block, not in the template, but further down in the mempool
     const fresh: string[] = []; // missing, but firstSeen or lastBoosted within PROPAGATION_MARGIN
     const rbf: string[] = []; // either missing or present, and either part of a full-rbf replacement, or a conflict with the mined block
     const accelerated: string[] = []; // prioritized by the mempool accelerator
@@ -69,27 +68,20 @@ class Audit {
 
     // we can expect an honest miner to include 'displaced' transactions in place of recent arrivals and censored txs
     // these displaced transactions should occupy the first N weight units of the next projected block
-    let displacedWeightRemaining = displacedWeight + 4000;
+    let displacedWeightRemaining = displacedWeight;
     let index = 0;
     let lastFeeRate = Infinity;
     let failures = 0;
-    let blockIndex = 1;
-    while (projectedBlocks[blockIndex] && failures < 500) {
-      if (index >= projectedBlocks[blockIndex].transactionIds.length) {
-        index = 0;
-        blockIndex++;
-      }
-      const txid = projectedBlocks[blockIndex].transactionIds[index];
+    while (projectedBlocks[1] && index < projectedBlocks[1].transactionIds.length && failures < 500) {
+      const txid = projectedBlocks[1].transactionIds[index];
       const tx = mempool[txid];
       if (tx) {
         const fits = (tx.weight - displacedWeightRemaining) < 4000;
-        // 0.005 margin of error for any remaining vsize rounding issues
-        const feeMatches = tx.effectiveFeePerVsize >= (lastFeeRate - 0.005);
+        const feeMatches = tx.effectiveFeePerVsize >= lastFeeRate;
         if (fits || feeMatches) {
           isDisplaced[txid] = true;
           if (fits) {
-            // (tx.effectiveFeePerVsize * tx.vsize) / Math.ceil(tx.vsize) attempts to correct for vsize rounding in the simple non-CPFP case
-            lastFeeRate = Math.min(lastFeeRate, (tx.effectiveFeePerVsize * tx.vsize) / Math.ceil(tx.vsize));
+            lastFeeRate = Math.min(lastFeeRate, tx.effectiveFeePerVsize);
           }
           if (tx.firstSeen == null || (now - (tx?.firstSeen || 0)) > PROPAGATION_MARGIN) {
             displacedWeightRemaining -= tx.weight;
@@ -114,11 +106,7 @@ class Audit {
         if (rbfCache.has(tx.txid)) {
           rbf.push(tx.txid);
         } else if (!isDisplaced[tx.txid]) {
-          if (mempool[tx.txid]) {
-            prioritized.push(tx.txid);
-          } else {
-            added.push(tx.txid);
-          }
+          added.push(tx.txid);
         }
         overflowWeight += tx.weight;
       }
@@ -167,7 +155,6 @@ class Audit {
     return {
       censored: Object.keys(isCensored),
       added,
-      prioritized,
       fresh,
       sigop: [],
       fullrbf: rbf,

backend/src/api/backend-info.ts

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

backend/src/api/bisq/bisq.routes.ts

@@ -0,0 +1,381 @@
+import { Application, Request, Response } from 'express';
+import config from '../../config';
+import { RequiredSpec } from '../../mempool.interfaces';
+import bisq from './bisq';
+import { MarketsApiError } from './interfaces';
+import marketsApi from './markets-api';
+
+class BisqRoutes {
+  public initRoutes(app: Application) {
+    app
+      .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/stats', this.getBisqStats)
+      .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/tx/:txId', this.getBisqTransaction)
+      .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/block/:hash', this.getBisqBlock)
+      .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/blocks/tip/height', this.getBisqTip)
+      .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/blocks/:index/:length', this.getBisqBlocks)
+      .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/address/:address', this.getBisqAddress)
+      .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/txs/:index/:length', this.getBisqTransactions)
+      .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/currencies', this.getBisqMarketCurrencies.bind(this))
+      .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/depth', this.getBisqMarketDepth.bind(this))
+      .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/hloc', this.getBisqMarketHloc.bind(this))
+      .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/markets', this.getBisqMarketMarkets.bind(this))
+      .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/offers', this.getBisqMarketOffers.bind(this))
+      .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/ticker', this.getBisqMarketTicker.bind(this))
+      .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/trades', this.getBisqMarketTrades.bind(this))
+      .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/volumes', this.getBisqMarketVolumes.bind(this))
+      .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/volumes/7d', this.getBisqMarketVolumes7d.bind(this))
+    ;
+  }
+
+
+  private getBisqStats(req: Request, res: Response) {
+    const result = bisq.getStats();
+    res.json(result);
+  }
+
+  private getBisqTip(req: Request, res: Response) {
+    const result = bisq.getLatestBlockHeight();
+    res.type('text/plain');
+    res.send(result.toString());
+  }
+
+  private getBisqTransaction(req: Request, res: Response) {
+    const result = bisq.getTransaction(req.params.txId);
+    if (result) {
+      res.json(result);
+    } else {
+      res.status(404).send('Bisq transaction not found');
+    }
+  }
+
+  private getBisqTransactions(req: Request, res: Response) {
+    const types: string[] = [];
+    req.query.types = req.query.types || [];
+    if (!Array.isArray(req.query.types)) {
+      res.status(500).send('Types is not an array');
+      return;
+    }
+
+    for (const _type in req.query.types) {
+      if (typeof req.query.types[_type] === 'string') {
+        types.push(req.query.types[_type].toString());
+      }
+    }
+
+    const index = parseInt(req.params.index, 10) || 0;
+    const length = parseInt(req.params.length, 10) > 100 ? 100 : parseInt(req.params.length, 10) || 25;
+    const [transactions, count] = bisq.getTransactions(index, length, types);
+    res.header('X-Total-Count', count.toString());
+    res.json(transactions);
+  }
+
+  private getBisqBlock(req: Request, res: Response) {
+    const result = bisq.getBlock(req.params.hash);
+    if (result) {
+      res.json(result);
+    } else {
+      res.status(404).send('Bisq block not found');
+    }
+  }
+
+  private getBisqBlocks(req: Request, res: Response) {
+    const index = parseInt(req.params.index, 10) || 0;
+    const length = parseInt(req.params.length, 10) > 100 ? 100 : parseInt(req.params.length, 10) || 25;
+    const [transactions, count] = bisq.getBlocks(index, length);
+    res.header('X-Total-Count', count.toString());
+    res.json(transactions);
+  }
+
+  private getBisqAddress(req: Request, res: Response) {
+    const result = bisq.getAddress(req.params.address.substr(1));
+    if (result) {
+      res.json(result);
+    } else {
+      res.status(404).send('Bisq address not found');
+    }
+  }
+
+  private getBisqMarketCurrencies(req: Request, res: Response) {
+    const constraints: RequiredSpec = {
+      'type': {
+        required: false,
+        types: ['crypto', 'fiat', 'all']
+      },
+    };
+
+    const p = this.parseRequestParameters(req.query, constraints);
+    if (p.error) {
+      res.status(400).json(this.getBisqMarketErrorResponse(p.error));
+      return;
+    }
+
+    const result = marketsApi.getCurrencies(p.type);
+    if (result) {
+      res.json(result);
+    } else {
+      res.status(500).json(this.getBisqMarketErrorResponse('getBisqMarketCurrencies error'));
+    }
+  }
+
+  private getBisqMarketDepth(req: Request, res: Response) {
+    const constraints: RequiredSpec = {
+      'market': {
+        required: true,
+        types: ['@string']
+      },
+    };
+
+    const p = this.parseRequestParameters(req.query, constraints);
+    if (p.error) {
+      res.status(400).json(this.getBisqMarketErrorResponse(p.error));
+      return;
+    }
+
+    const result = marketsApi.getDepth(p.market);
+    if (result) {
+      res.json(result);
+    } else {
+      res.status(500).json(this.getBisqMarketErrorResponse('getBisqMarketDepth error'));
+    }
+  }
+
+  private getBisqMarketMarkets(req: Request, res: Response) {
+    const result = marketsApi.getMarkets();
+    if (result) {
+      res.json(result);
+    } else {
+      res.status(500).json(this.getBisqMarketErrorResponse('getBisqMarketMarkets error'));
+    }
+  }
+
+  private getBisqMarketTrades(req: Request, res: Response) {
+    const constraints: RequiredSpec = {
+      'market': {
+        required: true,
+        types: ['@string']
+      },
+      'timestamp_from': {
+        required: false,
+        types: ['@number']
+      },
+      'timestamp_to': {
+        required: false,
+        types: ['@number']
+      },
+      'trade_id_to': {
+        required: false,
+        types: ['@string']
+      },
+      'trade_id_from': {
+        required: false,
+        types: ['@string']
+      },
+      'direction': {
+        required: false,
+        types: ['buy', 'sell']
+      },
+      'limit': {
+        required: false,
+        types: ['@number']
+      },
+      'sort': {
+        required: false,
+        types: ['asc', 'desc']
+      }
+    };
+
+    const p = this.parseRequestParameters(req.query, constraints);
+    if (p.error) {
+      res.status(400).json(this.getBisqMarketErrorResponse(p.error));
+      return;
+    }
+
+    const result = marketsApi.getTrades(p.market, p.timestamp_from,
+      p.timestamp_to, p.trade_id_from, p.trade_id_to, p.direction, p.limit, p.sort);
+    if (result) {
+      res.json(result);
+    } else {
+      res.status(500).json(this.getBisqMarketErrorResponse('getBisqMarketTrades error'));
+    }
+  }
+
+  private getBisqMarketOffers(req: Request, res: Response) {
+    const constraints: RequiredSpec = {
+      'market': {
+        required: true,
+        types: ['@string']
+      },
+      'direction': {
+        required: false,
+        types: ['buy', 'sell']
+      },
+    };
+
+    const p = this.parseRequestParameters(req.query, constraints);
+    if (p.error) {
+      res.status(400).json(this.getBisqMarketErrorResponse(p.error));
+      return;
+    }
+
+    const result = marketsApi.getOffers(p.market, p.direction);
+    if (result) {
+      res.json(result);
+    } else {
+      res.status(500).json(this.getBisqMarketErrorResponse('getBisqMarketOffers error'));
+    }
+  }
+
+  private getBisqMarketVolumes(req: Request, res: Response) {
+    const constraints: RequiredSpec = {
+      'market': {
+        required: false,
+        types: ['@string']
+      },
+      'interval': {
+        required: false,
+        types: ['minute', 'half_hour', 'hour', 'half_day', 'day', 'week', 'month', 'year', 'auto']
+      },
+      'timestamp_from': {
+        required: false,
+        types: ['@number']
+      },
+      'timestamp_to': {
+        required: false,
+        types: ['@number']
+      },
+      'milliseconds': {
+        required: false,
+        types: ['@boolean']
+      },
+      'timestamp': {
+        required: false,
+        types: ['no', 'yes']
+      },
+    };
+
+    const p = this.parseRequestParameters(req.query, constraints);
+    if (p.error) {
+      res.status(400).json(this.getBisqMarketErrorResponse(p.error));
+      return;
+    }
+
+    const result = marketsApi.getVolumes(p.market, p.timestamp_from, p.timestamp_to, p.interval, p.milliseconds, p.timestamp);
+    if (result) {
+      res.json(result);
+    } else {
+      res.status(500).json(this.getBisqMarketErrorResponse('getBisqMarketVolumes error'));
+    }
+  }
+
+  private getBisqMarketHloc(req: Request, res: Response) {
+    const constraints: RequiredSpec = {
+      'market': {
+        required: true,
+        types: ['@string']
+      },
+      'interval': {
+        required: false,
+        types: ['minute', 'half_hour', 'hour', 'half_day', 'day', 'week', 'month', 'year', 'auto']
+      },
+      'timestamp_from': {
+        required: false,
+        types: ['@number']
+      },
+      'timestamp_to': {
+        required: false,
+        types: ['@number']
+      },
+      'milliseconds': {
+        required: false,
+        types: ['@boolean']
+      },
+      'timestamp': {
+        required: false,
+        types: ['no', 'yes']
+      },
+    };
+
+    const p = this.parseRequestParameters(req.query, constraints);
+    if (p.error) {
+      res.status(400).json(this.getBisqMarketErrorResponse(p.error));
+      return;
+    }
+
+    const result = marketsApi.getHloc(p.market, p.interval, p.timestamp_from, p.timestamp_to, p.milliseconds, p.timestamp);
+    if (result) {
+      res.json(result);
+    } else {
+      res.status(500).json(this.getBisqMarketErrorResponse('getBisqMarketHloc error'));
+    }
+  }
+
+  private getBisqMarketTicker(req: Request, res: Response) {
+    const constraints: RequiredSpec = {
+      'market': {
+        required: false,
+        types: ['@string']
+      },
+    };
+
+    const p = this.parseRequestParameters(req.query, constraints);
+    if (p.error) {
+      res.status(400).json(this.getBisqMarketErrorResponse(p.error));
+      return;
+    }
+
+    const result = marketsApi.getTicker(p.market);
+    if (result) {
+      res.json(result);
+    } else {
+      res.status(500).json(this.getBisqMarketErrorResponse('getBisqMarketTicker error'));
+    }
+  }
+
+  private getBisqMarketVolumes7d(req: Request, res: Response) {
+    const result = marketsApi.getVolumesByTime(604800);
+    if (result) {
+      res.json(result);
+    } else {
+      res.status(500).json(this.getBisqMarketErrorResponse('getBisqMarketVolumes7d error'));
+    }
+  }
+
+  private parseRequestParameters(requestParams: object, params: RequiredSpec): { [name: string]: any; } {
+    const final = {};
+    for (const i in params) {
+      if (params.hasOwnProperty(i)) {
+        if (params[i].required && requestParams[i] === undefined) {
+          return { error: i + ' parameter missing'};
+        }
+        if (typeof requestParams[i] === 'string') {
+          const str = (requestParams[i] || '').toString().toLowerCase();
+          if (params[i].types.indexOf('@number') > -1) {
+            const number = parseInt((str).toString(), 10);
+            final[i] = number;
+          } else if (params[i].types.indexOf('@string') > -1) {
+            final[i] = str;
+          } else if (params[i].types.indexOf('@boolean') > -1) {
+            final[i] = str === 'true' || str === 'yes';
+          } else if (params[i].types.indexOf(str) > -1) {
+            final[i] = str;
+          } else {
+            return { error: i + ' parameter invalid'};
+          }
+        } else if (typeof requestParams[i] === 'number') {
+          final[i] = requestParams[i];
+        }
+      }
+    }
+    return final;
+  }
+
+  private getBisqMarketErrorResponse(message: string): MarketsApiError {
+    return {
+      'success': 0,
+      'error': message
+    };
+  }
+
+}
+
+export default new BisqRoutes;

backend/src/api/bisq/bisq.ts

@@ -0,0 +1,359 @@
+import config from '../../config';
+import * as fs from 'fs';
+import axios, { AxiosResponse } from 'axios';
+import * as http from 'http';
+import * as https from 'https';
+import { SocksProxyAgent } from 'socks-proxy-agent';
+import { BisqBlocks, BisqBlock, BisqTransaction, BisqStats, BisqTrade } from './interfaces';
+import { Common } from '../common';
+import { BlockExtended } from '../../mempool.interfaces';
+import backendInfo from '../backend-info';
+import logger from '../../logger';
+
+class Bisq {
+  private static BLOCKS_JSON_FILE_PATH = config.BISQ.DATA_PATH + '/json/all/blocks.json';
+  private latestBlockHeight = 0;
+  private blocks: BisqBlock[] = [];
+  private allBlocks: BisqBlock[] = [];
+  private transactions: BisqTransaction[] = [];
+  private transactionIndex: { [txId: string]: BisqTransaction } = {};
+  private blockIndex: { [hash: string]: BisqBlock } = {};
+  private addressIndex: { [address: string]: BisqTransaction[] } = {};
+  private stats: BisqStats = {
+    minted: 0,
+    burnt: 0,
+    addresses: 0,
+    unspent_txos: 0,
+    spent_txos: 0,
+  };
+  private price: number = 0;
+  private priceUpdateCallbackFunction: ((price: number) => void) | undefined;
+  private topDirectoryWatcher: fs.FSWatcher | undefined;
+  private subdirectoryWatcher: fs.FSWatcher | undefined;
+
+  constructor() {}
+
+  startBisqService(): void {
+    try {
+      this.checkForBisqDataFolder();
+    } catch (e) {
+      logger.info('Retrying to start bisq service in 3 minutes');
+      setTimeout(this.startBisqService.bind(this), 180000);
+      return;
+    }
+    this.loadBisqDumpFile();
+    setInterval(this.updatePrice.bind(this), 1000 * 60 * 60);
+    this.updatePrice();
+    this.startTopDirectoryWatcher();
+    this.startSubDirectoryWatcher();
+  }
+
+  handleNewBitcoinBlock(block: BlockExtended): void {
+    if (block.height - 10 > this.latestBlockHeight && this.latestBlockHeight !== 0) {
+      logger.warn(`Bitcoin block height (#${block.height}) has diverged from the latest Bisq block height (#${this.latestBlockHeight}). Restarting watchers...`);
+      this.startTopDirectoryWatcher();
+      this.startSubDirectoryWatcher();
+    }
+  }
+
+  getTransaction(txId: string): BisqTransaction | undefined {
+    return this.transactionIndex[txId];
+  }
+
+  getTransactions(start: number, length: number, types: string[]): [BisqTransaction[], number] {
+    let transactions = this.transactions;
+    if (types.length) {
+      transactions = transactions.filter((tx) => types.indexOf(tx.txType) > -1);
+    }
+    return [transactions.slice(start, length + start), transactions.length];
+  }
+
+  getBlock(hash: string): BisqBlock | undefined {
+    return this.blockIndex[hash];
+  }
+
+  getAddress(hash: string): BisqTransaction[] {
+    return this.addressIndex[hash];
+  }
+
+  getBlocks(start: number, length: number): [BisqBlock[], number] {
+    return [this.blocks.slice(start, length + start), this.blocks.length];
+  }
+
+  getStats(): BisqStats {
+    return this.stats;
+  }
+
+  setPriceCallbackFunction(fn: (price: number) => void) {
+    this.priceUpdateCallbackFunction = fn;
+  }
+
+  getLatestBlockHeight(): number {
+    return this.latestBlockHeight;
+  }
+
+  private checkForBisqDataFolder() {
+    if (!fs.existsSync(Bisq.BLOCKS_JSON_FILE_PATH)) {
+      logger.warn(Bisq.BLOCKS_JSON_FILE_PATH + ` doesn't exist. Make sure Bisq is running and the config is correct before starting the server.`);
+      throw new Error(`Cannot load BISQ ${Bisq.BLOCKS_JSON_FILE_PATH} file`);
+    }
+  }
+
+  private startTopDirectoryWatcher() {
+    if (this.topDirectoryWatcher) {
+      this.topDirectoryWatcher.close();
+    }
+    let fsWait: NodeJS.Timeout | null = null;
+    this.topDirectoryWatcher = fs.watch(config.BISQ.DATA_PATH + '/json', () => {
+      if (fsWait) {
+        clearTimeout(fsWait);
+      }
+      if (this.subdirectoryWatcher) {
+        this.subdirectoryWatcher.close();
+      }
+      fsWait = setTimeout(() => {
+        logger.debug(`Bisq restart detected. Resetting both watchers in 3 minutes.`);
+        setTimeout(() => {
+          this.startTopDirectoryWatcher();
+          this.startSubDirectoryWatcher();
+          this.loadBisqDumpFile();
+        }, 180000);
+      }, 15000);
+    });
+  }
+
+  private startSubDirectoryWatcher() {
+    if (this.subdirectoryWatcher) {
+      this.subdirectoryWatcher.close();
+    }
+    if (!fs.existsSync(Bisq.BLOCKS_JSON_FILE_PATH)) {
+      logger.warn(Bisq.BLOCKS_JSON_FILE_PATH + ` doesn't exist. Trying to restart sub directory watcher again in 3 minutes.`);
+      setTimeout(() => this.startSubDirectoryWatcher(), 180000);
+      return;
+    }
+    let fsWait: NodeJS.Timeout | null = null;
+    this.subdirectoryWatcher = fs.watch(config.BISQ.DATA_PATH + '/json/all', () => {
+      if (fsWait) {
+        clearTimeout(fsWait);
+      }
+      fsWait = setTimeout(() => {
+        logger.debug(`Change detected in the Bisq data folder.`);
+        this.loadBisqDumpFile();
+      }, 2000);
+    });
+  }
+  private async updatePrice() {
+    type axiosOptions = {
+      headers: {
+        'User-Agent': string
+      };
+      timeout: number;
+      httpAgent?: http.Agent;
+      httpsAgent?: https.Agent;
+    }
+    const setDelay = (secs: number = 1): Promise<void> => new Promise(resolve => setTimeout(() => resolve(), secs * 1000));
+    const BISQ_URL = (config.SOCKS5PROXY.ENABLED === true) && (config.SOCKS5PROXY.USE_ONION === true) ? config.EXTERNAL_DATA_SERVER.BISQ_ONION : config.EXTERNAL_DATA_SERVER.BISQ_URL;
+    const isHTTP = (new URL(BISQ_URL).protocol.split(':')[0] === 'http') ? true : false;
+    const axiosOptions: axiosOptions = {
+      headers: {
+        'User-Agent': (config.MEMPOOL.USER_AGENT === 'mempool') ? `mempool/v${backendInfo.getBackendInfo().version}` : `${config.MEMPOOL.USER_AGENT}`
+      },
+      timeout: config.SOCKS5PROXY.ENABLED ? 30000 : 10000
+    };
+    let retry = 0;
+
+    while(retry < config.MEMPOOL.EXTERNAL_MAX_RETRY) {
+      try {
+        if (config.SOCKS5PROXY.ENABLED) {
+          const socksOptions: any = {
+            agentOptions: {
+              keepAlive: true,
+            },
+            hostname: config.SOCKS5PROXY.HOST,
+            port: config.SOCKS5PROXY.PORT
+          };
+
+          if (config.SOCKS5PROXY.USERNAME && config.SOCKS5PROXY.PASSWORD) {
+            socksOptions.username = config.SOCKS5PROXY.USERNAME;
+            socksOptions.password = config.SOCKS5PROXY.PASSWORD;
+          } else {
+            // Retry with different tor circuits https://stackoverflow.com/a/64960234
+            socksOptions.username = `circuit${retry}`;
+          }
+
+          // Handle proxy agent for onion addresses
+          if (isHTTP) {
+            axiosOptions.httpAgent = new SocksProxyAgent(socksOptions);
+          } else {
+            axiosOptions.httpsAgent = new SocksProxyAgent(socksOptions);
+          }
+        }
+        
+        const data: AxiosResponse = await axios.get(`${BISQ_URL}/trades/?market=bsq_btc`, axiosOptions);
+        if (data.statusText === 'error' || !data.data) {
+          throw new Error(`Could not fetch data from Bisq market, Error: ${data.status}`);
+        }
+        const prices: number[] = [];
+        data.data.forEach((trade) => {
+          prices.push(parseFloat(trade.price) * 100000000);
+        });
+        prices.sort((a, b) => a - b);
+        this.price = Common.median(prices);
+        if (this.priceUpdateCallbackFunction) {
+          this.priceUpdateCallbackFunction(this.price);
+        }
+        logger.debug('Successfully updated Bisq market price');
+        break;
+      } catch (e) {
+        logger.err('Error updating Bisq market price: '  + (e instanceof Error ? e.message : e));
+        await setDelay(config.MEMPOOL.EXTERNAL_RETRY_INTERVAL);
+        retry++;
+      }
+    }
+  }
+
+  private async loadBisqDumpFile(): Promise<void> {
+    this.allBlocks = [];
+    try {
+      await this.loadData();
+      this.buildIndex();
+      this.calculateStats();
+    } catch (e) {
+      logger.info('Cannot load bisq dump file because: ' + (e instanceof Error ? e.message : e));
+    }
+  }
+
+  private buildIndex() {
+    const start = new Date().getTime();
+    this.transactions = [];
+    this.transactionIndex = {};
+    this.addressIndex = {};
+
+    this.allBlocks.forEach((block) => {
+      /* Build block index */
+      if (!this.blockIndex[block.hash]) {
+        this.blockIndex[block.hash] = block;
+      }
+
+      /* Build transactions index */
+      block.txs.forEach((tx) => {
+        this.transactions.push(tx);
+        this.transactionIndex[tx.id] = tx;
+      });
+    });
+
+    /* Build address index */
+    this.transactions.forEach((tx) => {
+      tx.inputs.forEach((input) => {
+        if (!this.addressIndex[input.address]) {
+          this.addressIndex[input.address] = [];
+        }
+        if (this.addressIndex[input.address].indexOf(tx) === -1) {
+          this.addressIndex[input.address].push(tx);
+        }
+      });
+      tx.outputs.forEach((output) => {
+        if (!this.addressIndex[output.address]) {
+          this.addressIndex[output.address] = [];
+        }
+        if (this.addressIndex[output.address].indexOf(tx) === -1) {
+          this.addressIndex[output.address].push(tx);
+        }
+      });
+    });
+
+    const time = new Date().getTime() - start;
+    logger.debug('Bisq data index rebuilt in ' + time + ' ms');
+  }
+
+  private calculateStats() {
+    let minted = 0;
+    let burned = 0;
+    let unspent = 0;
+    let spent = 0;
+
+    this.transactions.forEach((tx) => {
+      tx.outputs.forEach((output) => {
+        if (output.opReturn) {
+          return;
+        }
+        if (output.txOutputType === 'GENESIS_OUTPUT' || output.txOutputType === 'ISSUANCE_CANDIDATE_OUTPUT' && output.isVerified) {
+          minted += output.bsqAmount;
+        }
+        if (output.isUnspent) {
+          unspent++;
+        } else {
+          spent++;
+        }
+      });
+      burned += tx['burntFee'];
+    });
+
+    this.stats = {
+      addresses: Object.keys(this.addressIndex).length,
+      minted: minted / 100,
+      burnt: burned / 100,
+      spent_txos: spent,
+      unspent_txos: unspent,
+    };
+  }
+
+  private async loadData(): Promise<any> {
+    if (!fs.existsSync(Bisq.BLOCKS_JSON_FILE_PATH)) {
+      throw new Error(Bisq.BLOCKS_JSON_FILE_PATH + ` doesn't exist`);
+    }
+
+    const readline = require('readline');
+    const events = require('events');
+
+    const rl = readline.createInterface({
+      input: fs.createReadStream(Bisq.BLOCKS_JSON_FILE_PATH),
+      crlfDelay: Infinity
+    });
+
+    let blockBuffer = '';
+    let readingBlock = false;
+    let lineCount = 1;
+    const start = new Date().getTime();
+
+    logger.debug('Processing Bisq data dump...');
+
+    rl.on('line', (line) => {
+      if (lineCount === 2) {
+        line = line.replace('  "chainHeight": ', '');
+        this.latestBlockHeight = parseInt(line, 10);
+      }
+
+      if (line === '    {') {
+        readingBlock = true;
+      } else if (line === '    },') {
+        blockBuffer += '}';
+        try {
+          const block: BisqBlock =  JSON.parse(blockBuffer);
+          this.allBlocks.push(block);
+          readingBlock = false;
+          blockBuffer = '';
+        } catch (e) {
+          logger.debug(blockBuffer);
+          throw Error(`Unable to parse Bisq data dump at line ${lineCount}` + (e instanceof Error ? e.message : e));
+        }
+      }
+
+      if (readingBlock === true) {
+        blockBuffer += line;
+      }
+
+      ++lineCount;
+    });
+
+    await events.once(rl, 'close');
+
+    this.allBlocks.reverse();
+    this.blocks = this.allBlocks.filter((block) => block.txs.length > 0);
+
+    const time = new Date().getTime() - start;
+    logger.debug('Bisq dump processed in ' + time + ' ms');
+  }
+}
+
+export default new Bisq();

backend/src/api/bisq/interfaces.ts

@@ -0,0 +1,258 @@
+
+export interface BisqBlocks {
+  chainHeight: number;
+  blocks: BisqBlock[];
+}
+
+export interface BisqBlock {
+  height: number;
+  time: number;
+  hash: string;
+  previousBlockHash: string;
+  txs: BisqTransaction[];
+}
+
+export interface BisqTransaction {
+  txVersion: string;
+  id: string;
+  blockHeight: number;
+  blockHash: string;
+  time: number;
+  inputs: BisqInput[];
+  outputs: BisqOutput[];
+  txType: string;
+  txTypeDisplayString: string;
+  burntFee: number;
+  invalidatedBsq: number;
+  unlockBlockHeight: number;
+}
+
+export interface BisqStats {
+  minted: number;
+  burnt: number;
+  addresses: number;
+  unspent_txos: number;
+  spent_txos: number;
+}
+
+interface BisqInput {
+  spendingTxOutputIndex: number;
+  spendingTxId: string;
+  bsqAmount: number;
+  isVerified: boolean;
+  address: string;
+  time: number;
+}
+
+interface BisqOutput {
+  txVersion: string;
+  txId: string;
+  index: number;
+  bsqAmount: number;
+  btcAmount: number;
+  height: number;
+  isVerified: boolean;
+  burntFee: number;
+  invalidatedBsq: number;
+  address: string;
+  scriptPubKey: BisqScriptPubKey;
+  time: any;
+  txType: string;
+  txTypeDisplayString: string;
+  txOutputType: string;
+  txOutputTypeDisplayString: string;
+  lockTime: number;
+  isUnspent: boolean;
+  spentInfo: SpentInfo;
+  opReturn?: string;
+}
+
+interface BisqScriptPubKey {
+  addresses: string[];
+  asm: string;
+  hex: string;
+  reqSigs?: number;
+  type: string;
+}
+
+interface SpentInfo {
+  height: number;
+  inputIndex: number;
+  txId: string;
+}
+
+export interface BisqTrade {
+  direction: string;
+  price: string;
+  amount: string;
+  volume: string;
+  payment_method: string;
+  trade_id: string;
+  trade_date: number;
+  market?: string;
+}
+
+export interface Currencies { [txid: string]: Currency; }
+
+export interface Currency {
+  code: string;
+  name: string;
+  precision: number;
+
+  _type: string;
+}
+
+export interface Depth { [market: string]: Market; }
+
+interface Market {
+  'buys': string[];
+  'sells': string[];
+}
+
+export interface HighLowOpenClose {
+  period_start: number | string;
+  open: string;
+  high: string;
+  low: string;
+  close: string;
+  volume_left: string;
+  volume_right: string;
+  avg: string;
+}
+
+export interface Markets { [txid: string]: Pair; }
+
+interface Pair {
+  pair: string;
+  lname: string;
+  rname: string;
+  lsymbol: string;
+  rsymbol: string;
+  lprecision: number;
+  rprecision: number;
+  ltype: string;
+  rtype: string;
+  name: string;
+}
+
+export interface Offers { [market: string]: OffersMarket; }
+
+interface OffersMarket {
+  buys: Offer[] | null;
+  sells: Offer[] | null;
+}
+
+export interface OffersData {
+  direction: string;
+  currencyCode: string;
+  minAmount: number;
+  amount: number;
+  price: number;
+  date: number;
+  useMarketBasedPrice: boolean;
+  marketPriceMargin: number;
+  paymentMethod: string;
+  id: string;
+  currencyPair: string;
+  primaryMarketDirection: string;
+  priceDisplayString: string;
+  primaryMarketAmountDisplayString: string;
+  primaryMarketMinAmountDisplayString: string;
+  primaryMarketVolumeDisplayString: string;
+  primaryMarketMinVolumeDisplayString: string;
+  primaryMarketPrice: number;
+  primaryMarketAmount: number;
+  primaryMarketMinAmount: number;
+  primaryMarketVolume: number;
+  primaryMarketMinVolume: number;
+}
+
+export interface Offer {
+  offer_id: string;
+  offer_date: number;
+  direction: string;
+  min_amount: string;
+  amount: string;
+  price: string;
+  volume: string;
+  payment_method: string;
+  offer_fee_txid: any;
+}
+
+export interface Tickers { [market: string]: Ticker | null; }
+
+export interface Ticker {
+  last: string;
+  high: string;
+  low: string;
+  volume_left: string;
+  volume_right: string;
+  buy: string | null;
+  sell: string | null;
+}
+
+export interface Trade {
+  direction: string;
+  price: string;
+  amount: string;
+  volume: string;
+  payment_method: string;
+  trade_id: string;
+  trade_date: number;
+}
+
+export interface TradesData {
+  currency: string;
+  direction: string;
+  tradePrice: number;
+  tradeAmount: number;
+  tradeDate: number;
+  paymentMethod: string;
+  offerDate: number;
+  useMarketBasedPrice: boolean;
+  marketPriceMargin: number;
+  offerAmount: number;
+  offerMinAmount: number;
+  offerId: string;
+  depositTxId?: string;
+  currencyPair: string;
+  primaryMarketDirection: string;
+  primaryMarketTradePrice: number;
+  primaryMarketTradeAmount: number;
+  primaryMarketTradeVolume: number;
+
+  _market: string;
+  _tradePriceStr: string;
+  _tradeAmountStr: string;
+  _tradeVolumeStr: string;
+  _offerAmountStr: string;
+  _tradePrice: number;
+  _tradeAmount: number;
+  _tradeVolume: number;
+  _offerAmount: number;
+}
+
+export interface MarketVolume {
+  period_start: number;
+  num_trades: number;
+  volume: string;
+}
+
+export interface MarketsApiError {
+  success: number;
+  error: string;
+}
+
+export type Interval = 'minute' | 'half_hour' | 'hour' | 'half_day' | 'day' | 'week' | 'month' | 'year' | 'auto';
+
+export interface SummarizedIntervals { [market: string]: SummarizedInterval; }
+export interface SummarizedInterval {
+  'period_start': number;
+  'open': number;
+  'close': number;
+  'high': number;
+  'low': number;
+  'avg': number;
+  'volume_right': number;
+  'volume_left': number;
+}

backend/src/api/bisq/markets-api.ts

@@ -0,0 +1,679 @@
+import { Currencies, OffersData, TradesData, Depth, Currency, Interval, HighLowOpenClose,
+  Markets, Offers, Offer, BisqTrade, MarketVolume, Tickers, Ticker, SummarizedIntervals, SummarizedInterval } from './interfaces';
+
+const strtotime = require('./strtotime');
+
+class BisqMarketsApi {
+  private cryptoCurrencyData: Currency[] = [];
+  private fiatCurrencyData: Currency[] = [];
+  private activeCryptoCurrencyData: Currency[] = [];
+  private activeFiatCurrencyData: Currency[] = [];
+  private offersData: OffersData[] = [];
+  private tradesData: TradesData[] = [];
+  private fiatCurrenciesIndexed: { [code: string]: true } = {};
+  private allCurrenciesIndexed: { [code: string]: Currency } = {};
+  private tradeDataByMarket: { [market: string]: TradesData[] } = {};
+  private tickersCache: Ticker | Tickers | null = null;
+
+  constructor() { }
+
+  setOffersData(offers: OffersData[]) {
+    this.offersData = offers;
+  }
+
+  setTradesData(trades: TradesData[]) {
+    this.tradesData = trades;
+    this.tradeDataByMarket = {};
+
+    this.tradesData.forEach((trade) => {
+      trade._market = trade.currencyPair.toLowerCase().replace('/', '_');
+      if (!this.tradeDataByMarket[trade._market]) {
+        this.tradeDataByMarket[trade._market] = [];
+      }
+      this.tradeDataByMarket[trade._market].push(trade);
+    });
+  }
+
+  setCurrencyData(cryptoCurrency: Currency[], fiatCurrency: Currency[], activeCryptoCurrency: Currency[], activeFiatCurrency: Currency[]) {
+    this.cryptoCurrencyData = cryptoCurrency,
+    this.fiatCurrencyData = fiatCurrency,
+    this.activeCryptoCurrencyData = activeCryptoCurrency,
+    this.activeFiatCurrencyData = activeFiatCurrency;
+
+    this.fiatCurrenciesIndexed = {};
+    this.allCurrenciesIndexed = {};
+
+    this.fiatCurrencyData.forEach((currency) => {
+      currency._type = 'fiat';
+      this.fiatCurrenciesIndexed[currency.code] = true;
+      this.allCurrenciesIndexed[currency.code] = currency;
+    });
+    this.cryptoCurrencyData.forEach((currency) => {
+       currency._type = 'crypto';
+       this.allCurrenciesIndexed[currency.code] = currency;
+    });
+  }
+
+  updateCache() {
+    this.tickersCache = null;
+    this.tickersCache = this.getTicker();
+  }
+
+  getCurrencies(
+    type: 'crypto' | 'fiat' | 'active' | 'all' = 'all',
+  ): Currencies {
+    let currencies: Currency[];
+
+    switch (type) {
+      case 'fiat':
+        currencies = this.fiatCurrencyData;
+        break;
+      case 'crypto':
+        currencies = this.cryptoCurrencyData;
+        break;
+      case 'active':
+        currencies = this.activeCryptoCurrencyData.concat(this.activeFiatCurrencyData);
+        break;
+      case 'all':
+      default:
+        currencies = this.cryptoCurrencyData.concat(this.fiatCurrencyData);
+    }
+    const result = {};
+    currencies.forEach((currency) => {
+      result[currency.code] = currency;
+    });
+    return result;
+  }
+
+  getDepth(
+    market: string,
+  ): Depth {
+    const currencyPair = market.replace('_', '/').toUpperCase();
+
+    const buys = this.offersData
+      .filter((offer) => offer.currencyPair === currencyPair && offer.primaryMarketDirection === 'BUY')
+      .map((offer) => offer.price)
+      .sort((a, b) => b - a)
+      .map((price) => this.intToBtc(price));
+
+    const sells = this.offersData
+      .filter((offer) => offer.currencyPair === currencyPair && offer.primaryMarketDirection === 'SELL')
+      .map((offer) => offer.price)
+      .sort((a, b) => a - b)
+      .map((price) => this.intToBtc(price));
+
+    const result = {};
+    result[market] = {
+      'buys': buys,
+      'sells': sells,
+    };
+    return result;
+  }
+
+  getOffers(
+    market: string,
+    direction?: 'buy' | 'sell',
+  ): Offers {
+    const currencyPair = market.replace('_', '/').toUpperCase();
+
+    let buys: Offer[] | null = null;
+    let sells: Offer[] | null = null;
+
+    if (!direction || direction === 'buy') {
+      buys = this.offersData
+        .filter((offer) => offer.currencyPair === currencyPair && offer.primaryMarketDirection === 'BUY')
+        .sort((a, b) => b.price - a.price)
+        .map((offer) => this.offerDataToOffer(offer, market));
+    }
+
+    if (!direction || direction === 'sell') {
+      sells = this.offersData
+        .filter((offer) => offer.currencyPair === currencyPair && offer.primaryMarketDirection === 'SELL')
+        .sort((a, b) => a.price - b.price)
+        .map((offer) => this.offerDataToOffer(offer, market));
+    }
+
+    const result: Offers = {};
+    result[market] = {
+      'buys': buys,
+      'sells': sells,
+    };
+    return result;
+  }
+
+  getMarkets(): Markets {
+    const allCurrencies = this.getCurrencies();
+    const activeCurrencies = this.getCurrencies('active');
+    const markets = {};
+
+    for (const currency of Object.keys(activeCurrencies)) {
+      if (allCurrencies[currency].code === 'BTC') {
+        continue;
+      }
+
+      const isFiat = allCurrencies[currency]._type === 'fiat';
+      const pmarketname = allCurrencies['BTC']['name'];
+
+      const lsymbol = isFiat ? 'BTC' : currency;
+      const rsymbol = isFiat ? currency : 'BTC';
+      const lname = isFiat ? pmarketname : allCurrencies[currency].name;
+      const rname = isFiat ? allCurrencies[currency].name : pmarketname;
+      const ltype = isFiat ? 'crypto' : allCurrencies[currency]._type;
+      const rtype = isFiat ? 'fiat' : 'crypto';
+      const lprecision = 8;
+      const rprecision = isFiat ? 2 : 8;
+      const pair = lsymbol.toLowerCase() + '_' + rsymbol.toLowerCase();
+
+      markets[pair] = {
+        'pair': pair,
+        'lname': lname,
+        'rname': rname,
+        'lsymbol': lsymbol,
+        'rsymbol': rsymbol,
+        'lprecision': lprecision,
+        'rprecision': rprecision,
+        'ltype': ltype,
+        'rtype': rtype,
+        'name': lname + '/' + rname,
+      };
+    }
+
+    return markets;
+  }
+
+  getTrades(
+    market: string,
+    timestamp_from?: number,
+    timestamp_to?: number,
+    trade_id_from?: string,
+    trade_id_to?: string,
+    direction?: 'buy' | 'sell',
+    limit: number = 100,
+    sort: 'asc' | 'desc' = 'desc',
+  ): BisqTrade[] {
+      limit = Math.min(limit, 2000);
+      const _market = market === 'all' ? undefined : market;
+
+      if (!timestamp_from) {
+        timestamp_from = new Date('2016-01-01').getTime() / 1000;
+      }
+      if (!timestamp_to) {
+        timestamp_to = new Date().getTime() / 1000;
+      }
+
+      const matches = this.getTradesByCriteria(_market, timestamp_to, timestamp_from,
+        trade_id_to, trade_id_from, direction, sort, limit, false);
+
+      if (sort === 'asc') {
+        matches.sort((a, b) => a.tradeDate - b.tradeDate);
+      } else {
+        matches.sort((a, b) => b.tradeDate - a.tradeDate);
+      }
+
+      return matches.map((trade) => {
+        const bsqTrade: BisqTrade = {
+          direction: trade.primaryMarketDirection,
+          price: trade._tradePriceStr,
+          amount: trade._tradeAmountStr,
+          volume: trade._tradeVolumeStr,
+          payment_method: trade.paymentMethod,
+          trade_id: trade.offerId,
+          trade_date: trade.tradeDate,
+        };
+        if (market === 'all') {
+          bsqTrade.market = trade._market;
+        }
+        return bsqTrade;
+      });
+  }
+
+  getVolumes(
+    market?: string,
+    timestamp_from?: number,
+    timestamp_to?: number,
+    interval: Interval = 'auto',
+    milliseconds?: boolean,
+    timestamp: 'no' | 'yes' = 'yes',
+  ): MarketVolume[] {
+    if (milliseconds) {
+      timestamp_from = timestamp_from ? timestamp_from / 1000 : timestamp_from;
+      timestamp_to = timestamp_to ? timestamp_to / 1000 : timestamp_to;
+    }
+    if (!timestamp_from) {
+      timestamp_from = new Date('2016-01-01').getTime() / 1000;
+    }
+    if (!timestamp_to) {
+      timestamp_to = new Date().getTime() / 1000;
+    }
+
+    const trades = this.getTradesByCriteria(market, timestamp_to, timestamp_from,
+      undefined, undefined, undefined, 'asc', Number.MAX_SAFE_INTEGER);
+
+    if (interval === 'auto') {
+      const range = timestamp_to - timestamp_from;
+      interval = this.getIntervalFromRange(range);
+    }
+
+    const intervals: any = {};
+    const marketVolumes: MarketVolume[] = [];
+
+    for (const trade of trades) {
+      const traded_at = trade['tradeDate'] / 1000;
+      const interval_start = this.intervalStart(traded_at, interval);
+
+      if (!intervals[interval_start]) {
+        intervals[interval_start] = {
+          'volume': 0,
+          'num_trades': 0,
+        };
+      }
+
+      const period = intervals[interval_start];
+      period['period_start'] = interval_start;
+      period['volume'] += this.fiatCurrenciesIndexed[trade.currency] ? trade._tradeAmount : trade._tradeVolume;
+      period['num_trades']++;
+    }
+
+    for (const p in intervals) {
+      if (intervals.hasOwnProperty(p)) {
+        const period = intervals[p];
+        marketVolumes.push({
+          period_start: timestamp === 'no' ? new Date(period['period_start'] * 1000).toISOString() : period['period_start'],
+          num_trades: period['num_trades'],
+          volume: this.intToBtc(period['volume']),
+        });
+      }
+    }
+
+    return marketVolumes;
+  }
+
+  getTicker(
+    market?: string,
+  ): Tickers | Ticker | null {
+    if (market) {
+      return this.getTickerFromMarket(market);
+    }
+
+    if (this.tickersCache) {
+      return this.tickersCache;
+    }
+
+    const allMarkets = this.getMarkets();
+    const tickers = {};
+    for (const m in allMarkets) {
+      if (allMarkets.hasOwnProperty(m)) {
+        tickers[allMarkets[m].pair] = this.getTickerFromMarket(allMarkets[m].pair);
+      }
+    }
+
+    return tickers;
+  }
+
+  getTickerFromMarket(market: string): Ticker | null {
+    let ticker: Ticker;
+    const timestamp_from = strtotime('-24 hour');
+    const timestamp_to = new Date().getTime() / 1000;
+    const trades = this.getTradesByCriteria(market, timestamp_to, timestamp_from,
+      undefined, undefined, undefined, 'asc', Number.MAX_SAFE_INTEGER);
+
+    const periods: SummarizedInterval[] = Object.values(this.getTradesSummarized(trades, timestamp_from));
+
+    const allCurrencies = this.getCurrencies();
+    const currencyRight = allCurrencies[market.split('_')[1].toUpperCase()];
+
+    if (periods[0]) {
+      ticker = {
+        'last': this.intToBtc(periods[0].close),
+        'high': this.intToBtc(periods[0].high),
+        'low': this.intToBtc(periods[0].low),
+        'volume_left': this.intToBtc(periods[0].volume_left),
+        'volume_right': this.intToBtc(periods[0].volume_right),
+        'buy': null,
+        'sell': null,
+      };
+    } else {
+      const lastTrade = this.tradeDataByMarket[market];
+      if (!lastTrade) {
+        return null;
+      }
+      const tradePrice = lastTrade[0].primaryMarketTradePrice * Math.pow(10, 8 - currencyRight.precision);
+
+      const lastTradePrice = this.intToBtc(tradePrice);
+      ticker = {
+        'last': lastTradePrice,
+        'high': lastTradePrice,
+        'low': lastTradePrice,
+        'volume_left': '0',
+        'volume_right': '0',
+        'buy': null,
+        'sell': null,
+      };
+    }
+
+    const timestampFromMilli = timestamp_from * 1000;
+    const timestampToMilli = timestamp_to * 1000;
+
+    const currencyPair = market.replace('_', '/').toUpperCase();
+    const offersData = this.offersData.slice().sort((a, b) => a.price - b.price);
+
+    const buy = offersData.find((offer) => offer.currencyPair === currencyPair
+                                          && offer.primaryMarketDirection === 'BUY'
+                                          && offer.date >= timestampFromMilli
+                                          && offer.date <= timestampToMilli
+                                        );
+    const sell = offersData.find((offer) => offer.currencyPair === currencyPair
+                                            && offer.primaryMarketDirection === 'SELL'
+                                            && offer.date >= timestampFromMilli
+                                            && offer.date <= timestampToMilli
+                                          );
+
+    if (buy) {
+      ticker.buy = this.intToBtc(buy.primaryMarketPrice * Math.pow(10, 8 - currencyRight.precision));
+    }
+    if (sell) {
+      ticker.sell = this.intToBtc(sell.primaryMarketPrice * Math.pow(10, 8 - currencyRight.precision));
+    }
+
+    return ticker;
+  }
+
+  getHloc(
+    market: string,
+    interval: Interval = 'auto',
+    timestamp_from?: number,
+    timestamp_to?: number,
+    milliseconds?: boolean,
+    timestamp: 'no' | 'yes' = 'yes',
+  ): HighLowOpenClose[] {
+    if (milliseconds) {
+      timestamp_from = timestamp_from ? timestamp_from / 1000 : timestamp_from;
+      timestamp_to = timestamp_to ? timestamp_to / 1000 : timestamp_to;
+    }
+    if (!timestamp_from) {
+      timestamp_from = new Date('2016-01-01').getTime() / 1000;
+    }
+    if (!timestamp_to) {
+      timestamp_to = new Date().getTime() / 1000;
+    }
+
+    const trades = this.getTradesByCriteria(market, timestamp_to, timestamp_from,
+      undefined, undefined, undefined, 'asc', Number.MAX_SAFE_INTEGER);
+
+    if (interval === 'auto') {
+      const range = timestamp_to - timestamp_from;
+      interval = this.getIntervalFromRange(range);
+    }
+
+    const intervals = this.getTradesSummarized(trades, timestamp_from, interval);
+
+    const hloc: HighLowOpenClose[] = [];
+
+    for (const p in intervals) {
+      if (intervals.hasOwnProperty(p)) {
+        const period = intervals[p];
+        hloc.push({
+          period_start: timestamp === 'no' ? new Date(period['period_start'] * 1000).toISOString() : period['period_start'],
+          open: this.intToBtc(period['open']),
+          close: this.intToBtc(period['close']),
+          high: this.intToBtc(period['high']),
+          low: this.intToBtc(period['low']),
+          avg: this.intToBtc(period['avg']),
+          volume_right: this.intToBtc(period['volume_right']),
+          volume_left: this.intToBtc(period['volume_left']),
+        });
+      }
+    }
+
+    return hloc;
+  }
+
+  private getIntervalFromRange(range: number): Interval {
+    // two days range loads minute data
+    if (range <= 3600) {
+      // up to one hour range loads minutely data
+      return 'minute';
+    } else if (range <= 1 * 24 * 3600) {
+      // up to one day range loads half-hourly data
+      return 'half_hour';
+    } else if (range <= 3 * 24 * 3600) {
+      // up to 3 day range loads hourly data
+      return 'hour';
+    } else if (range <= 7 * 24 * 3600) {
+      // up to 7 day range loads half-daily data
+      return 'half_day';
+    } else if (range <= 60 * 24 * 3600) {
+      // up to 2 month range loads daily data
+      return 'day';
+    } else if (range <= 12 * 31 * 24 * 3600) {
+      // up to one year range loads weekly data
+      return 'week';
+    } else if (range <= 12 * 31 * 24 * 3600) {
+      // up to 5 year range loads monthly data
+      return 'month';
+    } else {
+      // greater range loads yearly data
+      return 'year';
+    }
+  }
+
+  getVolumesByTime(time: number): MarketVolume[] {
+    const timestamp_from = new Date().getTime() / 1000 - time;
+    const timestamp_to = new Date().getTime() / 1000;
+
+    const trades = this.getTradesByCriteria(undefined, timestamp_to, timestamp_from,
+      undefined, undefined, undefined, 'asc', Number.MAX_SAFE_INTEGER);
+
+    const markets: any = {};
+
+    for (const trade of trades) {
+      if (!markets[trade._market]) {
+        markets[trade._market] = {
+          'volume': 0,
+          'num_trades': 0,
+        };
+      }
+
+      markets[trade._market]['volume'] += this.fiatCurrenciesIndexed[trade.currency] ? trade._tradeAmount : trade._tradeVolume;
+      markets[trade._market]['num_trades']++;
+    }
+
+    return markets;
+  }
+
+  private getTradesSummarized(trades: TradesData[], timestamp_from: number, interval?: string): SummarizedIntervals {
+    const intervals: any = {};
+    const intervals_prices: any = {};
+
+    for (const trade of trades) {
+      const traded_at = trade.tradeDate / 1000;
+      const interval_start = !interval ? timestamp_from : this.intervalStart(traded_at, interval);
+
+      if (!intervals[interval_start]) {
+          intervals[interval_start] = {
+            'open': 0,
+            'close': 0,
+            'high': 0,
+            'low': 0,
+            'avg': 0,
+            'volume_right': 0,
+            'volume_left': 0,
+        };
+        intervals_prices[interval_start] = [];
+      }
+      const period = intervals[interval_start];
+      const price = trade._tradePrice;
+
+      if (!intervals_prices[interval_start]['leftvol']) {
+        intervals_prices[interval_start]['leftvol'] = [];
+      }
+      if (!intervals_prices[interval_start]['rightvol']) {
+        intervals_prices[interval_start]['rightvol'] = [];
+      }
+
+      intervals_prices[interval_start]['leftvol'].push(trade._tradeAmount);
+      intervals_prices[interval_start]['rightvol'].push(trade._tradeVolume);
+
+      if (price) {
+          const plow = period['low'];
+          period['period_start'] = interval_start;
+          period['open'] = period['open'] || price;
+          period['close'] = price;
+          period['high'] = price > period['high'] ? price : period['high'];
+          period['low'] = (plow && price > plow) ? period['low'] : price;
+          period['avg'] = intervals_prices[interval_start]['rightvol'].reduce((p: number, c: number) => c + p, 0)
+            / intervals_prices[interval_start]['leftvol'].reduce((c: number, p: number) => c + p, 0) * 100000000;
+          period['volume_left'] += trade._tradeAmount;
+          period['volume_right'] += trade._tradeVolume;
+      }
+    }
+    return intervals;
+  }
+
+  private getTradesByCriteria(
+    market: string | undefined,
+    timestamp_to: number,
+    timestamp_from: number,
+    trade_id_to: string | undefined,
+    trade_id_from: string | undefined,
+    direction: 'buy' | 'sell' | undefined,
+    sort: string,
+    limit: number,
+    integerAmounts: boolean = true,
+ ): TradesData[] {
+    let trade_id_from_ts: number | null = null;
+    let trade_id_to_ts: number | null = null;
+    const allCurrencies = this.getCurrencies();
+
+    const timestampFromMilli = timestamp_from * 1000;
+    const timestampToMilli = timestamp_to * 1000;
+
+    // note: the offer_id_from/to depends on iterating over trades in
+    // descending chronological order.
+    const tradesDataSorted = this.tradesData.slice();
+    if (sort === 'asc') {
+      tradesDataSorted.reverse();
+    }
+
+    let matches: TradesData[] = [];
+    for (const trade of tradesDataSorted) {
+      if (trade_id_from === trade.offerId) {
+        trade_id_from_ts = trade.tradeDate;
+      }
+      if (trade_id_to === trade.offerId) {
+        trade_id_to_ts = trade.tradeDate;
+      }
+      if (trade_id_to && trade_id_to_ts === null) {
+        continue;
+      }
+      if (trade_id_from && trade_id_from_ts != null && trade_id_from_ts !== trade.tradeDate) {
+        continue;
+      }
+      if (market && market !== trade._market) {
+        continue;
+      }
+      if (timestampFromMilli && timestampFromMilli > trade.tradeDate) {
+        continue;
+      }
+      if (timestampToMilli && timestampToMilli < trade.tradeDate) {
+        continue;
+      }
+      if (direction && direction !== trade.direction.toLowerCase()) {
+        continue;
+      }
+
+      // Filter out bogus trades with BTC/BTC or XXX/XXX market.
+      // See github issue: https://github.com/bitsquare/bitsquare/issues/883
+      const currencyPairs = trade.currencyPair.split('/');
+      if (currencyPairs[0] === currencyPairs[1]) {
+        continue;
+      }
+
+      const currencyLeft = allCurrencies[currencyPairs[0]];
+      const currencyRight = allCurrencies[currencyPairs[1]];
+
+      if (!currencyLeft || !currencyRight) {
+        continue;
+      }
+
+      const tradePrice = trade.primaryMarketTradePrice * Math.pow(10, 8 - currencyRight.precision);
+      const tradeAmount = trade.primaryMarketTradeAmount * Math.pow(10, 8 - currencyLeft.precision);
+      const tradeVolume = trade.primaryMarketTradeVolume * Math.pow(10, 8 - currencyRight.precision);
+
+      if (integerAmounts) {
+        trade._tradePrice = tradePrice;
+        trade._tradeAmount = tradeAmount;
+        trade._tradeVolume = tradeVolume;
+        trade._offerAmount = trade.offerAmount;
+      } else {
+        trade._tradePriceStr = this.intToBtc(tradePrice);
+        trade._tradeAmountStr = this.intToBtc(tradeAmount);
+        trade._tradeVolumeStr = this.intToBtc(tradeVolume);
+        trade._offerAmountStr = this.intToBtc(trade.offerAmount);
+      }
+
+      matches.push(trade);
+
+      if (matches.length >= limit) {
+        break;
+      }
+    }
+
+    if ((trade_id_from && !trade_id_from_ts) || (trade_id_to && !trade_id_to_ts)) {
+      matches = [];
+    }
+    return matches;
+  }
+
+  private intervalStart(ts: number, interval: string): number {
+    switch (interval) {
+        case 'minute':
+            return (ts - (ts % 60));
+        case '10_minute':
+            return (ts - (ts % 600));
+        case 'half_hour':
+            return (ts - (ts % 1800));
+        case 'hour':
+            return (ts - (ts % 3600));
+        case 'half_day':
+            return (ts - (ts % (3600 * 12)));
+        case 'day':
+            return strtotime('midnight today', ts);
+        case 'week':
+            return strtotime('midnight sunday last week', ts);
+        case 'month':
+            return strtotime('midnight first day of this month', ts);
+        case 'year':
+            return strtotime('midnight first day of january', ts);
+        default:
+            throw new Error('Unsupported interval: ' + interval);
+    }
+}
+
+  private offerDataToOffer(offer: OffersData, market: string): Offer {
+    const currencyPairs = market.split('_');
+    const currencyRight = this.allCurrenciesIndexed[currencyPairs[1].toUpperCase()];
+    const currencyLeft = this.allCurrenciesIndexed[currencyPairs[0].toUpperCase()];
+    const price = offer['primaryMarketPrice'] * Math.pow( 10, 8 - currencyRight['precision']);
+    const amount = offer['primaryMarketAmount'] * Math.pow( 10, 8 - currencyLeft['precision']);
+    const volume = offer['primaryMarketVolume'] * Math.pow( 10, 8 - currencyRight['precision']);
+
+    return {
+      offer_id: offer.id,
+      offer_date: offer.date,
+      direction: offer.primaryMarketDirection,
+      min_amount: this.intToBtc(offer.minAmount),
+      amount: this.intToBtc(amount),
+      price: this.intToBtc(price),
+      volume: this.intToBtc(volume),
+      payment_method: offer.paymentMethod,
+      offer_fee_txid: null,
+    };
+  }
+
+  private intToBtc(val: number): string {
+    return (val / 100000000).toFixed(8);
+  }
+}
+
+export default new BisqMarketsApi();

backend/src/api/bisq/markets.ts

@@ -0,0 +1,137 @@
+import config from '../../config';
+import * as fs from 'fs';
+import { OffersData as OffersData, TradesData, Currency } from './interfaces';
+import bisqMarket from './markets-api';
+import logger from '../../logger';
+
+class Bisq {
+  private static FOLDER_WATCH_CHANGE_DETECTION_DEBOUNCE = 4000;
+  private static MARKET_JSON_PATH = config.BISQ.DATA_PATH;
+  private static MARKET_JSON_FILE_PATHS = {
+    activeCryptoCurrency: '/active_crypto_currency_list.json',
+    activeFiatCurrency: '/active_fiat_currency_list.json',
+    cryptoCurrency: '/crypto_currency_list.json',
+    fiatCurrency: '/fiat_currency_list.json',
+    offers: '/offers_statistics.json',
+    trades: '/trade_statistics.json',
+  };
+
+  private cryptoCurrencyLastMtime = new Date('2016-01-01');
+  private fiatCurrencyLastMtime = new Date('2016-01-01');
+  private offersLastMtime = new Date('2016-01-01');
+  private tradesLastMtime = new Date('2016-01-01');
+
+  private subdirectoryWatcher: fs.FSWatcher | undefined;
+
+  constructor() {}
+
+  startBisqService(): void {
+    try {
+      this.checkForBisqDataFolder();
+    } catch (e) {
+      logger.info('Retrying to start bisq service (markets) in 3 minutes');
+      setTimeout(this.startBisqService.bind(this), 180000);
+      return;
+    }
+    this.loadBisqDumpFile();
+    this.startBisqDirectoryWatcher();
+  }
+
+  private checkForBisqDataFolder() {
+    if (!fs.existsSync(Bisq.MARKET_JSON_PATH + Bisq.MARKET_JSON_FILE_PATHS.cryptoCurrency)) {
+      logger.err(Bisq.MARKET_JSON_PATH + Bisq.MARKET_JSON_FILE_PATHS.cryptoCurrency + ` doesn't exist. Make sure Bisq is running and the config is correct before starting the server.`);
+      throw new Error(`Cannot load BISQ ${Bisq.MARKET_JSON_FILE_PATHS.cryptoCurrency} file`);
+    }
+  }
+
+  private startBisqDirectoryWatcher() {
+    if (this.subdirectoryWatcher) {
+      this.subdirectoryWatcher.close();
+    }
+    if (!fs.existsSync(Bisq.MARKET_JSON_PATH + Bisq.MARKET_JSON_FILE_PATHS.cryptoCurrency)) {
+      logger.warn(Bisq.MARKET_JSON_PATH + Bisq.MARKET_JSON_FILE_PATHS.cryptoCurrency + ` doesn't exist. Trying to restart sub directory watcher again in 3 minutes.`);
+      setTimeout(() => this.startBisqDirectoryWatcher(), 180000);
+      return;
+    }
+    let fsWait: NodeJS.Timeout | null = null;
+    this.subdirectoryWatcher = fs.watch(Bisq.MARKET_JSON_PATH, () => {
+      if (fsWait) {
+        clearTimeout(fsWait);
+      }
+      fsWait = setTimeout(() => {
+        logger.debug(`Change detected in the Bisq market data folder.`);
+        this.loadBisqDumpFile();
+      }, Bisq.FOLDER_WATCH_CHANGE_DETECTION_DEBOUNCE);
+    });
+  }
+
+  private async loadBisqDumpFile(): Promise<void> {
+    const start = new Date().getTime();
+    try {
+      let marketsDataUpdated = false;
+      const cryptoMtime = this.getFileMtime(Bisq.MARKET_JSON_FILE_PATHS.cryptoCurrency);
+      const fiatMtime = this.getFileMtime(Bisq.MARKET_JSON_FILE_PATHS.fiatCurrency);
+      if (cryptoMtime > this.cryptoCurrencyLastMtime || fiatMtime > this.fiatCurrencyLastMtime) {
+        const cryptoCurrencyData = await this.loadData<Currency[]>(Bisq.MARKET_JSON_FILE_PATHS.cryptoCurrency);
+        const fiatCurrencyData = await this.loadData<Currency[]>(Bisq.MARKET_JSON_FILE_PATHS.fiatCurrency);
+        const activeCryptoCurrencyData = await this.loadData<Currency[]>(Bisq.MARKET_JSON_FILE_PATHS.activeCryptoCurrency);
+        const activeFiatCurrencyData = await this.loadData<Currency[]>(Bisq.MARKET_JSON_FILE_PATHS.activeFiatCurrency);
+        logger.debug('Updating Bisq Market Currency Data');
+        bisqMarket.setCurrencyData(cryptoCurrencyData, fiatCurrencyData, activeCryptoCurrencyData, activeFiatCurrencyData);
+        if (cryptoMtime > this.cryptoCurrencyLastMtime) {
+          this.cryptoCurrencyLastMtime = cryptoMtime;
+        }
+        if (fiatMtime > this.fiatCurrencyLastMtime) {
+          this.fiatCurrencyLastMtime = fiatMtime;
+        }
+        marketsDataUpdated = true;
+      }
+      const offersMtime = this.getFileMtime(Bisq.MARKET_JSON_FILE_PATHS.offers);
+      if (offersMtime > this.offersLastMtime) {
+        const offersData = await this.loadData<OffersData[]>(Bisq.MARKET_JSON_FILE_PATHS.offers);
+        logger.debug('Updating Bisq Market Offers Data');
+        bisqMarket.setOffersData(offersData);
+        this.offersLastMtime = offersMtime;
+        marketsDataUpdated = true;
+      }
+      const tradesMtime = this.getFileMtime(Bisq.MARKET_JSON_FILE_PATHS.trades);
+      if (tradesMtime > this.tradesLastMtime) {
+        const tradesData = await this.loadData<TradesData[]>(Bisq.MARKET_JSON_FILE_PATHS.trades);
+        logger.debug('Updating Bisq Market Trades Data');
+        bisqMarket.setTradesData(tradesData);
+        this.tradesLastMtime = tradesMtime;
+        marketsDataUpdated = true;
+      }
+      if (marketsDataUpdated) {
+        bisqMarket.updateCache();
+        const time = new Date().getTime() - start;
+        logger.debug('Bisq market data updated in ' + time + ' ms');
+      }
+    } catch (e) {
+      logger.err('loadBisqMarketDataDumpFile() error.' + (e instanceof Error ? e.message : e));
+    }
+  }
+
+  private getFileMtime(path: string): Date {
+    const stats = fs.statSync(Bisq.MARKET_JSON_PATH + path);
+    return stats.mtime;
+  }
+
+  private loadData<T>(path: string): Promise<T> {
+    return new Promise((resolve, reject) => {
+      fs.readFile(Bisq.MARKET_JSON_PATH + path, 'utf8', (err, data) => {
+        if (err) {
+          reject(err);
+        }
+        try {
+          const parsedData = JSON.parse(data);
+          resolve(parsedData);
+        } catch (e) {
+          reject('JSON parse error (' + path + ')');
+        }
+      });
+    });
+  }
+}
+
+export default new Bisq();

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

@@ -29,7 +29,6 @@ export interface AbstractBitcoinApi {
   $getOutSpendsByOutpoint(outpoints: { txid: string, vout: number }[]): Promise<IEsploraApi.Outspend[]>;
 
   startHealthChecks(): void;
-  getHealthStatus(): HealthCheckHost[];
 }
 export interface BitcoinRpcCredentials {
   host: string;
@@ -39,15 +38,3 @@ export interface BitcoinRpcCredentials {
   timeout: number;
   cookie?: string;
 }
-
-export interface HealthCheckHost {
-  host: string;
-  active: boolean;
-  rtt: number;
-  latestHeight: number;
-  socket: boolean;
-  outOfSync: boolean;
-  unreachable: boolean;
-  checked: boolean;
-  lastChecked: number;
-}

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

@@ -106,7 +106,6 @@ export namespace IBitcoinApi {
       address?: string;              //  (string) bitcoin address
       addresses?: string[];           //  (string) bitcoin addresses
       pegout_chain?: string;         //  (string) Elements peg-out chain
-      pegout_address?: string;       //  (string) Elements peg-out address
       pegout_addresses?: string[];   //  (string) Elements peg-out addresses
     };
   }

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

@@ -1,5 +1,5 @@
 import * as bitcoinjs from 'bitcoinjs-lib';
-import { AbstractBitcoinApi, HealthCheckHost } from './bitcoin-api-abstract-factory';
+import { AbstractBitcoinApi } from './bitcoin-api-abstract-factory';
 import { IBitcoinApi } from './bitcoin-api.interface';
 import { IEsploraApi } from './esplora-api.interface';
 import blocks from '../blocks';
@@ -382,10 +382,6 @@ class BitcoinApi implements AbstractBitcoinApi {
   }
 
   public startHealthChecks(): void {};
-
-  public getHealthStatus() {
-    return [];
-  }
 }
 
 export default BitcoinApi;

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

@@ -19,7 +19,6 @@ import bitcoinClient from './bitcoin-client';
 import difficultyAdjustment from '../difficulty-adjustment';
 import transactionRepository from '../../repositories/TransactionRepository';
 import rbfCache from '../rbf-cache';
-import { calculateCpfp } from '../cpfp';
 
 class BitcoinRoutes {
   public initRoutes(app: Application) {
@@ -37,6 +36,60 @@ class BitcoinRoutes {
       .get(config.MEMPOOL.API_URL_PREFIX + 'replacements', this.getRbfReplacements)
       .get(config.MEMPOOL.API_URL_PREFIX + 'fullrbf/replacements', this.getFullRbfReplacements)
       .post(config.MEMPOOL.API_URL_PREFIX + 'tx/push', this.$postTransactionForm)
+      .get(config.MEMPOOL.API_URL_PREFIX + 'donations', async (req, res) => {
+        try {
+          const response = await axios.get(`${config.EXTERNAL_DATA_SERVER.MEMPOOL_API}/donations`, { responseType: 'stream', timeout: 10000 });
+          response.data.pipe(res);
+        } catch (e) {
+          res.status(500).end();
+        }
+      })
+      .get(config.MEMPOOL.API_URL_PREFIX + 'donations/images/:id', async (req, res) => {
+        try {
+          const response = await axios.get(`${config.EXTERNAL_DATA_SERVER.MEMPOOL_API}/donations/images/${req.params.id}`, {
+            responseType: 'stream', timeout: 10000
+          });
+          response.data.pipe(res);
+        } catch (e) {
+          res.status(500).end();
+        }
+      })
+      .get(config.MEMPOOL.API_URL_PREFIX + 'contributors', async (req, res) => {
+        try {
+          const response = await axios.get(`${config.EXTERNAL_DATA_SERVER.MEMPOOL_API}/contributors`, { responseType: 'stream', timeout: 10000 });
+          response.data.pipe(res);
+        } catch (e) {
+          res.status(500).end();
+        }
+      })
+      .get(config.MEMPOOL.API_URL_PREFIX + 'contributors/images/:id', async (req, res) => {
+        try {
+          const response = await axios.get(`${config.EXTERNAL_DATA_SERVER.MEMPOOL_API}/contributors/images/${req.params.id}`, {
+            responseType: 'stream', timeout: 10000
+          });
+          response.data.pipe(res);
+        } catch (e) {
+          res.status(500).end();
+        }
+      })
+      .get(config.MEMPOOL.API_URL_PREFIX + 'translators', async (req, res) => {
+        try {
+          const response = await axios.get(`${config.EXTERNAL_DATA_SERVER.MEMPOOL_API}/translators`, { responseType: 'stream', timeout: 10000 });
+          response.data.pipe(res);
+        } catch (e) {
+          res.status(500).end();
+        }
+      })
+      .get(config.MEMPOOL.API_URL_PREFIX + 'translators/images/:id', async (req, res) => {
+        try {
+          const response = await axios.get(`${config.EXTERNAL_DATA_SERVER.MEMPOOL_API}/translators/images/${req.params.id}`, {
+            responseType: 'stream', timeout: 10000
+          });
+          response.data.pipe(res);
+        } catch (e) {
+          res.status(500).end();
+        }
+      })
       .get(config.MEMPOOL.API_URL_PREFIX + 'blocks', this.getBlocks.bind(this))
       .get(config.MEMPOOL.API_URL_PREFIX + 'blocks/:height', this.getBlocks.bind(this))
       .get(config.MEMPOOL.API_URL_PREFIX + 'block/:hash', this.getBlock)
@@ -68,10 +121,8 @@ class BitcoinRoutes {
           .get(config.MEMPOOL.API_URL_PREFIX + 'block-height/:height', this.getBlockHeight)
           .get(config.MEMPOOL.API_URL_PREFIX + 'address/:address', this.getAddress)
           .get(config.MEMPOOL.API_URL_PREFIX + 'address/:address/txs', this.getAddressTransactions)
-          .get(config.MEMPOOL.API_URL_PREFIX + 'address/:address/txs/summary', this.getAddressTransactionSummary)
           .get(config.MEMPOOL.API_URL_PREFIX + 'scripthash/:scripthash', this.getScriptHash)
           .get(config.MEMPOOL.API_URL_PREFIX + 'scripthash/:scripthash/txs', this.getScriptHashTransactions)
-          .get(config.MEMPOOL.API_URL_PREFIX + 'scripthash/:scripthash/txs/summary', this.getScriptHashTransactionSummary)
           .get(config.MEMPOOL.API_URL_PREFIX + 'address-prefix/:prefix', this.getAddressPrefix)
           ;
       }
@@ -164,7 +215,7 @@ class BitcoinRoutes {
         return;
       }
 
-      const cpfpInfo = calculateCpfp(tx, mempool.getMempool());
+      const cpfpInfo = Common.setRelativesAndGetCpfpInfo(tx, mempool.getMempool());
 
       res.json(cpfpInfo);
       return;
@@ -364,7 +415,7 @@ class BitcoinRoutes {
         const height = req.params.height === undefined ? undefined : parseInt(req.params.height, 10);
         res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
         res.json(await blocks.$getBlocks(height, 15));
-      } else { // Liquid
+      } else { // Liquid, Bisq
         return await this.getLegacyBlocks(req, res);
       }
     } catch (e) {
@@ -374,7 +425,7 @@ class BitcoinRoutes {
 
   private async getBlocksByBulk(req: Request, res: Response) {
     try {
-      if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false) { // Liquid - Not implemented
+      if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false) { // Liquid, Bisq - Not implemented
         return res.status(404).send(`This API is only available for Bitcoin networks`);
       }
       if (config.MEMPOOL.MAX_BLOCKS_BULK_QUERY <= 0) {
@@ -515,13 +566,6 @@ class BitcoinRoutes {
     }
   }
 
-  private async getAddressTransactionSummary(req: Request, res: Response): Promise<void> {
-    if (config.MEMPOOL.BACKEND !== 'esplora') {
-      res.status(405).send('Address summary lookups require mempool/electrs backend.');
-      return;
-    }
-  }
-
   private async getScriptHash(req: Request, res: Response) {
     if (config.MEMPOOL.BACKEND === 'none') {
       res.status(405).send('Address lookups cannot be used with bitcoind as backend.');
@@ -565,13 +609,6 @@ class BitcoinRoutes {
     }
   }
 
-  private async getScriptHashTransactionSummary(req: Request, res: Response): Promise<void> {
-    if (config.MEMPOOL.BACKEND !== 'esplora') {
-      res.status(405).send('Scripthash summary lookups require mempool/electrs backend.');
-      return;
-    }
-  }
-
   private async getAddressPrefix(req: Request, res: Response) {
     try {
       const blockHash = await bitcoinApi.$getAddressPrefix(req.params.prefix);

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

@@ -1,30 +1,25 @@
 import config from '../../config';
-import axios, { AxiosResponse, isAxiosError } from 'axios';
+import axios, { AxiosResponse } from 'axios';
 import http from 'http';
-import { AbstractBitcoinApi, HealthCheckHost } from './bitcoin-api-abstract-factory';
+import { AbstractBitcoinApi } from './bitcoin-api-abstract-factory';
 import { IEsploraApi } from './esplora-api.interface';
 import logger from '../../logger';
-import { Common } from '../common';
 
 interface FailoverHost {
   host: string,
   rtts: number[],
   rtt: number,
-  timedOut?: boolean,
   failures: number,
   latestHeight?: number,
   socket?: boolean,
   outOfSync?: boolean,
   unreachable?: boolean,
   preferred?: boolean,
-  checked: boolean,
-  lastChecked?: number,
 }
 
 class FailoverRouter {
   activeHost: FailoverHost;
   fallbackHost: FailoverHost;
-  maxHeight: number = 0;
   hosts: FailoverHost[];
   multihost: boolean;
   pollInterval: number = 60000;
@@ -39,7 +34,6 @@ class FailoverRouter {
     this.hosts = (config.ESPLORA.FALLBACK || []).map(domain => {
       return {
         host: domain,
-        checked: false,
         rtts: [],
         rtt: Infinity,
         failures: 0,
@@ -52,7 +46,6 @@ class FailoverRouter {
       failures: 0,
       socket: !!config.ESPLORA.UNIX_SOCKET_PATH,
       preferred: true,
-      checked: false,
     };
     this.fallbackHost = this.activeHost;
     this.hosts.unshift(this.activeHost);
@@ -81,93 +74,66 @@ class FailoverRouter {
       clearTimeout(this.pollTimer);
     }
 
-    const start = Date.now();
+    const results = await Promise.allSettled(this.hosts.map(async (host) => {
+      if (host.socket) {
+        return this.pollConnection.get<number>('/blocks/tip/height', { socketPath: host.host, timeout: config.ESPLORA.FALLBACK_TIMEOUT });
+      } else {
+        return this.pollConnection.get<number>(host.host + '/blocks/tip/height', { timeout: config.ESPLORA.FALLBACK_TIMEOUT });
+      }
+    }));
+    const maxHeight = results.reduce((max, result) => Math.max(max, result.status === 'fulfilled' ? result.value?.data || 0 : 0), 0);
 
     // update rtts & sync status
-    for (const host of this.hosts) {
-      try {
-        const result = await (host.socket
-          ? this.pollConnection.get<number>('/blocks/tip/height', { socketPath: host.host, timeout: config.ESPLORA.FALLBACK_TIMEOUT })
-          : this.pollConnection.get<number>(host.host + '/blocks/tip/height', { timeout: config.ESPLORA.FALLBACK_TIMEOUT })
-        );
-        if (result) {
-          const height = result.data;
-          this.maxHeight = Math.max(height, this.maxHeight);
-          const rtt = result.config['meta'].rtt;
-          host.rtts.unshift(rtt);
-          host.rtts.slice(0, 5);
-          host.rtt = host.rtts.reduce((acc, l) => acc + l, 0) / host.rtts.length;
-          host.latestHeight = height;
-          if (height == null || isNaN(height) || (this.maxHeight - height > 2)) {
-            host.outOfSync = true;
-          } else {
-            host.outOfSync = false;
-          }
-          host.unreachable = false;
-        } else {
+    for (let i = 0; i < results.length; i++) {
+      const host = this.hosts[i];
+      const result = results[i].status === 'fulfilled' ? (results[i] as PromiseFulfilledResult<AxiosResponse<number, any>>).value : null;
+      if (result) {
+        const height = result.data;
+        const rtt = result.config['meta'].rtt;
+        host.rtts.unshift(rtt);
+        host.rtts.slice(0, 5);
+        host.rtt = host.rtts.reduce((acc, l) => acc + l, 0) / host.rtts.length;
+        host.latestHeight = height;
+        if (height == null || isNaN(height) || (maxHeight - height > 2)) {
           host.outOfSync = true;
-          host.unreachable = true;
-          host.rtts = [];
-          host.rtt = Infinity;
+        } else {
+          host.outOfSync = false;
         }
-        host.timedOut = false;
-      } catch (e) {
+        host.unreachable = false;
+      } else {
         host.outOfSync = true;
         host.unreachable = true;
-        host.rtts = [];
-        host.rtt = Infinity;
-        if (isAxiosError(e) && (e.code === 'ECONNABORTED' || e.code === 'ETIMEDOUT')) {
-          host.timedOut = true;
-        } else {
-          host.timedOut = false;
-        }
       }
-      host.checked = true;
-      host.lastChecked = Date.now();
-
-      // switch if the current host is out of sync or significantly slower than the next best alternative
-      const rankOrder = this.sortHosts();
-      // switch if the current host is out of sync or significantly slower than the next best alternative
-      if (this.activeHost.outOfSync || this.activeHost.unreachable || (this.activeHost !== rankOrder[0] && rankOrder[0].preferred) || (!this.activeHost.preferred && this.activeHost.rtt > (rankOrder[0].rtt * 2) + 50)) {
-        if (this.activeHost.unreachable) {
-          logger.warn(`🚨🚨🚨 Unable to reach ${this.activeHost.host}, failing over to next best alternative 🚨🚨🚨`);
-        } else if (this.activeHost.outOfSync) {
-          logger.warn(`🚨🚨🚨 ${this.activeHost.host} has fallen behind, failing over to next best alternative 🚨🚨🚨`);
-        } else {
-          logger.debug(`🛠️ ${this.activeHost.host} is no longer the best esplora host 🛠️`);
-        }
-        this.electHost();
-      }
-      await Common.sleep$(50);
     }
 
-    const rankOrder = this.updateFallback();
-    logger.debug(`Tomahawk ranking:\n${rankOrder.map((host, index) => this.formatRanking(index, host, this.activeHost, this.maxHeight)).join('\n')}`);
+    this.sortHosts();
 
-    const elapsed = Date.now() - start;
+    logger.debug(`Tomahawk ranking:\n${this.hosts.map((host, index) => this.formatRanking(index, host, this.activeHost, maxHeight)).join('\n')}`);
 
-    this.pollTimer = setTimeout(() => { this.pollHosts(); }, Math.max(1, this.pollInterval - elapsed));
+    // switch if the current host is out of sync or significantly slower than the next best alternative
+    if (this.activeHost.outOfSync || this.activeHost.unreachable || (this.activeHost !== this.hosts[0] && this.hosts[0].preferred) || (!this.activeHost.preferred && this.activeHost.rtt > (this.hosts[0].rtt * 2) + 50)) {
+      if (this.activeHost.unreachable) {
+        logger.warn(`🚨🚨🚨 Unable to reach ${this.activeHost.host}, failing over to next best alternative 🚨🚨🚨`);
+      } else if (this.activeHost.outOfSync) {
+        logger.warn(`🚨🚨🚨 ${this.activeHost.host} has fallen behind, failing over to next best alternative 🚨🚨🚨`);
+      } else {
+        logger.debug(`🛠️ ${this.activeHost.host} is no longer the best esplora host 🛠️`);
+      }
+      this.electHost();
+    }
+
+    this.pollTimer = setTimeout(() => { this.pollHosts(); }, this.pollInterval);
   }
 
   private formatRanking(index: number, host: FailoverHost, active: FailoverHost, maxHeight: number): string {
-    const heightStatus = !host.checked ? '⏳' : (host.outOfSync ? '🚫' : (host.latestHeight && host.latestHeight < maxHeight ? '🟧' : '✅'));
-    return `${host === active ? '⭐️' : '  '} ${host.rtt < Infinity ? Math.round(host.rtt).toString().padStart(5, ' ') + 'ms' : (host.timedOut ? '  ⌛️💥 ' : '    -  ')} ${!host.checked ? '⏳' : (host.unreachable ? '🔥' : '✅')} | block: ${host.latestHeight || '??????'} ${heightStatus} | ${host.host} ${host === active ? '⭐️' : '  '}`;
-  }
-
-  private updateFallback(): FailoverHost[] {
-    const rankOrder = this.sortHosts();
-    if (rankOrder.length > 1 && rankOrder[0] === this.activeHost) {
-      this.fallbackHost = rankOrder[1];
-    } else {
-      this.fallbackHost = rankOrder[0];
-    }
-    return rankOrder;
+    const heightStatus = host.outOfSync ? '🚫' : (host.latestHeight && host.latestHeight < maxHeight ? '🟧' : '✅');
+    return `${host === active ? '⭐️' : '  '} ${host.rtt < Infinity ? Math.round(host.rtt).toString().padStart(5, ' ') + 'ms' : '    -  '} ${host.unreachable ? '🔥' : '✅'} | block: ${host.latestHeight || '??????'} ${heightStatus} | ${host.host} ${host === active ? '⭐️' : '  '}`;
   }
 
   // sort hosts by connection quality, and update default fallback
-  public sortHosts(): FailoverHost[] {
+  private sortHosts(): void {
     // sort by connection quality
-    return this.hosts.slice().sort((a, b) => {
+    this.hosts.sort((a, b) => {
       if ((a.unreachable || a.outOfSync) === (b.unreachable || b.outOfSync)) {
         if  (a.preferred === b.preferred) {
           // lower rtt is best
@@ -179,14 +145,19 @@ class FailoverRouter {
         return (a.unreachable || a.outOfSync) ? 1 : -1;
       }
     });
+    if (this.hosts.length > 1 && this.hosts[0] === this.activeHost) {
+      this.fallbackHost = this.hosts[1];
+    } else {
+      this.fallbackHost = this.hosts[0];
+    }
   }
 
   // depose the active host and choose the next best replacement
   private electHost(): void {
     this.activeHost.outOfSync = true;
     this.activeHost.failures = 0;
-    const rankOrder = this.sortHosts();
-    this.activeHost = rankOrder[0];
+    this.sortHosts();
+    this.activeHost = this.hosts[0];
     logger.warn(`Switching esplora host to ${this.activeHost.host}`);
   }
 
@@ -350,24 +321,6 @@ class ElectrsApi implements AbstractBitcoinApi {
   public startHealthChecks(): void {
     this.failoverRouter.startHealthChecks();
   }
-
-  public getHealthStatus(): HealthCheckHost[] {
-    if (config.MEMPOOL.OFFICIAL) {
-      return this.failoverRouter.sortHosts().map(host => ({
-        host: host.host,
-        active: host === this.failoverRouter.activeHost,
-        rtt: host.rtt,
-        latestHeight: host.latestHeight || 0,
-        socket: !!host.socket,
-        outOfSync: !!host.outOfSync,
-        unreachable: !!host.unreachable,
-        checked: !!host.checked,
-        lastChecked: host.lastChecked || 0,
-      }));
-    } else {
-      return [];
-    }
-  }
 }
 
 export default ElectrsApi;

backend/src/api/blocks.ts

@@ -2,7 +2,7 @@ import config from '../config';
 import bitcoinApi, { bitcoinCoreApi } from './bitcoin/bitcoin-api-factory';
 import logger from '../logger';
 import memPool from './mempool';
-import { BlockExtended, BlockExtension, BlockSummary, PoolTag, TransactionExtended, TransactionMinerInfo, CpfpSummary, MempoolTransactionExtended, TransactionClassified, BlockAudit } from '../mempool.interfaces';
+import { BlockExtended, BlockExtension, BlockSummary, PoolTag, TransactionExtended, TransactionMinerInfo, CpfpSummary, MempoolTransactionExtended, TransactionClassified } from '../mempool.interfaces';
 import { Common } from './common';
 import diskCache from './disk-cache';
 import transactionUtils from './transaction-utils';
@@ -37,10 +37,8 @@ class Blocks {
   private currentBits = 0;
   private lastDifficultyAdjustmentTime = 0;
   private previousDifficultyRetarget = 0;
-  private quarterEpochBlockTime: number | null = null;
   private newBlockCallbacks: ((block: BlockExtended, txIds: string[], transactions: TransactionExtended[]) => void)[] = [];
   private newAsyncBlockCallbacks: ((block: BlockExtended, txIds: string[], transactions: MempoolTransactionExtended[]) => Promise<void>)[] = [];
-  private classifyingBlocks: boolean = false;
 
   private mainLoopTimeout: number = 120000;
 
@@ -453,9 +451,7 @@ class Blocks {
         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);
-          if (cpfpSummary) {
-            await this.$getStrippedBlockTransactions(block.hash, true, true, cpfpSummary, block.height); // This will index the block summary
-          }
+          await this.$getStrippedBlockTransactions(block.hash, true, true, cpfpSummary, block.height); // This will index the block summary
         } else {
           await this.$getStrippedBlockTransactions(block.hash, true, true); // This will index the block summary
         }
@@ -569,11 +565,6 @@ class Blocks {
    * [INDEXING] Index transaction classification flags for Goggles
    */
   public async $classifyBlocks(): Promise<void> {
-    if (this.classifyingBlocks) {
-      return;
-    }
-    this.classifyingBlocks = true;
-
     // classification requires an esplora backend
     if (!Common.gogglesIndexingEnabled() || config.MEMPOOL.BACKEND !== 'esplora') {
       return;
@@ -685,8 +676,6 @@ class Blocks {
         indexedThisRun = 0;
       }
     }
-
-    this.classifyingBlocks = false;
   }
 
   /**
@@ -784,16 +773,6 @@ class Blocks {
     } else {
       this.currentBlockHeight = this.blocks[this.blocks.length - 1].height;
     }
-    if (this.currentBlockHeight >= 503) {
-      try {
-        const quarterEpochBlockHash = await bitcoinApi.$getBlockHash(this.currentBlockHeight - 503);
-        const quarterEpochBlock = await bitcoinApi.$getBlock(quarterEpochBlockHash);
-        this.quarterEpochBlockTime = quarterEpochBlock?.timestamp;
-      } catch (e) {
-        this.quarterEpochBlockTime = null;
-        logger.warn('failed to update last epoch block time: ' + (e instanceof Error ? e.message : e));
-      }
-    }
 
     if (blockHeightTip - this.currentBlockHeight > config.MEMPOOL.INITIAL_BLOCKS_AMOUNT * 2) {
       logger.info(`${blockHeightTip - this.currentBlockHeight} blocks since tip. Fast forwarding to the ${config.MEMPOOL.INITIAL_BLOCKS_AMOUNT} recent blocks`);
@@ -1016,11 +995,11 @@ class Blocks {
     return state;
   }
 
-  private updateTimerProgress(state, msg): void {
+  private updateTimerProgress(state, msg) {
     state.progress = msg;
   }
 
-  private clearTimer(state): void {
+  private clearTimer(state) {
     if (state.timer) {
       clearTimeout(state.timer);
     }
@@ -1109,19 +1088,13 @@ class Blocks {
       summary = {
         id: hash,
         transactions: cpfpSummary.transactions.map(tx => {
-          let flags: number = 0;
-          try {
-            flags = tx.flags || Common.getTransactionFlags(tx);
-          } catch (e) {
-            logger.warn('Failed to classify transaction: ' + (e instanceof Error ? e.message : e));
-          }
           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,
-            flags: flags,
+            flags: tx.flags || Common.getTransactionFlags(tx),
           };
         }),
       };
@@ -1311,7 +1284,7 @@ class Blocks {
     return blocks;
   }
 
-  public async $getBlockAuditSummary(hash: string): Promise<BlockAudit | null> {
+  public async $getBlockAuditSummary(hash: string): Promise<any> {
     if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK)) {
       return BlocksAuditsRepository.$getBlockAudit(hash);
     } else {
@@ -1327,15 +1300,11 @@ class Blocks {
     return this.previousDifficultyRetarget;
   }
 
-  public getQuarterEpochBlockTime(): number | null {
-    return this.quarterEpochBlockTime;
-  }
-
   public getCurrentBlockHeight(): number {
     return this.currentBlockHeight;
   }
 
-  public async $indexCPFP(hash: string, height: number, txs?: TransactionExtended[]): Promise<CpfpSummary | null> {
+  public async $indexCPFP(hash: string, height: number, txs?: TransactionExtended[]): Promise<CpfpSummary> {
     let transactions = txs;
     if (!transactions) {
       if (config.MEMPOOL.BACKEND === 'esplora') {
@@ -1350,19 +1319,14 @@ class Blocks {
       }
     }
 
-    if (transactions?.length != null) {
-      const summary = Common.calculateCpfp(height, transactions as TransactionExtended[]);
+    const summary = Common.calculateCpfp(height, transactions as TransactionExtended[]);
 
-      await this.$saveCpfp(hash, height, summary);
+    await this.$saveCpfp(hash, height, summary);
 
-      const effectiveFeeStats = Common.calcEffectiveFeeStatistics(summary.transactions);
-      await blocksRepository.$saveEffectiveFeeStats(hash, effectiveFeeStats);
+    const effectiveFeeStats = Common.calcEffectiveFeeStatistics(summary.transactions);
+    await blocksRepository.$saveEffectiveFeeStats(hash, effectiveFeeStats);
 
-      return summary;
-    } else {
-      logger.err(`Cannot index CPFP for block ${height} - missing transaction data`);
-      return null;
-    }
+    return summary;
   }
 
   public async $saveCpfp(hash: string, height: number, cpfpSummary: CpfpSummary): Promise<void> {

backend/src/api/common.ts

@@ -6,25 +6,6 @@ import { NodeSocket } from '../repositories/NodesSocketsRepository';
 import { isIP } from 'net';
 import transactionUtils from './transaction-utils';
 import { isPoint } from '../utils/secp256k1';
-import logger from '../logger';
-import { getVarIntLength, opcodes, parseMultisigScript } from '../utils/bitcoin-script';
-
-// Bitcoin Core default policy settings
-const TX_MAX_STANDARD_VERSION = 2;
-const MAX_STANDARD_TX_WEIGHT = 400_000;
-const MAX_BLOCK_SIGOPS_COST = 80_000;
-const MAX_STANDARD_TX_SIGOPS_COST = (MAX_BLOCK_SIGOPS_COST / 5);
-const MIN_STANDARD_TX_NONWITNESS_SIZE = 65;
-const MAX_P2SH_SIGOPS = 15;
-const MAX_STANDARD_P2WSH_STACK_ITEMS = 100;
-const MAX_STANDARD_P2WSH_STACK_ITEM_SIZE = 80;
-const MAX_STANDARD_TAPSCRIPT_STACK_ITEM_SIZE = 80;
-const MAX_STANDARD_P2WSH_SCRIPT_SIZE = 3600;
-const MAX_STANDARD_SCRIPTSIG_SIZE = 1650;
-const DUST_RELAY_TX_FEE = 3;
-const MAX_OP_RETURN_RELAY = 83;
-const DEFAULT_PERMIT_BAREMULTISIG = true;
-
 export class Common {
   static nativeAssetId = config.MEMPOOL.NETWORK === 'liquidtestnet' ?
     '144c654344aa716d6f3abcc1ca90e5641e4e2a7f633bc09fe3baf64585819a49'
@@ -195,140 +176,6 @@ export class Common {
     );
   }
 
-  /**
-   * Validates most standardness rules
-   *
-   * returns true early if any standardness rule is violated, otherwise false
-   * (except for non-mandatory-script-verify-flag and p2sh script evaluation rules which are *not* enforced)
-   */
-  static isNonStandard(tx: TransactionExtended): boolean {
-    // version
-    if (tx.version > TX_MAX_STANDARD_VERSION) {
-      return true;
-    }
-
-    // tx-size
-    if (tx.weight > MAX_STANDARD_TX_WEIGHT) {
-      return true;
-    }
-
-    // tx-size-small
-    if (this.getNonWitnessSize(tx) < MIN_STANDARD_TX_NONWITNESS_SIZE) {
-      return true;
-    }
-
-    // bad-txns-too-many-sigops
-    if (tx.sigops && tx.sigops > MAX_STANDARD_TX_SIGOPS_COST) {
-      return true;
-    }
-
-    // input validation
-    for (const vin of tx.vin) {
-      if (vin.is_coinbase) {
-        // standardness rules don't apply to coinbase transactions
-        return false;
-      }
-      // scriptsig-size
-      if ((vin.scriptsig.length / 2) > MAX_STANDARD_SCRIPTSIG_SIZE) {
-        return true;
-      }
-      // scriptsig-not-pushonly
-      if (vin.scriptsig_asm) {
-        for (const op of vin.scriptsig_asm.split(' ')) {
-          if (opcodes[op] && opcodes[op] > opcodes['OP_16']) {
-            return true;
-          }
-        }
-      }
-      // bad-txns-nonstandard-inputs
-      if (vin.prevout?.scriptpubkey_type === 'p2sh') {
-        // TODO: evaluate script (https://github.com/bitcoin/bitcoin/blob/1ac627c485a43e50a9a49baddce186ee3ad4daad/src/policy/policy.cpp#L177)
-        // countScriptSigops returns the witness-scaled sigops, so divide by 4 before comparison with MAX_P2SH_SIGOPS
-        const sigops = (transactionUtils.countScriptSigops(vin.inner_redeemscript_asm) / 4);
-        if (sigops > MAX_P2SH_SIGOPS) {
-          return true;
-        }
-      } else if (['unknown', 'provably_unspendable', 'empty'].includes(vin.prevout?.scriptpubkey_type || '')) {
-        return true;
-      }
-      // TODO: bad-witness-nonstandard
-    }
-
-    // output validation
-    let opreturnCount = 0;
-    for (const vout of tx.vout) {
-      // scriptpubkey
-      if (['unknown', 'provably_unspendable', 'empty'].includes(vout.scriptpubkey_type)) {
-        // (non-standard output type)
-        return true;
-      } else if (vout.scriptpubkey_type === 'multisig') {
-        if (!DEFAULT_PERMIT_BAREMULTISIG) {
-          // bare-multisig
-          return true;
-        }
-        const mOfN = parseMultisigScript(vout.scriptpubkey_asm);
-        if (!mOfN || mOfN.n < 1 || mOfN.n > 3 || mOfN.m < 1 || mOfN.m > mOfN.n) {
-          // (non-standard bare multisig threshold)
-          return true;
-        }
-      } else if (vout.scriptpubkey_type === 'op_return') {
-        opreturnCount++;
-        if ((vout.scriptpubkey.length / 2) > MAX_OP_RETURN_RELAY) {
-          // over default datacarrier limit
-          return true;
-        }
-      }
-      // dust
-      // (we could probably hardcode this for the different output types...)
-      if (vout.scriptpubkey_type !== 'op_return') {
-        let dustSize = (vout.scriptpubkey.length / 2);
-        // add varint length overhead
-        dustSize += getVarIntLength(dustSize);
-        // add value size
-        dustSize += 8;
-        if (['v0_p2wpkh', 'v0_p2wsh', 'v1_p2tr'].includes(vout.scriptpubkey_type)) {
-          dustSize += 67;
-        } else {
-          dustSize += 148;
-        }
-        if (vout.value < (dustSize * DUST_RELAY_TX_FEE)) {
-          // under minimum output size
-          return true;
-        }
-      }
-    }
-
-    // multi-op-return
-    if (opreturnCount > 1) {
-      return true;
-    }
-
-    // TODO: non-mandatory-script-verify-flag
-
-    return false;
-  }
-
-  static getNonWitnessSize(tx: TransactionExtended): number {
-    let weight = tx.weight;
-    let hasWitness = false;
-    for (const vin of tx.vin) {
-      if (vin.witness?.length) {
-        hasWitness = true;
-        // witness count
-        weight -= getVarIntLength(vin.witness.length);
-        for (const witness of vin.witness) {
-          // witness item size + content
-          weight -= getVarIntLength(witness.length / 2) + (witness.length / 2);
-        }
-      }
-    }
-    if (hasWitness) {
-      // marker & segwit flag
-      weight -= 2;
-    }
-    return Math.ceil(weight / 4);
-  }
-
   static setSegwitSighashFlags(flags: bigint, witness: string[]): bigint {
     for (const w of witness) {
       if (this.isDERSig(w)) {
@@ -397,11 +244,8 @@ export class Common {
       flags |= TransactionFlags.v1;
     } else if (tx.version === 2) {
       flags |= TransactionFlags.v2;
-    } else if (tx.version === 3) {
-      flags |= TransactionFlags.v3;
     }
-    const reusedInputAddresses: { [address: string ]: number } = {};
-    const reusedOutputAddresses: { [address: string ]: number } = {};
+    const reusedAddresses: { [address: string ]: number } = {};
     const inValues = {};
     const outValues = {};
     let rbf = false;
@@ -417,9 +261,6 @@ export class Common {
         case 'v0_p2wpkh': flags |= TransactionFlags.p2wpkh; break;
         case 'v0_p2wsh': flags |= TransactionFlags.p2wsh; break;
         case 'v1_p2tr': {
-          if (!vin.witness?.length) {
-            throw new Error('Taproot input missing witness data');
-          }
           flags |= TransactionFlags.p2tr;
           // in taproot, if the last witness item begins with 0x50, it's an annex
           const hasAnnex = vin.witness?.[vin.witness.length - 1].startsWith('50');
@@ -445,7 +286,7 @@ export class Common {
       }
 
       if (vin.prevout?.scriptpubkey_address) {
-        reusedInputAddresses[vin.prevout?.scriptpubkey_address] = (reusedInputAddresses[vin.prevout?.scriptpubkey_address] || 0) + 1;
+        reusedAddresses[vin.prevout?.scriptpubkey_address] = (reusedAddresses[vin.prevout?.scriptpubkey_address] || 0) + 1;
       }
       inValues[vin.prevout?.value || Math.random()] = (inValues[vin.prevout?.value || Math.random()] || 0) + 1;
     }
@@ -455,14 +296,12 @@ export class Common {
       flags |= TransactionFlags.no_rbf;
     }
     let hasFakePubkey = false;
-    let P2WSHCount = 0;
-    let olgaSize = 0;
     for (const vout of tx.vout) {
       switch (vout.scriptpubkey_type) {
         case 'p2pk': {
           flags |= TransactionFlags.p2pk;
           // detect fake pubkey (i.e. not a valid DER point on the secp256k1 curve)
-          hasFakePubkey = hasFakePubkey || !isPoint(vout.scriptpubkey?.slice(2, -2));
+          hasFakePubkey = hasFakePubkey || !isPoint(vout.scriptpubkey.slice(2, -2));
         } break;
         case 'multisig': {
           flags |= TransactionFlags.p2ms;
@@ -482,21 +321,7 @@ export class Common {
         case 'op_return': flags |= TransactionFlags.op_return; break;
       }
       if (vout.scriptpubkey_address) {
-        reusedOutputAddresses[vout.scriptpubkey_address] = (reusedOutputAddresses[vout.scriptpubkey_address] || 0) + 1;
-      }
-      if (vout.scriptpubkey_type === 'v0_p2wsh') {
-        if (!P2WSHCount) {
-          olgaSize = parseInt(vout.scriptpubkey.slice(4, 8), 16);
-        }
-        P2WSHCount++;
-        if (P2WSHCount === Math.ceil((olgaSize + 2) / 32)) {
-          const nullBytes = (P2WSHCount * 32) - olgaSize - 2;
-          if (vout.scriptpubkey.endsWith(''.padEnd(nullBytes * 2, '0'))) {
-            flags |= TransactionFlags.fake_scripthash;
-          }
-        }
-      } else {
-        P2WSHCount = 0;
+        reusedAddresses[vout.scriptpubkey_address] = (reusedAddresses[vout.scriptpubkey_address] || 0) + 1;
       }
       outValues[vout.value || Math.random()] = (outValues[vout.value || Math.random()] || 0) + 1;
     }
@@ -506,7 +331,7 @@ export class Common {
     
     // fast but bad heuristic to detect possible coinjoins
     // (at least 5 inputs and 5 outputs, less than half of which are unique amounts, with no address reuse)
-    const addressReuse = Object.keys(reusedOutputAddresses).reduce((acc, key) => Math.max(acc, (reusedInputAddresses[key] || 0) + (reusedOutputAddresses[key] || 0)), 0) > 1;
+    const addressReuse = Object.values(reusedAddresses).reduce((acc, count) => Math.max(acc, count), 0) > 1;
     if (!addressReuse && tx.vin.length >= 5 && tx.vout.length >= 5 && (Object.keys(inValues).length + Object.keys(outValues).length) <= (tx.vin.length + tx.vout.length) / 2 ) {
       flags |= TransactionFlags.coinjoin;
     }
@@ -519,20 +344,11 @@ export class Common {
       flags |= TransactionFlags.batch_payout;
     }
 
-    if (this.isNonStandard(tx)) {
-      flags |= TransactionFlags.nonstandard;
-    }
-
     return Number(flags);
   }
 
   static classifyTransaction(tx: TransactionExtended): TransactionClassified {
-    let flags = 0;
-    try {
-      flags = Common.getTransactionFlags(tx);
-    } catch (e) {
-      logger.warn('Failed to add classification flags to transaction: ' + (e instanceof Error ? e.message : e));
-    }
+    const flags = Common.getTransactionFlags(tx);
     tx.flags = flags;
     return {
       ...Common.stripTransaction(tx),
@@ -552,7 +368,6 @@ export class Common {
       value: tx.vout.reduce((acc, vout) => acc + (vout.value ? vout.value : 0), 0),
       acc: tx.acceleration || undefined,
       rate: tx.effectiveFeePerVsize,
-      time: tx.firstSeen || undefined,
     };
   }
 
@@ -575,6 +390,69 @@ export class Common {
     }
   }
 
+  static setRelativesAndGetCpfpInfo(tx: MempoolTransactionExtended, memPool: { [txid: string]: MempoolTransactionExtended }): CpfpInfo {
+    const parents = this.findAllParents(tx, memPool);
+    const lowerFeeParents = parents.filter((parent) => parent.adjustedFeePerVsize < tx.effectiveFeePerVsize);
+
+    let totalWeight = (tx.adjustedVsize * 4) + lowerFeeParents.reduce((prev, val) => prev + (val.adjustedVsize * 4), 0);
+    let totalFees = tx.fee + lowerFeeParents.reduce((prev, val) => prev + val.fee, 0);
+
+    tx.ancestors = parents
+      .map((t) => {
+        return {
+          txid: t.txid,
+          weight: (t.adjustedVsize * 4),
+          fee: t.fee,
+        };
+      });
+
+    // Add high (high fee) decendant weight and fees
+    if (tx.bestDescendant) {
+      totalWeight += tx.bestDescendant.weight;
+      totalFees += tx.bestDescendant.fee;
+    }
+
+    tx.effectiveFeePerVsize = Math.max(0, totalFees / (totalWeight / 4));
+    tx.cpfpChecked = true;
+
+    return {
+      ancestors: tx.ancestors,
+      bestDescendant: tx.bestDescendant || null,
+    };
+  }
+
+
+  private static findAllParents(tx: MempoolTransactionExtended, memPool: { [txid: string]: MempoolTransactionExtended }): MempoolTransactionExtended[] {
+    let parents: MempoolTransactionExtended[] = [];
+    tx.vin.forEach((parent) => {
+      if (parents.find((p) => p.txid === parent.txid)) {
+        return;
+      }
+
+      const parentTx = memPool[parent.txid];
+      if (parentTx) {
+        if (tx.bestDescendant && tx.bestDescendant.fee / (tx.bestDescendant.weight / 4) > parentTx.adjustedFeePerVsize) {
+          if (parentTx.bestDescendant && parentTx.bestDescendant.fee < tx.fee + tx.bestDescendant.fee) {
+            parentTx.bestDescendant = {
+              weight: (tx.adjustedVsize * 4) + tx.bestDescendant.weight,
+              fee: tx.fee + tx.bestDescendant.fee,
+              txid: tx.txid,
+            };
+          }
+        } else if (tx.adjustedFeePerVsize > parentTx.adjustedFeePerVsize) {
+          parentTx.bestDescendant = {
+            weight: (tx.adjustedVsize * 4),
+            fee: tx.fee,
+            txid: tx.txid
+          };
+        }
+        parents.push(parentTx);
+        parents = parents.concat(this.findAllParents(parentTx, memPool));
+      }
+    });
+    return parents;
+  }
+
   // calculates the ratio of matched transactions to projected transactions by weight
   static getSimilarity(projectedBlock: MempoolBlockWithTransactions, transactions: TransactionExtended[]): number {
     let matchedWeight = 0;

backend/src/api/cpfp.ts

@@ -1,286 +0,0 @@
-import { CpfpInfo, MempoolTransactionExtended } from '../mempool.interfaces';
-import memPool from './mempool';
-
-const CPFP_UPDATE_INTERVAL = 60_000; // update CPFP info at most once per 60s per transaction
-const MAX_GRAPH_SIZE = 50; // the maximum number of in-mempool relatives to consider
-
-interface GraphTx extends MempoolTransactionExtended {
-  depends: string[];
-  spentby: string[];
-  ancestorMap: Map<string, GraphTx>;
-  fees: {
-    base: number;
-    ancestor: number;
-  };
-  ancestorcount: number;
-  ancestorsize: number;
-  ancestorRate: number;
-  individualRate: number;
-  score: number;
-}
-
-/**
- * Takes a mempool transaction and a copy of the current mempool, and calculates the CPFP data for
- * that transaction (and all others in the same cluster)
- */
-export function calculateCpfp(tx: MempoolTransactionExtended, mempool: { [txid: string]: MempoolTransactionExtended }): CpfpInfo {
-  if (tx.cpfpUpdated && Date.now() < (tx.cpfpUpdated + CPFP_UPDATE_INTERVAL)) {
-    tx.cpfpDirty = false;
-    return {
-      ancestors: tx.ancestors || [],
-      bestDescendant: tx.bestDescendant || null,
-      descendants: tx.descendants || [],
-      effectiveFeePerVsize: tx.effectiveFeePerVsize || tx.adjustedFeePerVsize || tx.feePerVsize,
-      sigops: tx.sigops,
-      adjustedVsize: tx.adjustedVsize,
-      acceleration: tx.acceleration
-    };
-  }
-
-  const ancestorMap = new Map<string, GraphTx>();
-  const graphTx = mempoolToGraphTx(tx);
-  ancestorMap.set(tx.txid, graphTx);
-
-  const allRelatives = expandRelativesGraph(mempool, ancestorMap);
-  const relativesMap = initializeRelatives(allRelatives);
-  const cluster = calculateCpfpCluster(tx.txid, relativesMap);
-
-  let totalVsize = 0;
-  let totalFee = 0;
-  for (const tx of cluster.values()) {
-    totalVsize += tx.adjustedVsize;
-    totalFee += tx.fee;
-  }
-  const effectiveFeePerVsize = totalFee / totalVsize;
-  for (const tx of cluster.values()) {
-    mempool[tx.txid].effectiveFeePerVsize = effectiveFeePerVsize;
-    mempool[tx.txid].ancestors = Array.from(tx.ancestorMap.values()).map(tx => ({ txid: tx.txid, weight: tx.weight, fee: tx.fee }));
-    mempool[tx.txid].descendants = Array.from(cluster.values()).filter(entry => entry.txid !== tx.txid && !tx.ancestorMap.has(entry.txid)).map(tx => ({ txid: tx.txid, weight: tx.weight, fee: tx.fee }));
-    mempool[tx.txid].bestDescendant = null;
-    mempool[tx.txid].cpfpChecked = true;
-    mempool[tx.txid].cpfpDirty = true;
-    mempool[tx.txid].cpfpUpdated = Date.now();
-  }
-
-  tx = mempool[tx.txid];
-
-  return {
-    ancestors: tx.ancestors || [],
-    bestDescendant: tx.bestDescendant || null,
-    descendants: tx.descendants || [],
-    effectiveFeePerVsize: tx.effectiveFeePerVsize || tx.adjustedFeePerVsize || tx.feePerVsize,
-    sigops: tx.sigops,
-    adjustedVsize: tx.adjustedVsize,
-    acceleration: tx.acceleration
-  };
-}
-
-function mempoolToGraphTx(tx: MempoolTransactionExtended): GraphTx {
-  return {
-    ...tx,
-    depends: tx.vin.map(v => v.txid),
-    spentby: tx.vout.map((v, i) => memPool.getFromSpendMap(tx.txid, i)).map(tx => tx?.txid).filter(txid => txid != null) as string[],
-    ancestorMap: new Map(),
-    fees: {
-      base: tx.fee,
-      ancestor: tx.fee,
-    },
-    ancestorcount: 1,
-    ancestorsize: tx.adjustedVsize,
-    ancestorRate: 0,
-    individualRate: 0,
-    score: 0,
-  };
-}
-
-/**
- * Takes a map of transaction ancestors, and expands it into a full graph of up to MAX_GRAPH_SIZE in-mempool relatives
- */
-function expandRelativesGraph(mempool: { [txid: string]: MempoolTransactionExtended }, ancestors: Map<string, GraphTx>): Map<string, GraphTx> {
-  const relatives: Map<string, GraphTx> = new Map();
-  const stack: GraphTx[] = Array.from(ancestors.values());
-  while (stack.length > 0) {
-    if (relatives.size > MAX_GRAPH_SIZE) {
-      return relatives;
-    }
-
-    const nextTx = stack.pop();
-    if (!nextTx) {
-      continue;
-    }
-    relatives.set(nextTx.txid, nextTx);
-
-    for (const relativeTxid of [...nextTx.depends, ...nextTx.spentby]) {
-      if (relatives.has(relativeTxid)) {
-        // already processed this tx
-        continue;
-      }
-      let mempoolTx = ancestors.get(relativeTxid);
-      if (!mempoolTx && mempool[relativeTxid]) {
-        mempoolTx = mempoolToGraphTx(mempool[relativeTxid]);
-      }
-      if (mempoolTx) {
-        stack.push(mempoolTx);
-      }
-    }
-  }
-
-  return relatives;
-}
-
- /**
-   * Efficiently sets a Map of in-mempool ancestors for each member of an expanded relative graph
-   * by running setAncestors on each leaf, and caching intermediate results.
-   * then initializes ancestor data for each transaction
-   * 
-   * @param all 
-   */
- function initializeRelatives(mempoolTxs: Map<string, GraphTx>): Map<string, GraphTx> {
-  const visited: Map<string, Map<string, GraphTx>> = new Map();
-  const leaves: GraphTx[] = Array.from(mempoolTxs.values()).filter(entry => entry.spentby.length === 0);
-  for (const leaf of leaves) {
-    setAncestors(leaf, mempoolTxs, visited);
-  }
-  mempoolTxs.forEach(entry => {
-    entry.ancestorMap?.forEach(ancestor => {
-      entry.ancestorcount++;
-      entry.ancestorsize += ancestor.adjustedVsize;
-      entry.fees.ancestor += ancestor.fees.base;
-    });
-    setAncestorScores(entry);
-  });
-  return mempoolTxs;
-}
-
-/**
-   * Given a root transaction and a list of in-mempool ancestors,
-   * Calculate the CPFP cluster
-   * 
-   * @param tx
-   * @param ancestors
-   */
-function calculateCpfpCluster(txid: string, graph: Map<string, GraphTx>): Map<string, GraphTx> {
-  const tx = graph.get(txid);
-  if (!tx) {
-    return new Map<string, GraphTx>([]);
-  }
-
-  // Initialize individual & ancestor fee rates
-  graph.forEach(entry => setAncestorScores(entry));
-
-  // Sort by descending ancestor score
-  let sortedRelatives = Array.from(graph.values()).sort(mempoolComparator);
-
-  // Iterate until we reach a cluster that includes our target tx
-  let maxIterations = MAX_GRAPH_SIZE;
-  let best = sortedRelatives.shift();
-  let bestCluster = new Map<string, GraphTx>(best?.ancestorMap?.entries() || []);
-  while (sortedRelatives.length && best && (best.txid !== tx.txid && !best.ancestorMap.has(tx.txid)) && maxIterations > 0) {
-    maxIterations--;
-    if ((best && best.txid === tx.txid) || (bestCluster && bestCluster.has(tx.txid))) {
-      break;
-    } else {
-      // Remove this cluster (it doesn't include our target tx)
-      // and update scores, ancestor totals and dependencies for the survivors
-      removeAncestors(bestCluster, graph);
-
-      // re-sort
-      sortedRelatives = Array.from(graph.values()).sort(mempoolComparator);
-
-      // Grab the next highest scoring entry
-      best = sortedRelatives.shift();
-      if (best) {
-        bestCluster = new Map<string, GraphTx>(best?.ancestorMap?.entries() || []);
-        bestCluster.set(best?.txid, best);
-      }
-    }
-  }
-
-  bestCluster.set(tx.txid, tx);
-
-  return bestCluster;
-}
-
- /**
-   * Remove a cluster of transactions from an in-mempool dependency graph
-   * and update the survivors' scores and ancestors
-   * 
-   * @param cluster 
-   * @param ancestors 
-   */
- function removeAncestors(cluster: Map<string, GraphTx>, all: Map<string, GraphTx>): void {
-  // remove
-  cluster.forEach(tx => {
-    all.delete(tx.txid);
-  });
-
-  // update survivors
-  all.forEach(tx => {
-    cluster.forEach(remove => {
-      if (tx.ancestorMap?.has(remove.txid)) {
-        // remove as dependency
-        tx.ancestorMap.delete(remove.txid);
-        tx.depends = tx.depends.filter(parent => parent !== remove.txid);
-        // update ancestor sizes and fees
-        tx.ancestorsize -= remove.adjustedVsize;
-        tx.fees.ancestor -= remove.fees.base;
-      }
-    });
-    // recalculate fee rates
-    setAncestorScores(tx);
-  });
-}
-
-/**
-   * Recursively traverses an in-mempool dependency graph, and sets a Map of in-mempool ancestors
-   * for each transaction.
-   * 
-   * @param tx 
-   * @param all 
-   */
-function setAncestors(tx: GraphTx, all: Map<string, GraphTx>, visited: Map<string, Map<string, GraphTx>>, depth: number = 0): Map<string, GraphTx> {
-  // sanity check for infinite recursion / too many ancestors (should never happen)
-  if (depth > MAX_GRAPH_SIZE) {
-    return tx.ancestorMap;
-  }
-  
-  // initialize the ancestor map for this tx
-  tx.ancestorMap = new Map<string, GraphTx>();
-  tx.depends.forEach(parentId => {
-    const parent = all.get(parentId);
-    if (parent) {
-      // add the parent
-      tx.ancestorMap?.set(parentId, parent);
-      // check for a cached copy of this parent's ancestors
-      let ancestors = visited.get(parent.txid);
-      if (!ancestors) {
-        // recursively fetch the parent's ancestors
-        ancestors = setAncestors(parent, all, visited, depth + 1);
-      }
-      // and add to this tx's map
-      ancestors.forEach((ancestor, ancestorId) => {
-        tx.ancestorMap?.set(ancestorId, ancestor);
-      });
-    }
-  });
-  visited.set(tx.txid, tx.ancestorMap);
-
-  return tx.ancestorMap;
-}
-
-/**
-   * Take a mempool transaction, and set the fee rates and ancestor score
-   * 
-   * @param tx 
-   */
-function setAncestorScores(tx: GraphTx): GraphTx {
-  tx.individualRate = (tx.fees.base * 100_000_000) / tx.adjustedVsize;
-  tx.ancestorRate = (tx.fees.ancestor * 100_000_000) / tx.ancestorsize;
-  tx.score = Math.min(tx.individualRate, tx.ancestorRate);
-  return tx;
-}
-
-// Sort by descending score
-function mempoolComparator(a: GraphTx, b: GraphTx): number {
-  return b.score - a.score;
-}

backend/src/api/database-migration.ts

@@ -7,7 +7,7 @@ import cpfpRepository from '../repositories/CpfpRepository';
 import { RowDataPacket } from 'mysql2';
 
 class DatabaseMigration {
-  private static currentVersion = 76;
+  private static currentVersion = 67;
   private queryTimeout = 3600_000;
   private statisticsAddedIndexed = false;
   private uniqueLogs: string[] = [];
@@ -566,104 +566,6 @@ class DatabaseMigration {
       await this.$executeQuery('ALTER TABLE `blocks_templates` ADD INDEX `version` (`version`)');
       await this.updateToSchemaVersion(67);
     }
-    
-    if (databaseSchemaVersion < 68 && config.MEMPOOL.NETWORK === "liquid") {
-      await this.$executeQuery('TRUNCATE TABLE elements_pegs');
-      await this.$executeQuery('ALTER TABLE elements_pegs ADD PRIMARY KEY (txid, txindex);');
-      await this.$executeQuery(`UPDATE state SET number = 0 WHERE name = 'last_elements_block';`);
-      // Create the federation_addresses table and add the two Liquid Federation change addresses in
-      await this.$executeQuery(this.getCreateFederationAddressesTableQuery(), await this.$checkIfTableExists('federation_addresses'));
-      await this.$executeQuery(`INSERT INTO federation_addresses (bitcoinaddress) VALUES ('bc1qxvay4an52gcghxq5lavact7r6qe9l4laedsazz8fj2ee2cy47tlqff4aj4')`); // Federation change address
-      await this.$executeQuery(`INSERT INTO federation_addresses (bitcoinaddress) VALUES ('3EiAcrzq1cELXScc98KeCswGWZaPGceT1d')`); // Federation change address
-      // Create the federation_txos table that uses the federation_addresses table as a foreign key
-      await this.$executeQuery(this.getCreateFederationTxosTableQuery(), await this.$checkIfTableExists('federation_txos'));
-      await this.$executeQuery(`INSERT INTO state VALUES('last_bitcoin_block_audit', 0, NULL);`);
-      await this.updateToSchemaVersion(68);
-    }
-
-    if (databaseSchemaVersion < 69 && config.MEMPOOL.NETWORK === 'mainnet') {
-      await this.$executeQuery(this.getCreateAccelerationsTableQuery(), await this.$checkIfTableExists('accelerations'));
-      await this.updateToSchemaVersion(69);
-    }
-
-    if (databaseSchemaVersion < 70 && config.MEMPOOL.NETWORK === 'mainnet') {
-      await this.$executeQuery('ALTER TABLE accelerations MODIFY COLUMN added DATETIME;');
-      await this.updateToSchemaVersion(70);
-    }
-
-    if (databaseSchemaVersion < 71 && config.MEMPOOL.NETWORK === 'liquid') {
-      await this.$executeQuery('TRUNCATE TABLE elements_pegs');
-      await this.$executeQuery('TRUNCATE TABLE federation_txos');
-      await this.$executeQuery('SET FOREIGN_KEY_CHECKS = 0');
-      await this.$executeQuery('TRUNCATE TABLE federation_addresses');
-      await this.$executeQuery('SET FOREIGN_KEY_CHECKS = 1');
-      await this.$executeQuery(`INSERT INTO federation_addresses (bitcoinaddress) VALUES ('bc1qxvay4an52gcghxq5lavact7r6qe9l4laedsazz8fj2ee2cy47tlqff4aj4')`); // Federation change address
-      await this.$executeQuery(`INSERT INTO federation_addresses (bitcoinaddress) VALUES ('3EiAcrzq1cELXScc98KeCswGWZaPGceT1d')`); // Federation change address
-      await this.$executeQuery(`UPDATE state SET number = 0 WHERE name = 'last_elements_block';`);
-      await this.$executeQuery(`UPDATE state SET number = 0 WHERE name = 'last_bitcoin_block_audit';`);
-      await this.$executeQuery('ALTER TABLE `federation_txos` ADD timelock INT NOT NULL DEFAULT 0');
-      await this.$executeQuery('ALTER TABLE `federation_txos` ADD expiredAt INT NOT NULL DEFAULT 0');
-      await this.$executeQuery('ALTER TABLE `federation_txos` ADD emergencyKey TINYINT NOT NULL DEFAULT 0');
-      await this.updateToSchemaVersion(71);
-    }
-
-    if (databaseSchemaVersion < 72 && isBitcoin === true) {
-      // reindex Goggles flags for mined block templates above height 832000
-      await this.$executeQuery('UPDATE blocks_summaries SET version = 0 WHERE height >= 832000;');
-      await this.updateToSchemaVersion(72);
-    }
-
-    if (databaseSchemaVersion < 73 && config.MEMPOOL.NETWORK === 'mainnet') {
-      // Clear bad data
-      await this.$executeQuery(`TRUNCATE accelerations`);
-      this.uniqueLog(logger.notice, `'accelerations' table has been truncated`);
-      await this.updateToSchemaVersion(73);
-    }
-
-    if (databaseSchemaVersion < 74 && config.MEMPOOL.NETWORK === 'mainnet') {
-      await this.$executeQuery(`INSERT INTO state(name, number) VALUE ('last_acceleration_block', 0);`);
-      await this.updateToSchemaVersion(74);
-    }
-
-    if (databaseSchemaVersion < 75) {
-      await this.$executeQuery('ALTER TABLE `prices` ADD `BGN` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `BRL` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `CNY` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `CZK` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `DKK` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `HKD` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `HRK` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `HUF` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `IDR` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `ILS` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `INR` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `ISK` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `KRW` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `MXN` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `MYR` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `NOK` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `NZD` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `PHP` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `PLN` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `RON` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `RUB` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `SEK` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `SGD` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `THB` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `TRY` float DEFAULT "-1"');
-      await this.$executeQuery('ALTER TABLE `prices` ADD `ZAR` float DEFAULT "-1"');
-
-      await this.$executeQuery('TRUNCATE hashrates');
-      await this.$executeQuery('TRUNCATE difficulty_adjustments');
-      await this.$executeQuery(`UPDATE state SET string = NULL WHERE name = 'pools_json_sha'`);
-
-      await this.updateToSchemaVersion(75);
-    }
-
-    if (databaseSchemaVersion < 76 && isBitcoin === true) {
-      await this.$executeQuery('ALTER TABLE `blocks_audits` ADD prioritized_txs JSON DEFAULT "[]"');
-      await this.updateToSchemaVersion(76);
-    }
   }
 
   /**
@@ -911,32 +813,6 @@ class DatabaseMigration {
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8;`;
   }
 
-  private getCreateFederationAddressesTableQuery(): string {
-    return `CREATE TABLE IF NOT EXISTS federation_addresses (
-      bitcoinaddress varchar(100) NOT NULL,
-      PRIMARY KEY (bitcoinaddress)
-    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;`;
-  }
-
-  private getCreateFederationTxosTableQuery(): string {
-    return `CREATE TABLE IF NOT EXISTS federation_txos (
-      txid varchar(65) NOT NULL,
-      txindex int(11) NOT NULL,
-      bitcoinaddress varchar(100) NOT NULL,
-      amount bigint(20) unsigned NOT NULL,
-      blocknumber int(11) unsigned NOT NULL,
-      blocktime int(11) unsigned NOT NULL,
-      unspent tinyint(1) NOT NULL,
-      lastblockupdate int(11) unsigned NOT NULL,
-      lasttimeupdate int(11) unsigned NOT NULL,
-      pegtxid varchar(65) NOT NULL,
-      pegindex int(11) NOT NULL,
-      pegblocktime int(11) unsigned NOT NULL,
-      PRIMARY KEY (txid, txindex), 
-      FOREIGN KEY (bitcoinaddress) REFERENCES federation_addresses (bitcoinaddress)
-    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;`;
-  }
-
   private getCreatePoolsTableQuery(): string {
     return `CREATE TABLE IF NOT EXISTS pools (
       id int(11) NOT NULL AUTO_INCREMENT,
@@ -1207,23 +1083,6 @@ class DatabaseMigration {
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8;`;
   }
 
-  private getCreateAccelerationsTableQuery(): string {
-    return `CREATE TABLE IF NOT EXISTS accelerations (
-      txid varchar(65) NOT NULL,
-      added datetime NOT NULL,
-      height int(10) NOT NULL,
-      pool smallint unsigned NULL,
-      effective_vsize int(10) NOT NULL,
-      effective_fee bigint(20) unsigned NOT NULL,
-      boost_rate float unsigned,
-      boost_cost bigint(20) unsigned NOT NULL,
-      PRIMARY KEY (txid),
-      INDEX (added),
-      INDEX (height),
-      INDEX (pool)
-    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;`;
-  }
-
   public async $blocksReindexingTruncate(): Promise<void> {
     logger.warn(`Truncating pools, blocks, hashrates and difficulty_adjustments tables for re-indexing (using '--reindex-blocks'). You can cancel this command within 5 seconds`);
     await Common.sleep$(5000);

backend/src/api/difficulty-adjustment.ts

@@ -12,7 +12,6 @@ export interface DifficultyAdjustment {
   previousTime: number;          // Unix time in ms
   nextRetargetHeight: number;    // Block Height
   timeAvg: number;               // Duration of time in ms
-  adjustedTimeAvg;               // Expected block interval with hashrate implied over last 504 blocks
   timeOffset: number;            // (Testnet) Time since last block (cap @ 20min) in ms
   expectedBlocks: number;         // Block count
 }
@@ -81,7 +80,6 @@ export function calcBitsDifference(oldBits: number, newBits: number): number {
 
 export function calcDifficultyAdjustment(
   DATime: number,
-  quarterEpochTime: number | null,
   nowSeconds: number,
   blockHeight: number,
   previousRetarget: number,
@@ -102,20 +100,8 @@ export function calcDifficultyAdjustment(
 
   let difficultyChange = 0;
   let timeAvgSecs = blocksInEpoch ? diffSeconds / blocksInEpoch : BLOCK_SECONDS_TARGET;
-  let adjustedTimeAvgSecs = timeAvgSecs;
-
-  // for the first 504 blocks of the epoch, calculate the expected avg block interval
-  // from a sliding window over the last 504 blocks
-  if (quarterEpochTime && blocksInEpoch < 503) {
-    const timeLastEpoch = DATime - quarterEpochTime;
-    const adjustedTimeLastEpoch = timeLastEpoch * (1 + (previousRetarget / 100));
-    const adjustedTimeSpan = diffSeconds + adjustedTimeLastEpoch;
-    adjustedTimeAvgSecs = adjustedTimeSpan / 503;
-    difficultyChange = (BLOCK_SECONDS_TARGET / (adjustedTimeSpan / 504) - 1) * 100;
-  } else {
-    difficultyChange = (BLOCK_SECONDS_TARGET / (actualTimespan / (blocksInEpoch + 1)) - 1) * 100;
-  }
 
+  difficultyChange = (BLOCK_SECONDS_TARGET / (actualTimespan / (blocksInEpoch + 1)) - 1) * 100;
   // Max increase is x4 (+300%)
   if (difficultyChange > 300) {
     difficultyChange = 300;
@@ -140,8 +126,7 @@ export function calcDifficultyAdjustment(
   }
 
   const timeAvg = Math.floor(timeAvgSecs * 1000);
-  const adjustedTimeAvg = Math.floor(adjustedTimeAvgSecs * 1000);
-  const remainingTime = remainingBlocks * adjustedTimeAvg;
+  const remainingTime = remainingBlocks * timeAvg;
   const estimatedRetargetDate = remainingTime + nowSeconds * 1000;
 
   return {
@@ -154,7 +139,6 @@ export function calcDifficultyAdjustment(
     previousTime: DATime,
     nextRetargetHeight,
     timeAvg,
-    adjustedTimeAvg,
     timeOffset,
     expectedBlocks,
   };
@@ -171,10 +155,9 @@ class DifficultyAdjustmentApi {
       return null;
     }
     const nowSeconds = Math.floor(new Date().getTime() / 1000);
-    const quarterEpochBlockTime = blocks.getQuarterEpochBlockTime();
 
     return calcDifficultyAdjustment(
-      DATime, quarterEpochBlockTime, nowSeconds, blockHeight, previousRetarget,
+      DATime, nowSeconds, blockHeight, previousRetarget,
       config.MEMPOOL.NETWORK, latestBlock.timestamp
     );
   }

backend/src/api/liquid/elements-parser.ts

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

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

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

backend/src/api/mempool-blocks.ts

@@ -1,11 +1,13 @@
 import { GbtGenerator, GbtResult, ThreadTransaction as RustThreadTransaction, ThreadAcceleration as RustThreadAcceleration } from 'rust-gbt';
 import logger from '../logger';
-import { MempoolBlock, MempoolTransactionExtended, MempoolBlockWithTransactions, MempoolBlockDelta, Ancestor, CompactThreadTransaction, EffectiveFeeStats, TransactionClassified, TransactionCompressed, MempoolDeltaChange, GbtCandidates } from '../mempool.interfaces';
+import { MempoolBlock, MempoolTransactionExtended, MempoolBlockWithTransactions, MempoolBlockDelta, Ancestor, CompactThreadTransaction, EffectiveFeeStats, PoolTag, TransactionClassified } from '../mempool.interfaces';
 import { Common, OnlineFeeStatsCalculator } from './common';
 import config from '../config';
 import { Worker } from 'worker_threads';
 import path from 'path';
 import mempool from './mempool';
+import { Acceleration } from './services/acceleration';
+import PoolsRepository from '../repositories/PoolsRepository';
 
 const MAX_UINT32 = Math.pow(2, 32) - 1;
 
@@ -18,7 +20,17 @@ class MempoolBlocks {
 
   private nextUid: number = 1;
   private uidMap: Map<number, string> = new Map(); // map short numerical uids to full txids
-  private txidMap: Map<string, number> = new Map(); // map full txids back to short numerical uids
+
+  private pools: { [id: number]: PoolTag } = {};
+
+  constructor() {
+    PoolsRepository.$getPools().then(allPools => {
+      this.pools = {};
+      for (const pool of allPools) {
+        this.pools[pool.uniqueId] = pool;
+      }
+    });
+  }
 
   public getMempoolBlocks(): MempoolBlock[] {
     return this.mempoolBlocks.map((block) => {
@@ -41,12 +53,138 @@ class MempoolBlocks {
     return this.mempoolBlockDeltas;
   }
 
+  public updateMempoolBlocks(memPool: { [txid: string]: MempoolTransactionExtended }, saveResults: boolean = false): MempoolBlockWithTransactions[] {
+    const latestMempool = memPool;
+    const memPoolArray: MempoolTransactionExtended[] = [];
+    for (const i in latestMempool) {
+      memPoolArray.push(latestMempool[i]);
+    }
+    const start = new Date().getTime();
+
+    // Clear bestDescendants & ancestors
+    memPoolArray.forEach((tx) => {
+      tx.bestDescendant = null;
+      tx.ancestors = [];
+      tx.cpfpChecked = false;
+      if (!tx.effectiveFeePerVsize) {
+        tx.effectiveFeePerVsize = tx.adjustedFeePerVsize;
+      }
+    });
+
+    // First sort
+    memPoolArray.sort((a, b) => {
+      if (a.adjustedFeePerVsize === b.adjustedFeePerVsize) {
+        // tie-break by lexicographic txid order for stability
+        return a.txid < b.txid ? -1 : 1;
+      } else {
+        return b.adjustedFeePerVsize - a.adjustedFeePerVsize;
+      }
+    });
+
+    // Loop through and traverse all ancestors and sum up all the sizes + fees
+    // Pass down size + fee to all unconfirmed children
+    let sizes = 0;
+    memPoolArray.forEach((tx) => {
+      sizes += tx.weight;
+      if (sizes > 4000000 * 8) {
+        return;
+      }
+      Common.setRelativesAndGetCpfpInfo(tx, memPool);
+    });
+
+    // Final sort, by effective fee
+    memPoolArray.sort((a, b) => {
+      if (a.effectiveFeePerVsize === b.effectiveFeePerVsize) {
+        // tie-break by lexicographic txid order for stability
+        return a.txid < b.txid ? -1 : 1;
+      } else {
+        return b.effectiveFeePerVsize - a.effectiveFeePerVsize;
+      }
+    });
+
+    const end = new Date().getTime();
+    const time = end - start;
+    logger.debug('Mempool blocks calculated in ' + time / 1000 + ' seconds');
+
+    const blocks = this.calculateMempoolBlocks(memPoolArray);
+
+    if (saveResults) {
+      const deltas = this.calculateMempoolDeltas(this.mempoolBlocks, blocks);
+      this.mempoolBlocks = blocks;
+      this.mempoolBlockDeltas = deltas;
+    }
+
+    return blocks;
+  }
+
+  private calculateMempoolBlocks(transactionsSorted: MempoolTransactionExtended[]): MempoolBlockWithTransactions[] {
+    const mempoolBlocks: MempoolBlockWithTransactions[] = [];
+    let feeStatsCalculator: OnlineFeeStatsCalculator = new OnlineFeeStatsCalculator(config.MEMPOOL.BLOCK_WEIGHT_UNITS);
+    let onlineStats = false;
+    let blockSize = 0;
+    let blockWeight = 0;
+    let blockVsize = 0;
+    let blockFees = 0;
+    const sizeLimit = (config.MEMPOOL.BLOCK_WEIGHT_UNITS / 4) * 1.2;
+    let transactionIds: string[] = [];
+    let transactions: MempoolTransactionExtended[] = [];
+    transactionsSorted.forEach((tx, index) => {
+      if (blockWeight + tx.weight <= config.MEMPOOL.BLOCK_WEIGHT_UNITS
+        || mempoolBlocks.length === config.MEMPOOL.MEMPOOL_BLOCKS_AMOUNT - 1) {
+        tx.position = {
+          block: mempoolBlocks.length,
+          vsize: blockVsize + (tx.vsize / 2),
+        };
+        blockWeight += tx.weight;
+        blockVsize += tx.vsize;
+        blockSize += tx.size;
+        blockFees += tx.fee;
+        if (blockVsize <= sizeLimit) {
+          transactions.push(tx);
+        }
+        transactionIds.push(tx.txid);
+        if (onlineStats) {
+          feeStatsCalculator.processNext(tx);
+        }
+      } else {
+        mempoolBlocks.push(this.dataToMempoolBlocks(transactionIds, transactions, blockSize, blockWeight, blockFees));
+        blockVsize = 0;
+        tx.position = {
+          block: mempoolBlocks.length,
+          vsize: blockVsize + (tx.vsize / 2),
+        };
+
+        if (mempoolBlocks.length === config.MEMPOOL.MEMPOOL_BLOCKS_AMOUNT - 1) {
+          const stackWeight = transactionsSorted.slice(index).reduce((total, tx) => total + (tx.weight || 0), 0);
+          if (stackWeight > config.MEMPOOL.BLOCK_WEIGHT_UNITS) {
+            onlineStats = true;
+            feeStatsCalculator = new OnlineFeeStatsCalculator(stackWeight, 0.5, [10, 20, 30, 40, 50, 60, 70, 80, 90]);
+            feeStatsCalculator.processNext(tx);
+          }
+        }
+
+        blockVsize += tx.vsize;
+        blockWeight = tx.weight;
+        blockSize = tx.size;
+        blockFees = tx.fee;
+        transactionIds = [tx.txid];
+        transactions = [tx];
+      }
+    });
+    if (transactions.length) {
+      const feeStats = onlineStats ? feeStatsCalculator.getRawFeeStats() : undefined;
+      mempoolBlocks.push(this.dataToMempoolBlocks(transactionIds, transactions, blockSize, blockWeight, blockFees, feeStats));
+    }
+
+    return mempoolBlocks;
+  }
+
   private calculateMempoolDeltas(prevBlocks: MempoolBlockWithTransactions[], mempoolBlocks: MempoolBlockWithTransactions[]): MempoolBlockDelta[] {
     const mempoolBlockDeltas: MempoolBlockDelta[] = [];
     for (let i = 0; i < Math.max(mempoolBlocks.length, prevBlocks.length); i++) {
       let added: TransactionClassified[] = [];
       let removed: string[] = [];
-      const changed: TransactionClassified[] = [];
+      const changed: { txid: string, rate: number | undefined, acc: boolean | undefined }[] = [];
       if (mempoolBlocks[i] && !prevBlocks[i]) {
         added = mempoolBlocks[i].transactions;
       } else if (!mempoolBlocks[i] && prevBlocks[i]) {
@@ -69,20 +207,20 @@ class MempoolBlocks {
           if (!prevIds[tx.txid]) {
             added.push(tx);
           } else if (tx.rate !== prevIds[tx.txid].rate || tx.acc !== prevIds[tx.txid].acc) {
-            changed.push(tx);
+            changed.push({ txid: tx.txid, rate: tx.rate, acc: tx.acc });
           }
         });
       }
       mempoolBlockDeltas.push({
-        added: added.map(this.compressTx),
+        added,
         removed,
-        changed: changed.map(this.compressDeltaChange),
+        changed,
       });
     }
     return mempoolBlockDeltas;
   }
 
-  public async $makeBlockTemplates(transactions: string[], newMempool: { [txid: string]: MempoolTransactionExtended }, candidates: GbtCandidates | undefined, saveResults: boolean = false, useAccelerations: boolean = false, accelerationPool?: number): Promise<MempoolBlockWithTransactions[]> {
+  public async $makeBlockTemplates(newMempool: { [txid: string]: MempoolTransactionExtended }, saveResults: boolean = false, useAccelerations: boolean = false, accelerationPool?: number): Promise<MempoolBlockWithTransactions[]> {
     const start = Date.now();
 
     // reset mempool short ids
@@ -90,8 +228,7 @@ class MempoolBlocks {
       this.resetUids();
     }
     // set missing short ids
-    for (const txid of transactions) {
-      const tx = newMempool[txid];
+    for (const tx of Object.values(newMempool)) {
       this.setUid(tx, !saveResults);
     }
 
@@ -100,8 +237,7 @@ class MempoolBlocks {
     // prepare a stripped down version of the mempool with only the minimum necessary data
     // to reduce the overhead of passing this data to the worker thread
     const strippedMempool: Map<number, CompactThreadTransaction> = new Map();
-    for (const txid of transactions) {
-      const entry = newMempool[txid];
+    Object.values(newMempool).forEach(entry => {
       if (entry.uid !== null && entry.uid !== undefined) {
         const stripped = {
           uid: entry.uid,
@@ -114,7 +250,7 @@ class MempoolBlocks {
         };
         strippedMempool.set(entry.uid, stripped);
       }
-    }
+    });
 
     // (re)initialize tx selection worker thread
     if (!this.txSelectionWorker) {
@@ -145,7 +281,7 @@ class MempoolBlocks {
       // clean up thread error listener
       this.txSelectionWorker?.removeListener('error', threadErrorListener);
 
-      const processed = this.processBlockTemplates(newMempool, blocks, null, Object.entries(rates), Object.values(clusters), candidates, accelerations, accelerationPool, saveResults);
+      const processed = this.processBlockTemplates(newMempool, blocks, null, Object.entries(rates), Object.values(clusters), accelerations, accelerationPool, saveResults);
 
       logger.debug(`makeBlockTemplates completed in ${(Date.now() - start)/1000} seconds`);
 
@@ -156,10 +292,10 @@ class MempoolBlocks {
     return this.mempoolBlocks;
   }
 
-  public async $updateBlockTemplates(transactions: string[], newMempool: { [txid: string]: MempoolTransactionExtended }, added: MempoolTransactionExtended[], removed: MempoolTransactionExtended[], candidates: GbtCandidates | undefined, accelerationDelta: string[] = [], saveResults: boolean = false, useAccelerations: boolean = false): Promise<void> {
+  public async $updateBlockTemplates(newMempool: { [txid: string]: MempoolTransactionExtended }, added: MempoolTransactionExtended[], removed: MempoolTransactionExtended[], accelerationDelta: string[] = [], saveResults: boolean = false, useAccelerations: boolean = false): Promise<void> {
     if (!this.txSelectionWorker) {
       // need to reset the worker
-      await this.$makeBlockTemplates(transactions, newMempool, candidates, saveResults, useAccelerations);
+      await this.$makeBlockTemplates(newMempool, saveResults, useAccelerations);
       return;
     }
 
@@ -169,9 +305,9 @@ class MempoolBlocks {
     const addedAndChanged: MempoolTransactionExtended[] = useAccelerations ? accelerationDelta.map(txid => newMempool[txid]).filter(tx => tx != null).concat(added) : added;
 
     for (const tx of addedAndChanged) {
-      this.setUid(tx, false);
+      this.setUid(tx, true);
     }
-    const removedTxs = removed.filter(tx => tx.uid != null) as MempoolTransactionExtended[];
+    const removedUids = removed.map(tx => this.getUid(tx)).filter(uid => uid != null) as number[];
 
     // prepare a stripped down version of the mempool with only the minimum necessary data
     // to reduce the overhead of passing this data to the worker thread
@@ -197,15 +333,15 @@ class MempoolBlocks {
         });
         this.txSelectionWorker?.once('error', reject);
       });
-      this.txSelectionWorker.postMessage({ type: 'update', added: addedStripped, removed: removedTxs.map(tx => tx.uid) as number[] });
+      this.txSelectionWorker.postMessage({ type: 'update', added: addedStripped, removed: removedUids });
       const { blocks, rates, clusters } = this.convertResultTxids(await workerResultPromise);
 
-      this.removeUids(removedTxs);
+      this.removeUids(removedUids);
 
       // clean up thread error listener
       this.txSelectionWorker?.removeListener('error', threadErrorListener);
 
-      this.processBlockTemplates(newMempool, blocks, null, Object.entries(rates), Object.values(clusters), candidates, accelerations, null, saveResults);
+      this.processBlockTemplates(newMempool, blocks, null, Object.entries(rates), Object.values(clusters), accelerations, null, saveResults);
       logger.debug(`updateBlockTemplates completed in ${(Date.now() - start) / 1000} seconds`);
     } catch (e) {
       logger.err('updateBlockTemplates failed. ' + (e instanceof Error ? e.message : e));
@@ -217,28 +353,25 @@ class MempoolBlocks {
     this.rustGbtGenerator = new GbtGenerator();
   }
 
-  public async $rustMakeBlockTemplates(txids: string[], newMempool: { [txid: string]: MempoolTransactionExtended }, candidates: GbtCandidates | undefined, saveResults: boolean = false, useAccelerations: boolean = false, accelerationPool?: number): Promise<MempoolBlockWithTransactions[]> {
+  public async $rustMakeBlockTemplates(newMempool: { [txid: string]: MempoolTransactionExtended }, saveResults: boolean = false, useAccelerations: boolean = false, accelerationPool?: number): Promise<MempoolBlockWithTransactions[]> {
     const start = Date.now();
 
     // reset mempool short ids
     if (saveResults) {
       this.resetUids();
     }
-
-    const transactions = txids.map(txid => newMempool[txid]).filter(tx => tx != null);
     // set missing short ids
-    for (const tx of transactions) {
+    for (const tx of Object.values(newMempool)) {
       this.setUid(tx, !saveResults);
     }
     // set short ids for transaction inputs
-    for (const tx of transactions) {
+    for (const tx of Object.values(newMempool)) {
       tx.inputs = tx.vin.map(v => this.getUid(newMempool[v.txid])).filter(uid => (uid !== null && uid !== undefined)) as number[];
     }
 
     const accelerations = useAccelerations ? mempool.getAccelerations() : {};
     const acceleratedList = accelerationPool ? Object.values(accelerations).filter(acc => newMempool[acc.txid] && acc.pools.includes(accelerationPool)) : Object.values(accelerations).filter(acc => newMempool[acc.txid]);
     const convertedAccelerations = acceleratedList.map(acc => {
-      this.setUid(newMempool[acc.txid], true);
       return {
         uid: this.getUid(newMempool[acc.txid]),
         delta: acc.feeDelta,
@@ -249,15 +382,15 @@ class MempoolBlocks {
     const rustGbt = saveResults ? this.rustGbtGenerator : new GbtGenerator();
     try {
       const { blocks, blockWeights, rates, clusters, overflow } = this.convertNapiResultTxids(
-        await rustGbt.make(transactions as RustThreadTransaction[], convertedAccelerations as RustThreadAcceleration[], this.nextUid),
+        await rustGbt.make(Object.values(newMempool) as RustThreadTransaction[], convertedAccelerations as RustThreadAcceleration[], this.nextUid),
       );
       if (saveResults) {
         this.rustInitialized = true;
       }
-      const expectedSize = transactions.length;
+      const mempoolSize = Object.keys(newMempool).length;
       const resultMempoolSize = blocks.reduce((total, block) => total + block.length, 0) + overflow.length;
-      logger.debug(`RUST updateBlockTemplates returned ${resultMempoolSize} txs out of ${expectedSize} in the mempool, ${overflow.length} were unmineable`);
-      const processed = this.processBlockTemplates(newMempool, blocks, blockWeights, rates, clusters, candidates, accelerations, accelerationPool, saveResults);
+      logger.debug(`RUST updateBlockTemplates returned ${resultMempoolSize} txs out of ${mempoolSize} in the mempool, ${overflow.length} were unmineable`);
+      const processed = this.processBlockTemplates(newMempool, blocks, blockWeights, rates, clusters, accelerations, accelerationPool, saveResults);
       logger.debug(`RUST makeBlockTemplates completed in ${(Date.now() - start)/1000} seconds`);
       return processed;
     } catch (e) {
@@ -269,37 +402,36 @@ class MempoolBlocks {
     return this.mempoolBlocks;
   }
 
-  public async $oneOffRustBlockTemplates(transactions: string[], newMempool: { [txid: string]: MempoolTransactionExtended }, candidates: GbtCandidates | undefined, useAccelerations: boolean, accelerationPool?: number): Promise<MempoolBlockWithTransactions[]> {
-    return this.$rustMakeBlockTemplates(transactions, newMempool, candidates, false, useAccelerations, accelerationPool);
+  public async $oneOffRustBlockTemplates(newMempool: { [txid: string]: MempoolTransactionExtended }, useAccelerations: boolean, accelerationPool?: number): Promise<MempoolBlockWithTransactions[]> {
+    return this.$rustMakeBlockTemplates(newMempool, false, useAccelerations, accelerationPool);
   }
 
-  public async $rustUpdateBlockTemplates(transactions: string[], newMempool: { [txid: string]: MempoolTransactionExtended }, added: MempoolTransactionExtended[], removed: MempoolTransactionExtended[], candidates: GbtCandidates | undefined, useAccelerations: boolean, accelerationPool?: number): Promise<MempoolBlockWithTransactions[]> {
+  public async $rustUpdateBlockTemplates(newMempool: { [txid: string]: MempoolTransactionExtended }, mempoolSize: number, added: MempoolTransactionExtended[], removed: MempoolTransactionExtended[], useAccelerations: boolean, accelerationPool?: number): Promise<MempoolBlockWithTransactions[]> {
     // GBT optimization requires that uids never get too sparse
     // as a sanity check, we should also explicitly prevent uint32 uid overflow
-    if (this.nextUid + added.length >= Math.min(Math.max(262144, 2 * transactions.length), MAX_UINT32)) {
+    if (this.nextUid + added.length >= Math.min(Math.max(262144, 2 * mempoolSize), MAX_UINT32)) {
       this.resetRustGbt();
     }
 
     if (!this.rustInitialized) {
       // need to reset the worker
-      return this.$rustMakeBlockTemplates(transactions, newMempool, candidates, true, useAccelerations, accelerationPool);
+      return this.$rustMakeBlockTemplates(newMempool, true, useAccelerations, accelerationPool);
     }
 
     const start = Date.now();
     // set missing short ids
     for (const tx of added) {
-      this.setUid(tx, false);
+      this.setUid(tx, true);
     }
     // set short ids for transaction inputs
     for (const tx of added) {
       tx.inputs = tx.vin.map(v => this.getUid(newMempool[v.txid])).filter(uid => (uid !== null && uid !== undefined)) as number[];
     }
-    const removedTxs = removed.filter(tx => tx.uid != null) as MempoolTransactionExtended[];
+    const removedUids = removed.map(tx => this.getUid(tx)).filter(uid => (uid !== null && uid !== undefined)) as number[];
 
     const accelerations = useAccelerations ? mempool.getAccelerations() : {};
     const acceleratedList = accelerationPool ? Object.values(accelerations).filter(acc => newMempool[acc.txid] && acc.pools.includes(accelerationPool)) : Object.values(accelerations).filter(acc => newMempool[acc.txid]);
     const convertedAccelerations = acceleratedList.map(acc => {
-      this.setUid(newMempool[acc.txid], true);
       return {
         uid: this.getUid(newMempool[acc.txid]),
         delta: acc.feeDelta,
@@ -311,18 +443,18 @@ class MempoolBlocks {
       const { blocks, blockWeights, rates, clusters, overflow } = this.convertNapiResultTxids(
         await this.rustGbtGenerator.update(
           added as RustThreadTransaction[],
-          removedTxs.map(tx => tx.uid) as number[],
+          removedUids,
           convertedAccelerations as RustThreadAcceleration[],
           this.nextUid,
         ),
       );
       const resultMempoolSize = blocks.reduce((total, block) => total + block.length, 0) + overflow.length;
-      logger.debug(`RUST updateBlockTemplates returned ${resultMempoolSize} txs out of ${transactions.length} candidates, ${overflow.length} were unmineable`);
-      if (transactions.length !== resultMempoolSize) {
-        throw new Error(`GBT returned wrong number of transactions ${transactions.length} vs ${resultMempoolSize}, cache is probably out of sync`);
+      logger.debug(`RUST updateBlockTemplates returned ${resultMempoolSize} txs out of ${mempoolSize} in the mempool, ${overflow.length} were unmineable`);
+      if (mempoolSize !== resultMempoolSize) {
+        throw new Error('GBT returned wrong number of transactions , cache is probably out of sync');
       } else {
-        const processed = this.processBlockTemplates(newMempool, blocks, blockWeights, rates, clusters, candidates, accelerations, accelerationPool, true);
-        this.removeUids(removedTxs);
+        const processed = this.processBlockTemplates(newMempool, blocks, blockWeights, rates, clusters, accelerations, accelerationPool, true);
+        this.removeUids(removedUids);
         logger.debug(`RUST updateBlockTemplates completed in ${(Date.now() - start)/1000} seconds`);
         return processed;
       }
@@ -333,12 +465,7 @@ class MempoolBlocks {
     }
   }
 
-  private processBlockTemplates(mempool: { [txid: string]: MempoolTransactionExtended }, blocks: string[][], blockWeights: number[] | null, rates: [string, number][], clusters: string[][], candidates: GbtCandidates | undefined, accelerations, accelerationPool, saveResults): MempoolBlockWithTransactions[] {
-    for (const txid of Object.keys(candidates?.txs ?? mempool)) {
-      if (txid in mempool) {
-        mempool[txid].cpfpDirty = false;
-      }
-    }
+  private processBlockTemplates(mempool: { [txid: string]: MempoolTransactionExtended }, blocks: string[][], blockWeights: number[] | null, rates: [string, number][], clusters: string[][], accelerations: { [txid: string]: Acceleration }, accelerationPool, saveResults): MempoolBlockWithTransactions[] {
     for (const [txid, rate] of rates) {
       if (txid in mempool) {
         mempool[txid].cpfpDirty = (rate !== mempool[txid].effectiveFeePerVsize);
@@ -372,9 +499,6 @@ class MempoolBlocks {
             if (txid === memberTxid) {
               matched = true;
             } else {
-              if (!mempool[txid]) {
-                console.log('txid missing from mempool! ', txid, candidates?.txs[txid]);
-              }
               const relative = {
                 txid: txid,
                 fee: mempool[txid].fee,
@@ -407,16 +531,6 @@ class MempoolBlocks {
       let totalWeight = 0;
       let totalFees = 0;
       const transactions: MempoolTransactionExtended[] = [];
-
-      // backfill purged transactions
-      if (candidates?.txs && blockIndex === blocks.length - 1) {
-        for (const txid of Object.keys(mempool)) {
-          if (!candidates.txs[txid]) {
-            block.push(txid);
-          }
-        }
-      }
-
       for (const txid of block) {
         if (txid) {
           mempoolTx = mempool[txid];
@@ -425,6 +539,16 @@ class MempoolBlocks {
             block: blockIndex,
             vsize: totalVsize + (mempoolTx.vsize / 2),
           };
+          if (!mempoolTx.cpfpChecked) {
+            if (mempoolTx.ancestors?.length) {
+              mempoolTx.ancestors = [];
+            }
+            if (mempoolTx.descendants?.length) {
+              mempoolTx.descendants = [];
+            }
+            mempoolTx.bestDescendant = null;
+            mempoolTx.cpfpChecked = true;
+          }
 
           const acceleration = accelerations[txid];
           if (isAccelerated[txid] || (acceleration && (!accelerationPool || acceleration.pools.includes(accelerationPool)))) {
@@ -475,7 +599,7 @@ class MempoolBlocks {
       const deltas = this.calculateMempoolDeltas(this.mempoolBlocks, mempoolBlocks);
       this.mempoolBlocks = mempoolBlocks;
       this.mempoolBlockDeltas = deltas;
-
+      this.updateAccelerationPositions(mempool, accelerations, mempoolBlocks);
     }
 
     return mempoolBlocks;
@@ -483,7 +607,7 @@ class MempoolBlocks {
 
   private dataToMempoolBlocks(transactionIds: string[], transactions: MempoolTransactionExtended[], totalSize: number, totalWeight: number, totalFees: number, feeStats?: EffectiveFeeStats ): MempoolBlockWithTransactions {
     if (!feeStats) {
-      feeStats = Common.calcEffectiveFeeStatistics(transactions);
+      feeStats = Common.calcEffectiveFeeStatistics(transactions.filter(tx => !tx.acceleration));
     }
     return {
       blockSize: totalSize,
@@ -499,38 +623,30 @@ class MempoolBlocks {
 
   private resetUids(): void {
     this.uidMap.clear();
-    this.txidMap.clear();
     this.nextUid = 1;
   }
 
   private setUid(tx: MempoolTransactionExtended, skipSet = false): number {
-    if (!this.txidMap.has(tx.txid) || !skipSet) {
+    if (tx.uid === null || tx.uid === undefined || !skipSet) {
       const uid = this.nextUid;
       this.nextUid++;
       this.uidMap.set(uid, tx.txid);
-      this.txidMap.set(tx.txid, uid);
       tx.uid = uid;
       return uid;
     } else {
-      tx.uid = this.txidMap.get(tx.txid) as number;
       return tx.uid;
     }
   }
 
   private getUid(tx: MempoolTransactionExtended): number | void {
-    if (tx) {
-      return this.txidMap.get(tx.txid);
+    if (tx?.uid !== null && tx?.uid !== undefined && this.uidMap.has(tx.uid)) {
+      return tx.uid;
     }
   }
 
-  private removeUids(txs: MempoolTransactionExtended[]): void {
-    for (const tx of txs) {
-      const uid = this.txidMap.get(tx.txid);
-      if (uid != null) {
-        this.uidMap.delete(uid);
-        this.txidMap.delete(tx.txid);
-      }
-      tx.uid = undefined;
+  private removeUids(uids: number[]): void {
+    for (const uid of uids) {
+      this.uidMap.delete(uid);
     }
   }
 
@@ -589,38 +705,122 @@ class MempoolBlocks {
     return { blocks: convertedBlocks, blockWeights, rates: convertedRates, clusters: convertedClusters, overflow: convertedOverflow };
   }
 
-  public compressTx(tx: TransactionClassified): TransactionCompressed {
-    if (tx.acc) {
-      return [
-        tx.txid,
-        tx.fee,
-        tx.vsize,
-        tx.value,
-        Math.round((tx.rate || (tx.fee / tx.vsize)) * 100) / 100,
-        tx.flags,
-        tx.time || 0,
-        1,
-      ];
-    } else {
-      return [
-        tx.txid,
-        tx.fee,
-        tx.vsize,
-        tx.value,
-        Math.round((tx.rate || (tx.fee / tx.vsize)) * 100) / 100,
-        tx.flags,
-        tx.time || 0,
-      ];
+  // estimates and saves positions of accelerations in mining partner mempools
+  private updateAccelerationPositions(mempoolCache: { [txid: string]: MempoolTransactionExtended }, accelerations: { [txid: string]: Acceleration }, mempoolBlocks: MempoolBlockWithTransactions[]): void {
+    const accelerationPositions: { [txid: string]: { poolId: number, pool: string, block: number, vsize: number }[] } = {};
+    // keep track of simulated mempool blocks for each active pool
+    const pools: {
+      [pool: string]: { name: string, block: number, vsize: number, accelerations: string[], complete: boolean };
+    } = {};
+    // prepare a list of accelerations in ascending order (we'll pop items off the end of the list)
+    const accQueue: { acceleration: Acceleration, rate: number, vsize: number }[] = Object.values(accelerations).map(acc => {
+      let vsize = mempoolCache[acc.txid].vsize;
+      for (const ancestor of mempoolCache[acc.txid].ancestors || []) {
+        vsize += (ancestor.weight / 4);
+      }
+      return {
+        acceleration: acc,
+        rate: mempoolCache[acc.txid].effectiveFeePerVsize,
+        vsize
+      };
+    }).sort((a, b) => a.rate - b.rate);
+    // initialize the pool tracker
+    for (const { acceleration }  of accQueue) {
+      accelerationPositions[acceleration.txid] = [];
+      for (const pool of acceleration.pools) {
+        if (!pools[pool]) {
+          pools[pool] = {
+            name: this.pools[pool]?.name || 'unknown',
+            block: 0,
+            vsize: 0,
+            accelerations: [],
+            complete: false,
+          };
+        }
+        pools[pool].accelerations.push(acceleration.txid);
+      }
+      for (const ancestor of mempoolCache[acceleration.txid].ancestors || []) {
+        accelerationPositions[ancestor.txid] = [];
+      }
     }
-  }
 
-  public compressDeltaChange(tx: TransactionClassified): MempoolDeltaChange {
-    return [
-      tx.txid,
-      Math.round((tx.rate || (tx.fee / tx.vsize)) * 100) / 100,
-      tx.flags,
-      tx.acc ? 1 : 0,
-    ];
+    for (const pool of Object.keys(pools)) {
+      // if any pools accepted *every* acceleration, we can just use the GBT result positions directly
+      if (pools[pool].accelerations.length === Object.keys(accelerations).length) {
+        pools[pool].complete = true;
+      }
+    }
+
+    let block = 0;
+    let index = 0;
+    let next = accQueue.pop();
+    // build simulated blocks for each pool by taking the best option from
+    // either the mempool or the list of accelerations.
+    while (next && block < mempoolBlocks.length) {
+      while (next && index < mempoolBlocks[block].transactions.length) {
+        const nextTx = mempoolBlocks[block].transactions[index];
+        if (next.rate >= (nextTx.rate || (nextTx.fee / nextTx.vsize))) {
+          for (const pool of next.acceleration.pools) {
+            if (pools[pool].vsize + next.vsize <= 999_000) {
+              pools[pool].vsize += next.vsize;
+            } else {
+              pools[pool].block++;
+              pools[pool].vsize = next.vsize;
+            }
+            // insert the acceleration into matching pool's blocks
+            if (pools[pool].complete && mempoolCache[next.acceleration.txid]?.position !== undefined) {
+              accelerationPositions[next.acceleration.txid].push({
+                ...mempoolCache[next.acceleration.txid].position as { block: number, vsize: number },
+                poolId: pool,
+                pool: pools[pool].name
+              });
+            } else {
+              accelerationPositions[next.acceleration.txid].push({
+                poolId: pool,
+                pool: pools[pool].name,
+                block: pools[pool].block,
+                vsize: pools[pool].vsize - (next.vsize / 2),
+              });
+            }
+            // and any accelerated ancestors
+            for (const ancestor of mempoolCache[next.acceleration.txid].ancestors || []) {
+              if (pools[pool].complete && mempoolCache[ancestor.txid]?.position !== undefined) {
+                accelerationPositions[ancestor.txid].push({
+                  ...mempoolCache[ancestor.txid].position as { block: number, vsize: number },
+                  poolId: pool,
+                  pool: pools[pool].name,
+                });
+              } else {
+                accelerationPositions[ancestor.txid].push({
+                  poolId: pool,
+                  pool: pools[pool].name,
+                  block: pools[pool].block,
+                  vsize: pools[pool].vsize - (next.vsize / 2),
+                });
+              }
+            }
+          }
+          next = accQueue.pop();
+        } else {
+          // skip accelerated transactions and their CPFP ancestors
+          if (accelerationPositions[nextTx.txid] == null) {
+            // insert into all pools' blocks
+            for (const pool of Object.keys(pools)) {
+              if (pools[pool].vsize + nextTx.vsize <= 999_000) {
+                pools[pool].vsize += nextTx.vsize;
+              } else {
+                pools[pool].block++;
+                pools[pool].vsize = nextTx.vsize;
+              }
+            }
+          }
+          index++;
+        }
+      }
+      block++;
+      index = 0;
+    }
+    mempool.setAccelerationPositions(accelerationPositions);
   }
 }
 

backend/src/api/mempool.ts

@@ -1,6 +1,6 @@
 import config from '../config';
 import bitcoinApi from './bitcoin/bitcoin-api-factory';
-import { MempoolTransactionExtended, TransactionExtended, VbytesPerSecond, GbtCandidates } from '../mempool.interfaces';
+import { MempoolTransactionExtended, TransactionExtended, VbytesPerSecond } from '../mempool.interfaces';
 import logger from '../logger';
 import { Common } from './common';
 import transactionUtils from './transaction-utils';
@@ -11,22 +11,21 @@ import bitcoinSecondClient from './bitcoin/bitcoin-second-client';
 import rbfCache from './rbf-cache';
 import { Acceleration } from './services/acceleration';
 import redisCache from './redis-cache';
-import blocks from './blocks';
 
 class Mempool {
   private inSync: boolean = false;
   private mempoolCacheDelta: number = -1;
   private mempoolCache: { [txId: string]: MempoolTransactionExtended } = {};
-  private mempoolCandidates: { [txid: string ]: boolean } = {};
   private spendMap = new Map<string, MempoolTransactionExtended>();
   private mempoolInfo: IBitcoinApi.MempoolInfo = { loaded: false, size: 0, bytes: 0, usage: 0, total_fee: 0,
                                                     maxmempool: 300000000, mempoolminfee: Common.isLiquid() ? 0.00000100 : 0.00001000, minrelaytxfee: Common.isLiquid() ? 0.00000100 : 0.00001000 };
   private mempoolChangedCallback: ((newMempool: {[txId: string]: MempoolTransactionExtended; }, newTransactions: MempoolTransactionExtended[],
     deletedTransactions: MempoolTransactionExtended[], accelerationDelta: string[]) => void) | undefined;
   private $asyncMempoolChangedCallback: ((newMempool: {[txId: string]: MempoolTransactionExtended; }, mempoolSize: number, newTransactions: MempoolTransactionExtended[],
-    deletedTransactions: MempoolTransactionExtended[], accelerationDelta: string[], candidates?: GbtCandidates) => Promise<void>) | undefined;
+    deletedTransactions: MempoolTransactionExtended[], accelerationDelta: string[]) => Promise<void>) | undefined;
 
   private accelerations: { [txId: string]: Acceleration } = {};
+  private accelerationPositions: { [txid: string]: { poolId: number, pool: string, block: number, vsize: number }[] } = {};
 
   private txPerSecondArray: number[] = [];
   private txPerSecond: number = 0;
@@ -42,8 +41,6 @@ class Mempool {
   private missingTxCount = 0;
   private mainLoopTimeout: number = 120000;
 
-  public limitGBT = config.MEMPOOL.USE_SECOND_NODE_FOR_MINFEE && config.MEMPOOL.LIMIT_GBT;
-
   constructor() {
     setInterval(this.updateTxPerSecond.bind(this), 1000);
   }
@@ -78,8 +75,7 @@ class Mempool {
   }
 
   public setAsyncMempoolChangedCallback(fn: (newMempool: { [txId: string]: MempoolTransactionExtended; }, mempoolSize: number,
-    newTransactions: MempoolTransactionExtended[], deletedTransactions: MempoolTransactionExtended[], accelerationDelta: string[],
-    candidates?: GbtCandidates) => Promise<void>): void {
+    newTransactions: MempoolTransactionExtended[], deletedTransactions: MempoolTransactionExtended[], accelerationDelta: string[]) => Promise<void>): void {
     this.$asyncMempoolChangedCallback = fn;
   }
 
@@ -91,10 +87,6 @@ class Mempool {
     return this.spendMap;
   }
 
-  public getFromSpendMap(txid, index): MempoolTransactionExtended | void {
-    return this.spendMap.get(`${txid}:${index}`);
-  }
-
   public async $setMempool(mempoolData: { [txId: string]: MempoolTransactionExtended }) {
     this.mempoolCache = mempoolData;
     let count = 0;
@@ -116,10 +108,6 @@ class Mempool {
       if (config.MEMPOOL.CACHE_ENABLED && config.REDIS.ENABLED) {
         await redisCache.$addTransaction(this.mempoolCache[txid]);
       }
-      this.mempoolCache[txid].flags = Common.getTransactionFlags(this.mempoolCache[txid]);
-      this.mempoolCache[txid].cpfpChecked = false;
-      this.mempoolCache[txid].cpfpDirty = true;
-      this.mempoolCache[txid].cpfpUpdated = undefined;
     }
     if (config.MEMPOOL.CACHE_ENABLED && config.REDIS.ENABLED) {
       await redisCache.$flushTransactions();
@@ -129,7 +117,7 @@ class Mempool {
       this.mempoolChangedCallback(this.mempoolCache, [], [], []);
     }
     if (this.$asyncMempoolChangedCallback) {
-      await this.$asyncMempoolChangedCallback(this.mempoolCache, count, [], [], [], this.limitGBT ? { txs: {}, added: [], removed: [] } : undefined);
+      await this.$asyncMempoolChangedCallback(this.mempoolCache, count, [], [], []);
     }
     this.addToSpendMap(Object.values(this.mempoolCache));
   }
@@ -172,10 +160,6 @@ class Mempool {
     return newTransactions;
   }
 
-  public getMempoolCandidates(): { [txid: string]: boolean } {
-    return this.mempoolCandidates;
-  }
-
   public async $updateMemPoolInfo() {
     this.mempoolInfo = await this.$getMempoolInfo();
   }
@@ -205,7 +189,7 @@ class Mempool {
     return txTimes;
   }
 
-  public async $updateMempool(transactions: string[], accelerations: Acceleration[] | null, minFeeMempool: string[], minFeeTip: number, pollRate: number): Promise<void> {
+  public async $updateMempool(transactions: string[], accelerations: Acceleration[] | null, pollRate: number): Promise<void> {
     logger.debug(`Updating mempool...`);
 
     // warn if this run stalls the main loop for more than 2 minutes
@@ -346,8 +330,6 @@ class Mempool {
       }
     }
 
-    const candidates = await this.getNextCandidates(minFeeMempool, minFeeTip, deletedTransactions);
-
     const newMempoolSize = currentMempoolSize + newTransactions.length - deletedTransactions.length;
     const newTransactionsStripped = newTransactions.map((tx) => Common.stripTransaction(tx));
     this.latestTransactions = newTransactionsStripped.concat(this.latestTransactions).slice(0, 6);
@@ -359,14 +341,12 @@ class Mempool {
 
     this.mempoolCacheDelta = Math.abs(transactions.length - newMempoolSize);
 
-    const candidatesChanged = candidates?.added?.length || candidates?.removed?.length;
-
     if (this.mempoolChangedCallback && (hasChange || deletedTransactions.length)) {
       this.mempoolChangedCallback(this.mempoolCache, newTransactions, deletedTransactions, accelerationDelta);
     }
-    if (this.$asyncMempoolChangedCallback && (hasChange || deletedTransactions.length || candidatesChanged)) {
+    if (this.$asyncMempoolChangedCallback && (hasChange || deletedTransactions.length)) {
       this.updateTimerProgress(timer, 'running async mempool callback');
-      await this.$asyncMempoolChangedCallback(this.mempoolCache, newMempoolSize, newTransactions, deletedTransactions, accelerationDelta, candidates);
+      await this.$asyncMempoolChangedCallback(this.mempoolCache, newMempoolSize, newTransactions, deletedTransactions, accelerationDelta);
       this.updateTimerProgress(timer, 'completed async mempool callback');
     }
 
@@ -452,62 +432,12 @@ class Mempool {
     }
   }
 
-  public async getNextCandidates(minFeeTransactions: string[], blockHeight: number, deletedTransactions: MempoolTransactionExtended[]): Promise<GbtCandidates | undefined> {
-    if (this.limitGBT) {
-      const deletedTxsMap = {};
-      for (const tx of deletedTransactions) {
-        deletedTxsMap[tx.txid] = tx;
-      }
-      const newCandidateTxMap = {};
-      for (const txid of minFeeTransactions) {
-        if (this.mempoolCache[txid]) {
-          newCandidateTxMap[txid] = true;
-        }
-      }
-      const accelerations = this.getAccelerations();
-      for (const txid of Object.keys(accelerations)) {
-        if (this.mempoolCache[txid]) {
-          newCandidateTxMap[txid] = true;
-        }
-      }
-      const removed: MempoolTransactionExtended[] = [];
-      const added: MempoolTransactionExtended[] = [];
-      // don't prematurely remove txs included in a new block
-      if (blockHeight > blocks.getCurrentBlockHeight()) {
-        for (const txid of Object.keys(this.mempoolCandidates)) {
-          newCandidateTxMap[txid] = true;
-        }
-      } else {
-        for (const txid of Object.keys(this.mempoolCandidates)) {
-          if (!newCandidateTxMap[txid]) {
-            if (this.mempoolCache[txid]) {
-              removed.push(this.mempoolCache[txid]);
-              this.mempoolCache[txid].effectiveFeePerVsize = this.mempoolCache[txid].adjustedFeePerVsize;
-              this.mempoolCache[txid].ancestors = [];
-              this.mempoolCache[txid].descendants = [];
-              this.mempoolCache[txid].bestDescendant = null;
-              this.mempoolCache[txid].cpfpChecked = false;
-              this.mempoolCache[txid].cpfpUpdated = undefined;
-            } else if (deletedTxsMap[txid]) {
-              removed.push(deletedTxsMap[txid]);
-            }
-          }
-        }
-      }
+  setAccelerationPositions(positions: { [txid: string]: { poolId: number, pool: string, block: number, vsize: number }[] }): void {
+    this.accelerationPositions = positions;
+  }
 
-      for (const txid of Object.keys(newCandidateTxMap)) {
-        if (!this.mempoolCandidates[txid]) {
-          added.push(this.mempoolCache[txid]);
-        }
-      }
-
-      this.mempoolCandidates = newCandidateTxMap;
-      return {
-        txs: this.mempoolCandidates,
-        added,
-        removed
-      };
-    }
+  getAccelerationPositions(txid: string): { [pool: number]: { poolId: number, pool: string, block: number, vsize: number } } | undefined {
+    return this.accelerationPositions[txid];
   }
 
   private startTimer() {

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

@@ -8,7 +8,6 @@ import HashratesRepository from '../../repositories/HashratesRepository';
 import bitcoinClient from '../bitcoin/bitcoin-client';
 import mining from "./mining";
 import PricesRepository from '../../repositories/PricesRepository';
-import AccelerationRepository from '../../repositories/AccelerationRepository';
 
 class MiningRoutes {
   public initRoutes(app: Application) {
@@ -35,11 +34,6 @@ class MiningRoutes {
       .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/audit/:hash', this.$getBlockAudit)
       .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/timestamp/:timestamp', this.$getHeightFromTimestamp)
       .get(config.MEMPOOL.API_URL_PREFIX + 'historical-price', this.$getHistoricalPrice)
-
-      .get(config.MEMPOOL.API_URL_PREFIX + 'accelerations/pool/:slug', this.$getAccelerationsByPool)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'accelerations/block/:height', this.$getAccelerationsByHeight)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'accelerations/recent/:interval', this.$getRecentAccelerations)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'accelerations/total', this.$getAccelerationTotals)
     ;
   }
 
@@ -52,20 +46,13 @@ class MiningRoutes {
         res.status(400).send('Prices are not available on testnets.');
         return;
       }
-      const timestamp = parseInt(req.query.timestamp as string, 10) || 0;
-      const currency = req.query.currency as string;
-      
-      let response;
-      if (timestamp && currency) {
-        response = await PricesRepository.$getNearestHistoricalPrice(timestamp, currency);
-      } else if (timestamp) {
-        response = await PricesRepository.$getNearestHistoricalPrice(timestamp);
-      } else if (currency) {
-        response = await PricesRepository.$getHistoricalPrices(currency);
+      if (req.query.timestamp) {
+        res.status(200).send(await PricesRepository.$getNearestHistoricalPrice(
+          parseInt(<string>req.query.timestamp ?? 0, 10)
+        ));
       } else {
-        response = await PricesRepository.$getHistoricalPrices();
+        res.status(200).send(await PricesRepository.$getHistoricalPrices());
       }
-      res.status(200).send(response);
     } catch (e) {
       res.status(500).send(e instanceof Error ? e.message : e);
     }
@@ -365,67 +352,6 @@ class MiningRoutes {
       res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
-
-  private async $getAccelerationsByPool(req: Request, res: Response): Promise<void> {
-    try {
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
-      if (!config.MEMPOOL_SERVICES.ACCELERATIONS || ['testnet', 'signet', 'liquidtestnet', 'liquid'].includes(config.MEMPOOL.NETWORK)) {
-        res.status(400).send('Acceleration data is not available.');
-        return;
-      }
-      res.status(200).send(await AccelerationRepository.$getAccelerationInfo(req.params.slug));
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
-  private async $getAccelerationsByHeight(req: Request, res: Response): Promise<void> {
-    try {
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 3600 * 24).toUTCString());
-      if (!config.MEMPOOL_SERVICES.ACCELERATIONS || ['testnet', 'signet', 'liquidtestnet', 'liquid'].includes(config.MEMPOOL.NETWORK)) {
-        res.status(400).send('Acceleration data is not available.');
-        return;
-      }
-      const height = req.params.height === undefined ? undefined : parseInt(req.params.height, 10);
-      res.status(200).send(await AccelerationRepository.$getAccelerationInfo(null, height));
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
-  private async $getRecentAccelerations(req: Request, res: Response): Promise<void> {
-    try {
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
-      if (!config.MEMPOOL_SERVICES.ACCELERATIONS || ['testnet', 'signet', 'liquidtestnet', 'liquid'].includes(config.MEMPOOL.NETWORK)) {
-        res.status(400).send('Acceleration data is not available.');
-        return;
-      }
-      res.status(200).send(await AccelerationRepository.$getAccelerationInfo(null, null, req.params.interval));
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
-  private async $getAccelerationTotals(req: Request, res: Response): Promise<void> {
-    try {
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
-      if (!config.MEMPOOL_SERVICES.ACCELERATIONS || ['testnet', 'signet', 'liquidtestnet', 'liquid'].includes(config.MEMPOOL.NETWORK)) {
-        res.status(400).send('Acceleration data is not available.');
-        return;
-      }
-      res.status(200).send(await AccelerationRepository.$getAccelerationTotals(<string>req.query.pool, <string>req.query.interval));
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
 }
 
 export default new MiningRoutes();

backend/src/api/mining/mining.ts

@@ -142,7 +142,7 @@ class Mining {
   public async $getPoolStat(slug: string): Promise<object> {
     const pool = await PoolsRepository.$getPool(slug);
     if (!pool) {
-      throw new Error('This mining pool does not exist');
+      throw new Error('This mining pool does not exist ' + escape(slug));
     }
 
     const blockCount: number = await BlocksRepository.$blockCount(pool.id);

backend/src/api/redis-cache.ts

@@ -19,90 +19,45 @@ class RedisCache {
   private client;
   private connected = false;
   private schemaVersion = 1;
-  private redisConfig: any;
 
-  private pauseFlush: boolean = false;
   private cacheQueue: MempoolTransactionExtended[] = [];
-  private removeQueue: string[] = [];
-  private rbfCacheQueue: { type: string, txid: string, value: any }[] = [];
-  private rbfRemoveQueue: { type: string, txid: string }[] = [];
   private txFlushLimit: number = 10000;
 
   constructor() {
     if (config.REDIS.ENABLED) {
-      this.redisConfig = {
+      const redisConfig = {
         socket: {
           path: config.REDIS.UNIX_SOCKET_PATH
         },
         database: NetworkDB[config.MEMPOOL.NETWORK],
       };
+      this.client = createClient(redisConfig);
+      this.client.on('error', (e) => {
+        logger.err(`Error in Redis client: ${e instanceof Error ? e.message : e}`);
+      });
       this.$ensureConnected();
-      setInterval(() => { this.$ensureConnected(); }, 10000);
     }
   }
 
-  private async $ensureConnected(): Promise<boolean> {
+  private async $ensureConnected(): Promise<void> {
     if (!this.connected && config.REDIS.ENABLED) {
-      try {
-        this.client = createClient(this.redisConfig);
-        this.client.on('error', async (e) => {
-          logger.err(`Error in Redis client: ${e instanceof Error ? e.message : e}`);
-          this.connected = false;
-          await this.client.disconnect();
-        });
-        await this.client.connect().then(async () => {
-          try {
-            const version = await this.client.get('schema_version');
-            this.connected = true;
-            if (version !== this.schemaVersion) {
-              // schema changed
-              // perform migrations or flush DB if necessary
-              logger.info(`Redis schema version changed from ${version} to ${this.schemaVersion}`);
-              await this.client.set('schema_version', this.schemaVersion);
-            }
-            logger.info(`Redis client connected`);
-            return true;
-          } catch (e) {
-            this.connected = false;
-            logger.warn('Failed to connect to Redis');
-            return false;
-          }
-        });
-        await this.$onConnected();
-        return true;
-      } catch (e) {
-        logger.warn('Error connecting to Redis: ' + (e instanceof Error ? e.message : e));
-        return false;
-      }
-    } else {
-      try {
-        // test connection
-        await this.client.get('schema_version');
-        return true;
-      } catch (e) {
-        logger.warn('Lost connection to Redis: ' + (e instanceof Error ? e.message : e));
-        logger.warn('Attempting to reconnect in 10 seconds');
-        this.connected = false;
-        return false;
-      }
+      return this.client.connect().then(async () => {
+        this.connected = true;
+        logger.info(`Redis client connected`);
+        const version = await this.client.get('schema_version');
+        if (version !== this.schemaVersion) {
+          // schema changed
+          // perform migrations or flush DB if necessary
+          logger.info(`Redis schema version changed from ${version} to ${this.schemaVersion}`);
+          await this.client.set('schema_version', this.schemaVersion);
+        }
+      });
     }
   }
 
-  private async $onConnected(): Promise<void> {
-    await this.$flushTransactions();
-    await this.$removeTransactions([]);
-    await this.$flushRbfQueues();
-  }
-
-  async $updateBlocks(blocks: BlockExtended[]): Promise<void> {
-    if (!config.REDIS.ENABLED) {
-      return;
-    }
-    if (!this.connected) {
-      logger.warn(`Failed to update blocks in Redis cache: Redis is not connected`);
-      return;
-    }
+  async $updateBlocks(blocks: BlockExtended[]) {
     try {
+      await this.$ensureConnected();
       await this.client.set('blocks', JSON.stringify(blocks));
       logger.debug(`Saved latest blocks to Redis cache`);
     } catch (e) {
@@ -110,15 +65,9 @@ class RedisCache {
     }
   }
 
-  async $updateBlockSummaries(summaries: BlockSummary[]): Promise<void> {
-    if (!config.REDIS.ENABLED) {
-      return;
-    }
-    if (!this.connected) {
-      logger.warn(`Failed to update block summaries in Redis cache: Redis is not connected`);
-      return;
-    }
+  async $updateBlockSummaries(summaries: BlockSummary[]) {
     try {
+      await this.$ensureConnected();
       await this.client.set('block-summaries', JSON.stringify(summaries));
       logger.debug(`Saved latest block summaries to Redis cache`);
     } catch (e) {
@@ -126,35 +75,30 @@ class RedisCache {
     }
   }
 
-  async $addTransaction(tx: MempoolTransactionExtended): Promise<void> {
-    if (!config.REDIS.ENABLED) {
-      return;
-    }
+  async $addTransaction(tx: MempoolTransactionExtended) {
     this.cacheQueue.push(tx);
     if (this.cacheQueue.length >= this.txFlushLimit) {
-      if (!this.pauseFlush) {
-        await this.$flushTransactions();
-      }
+      await this.$flushTransactions();
     }
   }
 
-  async $flushTransactions(): Promise<void> {
-    if (!config.REDIS.ENABLED) {
-      return;
-    }
-    if (!this.cacheQueue.length) {
-      return;
-    }
-    if (!this.connected) {
-      logger.warn(`Failed to add ${this.cacheQueue.length} transactions to Redis cache: Redis not connected`);
-      return;
+  async $flushTransactions() {
+    const success = await this.$addTransactions(this.cacheQueue);
+    if (success) {
+      logger.debug(`Saved ${this.cacheQueue.length} transactions to Redis cache`);
+      this.cacheQueue = [];
+    } else {
+      logger.err(`Failed to save ${this.cacheQueue.length} transactions to Redis cache`);
     }
+  }
 
-    this.pauseFlush = false;
-
-    const toAdd = this.cacheQueue.slice(0, this.txFlushLimit);
+  private async $addTransactions(newTransactions: MempoolTransactionExtended[]): Promise<boolean> {
+    if (!newTransactions.length) {
+      return true;
+    }
     try {
-      const msetData = toAdd.map(tx => {
+      await this.$ensureConnected();
+      const msetData = newTransactions.map(tx => {
         const minified: any = { ...tx };
         delete minified.hex;
         for (const vin of minified.vin) {
@@ -168,53 +112,30 @@ class RedisCache {
         return [`mempool:tx:${tx.txid}`, JSON.stringify(minified)];
       });
       await this.client.MSET(msetData);
-      // successful, remove transactions from cache queue
-      this.cacheQueue = this.cacheQueue.slice(toAdd.length);
-      logger.debug(`Saved ${toAdd.length} transactions to Redis cache, ${this.cacheQueue.length} left in queue`);
+      return true;
     } catch (e) {
-      logger.warn(`Failed to add ${toAdd.length} transactions to Redis cache: ${e instanceof Error ? e.message : e}`);
-      this.pauseFlush = true;
+      logger.warn(`Failed to add ${newTransactions.length} transactions to Redis cache: ${e instanceof Error ? e.message : e}`);
+      return false;
     }
   }
 
-  async $removeTransactions(transactions: string[]): Promise<void> {
-    if (!config.REDIS.ENABLED) {
-      return;
-    }
-    const toRemove = this.removeQueue.concat(transactions);
-    this.removeQueue = [];
-    let failed: string[] = [];
-    let numRemoved = 0;
-    if (this.connected) {
+  async $removeTransactions(transactions: string[]) {
+    try {
+      await this.$ensureConnected();
       const sliceLength = config.REDIS.BATCH_QUERY_BASE_SIZE;
-      for (let i = 0; i < Math.ceil(toRemove.length / sliceLength); i++) {
-        const slice = toRemove.slice(i * sliceLength, (i + 1) * sliceLength);
-        try {
-          await this.client.unlink(slice.map(txid => `mempool:tx:${txid}`));
-          numRemoved+= sliceLength;
-          logger.debug(`Deleted ${slice.length} transactions from the Redis cache`);
-        } catch (e) {
-          logger.warn(`Failed to remove ${slice.length} transactions from Redis cache: ${e instanceof Error ? e.message : e}`);
-          failed = failed.concat(slice);
-        }
+      for (let i = 0; i < Math.ceil(transactions.length / sliceLength); i++) {
+        const slice = transactions.slice(i * sliceLength, (i + 1) * sliceLength);
+        await this.client.unlink(slice.map(txid => `mempool:tx:${txid}`));
+        logger.debug(`Deleted ${slice.length} transactions from the Redis cache`);
       }
-      // concat instead of replace, in case more txs have been added in the meantime
-      this.removeQueue = this.removeQueue.concat(failed);
-    } else {
-      this.removeQueue = this.removeQueue.concat(toRemove);
+    } catch (e) {
+      logger.warn(`Failed to remove ${transactions.length} transactions from Redis cache: ${e instanceof Error ? e.message : e}`);
     }
   }
 
   async $setRbfEntry(type: string, txid: string, value: any): Promise<void> {
-    if (!config.REDIS.ENABLED) {
-      return;
-    }
-    if (!this.connected) {
-      this.rbfCacheQueue.push({ type, txid, value });
-      logger.warn(`Failed to set RBF ${type} in Redis cache: Redis is not connected`);
-      return;
-    }
     try {
+      await this.$ensureConnected();
       await this.client.set(`rbf:${type}:${txid}`, JSON.stringify(value));
     } catch (e) {
       logger.warn(`Failed to set RBF ${type} in Redis cache: ${e instanceof Error ? e.message : e}`);
@@ -222,55 +143,17 @@ class RedisCache {
   }
 
   async $removeRbfEntry(type: string, txid: string): Promise<void> {
-    if (!config.REDIS.ENABLED) {
-      return;
-    }
-    if (!this.connected) {
-      this.rbfRemoveQueue.push({ type, txid });
-      logger.warn(`Failed to remove RBF ${type} from Redis cache: Redis is not connected`);
-      return;
-    }
     try {
+      await this.$ensureConnected();
       await this.client.unlink(`rbf:${type}:${txid}`);
     } catch (e) {
       logger.warn(`Failed to remove RBF ${type} from Redis cache: ${e instanceof Error ? e.message : e}`);
     }
   }
 
-  private async $flushRbfQueues(): Promise<void> {
-    if (!config.REDIS.ENABLED) {
-      return;
-    }
-    if (!this.connected) {
-      return;
-    }
-    try {
-      const toAdd = this.rbfCacheQueue;
-      this.rbfCacheQueue = [];
-      for (const { type, txid, value } of toAdd) {
-        await this.$setRbfEntry(type, txid, value);
-      }
-      logger.debug(`Saved ${toAdd.length} queued RBF entries to the Redis cache`);
-      const toRemove = this.rbfRemoveQueue;
-      this.rbfRemoveQueue = [];
-      for (const { type, txid } of toRemove) {
-        await this.$removeRbfEntry(type, txid);
-      }
-      logger.debug(`Removed ${toRemove.length} queued RBF entries from the Redis cache`);
-    } catch (e) {
-      logger.warn(`Failed to flush RBF cache event queues after reconnecting to Redis: ${e instanceof Error ? e.message : e}`);
-    }
-  }
-
   async $getBlocks(): Promise<BlockExtended[]> {
-    if (!config.REDIS.ENABLED) {
-      return [];
-    }
-    if (!this.connected) {
-      logger.warn(`Failed to retrieve blocks from Redis cache: Redis is not connected`);
-      return [];
-    }
     try {
+      await this.$ensureConnected();
       const json = await this.client.get('blocks');
       return JSON.parse(json);
     } catch (e) {
@@ -280,14 +163,8 @@ class RedisCache {
   }
 
   async $getBlockSummaries(): Promise<BlockSummary[]> {
-    if (!config.REDIS.ENABLED) {
-      return [];
-    }
-    if (!this.connected) {
-      logger.warn(`Failed to retrieve blocks from Redis cache: Redis is not connected`);
-      return [];
-    }
     try {
+      await this.$ensureConnected();
       const json = await this.client.get('block-summaries');
       return JSON.parse(json);
     } catch (e) {
@@ -297,16 +174,10 @@ class RedisCache {
   }
 
   async $getMempool(): Promise<{ [txid: string]: MempoolTransactionExtended }> {
-    if (!config.REDIS.ENABLED) {
-      return {};
-    }
-    if (!this.connected) {
-      logger.warn(`Failed to retrieve mempool from Redis cache: Redis is not connected`);
-      return {};
-    }
     const start = Date.now();
     const mempool = {};
     try {
+      await this.$ensureConnected();
       const mempoolList = await this.scanKeys<MempoolTransactionExtended>('mempool:tx:*');
       for (const tx of mempoolList) {
         mempool[tx.key] = tx.value;
@@ -320,14 +191,8 @@ class RedisCache {
   }
 
   async $getRbfEntries(type: string): Promise<any[]> {
-    if (!config.REDIS.ENABLED) {
-      return [];
-    }
-    if (!this.connected) {
-      logger.warn(`Failed to retrieve Rbf ${type}s from Redis cache: Redis is not connected`);
-      return [];
-    }
     try {
+      await this.$ensureConnected();
       const rbfEntries = await this.scanKeys<MempoolTransactionExtended[]>(`rbf:${type}:*`);
       return rbfEntries;
     } catch (e) {
@@ -336,10 +201,7 @@ class RedisCache {
     }
   }
 
-  async $loadCache(): Promise<void> {
-    if (!config.REDIS.ENABLED) {
-      return;
-    }
+  async $loadCache() {
     logger.info('Restoring mempool and blocks data from Redis cache');
     // Load block data
     const loadedBlocks = await this.$getBlocks();
@@ -364,7 +226,7 @@ class RedisCache {
     });
   }
 
-  private inflateLoadedTxs(mempool: { [txid: string]: MempoolTransactionExtended }): void {
+  private inflateLoadedTxs(mempool: { [txid: string]: MempoolTransactionExtended }) {
     for (const tx of Object.values(mempool)) {
       for (const vin of tx.vin) {
         if (vin.scriptsig) {

backend/src/api/services/acceleration.ts

@@ -7,26 +7,15 @@ export interface Acceleration {
   txid: string,
   feeDelta: number,
   pools: number[],
-};
-
-export interface AccelerationHistory {
-  txid: string,
-  status: string,
-  feePaid: number,
-  added: number,
-  lastUpdated: number,
-  baseFee: number,
-  vsizeFee: number,
-  effectiveFee: number,
-  effectiveVsize: number,
-  feeDelta: number,
-  blockHash: string,
-  blockHeight: number,
-  pools: {
-    pool_unique_id: number,
-    username: string,
-  }[],
-};
+  effectiveFee: number;
+  effectiveVsize: number;
+  positions?: {
+    [pool: number]: {
+      block: number,
+      vbytes: number,
+    },
+  },
+}
 
 class AccelerationApi {
   public async $fetchAccelerations(): Promise<Acceleration[] | null> {
@@ -43,27 +32,6 @@ class AccelerationApi {
     }
   }
 
-  public async $fetchAccelerationHistory(page?: number, status?: string): Promise<AccelerationHistory[] | null> {
-    if (config.MEMPOOL_SERVICES.ACCELERATIONS) {
-      try {
-        const response = await axios.get(`${config.MEMPOOL_SERVICES.API}/accelerator/accelerations/history`, {
-          responseType: 'json',
-          timeout: 10000,
-          params: {
-            page,
-            status,
-          }
-        });
-        return response.data as AccelerationHistory[];
-      } catch (e) {
-        logger.warn('Failed to fetch acceleration history 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++) {

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

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

backend/src/api/statistics/statistics.ts

@@ -6,7 +6,6 @@ import statisticsApi from './statistics-api';
 
 class Statistics {
   protected intervalTimer: NodeJS.Timer | undefined;
-  protected lastRun: number = 0;
   protected newStatisticsEntryCallback: ((stats: OptimizedStatistic) => void) | undefined;
 
   public setNewStatisticsEntryCallback(fn: (stats: OptimizedStatistic) => void) {
@@ -24,21 +23,15 @@ class Statistics {
     setTimeout(() => {
       this.runStatistics();
       this.intervalTimer = setInterval(() => {
-        this.runStatistics(true);
+        this.runStatistics();
       }, 1 * 60 * 1000);
     }, difference);
   }
 
-  public async runStatistics(skipIfRecent = false): Promise<void> {
+  private async runStatistics(): Promise<void> {
     if (!memPool.isInSync()) {
       return;
     }
-
-    if (skipIfRecent && new Date().getTime() / 1000 - this.lastRun < 30) {
-      return;
-    }
-
-    this.lastRun = new Date().getTime() / 1000;
     const currentMempool = memPool.getMempool();
     const txPerSecond = memPool.getTxPerSecond();
     const vBytesPerSecond = memPool.getVBytesPerSecond();

backend/src/api/transaction-utils.ts

@@ -145,10 +145,6 @@ class TransactionUtils {
   }
 
   public countScriptSigops(script: string, isRawScript: boolean = false, witness: boolean = false): number {
-    if (!script?.length) {
-      return 0;
-    }
-
     let sigops = 0;
     // count OP_CHECKSIG and OP_CHECKSIGVERIFY
     sigops += (script.match(/OP_CHECKSIG/g)?.length || 0);

backend/src/api/websocket-handler.ts

@@ -2,7 +2,7 @@ import logger from '../logger';
 import * as WebSocket from 'ws';
 import {
   BlockExtended, TransactionExtended, MempoolTransactionExtended, WebsocketResponse,
-  OptimizedStatistic, ILoadingIndicators, GbtCandidates, TxTrackingInfo,
+  OptimizedStatistic, ILoadingIndicators
 } from '../mempool.interfaces';
 import blocks from './blocks';
 import memPool from './mempool';
@@ -18,21 +18,17 @@ import feeApi from './fee-api';
 import BlocksAuditsRepository from '../repositories/BlocksAuditsRepository';
 import BlocksSummariesRepository from '../repositories/BlocksSummariesRepository';
 import Audit from './audit';
+import { deepClone } from '../utils/clone';
 import priceUpdater from '../tasks/price-updater';
 import { ApiPrice } from '../repositories/PricesRepository';
 import accelerationApi from './services/acceleration';
 import mempool from './mempool';
-import statistics from './statistics/statistics';
-import accelerationRepository from '../repositories/AccelerationRepository';
-import bitcoinApi from './bitcoin/bitcoin-api-factory';
 
 interface AddressTransactions {
   mempool: MempoolTransactionExtended[],
   confirmed: MempoolTransactionExtended[],
   removed: MempoolTransactionExtended[],
 }
-import bitcoinSecondClient from './bitcoin/bitcoin-second-client';
-import { calculateCpfp } from './cpfp';
 
 // valid 'want' subscriptions
 const wantable = [
@@ -40,7 +36,6 @@ const wantable = [
   'mempool-blocks',
   'live-2h-chart',
   'stats',
-  'tomahawk',
 ];
 
 class WebsocketHandler {
@@ -53,7 +48,7 @@ class WebsocketHandler {
 
   private socketData: { [key: string]: string } = {};
   private serializedInitData: string = '{}';
-  private lastRbfSummary: ReplacementInfo[] | null = null;
+  private lastRbfSummary: ReplacementInfo | null = null;
 
   constructor() { }
 
@@ -83,7 +78,6 @@ class WebsocketHandler {
     const _blocks = blocks.getBlocks().slice(-config.MEMPOOL.INITIAL_BLOCKS_AMOUNT);
     const da = difficultyAdjustment.getDifficultyAdjustment();
     this.updateSocketDataFields({
-      'backend': config.MEMPOOL.BACKEND,
       'mempoolInfo': memPool.getMempoolInfo(),
       'vBytesPerSecond': memPool.getVBytesPerSecond(),
       'blocks': _blocks,
@@ -126,7 +120,7 @@ class WebsocketHandler {
             for (const sub of wantable) {
               const key = `want-${sub}`;
               const wants = parsedMessage.data.includes(sub);
-              if (wants && !client[key]) {
+              if (wants && client['wants'] && !client[key]) {
                 wantNow[key] = true;
               }
               client[key] = wants;
@@ -150,10 +144,6 @@ class WebsocketHandler {
             response['da'] = this.socketData['da'];
           }
 
-          if (wantNow['want-tomahawk']) {
-            response['tomahawk'] = JSON.stringify(bitcoinApi.getHealthStatus());
-          }
-
           if (parsedMessage && parsedMessage['track-tx']) {
             if (/^[a-fA-F0-9]{64}$/.test(parsedMessage['track-tx'])) {
               client['track-tx'] = parsedMessage['track-tx'];
@@ -202,7 +192,8 @@ class WebsocketHandler {
                 }
                 response['txPosition'] = JSON.stringify({
                   txid: trackTxid,
-                  position
+                  position,
+                  accelerationPositions: memPool.getAccelerationPositions(tx.txid),
                 });
               }
             } else {
@@ -210,52 +201,6 @@ class WebsocketHandler {
             }
           }
 
-          if (parsedMessage && parsedMessage['track-txs']) {
-            const txids: string[] = [];
-            if (Array.isArray(parsedMessage['track-txs'])) {
-              for (const txid of parsedMessage['track-txs']) {
-                if (/^[a-fA-F0-9]{64}$/.test(txid)) {
-                  txids.push(txid);
-                }
-              }
-            }
-
-            const txs: { [txid: string]: TxTrackingInfo } = {};
-            for (const txid of txids) {
-              const txInfo: TxTrackingInfo = {
-                confirmed: true,
-              };
-              const rbfCacheTxid = rbfCache.getReplacedBy(txid);
-              if (rbfCacheTxid) {
-                txInfo.replacedBy = rbfCacheTxid;
-                txInfo.confirmed = false;
-              }
-              const tx = memPool.getMempool()[txid];
-              if (tx && tx.position) {
-                txInfo.position = {
-                  ...tx.position
-                };
-                if (tx.acceleration) {
-                  txInfo.accelerated = tx.acceleration;
-                }
-              }
-              if (tx) {
-                txInfo.confirmed = false;
-              }
-              txs[txid] = txInfo;
-            }
-
-            if (txids.length) {
-              client['track-txs'] = txids;
-            } else {
-              client['track-txs'] = null;
-            }
-
-            if (Object.keys(txs).length) {
-              response['tracked-txs'] = JSON.stringify(txs);
-            }
-          }
-
           if (parsedMessage && parsedMessage['track-address']) {
             const validAddress = this.testAddress(parsedMessage['track-address']);
             if (validAddress) {
@@ -315,7 +260,7 @@ class WebsocketHandler {
               const mBlocksWithTransactions = mempoolBlocks.getMempoolBlocksWithTransactions();
               response['projected-block-transactions'] = JSON.stringify({
                 index: index,
-                blockTransactions: (mBlocksWithTransactions[index]?.transactions || []).map(mempoolBlocks.compressTx),
+                blockTransactions: mBlocksWithTransactions[index]?.transactions || [],
               });
             } else {
               client['track-mempool-block'] = null;
@@ -360,6 +305,14 @@ class WebsocketHandler {
             client['track-donation'] = parsedMessage['track-donation'];
           }
 
+          if (parsedMessage['track-bisq-market']) {
+            if (/^[a-z]{3}_[a-z]{3}$/.test(parsedMessage['track-bisq-market'])) {
+              client['track-bisq-market'] = parsedMessage['track-bisq-market'];
+            } else {
+              client['track-bisq-market'] = null;
+            }
+          }
+
           if (Object.keys(response).length) {
             client.send(this.serializeResponse(response));
           }
@@ -476,26 +429,21 @@ class WebsocketHandler {
   }
 
   async $handleMempoolChange(newMempool: { [txid: string]: MempoolTransactionExtended }, mempoolSize: number,
-    newTransactions: MempoolTransactionExtended[], deletedTransactions: MempoolTransactionExtended[], accelerationDelta: string[],
-    candidates?: GbtCandidates): Promise<void> {
+    newTransactions: MempoolTransactionExtended[], deletedTransactions: MempoolTransactionExtended[], accelerationDelta: string[]): Promise<void> {
     if (!this.wss) {
       throw new Error('WebSocket.Server is not set');
     }
 
     this.printLogs();
 
-    const transactionIds = (memPool.limitGBT && candidates) ? Object.keys(candidates?.txs || {}) : Object.keys(newMempool);
-    let added = newTransactions;
-    let removed = deletedTransactions;
-    if (memPool.limitGBT) {
-      added = candidates?.added || [];
-      removed = candidates?.removed || [];
-    }
-
-    if (config.MEMPOOL.RUST_GBT) {
-      await mempoolBlocks.$rustUpdateBlockTemplates(transactionIds, newMempool, added, removed, candidates, config.MEMPOOL_SERVICES.ACCELERATIONS);
+    if (config.MEMPOOL.ADVANCED_GBT_MEMPOOL) {
+      if (config.MEMPOOL.RUST_GBT) {
+        await mempoolBlocks.$rustUpdateBlockTemplates(newMempool, mempoolSize, newTransactions, deletedTransactions, config.MEMPOOL_SERVICES.ACCELERATIONS);
+      } else {
+        await mempoolBlocks.$updateBlockTemplates(newMempool, newTransactions, deletedTransactions, accelerationDelta, true, config.MEMPOOL_SERVICES.ACCELERATIONS);
+      }
     } else {
-      await mempoolBlocks.$updateBlockTemplates(transactionIds, newMempool, added, removed, candidates, accelerationDelta, true, config.MEMPOOL_SERVICES.ACCELERATIONS);
+      mempoolBlocks.updateMempoolBlocks(newMempool, true);
     }
 
     const mBlocks = mempoolBlocks.getMempoolBlocks();
@@ -509,11 +457,10 @@ class WebsocketHandler {
     let rbfReplacements;
     let fullRbfReplacements;
     let rbfSummary;
-    if (Object.keys(rbfChanges.trees).length || !this.lastRbfSummary) {
+    if (Object.keys(rbfChanges.trees).length) {
       rbfReplacements = rbfCache.getRbfTrees(false);
       fullRbfReplacements = rbfCache.getRbfTrees(true);
-      rbfSummary = rbfCache.getLatestRbfSummary() || [];
-      this.lastRbfSummary = rbfSummary;
+      rbfSummary = rbfCache.getLatestRbfSummary();
     }
 
     for (const deletedTx of deletedTransactions) {
@@ -556,11 +503,6 @@ class WebsocketHandler {
       if (client['track-tx']) {
         trackedTxs.add(client['track-tx']);
       }
-      if (client['track-txs']) {
-        for (const txid of client['track-txs']) {
-          trackedTxs.add(txid);
-        }
-      }
     });
     if (trackedTxs.size > 0) {
       for (const tx of newTransactions) {
@@ -602,10 +544,6 @@ class WebsocketHandler {
         response['mempool-blocks'] = getCachedResponse('mempool-blocks', mBlocks);
       }
 
-      if (client['want-tomahawk']) {
-        response['tomahawk'] = getCachedResponse('tomahawk', bitcoinApi.getHealthStatus());
-      }
-
       if (client['track-mempool-tx']) {
         const tx = newTransactions.find((t) => t.txid === client['track-mempool-tx']);
         if (tx) {
@@ -737,11 +675,9 @@ class WebsocketHandler {
             position: {
               ...mempoolTx.position,
               accelerated: mempoolTx.acceleration || undefined,
-            }
+            },
+            accelerationPositions: memPool.getAccelerationPositions(mempoolTx.txid),
           };
-          if (!mempoolTx.cpfpChecked) {
-            calculateCpfp(mempoolTx, newMempool);
-          }
           if (mempoolTx.cpfpDirty) {
             positionData['cpfp'] = {
               ancestors: mempoolTx.ancestors,
@@ -750,53 +686,13 @@ class WebsocketHandler {
               effectiveFeePerVsize: mempoolTx.effectiveFeePerVsize || null,
               sigops: mempoolTx.sigops,
               adjustedVsize: mempoolTx.adjustedVsize,
-              acceleration: mempoolTx.acceleration
+              acceleration: mempoolTx.acceleration,
             };
           }
           response['txPosition'] = JSON.stringify(positionData);
         }
       }
 
-      if (client['track-txs']) {
-        const txids = client['track-txs'];
-        const txs: { [txid: string]: TxTrackingInfo } = {};
-        for (const txid of txids) {
-          const txInfo: TxTrackingInfo = {};
-          const outspends = outspendCache[txid];
-          if (outspends && Object.keys(outspends).length) {
-            txInfo.utxoSpent = outspends;
-          }
-          const replacedBy = rbfChanges.map[txid] ? rbfCache.getReplacedBy(txid) : false;
-          if (replacedBy) {
-            txInfo.replacedBy = replacedBy;
-          }
-          const mempoolTx = newMempool[txid];
-          if (mempoolTx && mempoolTx.position) {
-            txInfo.position = {
-              ...mempoolTx.position,
-              accelerated: mempoolTx.acceleration || undefined,
-            };
-            if (!mempoolTx.cpfpChecked) {
-              calculateCpfp(mempoolTx, newMempool);
-            }
-            if (mempoolTx.cpfpDirty) {
-              txInfo.cpfp = {
-                ancestors: mempoolTx.ancestors,
-                bestDescendant: mempoolTx.bestDescendant || null,
-                descendants: mempoolTx.descendants || null,
-                effectiveFeePerVsize: mempoolTx.effectiveFeePerVsize || null,
-                sigops: mempoolTx.sigops,
-                adjustedVsize: mempoolTx.adjustedVsize,
-              };
-            }
-          }
-          txs[txid] = txInfo;
-        }
-        if (Object.keys(txs).length) {
-          response['tracked-txs'] = JSON.stringify(txs);
-        }
-      }
-
       if (client['track-mempool-block'] >= 0 && memPool.isInSync()) {
         const index = client['track-mempool-block'];
         if (mBlockDeltas[index]) {
@@ -829,15 +725,8 @@ class WebsocketHandler {
     }
 
     this.printLogs();
-    await statistics.runStatistics();
 
     const _memPool = memPool.getMempool();
-    const candidateTxs = await memPool.getMempoolCandidates();
-    let candidates: GbtCandidates | undefined = (memPool.limitGBT && candidateTxs) ? { txs: candidateTxs, added: [], removed: [] } : undefined;
-    let transactionIds: string[] = (memPool.limitGBT) ? Object.keys(candidates?.txs || {}) : Object.keys(_memPool);
-
-    const accelerations = Object.values(mempool.getAccelerations());
-    await accelerationRepository.$indexAccelerationsForBlock(block, accelerations, transactions);
 
     const rbfTransactions = Common.findMinedRbfTransactions(transactions, memPool.getSpendMap());
     memPool.handleMinedRbfTransactions(rbfTransactions);
@@ -845,23 +734,36 @@ class WebsocketHandler {
 
     if (config.MEMPOOL.AUDIT && memPool.isInSync()) {
       let projectedBlocks;
-      const auditMempool = _memPool;
+      let auditMempool = _memPool;
       const isAccelerated = config.MEMPOOL_SERVICES.ACCELERATIONS && accelerationApi.isAcceleratedBlock(block, Object.values(mempool.getAccelerations()));
-
-      if ((config.MEMPOOL_SERVICES.ACCELERATIONS)) {
-        if (config.MEMPOOL.RUST_GBT) {
-          const added = memPool.limitGBT ? (candidates?.added || []) : [];
-          const removed = memPool.limitGBT ? (candidates?.removed || []) : [];
-          projectedBlocks = await mempoolBlocks.$rustUpdateBlockTemplates(transactionIds, auditMempool, added, removed, candidates, isAccelerated, block.extras.pool.id);
+      // template calculation functions have mempool side effects, so calculate audits using
+      // a cloned copy of the mempool if we're running a different algorithm for mempool updates
+      const separateAudit = config.MEMPOOL.ADVANCED_GBT_AUDIT !== config.MEMPOOL.ADVANCED_GBT_MEMPOOL;
+      if (separateAudit) {
+        auditMempool = deepClone(_memPool);
+        if (config.MEMPOOL.ADVANCED_GBT_AUDIT) {
+          if (config.MEMPOOL.RUST_GBT) {
+            projectedBlocks = await mempoolBlocks.$oneOffRustBlockTemplates(auditMempool, isAccelerated, block.extras.pool.id);
+          } else {
+            projectedBlocks = await mempoolBlocks.$makeBlockTemplates(auditMempool, false, isAccelerated, block.extras.pool.id);
+          }
         } else {
-          projectedBlocks = await mempoolBlocks.$makeBlockTemplates(transactionIds, auditMempool, candidates, false, isAccelerated, block.extras.pool.id);
+          projectedBlocks = mempoolBlocks.updateMempoolBlocks(auditMempool, false);
         }
       } else {
-        projectedBlocks = mempoolBlocks.getMempoolBlocksWithTransactions();
+        if ((config.MEMPOOL_SERVICES.ACCELERATIONS)) {
+          if (config.MEMPOOL.RUST_GBT) {
+            projectedBlocks = await mempoolBlocks.$rustUpdateBlockTemplates(auditMempool, Object.keys(auditMempool).length, [], [], isAccelerated, block.extras.pool.id);
+          } else {
+            projectedBlocks = await mempoolBlocks.$makeBlockTemplates(auditMempool, false, isAccelerated, block.extras.pool.id);
+          }
+        } else {
+          projectedBlocks = mempoolBlocks.getMempoolBlocksWithTransactions();
+        }
       }
 
       if (Common.indexingEnabled()) {
-        const { censored, added, prioritized, fresh, sigop, fullrbf, accelerated, score, similarity } = Audit.auditBlock(transactions, projectedBlocks, auditMempool);
+        const { censored, added, fresh, sigop, fullrbf, accelerated, score, similarity } = Audit.auditBlock(transactions, projectedBlocks, auditMempool);
         const matchRate = Math.round(score * 100 * 100) / 100;
 
         const stripped = projectedBlocks[0]?.transactions ? projectedBlocks[0].transactions : [];
@@ -887,7 +789,6 @@ class WebsocketHandler {
           height: block.height,
           hash: block.id,
           addedTxs: added,
-          prioritizedTxs: prioritized,
           missingTxs: censored,
           freshTxs: fresh,
           sigopTxs: sigop,
@@ -921,23 +822,14 @@ class WebsocketHandler {
       confirmedTxids[txId] = true;
     }
 
-    if (memPool.limitGBT) {
-      const minFeeMempool = memPool.limitGBT ? await bitcoinSecondClient.getRawMemPool() : null;
-      const minFeeTip = memPool.limitGBT ? await bitcoinSecondClient.getBlockCount() : -1;
-      candidates = await memPool.getNextCandidates(minFeeMempool, minFeeTip, transactions);
-      transactionIds = Object.keys(candidates?.txs || {});
+    if (config.MEMPOOL.ADVANCED_GBT_MEMPOOL) {
+      if (config.MEMPOOL.RUST_GBT) {
+        await mempoolBlocks.$rustUpdateBlockTemplates(_memPool, Object.keys(_memPool).length, [], transactions, true);
+      } else {
+        await mempoolBlocks.$makeBlockTemplates(_memPool, true, config.MEMPOOL_SERVICES.ACCELERATIONS);
+      }
     } else {
-      candidates = undefined;
-      transactionIds = Object.keys(memPool.getMempool());
-    }
-
-
-    if (config.MEMPOOL.RUST_GBT) {
-      const added = memPool.limitGBT ? (candidates?.added || []) : [];
-      const removed = memPool.limitGBT ? (candidates?.removed || []) : transactions;
-      await mempoolBlocks.$rustUpdateBlockTemplates(transactionIds, _memPool, added, removed, candidates, true);
-    } else {
-      await mempoolBlocks.$makeBlockTemplates(transactionIds, _memPool, candidates, true, config.MEMPOOL_SERVICES.ACCELERATIONS);
+      mempoolBlocks.updateMempoolBlocks(_memPool, true);
     }
     const mBlocks = mempoolBlocks.getMempoolBlocks();
     const mBlockDeltas = mempoolBlocks.getMempoolBlockDeltas();
@@ -994,10 +886,6 @@ class WebsocketHandler {
         response['mempool-blocks'] = getCachedResponse('mempool-blocks', mBlocks);
       }
 
-      if (client['want-tomahawk']) {
-        response['tomahawk'] = getCachedResponse('tomahawk', bitcoinApi.getHealthStatus());
-      }
-
       if (client['track-tx']) {
         const trackTxid = client['track-tx'];
         if (trackTxid && confirmedTxids[trackTxid]) {
@@ -1010,34 +898,13 @@ class WebsocketHandler {
               position: {
                 ...mempoolTx.position,
                 accelerated: mempoolTx.acceleration || undefined,
-              }
+              },
+              accelerationPositions: memPool.getAccelerationPositions(mempoolTx.txid),
             });
           }
         }
       }
 
-      if (client['track-txs']) {
-        const txs: { [txid: string]: TxTrackingInfo } = {};
-        for (const txid of client['track-txs']) {
-          if (confirmedTxids[txid]) {
-            txs[txid] = { confirmed: true };
-          } else {
-            const mempoolTx = _memPool[txid];
-            if (mempoolTx && mempoolTx.position) {
-              txs[txid] = {
-                position: {
-                  ...mempoolTx.position,
-                },
-                accelerated: mempoolTx.acceleration || undefined,
-              };
-            }
-          }
-        }
-        if (Object.keys(txs).length) {
-          response['tracked-txs'] = JSON.stringify(txs);
-        }
-      }
-
       if (client['track-address']) {
         const foundTransactions: TransactionExtended[] = Array.from(addressCache[client['track-address']]?.values() || []);
 
@@ -1135,7 +1002,7 @@ class WebsocketHandler {
           if (mBlockDeltas[index].added.length > (mBlocksWithTransactions[index]?.transactions.length / 2)) {
             response['projected-block-transactions'] = getCachedResponse(`projected-block-transactions-full-${index}`, {
               index: index,
-              blockTransactions: mBlocksWithTransactions[index].transactions.map(mempoolBlocks.compressTx),
+              blockTransactions: mBlocksWithTransactions[index].transactions,
             });
           } else {
             response['projected-block-transactions'] = getCachedResponse(`projected-block-transactions-delta-${index}`, {
@@ -1150,8 +1017,6 @@ class WebsocketHandler {
         client.send(this.serializeResponse(response));
       }
     });
-
-    await statistics.runStatistics();
   }
 
   // takes a dictionary of JSON serialized values
@@ -1233,7 +1098,6 @@ class WebsocketHandler {
   private printLogs(): void {
     if (this.wss) {
       let numTxSubs = 0;
-      let numTxsSubs = 0;
       let numProjectedSubs = 0;
       let numRbfSubs = 0;
 
@@ -1241,9 +1105,6 @@ class WebsocketHandler {
         if (client['track-tx']) {
           numTxSubs++;
         }
-        if (client['track-txs']) {
-          numTxsSubs++;
-        }
         if (client['track-mempool-block'] != null && client['track-mempool-block'] >= 0) {
           numProjectedSubs++;
         }
@@ -1256,7 +1117,7 @@ class WebsocketHandler {
       const diff = count - this.numClients;
       this.numClients = count;
       logger.debug(`${count} websocket clients | ${this.numConnected} connected | ${this.numDisconnected} disconnected | (${diff >= 0 ? '+' : ''}${diff})`);
-      logger.debug(`websocket subscriptions: track-tx: ${numTxSubs}, track-txs: ${numTxsSubs}, track-mempool-block: ${numProjectedSubs} track-rbf: ${numRbfSubs}`);
+      logger.debug(`websocket subscriptions: track-tx: ${numTxSubs}, track-mempool-block: ${numProjectedSubs} track-rbf: ${numRbfSubs}`);
       this.numConnected = 0;
       this.numDisconnected = 0;
     }

backend/src/config.ts

@@ -5,7 +5,6 @@ const configFromFile = require(
 interface IConfig {
   MEMPOOL: {
     ENABLED: boolean;
-    OFFICIAL: boolean;
     NETWORK: 'mainnet' | 'testnet' | 'signet' | 'liquid' | 'liquidtestnet';
     BACKEND: 'esplora' | 'electrum' | 'none';
     HTTP_PORT: number;
@@ -32,8 +31,9 @@ interface IConfig {
     POOLS_JSON_URL: string,
     POOLS_JSON_TREE_URL: string,
     AUDIT: boolean;
+    ADVANCED_GBT_AUDIT: boolean;
+    ADVANCED_GBT_MEMPOOL: boolean;
     RUST_GBT: boolean;
-    LIMIT_GBT: boolean;
     CPFP_INDEXING: boolean;
     MAX_BLOCKS_BULK_QUERY: number;
     DISK_CACHE_BLOCK_INTERVAL: number;
@@ -103,7 +103,6 @@ interface IConfig {
     PASSWORD: string;
     TIMEOUT: number;
     PID_DIR: string;
-    POOL_SIZE: number;
   };
   SYSLOG: {
     ENABLED: boolean;
@@ -116,6 +115,10 @@ interface IConfig {
     ENABLED: boolean;
     TX_PER_SECOND_SAMPLE_PERIOD: number;
   };
+  BISQ: {
+    ENABLED: boolean;
+    DATA_PATH: string;
+  };
   SOCKS5PROXY: {
     ENABLED: boolean;
     USE_ONION: boolean;
@@ -129,6 +132,8 @@ interface IConfig {
     MEMPOOL_ONION: string;
     LIQUID_API: string;
     LIQUID_ONION: string;
+    BISQ_URL: string;
+    BISQ_ONION: string;
   };
   MAXMIND: {
     ENABLED: boolean;
@@ -151,16 +156,11 @@ interface IConfig {
     UNIX_SOCKET_PATH: string;
     BATCH_QUERY_BASE_SIZE: number;
   },
-  FIAT_PRICE: {
-    ENABLED: boolean;
-    API_KEY: string;
-  },
 }
 
 const defaults: IConfig = {
   'MEMPOOL': {
     'ENABLED': true,
-    'OFFICIAL': false,
     'NETWORK': 'mainnet',
     'BACKEND': 'none',
     'HTTP_PORT': 8999,
@@ -187,8 +187,9 @@ const defaults: IConfig = {
     'POOLS_JSON_URL': 'https://raw.githubusercontent.com/mempool/mining-pools/master/pools-v2.json',
     'POOLS_JSON_TREE_URL': 'https://api.github.com/repos/mempool/mining-pools/git/trees/master',
     'AUDIT': false,
+    'ADVANCED_GBT_AUDIT': false,
+    'ADVANCED_GBT_MEMPOOL': false,
     'RUST_GBT': false,
-    'LIMIT_GBT': false,
     'CPFP_INDEXING': false,
     'MAX_BLOCKS_BULK_QUERY': 0,
     'DISK_CACHE_BLOCK_INTERVAL': 6,
@@ -239,7 +240,6 @@ const defaults: IConfig = {
     'PASSWORD': 'mempool',
     'TIMEOUT': 180000,
     'PID_DIR': '',
-    'POOL_SIZE': 100,
   },
   'SYSLOG': {
     'ENABLED': true,
@@ -252,6 +252,10 @@ const defaults: IConfig = {
     'ENABLED': true,
     'TX_PER_SECOND_SAMPLE_PERIOD': 150
   },
+  'BISQ': {
+    'ENABLED': false,
+    'DATA_PATH': '/bisq/statsnode-data/btc_mainnet/db'
+  },
   'LIGHTNING': {
     'ENABLED': false,
     'BACKEND': 'lnd',
@@ -283,7 +287,9 @@ const defaults: IConfig = {
     'MEMPOOL_API': 'https://mempool.space/api/v1',
     'MEMPOOL_ONION': 'http://mempoolhqx4isw62xs7abwphsq7ldayuidyx2v2oethdhhj6mlo2r6ad.onion/api/v1',
     'LIQUID_API': 'https://liquid.network/api/v1',
-    'LIQUID_ONION': 'http://liquidmom47f6s3m53ebfxn47p76a6tlnxib3wp6deux7wuzotdr6cyd.onion/api/v1'
+    'LIQUID_ONION': 'http://liquidmom47f6s3m53ebfxn47p76a6tlnxib3wp6deux7wuzotdr6cyd.onion/api/v1',
+    'BISQ_URL': 'https://bisq.markets/api',
+    'BISQ_ONION': 'http://bisqmktse2cabavbr2xjq7xw3h6g5ottemo5rolfcwt6aly6tp5fdryd.onion/api'
   },
   'MAXMIND': {
     'ENABLED': false,
@@ -306,10 +312,6 @@ const defaults: IConfig = {
     'UNIX_SOCKET_PATH': '',
     'BATCH_QUERY_BASE_SIZE': 5000,
   },
-  'FIAT_PRICE': {
-    'ENABLED': true,
-    'API_KEY': '',
-  },
 };
 
 class Config implements IConfig {
@@ -321,6 +323,7 @@ class Config implements IConfig {
   DATABASE: IConfig['DATABASE'];
   SYSLOG: IConfig['SYSLOG'];
   STATISTICS: IConfig['STATISTICS'];
+  BISQ: IConfig['BISQ'];
   LIGHTNING: IConfig['LIGHTNING'];
   LND: IConfig['LND'];
   CLIGHTNING: IConfig['CLIGHTNING'];
@@ -330,7 +333,6 @@ class Config implements IConfig {
   REPLICATION: IConfig['REPLICATION'];
   MEMPOOL_SERVICES: IConfig['MEMPOOL_SERVICES'];
   REDIS: IConfig['REDIS'];
-  FIAT_PRICE: IConfig['FIAT_PRICE'];
 
   constructor() {
     const configs = this.merge(configFromFile, defaults);
@@ -342,6 +344,7 @@ class Config implements IConfig {
     this.DATABASE = configs.DATABASE;
     this.SYSLOG = configs.SYSLOG;
     this.STATISTICS = configs.STATISTICS;
+    this.BISQ = configs.BISQ;
     this.LIGHTNING = configs.LIGHTNING;
     this.LND = configs.LND;
     this.CLIGHTNING = configs.CLIGHTNING;
@@ -351,7 +354,6 @@ class Config implements IConfig {
     this.REPLICATION = configs.REPLICATION;
     this.MEMPOOL_SERVICES = configs.MEMPOOL_SERVICES;
     this.REDIS = configs.REDIS;
-    this.FIAT_PRICE = configs.FIAT_PRICE;
   }
 
   merge = (...objects: object[]): IConfig => {

backend/src/database.ts

@@ -21,7 +21,7 @@ import { execSync } from 'child_process';
     database: config.DATABASE.DATABASE,
     user: config.DATABASE.USERNAME,
     password: config.DATABASE.PASSWORD,
-    connectionLimit: config.DATABASE.POOL_SIZE,
+    connectionLimit: 10,
     supportBigNumbers: true,
     timezone: '+00:00',
   };

backend/src/index.ts

@@ -11,6 +11,8 @@ import memPool from './api/mempool';
 import diskCache from './api/disk-cache';
 import statistics from './api/statistics/statistics';
 import websocketHandler from './api/websocket-handler';
+import bisq from './api/bisq/bisq';
+import bisqMarkets from './api/bisq/markets';
 import logger from './logger';
 import backendInfo from './api/backend-info';
 import loadingIndicators from './api/loading-indicators';
@@ -30,6 +32,7 @@ import networkSyncService from './tasks/lightning/network-sync.service';
 import statisticsRoutes from './api/statistics/statistics.routes';
 import pricesRoutes from './api/prices/prices.routes';
 import miningRoutes from './api/mining/mining-routes';
+import bisqRoutes from './api/bisq/bisq.routes';
 import liquidRoutes from './api/liquid/liquid.routes';
 import bitcoinRoutes from './api/bitcoin/bitcoin.routes';
 import fundingTxFetcher from './tasks/lightning/sync-tasks/funding-tx-fetcher';
@@ -42,9 +45,6 @@ import { formatBytes, getBytesUnit } from './utils/format';
 import redisCache from './api/redis-cache';
 import accelerationApi from './api/services/acceleration';
 import bitcoinCoreRoutes from './api/bitcoin/bitcoin-core.routes';
-import bitcoinSecondClient from './api/bitcoin/bitcoin-second-client';
-import accelerationRoutes from './api/acceleration/acceleration.routes';
-import aboutRoutes from './api/about.routes';
 
 class Server {
   private wss: WebSocket.Server | undefined;
@@ -131,7 +131,7 @@ class Server {
       .use(express.text({ type: ['text/plain', 'application/base64'] }))
       ;
 
-    if (config.DATABASE.ENABLED && config.FIAT_PRICE.ENABLED) {
+    if (config.DATABASE.ENABLED) {
       await priceUpdater.$initializeLatestPriceWithDb();
     }
 
@@ -155,22 +155,14 @@ class Server {
     }
 
     if (Common.isLiquid()) {
-      const refreshIcons = () => {
-        try {
-          icons.loadIcons();
-        } catch (e) {
-          logger.err('Cannot load liquid icons. Ignoring. Reason: ' + (e instanceof Error ? e.message : e));
-        }
-      };
-      // Run once on startup.
-      refreshIcons();
-      // Matches crontab refresh interval for asset db.
-      setInterval(refreshIcons, 3600_000);
+      try {
+        icons.loadIcons();
+      } catch (e) {
+        logger.err('Cannot load liquid icons. Ignoring. Reason: ' + (e instanceof Error ? e.message : e));
+      }
     }
 
-    if (config.FIAT_PRICE.ENABLED) {
-      priceUpdater.$run();
-    }
+    priceUpdater.$run();
     await chainTips.updateOrphanedBlocks();
 
     this.setUpHttpApiRoutes();
@@ -181,6 +173,13 @@ class Server {
 
     setInterval(() => { this.healthCheck(); }, 2500);
 
+    if (config.BISQ.ENABLED) {
+      bisq.startBisqService();
+      bisq.setPriceCallbackFunction((price) => websocketHandler.setExtraInitData('bsq-price', price));
+      blocks.setNewBlockCallback(bisq.handleNewBitcoinBlock.bind(bisq));
+      bisqMarkets.startBisqService();
+    }
+
     if (config.LIGHTNING.ENABLED) {
       this.$runLightningBackend();
     }
@@ -208,18 +207,14 @@ class Server {
         }
       }
       const newMempool = await bitcoinApi.$getRawMempool();
-      const minFeeMempool = memPool.limitGBT ? await bitcoinSecondClient.getRawMemPool() : null;
-      const minFeeTip = memPool.limitGBT ? await bitcoinSecondClient.getBlockCount() : -1;
       const newAccelerations = await accelerationApi.$fetchAccelerations();
       const numHandledBlocks = await blocks.$updateBlocks();
       const pollRate = config.MEMPOOL.POLL_RATE_MS * (indexer.indexerIsRunning() ? 10 : 1);
       if (numHandledBlocks === 0) {
-        await memPool.$updateMempool(newMempool, newAccelerations, minFeeMempool, minFeeTip, pollRate);
+        await memPool.$updateMempool(newMempool, newAccelerations, pollRate);
       }
       indexer.$run();
-      if (config.FIAT_PRICE.ENABLED) {
-        priceUpdater.$run();
-      }
+      priceUpdater.$run();
 
       // rerun immediately if we skipped the mempool update, otherwise wait POLL_RATE_MS
       const elapsed = Date.now() - start;
@@ -271,7 +266,6 @@ class Server {
       blocks.setNewBlockCallback(async () => {
         try {
           await elementsParser.$parse();
-          await elementsParser.$updateFederationUtxos();
         } catch (e) {
           logger.warn('Elements parsing error: ' + (e instanceof Error ? e.message : e));
         }
@@ -283,9 +277,7 @@ class Server {
       memPool.setAsyncMempoolChangedCallback(websocketHandler.$handleMempoolChange.bind(websocketHandler));
       blocks.setNewAsyncBlockCallback(websocketHandler.handleNewBlock.bind(websocketHandler));
     }
-    if (config.FIAT_PRICE.ENABLED) {
-      priceUpdater.setRatesChangedCallback(websocketHandler.handleNewConversionRates.bind(websocketHandler));
-    }
+    priceUpdater.setRatesChangedCallback(websocketHandler.handleNewConversionRates.bind(websocketHandler));
     loadingIndicators.setProgressChangedCallback(websocketHandler.handleLoadingChanged.bind(websocketHandler));
   }
   
@@ -299,6 +291,9 @@ class Server {
     if (Common.indexingEnabled() && config.MEMPOOL.ENABLED) {
       miningRoutes.initRoutes(this.app);
     }
+    if (config.BISQ.ENABLED) {
+      bisqRoutes.initRoutes(this.app);
+    }
     if (Common.isLiquid()) {
       liquidRoutes.initRoutes(this.app);
     }
@@ -307,10 +302,6 @@ class Server {
       nodesRoutes.initRoutes(this.app);
       channelsRoutes.initRoutes(this.app);
     }
-    if (config.MEMPOOL_SERVICES.ACCELERATIONS) {
-      accelerationRoutes.initRoutes(this.app);
-    }
-    aboutRoutes.initRoutes(this.app);
   }
 
   healthCheck(): void {

backend/src/indexer.ts

@@ -8,7 +8,6 @@ import priceUpdater from './tasks/price-updater';
 import PricesRepository from './repositories/PricesRepository';
 import config from './config';
 import auditReplicator from './replication/AuditReplication';
-import AccelerationRepository from './repositories/AccelerationRepository';
 
 export interface CoreIndex {
   name: string;
@@ -117,7 +116,7 @@ class Indexer {
 
     switch (task) {
       case 'blocksPrices': {
-        if (!['testnet', 'signet'].includes(config.MEMPOOL.NETWORK) && config.FIAT_PRICE.ENABLED) {
+        if (!['testnet', 'signet'].includes(config.MEMPOOL.NETWORK)) {
           let lastestPriceId;
           try {
             lastestPriceId = await PricesRepository.$getLatestPriceId();
@@ -149,12 +148,10 @@ class Indexer {
       return;
     }
 
-    if (config.FIAT_PRICE.ENABLED) {
-      try {
-        await priceUpdater.$run();
-      } catch (e) {
-        logger.err(`Running priceUpdater failed. Reason: ` + (e instanceof Error ? e.message : e));
-      }
+    try {
+      await priceUpdater.$run();
+    } catch (e) {
+      logger.err(`Running priceUpdater failed. Reason: ` + (e instanceof Error ? e.message : e));
     }
 
     // Do not attempt to index anything unless Bitcoin Core is fully synced
@@ -188,9 +185,7 @@ class Indexer {
       await blocks.$generateCPFPDatabase();
       await blocks.$generateAuditStats();
       await auditReplicator.$sync();
-      await AccelerationRepository.$indexPastAccelerations();
-      // do not wait for classify blocks to finish
-      blocks.$classifyBlocks();
+      await blocks.$classifyBlocks();
     } catch (e) {
       this.indexerRunning = false;
       logger.err(`Indexer failed, trying again in 10 seconds. Reason: ` + (e instanceof Error ? e.message : e));

backend/src/logger.ts

@@ -86,6 +86,9 @@ class Logger {
     if (config.LIGHTNING.ENABLED) {
       return config.MEMPOOL.NETWORK === 'mainnet' ? 'lightning' : `${config.MEMPOOL.NETWORK}-lightning`; 
     }
+    if (config.BISQ.ENABLED) {
+      return 'bisq';
+    }
     if (config.MEMPOOL.NETWORK && config.MEMPOOL.NETWORK !== 'mainnet') {
       return config.MEMPOOL.NETWORK;
     }

backend/src/mempool.interfaces.ts

@@ -37,7 +37,6 @@ export interface BlockAudit {
   sigopTxs: string[],
   fullrbfTxs: string[],
   addedTxs: string[],
-  prioritizedTxs: string[],
   acceleratedTxs: string[],
   matchRate: number,
   expectedFees?: number,
@@ -66,9 +65,9 @@ export interface MempoolBlockWithTransactions extends MempoolBlock {
 }
 
 export interface MempoolBlockDelta {
-  added: TransactionCompressed[];
+  added: TransactionClassified[];
   removed: string[];
-  changed: MempoolDeltaChange[];
+  changed: { txid: string, rate: number | undefined, flags?: number }[];
 }
 
 interface VinStrippedToScriptsig {
@@ -108,7 +107,6 @@ export interface MempoolTransactionExtended extends TransactionExtended {
   inputs?: number[];
   lastBoosted?: number;
   cpfpDirty?: boolean;
-  cpfpUpdated?: number;
 }
 
 export interface AuditTransaction {
@@ -145,12 +143,6 @@ export interface CompactThreadTransaction {
   dirty?: boolean;
 }
 
-export interface GbtCandidates {
-  txs: { [txid: string ]: boolean },
-  added: MempoolTransactionExtended[];
-  removed: MempoolTransactionExtended[];
-}
-
 export interface ThreadTransaction {
   txid: string;
   fee: number;
@@ -189,9 +181,6 @@ export interface CpfpInfo {
   bestDescendant?: BestDescendant | null;
   descendants?: Ancestor[];
   effectiveFeePerVsize?: number;
-  sigops?: number;
-  adjustedVsize?: number,
-  acceleration?: boolean,
 }
 
 export interface TransactionStripped {
@@ -201,18 +190,12 @@ export interface TransactionStripped {
   value: number;
   acc?: boolean;
   rate?: number; // effective fee rate
-  time?: number;
 }
 
 export interface TransactionClassified extends TransactionStripped {
   flags: number;
 }
 
-// [txid, fee, vsize, value, rate, flags, acceleration?]
-export type TransactionCompressed = [string, number, number, number, number, number, number, 1?];
-// [txid, rate, flags, acceleration?]
-export type MempoolDeltaChange = [string, number, number, (1|0)];
-
 // binary flags for transaction classification
 export const TransactionFlags = {
   // features
@@ -220,8 +203,6 @@ export const TransactionFlags = {
   no_rbf:                                                      0b00000010n,
   v1:                                                          0b00000100n,
   v2:                                                          0b00001000n,
-  v3:                                                          0b00010000n,
-  nonstandard:                                                 0b00100000n,
   // address types
   p2pk:                                               0b00000001_00000000n,
   p2ms:                                               0b00000010_00000000n,
@@ -238,7 +219,6 @@ export const TransactionFlags = {
   op_return:                        0b00000001_00000000_00000000_00000000n,
   fake_pubkey:                      0b00000010_00000000_00000000_00000000n,
   inscription:                      0b00000100_00000000_00000000_00000000n,
-  fake_scripthash:                  0b00001000_00000000_00000000_00000000n,
   // heuristics
   coinjoin:                0b00000001_00000000_00000000_00000000_00000000n,
   consolidation:           0b00000010_00000000_00000000_00000000_00000000n,
@@ -413,28 +393,13 @@ export interface OptimizedStatistic {
   vsizes: number[];
 }
 
-export interface TxTrackingInfo {
-  replacedBy?: string,
-  position?: { block: number, vsize: number, accelerated?: boolean },
-  cpfp?: {
-    ancestors?: Ancestor[],
-    bestDescendant?: Ancestor | null,
-    descendants?: Ancestor[] | null,
-    effectiveFeePerVsize?: number | null,
-    sigops: number,
-    adjustedVsize: number,
-  },
-  utxoSpent?: { [vout: number]: { vin: number, txid: string } },
-  accelerated?: boolean,
-  confirmed?: boolean
-}
-
 export interface WebsocketResponse {
   action: string;
   data: string[];
   'track-tx': string;
   'track-address': string;
   'watch-mempool': boolean;
+  'track-bisq-market': string;
 }
 
 export interface VbytesPerSecond {
@@ -456,7 +421,6 @@ export interface IBackendInfo {
   gitCommit: string;
   version: string;
   lightning: boolean;
-  backend: 'esplora' | 'electrum' | 'none';
 }
 
 export interface IDifficultyAdjustment {

backend/src/replication/AuditReplication.ts

@@ -114,7 +114,6 @@ class AuditReplication {
       time: auditSummary.timestamp || auditSummary.time,
       missingTxs: auditSummary.missingTxs || [],
       addedTxs: auditSummary.addedTxs || [],
-      prioritizedTxs: auditSummary.prioritizedTxs || [],
       freshTxs: auditSummary.freshTxs || [],
       sigopTxs: auditSummary.sigopTxs || [],
       fullrbfTxs: auditSummary.fullrbfTxs || [],

backend/src/repositories/AccelerationRepository.ts

@@ -1,322 +0,0 @@
-import { AccelerationInfo, makeBlockTemplate } from '../api/acceleration/acceleration';
-import { RowDataPacket } from 'mysql2';
-import DB from '../database';
-import logger from '../logger';
-import { IEsploraApi } from '../api/bitcoin/esplora-api.interface';
-import { Common } from '../api/common';
-import config from '../config';
-import blocks from '../api/blocks';
-import accelerationApi, { Acceleration } from '../api/services/acceleration';
-import accelerationCosts from '../api/acceleration/acceleration';
-import bitcoinApi from '../api/bitcoin/bitcoin-api-factory';
-import transactionUtils from '../api/transaction-utils';
-import { BlockExtended, MempoolTransactionExtended } from '../mempool.interfaces';
-
-export interface PublicAcceleration {
-  txid: string,
-  height: number,
-  pool: {
-    id: number,
-    slug: string,
-    name: string,
-  },
-  effective_vsize: number,
-  effective_fee: number,
-  boost_rate: number,
-  boost_cost: number,
-}
-
-class AccelerationRepository {
-  private bidBoostV2Activated = 831580;
-
-  public async $saveAcceleration(acceleration: AccelerationInfo, block: IEsploraApi.Block, pool_id: number): Promise<void> {
-    try {
-      await DB.query(`
-        INSERT INTO accelerations(txid, added, height, pool, effective_vsize, effective_fee, boost_rate, boost_cost)
-        VALUE (?, FROM_UNIXTIME(?), ?, ?, ?, ?, ?, ?)
-        ON DUPLICATE KEY UPDATE
-          height = ?
-      `, [
-        acceleration.txSummary.txid,
-        block.timestamp,
-        block.height,
-        pool_id,
-        acceleration.txSummary.effectiveVsize,
-        acceleration.txSummary.effectiveFee,
-        acceleration.targetFeeRate,
-        acceleration.cost,
-        block.height,
-      ]);
-    } catch (e: any) {
-      logger.err(`Cannot save acceleration (${acceleration.txSummary.txid}) into db. Reason: ` + (e instanceof Error ? e.message : e));
-      // We don't throw, not a critical issue if we miss some accelerations
-    }
-  }
-
-  public async $getAccelerationInfo(poolSlug: string | null = null, height: number | null = null, interval: string | null = null): Promise<PublicAcceleration[]> {
-    if (!interval || !['24h', '3d', '1w', '1m'].includes(interval)) {
-      interval = '1m';
-    }
-    interval = Common.getSqlInterval(interval);
-
-    if (!config.MEMPOOL_SERVICES.ACCELERATIONS || (interval == null && poolSlug == null && height == null)) {
-      return [];
-    }
-
-    let query = `
-      SELECT * FROM accelerations
-      JOIN pools on pools.unique_id = accelerations.pool
-    `;
-    let params: any[] = [];
-    let hasFilter = false;
-
-    if (interval && height === null) {
-      query += ` WHERE accelerations.added BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW() `;
-      hasFilter = true;
-    }
-
-    if (height != null) {
-      if (hasFilter) {
-        query += ` AND accelerations.height = ? `;
-      } else {
-        query += ` WHERE accelerations.height = ? `;
-      }
-      params.push(height);
-    } else if (poolSlug != null) {
-      if (hasFilter) {
-        query += ` AND pools.slug = ? `;
-      } else {
-        query += ` WHERE pools.slug = ? `;
-      }
-      params.push(poolSlug);
-    }
-
-    query += ` ORDER BY accelerations.added DESC `;
-
-    try {
-      const [rows] = await DB.query(query, params) as RowDataPacket[][];
-      if (rows?.length) {
-        return rows.map(row => ({
-          txid: row.txid,
-          height: row.height,
-          pool: {
-            id: row.id,
-            slug: row.slug,
-            name: row.name,
-          },
-          effective_vsize: row.effective_vsize,
-          effective_fee: row.effective_fee,
-          boost_rate: row.boost_rate,
-          boost_cost: row.boost_cost,
-        }));
-      } else {
-        return [];
-      }
-    } catch (e) {
-      logger.err(`Cannot query acceleration info. Reason: ` + (e instanceof Error ? e.message : e));
-      throw e;
-    }
-  }
-
-  public async $getAccelerationTotals(poolSlug: string | null = null, interval: string | null = null): Promise<{ cost: number, count: number }> {
-    interval = Common.getSqlInterval(interval);
-
-    if (!config.MEMPOOL_SERVICES.ACCELERATIONS) {
-      return { cost: 0, count: 0 };
-    }
-
-    let query = `
-      SELECT SUM(boost_cost) as total_cost, COUNT(txid) as count FROM accelerations
-      JOIN pools on pools.unique_id = accelerations.pool
-    `;
-    let params: any[] = [];
-    let hasFilter = false;
-
-    if (interval) {
-      query += ` WHERE accelerations.added BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW() `;
-      hasFilter = true;
-    }
-    if (poolSlug != null) {
-      if (hasFilter) {
-        query += ` AND pools.slug = ? `;
-      } else {
-        query += ` WHERE pools.slug = ? `;
-      }
-      params.push(poolSlug);
-    }
-
-    try {
-      const [rows] = await DB.query(query, params) as RowDataPacket[][];
-      return {
-        cost: rows[0]?.total_cost || 0,
-        count: rows[0]?.count || 0,
-      };
-    } catch (e) {
-      logger.err(`Cannot query acceleration totals. Reason: ` + (e instanceof Error ? e.message : e));
-      throw e;
-    }
-  }
-
-  public async $getLastSyncedHeight(): Promise<number> {
-    try {
-      const [rows] = await DB.query(`
-        SELECT * FROM state
-        WHERE name = 'last_acceleration_block'
-      `);
-      if (rows?.['length']) {
-        return rows[0].number;
-      }
-    } catch (e: any) {
-      logger.err(`Cannot find last acceleration sync height. Reason: ` + (e instanceof Error ? e.message : e));
-    }
-    return 0;
-  }
-
-  private async $setLastSyncedHeight(height: number): Promise<void> {
-    try {
-      await DB.query(`
-        UPDATE state
-        SET number = ?
-        WHERE name = 'last_acceleration_block'
-      `, [height]);
-    } catch (e: any) {
-      logger.err(`Cannot update last acceleration sync height. Reason: ` + (e instanceof Error ? e.message : e));
-    }
-  }
-
-  public async $indexAccelerationsForBlock(block: BlockExtended, accelerations: Acceleration[], transactions: MempoolTransactionExtended[]): Promise<void> {
-    const blockTxs: { [txid: string]: MempoolTransactionExtended } = {};
-    for (const tx of transactions) {
-      blockTxs[tx.txid] = tx;
-    }
-    const successfulAccelerations = accelerations.filter(acc => acc.pools.includes(block.extras.pool.id));
-    let boostRate: number | null = null;
-    for (const acc of successfulAccelerations) {
-      if (boostRate === null) {
-        boostRate = accelerationCosts.calculateBoostRate(
-          accelerations.map(acc => ({ txid: acc.txid, max_bid: acc.feeDelta })),
-          transactions
-        );
-      }
-      if (blockTxs[acc.txid]) {
-        const tx = blockTxs[acc.txid];
-        const accelerationInfo = accelerationCosts.getAccelerationInfo(tx, boostRate, transactions);
-        accelerationInfo.cost = Math.max(0, Math.min(acc.feeDelta, accelerationInfo.cost));
-        this.$saveAcceleration(accelerationInfo, block, block.extras.pool.id);
-      }
-    }
-    const lastSyncedHeight = await this.$getLastSyncedHeight();
-    // if we've missed any blocks, let the indexer catch up from the last synced height on the next run
-    if (block.height === lastSyncedHeight + 1) {
-      await this.$setLastSyncedHeight(block.height);
-    }
-  }
-
-  /**
-   * [INDEXING] Backfill missing acceleration data
-   */
-  async $indexPastAccelerations(): Promise<void> {
-    if (config.MEMPOOL.NETWORK !== 'mainnet' || !config.MEMPOOL_SERVICES.ACCELERATIONS) {
-      // acceleration history disabled
-      return;
-    }
-    const lastSyncedHeight = await this.$getLastSyncedHeight();
-    const currentHeight = blocks.getCurrentBlockHeight();
-    if (currentHeight <= lastSyncedHeight) {
-      // already in sync
-      return;
-    }
-
-    logger.debug(`Fetching accelerations between block ${lastSyncedHeight} and ${currentHeight}`);
-
-    // Fetch accelerations from mempool.space since the last synced block;
-    const accelerationsByBlock = {};
-    const blockHashes = {};
-    let done = false;
-    let page = 1;
-    let count = 0;
-    try {
-      while (!done) {
-        const accelerations = await accelerationApi.$fetchAccelerationHistory(page);
-        page++;
-        if (!accelerations?.length) {
-          done = true;
-          break;
-        }
-        for (const acc of accelerations) {
-          if (acc.status !== 'completed_provisional' && acc.status !== 'completed') {
-            continue;
-          }
-          if (!lastSyncedHeight || acc.blockHeight > lastSyncedHeight) {
-            if (!accelerationsByBlock[acc.blockHeight]) {
-              accelerationsByBlock[acc.blockHeight] = [];
-              blockHashes[acc.blockHeight] = acc.blockHash;
-            }
-            accelerationsByBlock[acc.blockHeight].push(acc);
-            count++;
-          } else {
-            done = true;
-          }
-        }
-      }
-    } catch (e) {
-      logger.err(`Failed to fetch full acceleration history. Reason: ` + (e instanceof Error ? e.message : e));
-    }
-
-    logger.debug(`Indexing ${count} accelerations between block ${lastSyncedHeight} and ${currentHeight}`);
-
-    // process accelerated blocks in order
-    const heights = Object.keys(accelerationsByBlock).map(key => parseInt(key)).sort((a,b) => a - b);
-    for (const height of heights) {
-      const accelerations = accelerationsByBlock[height];
-      try {
-        const block = await blocks.$getBlock(blockHashes[height]) as BlockExtended;
-        const transactions = (await bitcoinApi.$getTxsForBlock(blockHashes[height])).map(tx => transactionUtils.extendMempoolTransaction(tx));
-
-        const blockTxs = {};
-        for (const tx of transactions) {
-          blockTxs[tx.txid] = tx;
-        }
-
-        let boostRate = 0;
-        // use Bid Boost V2 if active
-        if (height > this.bidBoostV2Activated) {
-          boostRate = accelerationCosts.calculateBoostRate(
-            accelerations.map(acc => ({ txid: acc.txid, max_bid: acc.feeDelta })),
-            transactions
-          );
-        } else {
-          // default to Bid Boost V1 (median block fee rate)
-          const template = makeBlockTemplate(
-            transactions,
-            accelerations.map(acc => ({ txid: acc.txid, max_bid: acc.feeDelta })),
-            1,
-            Infinity,
-            Infinity
-          );
-          const feeStats = Common.calcEffectiveFeeStatistics(template);
-          boostRate = feeStats.medianFee;
-        }
-        for (const acc of accelerations) {
-          if (blockTxs[acc.txid]) {
-            const tx = blockTxs[acc.txid];
-            const accelerationInfo = accelerationCosts.getAccelerationInfo(tx, boostRate, transactions);
-            accelerationInfo.cost = Math.max(0, Math.min(acc.feeDelta, accelerationInfo.cost));
-            await this.$saveAcceleration(accelerationInfo, block, block.extras.pool.id);
-          }
-        }
-        await this.$setLastSyncedHeight(height);
-      } catch (e) {
-        logger.err(`Failed to process accelerations for block ${height}. Reason: ` + (e instanceof Error ? e.message : e));
-        return;
-      }
-      logger.debug(`Indexed ${accelerations.length} accelerations in block  ${height}`);
-    }
-
-    await this.$setLastSyncedHeight(currentHeight);
-
-    logger.debug(`Indexing accelerations completed`);
-  }
-}
-
-export default new AccelerationRepository();

backend/src/repositories/BlocksAuditsRepository.ts

@@ -6,9 +6,9 @@ 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, prioritized_txs, fresh_txs, sigop_txs, fullrbf_txs, accelerated_txs, match_rate, expected_fees, expected_weight)
-        VALUE (FROM_UNIXTIME(?), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [audit.time, audit.height, audit.hash, JSON.stringify(audit.missingTxs),
-          JSON.stringify(audit.addedTxs), JSON.stringify(audit.prioritizedTxs), JSON.stringify(audit.freshTxs), JSON.stringify(audit.sigopTxs), JSON.stringify(audit.fullrbfTxs), JSON.stringify(audit.acceleratedTxs), audit.matchRate, audit.expectedFees, audit.expectedWeight]);
+      await DB.query(`INSERT INTO blocks_audits(time, height, hash, missing_txs, added_txs, fresh_txs, sigop_txs, fullrbf_txs, accelerated_txs, match_rate, expected_fees, expected_weight)
+        VALUE (FROM_UNIXTIME(?), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [audit.time, audit.height, audit.hash, JSON.stringify(audit.missingTxs),
+          JSON.stringify(audit.addedTxs), JSON.stringify(audit.freshTxs), JSON.stringify(audit.sigopTxs), JSON.stringify(audit.fullrbfTxs), JSON.stringify(audit.acceleratedTxs), audit.matchRate, audit.expectedFees, audit.expectedWeight]);
     } catch (e: any) {
       if (e.errno === 1062) { // ER_DUP_ENTRY - This scenario is possible upon node backend restart
         logger.debug(`Cannot save block audit for block ${audit.hash} because it has already been indexed, ignoring`);
@@ -59,14 +59,13 @@ class BlocksAuditRepositories {
     }
   }
 
-  public async $getBlockAudit(hash: string): Promise<BlockAudit | null> {
+  public async $getBlockAudit(hash: string): Promise<any> {
     try {
       const [rows]: any[] = await DB.query(
         `SELECT blocks_audits.height, blocks_audits.hash as id, UNIX_TIMESTAMP(blocks_audits.time) as timestamp,
         template,
         missing_txs as missingTxs,
         added_txs as addedTxs,
-        prioritized_txs as prioritizedTxs,
         fresh_txs as freshTxs,
         sigop_txs as sigopTxs,
         fullrbf_txs as fullrbfTxs,
@@ -76,13 +75,12 @@ class BlocksAuditRepositories {
         expected_weight as expectedWeight
         FROM blocks_audits
         JOIN blocks_templates ON blocks_templates.id = blocks_audits.hash
-        WHERE blocks_audits.hash = ?
-      `, [hash]);
+        WHERE blocks_audits.hash = "${hash}"
+      `);
       
       if (rows.length) {
         rows[0].missingTxs = JSON.parse(rows[0].missingTxs);
         rows[0].addedTxs = JSON.parse(rows[0].addedTxs);
-        rows[0].prioritizedTxs = JSON.parse(rows[0].prioritizedTxs);
         rows[0].freshTxs = JSON.parse(rows[0].freshTxs);
         rows[0].sigopTxs = JSON.parse(rows[0].sigopTxs);
         rows[0].fullrbfTxs = JSON.parse(rows[0].fullrbfTxs);
@@ -103,8 +101,8 @@ class BlocksAuditRepositories {
       const [rows]: any[] = await DB.query(
         `SELECT hash, match_rate as matchRate, expected_fees as expectedFees, expected_weight as expectedWeight
         FROM blocks_audits
-        WHERE blocks_audits.hash = ?
-      `, [hash]);
+        WHERE blocks_audits.hash = "${hash}"
+      `);
       return rows[0];
     } catch (e: any) {
       logger.err(`Cannot fetch block audit from db. Reason: ` + (e instanceof Error ? e.message : e));

backend/src/repositories/BlocksRepository.ts

@@ -5,7 +5,7 @@ import logger from '../logger';
 import { Common } from '../api/common';
 import PoolsRepository from './PoolsRepository';
 import HashratesRepository from './HashratesRepository';
-import { RowDataPacket, escape } from 'mysql2';
+import { escape } from 'mysql2';
 import BlocksSummariesRepository from './BlocksSummariesRepository';
 import DifficultyAdjustmentsRepository from './DifficultyAdjustmentsRepository';
 import bitcoinClient from '../api/bitcoin/bitcoin-client';
@@ -478,7 +478,7 @@ class BlocksRepository {
   public async $getBlocksByPool(slug: string, startHeight?: number): Promise<BlockExtended[]> {
     const pool = await PoolsRepository.$getPool(slug);
     if (!pool) {
-      throw new Error('This mining pool does not exist');
+      throw new Error('This mining pool does not exist ' + escape(slug));
     }
 
     const params: any[] = [];
@@ -802,10 +802,10 @@ class BlocksRepository {
   /**
    * Get a list of blocks that have been indexed
    */
-  public async $getIndexedBlocks(): Promise<{ height: number, hash: string }[]> {
+  public async $getIndexedBlocks(): Promise<any[]> {
     try {
-      const [rows] = await DB.query(`SELECT height, hash FROM blocks ORDER BY height DESC`) as RowDataPacket[][];
-      return rows as { height: number, hash: string }[];
+      const [rows]: any = await DB.query(`SELECT height, hash FROM blocks ORDER BY height DESC`);
+      return rows;
     } catch (e) {
       logger.err('Cannot generate block size and weight history. Reason: ' + (e instanceof Error ? e.message : e));
       throw e;
@@ -815,7 +815,7 @@ class BlocksRepository {
   /**
    * Get a list of blocks that have not had CPFP data indexed
    */
-   public async $getCPFPUnindexedBlocks(): Promise<number[]> {
+   public async $getCPFPUnindexedBlocks(): Promise<any[]> {
     try {
       const blockchainInfo = await bitcoinClient.getBlockchainInfo();
       const currentBlockHeight = blockchainInfo.blocks;
@@ -825,13 +825,13 @@ class BlocksRepository {
       }
       const minHeight = Math.max(0, currentBlockHeight - indexingBlockAmount + 1);
 
-      const [rows] = await DB.query(`
+      const [rows]: any[] = await DB.query(`
         SELECT height
         FROM compact_cpfp_clusters
         WHERE height <= ? AND height >= ?
         GROUP BY height
         ORDER BY height DESC;
-      `, [currentBlockHeight, minHeight]) as RowDataPacket[][];
+      `, [currentBlockHeight, minHeight]);
 
       const indexedHeights = {};
       rows.forEach((row) => { indexedHeights[row.height] = true; });

backend/src/repositories/BlocksSummariesRepository.ts

@@ -1,4 +1,3 @@
-import { RowDataPacket } from 'mysql2';
 import DB from '../database';
 import logger from '../logger';
 import { BlockSummary, TransactionClassified } from '../mempool.interfaces';
@@ -70,7 +69,7 @@ class BlocksSummariesRepository {
 
   public async $getIndexedSummariesId(): Promise<string[]> {
     try {
-      const [rows] = await DB.query(`SELECT id from blocks_summaries`) as RowDataPacket[][];
+      const [rows]: any[] = await DB.query(`SELECT id from blocks_summaries`);
       return rows.map(row => row.id);
     } catch (e) {
       logger.err(`Cannot get block summaries id list. Reason: ` + (e instanceof Error ? e.message : e));

backend/src/repositories/HashratesRepository.ts

@@ -139,7 +139,7 @@ class HashratesRepository {
   public async $getPoolWeeklyHashrate(slug: string): Promise<any[]> {
     const pool = await PoolsRepository.$getPool(slug);
     if (!pool) {
-      throw new Error('This mining pool does not exist');
+      throw new Error('This mining pool does not exist ' + escape(slug));
     }
 
     // Find hashrate boundaries

backend/src/repositories/PricesRepository.ts

@@ -1,6 +1,5 @@
 import DB from '../database';
 import logger from '../logger';
-import config from '../config';
 import priceUpdater from '../tasks/price-updater';
 
 export interface ApiPrice {
@@ -12,81 +11,17 @@ export interface ApiPrice {
   CHF: number,
   AUD: number,
   JPY: number,
-  BGN: number,
-  BRL: number,
-  CNY: number,
-  CZK: number,
-  DKK: number,
-  HKD: number,
-  HRK: number,
-  HUF: number,
-  IDR: number,
-  ILS: number,
-  INR: number,
-  ISK: number,
-  KRW: number,
-  MXN: number,
-  MYR: number,
-  NOK: number,
-  NZD: number,
-  PHP: number,
-  PLN: number,
-  RON: number,
-  RUB: number,
-  SEK: number,
-  SGD: number,
-  THB: number,
-  TRY: number,
-  ZAR: number,
 }
-
-const ApiPriceFields = config.FIAT_PRICE.API_KEY ?
-    `
-      UNIX_TIMESTAMP(time) as time,
-      USD,
-      EUR,
-      GBP,
-      CAD,
-      CHF,
-      AUD,
-      JPY,
-      BGN,
-      BRL,
-      CNY,
-      CZK,
-      DKK,
-      HKD,
-      HRK,
-      HUF,
-      IDR,
-      ILS,
-      INR,
-      ISK,
-      KRW,
-      MXN,
-      MYR,
-      NOK,
-      NZD,
-      PHP,
-      PLN,
-      RON,
-      RUB,
-      SEK,
-      SGD,
-      THB,
-      TRY,
-      ZAR
-    `:
-    `
-      UNIX_TIMESTAMP(time) as time,
-      USD,
-      EUR,
-      GBP,
-      CAD,
-      CHF,
-      AUD,
-      JPY
-    `;
+const ApiPriceFields = `
+  UNIX_TIMESTAMP(time) as time,
+  USD,
+  EUR,
+  GBP,
+  CAD,
+  CHF,
+  AUD,
+  JPY
+`;
 
 export interface ExchangeRates {
   USDEUR: number,
@@ -95,32 +30,6 @@ export interface ExchangeRates {
   USDCHF: number,
   USDAUD: number,
   USDJPY: number,
-  USDBGN?: number,
-  USDBRL?: number,
-  USDCNY?: number,
-  USDCZK?: number,
-  USDDKK?: number,
-  USDHKD?: number,
-  USDHRK?: number,
-  USDHUF?: number,
-  USDIDR?: number,
-  USDILS?: number,
-  USDINR?: number,
-  USDISK?: number,
-  USDKRW?: number,
-  USDMXN?: number,
-  USDMYR?: number,
-  USDNOK?: number,
-  USDNZD?: number,
-  USDPHP?: number,
-  USDPLN?: number,
-  USDRON?: number,
-  USDRUB?: number,
-  USDSEK?: number,
-  USDSGD?: number,
-  USDTHB?: number,
-  USDTRY?: number,
-  USDZAR?: number,
 }
 
 export interface Conversion {
@@ -136,32 +45,6 @@ export const MAX_PRICES = {
   CHF: 100000000,
   AUD: 100000000,
   JPY: 10000000000,
-  BGN: 1000000000,
-  BRL: 1000000000,
-  CNY: 1000000000,
-  CZK: 10000000000,
-  DKK: 1000000000,
-  HKD: 1000000000,
-  HRK: 1000000000,
-  HUF: 10000000000,
-  IDR: 100000000000,
-  ILS: 1000000000,
-  INR: 10000000000,
-  ISK: 10000000000,
-  KRW: 100000000000,
-  MXN: 1000000000,
-  MYR: 1000000000,
-  NOK: 1000000000,
-  NZD: 1000000000,
-  PHP: 10000000000,
-  PLN: 1000000000,
-  RON: 1000000000,
-  RUB: 10000000000,
-  SEK: 1000000000,
-  SGD: 100000000,
-  THB: 10000000000,
-  TRY: 10000000000,
-  ZAR: 10000000000,
 };
 
 class PricesRepository {
@@ -181,49 +64,17 @@ class PricesRepository {
     }
     
     try {
-      if (!config.FIAT_PRICE.API_KEY) { // Store only the 7 main currencies
-          await DB.query(`
-          INSERT INTO prices(time,             USD, EUR, GBP, CAD, CHF, AUD, JPY)
-          VALUE             (FROM_UNIXTIME(?), ?,   ?,   ?,   ?,   ?,   ?,   ?  )`,
-          [time, prices.USD, prices.EUR, prices.GBP, prices.CAD, prices.CHF, prices.AUD, prices.JPY]
-        );
-      } else { // Store all 7 main currencies + all the currencies obtained with the external API
-        await DB.query(`
-          INSERT INTO prices(time,             USD, EUR, GBP, CAD, CHF, AUD, JPY, BGN, BRL, CNY, CZK, DKK, HKD, HRK, HUF, IDR, ILS, INR, ISK, KRW, MXN, MYR, NOK, NZD, PHP, PLN, RON, RUB, SEK, SGD, THB, TRY, ZAR)
-          VALUE             (FROM_UNIXTIME(?), ?,   ?,   ?,   ?,   ?,   ?,   ?,   ?  , ?,   ?,   ?,   ?,   ?,   ?,   ?,   ?  , ?,   ?,   ?,   ?,   ?,   ?,   ?,   ?,   ?,   ?,   ?,   ?,   ?,   ?,   ?,   ?  , ?  )`,
-          [time, prices.USD, prices.EUR, prices.GBP, prices.CAD, prices.CHF, prices.AUD, prices.JPY, prices.BGN, prices.BRL, prices.CNY, prices.CZK, prices.DKK, 
-                prices.HKD, prices.HRK, prices.HUF, prices.IDR, prices.ILS, prices.INR, prices.ISK, prices.KRW, prices.MXN, prices.MYR, prices.NOK, prices.NZD, 
-                prices.PHP, prices.PLN, prices.RON, prices.RUB, prices.SEK, prices.SGD, prices.THB, prices.TRY, prices.ZAR]
-        );
-      }
+      await DB.query(`
+        INSERT INTO prices(time,             USD, EUR, GBP, CAD, CHF, AUD, JPY)
+        VALUE             (FROM_UNIXTIME(?), ?,   ?,   ?,   ?,   ?,   ?,   ?  )`,
+        [time, prices.USD, prices.EUR, prices.GBP, prices.CAD, prices.CHF, prices.AUD, prices.JPY]
+      );
     } catch (e) {
       logger.err(`Cannot save exchange rate into db. Reason: ` + (e instanceof Error ? e.message : e));
       throw e;
     }
   }
 
-  public async $saveAdditionalCurrencyPrices(time: number, prices: ApiPrice, legacyCurrencies: string[]): Promise<void> {
-    try {
-      await DB.query(`
-        UPDATE prices
-        SET BGN = ?, BRL = ?, CNY = ?, CZK = ?, DKK = ?, HKD = ?, HRK = ?, HUF = ?, IDR = ?, ILS = ?, INR = ?, ISK = ?, KRW = ?, MXN = ?, MYR = ?, NOK = ?, NZD = ?, PHP = ?, PLN = ?, RON = ?, RUB = ?, SEK = ?, SGD = ?, THB = ?, TRY = ?, ZAR = ?
-        WHERE UNIX_TIMESTAMP(time) = ?`,
-        [prices.BGN, prices.BRL, prices.CNY, prices.CZK, prices.DKK, prices.HKD, prices.HRK, prices.HUF, prices.IDR, prices.ILS, prices.INR, prices.ISK, prices.KRW, prices.MXN, prices.MYR, prices.NOK, prices.NZD, prices.PHP, prices.PLN, prices.RON, prices.RUB, prices.SEK, prices.SGD, prices.THB, prices.TRY, prices.ZAR, time]
-      );
-      for (const currency of legacyCurrencies) {
-        await DB.query(`
-          UPDATE prices
-          SET ${currency} = ?
-          WHERE UNIX_TIMESTAMP(time) = ?`,
-          [prices[currency], time]
-        );
-      }
-    } catch (e) {
-      logger.err(`Cannot update exchange rate into db. Reason: ` + (e instanceof Error ? e.message : e));
-      throw e;
-    }
-  }
-
   public async $getOldestPriceTime(): Promise<number> {
     const [oldestRow] = await DB.query(`
       SELECT UNIX_TIMESTAMP(time) AS time
@@ -267,28 +118,6 @@ class PricesRepository {
     return times.map(time => time.time);
   }
 
-  public async $getPricesTimesWithMissingFields(): Promise<{time: number, USD: number, eur_missing: boolean, gbp_missing: boolean, cad_missing: boolean, chf_missing: boolean, aud_missing: boolean, jpy_missing: boolean}[]> {
-    const [times] = await DB.query(`
-      SELECT UNIX_TIMESTAMP(time) AS time, 
-             USD, 
-             CASE WHEN EUR = -1 THEN TRUE ELSE FALSE END AS eur_missing,
-             CASE WHEN GBP = -1 THEN TRUE ELSE FALSE END AS gbp_missing,
-             CASE WHEN CAD = -1 THEN TRUE ELSE FALSE END AS cad_missing,
-             CASE WHEN CHF = -1 THEN TRUE ELSE FALSE END AS chf_missing,
-             CASE WHEN AUD = -1 THEN TRUE ELSE FALSE END AS aud_missing,
-             CASE WHEN JPY = -1 THEN TRUE ELSE FALSE END AS jpy_missing
-      FROM prices
-      WHERE USD != -1 
-      AND -1 IN (EUR, GBP, CAD, CHF, AUD, JPY, BGN, BRL, CNY, CZK, DKK, HKD, HRK, HUF, IDR, ILS, INR, ISK, KRW, 
-                 MXN, MYR, NOK, NZD, PHP, PLN, RON, RUB, SEK, SGD, THB, TRY, ZAR)
-      ORDER BY time DESC
-    `);
-    if (!Array.isArray(times)) {
-      return [];
-    }
-    return times as {time: number, USD: number, eur_missing: boolean, gbp_missing: boolean, cad_missing: boolean, chf_missing: boolean, aud_missing: boolean, jpy_missing: boolean}[];
-  }
-
   public async $getPricesTimesAndId(): Promise<{time: number, id: number, USD: number}[]> {
     const [times] = await DB.query(`
       SELECT
@@ -315,7 +144,7 @@ class PricesRepository {
     return rates[0] as ApiPrice;
   }
 
-  public async $getNearestHistoricalPrice(timestamp: number | undefined, currency?: string): Promise<Conversion | null> {
+  public async $getNearestHistoricalPrice(timestamp: number | undefined): Promise<Conversion | null> {
     try {
       const [rates] = await DB.query(`
         SELECT ${ApiPriceFields}
@@ -329,91 +158,24 @@ class PricesRepository {
         throw Error(`Cannot get single historical price from the database`);
       }
 
-      const [latestPrices] = await DB.query(`
-        SELECT ${ApiPriceFields}
-        FROM prices
-        ORDER BY time DESC
-        LIMIT 1
-      `);
-      if (!Array.isArray(latestPrices)) {
-        throw Error(`Cannot get single historical price from the database`);
-      }      
-      
       // Compute fiat exchange rates
-      let latestPrice = latestPrices[0] as ApiPrice;
+      let latestPrice = rates[0] as ApiPrice;
       if (!latestPrice || latestPrice.USD === -1) {
         latestPrice = priceUpdater.getEmptyPricesObj();
       }
 
-      const computeFx = (usd: number, other: number): number => usd <= 0.05 ? 0 : Math.round(Math.max(other, 0) / usd * 100) / 100;
+      const computeFx = (usd: number, other: number): number =>
+        Math.round(Math.max(other, 0) / Math.max(usd, 1) * 100) / 100;
       
-      const exchangeRates: ExchangeRates = config.FIAT_PRICE.API_KEY ? 
-        {
-          USDEUR: computeFx(latestPrice.USD, latestPrice.EUR),
-          USDGBP: computeFx(latestPrice.USD, latestPrice.GBP),
-          USDCAD: computeFx(latestPrice.USD, latestPrice.CAD),
-          USDCHF: computeFx(latestPrice.USD, latestPrice.CHF),
-          USDAUD: computeFx(latestPrice.USD, latestPrice.AUD),
-          USDJPY: computeFx(latestPrice.USD, latestPrice.JPY),
-          USDBGN: computeFx(latestPrice.USD, latestPrice.BGN),
-          USDBRL: computeFx(latestPrice.USD, latestPrice.BRL),
-          USDCNY: computeFx(latestPrice.USD, latestPrice.CNY),
-          USDCZK: computeFx(latestPrice.USD, latestPrice.CZK),
-          USDDKK: computeFx(latestPrice.USD, latestPrice.DKK),
-          USDHKD: computeFx(latestPrice.USD, latestPrice.HKD),
-          USDHRK: computeFx(latestPrice.USD, latestPrice.HRK),
-          USDHUF: computeFx(latestPrice.USD, latestPrice.HUF),
-          USDIDR: computeFx(latestPrice.USD, latestPrice.IDR),
-          USDILS: computeFx(latestPrice.USD, latestPrice.ILS),
-          USDINR: computeFx(latestPrice.USD, latestPrice.INR),
-          USDISK: computeFx(latestPrice.USD, latestPrice.ISK),
-          USDKRW: computeFx(latestPrice.USD, latestPrice.KRW),
-          USDMXN: computeFx(latestPrice.USD, latestPrice.MXN),
-          USDMYR: computeFx(latestPrice.USD, latestPrice.MYR),
-          USDNOK: computeFx(latestPrice.USD, latestPrice.NOK),
-          USDNZD: computeFx(latestPrice.USD, latestPrice.NZD),
-          USDPHP: computeFx(latestPrice.USD, latestPrice.PHP),
-          USDPLN: computeFx(latestPrice.USD, latestPrice.PLN),
-          USDRON: computeFx(latestPrice.USD, latestPrice.RON),
-          USDRUB: computeFx(latestPrice.USD, latestPrice.RUB),
-          USDSEK: computeFx(latestPrice.USD, latestPrice.SEK),
-          USDSGD: computeFx(latestPrice.USD, latestPrice.SGD),
-          USDTHB: computeFx(latestPrice.USD, latestPrice.THB),
-          USDTRY: computeFx(latestPrice.USD, latestPrice.TRY),
-          USDZAR: computeFx(latestPrice.USD, latestPrice.ZAR),
-        } : {
-          USDEUR: computeFx(latestPrice.USD, latestPrice.EUR),
-          USDGBP: computeFx(latestPrice.USD, latestPrice.GBP),
-          USDCAD: computeFx(latestPrice.USD, latestPrice.CAD),
-          USDCHF: computeFx(latestPrice.USD, latestPrice.CHF),
-          USDAUD: computeFx(latestPrice.USD, latestPrice.AUD),
-          USDJPY: computeFx(latestPrice.USD, latestPrice.JPY),
+      const exchangeRates: ExchangeRates = {
+        USDEUR: computeFx(latestPrice.USD, latestPrice.EUR),
+        USDGBP: computeFx(latestPrice.USD, latestPrice.GBP),
+        USDCAD: computeFx(latestPrice.USD, latestPrice.CAD),
+        USDCHF: computeFx(latestPrice.USD, latestPrice.CHF),
+        USDAUD: computeFx(latestPrice.USD, latestPrice.AUD),
+        USDJPY: computeFx(latestPrice.USD, latestPrice.JPY),
       };
 
-      if (currency) {
-        if (!latestPrice[currency]) {
-          return null;
-        }
-        const filteredRates = rates.map((rate: any) => {
-          return {
-            time: rate.time,
-            [currency]: rate[currency],
-            ['USD']: rate['USD']
-          };
-        });
-        if (filteredRates.length === 0) { // No price data before 2010-07-19: add a fake entry
-          filteredRates.push({
-            time: 1279497600,
-            [currency]: 0,
-            ['USD']: 0
-          });
-        }
-        return {
-          prices: filteredRates as ApiPrice[],
-          exchangeRates: exchangeRates
-        };
-      }
-
       return {
         prices: rates as ApiPrice[],
         exchangeRates: exchangeRates
@@ -424,7 +186,7 @@ class PricesRepository {
     }
   }
 
-  public async $getHistoricalPrices(currency?: string): Promise<Conversion | null> {
+  public async $getHistoricalPrices(): Promise<Conversion | null> {
     try {
       const [rates] = await DB.query(`
         SELECT ${ApiPriceFields}
@@ -441,69 +203,18 @@ class PricesRepository {
         latestPrice = priceUpdater.getEmptyPricesObj();
       }
 
-      const computeFx = (usd: number, other: number): number => 
-        usd <= 0 ? 0 : Math.round(Math.max(other, 0) / usd * 100) / 100;
+      const computeFx = (usd: number, other: number): number =>
+        Math.round(Math.max(other, 0) / Math.max(usd, 1) * 100) / 100;
       
-      const exchangeRates: ExchangeRates = config.FIAT_PRICE.API_KEY ? 
-        {
-          USDEUR: computeFx(latestPrice.USD, latestPrice.EUR),
-          USDGBP: computeFx(latestPrice.USD, latestPrice.GBP),
-          USDCAD: computeFx(latestPrice.USD, latestPrice.CAD),
-          USDCHF: computeFx(latestPrice.USD, latestPrice.CHF),
-          USDAUD: computeFx(latestPrice.USD, latestPrice.AUD),
-          USDJPY: computeFx(latestPrice.USD, latestPrice.JPY),
-          USDBGN: computeFx(latestPrice.USD, latestPrice.BGN),
-          USDBRL: computeFx(latestPrice.USD, latestPrice.BRL),
-          USDCNY: computeFx(latestPrice.USD, latestPrice.CNY),
-          USDCZK: computeFx(latestPrice.USD, latestPrice.CZK),
-          USDDKK: computeFx(latestPrice.USD, latestPrice.DKK),
-          USDHKD: computeFx(latestPrice.USD, latestPrice.HKD),
-          USDHRK: computeFx(latestPrice.USD, latestPrice.HRK),
-          USDHUF: computeFx(latestPrice.USD, latestPrice.HUF),
-          USDIDR: computeFx(latestPrice.USD, latestPrice.IDR),
-          USDILS: computeFx(latestPrice.USD, latestPrice.ILS),
-          USDINR: computeFx(latestPrice.USD, latestPrice.INR),
-          USDISK: computeFx(latestPrice.USD, latestPrice.ISK),
-          USDKRW: computeFx(latestPrice.USD, latestPrice.KRW),
-          USDMXN: computeFx(latestPrice.USD, latestPrice.MXN),
-          USDMYR: computeFx(latestPrice.USD, latestPrice.MYR),
-          USDNOK: computeFx(latestPrice.USD, latestPrice.NOK),
-          USDNZD: computeFx(latestPrice.USD, latestPrice.NZD),
-          USDPHP: computeFx(latestPrice.USD, latestPrice.PHP),
-          USDPLN: computeFx(latestPrice.USD, latestPrice.PLN),
-          USDRON: computeFx(latestPrice.USD, latestPrice.RON),
-          USDRUB: computeFx(latestPrice.USD, latestPrice.RUB),
-          USDSEK: computeFx(latestPrice.USD, latestPrice.SEK),
-          USDSGD: computeFx(latestPrice.USD, latestPrice.SGD),
-          USDTHB: computeFx(latestPrice.USD, latestPrice.THB),
-          USDTRY: computeFx(latestPrice.USD, latestPrice.TRY),
-          USDZAR: computeFx(latestPrice.USD, latestPrice.ZAR),
-        } : {
-          USDEUR: computeFx(latestPrice.USD, latestPrice.EUR),
-          USDGBP: computeFx(latestPrice.USD, latestPrice.GBP),
-          USDCAD: computeFx(latestPrice.USD, latestPrice.CAD),
-          USDCHF: computeFx(latestPrice.USD, latestPrice.CHF),
-          USDAUD: computeFx(latestPrice.USD, latestPrice.AUD),
-          USDJPY: computeFx(latestPrice.USD, latestPrice.JPY),
+      const exchangeRates: ExchangeRates = {
+        USDEUR: computeFx(latestPrice.USD, latestPrice.EUR),
+        USDGBP: computeFx(latestPrice.USD, latestPrice.GBP),
+        USDCAD: computeFx(latestPrice.USD, latestPrice.CAD),
+        USDCHF: computeFx(latestPrice.USD, latestPrice.CHF),
+        USDAUD: computeFx(latestPrice.USD, latestPrice.AUD),
+        USDJPY: computeFx(latestPrice.USD, latestPrice.JPY),
       };
 
-      if (currency) {
-        if (!latestPrice[currency]) {
-          return null;
-        }
-        const filteredRates = rates.map((rate: any) => {
-          return {
-            time: rate.time,
-            [currency]: rate[currency],
-            ['USD']: rate['USD']
-          };
-        });
-        return {
-          prices: filteredRates as ApiPrice[],
-          exchangeRates: exchangeRates
-        };
-      }
-
       return {
         prices: rates as ApiPrice[],
         exchangeRates: exchangeRates

backend/src/rpc-api/commands.ts

@@ -11,7 +11,6 @@ module.exports = {
   encryptWallet: 'encryptwallet',
   estimateFee: 'estimatefee', // bitcoind v0.10.0x
   estimatePriority: 'estimatepriority', // bitcoind v0.10.0+
-  estimateSmartFee: 'estimatesmartfee',
   generate: 'generate', // bitcoind v0.11.0+
   getAccount: 'getaccount',
   getAccountAddress: 'getaccountaddress',

backend/src/tasks/price-feeds/free-currency-api.ts

@@ -1,73 +0,0 @@
-import { query } from '../../utils/axios-query';
-import { ConversionFeed, ConversionRates } from '../price-updater';
-
-const emptyRates = {
-  AUD: -1,
-  BGN: -1,
-  BRL: -1,
-  CAD: -1,
-  CHF: -1,
-  CNY: -1,
-  CZK: -1,
-  DKK: -1,
-  EUR: -1,
-  GBP: -1,
-  HKD: -1,
-  HRK: -1,
-  HUF: -1,
-  IDR: -1,
-  ILS: -1,
-  INR: -1,
-  ISK: -1,
-  JPY: -1,
-  KRW: -1,
-  MXN: -1,
-  MYR: -1,
-  NOK: -1,
-  NZD: -1,
-  PHP: -1,
-  PLN: -1,
-  RON: -1,
-  RUB: -1,
-  SEK: -1,
-  SGD: -1,
-  THB: -1,
-  TRY: -1,
-  USD: -1,
-  ZAR: -1,
-};
-
-class FreeCurrencyApi implements ConversionFeed {
-  private API_KEY: string;
-
-  constructor(apiKey: string) {
-    this.API_KEY = apiKey;
-  }
-
-  public async $getQuota(): Promise<any> {
-    const response = await query(`https://api.freecurrencyapi.com/v1/status?apikey=${this.API_KEY}`);
-    if (response && response['quotas']) {
-      return response['quotas'];
-    }
-    return null;
-  }
-
-  public async $fetchLatestConversionRates(): Promise<ConversionRates> {
-    const response = await query(`https://api.freecurrencyapi.com/v1/latest?apikey=${this.API_KEY}`);
-    if (response && response['data']) {
-      return response['data'];
-    }
-    return emptyRates;
-  }
-
-  public async $fetchConversionRates(date: string): Promise<ConversionRates> {
-    const response = await query(`https://api.freecurrencyapi.com/v1/historical?date=${date}&apikey=${this.API_KEY}`);
-    if (response && response['data'] && response['data'][date]) {
-      return response['data'][date];
-    }
-    return emptyRates;
-  }
-
-}
-
-export default FreeCurrencyApi;

backend/src/tasks/price-updater.ts

@@ -8,7 +8,6 @@ import BitflyerApi from './price-feeds/bitflyer-api';
 import CoinbaseApi from './price-feeds/coinbase-api';
 import GeminiApi from './price-feeds/gemini-api';
 import KrakenApi from './price-feeds/kraken-api';
-import FreeCurrencyApi from './price-feeds/free-currency-api';
 
 export interface PriceFeed {
   name: string;
@@ -24,16 +23,6 @@ export interface PriceHistory {
   [timestamp: number]: ApiPrice;
 }
 
-export interface ConversionFeed {
-  $getQuota(): Promise<any>;
-  $fetchLatestConversionRates(): Promise<ConversionRates>;
-  $fetchConversionRates(date: string): Promise<ConversionRates>;
-}
-
-export interface ConversionRates {
-  [currency: string]: number
-}
-
 function getMedian(arr: number[]): number {
   const sortedArr = arr.slice().sort((a, b) => a - b);
   const mid = Math.floor(sortedArr.length / 2);
@@ -44,9 +33,6 @@ function getMedian(arr: number[]): number {
 
 class PriceUpdater {
   public historyInserted = false;
-  private additionalCurrenciesHistoryInserted = false;
-  private additionalCurrenciesHistoryRunning = false;
-  private lastFailedHistoricalRun = 0;
   private timeBetweenUpdatesMs = 360_0000 / config.MEMPOOL.PRICE_UPDATES_PER_HOUR;
   private cyclePosition = -1;
   private firstRun = true;
@@ -56,10 +42,6 @@ class PriceUpdater {
   private feeds: PriceFeed[] = [];
   private currencies: string[] = ['USD', 'EUR', 'GBP', 'CAD', 'CHF', 'AUD', 'JPY'];
   private latestPrices: ApiPrice;
-  private currencyConversionFeed: ConversionFeed | undefined;
-  private newCurrencies: string[] = ['BGN', 'BRL', 'CNY', 'CZK', 'DKK', 'HKD', 'HRK', 'HUF', 'IDR', 'ILS', 'INR', 'ISK', 'KRW', 'MXN', 'MYR', 'NOK', 'NZD', 'PHP', 'PLN', 'RON', 'RUB', 'SEK', 'SGD', 'THB', 'TRY', 'ZAR'];
-  private lastTimeConversionsRatesFetched: number = 0;
-  private latestConversionsRatesFromFeed: ConversionRates = {};
   private ratesChangedCallback: ((rates: ApiPrice) => void) | undefined;
 
   constructor() {
@@ -71,7 +53,6 @@ class PriceUpdater {
     this.feeds.push(new BitfinexApi());
     this.feeds.push(new GeminiApi());
 
-    this.currencyConversionFeed = new FreeCurrencyApi(config.FIAT_PRICE.API_KEY);
     this.setCyclePosition();
   }
 
@@ -89,32 +70,6 @@ class PriceUpdater {
       CHF: -1,
       AUD: -1,
       JPY: -1,
-      BGN: -1,
-      BRL: -1,
-      CNY: -1,
-      CZK: -1,
-      DKK: -1,
-      HKD: -1,
-      HRK: -1,
-      HUF: -1,
-      IDR: -1,
-      ILS: -1,
-      INR: -1,
-      ISK: -1,
-      KRW: -1,
-      MXN: -1,
-      MYR: -1,
-      NOK: -1,
-      NZD: -1,
-      PHP: -1,
-      PLN: -1,
-      RON: -1,
-      RUB: -1,
-      SEK: -1,
-      SGD: -1,
-      THB: -1,
-      TRY: -1,
-      ZAR: -1,
     };
   }
 
@@ -144,23 +99,6 @@ class PriceUpdater {
     if ((Math.round(new Date().getTime() / 1000) - this.lastHistoricalRun) > 3600 * 24) {
       // Once a day, look for missing prices (could happen due to network connectivity issues)
       this.historyInserted = false;
-      this.additionalCurrenciesHistoryInserted = false;
-    }
-
-    if (this.lastFailedHistoricalRun > 0 && (Math.round(new Date().getTime() / 1000) - this.lastFailedHistoricalRun) > 60) {
-      // If the last attempt to insert missing prices failed, we try again after 60 seconds
-      this.additionalCurrenciesHistoryInserted = false;
-    }
-
-    if (config.FIAT_PRICE.API_KEY && this.currencyConversionFeed && (Math.round(new Date().getTime() / 1000) - this.lastTimeConversionsRatesFetched) > 3600 * 24) {
-      // Once a day, fetch conversion rates from api: we don't need more granularity for fiat currencies and have a limited number of requests
-      try {
-        this.latestConversionsRatesFromFeed = await this.currencyConversionFeed.$fetchLatestConversionRates();
-        this.lastTimeConversionsRatesFetched = Math.round(new Date().getTime() / 1000);
-        logger.debug(`Fetched currencies conversion rates from external API: ${JSON.stringify(this.latestConversionsRatesFromFeed)}`);
-      } catch (e) {
-        logger.err(`Cannot fetch conversion rates from the API. Reason: ${(e instanceof Error ? e.message : e)}`);
-      }
     }
 
     try {
@@ -168,10 +106,6 @@ class PriceUpdater {
       if (this.historyInserted === false && config.DATABASE.ENABLED === true) {
         await this.$insertHistoricalPrices();
       }
-      if (this.additionalCurrenciesHistoryInserted === false && config.DATABASE.ENABLED === true && config.FIAT_PRICE.API_KEY && !this.additionalCurrenciesHistoryRunning) {
-        await this.$insertMissingAdditionalPrices();
-      }
-
     } catch (e: any) {
       logger.err(`Cannot save BTC prices in db. Reason: ${e instanceof Error ? e.message : e}`, logger.tags.mining);
     }
@@ -251,14 +185,6 @@ class PriceUpdater {
       }
     }
 
-    if (config.FIAT_PRICE.API_KEY && this.latestPrices.USD > 0 && Object.keys(this.latestConversionsRatesFromFeed).length > 0) {
-      for (const conversionCurrency of this.newCurrencies) {
-        if (this.latestConversionsRatesFromFeed[conversionCurrency] > 0 && this.latestPrices.USD * this.latestConversionsRatesFromFeed[conversionCurrency] < MAX_PRICES[conversionCurrency]) {
-          this.latestPrices[conversionCurrency] = Math.round(this.latestPrices.USD * this.latestConversionsRatesFromFeed[conversionCurrency]);
-        }
-      }
-    }
-
     if (config.DATABASE.ENABLED === true && this.cyclePosition === 0) {
       // Save everything in db
       try {
@@ -327,7 +253,7 @@ class PriceUpdater {
     await this.$insertMissingRecentPrices('hour');
 
     this.historyInserted = true;
-    this.lastHistoricalRun = Math.round(new Date().getTime() / 1000);
+    this.lastHistoricalRun = new Date().getTime();
   }
 
   /**
@@ -394,83 +320,6 @@ class PriceUpdater {
       logger.debug(`Inserted ${totalInserted} ${type === 'day' ? 'dai' : 'hour'}ly historical prices into the db`, logger.tags.mining);
     }
   }
-
-  /**
-   * Find missing prices for additional currencies and insert them in the database
-   * We calculate the additional prices from the USD price and the conversion rates
-   */
-  private async $insertMissingAdditionalPrices(): Promise<void> {
-    this.lastFailedHistoricalRun = 0;
-    const priceTimesToFill = await PricesRepository.$getPricesTimesWithMissingFields();
-    if (priceTimesToFill.length === 0) {
-      return;
-    }
-    try {
-      const remainingQuota = await this.currencyConversionFeed?.$getQuota();
-      if (remainingQuota['month']['remaining'] < 500) { // We need some calls left for the daily updates
-        logger.debug(`Not enough currency API credit to insert missing prices in ${priceTimesToFill.length} rows (${remainingQuota['month']['remaining']} calls left).`, logger.tags.mining);
-        this.additionalCurrenciesHistoryInserted = true; // Do not try again until next day
-        return;
-      }
-    } catch (e) {
-      logger.err(`Cannot fetch currency API credit, insertion of missing prices aborted. Reason: ${(e instanceof Error ? e.message : e)}`);
-      return;
-    }
-
-    this.additionalCurrenciesHistoryRunning = true;
-    logger.debug(`Fetching missing conversion rates from external API to fill ${priceTimesToFill.length} rows`, logger.tags.mining);
-
-    let conversionRates: { [timestamp: number]: ConversionRates } = {};
-    let totalInserted = 0;
-
-    for (let i = 0; i < priceTimesToFill.length; i++) {
-      const priceTime = priceTimesToFill[i];
-      const missingLegacyCurrencies = this.getMissingLegacyCurrencies(priceTime); // In the case a legacy currency (EUR, GBP, CAD, CHF, AUD, JPY)
-      const year = new Date(priceTime.time * 1000).getFullYear();                 // is missing, we use the same process as for the new currencies
-      const month = new Date(priceTime.time * 1000).getMonth();
-      const yearMonthTimestamp = new Date(year, month, 1).getTime() / 1000;
-      if (conversionRates[yearMonthTimestamp] === undefined) {
-        conversionRates[yearMonthTimestamp] = await this.currencyConversionFeed?.$fetchConversionRates(`${year}-${month + 1 < 10 ? `0${month + 1}` : `${month + 1}`}-01`) || { USD: -1 };
-        if (conversionRates[yearMonthTimestamp]['USD'] < 0) {
-          logger.err(`Cannot fetch conversion rates from the API for ${year}-${month + 1 < 10 ? `0${month + 1}` : `${month + 1}`}-01. Aborting insertion of missing prices.`, logger.tags.mining);
-          this.lastFailedHistoricalRun = Math.round(new Date().getTime() / 1000);
-          break;
-        }
-      }
-
-      const prices: ApiPrice = this.getEmptyPricesObj();
-      
-      let willInsert = false;
-      for (const conversionCurrency of this.newCurrencies.concat(missingLegacyCurrencies)) {
-        if (conversionRates[yearMonthTimestamp][conversionCurrency] > 0 && priceTime.USD * conversionRates[yearMonthTimestamp][conversionCurrency] < MAX_PRICES[conversionCurrency]) {
-          prices[conversionCurrency] = year >= 2013 ? Math.round(priceTime.USD * conversionRates[yearMonthTimestamp][conversionCurrency]) : Math.round(priceTime.USD * conversionRates[yearMonthTimestamp][conversionCurrency] * 100) / 100;
-          willInsert = true;
-        } else {
-          prices[conversionCurrency] = 0;
-        }
-      }
-      
-      if (willInsert) {
-        await PricesRepository.$saveAdditionalCurrencyPrices(priceTime.time, prices, missingLegacyCurrencies);
-        ++totalInserted;
-      }
-    }
-
-    logger.debug(`Inserted ${totalInserted} missing additional currency prices into the db`, logger.tags.mining);
-    this.additionalCurrenciesHistoryInserted = true;
-    this.additionalCurrenciesHistoryRunning = false;
-  }
-
-  // Helper function to get legacy missing currencies in a row (EUR, GBP, CAD, CHF, AUD, JPY)
-  private getMissingLegacyCurrencies(priceTime: any): string[] {
-    const missingCurrencies: string[] = [];
-    ['eur', 'gbp', 'cad', 'chf', 'aud', 'jpy'].forEach(currency => {
-      if (priceTime[`${currency}_missing`]) {
-        missingCurrencies.push(currency.toUpperCase());
-      }
-    });
-    return missingCurrencies;
-  }
 }
 
 export default new PriceUpdater();

backend/src/utils/bitcoin-script.ts

@@ -1,203 +0,0 @@
-const opcodes = {
-  OP_FALSE: 0,
-  OP_0: 0,
-  OP_PUSHDATA1: 76,
-  OP_PUSHDATA2: 77,
-  OP_PUSHDATA4: 78,
-  OP_1NEGATE: 79,
-  OP_PUSHNUM_NEG1: 79,
-  OP_RESERVED: 80,
-  OP_TRUE: 81,
-  OP_1: 81,
-  OP_2: 82,
-  OP_3: 83,
-  OP_4: 84,
-  OP_5: 85,
-  OP_6: 86,
-  OP_7: 87,
-  OP_8: 88,
-  OP_9: 89,
-  OP_10: 90,
-  OP_11: 91,
-  OP_12: 92,
-  OP_13: 93,
-  OP_14: 94,
-  OP_15: 95,
-  OP_16: 96,
-  OP_PUSHNUM_1: 81,
-  OP_PUSHNUM_2: 82,
-  OP_PUSHNUM_3: 83,
-  OP_PUSHNUM_4: 84,
-  OP_PUSHNUM_5: 85,
-  OP_PUSHNUM_6: 86,
-  OP_PUSHNUM_7: 87,
-  OP_PUSHNUM_8: 88,
-  OP_PUSHNUM_9: 89,
-  OP_PUSHNUM_10: 90,
-  OP_PUSHNUM_11: 91,
-  OP_PUSHNUM_12: 92,
-  OP_PUSHNUM_13: 93,
-  OP_PUSHNUM_14: 94,
-  OP_PUSHNUM_15: 95,
-  OP_PUSHNUM_16: 96,
-  OP_NOP: 97,
-  OP_VER: 98,
-  OP_IF: 99,
-  OP_NOTIF: 100,
-  OP_VERIF: 101,
-  OP_VERNOTIF: 102,
-  OP_ELSE: 103,
-  OP_ENDIF: 104,
-  OP_VERIFY: 105,
-  OP_RETURN: 106,
-  OP_TOALTSTACK: 107,
-  OP_FROMALTSTACK: 108,
-  OP_2DROP: 109,
-  OP_2DUP: 110,
-  OP_3DUP: 111,
-  OP_2OVER: 112,
-  OP_2ROT: 113,
-  OP_2SWAP: 114,
-  OP_IFDUP: 115,
-  OP_DEPTH: 116,
-  OP_DROP: 117,
-  OP_DUP: 118,
-  OP_NIP: 119,
-  OP_OVER: 120,
-  OP_PICK: 121,
-  OP_ROLL: 122,
-  OP_ROT: 123,
-  OP_SWAP: 124,
-  OP_TUCK: 125,
-  OP_CAT: 126,
-  OP_SUBSTR: 127,
-  OP_LEFT: 128,
-  OP_RIGHT: 129,
-  OP_SIZE: 130,
-  OP_INVERT: 131,
-  OP_AND: 132,
-  OP_OR: 133,
-  OP_XOR: 134,
-  OP_EQUAL: 135,
-  OP_EQUALVERIFY: 136,
-  OP_RESERVED1: 137,
-  OP_RESERVED2: 138,
-  OP_1ADD: 139,
-  OP_1SUB: 140,
-  OP_2MUL: 141,
-  OP_2DIV: 142,
-  OP_NEGATE: 143,
-  OP_ABS: 144,
-  OP_NOT: 145,
-  OP_0NOTEQUAL: 146,
-  OP_ADD: 147,
-  OP_SUB: 148,
-  OP_MUL: 149,
-  OP_DIV: 150,
-  OP_MOD: 151,
-  OP_LSHIFT: 152,
-  OP_RSHIFT: 153,
-  OP_BOOLAND: 154,
-  OP_BOOLOR: 155,
-  OP_NUMEQUAL: 156,
-  OP_NUMEQUALVERIFY: 157,
-  OP_NUMNOTEQUAL: 158,
-  OP_LESSTHAN: 159,
-  OP_GREATERTHAN: 160,
-  OP_LESSTHANOREQUAL: 161,
-  OP_GREATERTHANOREQUAL: 162,
-  OP_MIN: 163,
-  OP_MAX: 164,
-  OP_WITHIN: 165,
-  OP_RIPEMD160: 166,
-  OP_SHA1: 167,
-  OP_SHA256: 168,
-  OP_HASH160: 169,
-  OP_HASH256: 170,
-  OP_CODESEPARATOR: 171,
-  OP_CHECKSIG: 172,
-  OP_CHECKSIGVERIFY: 173,
-  OP_CHECKMULTISIG: 174,
-  OP_CHECKMULTISIGVERIFY: 175,
-  OP_NOP1: 176,
-  OP_NOP2: 177,
-  OP_CHECKLOCKTIMEVERIFY: 177,
-  OP_CLTV: 177,
-  OP_NOP3: 178,
-  OP_CHECKSEQUENCEVERIFY: 178,
-  OP_CSV: 178,
-  OP_NOP4: 179,
-  OP_NOP5: 180,
-  OP_NOP6: 181,
-  OP_NOP7: 182,
-  OP_NOP8: 183,
-  OP_NOP9: 184,
-  OP_NOP10: 185,
-  OP_CHECKSIGADD: 186,
-  OP_PUBKEYHASH: 253,
-  OP_PUBKEY: 254,
-  OP_INVALIDOPCODE: 255,
-};
-// add unused opcodes
-for (let i = 187; i <= 255; i++) {
-  opcodes[`OP_RETURN_${i}`] = i;
-}
-
-export { opcodes };
-
-/** extracts m and n from a multisig script (asm), returns nothing if it is not a multisig script */
-export function parseMultisigScript(script: string): void | { m: number, n: number } {
-  if (!script) {
-    return;
-  }
-  const ops = script.split(' ');
-  if (ops.length < 3 || ops.pop() !== 'OP_CHECKMULTISIG') {
-    return;
-  }
-  const opN = ops.pop();
-  if (!opN) {
-    return;
-  }
-  if (!opN.startsWith('OP_PUSHNUM_')) {
-    return;
-  }
-  const n = parseInt(opN.match(/[0-9]+/)?.[0] || '', 10);
-  if (ops.length < n * 2 + 1) {
-    return;
-  }
-  // pop n public keys
-  for (let i = 0; i < n; i++) {
-    if (!/^0((2|3)\w{64}|4\w{128})$/.test(ops.pop() || '')) {
-      return;
-    }
-    if (!/^OP_PUSHBYTES_(33|65)$/.test(ops.pop() || '')) {
-      return;
-    }
-  }
-  const opM = ops.pop();
-  if (!opM) {
-    return;
-  }
-  if (!opM.startsWith('OP_PUSHNUM_')) {
-    return;
-  }
-  const m = parseInt(opM.match(/[0-9]+/)?.[0] || '', 10);
-
-  if (ops.length) {
-    return;
-  }
-
-  return { m, n };
-}
-
-export function getVarIntLength(n: number): number {
-  if (n < 0xfd) {
-    return 1;
-  } else if (n <= 0xffff) {
-    return 3;
-  } else if (n <= 0xffffffff) {
-    return 5;
-  } else {
-    return 9;
-  }
-}

backend/src/utils/secp256k1.ts

@@ -31,9 +31,6 @@ const curveP = BigInt(`0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
  * @returns {boolean} true if the point is on the SECP256K1 curve
  */
 export function isPoint(pointHex: string): boolean {
-  if (!pointHex?.length) {
-    return false;
-  }
   if (
     !(
       // is uncompressed

contributors/jamesblacklock.txt

@@ -1,3 +0,0 @@
-I hereby accept the terms of the Contributor License Agreement in the CONTRIBUTING.md file of the mempool/mempool git repository as of December 20, 2023.
-
-Signed: jamesblacklock

contributors/natsee.txt

@@ -1,3 +1,3 @@
 I hereby accept the terms of the Contributor License Agreement in the CONTRIBUTING.md file of the mempool/mempool git repository as of November 16, 2023.
 
-Signed: natsoni
+Signed: natsee

contributors/russeree.txt

@@ -1,3 +0,0 @@
-I hereby accept the terms of the Contributor License Agreement in the CONTRIBUTING.md file of the mempool/mempool git repository as of March 8, 2024.
-
-Signed: PortlandHODL

docker/README.md

@@ -109,6 +109,8 @@ Below we list all settings from `mempool-config.json` and the corresponding over
     "AUTOMATIC_BLOCK_REINDEXING": false,
     "POOLS_JSON_URL": "https://raw.githubusercontent.com/mempool/mining-pools/master/pools-v2.json",
     "POOLS_JSON_TREE_URL": "https://api.github.com/repos/mempool/mining-pools/git/trees/master",
+    "ADVANCED_GBT_AUDIT": false,
+    "ADVANCED_GBT_MEMPOOL": false,
     "CPFP_INDEXING": false,
     "MAX_BLOCKS_BULK_QUERY": 0,
     "DISK_CACHE_BLOCK_INTERVAL": 6,
@@ -140,6 +142,8 @@ Corresponding `docker-compose.yml` overrides:
       MEMPOOL_AUTOMATIC_BLOCK_REINDEXING: ""
       MEMPOOL_POOLS_JSON_URL: ""
       MEMPOOL_POOLS_JSON_TREE_URL: ""
+      MEMPOOL_ADVANCED_GBT_AUDIT: ""
+      MEMPOOL_ADVANCED_GBT_MEMPOOL: ""
       MEMPOOL_CPFP_INDEXING: ""
       MEMPOOL_MAX_BLOCKS_BULK_QUERY: ""
       MEMPOOL_DISK_CACHE_BLOCK_INTERVAL: ""
@@ -147,6 +151,8 @@ Corresponding `docker-compose.yml` overrides:
       ...
 ```
 
+`ADVANCED_GBT_AUDIT` AND `ADVANCED_GBT_MEMPOOL` enable a more accurate (but slower) block prediction algorithm for the block audit feature and the projected mempool-blocks respectively.
+
 `CPFP_INDEXING` enables indexing CPFP (Child Pays For Parent) information for the last `INDEXING_BLOCKS_AMOUNT` blocks.
 
 <br/>
@@ -323,6 +329,25 @@ Corresponding `docker-compose.yml` overrides:
 
 <br/>
 
+`mempool-config.json`:
+```json
+  "BISQ": {
+    "ENABLED": false,
+    "DATA_PATH": "/bisq/statsnode-data/btc_mainnet/db"
+  }
+```
+
+Corresponding `docker-compose.yml` overrides:
+```yaml
+  api:
+    environment:
+      BISQ_ENABLED: ""
+      BISQ_DATA_PATH: ""
+      ...
+```
+
+<br/>
+
 `mempool-config.json`:
 ```json
   "SOCKS5PROXY": {

docker/backend/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20.12.0-buster-slim AS builder
+FROM node:20.8.0-buster-slim AS builder
 
 ARG commitHash
 ENV MEMPOOL_COMMIT_HASH=${commitHash}
@@ -11,20 +11,13 @@ RUN apt-get install -y build-essential python3 pkg-config curl ca-certificates
 
 # Install Rust via rustup
 RUN CPU_ARCH=$(uname -m); if [ "$CPU_ARCH" = "armv7l" ]; then c_rehash; fi
-#RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable
-#Workaround to run on github actions from https://github.com/rust-lang/rustup/issues/2700#issuecomment-1367488985
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sed 's#/proc/self/exe#\/bin\/sh#g' | sh -s -- -y --default-toolchain stable
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable
 ENV PATH="/root/.cargo/bin:$PATH"
 
-COPY --from=backend . .
-COPY --from=rustgbt . ../rust/
-ENV FD=/build/rust-gbt
 RUN npm install --omit=dev --omit=optional
-
-WORKDIR /build
 RUN npm run package
 
-FROM node:20.12.0-buster-slim
+FROM node:20.8.0-buster-slim
 
 WORKDIR /backend
 

docker/backend/mempool-config.json

@@ -3,7 +3,6 @@
     "NETWORK": "__MEMPOOL_NETWORK__",
     "BACKEND": "__MEMPOOL_BACKEND__",
     "ENABLED": __MEMPOOL_ENABLED__,
-    "OFFICIAL": __MEMPOOL_OFFICIAL__,
     "HTTP_PORT": __MEMPOOL_HTTP_PORT__,
     "SPAWN_CLUSTER_PROCS": __MEMPOOL_SPAWN_CLUSTER_PROCS__,
     "API_URL_PREFIX": "__MEMPOOL_API_URL_PREFIX__",
@@ -26,8 +25,9 @@
     "GOGGLES_INDEXING": __MEMPOOL_GOGGLES_INDEXING__,
     "AUTOMATIC_BLOCK_REINDEXING": __MEMPOOL_AUTOMATIC_BLOCK_REINDEXING__,
     "AUDIT": __MEMPOOL_AUDIT__,
+    "ADVANCED_GBT_AUDIT": __MEMPOOL_ADVANCED_GBT_AUDIT__,
+    "ADVANCED_GBT_MEMPOOL": __MEMPOOL_ADVANCED_GBT_MEMPOOL__,
     "RUST_GBT": __MEMPOOL_RUST_GBT__,
-    "LIMIT_GBT": __MEMPOOL_LIMIT_GBT__,
     "CPFP_INDEXING": __MEMPOOL_CPFP_INDEXING__,
     "MAX_BLOCKS_BULK_QUERY": __MEMPOOL_MAX_BLOCKS_BULK_QUERY__,
     "DISK_CACHE_BLOCK_INTERVAL": __MEMPOOL_DISK_CACHE_BLOCK_INTERVAL__,
@@ -35,7 +35,7 @@
     "ALLOW_UNREACHABLE": __MEMPOOL_ALLOW_UNREACHABLE__,
     "POOLS_JSON_TREE_URL": "__MEMPOOL_POOLS_JSON_TREE_URL__",
     "POOLS_JSON_URL": "__MEMPOOL_POOLS_JSON_URL__",
-    "PRICE_UPDATES_PER_HOUR": __MEMPOOL_PRICE_UPDATES_PER_HOUR__,
+    "PRICE_UPDATES_PER_HOUR": __MEMPOOL_PRICE_UPDATES_PER_HOUR__
     "MAX_TRACKED_ADDRESSES": __MEMPOOL_MAX_TRACKED_ADDRESSES__
   },
   "CORE_RPC": {
@@ -79,8 +79,7 @@
     "USERNAME": "__DATABASE_USERNAME__",
     "PASSWORD": "__DATABASE_PASSWORD__",
     "TIMEOUT": __DATABASE_TIMEOUT__,
-    "PID_DIR": "__DATABASE_PID_DIR__",
-    "POOL_SIZE": __DATABASE_POOL_SIZE__
+    "PID_DIR": "__DATABASE_PID_DIR__"
   },
   "SYSLOG": {
     "ENABLED": __SYSLOG_ENABLED__,
@@ -93,6 +92,10 @@
     "ENABLED": __STATISTICS_ENABLED__,
     "TX_PER_SECOND_SAMPLE_PERIOD": __STATISTICS_TX_PER_SECOND_SAMPLE_PERIOD__
   },
+  "BISQ": {
+    "ENABLED": __BISQ_ENABLED__,
+    "DATA_PATH": "__BISQ_DATA_PATH__"
+  },
   "LIGHTNING": {
     "ENABLED": __LIGHTNING_ENABLED__,
     "BACKEND": "__LIGHTNING_BACKEND__",
@@ -124,7 +127,9 @@
     "MEMPOOL_API": "__EXTERNAL_DATA_SERVER_MEMPOOL_API__",
     "MEMPOOL_ONION": "__EXTERNAL_DATA_SERVER_MEMPOOL_ONION__",
     "LIQUID_API": "__EXTERNAL_DATA_SERVER_LIQUID_API__",
-    "LIQUID_ONION": "__EXTERNAL_DATA_SERVER_LIQUID_ONION__"
+    "LIQUID_ONION": "__EXTERNAL_DATA_SERVER_LIQUID_ONION__",
+    "BISQ_URL": "__EXTERNAL_DATA_SERVER_BISQ_URL__",
+    "BISQ_ONION": "__EXTERNAL_DATA_SERVER_BISQ_ONION__"
   },
   "MAXMIND": {
     "ENABLED": __MAXMIND_ENABLED__,
@@ -146,9 +151,5 @@
     "ENABLED": __REDIS_ENABLED__,
     "UNIX_SOCKET_PATH": "__REDIS_UNIX_SOCKET_PATH__",
     "BATCH_QUERY_BASE_SIZE": __REDIS_BATCH_QUERY_BASE_SIZE__
-  },
-  "FIAT_PRICE": {
-    "ENABLED": __FIAT_PRICE_ENABLED__,
-    "API_KEY": "__FIAT_PRICE_API_KEY__"
   }
 }

docker/backend/start.sh

@@ -4,7 +4,6 @@
 __MEMPOOL_NETWORK__=${MEMPOOL_NETWORK:=mainnet}
 __MEMPOOL_BACKEND__=${MEMPOOL_BACKEND:=electrum}
 __MEMPOOL_ENABLED__=${MEMPOOL_ENABLED:=true}
-__MEMPOOL_OFFICIAL__=${MEMPOOL_OFFICIAL:=false}
 __MEMPOOL_HTTP_PORT__=${BACKEND_HTTP_PORT:=8999}
 __MEMPOOL_SPAWN_CLUSTER_PROCS__=${MEMPOOL_SPAWN_CLUSTER_PROCS:=0}
 __MEMPOOL_API_URL_PREFIX__=${MEMPOOL_API_URL_PREFIX:=/api/v1/}
@@ -29,8 +28,9 @@ __MEMPOOL_AUTOMATIC_BLOCK_REINDEXING__=${MEMPOOL_AUTOMATIC_BLOCK_REINDEXING:=fal
 __MEMPOOL_POOLS_JSON_URL__=${MEMPOOL_POOLS_JSON_URL:=https://raw.githubusercontent.com/mempool/mining-pools/master/pools-v2.json}
 __MEMPOOL_POOLS_JSON_TREE_URL__=${MEMPOOL_POOLS_JSON_TREE_URL:=https://api.github.com/repos/mempool/mining-pools/git/trees/master}
 __MEMPOOL_AUDIT__=${MEMPOOL_AUDIT:=false}
+__MEMPOOL_ADVANCED_GBT_AUDIT__=${MEMPOOL_ADVANCED_GBT_AUDIT:=false}
+__MEMPOOL_ADVANCED_GBT_MEMPOOL__=${MEMPOOL_ADVANCED_GBT_MEMPOOL:=false}
 __MEMPOOL_RUST_GBT__=${MEMPOOL_RUST_GBT:=false}
-__MEMPOOL_LIMIT_GBT__=${MEMPOOL_LIMIT_GBT:=false}
 __MEMPOOL_CPFP_INDEXING__=${MEMPOOL_CPFP_INDEXING:=false}
 __MEMPOOL_MAX_BLOCKS_BULK_QUERY__=${MEMPOOL_MAX_BLOCKS_BULK_QUERY:=0}
 __MEMPOOL_DISK_CACHE_BLOCK_INTERVAL__=${MEMPOOL_DISK_CACHE_BLOCK_INTERVAL:=6}
@@ -55,7 +55,7 @@ __ELECTRUM_TLS_ENABLED__=${ELECTRUM_TLS_ENABLED:=false}
 
 # ESPLORA
 __ESPLORA_REST_API_URL__=${ESPLORA_REST_API_URL:=http://127.0.0.1:3000}
-__ESPLORA_UNIX_SOCKET_PATH__=${ESPLORA_UNIX_SOCKET_PATH:=""}
+__ESPLORA_UNIX_SOCKET_PATH__=${ESPLORA_UNIX_SOCKET_PATH:="null"}
 __ESPLORA_BATCH_QUERY_BASE_SIZE__=${ESPLORA_BATCH_QUERY_BASE_SIZE:=1000}
 __ESPLORA_RETRY_UNIX_SOCKET_AFTER__=${ESPLORA_RETRY_UNIX_SOCKET_AFTER:=30000}
 __ESPLORA_REQUEST_TIMEOUT__=${ESPLORA_REQUEST_TIMEOUT:=5000}
@@ -81,7 +81,6 @@ __DATABASE_USERNAME__=${DATABASE_USERNAME:=mempool}
 __DATABASE_PASSWORD__=${DATABASE_PASSWORD:=mempool}
 __DATABASE_TIMEOUT__=${DATABASE_TIMEOUT:=180000}
 __DATABASE_PID_DIR__=${DATABASE_PID_DIR:=""}
-__DATABASE_POOL_SIZE__=${DATABASE_POOL_SIZE:=100}
 
 # SYSLOG
 __SYSLOG_ENABLED__=${SYSLOG_ENABLED:=false}
@@ -94,6 +93,10 @@ __SYSLOG_FACILITY__=${SYSLOG_FACILITY:=local7}
 __STATISTICS_ENABLED__=${STATISTICS_ENABLED:=true}
 __STATISTICS_TX_PER_SECOND_SAMPLE_PERIOD__=${STATISTICS_TX_PER_SECOND_SAMPLE_PERIOD:=150}
 
+# BISQ
+__BISQ_ENABLED__=${BISQ_ENABLED:=false}
+__BISQ_DATA_PATH__=${BISQ_DATA_PATH:=/bisq/statsnode-data/btc_mainnet/db}
+
 # SOCKS5PROXY
 __SOCKS5PROXY_ENABLED__=${SOCKS5PROXY_ENABLED:=false}
 __SOCKS5PROXY_USE_ONION__=${SOCKS5PROXY_USE_ONION:=true}
@@ -107,6 +110,8 @@ __EXTERNAL_DATA_SERVER_MEMPOOL_API__=${EXTERNAL_DATA_SERVER_MEMPOOL_API:=https:/
 __EXTERNAL_DATA_SERVER_MEMPOOL_ONION__=${EXTERNAL_DATA_SERVER_MEMPOOL_ONION:=http://mempoolhqx4isw62xs7abwphsq7ldayuidyx2v2oethdhhj6mlo2r6ad.onion/api/v1}
 __EXTERNAL_DATA_SERVER_LIQUID_API__=${EXTERNAL_DATA_SERVER_LIQUID_API:=https://liquid.network/api/v1}
 __EXTERNAL_DATA_SERVER_LIQUID_ONION__=${EXTERNAL_DATA_SERVER_LIQUID_ONION:=http://liquidmom47f6s3m53ebfxn47p76a6tlnxib3wp6deux7wuzotdr6cyd.onion/api/v1}
+__EXTERNAL_DATA_SERVER_BISQ_URL__=${EXTERNAL_DATA_SERVER_BISQ_URL:=https://bisq.markets/api}
+__EXTERNAL_DATA_SERVER_BISQ_ONION__=${EXTERNAL_DATA_SERVER_BISQ_ONION:=http://bisqmktse2cabavbr2xjq7xw3h6g5ottemo5rolfcwt6aly6tp5fdryd.onion/api}
 
 # LIGHTNING
 __LIGHTNING_ENABLED__=${LIGHTNING_ENABLED:=false}
@@ -134,8 +139,8 @@ __MAXMIND_GEOLITE2_ASN__=${MAXMIND_GEOLITE2_ASN:="/backend/GeoIP/GeoLite2-ASN.mm
 __MAXMIND_GEOIP2_ISP__=${MAXMIND_GEOIP2_ISP:=""}
 
 # REPLICATION
-__REPLICATION_ENABLED__=${REPLICATION_ENABLED:=false}
-__REPLICATION_AUDIT__=${REPLICATION_AUDIT:=false}
+__REPLICATION_ENABLED__=${REPLICATION_ENABLED:=true}
+__REPLICATION_AUDIT__=${REPLICATION_AUDIT:=true}
 __REPLICATION_AUDIT_START_HEIGHT__=${REPLICATION_AUDIT_START_HEIGHT:=774000}
 __REPLICATION_SERVERS__=${REPLICATION_SERVERS:=[]}
 
@@ -148,16 +153,11 @@ __REDIS_ENABLED__=${REDIS_ENABLED:=false}
 __REDIS_UNIX_SOCKET_PATH__=${REDIS_UNIX_SOCKET_PATH:=true}
 __REDIS_BATCH_QUERY_BASE_SIZE__=${REDIS_BATCH_QUERY_BASE_SIZE:=5000}
 
-# FIAT_PRICE
-__FIAT_PRICE_ENABLED__=${FIAT_PRICE_ENABLED:=true}
-__FIAT_PRICE_API_KEY__=${FIAT_PRICE_API_KEY:=""}
-
 mkdir -p "${__MEMPOOL_CACHE_DIR__}"
 
 sed -i "s!__MEMPOOL_NETWORK__!${__MEMPOOL_NETWORK__}!g" mempool-config.json
 sed -i "s!__MEMPOOL_BACKEND__!${__MEMPOOL_BACKEND__}!g" mempool-config.json
 sed -i "s!__MEMPOOL_ENABLED__!${__MEMPOOL_ENABLED__}!g" mempool-config.json
-sed -i "s!__MEMPOOL_OFFICIAL__!${__MEMPOOL_OFFICIAL__}!g" mempool-config.json
 sed -i "s!__MEMPOOL_HTTP_PORT__!${__MEMPOOL_HTTP_PORT__}!g" mempool-config.json
 sed -i "s!__MEMPOOL_SPAWN_CLUSTER_PROCS__!${__MEMPOOL_SPAWN_CLUSTER_PROCS__}!g" mempool-config.json
 sed -i "s!__MEMPOOL_API_URL_PREFIX__!${__MEMPOOL_API_URL_PREFIX__}!g" mempool-config.json
@@ -182,8 +182,9 @@ sed -i "s!__MEMPOOL_AUTOMATIC_BLOCK_REINDEXING__!${__MEMPOOL_AUTOMATIC_BLOCK_REI
 sed -i "s!__MEMPOOL_POOLS_JSON_URL__!${__MEMPOOL_POOLS_JSON_URL__}!g" mempool-config.json
 sed -i "s!__MEMPOOL_POOLS_JSON_TREE_URL__!${__MEMPOOL_POOLS_JSON_TREE_URL__}!g" mempool-config.json
 sed -i "s!__MEMPOOL_AUDIT__!${__MEMPOOL_AUDIT__}!g" mempool-config.json
+sed -i "s!__MEMPOOL_ADVANCED_GBT_MEMPOOL__!${__MEMPOOL_ADVANCED_GBT_MEMPOOL__}!g" mempool-config.json
 sed -i "s!__MEMPOOL_RUST_GBT__!${__MEMPOOL_RUST_GBT__}!g" mempool-config.json
-sed -i "s!__MEMPOOL_LIMIT_GBT__!${__MEMPOOL_LIMIT_GBT__}!g" mempool-config.json
+sed -i "s!__MEMPOOL_ADVANCED_GBT_AUDIT__!${__MEMPOOL_ADVANCED_GBT_AUDIT__}!g" mempool-config.json
 sed -i "s!__MEMPOOL_CPFP_INDEXING__!${__MEMPOOL_CPFP_INDEXING__}!g" mempool-config.json
 sed -i "s!__MEMPOOL_MAX_BLOCKS_BULK_QUERY__!${__MEMPOOL_MAX_BLOCKS_BULK_QUERY__}!g" mempool-config.json
 sed -i "s!__MEMPOOL_DISK_CACHE_BLOCK_INTERVAL__!${__MEMPOOL_DISK_CACHE_BLOCK_INTERVAL__}!g" mempool-config.json
@@ -229,7 +230,6 @@ sed -i "s!__DATABASE_USERNAME__!${__DATABASE_USERNAME__}!g" mempool-config.json
 sed -i "s!__DATABASE_PASSWORD__!${__DATABASE_PASSWORD__}!g" mempool-config.json
 sed -i "s!__DATABASE_TIMEOUT__!${__DATABASE_TIMEOUT__}!g" mempool-config.json
 sed -i "s!__DATABASE_PID_DIR__!${__DATABASE_PID_DIR__}!g" mempool-config.json
-sed -i "s!__DATABASE_POOL_SIZE__!${__DATABASE_POOL_SIZE__}!g" mempool-config.json
 
 sed -i "s!__SYSLOG_ENABLED__!${__SYSLOG_ENABLED__}!g" mempool-config.json
 sed -i "s!__SYSLOG_HOST__!${__SYSLOG_HOST__}!g" mempool-config.json
@@ -240,6 +240,9 @@ sed -i "s!__SYSLOG_FACILITY__!${__SYSLOG_FACILITY__}!g" mempool-config.json
 sed -i "s!__STATISTICS_ENABLED__!${__STATISTICS_ENABLED__}!g" mempool-config.json
 sed -i "s!__STATISTICS_TX_PER_SECOND_SAMPLE_PERIOD__!${__STATISTICS_TX_PER_SECOND_SAMPLE_PERIOD__}!g" mempool-config.json
 
+sed -i "s!__BISQ_ENABLED__!${__BISQ_ENABLED__}!g" mempool-config.json
+sed -i "s!__BISQ_DATA_PATH__!${__BISQ_DATA_PATH__}!g" mempool-config.json
+
 sed -i "s!__SOCKS5PROXY_ENABLED__!${__SOCKS5PROXY_ENABLED__}!g" mempool-config.json
 sed -i "s!__SOCKS5PROXY_USE_ONION__!${__SOCKS5PROXY_USE_ONION__}!g" mempool-config.json
 sed -i "s!__SOCKS5PROXY_HOST__!${__SOCKS5PROXY_HOST__}!g" mempool-config.json
@@ -251,6 +254,8 @@ sed -i "s!__EXTERNAL_DATA_SERVER_MEMPOOL_API__!${__EXTERNAL_DATA_SERVER_MEMPOOL_
 sed -i "s!__EXTERNAL_DATA_SERVER_MEMPOOL_ONION__!${__EXTERNAL_DATA_SERVER_MEMPOOL_ONION__}!g" mempool-config.json
 sed -i "s!__EXTERNAL_DATA_SERVER_LIQUID_API__!${__EXTERNAL_DATA_SERVER_LIQUID_API__}!g" mempool-config.json
 sed -i "s!__EXTERNAL_DATA_SERVER_LIQUID_ONION__!${__EXTERNAL_DATA_SERVER_LIQUID_ONION__}!g" mempool-config.json
+sed -i "s!__EXTERNAL_DATA_SERVER_BISQ_URL__!${__EXTERNAL_DATA_SERVER_BISQ_URL__}!g" mempool-config.json
+sed -i "s!__EXTERNAL_DATA_SERVER_BISQ_ONION__!${__EXTERNAL_DATA_SERVER_BISQ_ONION__}!g" mempool-config.json
 
 # LIGHTNING
 sed -i "s!__LIGHTNING_ENABLED__!${__LIGHTNING_ENABLED__}!g" mempool-config.json
@@ -292,8 +297,4 @@ sed -i "s!__REDIS_ENABLED__!${__REDIS_ENABLED__}!g" mempool-config.json
 sed -i "s!__REDIS_UNIX_SOCKET_PATH__!${__REDIS_UNIX_SOCKET_PATH__}!g" mempool-config.json
 sed -i "s!__REDIS_BATCH_QUERY_BASE_SIZE__!${__REDIS_BATCH_QUERY_BASE_SIZE__}!g" mempool-config.json
 
-# FIAT_PRICE
-sed -i "s!__FIAT_PRICE_ENABLED__!${__FIAT_PRICE_ENABLED__}!g" mempool-config.json
-sed -i "s!__FIAT_PRICE_API_KEY__!${__FIAT_PRICE_API_KEY__}!g" mempool-config.json
-
 node /backend/package/index.js

docker/frontend/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20.12.0-buster-slim AS builder
+FROM node:20.8.0-buster-slim AS builder
 
 ARG commitHash
 ENV DOCKER_COMMIT_HASH=${commitHash}
@@ -13,7 +13,7 @@ RUN npm install --omit=dev --omit=optional
 
 RUN npm run build
 
-FROM nginx:1.25.4-alpine
+FROM nginx:1.24.0-alpine
 
 WORKDIR /patch
 

docker/frontend/entrypoint.sh

@@ -20,6 +20,8 @@ __TESTNET_ENABLED__=${TESTNET_ENABLED:=false}
 __SIGNET_ENABLED__=${SIGNET_ENABLED:=false}
 __LIQUID_ENABLED__=${LIQUID_ENABLED:=false}
 __LIQUID_TESTNET_ENABLED__=${LIQUID_TESTNET_ENABLED:=false}
+__BISQ_ENABLED__=${BISQ_ENABLED:=false}
+__BISQ_SEPARATE_BACKEND__=${BISQ_SEPARATE_BACKEND:=false}
 __ITEMS_PER_PAGE__=${ITEMS_PER_PAGE:=10}
 __KEEP_BLOCKS_AMOUNT__=${KEEP_BLOCKS_AMOUNT:=8}
 __NGINX_PROTOCOL__=${NGINX_PROTOCOL:=http}
@@ -30,6 +32,7 @@ __MEMPOOL_BLOCKS_AMOUNT__=${MEMPOOL_BLOCKS_AMOUNT:=8}
 __BASE_MODULE__=${BASE_MODULE:=mempool}
 __MEMPOOL_WEBSITE_URL__=${MEMPOOL_WEBSITE_URL:=https://mempool.space}
 __LIQUID_WEBSITE_URL__=${LIQUID_WEBSITE_URL:=https://liquid.network}
+__BISQ_WEBSITE_URL__=${BISQ_WEBSITE_URL:=https://bisq.markets}
 __MINING_DASHBOARD__=${MINING_DASHBOARD:=true}
 __LIGHTNING__=${LIGHTNING:=false}
 __AUDIT__=${AUDIT:=false}
@@ -37,15 +40,15 @@ __MAINNET_BLOCK_AUDIT_START_HEIGHT__=${MAINNET_BLOCK_AUDIT_START_HEIGHT:=0}
 __TESTNET_BLOCK_AUDIT_START_HEIGHT__=${TESTNET_BLOCK_AUDIT_START_HEIGHT:=0}
 __SIGNET_BLOCK_AUDIT_START_HEIGHT__=${SIGNET_BLOCK_AUDIT_START_HEIGHT:=0}
 __ACCELERATOR__=${ACCELERATOR:=false}
-__PUBLIC_ACCELERATIONS__=${PUBLIC_ACCELERATIONS:=false}
 __HISTORICAL_PRICE__=${HISTORICAL_PRICE:=true}
-__ADDITIONAL_CURRENCIES__=${ADDITIONAL_CURRENCIES:=false}
 
 # Export as environment variables to be used by envsubst
 export __TESTNET_ENABLED__
 export __SIGNET_ENABLED__
 export __LIQUID_ENABLED__
 export __LIQUID_TESTNET_ENABLED__
+export __BISQ_ENABLED__
+export __BISQ_SEPARATE_BACKEND__
 export __ITEMS_PER_PAGE__
 export __KEEP_BLOCKS_AMOUNT__
 export __NGINX_PROTOCOL__
@@ -56,6 +59,7 @@ export __MEMPOOL_BLOCKS_AMOUNT__
 export __BASE_MODULE__
 export __MEMPOOL_WEBSITE_URL__
 export __LIQUID_WEBSITE_URL__
+export __BISQ_WEBSITE_URL__
 export __MINING_DASHBOARD__
 export __LIGHTNING__
 export __AUDIT__
@@ -63,9 +67,7 @@ export __MAINNET_BLOCK_AUDIT_START_HEIGHT__
 export __TESTNET_BLOCK_AUDIT_START_HEIGHT__
 export __SIGNET_BLOCK_AUDIT_START_HEIGHT__
 export __ACCELERATOR__
-export __PUBLIC_ACCELERATIONS__
 export __HISTORICAL_PRICE__
-export __ADDITIONAL_CURRENCIES__
 
 folder=$(find /var/www/mempool -name "config.js" | xargs dirname)
 echo ${folder}

docker/init.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #backend
-cp -r ./docker/backend/* ./backend/
+cp ./docker/backend/* ./backend/
 
 #geoip-data
 mkdir -p ./backend/GeoIP/
@@ -13,8 +13,8 @@ localhostIP="127.0.0.1"
 cp ./docker/frontend/* ./frontend
 cp ./nginx.conf ./frontend/
 cp ./nginx-mempool.conf ./frontend/
-sed -i"" -e "s/${localhostIP}:80/0.0.0.0:__MEMPOOL_FRONTEND_HTTP_PORT__/g" ./frontend/nginx.conf
-sed -i"" -e "s/${localhostIP}/0.0.0.0/g" ./frontend/nginx.conf
-sed -i"" -e "s/user nobody;//g" ./frontend/nginx.conf
-sed -i"" -e "s!/etc/nginx/nginx-mempool.conf!/etc/nginx/conf.d/nginx-mempool.conf!g" ./frontend/nginx.conf
-sed -i"" -e "s/${localhostIP}:8999/__MEMPOOL_BACKEND_MAINNET_HTTP_HOST__:__MEMPOOL_BACKEND_MAINNET_HTTP_PORT__/g" ./frontend/nginx-mempool.conf
+sed -i "s/${localhostIP}:80/0.0.0.0:__MEMPOOL_FRONTEND_HTTP_PORT__/g" ./frontend/nginx.conf
+sed -i "s/${localhostIP}/0.0.0.0/g" ./frontend/nginx.conf
+sed -i "s/user nobody;//g" ./frontend/nginx.conf
+sed -i "s!/etc/nginx/nginx-mempool.conf!/etc/nginx/conf.d/nginx-mempool.conf!g" ./frontend/nginx.conf
+sed -i "s/${localhostIP}:8999/__MEMPOOL_BACKEND_MAINNET_HTTP_HOST__:__MEMPOOL_BACKEND_MAINNET_HTTP_PORT__/g" ./frontend/nginx-mempool.conf

frontend/.eslintrc

@@ -19,7 +19,6 @@
     "@typescript-eslint/no-this-alias": 1,
     "@typescript-eslint/no-var-requires": 1,
     "@typescript-eslint/explicit-function-return-type": 1,
-    "@typescript-eslint/no-unused-vars": 1,
     "no-case-declarations": 1,
     "no-console": 1,
     "no-constant-condition": 1,

frontend/.gitignore

@@ -6,13 +6,6 @@
 /out-tsc
 server.run.js
 
-# docker
-Dockerfile
-entrypoint.sh
-nginx-mempool.conf
-nginx.conf
-wait-for
-
 # Only exists if Bazel was run
 /bazel-out
 

frontend/README.md

@@ -22,13 +22,14 @@ cd mempool/frontend
 
 ### 2. Specify Website
 
-The same frontend codebase is used for https://mempool.space and https://liquid.network.
+The same frontend codebase is used for https://mempool.space, https://liquid.network and https://bisq.markets.
 
 Configure the frontend for the site you want by running the corresponding command:
 
 ```
 $ npm run config:defaults:mempool
 $ npm run config:defaults:liquid
+$ npm run config:defaults:bisq
 ```
 
 ### 3. Run the Frontend

frontend/angular.json

@@ -223,11 +223,11 @@
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "buildTarget": "mempool:build"
+            "browserTarget": "mempool:build"
           },
           "configurations": {
             "production": {
-              "buildTarget": "mempool:build:production"
+              "browserTarget": "mempool:build:production"
             },
             "local": {
               "proxyConfig": "proxy.conf.local.js",
@@ -264,7 +264,7 @@
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "buildTarget": "mempool:build"
+            "browserTarget": "mempool:build"
           }
         },
         "e2e": {
@@ -280,56 +280,6 @@
             }
           }
         },
-        "server": {
-          "builder": "@angular-devkit/build-angular:server",
-          "options": {
-            "outputPath": "dist/mempool/server",
-            "main": "server.ts",
-            "tsConfig": "tsconfig.server.json"
-          },
-          "configurations": {
-            "production": {
-              "outputHashing": "media",
-              "fileReplacements": [
-                {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.prod.ts"
-                }
-              ],
-              "sourceMap": false,
-              "localize": true,
-              "optimization": false
-            }
-          }
-        },
-        "serve-ssr": {
-          "builder": "@angular-devkit/build-angular:ssr-dev-server",
-          "options": {
-            "browserTarget": "mempool:build",
-            "serverTarget": "mempool:server"
-          },
-          "configurations": {
-            "production": {
-              "browserTarget": "mempool:build:production",
-              "serverTarget": "mempool:server:production",
-              "optimization": false,
-              "sourceMap": true
-            }
-          }
-        },
-        "prerender": {
-          "builder": "@angular-devkit/build-angular:prerender",
-          "options": {
-            "browserTarget": "mempool:build:production",
-            "serverTarget": "mempool:server:production",
-            "routes": [
-              "/"
-            ]
-          },
-          "configurations": {
-            "production": {}
-          }
-        },
         "cypress-run": {
           "builder": "@cypress/schematic:cypress",
           "options": {

frontend/cypress/e2e/bisq/bisq.spec.ts

@@ -0,0 +1,164 @@
+describe('Bisq', () => {
+  const baseModule = Cypress.env('BASE_MODULE');
+  const basePath = '';
+
+  beforeEach(() => {
+    cy.intercept('/sockjs-node/info*').as('socket');
+    cy.intercept('/bisq/api/markets/hloc?market=btc_usd&interval=day').as('hloc');
+    cy.intercept('/bisq/api/markets/ticker').as('ticker');
+    cy.intercept('/bisq/api/markets/markets').as('markets');
+    cy.intercept('/bisq/api/markets/volumes/7d').as('7d');
+    cy.intercept('/bisq/api/markets/trades?market=all').as('trades');
+    cy.intercept('/bisq/api/txs/*/*').as('txs');
+    cy.intercept('/bisq/api/blocks/*/*').as('blocks');
+    cy.intercept('/bisq/api/stats').as('stats');
+  });
+
+  if (baseModule === 'bisq') {
+    it('loads the dashboard', () => {
+      cy.visit(`${basePath}`);
+      cy.waitForSkeletonGone();
+    });
+
+    describe('transactions', () => {
+      it('loads the transactions screen', () => {
+        cy.visit(`${basePath}`);
+        cy.waitForSkeletonGone();
+        cy.get('#btn-transactions').click().then(() => {
+          cy.get('.table > tr').should('have.length', 50);
+        });
+      });
+
+      const filters = [
+        'Asset listing fee', 'Blind vote', 'Compensation request',
+        'Genesis', 'Irregular', 'Lockup', 'Pay trade fee', 'Proof of burn',
+        'Proposal', 'Reimbursement request', 'Transfer BSQ', 'Unlock', 'Vote reveal'
+      ];
+      filters.forEach((filter) => {
+        it.only(`filters the transaction screen by ${filter}`, () => {
+          cy.visit(`${basePath}/transactions`);
+          cy.wait('@txs');
+          cy.waitForSkeletonGone();
+          cy.get('#filter').click();
+          cy.contains(filter).find('input').click();
+          cy.wait('@txs');
+          cy.wait(500);
+          cy.get('td:nth-of-type(2)').each(($td) => {
+            expect($td.text().trim()).to.eq(filter);
+          });
+        });
+      });
+
+      it('filters using multiple criteria', () => {
+        const filters = ['Proposal', 'Lockup', 'Unlock'];
+        cy.visit(`${basePath}/transactions`);
+        cy.waitForSkeletonGone();
+        cy.get('#filter').click();
+        filters.forEach((filter) => {
+          cy.contains(filter).find('input').click();
+          //TODO: change this waiter
+          cy.wait(1500);
+        });
+        cy.get('td:nth-of-type(2)').each(($td) => {
+          const regex = new RegExp(`${filters.join('|')}`, 'g');
+          expect($td.text().trim()).to.match(regex);
+        });
+      });
+
+      const transactions = [
+        { type: 'Asset listing fee', txid: '3548aa0c002b015ea700072b7d7d76d45d4f10a3573804d0d2f624c0bb255b6b' },
+        { type: 'Blind vote', txid: 'f8fabb95efa1bb81325e4c961b9fc7e3508a9b9ecd4eddf1400e58867eff8d92' },
+        { type: 'Compensation request', txid: 'a8cdc65fe6bb8730f5f89f99f779d0469b0a493e1ae570e20eb7afda696a18a9' },
+        { type: 'Genesis', txid: '4b5417ec5ab6112bedf539c3b4f5a806ed539542d8b717e1c4470aa3180edce5' },
+        { type: 'Irregular', txid: '90b06684a517388fec2237e2362a29810dc82f0e13e019c84747ec27051e6c53' },
+        { type: 'Lockup', txid: '365425b3b7487229e2ba598fb8f2a9e359e3351620383e5018548649a28b78c4' },
+        { type: 'Pay trade fee', txid: 'a66b30e9777e16572ab36723539df8f45bd5d8130d810b2c3d75b8c02a191eaf' },
+        { type: 'Proof of burn', txid: '8325ccb87065fb9243ed9ff1cbb431fc2ac5060a60433bcde474ccbd97b76dcb' },
+        { type: 'Proposal', txid: '34e2a20f045c82fbcf7cb191b42dea6fba45641777e1751ffb29d3981c4bf413' },
+        { type: 'Reimbursement request', txid: '04c16c79ca6b9ec9978880024b0d0ad3100020f33286b63c85ca7b1a319421ae' },
+        { type: 'Transfer BSQ', txid: '64500bd9220675ad30d5ace27de95a341a498d7eda08162ee0ce7feb8c56cb14' },
+        { type: 'Unlock', txid: '5a756841bbb11137d15b0082a3fcadbe102791f41a95d661d3bd0c5ad0b3b1a3' },
+        { type: 'Vote reveal', txid: 'bd7daae1d4af8837db5e47d7bd9d8b9f83dcfd35d112f85e90728b9be45191f7' }
+      ];
+
+      transactions.forEach((transaction) => {
+        it(`loads a "${transaction.type}" transaction`, () => {
+          cy.visit(`${basePath}/tx/${transaction.txid}`);
+          cy.waitForSkeletonGone();
+        });
+      });
+    });
+
+    describe('blocks', () => {
+      it('loads the blocks screen', () => {
+        cy.visit(`${basePath}`);
+        cy.waitForSkeletonGone();
+        cy.get('#btn-blocks').click().then(() => {
+          cy.wait('@blocks');
+          cy.get('tbody tr').should('have.length', 10);
+        });
+      });
+
+      it('loads a specific block', () => {
+        cy.visit(`${basePath}/block/0000000000000000000137ef33faa63bc6e809ab30932cf77d454fb36d2bd83a`);
+        cy.waitForSkeletonGone();
+      });
+
+    });
+
+    describe('markets', () => {
+      it('loads the markets screen', () => {
+        cy.visit(`${basePath}/markets`);
+        cy.waitForSkeletonGone();
+      });
+
+      it('loads a specific market', () => {
+        cy.visit(`${basePath}/market/btc_eur`);
+        cy.waitForSkeletonGone();
+        //Buy Offers
+        cy.get('.row > :nth-child(1) td').should('have.length.at.least', 1);
+        //Sell offers
+        cy.get('.row > :nth-child(1) td').should('have.length.at.least', 1);
+        //Trades
+        cy.get('app-bisq-trades > .table-container td').should('have.length.at.least', 1);
+      });
+    });
+
+    it('loads the stats screen', () => {
+      cy.visit(`${basePath}`);
+      cy.waitForSkeletonGone();
+      cy.get('#btn-stats').click().then(() => {
+        cy.wait('@stats');
+      });
+    });
+
+    it('loads the api screen', () => {
+      cy.visit(`${basePath}`);
+      cy.waitForSkeletonGone();
+      cy.get('#btn-docs').click().then(() => {
+        cy.get('.section-header').should('have.length.at.least', 1);
+        cy.get('.endpoint-container').should('have.length.at.least', 1);
+      });
+    });
+
+    it('shows blocks pagination with 5 pages (desktop)', () => {
+      cy.viewport(760, 800);
+      cy.visit(`${basePath}/blocks`);
+      cy.waitForSkeletonGone();
+      cy.get('tbody tr').should('have.length', 10);
+      // 5 pages + 4 buttons = 9 buttons
+      cy.get('.pagination-container ul.pagination').first().children().should('have.length', 9);
+    });
+
+    it('shows blocks pagination with 3 pages (mobile)', () => {
+      cy.viewport(669, 800);
+      cy.visit(`${basePath}/blocks`);
+      cy.waitForSkeletonGone();
+      cy.get('tbody tr').should('have.length', 10);
+      // 3 pages + 4 buttons = 7 buttons
+      cy.get('.pagination-container ul.pagination').first().children().should('have.length', 7);
+    });
+  } else {
+    it.skip(`Tests cannot be run on the selected BASE_MODULE ${baseModule}`);
+  }
+});

frontend/cypress/e2e/liquid/liquid.spec.ts

@@ -1,4 +1,4 @@
-describe('Liquid', () => {
+describe.skip('Liquid', () => {
   const baseModule = Cypress.env('BASE_MODULE');
   const basePath = '';
 
@@ -23,13 +23,6 @@ describe('Liquid', () => {
       cy.get('#mempool-block-0 > .blockLink').should('exist');
     });
 
-    it('load first mempool block after skeleton loads', () => {
-      cy.visit(`${basePath}`);
-      cy.waitForSkeletonGone();
-      cy.get('#mempool-block-0 > .blockLink').click();
-      cy.waitForSkeletonGone();
-    });
-
     it('loads the dashboard', () => {
       cy.visit(`${basePath}`);
       cy.waitForSkeletonGone();
@@ -91,11 +84,10 @@ describe('Liquid', () => {
         cy.waitForSkeletonGone();
         //TODO: Change to an element id so we don't assert on a string
         cy.get('.table-tx-vin').should('contain', 'Peg-in');
-        //Remove the target=_blank attribute so the new url opens in the same tab
-        cy.get('.table-tx-vin a').invoke('removeAttr', 'target').click().then(() => {
+        cy.get('.table-tx-vin a').click().then(() => {
           cy.waitForSkeletonGone();
           if (baseModule === 'liquid') {
-            cy.url().should('eq', 'https://mempool.space/tx/f148c0d854db4174ea420655235f910543f0ec3680566dcfdf84fb0a1697b592#vout=0');
+            cy.url().should('eq', 'https://mempool.space/tx/f148c0d854db4174ea420655235f910543f0ec3680566dcfdf84fb0a1697b592');
           } else {
             //TODO: Use an environment variable to get the hostname
             cy.url().should('eq', 'http://localhost:4200/tx/f148c0d854db4174ea420655235f910543f0ec3680566dcfdf84fb0a1697b592');
@@ -106,8 +98,7 @@ describe('Liquid', () => {
       it('loads peg out addresses', () => {
         cy.visit(`${basePath}/tx/ecf6eba04ffb3946faa172343c87162df76f1a57b07b0d6dc6ad956b13376dc8`);
         cy.waitForSkeletonGone();
-        //Remove the target=_blank attribute so the new url opens in the same tab
-        cy.get('.table-tx-vout a').first().invoke('removeAttr', 'target').click().then(() => {
+        cy.get('.table-tx-vout a').first().click().then(() => {
           cy.waitForSkeletonGone();
           if (baseModule === 'liquid') {
             cy.url().should('eq', 'https://mempool.space/address/1BxoGcMg14oaH3CwHD2hF4gU9VcfgX5yoR');

frontend/cypress/e2e/liquidtestnet/liquidtestnet.spec.ts

@@ -1,4 +1,4 @@
-describe('Liquid Testnet', () => {
+describe.skip('Liquid Testnet', () => {
   const baseModule = Cypress.env('BASE_MODULE');
   const basePath = '/testnet';
 
@@ -28,17 +28,6 @@ describe('Liquid Testnet', () => {
       cy.waitForSkeletonGone();
     });
 
-    it.skip('loads the dashboard with no scrollbars on mobile', () => {
-      cy.viewport('iphone-xr');
-      cy.visit(`${basePath}`);
-      cy.waitForSkeletonGone();
-      cy.window().then(window => {
-        const htmlWidth = Cypress.$('html')[0].scrollWidth;
-        const scrollBarWidth = window.innerWidth - htmlWidth;
-        expect(scrollBarWidth).to.be.eq(0);  //check for no horizontal scrollbar
-      });
-    });
-
     it('loads the blocks page', () => {
       cy.visit(`${basePath}`)
       cy.get('#btn-blocks');
@@ -68,14 +57,17 @@ describe('Liquid Testnet', () => {
       cy.get('.tv-only').should('not.exist');
     });
 
-    it.skip('renders unconfidential transactions correctly on mobile', () => {
-      cy.viewport('iphone-xr');
-      cy.visit(`${basePath}/tx/b119f338878416781dc285b94c0de52826341dea43566e4de4740d3ebfd1f6dc#blinded=99707,144c654344aa716d6f3abcc1ca90e5641e4e2a7f633bc09fe3baf64585819a49,1377e4ec8eb0c89296e14ffca57e377f4b51ad8f1c881e43364434d8430dbfda,cdd6caae4c3452586cfcb107478dd2b7acaa5f82714a6a966578255e857eee60`);
+    it.skip('renders unconfidential addresses correctly on mobile', () => {
+      cy.viewport('iphone-6');
+      cy.visit(`${basePath}/address/__TODO__`);
       cy.waitForSkeletonGone();
-      cy.window().then(window => {
-        const htmlWidth = Cypress.$('html')[0].scrollWidth;
-        const scrollBarWidth = window.innerWidth - htmlWidth;
-        expect(scrollBarWidth).to.be.eq(0);  //check for no horizontal scrollbar
+      //TODO: Add proper IDs for these selectors
+      const firstRowSelector = '.container-xl > :nth-child(3) > div > :nth-child(1) > .table > tbody';
+      const thirdRowSelector = '.container-xl > :nth-child(3) > div > :nth-child(3)';
+      cy.get(firstRowSelector).invoke('css', 'width').then(firstRowWidth => {
+        cy.get(thirdRowSelector).invoke('css', 'width').then(thirdRowWidth => {
+          expect(parseInt(firstRowWidth)).to.be.lessThan(parseInt(thirdRowWidth));
+        });
       });
     });
 

frontend/cypress/e2e/mainnet/mainnet.spec.ts

@@ -67,7 +67,7 @@ describe('Mainnet', () => {
       cy.get('[id^="bitcoin-block-"]').should('have.length', 22);
       cy.get('.footer').should('be.visible');
       cy.get('.row > :nth-child(1)').invoke('text').then((text) => {
-        expect(text).to.match(/Incoming Transactions.* vB\/s/);
+        expect(text).to.match(/Incoming transactions.* vB\/s/);
       });
       cy.get('.row > :nth-child(2)').invoke('text').then((text) => {
         expect(text).to.match(/Unconfirmed:(.*)/);

frontend/cypress/support/commands.ts

@@ -72,11 +72,13 @@ Cypress.Commands.add('mockMempoolSocket', () => {
   mockWebSocket();
 });
 
-Cypress.Commands.add('changeNetwork', (network: "testnet" | "signet" | "liquid" | "mainnet") => {
+Cypress.Commands.add('changeNetwork', (network: "testnet" | "signet" | "liquid" | "bisq" | "mainnet") => {
   cy.get('.dropdown-toggle').click().then(() => {
     cy.get(`a.${network}`).click().then(() => {
       cy.waitForPageIdle();
-      cy.waitForSkeletonGone();
+      if (network !== 'bisq') {
+        cy.waitForSkeletonGone();
+      }
     });
   });
 });

frontend/cypress/support/index.d.ts

@@ -5,6 +5,6 @@ declare namespace Cypress {
         waitForSkeletonGone(): Chainable<any>
         waitForPageIdle(): Chainable<any>
         mockMempoolSocket(): Chainable<any>
-        changeNetwork(network: "testnet"|"signet"|"liquid"|"mainnet"): Chainable<any>
+        changeNetwork(network: "testnet"|"signet"|"liquid"|"bisq"|"mainnet"): Chainable<any>
     }
 }