Bump version number to v2.1.2

.github/FUNDING.yml

@@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl
 liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
-custom: ['https://mempool.space/sponsor'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+custom: ['https://mempool.space/about'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/cypress.yml

@@ -1,77 +0,0 @@
-name: Cypress Tests
-
-on: [push, pull_request]
-
-jobs:
-  cypress:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        containers: [1, 2, 3, 4, 5]
-        os: ["ubuntu-latest"]
-        browser: [chrome]
-    name: E2E tests on ${{ matrix.browser }} - ${{ matrix.os }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: ${{ matrix.browser }} browser tests (Mempool)
-        uses: cypress-io/github-action@v2
-        with:
-          working-directory: frontend
-          build: npm run config:defaults:mempool
-          start: npm run start:local-prod
-          wait-on: 'http://localhost:4200'
-          wait-on-timeout: 120
-          record: true
-          parallel: true
-          env: BASE_MODULE=mempool
-          group: Tests on ${{ matrix.browser }} (Mempool)
-          browser: ${{ matrix.browser }}
-          ci-build-id: '${{ github.sha }}-${{ github.workflow }}-${{ github.event_name }}'
-        env:
-          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CYPRESS_PROJECT_ID: ${{ secrets.CYPRESS_PROJECT_ID }}
-
-      - name: ${{ matrix.browser }} browser tests (Liquid)
-        uses: cypress-io/github-action@v2
-        if: always()
-        with:
-          working-directory: frontend
-          build: npm run config:defaults:liquid
-          start: npm run start:local-prod
-          wait-on: 'http://localhost:4200'
-          wait-on-timeout: 120
-          record: true
-          parallel: true
-          spec: cypress/integration/liquid/liquid.spec.ts
-          env: BASE_MODULE=liquid
-          group: Tests on ${{ matrix.browser }} (Liquid)
-          browser: ${{ matrix.browser }}
-          ci-build-id: '${{ github.sha }}-${{ github.workflow }}-${{ github.event_name }}'
-        env:
-          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CYPRESS_PROJECT_ID: ${{ secrets.CYPRESS_PROJECT_ID }}
-
-      - name: ${{ matrix.browser }} browser tests (Bisq)
-        uses: cypress-io/github-action@v2
-        if: always()
-        with:
-          working-directory: frontend
-          build: npm run config:defaults:bisq
-          start: npm run start:local-prod
-          wait-on: 'http://localhost:4200'
-          wait-on-timeout: 120
-          record: true
-          parallel: true
-          spec: cypress/integration/bisq/bisq.spec.ts
-          env: BASE_MODULE=bisq
-          group: Tests on ${{ matrix.browser }} (Bisq)
-          browser: ${{ matrix.browser }}
-          ci-build-id: '${{ github.sha }}-${{ github.workflow }}-${{ github.event_name }}'
-        env:
-          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CYPRESS_PROJECT_ID: ${{ secrets.CYPRESS_PROJECT_ID }}

.github/workflows/on-tag.yml

@@ -27,9 +27,6 @@ jobs:
       - name: Show set environment variables
         run: |
           printf "      TAG: %s\n"  "$TAG"
-      
-      - name: Add SHORT_SHA env property with commit short sha
-        run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
 
       - name: Login to Docker for building
         run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
@@ -67,6 +64,14 @@ jobs:
           --cache-to "type=local,dest=/tmp/.buildx-cache" \
           --platform linux/amd64,linux/arm64,linux/arm/v7 \
           --tag ${{ secrets.DOCKER_HUB_USER }}/${{ matrix.service }}:$TAG \
+          --output "type=registry" ./${{ matrix.service }}/
+
+      - name: Run Docker buildx for ${{ matrix.service }} against latest
+        run: |
+          docker buildx build \
+          --cache-from "type=local,src=/tmp/.buildx-cache" \
+          --cache-to "type=local,dest=/tmp/.buildx-cache" \
+          --platform linux/amd64,linux/arm64,linux/arm/v7 \
           --tag ${{ secrets.DOCKER_HUB_USER }}/${{ matrix.service }}:latest \
-          --output "type=registry" ./${{ matrix.service }}/ \
+          --output "type=registry" ./${{ matrix.service }}/
-          --build-arg commitHash=$SHORT_SHA
+

.gitignore

@@ -1,4 +1 @@
 sitemap
-data
-docker-compose.yml
-backend/mempool-config.json

.vscode/settings.json

@@ -1,4 +0,0 @@
-{
-  "editor.tabSize": 2,
-  "typescript.tsdk": "./backend/node_modules/typescript/lib"
-}

GNUmakefile

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

LICENSE

@@ -1,29 +1,35 @@
-The Mempool Open Source Project
+MIT License with Commons Clause License Condition v1.0
-Copyright (c) 2019-2021 The Mempool Open Source Project Developers
 
-This program is free software; you can redistribute it and/or modify it under
+Copyright (c) 2019-2020 The Mempool Open Source Project
-the terms of (at your option) either:
 
- 1) the GNU Affero General Public License as published by the Free Software
+Permission is hereby granted, free of charge, to any person obtaining a copy
- Foundation, either version 3 of the License or any later version approved by a
+of this software and associated documentation files (the "Software"), to deal
- proxy statement published on <https://mempool.space/about>; or
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, and/or sublicense
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
- 2) the GNU General Public License as published by the Free Software
+The above copyright notice and this permission notice shall be included in all
- Foundation, either version 3 of the License or any later version approved by a
+copies or substantial portions of the Software.
- proxy statement published on <https://mempool.space/about>.
 
-However, this copyright license does not include an implied right or license to
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-use our trademarks: The Mempool Open Source Project™, mempool.space™, the
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-mempool Logo™, the mempool.space Vertical Logo™, the mempool.space Horizontal
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-Logo™, the mempool Square Logo™, and the mempool Blocks logo™ are registered
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-trademarks or trademarks of Mempool Space K.K in Japan, the United States,
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-and/or other countries. See our full Trademark Policy and Guidelines for more
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-details, published on <https://mempool.space/trademark-policy>.
+SOFTWARE.
 
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
+Commons Clause License Condition v1.0
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE. See the full license terms for more details.
 
-You should have received a copy of both the GNU Affero General Public License
+Without limiting other conditions in the License, the grant of rights under
-and the GNU General Public License along with this program.  If not, see
+the License will not include, and the License does not grant to you, the
-<http://www.gnu.org/licenses/>.
+right to Sell the Software.
+
+For purposes of the foregoing, “Sell” means practicing any or all of the
+rights granted to you under the License to provide to third parties, for a
+fee or other consideration (including without limitation fees for hosting or
+consulting/ support services related to the Software), a product or service
+whose value derives, entirely or substantially, from the functionality of
+the Software. Any license notice or attribution required by the License must
+also include this Commons Cause License Condition notice.

LICENSE.AGPL-3.md

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

LICENSE.GPL-3.md

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

Makefile

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

README.md

@@ -2,7 +2,7 @@
 
 Mempool is the fully featured visualizer, explorer, and API service running on [mempool.space](https://mempool.space/), an open source project developed and operated for the benefit of the Bitcoin community, with a focus on the emerging transaction fee market to help our transition into a multi-layer ecosystem.
 
-![mempool](https://mempool.space/resources/screenshots/v2.2.0-dashboard.png)
+![mempool](https://mempool.space/resources/screenshots/v2.1.0-dashboard.png)
 
 ## Installation Methods
 
@@ -79,7 +79,7 @@ Install mempool dependencies from npm and build the backend:
 
 ```bash
   # backend
-  cd backend
+  cd ../backend/
   npm install
   npm run build
 ```
@@ -167,7 +167,7 @@ Install mempool dependencies from npm and build the frontend static HTML/CSS/JS:
 Install the output into nginx webroot folder:
 
 ```bash
-  sudo rsync -av --delete dist/mempool /var/www/
+  sudo rsync -av --delete dist/mempool/ /var/www/html/
 ```
 
 ## nginx + certbot
@@ -179,7 +179,7 @@ Install the supplied nginx.conf and nginx-mempool.conf in /etc/nginx
   apt-get install -y nginx python-certbot-nginx
 
   # install the mempool configuration for nginx
-  cp nginx.conf nginx-mempool.conf /etc/nginx/
+  cp nginx.conf nginx-mempool.conf /etc/nginx/nginx.conf
 
   # replace example.com with your domain name
   certbot --nginx -d example.com

backend/.vscode/settings.json

@@ -1,4 +0,0 @@
-{
-  "editor.tabSize": 2,
-  "typescript.tsdk": "../backend/node_modules/typescript/lib"
-}

backend/mempool-config.sample.json

@@ -7,12 +7,7 @@
     "API_URL_PREFIX": "/api/v1/",
     "POLL_RATE_MS": 2000,
     "CACHE_DIR": "./cache",
-    "CLEAR_PROTECTION_MINUTES": 20,
+    "CLEAR_PROTECTION_MINUTES": 20
-    "RECOMMENDED_FEE_PERCENTILE": 50,
-    "BLOCK_WEIGHT_UNITS": 4000000,
-    "INITIAL_BLOCKS_AMOUNT": 8,
-    "MEMPOOL_BLOCKS_AMOUNT": 8,
-    "PRICE_FEED_UPDATE_INTERVAL": 3600
   },
   "CORE_RPC": {
     "HOST": "127.0.0.1",
@@ -43,18 +38,15 @@
     "USERNAME": "mempool",
     "PASSWORD": "mempool"
   },
-  "SYSLOG": {
-    "ENABLED": true,
-    "HOST": "127.0.0.1",
-    "PORT": 514,
-    "MIN_PRIORITY": "info",
-    "FACILITY": "local7"
-  },
   "STATISTICS": {
     "ENABLED": true,
     "TX_PER_SECOND_SAMPLE_PERIOD": 150
   },
-  "BISQ": {
+  "BISQ_BLOCKS": {
+    "ENABLED": false,
+    "DATA_PATH": "/bisq/statsnode-data/btc_mainnet/db/json"
+  },
+  "BISQ_MARKETS": {
     "ENABLED": false,
     "DATA_PATH": "/bisq/statsnode-data/btc_mainnet/db"
   }

backend/package-lock.json

@@ -1,32 +1,32 @@
 {
   "name": "mempool-backend",
-  "version": "2.2.2-dev",
+  "version": "2.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "mempool-backend",
-      "version": "2.2.2-dev",
+      "version": "2.0.0",
-      "license": "GNU Affero General Public License v3.0",
+      "license": "MIT",
       "dependencies": {
-        "@mempool/bitcoin": "^3.0.3",
+        "@mempool/bitcoin": "^3.0.2",
         "@mempool/electrum-client": "^1.1.7",
         "axios": "^0.21.1",
         "bitcoinjs-lib": "^5.2.0",
         "crypto-js": "^4.0.0",
         "express": "^4.17.1",
         "locutus": "^2.0.12",
-        "mysql2": "2.2.5",
+        "mysql2": "^2.2.5",
-        "node-worker-threads-pool": "^1.4.3",
+        "node-worker-threads-pool": "^1.4.2",
-        "ws": "^7.4.6"
+        "ws": "^7.3.1"
       },
       "devDependencies": {
         "@types/compression": "^1.0.1",
         "@types/express": "^4.17.2",
         "@types/locutus": "^0.0.6",
-        "@types/ws": "^7.4.4",
+        "@types/ws": "^6.0.4",
-        "tslint": "^6.1.0",
+        "tslint": "~6.1.0",
-        "typescript": "4.4.2"
+        "typescript": "~3.9.7"
       }
     },
     "node_modules/@babel/code-frame": {
@@ -56,9 +56,9 @@
       }
     },
     "node_modules/@mempool/bitcoin": {
-      "version": "3.0.3",
+      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@mempool/bitcoin/-/bitcoin-3.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/@mempool/bitcoin/-/bitcoin-3.0.2.tgz",
-      "integrity": "sha512-10UdbwchnevlebDTN+Xhv75AEhDmTMy9UgWHlqx5MG2mheFG6+eqmtHsdxeYnv3IAtTtlRfA6fY0RbV/x4TNFQ==",
+      "integrity": "sha512-WNHFTDJEEBmakSPAbrJ933mGgm1uYxmOElyQYZVW7D7CRUd8mKek+QlViin63e71vyfMVOGXtWwSb87dxghggQ==",
       "engines": {
         "node": ">= 0.10.0"
       }
@@ -163,11 +163,10 @@
       }
     },
     "node_modules/@types/ws": {
-      "version": "7.4.4",
+      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-7.4.4.tgz",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-6.0.4.tgz",
-      "integrity": "sha512-d/7W23JAXPodQNbOZNXvl2K+bqAQrCMwlh/nuQsPSQk6Fq0opHoPrUw43aHsvSbIiQPr8Of2hkFbnz1XBFVyZQ==",
+      "integrity": "sha512-PpPrX7SZW9re6+Ha8ojZG4Se8AZXgf0GK6zmfqEuCsY49LFDNXO3SByp44X3dFEqtB73lkCDAdUazhAjVPiNwg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -549,17 +548,17 @@
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
     "node_modules/elliptic": {
-      "version": "6.5.4",
+      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
-      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+      "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
       "dependencies": {
-        "bn.js": "^4.11.9",
+        "bn.js": "^4.4.0",
-        "brorand": "^1.1.0",
+        "brorand": "^1.0.1",
         "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.1",
+        "hmac-drbg": "^1.0.0",
-        "inherits": "^2.0.4",
+        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.1",
+        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
+        "minimalistic-crypto-utils": "^1.0.0"
       }
     },
     "node_modules/encodeurl": {
@@ -570,6 +569,11 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
+    },
     "node_modules/escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@@ -891,11 +895,14 @@
       }
     },
     "node_modules/locutus": {
-      "version": "2.0.15",
+      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/locutus/-/locutus-2.0.15.tgz",
+      "resolved": "https://registry.npmjs.org/locutus/-/locutus-2.0.14.tgz",
-      "integrity": "sha512-2xWC4RkoAoCVXEb/stzEgG1TNgd+mrkLBj6TuEDNyUoKeQ2XzDTyJUC23sMiqbL6zJmJSP3w59OZo+zc4IBOmA==",
+      "integrity": "sha512-0H1o1iHNEp3kJ5rW57bT/CAP5g6Qm0Zd817Wcx2+rOMTYyIJoc482Ja1v9dB6IUjwvWKcBNdYi7x2lRXtlJ3bA==",
+      "dependencies": {
+        "es6-promise": "^4.2.5"
+      },
       "engines": {
-        "node": ">= 10"
+        "node": ">= 0.12.0"
       }
     },
     "node_modules/long": {
@@ -1473,11 +1480,10 @@
       "integrity": "sha512-7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g=="
     },
     "node_modules/typescript": {
-      "version": "4.4.2",
+      "version": "3.9.7",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.2.tgz",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz",
-      "integrity": "sha512-gzP+t5W4hdy4c+68bfcv0t400HVJMMd2+H9B7gae1nQlBzCqvrXX+6GL/b3GAgyTH966pzrZ70/fRjwAtZksSQ==",
+      "integrity": "sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==",
       "dev": true,
-      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -1538,9 +1544,9 @@
       "dev": true
     },
     "node_modules/ws": {
-      "version": "7.4.6",
+      "version": "7.4.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.2.tgz",
-      "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
+      "integrity": "sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA==",
       "engines": {
         "node": ">=8.3.0"
       },
@@ -1591,9 +1597,9 @@
       }
     },
     "@mempool/bitcoin": {
-      "version": "3.0.3",
+      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@mempool/bitcoin/-/bitcoin-3.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/@mempool/bitcoin/-/bitcoin-3.0.2.tgz",
-      "integrity": "sha512-10UdbwchnevlebDTN+Xhv75AEhDmTMy9UgWHlqx5MG2mheFG6+eqmtHsdxeYnv3IAtTtlRfA6fY0RbV/x4TNFQ=="
+      "integrity": "sha512-WNHFTDJEEBmakSPAbrJ933mGgm1uYxmOElyQYZVW7D7CRUd8mKek+QlViin63e71vyfMVOGXtWwSb87dxghggQ=="
     },
     "@mempool/electrum-client": {
       "version": "1.1.8",
@@ -1692,9 +1698,9 @@
       }
     },
     "@types/ws": {
-      "version": "7.4.4",
+      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-7.4.4.tgz",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-6.0.4.tgz",
-      "integrity": "sha512-d/7W23JAXPodQNbOZNXvl2K+bqAQrCMwlh/nuQsPSQk6Fq0opHoPrUw43aHsvSbIiQPr8Of2hkFbnz1XBFVyZQ==",
+      "integrity": "sha512-PpPrX7SZW9re6+Ha8ojZG4Se8AZXgf0GK6zmfqEuCsY49LFDNXO3SByp44X3dFEqtB73lkCDAdUazhAjVPiNwg==",
       "dev": true,
       "requires": {
         "@types/node": "*"
@@ -2036,17 +2042,17 @@
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
     "elliptic": {
-      "version": "6.5.4",
+      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
-      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+      "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
       "requires": {
-        "bn.js": "^4.11.9",
+        "bn.js": "^4.4.0",
-        "brorand": "^1.1.0",
+        "brorand": "^1.0.1",
         "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.1",
+        "hmac-drbg": "^1.0.0",
-        "inherits": "^2.0.4",
+        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.1",
+        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
+        "minimalistic-crypto-utils": "^1.0.0"
       }
     },
     "encodeurl": {
@@ -2054,6 +2060,11 @@
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
       "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
     },
+    "es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
+    },
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@@ -2310,9 +2321,12 @@
       }
     },
     "locutus": {
-      "version": "2.0.15",
+      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/locutus/-/locutus-2.0.15.tgz",
+      "resolved": "https://registry.npmjs.org/locutus/-/locutus-2.0.14.tgz",
-      "integrity": "sha512-2xWC4RkoAoCVXEb/stzEgG1TNgd+mrkLBj6TuEDNyUoKeQ2XzDTyJUC23sMiqbL6zJmJSP3w59OZo+zc4IBOmA=="
+      "integrity": "sha512-0H1o1iHNEp3kJ5rW57bT/CAP5g6Qm0Zd817Wcx2+rOMTYyIJoc482Ja1v9dB6IUjwvWKcBNdYi7x2lRXtlJ3bA==",
+      "requires": {
+        "es6-promise": "^4.2.5"
+      }
     },
     "long": {
       "version": "4.0.0",
@@ -2771,9 +2785,9 @@
       "integrity": "sha512-7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g=="
     },
     "typescript": {
-      "version": "4.4.2",
+      "version": "3.9.7",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.2.tgz",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz",
-      "integrity": "sha512-gzP+t5W4hdy4c+68bfcv0t400HVJMMd2+H9B7gae1nQlBzCqvrXX+6GL/b3GAgyTH966pzrZ70/fRjwAtZksSQ==",
+      "integrity": "sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==",
       "dev": true
     },
     "unpipe": {
@@ -2819,9 +2833,9 @@
       "dev": true
     },
     "ws": {
-      "version": "7.4.6",
+      "version": "7.4.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.2.tgz",
-      "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
+      "integrity": "sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA==",
       "requires": {}
     },
     "yallist": {

backend/package.json

@@ -1,8 +1,8 @@
 {
   "name": "mempool-backend",
-  "version": "2.2.2-dev",
+  "version": "2.1.2",
   "description": "Bitcoin mempool visualizer and blockchain explorer backend",
-  "license": "GNU Affero General Public License v3.0",
+  "license": "MIT",
   "homepage": "https://mempool.space",
   "repository": {
     "type": "git",
@@ -28,7 +28,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@mempool/bitcoin": "^3.0.3",
+    "@mempool/bitcoin": "^3.0.2",
     "@mempool/electrum-client": "^1.1.7",
     "axios": "^0.21.1",
     "bitcoinjs-lib": "^5.2.0",
@@ -36,15 +36,15 @@
     "express": "^4.17.1",
     "locutus": "^2.0.12",
     "mysql2": "2.2.5",
-    "node-worker-threads-pool": "^1.4.3",
+    "node-worker-threads-pool": "^1.4.2",
-    "ws": "^7.4.6"
+    "ws": "^7.3.1"
   },
   "devDependencies": {
     "@types/compression": "^1.0.1",
     "@types/express": "^4.17.2",
     "@types/locutus": "^0.0.6",
-    "@types/ws": "^7.4.4",
+    "@types/ws": "^6.0.4",
-    "tslint": "^6.1.0",
+    "tslint": "~6.1.0",
-    "typescript": "4.4.2"
+    "typescript": "~3.9.7"
   }
 }

backend/src/api/backend-info.ts

@@ -1,24 +1,20 @@
 import * as fs from 'fs';
 import * as os from 'os';
 import logger from '../logger';
-import { IBackendInfo } from '../mempool.interfaces';
 
 class BackendInfo {
-  private gitCommitHash = '';
+  gitCommitHash = '';
-  private hostname = '';
+  hostname = '';
-  private version = '';
 
   constructor() {
     this.setLatestCommitHash();
-    this.setVersion();
     this.hostname = os.hostname();
   }
 
-  public getBackendInfo(): IBackendInfo {
+  public getBackendInfo() {
     return {
-      hostname: this.hostname,
+      'hostname': this.hostname,
-      gitCommit: this.gitCommitHash,
+      'git-commit': this.gitCommitHash,
-      version: this.version,
     };
   }
 
@@ -30,16 +26,7 @@ class BackendInfo {
     try {
       this.gitCommitHash = fs.readFileSync('../.git/refs/heads/master').toString().trim();
     } catch (e) {
-      logger.err('Could not load git commit info: ' + (e instanceof Error ? e.message : e));
+      logger.err('Could not load git commit info: ' + e.message || e);
-    }
-  }
-
-  private setVersion(): void {
-    try {
-      const packageJson = fs.readFileSync('package.json').toString();
-      this.version = JSON.parse(packageJson).version;
-    } catch (e) {
-      throw new Error(e instanceof Error ? e.message : 'Error');
     }
   }
 }

backend/src/api/bisq/bisq.ts

@@ -8,10 +8,9 @@ import { StaticPool } from 'node-worker-threads-pool';
 import logger from '../../logger';
 
 class Bisq {
-  private static BLOCKS_JSON_FILE_PATH = config.BISQ.DATA_PATH + '/json/all/blocks.json';
+  private static BLOCKS_JSON_FILE_PATH = config.BISQ_BLOCKS.DATA_PATH + '/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 } = {};
@@ -99,7 +98,7 @@ class Bisq {
       this.topDirectoryWatcher.close();
     }
     let fsWait: NodeJS.Timeout | null = null;
-    this.topDirectoryWatcher = fs.watch(config.BISQ.DATA_PATH + '/json', () => {
+    this.topDirectoryWatcher = fs.watch(config.BISQ_BLOCKS.DATA_PATH, () => {
       if (fsWait) {
         clearTimeout(fsWait);
       }
@@ -127,7 +126,7 @@ class Bisq {
       return;
     }
     let fsWait: NodeJS.Timeout | null = null;
-    this.subdirectoryWatcher = fs.watch(config.BISQ.DATA_PATH + '/json/all', () => {
+    this.subdirectoryWatcher = fs.watch(config.BISQ_BLOCKS.DATA_PATH + '/all', () => {
       if (fsWait) {
         clearTimeout(fsWait);
       }
@@ -162,7 +161,7 @@ class Bisq {
       this.buildIndex();
       this.calculateStats();
     } catch (e) {
-      logger.info('loadBisqDumpFile() error.' + (e instanceof Error ? e.message : e));
+      logger.err('loadBisqDumpFile() error.' + e.message || e);
     }
   }
 
@@ -172,7 +171,7 @@ class Bisq {
     this.transactionIndex = {};
     this.addressIndex = {};
 
-    this.allBlocks.forEach((block) => {
+    this.blocks.forEach((block) => {
       /* Build block index */
       if (!this.blockIndex[block.hash]) {
         this.blockIndex[block.hash] = block;
@@ -246,10 +245,9 @@ class Bisq {
     if (cacheData && cacheData.length !== 0) {
       logger.debug('Processing Bisq data dump...');
       const data: BisqBlocks = await this.jsonParsePool.exec(cacheData);
-      if (data.blocks && data.blocks.length !== this.allBlocks.length) {
+      if (data.blocks && data.blocks.length !== this.blocks.length) {
-        this.allBlocks = data.blocks;
+        this.blocks = data.blocks.filter((block) => block.txs.length > 0);
-        this.allBlocks.reverse();
+        this.blocks.reverse();
-        this.blocks = this.allBlocks.filter((block) => block.txs.length > 0);
         this.latestBlockHeight = data.chainHeight;
         const time = new Date().getTime() - start;
         logger.debug('Bisq dump processed in ' + time + ' ms (worker thread)');

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

@@ -457,30 +457,6 @@ class BisqMarketsApi {
     }
   }
 
-  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 = {};

backend/src/api/bisq/markets.ts

@@ -6,7 +6,7 @@ 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_PATH = config.BISQ_MARKETS.DATA_PATH;
   private static MARKET_JSON_FILE_PATHS = {
     activeCryptoCurrency: '/active_crypto_currency_list.json',
     activeFiatCurrency: '/active_fiat_currency_list.json',
@@ -102,7 +102,7 @@ class Bisq {
         logger.debug('Bisq market data updated in ' + time + ' ms');
       }
     } catch (e) {
-      logger.err('loadBisqMarketDataDumpFile() error.' + (e instanceof Error ? e.message : e));
+      logger.err('loadBisqMarketDataDumpFile() error.' + e.message || e);
     }
   }
 

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

@@ -3,10 +3,10 @@ import { IEsploraApi } from './esplora-api.interface';
 export interface AbstractBitcoinApi {
   $getRawMempool(): Promise<IEsploraApi.Transaction['txid'][]>;
   $getRawTransaction(txId: string, skipConversion?: boolean, addPrevout?: boolean): Promise<IEsploraApi.Transaction>;
+  $getRawTransactionBitcoind(txId: string, skipConversion?: boolean, addPrevout?: boolean): Promise<IEsploraApi.Transaction>;
   $getBlockHeightTip(): Promise<number>;
   $getTxIdsForBlock(hash: string): Promise<string[]>;
   $getBlockHash(height: number): Promise<string>;
-  $getBlockHeader(hash: string): Promise<string>;
   $getBlock(hash: string): Promise<IEsploraApi.Block>;
   $getAddress(address: string): Promise<IEsploraApi.Address>;
   $getAddressTransactions(address: string, lastSeenTxId: string): Promise<IEsploraApi.Transaction[]>;

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

@@ -98,15 +98,12 @@ export namespace IBitcoinApi {
 
   export interface AddressInformation {
     isvalid: boolean;                //  (boolean) If the address is valid or not. If not, this is the only property returned.
-    isvalid_parent?: boolean;        //  (boolean) Elements only
     address: string;                 //  (string) The bitcoin address validated
     scriptPubKey: string;            //  (string) The hex-encoded scriptPubKey generated by the address
     isscript: boolean;               //  (boolean) If the key is a script
     iswitness: boolean;              //  (boolean) If the address is a witness
     witness_version?: boolean;       //  (numeric, optional) The version number of the witness program
     witness_program: string;         //  (string, optional) The hex value of the witness program
-    confidential_key?: string;       //  (string) Elements only
-    unconfidential?: string;         //  (string) Elements only
   }
 
   export interface ChainTips {
@@ -116,46 +113,4 @@ export namespace IBitcoinApi {
     status: 'invalid' | 'headers-only' | 'valid-headers' | 'valid-fork' | 'active';
   }
 
-  export interface BlockchainInfo {
-    chain: number;                   // (string) current network name as defined in BIP70 (main, test, regtest)
-    blocks: number;                  // (numeric) the current number of blocks processed in the server
-    headers: number;                 // (numeric) the current number of headers we have validated
-    bestblockhash: string,           // (string) the hash of the currently best block
-    difficulty: number;              // (numeric) the current difficulty
-    mediantime: number;              // (numeric) median time for the current best block
-    verificationprogress: number;    // (numeric) estimate of verification progress [0..1]
-    initialblockdownload: boolean;   // (bool) (debug information) estimate of whether this node is in Initial Block Download mode.
-    chainwork: string                // (string) total amount of work in active chain, in hexadecimal
-    size_on_disk: number;            // (numeric) the estimated size of the block and undo files on disk
-    pruned: number;                  // (boolean) if the blocks are subject to pruning
-    pruneheight: number;             // (numeric) lowest-height complete block stored (only present if pruning is enabled)
-    automatic_pruning: number;       // (boolean) whether automatic pruning is enabled (only present if pruning is enabled)
-    prune_target_size: number;       // (numeric) the target size used by pruning (only present if automatic pruning is enabled)
-    softforks: SoftFork[];           // (array) status of softforks in progress
-    bip9_softforks: { [name: string]: Bip9SoftForks[] } // (object) status of BIP9 softforks in progress
-    warnings: string;                // (string) any network and blockchain warnings.
-  }
-
-  interface SoftFork {
-    id: string;                      // (string) name of softfork
-    version: number;                 // (numeric) block version
-    reject: {                        // (object) progress toward rejecting pre-softfork blocks
-      status: boolean;               // (boolean) true if threshold reached
-    },
-  }
-  interface Bip9SoftForks {
-    status: number;                  // (string) one of defined, started, locked_in, active, failed
-    bit: number;                     // (numeric) the bit (0-28) in the block version field used to signal this softfork (only for started status)
-    startTime: number;               // (numeric) the minimum median time past of a block at which the bit gains its meaning
-    timeout: number;                 // (numeric) the median time past of a block at which the deployment is considered failed if not yet locked in
-    since: number;                   // (numeric) height of the first block to which the status applies
-    statistics: {                    // (object) numeric statistics about BIP9 signalling for a softfork (only for started status)
-      period: number;                // (numeric) the length in blocks of the BIP9 signalling period 
-      threshold: number;             // (numeric) the number of blocks with the version bit set required to activate the feature 
-      elapsed: number;               // (numeric) the number of blocks elapsed since the beginning of the current period 
-      count: number;                 // (numeric) the number of blocks with the version bit set in the current period 
-      possible: boolean;             // (boolean) returns false if there are not enough blocks left in this period to pass activation threshold 
-    }
-  }
-
 }

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

@@ -22,6 +22,16 @@ class BitcoinApi implements AbstractBitcoinApi {
     });
   }
 
+  $getRawTransactionBitcoind(txId: string, skipConversion = false, addPrevout = false): Promise<IEsploraApi.Transaction> {
+    return this.bitcoindClient.getRawTransaction(txId, true)
+      .then((transaction: IBitcoinApi.Transaction) => {
+        if (skipConversion) {
+          return transaction;
+        }
+        return this.$convertTransaction(transaction, addPrevout);
+      });
+  }
+
   $getRawTransaction(txId: string, skipConversion = false, addPrevout = false): Promise<IEsploraApi.Transaction> {
     // If the transaction is in the mempool we already converted and fetched the fee. Only prevouts are missing
     const txInMempool = mempool.getMempool()[txId];
@@ -37,9 +47,6 @@ class BitcoinApi implements AbstractBitcoinApi {
     return this.bitcoindClient.getRawTransaction(txId, true)
       .then((transaction: IBitcoinApi.Transaction) => {
         if (skipConversion) {
-          transaction.vout.forEach((vout) => {
-            vout.value = vout.value * 100000000;
-          });
           return transaction;
         }
         return this.$convertTransaction(transaction, addPrevout);
@@ -56,18 +63,10 @@ class BitcoinApi implements AbstractBitcoinApi {
       .then((rpcBlock: IBitcoinApi.Block) => rpcBlock.tx);
   }
 
-  $getRawBlock(hash: string): Promise<string> {
-    return this.bitcoindClient.getBlock(hash, 0);
-  }
-
   $getBlockHash(height: number): Promise<string> {
     return this.bitcoindClient.getBlockHash(height);
   }
 
-  $getBlockHeader(hash: string): Promise<string> {
-    return this.bitcoindClient.getBlockHeader(hash, false);
-  }
-
   async $getBlock(hash: string): Promise<IEsploraApi.Block> {
     const foundBlock = blocks.getBlocks().find((block) => block.id === hash);
     if (foundBlock) {
@@ -155,9 +154,6 @@ class BitcoinApi implements AbstractBitcoinApi {
       esploraTransaction = await this.$calculateFeeFromInputs(esploraTransaction, addPrevout);
     } else {
       esploraTransaction = await this.$appendMempoolFeeData(esploraTransaction);
-      if (addPrevout) {
-        esploraTransaction = await this.$calculateFeeFromInputs(esploraTransaction, addPrevout);
-      }
     }
 
     return esploraTransaction;
@@ -237,6 +233,10 @@ class BitcoinApi implements AbstractBitcoinApi {
       });
   }
 
+  protected $validateAddress(address: string): Promise<IBitcoinApi.AddressInformation> {
+    return this.bitcoindClient.validateAddress(address);
+  }
+
   private $getMempoolEntry(txid: string): Promise<IBitcoinApi.MempoolEntry> {
     return this.bitcoindClient.getMempoolEntry(txid);
   }

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

@@ -40,14 +40,6 @@ class BitcoinBaseApi {
     }
     return this.bitcoindClient.getMempoolInfo();
   }
-
-  $getBlockchainInfo(): Promise<IBitcoinApi.BlockchainInfo> {
-    return this.bitcoindClient.getBlockchainInfo();
-  }
-
-  $validateAddress(address: string): Promise<IBitcoinApi.AddressInformation> {
-    return this.bitcoindClient.validateAddress(address);
-  }
 }
 
 export default new BitcoinBaseApi();

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

@@ -11,7 +11,6 @@ import * as sha256 from 'crypto-js/sha256';
 import * as hexEnc from 'crypto-js/enc-hex';
 import loadingIndicators from '../loading-indicators';
 import memoryCache from '../memory-cache';
-import bitcoinBaseApi from './bitcoin-base.api';
 
 class BitcoindElectrsApi extends BitcoinApi implements AbstractBitcoinApi {
   private electrumClient: any;
@@ -45,7 +44,7 @@ class BitcoindElectrsApi extends BitcoinApi implements AbstractBitcoinApi {
   }
 
   async $getAddress(address: string): Promise<IEsploraApi.Address> {
-    const addressInfo = await bitcoinBaseApi.$validateAddress(address);
+    const addressInfo = await this.$validateAddress(address);
     if (!addressInfo || !addressInfo.isvalid) {
       return ({
         'address': address,
@@ -94,12 +93,12 @@ class BitcoindElectrsApi extends BitcoinApi implements AbstractBitcoinApi {
       if (e === 'failed to get confirmed status') {
         e = 'The number of transactions on this address exceeds the Electrum server limit';
       }
-      throw new Error(typeof e === 'string' ? e : 'Error');
+      throw new Error(e);
     }
   }
 
   async $getAddressTransactions(address: string, lastSeenTxId: string): Promise<IEsploraApi.Transaction[]> {
-    const addressInfo = await bitcoinBaseApi.$validateAddress(address);
+    const addressInfo = await this.$validateAddress(address);
     if (!addressInfo || !addressInfo.isvalid) {
      return [];
     }
@@ -132,7 +131,7 @@ class BitcoindElectrsApi extends BitcoinApi implements AbstractBitcoinApi {
       if (e === 'failed to get confirmed status') {
         e = 'The number of transactions on this address exceeds the Electrum server limit';
       }
-      throw new Error(typeof e === 'string' ? e : 'Error');
+      throw new Error(e);
     }
   }
 

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

@@ -9,7 +9,6 @@ export namespace IEsploraApi {
     vin: Vin[];
     vout: Vout[];
     status: Status;
-    hex?: string;
   }
 
   export interface Recent {

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

@@ -35,11 +35,6 @@ class ElectrsApi implements AbstractBitcoinApi {
       .then((response) => response.data);
   }
 
-  $getBlockHeader(hash: string): Promise<string> {
-    return axios.get<string>(config.ESPLORA.REST_API_URL + '/block/' + hash + '/header', this.axiosConfig)
-      .then((response) => response.data);
-  }
-
   $getBlock(hash: string): Promise<IEsploraApi.Block> {
     return axios.get<IEsploraApi.Block>(config.ESPLORA.REST_API_URL + '/block/' + hash, this.axiosConfig)
       .then((response) => response.data);
@@ -53,6 +48,11 @@ class ElectrsApi implements AbstractBitcoinApi {
     throw new Error('Method getAddressTransactions not implemented.');
   }
 
+  $getRawTransactionBitcoind(txId: string): Promise<IEsploraApi.Transaction> {
+    return axios.get<IEsploraApi.Transaction>(config.ESPLORA.REST_API_URL + '/tx/' + txId, this.axiosConfig)
+      .then((response) => response.data);
+  }
+
   $getAddressPrefix(prefix: string): string[] {
     throw new Error('Method not implemented.');
   }

backend/src/api/blocks.ts

@@ -6,14 +6,12 @@ import { BlockExtended, TransactionExtended } from '../mempool.interfaces';
 import { Common } from './common';
 import diskCache from './disk-cache';
 import transactionUtils from './transaction-utils';
-import bitcoinBaseApi from './bitcoin/bitcoin-base.api';
 
 class Blocks {
+  private static INITIAL_BLOCK_AMOUNT = 8;
   private blocks: BlockExtended[] = [];
   private currentBlockHeight = 0;
-  private currentDifficulty = 0;
   private lastDifficultyAdjustmentTime = 0;
-  private previousDifficultyRetarget = 0;
   private newBlockCallbacks: ((block: BlockExtended, txIds: string[], transactions: TransactionExtended[]) => void)[] = [];
 
   constructor() { }
@@ -34,32 +32,21 @@ class Blocks {
     const blockHeightTip = await bitcoinApi.$getBlockHeightTip();
 
     if (this.blocks.length === 0) {
-      this.currentBlockHeight = blockHeightTip - config.MEMPOOL.INITIAL_BLOCKS_AMOUNT;
+      this.currentBlockHeight = blockHeightTip - Blocks.INITIAL_BLOCK_AMOUNT;
     } else {
       this.currentBlockHeight = this.blocks[this.blocks.length - 1].height;
     }
 
-    if (blockHeightTip - this.currentBlockHeight > config.MEMPOOL.INITIAL_BLOCKS_AMOUNT * 2) {
+    if (blockHeightTip - this.currentBlockHeight > Blocks.INITIAL_BLOCK_AMOUNT * 2) {
-      logger.info(`${blockHeightTip - this.currentBlockHeight} blocks since tip. Fast forwarding to the ${config.MEMPOOL.INITIAL_BLOCKS_AMOUNT} recent blocks`);
+      logger.info(`${blockHeightTip - this.currentBlockHeight} blocks since tip. Fast forwarding to the ${Blocks.INITIAL_BLOCK_AMOUNT} recent blocks`);
-      this.currentBlockHeight = blockHeightTip - config.MEMPOOL.INITIAL_BLOCKS_AMOUNT;
+      this.currentBlockHeight = blockHeightTip - Blocks.INITIAL_BLOCK_AMOUNT;
     }
 
     if (!this.lastDifficultyAdjustmentTime) {
-      const blockchainInfo = await bitcoinBaseApi.$getBlockchainInfo();
+      const heightDiff = blockHeightTip % 2016;
-      if (blockchainInfo.blocks === blockchainInfo.headers) {
+      const blockHash = await bitcoinApi.$getBlockHash(blockHeightTip - heightDiff);
-        const heightDiff = blockHeightTip % 2016;
+      const block = await bitcoinApi.$getBlock(blockHash);
-        const blockHash = await bitcoinApi.$getBlockHash(blockHeightTip - heightDiff);
+      this.lastDifficultyAdjustmentTime = block.timestamp;
-        const block = await bitcoinApi.$getBlock(blockHash);
-        this.lastDifficultyAdjustmentTime = block.timestamp;
-        this.currentDifficulty = block.difficulty;
-
-        const previousPeriodBlockHash = await bitcoinApi.$getBlockHash(blockHeightTip - heightDiff - 2016);
-        const previousPeriodBlock = await bitcoinApi.$getBlock(previousPeriodBlockHash);
-        this.previousDifficultyRetarget = (block.difficulty - previousPeriodBlock.difficulty) / previousPeriodBlock.difficulty * 100;
-        logger.debug(`Initial difficulty adjustment data set.`);
-      } else {
-        logger.debug(`Blockchain headers (${blockchainInfo.headers}) and blocks (${blockchainInfo.blocks}) not in sync. Waiting...`);
-      }
     }
 
     while (this.currentBlockHeight < blockHeightTip) {
@@ -89,7 +76,7 @@ class Blocks {
             const tx = await transactionUtils.$getTransactionExtended(txIds[i]);
             transactions.push(tx);
           } catch (e) {
-            logger.debug('Error fetching block tx: ' + (e instanceof Error ? e.message : e));
+            logger.debug('Error fetching block tx: ' + e.message || e);
             if (i === 0) {
               throw new Error('Failed to fetch Coinbase transaction: ' + txIds[i]);
             }
@@ -97,31 +84,22 @@ class Blocks {
         }
       }
 
-      transactions.forEach((tx) => {
-        if (!tx.cpfpChecked) {
-          Common.setRelativesAndGetCpfpInfo(tx, mempool);
-        }
-      });
-
       logger.debug(`${transactionsFound} of ${txIds.length} found in mempool. ${txIds.length - transactionsFound} not found.`);
 
       const blockExtended: BlockExtended = Object.assign({}, block);
       blockExtended.reward = transactions[0].vout.reduce((acc, curr) => acc + curr.value, 0);
       blockExtended.coinbaseTx = transactionUtils.stripCoinbaseTransaction(transactions[0]);
-      transactions.shift();
+      transactions.sort((a, b) => b.feePerVsize - a.feePerVsize);
-      transactions.sort((a, b) => b.effectiveFeePerVsize - a.effectiveFeePerVsize);
+      blockExtended.medianFee = transactions.length > 1 ? Common.median(transactions.map((tx) => tx.feePerVsize)) : 0;
-      blockExtended.medianFee = transactions.length > 0 ? Common.median(transactions.map((tx) => tx.effectiveFeePerVsize)) : 0;
+      blockExtended.feeRange = transactions.length > 1 ? Common.getFeesInRange(transactions.slice(0, transactions.length - 1), 8) : [0, 0];
-      blockExtended.feeRange = transactions.length > 0 ? Common.getFeesInRange(transactions, 8) : [0, 0];
 
       if (block.height % 2016 === 0) {
-        this.previousDifficultyRetarget = (block.difficulty - this.currentDifficulty) / this.currentDifficulty * 100;
         this.lastDifficultyAdjustmentTime = block.timestamp;
-        this.currentDifficulty = block.difficulty;
       }
 
       this.blocks.push(blockExtended);
-      if (this.blocks.length > config.MEMPOOL.INITIAL_BLOCKS_AMOUNT * 4) {
+      if (this.blocks.length > Blocks.INITIAL_BLOCK_AMOUNT * 4) {
-        this.blocks = this.blocks.slice(-config.MEMPOOL.INITIAL_BLOCKS_AMOUNT * 4);
+        this.blocks = this.blocks.slice(-Blocks.INITIAL_BLOCK_AMOUNT * 4);
       }
 
       if (this.newBlockCallbacks.length) {
@@ -137,10 +115,6 @@ class Blocks {
     return this.lastDifficultyAdjustmentTime;
   }
 
-  public getPreviousDifficultyRetarget(): number {
-    return this.previousDifficultyRetarget;
-  }
-
   public getCurrentBlockHeight(): number {
     return this.currentBlockHeight;
   }

backend/src/api/common.ts

@@ -1,5 +1,5 @@
-import { CpfpInfo, TransactionExtended, TransactionStripped } from '../mempool.interfaces';
+import { TransactionExtended, TransactionStripped } from '../mempool.interfaces';
-import config from '../config';
+
 export class Common {
   static median(numbers: number[]) {
     let medianNr = 0;
@@ -12,28 +12,17 @@ export class Common {
     return medianNr;
   }
 
-  static percentile(numbers: number[], percentile: number) {
-    if (percentile === 50) {
-      return this.median(numbers);
-    }
-    const index = Math.ceil(numbers.length * (100 - percentile) * 1e-2);
-    if (index < 0 || index > numbers.length - 1) {
-      return 0;
-    }
-    return numbers[index];
-  }
-
   static getFeesInRange(transactions: TransactionExtended[], rangeLength: number) {
-    const arr = [transactions[transactions.length - 1].effectiveFeePerVsize];
+    const arr = [transactions[transactions.length - 1].feePerVsize];
     const chunk = 1 / (rangeLength - 1);
     let itemsToAdd = rangeLength - 2;
 
     while (itemsToAdd > 0) {
-      arr.push(transactions[Math.floor(transactions.length * chunk * itemsToAdd)].effectiveFeePerVsize);
+      arr.push(transactions[Math.floor(transactions.length * chunk * itemsToAdd)].feePerVsize);
       itemsToAdd--;
     }
 
-    arr.push(transactions[0].effectiveFeePerVsize);
+    arr.push(transactions[0].feePerVsize);
     return arr;
   }
 
@@ -75,74 +64,4 @@ export class Common {
        }, ms);
     });
   }
-
-  static shuffleArray(array: any[]) {
-    for (let i = array.length - 1; i > 0; i--) {
-        const j = Math.floor(Math.random() * (i + 1));
-        [array[i], array[j]] = [array[j], array[i]];
-    }
-  }
-
-  static setRelativesAndGetCpfpInfo(tx: TransactionExtended, memPool: { [txid: string]: TransactionExtended }): CpfpInfo {
-    const parents = this.findAllParents(tx, memPool);
-    const lowerFeeParents = parents.filter((parent) => parent.feePerVsize < tx.effectiveFeePerVsize);
-
-    let totalWeight = tx.weight + lowerFeeParents.reduce((prev, val) => prev + val.weight, 0);
-    let totalFees = tx.fee + lowerFeeParents.reduce((prev, val) => prev + val.fee, 0);
-
-    tx.ancestors = parents
-      .map((t) => {
-        return {
-          txid: t.txid,
-          weight: t.weight,
-          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(config.MEMPOOL.NETWORK === 'liquid' ? 0.1 : 1, totalFees / (totalWeight / 4));
-    tx.cpfpChecked = true;
-
-    return {
-      ancestors: tx.ancestors,
-      bestDescendant: tx.bestDescendant || null,
-    };
-  }
-
-
-  private static findAllParents(tx: TransactionExtended, memPool: { [txid: string]: TransactionExtended }): TransactionExtended[] {
-    let parents: TransactionExtended[] = [];
-    tx.vin.forEach((parent) => {
-      if (parents.find((p) => p.txid === parent.txid)) {
-        return;
-      }
-
-      const parentTx = memPool[parent.txid];
-      if (parentTx) {
-        if (tx.bestDescendant && tx.bestDescendant.fee / (tx.bestDescendant.weight / 4) > parentTx.feePerVsize) {
-          if (parentTx.bestDescendant && parentTx.bestDescendant.fee < tx.fee + tx.bestDescendant.fee) {
-            parentTx.bestDescendant = {
-              weight: tx.weight + tx.bestDescendant.weight,
-              fee: tx.fee + tx.bestDescendant.fee,
-              txid: tx.txid,
-            };
-          }
-        } else if (tx.feePerVsize > parentTx.feePerVsize) {
-          parentTx.bestDescendant = {
-            weight: tx.weight,
-            fee: tx.fee,
-            txid: tx.txid
-          };
-        }
-        parents.push(parentTx);
-        parents = parents.concat(this.findAllParents(parentTx, memPool));
-      }
-    });
-    return parents;
-  }
 }

backend/src/api/disk-cache.ts

@@ -6,13 +6,11 @@ import blocks from './blocks';
 import logger from '../logger';
 import config from '../config';
 import { TransactionExtended } from '../mempool.interfaces';
-import { Common } from './common';
 
 class DiskCache {
   private static FILE_NAME = config.MEMPOOL.CACHE_DIR + '/cache.json';
   private static FILE_NAMES = config.MEMPOOL.CACHE_DIR + '/cache{number}.json';
   private static CHUNK_FILES = 25;
-  private isWritingCache = false;
 
   constructor() { }
 
@@ -20,13 +18,8 @@ class DiskCache {
     if (!cluster.isMaster) {
       return;
     }
-    if (this.isWritingCache) {
-      logger.debug('Saving cache already in progress. Skipping.')
-      return;
-    }
     try {
       logger.debug('Writing mempool and blocks data to disk cache (async)...');
-      this.isWritingCache = true;
 
       const mempool = memPool.getMempool();
       const mempoolArray: TransactionExtended[] = [];
@@ -34,8 +27,6 @@ class DiskCache {
         mempoolArray.push(mempool[tx]);
       }
 
-      Common.shuffleArray(mempoolArray);
-
       const chunkSize = Math.floor(mempoolArray.length / DiskCache.CHUNK_FILES);
 
       await fsPromises.writeFile(DiskCache.FILE_NAME, JSON.stringify({
@@ -50,10 +41,8 @@ class DiskCache {
         }), {flag: 'w'});
       }
       logger.debug('Mempool and blocks data saved to disk cache');
-      this.isWritingCache = false;
     } catch (e) {
-      logger.warn('Error writing to cache file: ' + (e instanceof Error ? e.message : e));
+      logger.warn('Error writing to cache file: ' + e.message || e);
-      this.isWritingCache = false;
     }
   }
 
@@ -76,26 +65,22 @@ class DiskCache {
 
       for (let i = 1; i < DiskCache.CHUNK_FILES; i++) {
         const fileName = DiskCache.FILE_NAMES.replace('{number}', i.toString());
-        try {
+        if (fs.existsSync(fileName)) {
-          if (fs.existsSync(fileName)) {
+          const cacheData2 = JSON.parse(fs.readFileSync(fileName, 'utf8'));
-            const cacheData2 = JSON.parse(fs.readFileSync(fileName, 'utf8'));
+          if (cacheData2.mempoolArray) {
-            if (cacheData2.mempoolArray) {
+            for (const tx of cacheData2.mempoolArray) {
-              for (const tx of cacheData2.mempoolArray) {
+              data.mempool[tx.txid] = tx;
-                data.mempool[tx.txid] = tx;
-              }
-            } else {
-              Object.assign(data.mempool, cacheData2.mempool);
             }
+          } else {
+            Object.assign(data.mempool, cacheData2.mempool);
           }
-        } catch (e) {
-          logger.debug('Error parsing ' + fileName + '. Skipping.');
         }
       }
 
       memPool.setMempool(data.mempool);
       blocks.setBlocks(data.blocks);
     } catch (e) {
-      logger.warn('Failed to parse mempoool and blocks cache. Skipping.');
+      logger.warn('Failed to parse mempoool and blocks cache. Skipping...');
     }
   }
 }

backend/src/api/fee-api.ts

@@ -1,6 +1,5 @@
 import config from '../config';
 import { MempoolBlock } from '../mempool.interfaces';
-import mempool from './mempool';
 import projectedBlocks from './mempool-blocks';
 
 class FeeApi {
@@ -10,15 +9,12 @@ class FeeApi {
 
   public getRecommendedFee() {
     const pBlocks = projectedBlocks.getMempoolBlocks();
-    const mPool = mempool.getMempoolInfo();
-    const minimumFee = Math.ceil(mPool.mempoolminfee * 100000);
 
     if (!pBlocks.length) {
       return {
         'fastestFee': this.defaultFee,
         'halfHourFee': this.defaultFee,
         'hourFee': this.defaultFee,
-        'minimumFee': minimumFee,
       };
     }
 
@@ -30,7 +26,6 @@ class FeeApi {
       'fastestFee': firstMedianFee,
       'halfHourFee': secondMedianFee,
       'hourFee': thirdMedianFee,
-      'minimumFee': minimumFee,
     };
   }
 
@@ -39,11 +34,11 @@ class FeeApi {
     if (pBlock.blockVSize <= 500000) {
       return this.defaultFee;
     }
-    if (pBlock.blockVSize <= 950000 && !nextBlock) {
+    if (pBlock.blockVSize <= 950000 && nextBlock) {
       const multiplier = (pBlock.blockVSize - 500000) / 500000;
       return Math.max(Math.round(useFee * multiplier), this.defaultFee);
     }
-    return Math.ceil(useFee);
+    return Math.round(useFee);
   }
 }
 

backend/src/api/fiat-conversion.ts

@@ -1,7 +1,6 @@
 import logger from '../logger';
 import axios from 'axios';
 import { IConversionRates } from '../mempool.interfaces';
-import config from '../config';
 
 class FiatConversion {
   private conversionRates: IConversionRates = {
@@ -17,7 +16,7 @@ class FiatConversion {
 
   public startService() {
     logger.info('Starting currency rates service');
-    setInterval(this.updateCurrency.bind(this), 1000 * config.MEMPOOL.PRICE_FEED_UPDATE_INTERVAL);
+    setInterval(this.updateCurrency.bind(this), 1000 * 60 * 60);
     this.updateCurrency();
   }
 
@@ -36,7 +35,7 @@ class FiatConversion {
         this.ratesChangedCallback(this.conversionRates);
       }
     } catch (e) {
-      logger.err('Error updating fiat conversion rates: ' + (e instanceof Error ? e.message : e));
+      logger.err('Error updating fiat conversion rates: ' + e);
     }
   }
 }

backend/src/api/mempool-blocks.ts

@@ -1,9 +1,8 @@
-import logger from '../logger';
 import { MempoolBlock, TransactionExtended, MempoolBlockWithTransactions } from '../mempool.interfaces';
 import { Common } from './common';
-import config from '../config';
 
 class MempoolBlocks {
+  private static DEFAULT_PROJECTED_BLOCKS_AMOUNT = 8;
   private mempoolBlocks: MempoolBlockWithTransactions[] = [];
 
   constructor() {}
@@ -33,67 +32,36 @@ class MempoolBlocks {
         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.feePerVsize;
-      }
-    });
-
-    // First sort
     memPoolArray.sort((a, b) => b.feePerVsize - a.feePerVsize);
-
+    const transactionsSorted = memPoolArray.filter((tx) => tx.feePerVsize);
-    // Loop through and traverse all ancestors and sum up all the sizes + fees
+    this.mempoolBlocks = this.calculateMempoolBlocks(transactionsSorted);
-    // Pass down size + fee to all unconfirmed children
-    let sizes = 0;
-    memPoolArray.forEach((tx, i) => {
-      sizes += tx.weight;
-      if (sizes > 4000000 * 8) {
-        return;
-      }
-      Common.setRelativesAndGetCpfpInfo(tx, memPool);
-    });
-
-    // Final sort, by effective fee
-    memPoolArray.sort((a, b) => b.effectiveFeePerVsize - a.effectiveFeePerVsize);
-
-    const end = new Date().getTime();
-    const time = end - start;
-    logger.debug('Mempool blocks calculated in ' + time / 1000 + ' seconds');
-
-    this.mempoolBlocks = this.calculateMempoolBlocks(memPoolArray);
   }
 
   private calculateMempoolBlocks(transactionsSorted: TransactionExtended[]): MempoolBlockWithTransactions[] {
     const mempoolBlocks: MempoolBlockWithTransactions[] = [];
-    let blockWeight = 0;
+    let blockVSize = 0;
     let blockSize = 0;
     let transactions: TransactionExtended[] = [];
     transactionsSorted.forEach((tx) => {
-      if (blockWeight + tx.weight <= config.MEMPOOL.BLOCK_WEIGHT_UNITS || mempoolBlocks.length === config.MEMPOOL.MEMPOOL_BLOCKS_AMOUNT) {
+      if (blockVSize + tx.vsize <= 1000000 || mempoolBlocks.length === MempoolBlocks.DEFAULT_PROJECTED_BLOCKS_AMOUNT - 1) {
-        blockWeight += tx.weight;
+        blockVSize += tx.vsize;
         blockSize += tx.size;
         transactions.push(tx);
       } else {
-        mempoolBlocks.push(this.dataToMempoolBlocks(transactions, blockSize, blockWeight, mempoolBlocks.length));
+        mempoolBlocks.push(this.dataToMempoolBlocks(transactions, blockSize, blockVSize, mempoolBlocks.length));
-        blockWeight = tx.weight;
+        blockVSize = tx.vsize;
         blockSize = tx.size;
         transactions = [tx];
       }
     });
     if (transactions.length) {
-      mempoolBlocks.push(this.dataToMempoolBlocks(transactions, blockSize, blockWeight, mempoolBlocks.length));
+      mempoolBlocks.push(this.dataToMempoolBlocks(transactions, blockSize, blockVSize, mempoolBlocks.length));
     }
     return mempoolBlocks;
   }
 
   private dataToMempoolBlocks(transactions: TransactionExtended[],
-    blockSize: number, blockWeight: number, blocksIndex: number): MempoolBlockWithTransactions {
+    blockSize: number, blockVSize: number, blocksIndex: number): MempoolBlockWithTransactions {
     let rangeLength = 4;
     if (blocksIndex === 0) {
       rangeLength = 8;
@@ -105,10 +73,10 @@ class MempoolBlocks {
     }
     return {
       blockSize: blockSize,
-      blockVSize: blockWeight / 4,
+      blockVSize: blockVSize,
       nTx: transactions.length,
       totalFees: transactions.reduce((acc, cur) => acc + cur.fee, 0),
-      medianFee: Common.percentile(transactions.map((tx) => tx.effectiveFeePerVsize), config.MEMPOOL.RECOMMENDED_FEE_PERCENTILE),
+      medianFee: Common.median(transactions.map((tx) => tx.feePerVsize)),
       feeRange: Common.getFeesInRange(transactions, rangeLength),
       transactionIds: transactions.map((tx) => tx.txid),
     };

backend/src/api/mempool.ts

@@ -10,11 +10,10 @@ import loadingIndicators from './loading-indicators';
 
 class Mempool {
   private static WEBSOCKET_REFRESH_RATE_MS = 10000;
-  private static LAZY_DELETE_AFTER_SECONDS = 30;
   private inSync: boolean = false;
   private mempoolCache: { [txId: string]: TransactionExtended } = {};
   private mempoolInfo: IBitcoinApi.MempoolInfo = { loaded: false, size: 0, bytes: 0, usage: 0,
-                                                    maxmempool: 300000000, mempoolminfee: 0.00001000, minrelaytxfee: 0.00001000 };
+                                                    maxmempool: 0, mempoolminfee: 0, minrelaytxfee: 0 };
   private mempoolChangedCallback: ((newMempool: {[txId: string]: TransactionExtended; }, newTransactions: TransactionExtended[],
     deletedTransactions: TransactionExtended[]) => void) | undefined;
 
@@ -28,7 +27,6 @@ class Mempool {
 
   constructor() {
     setInterval(this.updateTxPerSecond.bind(this), 1000);
-    setInterval(this.deleteExpiredTransactions.bind(this), 20000);
   }
 
   public isInSync(): boolean {
@@ -64,7 +62,7 @@ class Mempool {
     this.mempoolInfo = await bitcoinBaseApi.$getMempoolInfo();
   }
 
-  public getMempoolInfo(): IBitcoinApi.MempoolInfo {
+  public getMempoolInfo(): IBitcoinApi.MempoolInfo | undefined {
     return this.mempoolInfo;
   }
 
@@ -124,7 +122,7 @@ class Mempool {
           }
           newTransactions.push(transaction);
         } catch (e) {
-          logger.debug('Error finding transaction in mempool: ' + (e instanceof Error ? e.message : e));
+          logger.debug('Error finding transaction in mempool: ' + e.message || e);
         }
       }
 
@@ -147,6 +145,7 @@ class Mempool {
       }, 1000 * 60 * config.MEMPOOL.CLEAR_PROTECTION_MINUTES);
     }
 
+    let newMempool = {};
     const deletedTransactions: TransactionExtended[] = [];
 
     if (this.mempoolProtection !== 1) {
@@ -155,31 +154,35 @@ class Mempool {
       const transactionsObject = {};
       transactions.forEach((txId) => transactionsObject[txId] = true);
 
-      // Flag transactions for lazy deletion
+      // Replace mempool to separate deleted transactions
       for (const tx in this.mempoolCache) {
-        if (!transactionsObject[tx] && !this.mempoolCache[tx].deleteAfter) {
+        if (transactionsObject[tx]) {
+          newMempool[tx] = this.mempoolCache[tx];
+        } else {
           deletedTransactions.push(this.mempoolCache[tx]);
-          this.mempoolCache[tx].deleteAfter = new Date().getTime() + Mempool.LAZY_DELETE_AFTER_SECONDS * 1000;
         }
       }
+    } else {
+      newMempool = this.mempoolCache;
     }
 
     const newTransactionsStripped = newTransactions.map((tx) => Common.stripTransaction(tx));
     this.latestTransactions = newTransactionsStripped.concat(this.latestTransactions).slice(0, 6);
 
-    if (!this.inSync && transactions.length === Object.keys(this.mempoolCache).length) {
+    if (!this.inSync && transactions.length === Object.keys(newMempool).length) {
       this.inSync = true;
-      logger.notice('The mempool is now in sync!');
+      logger.info('The mempool is now in sync!');
       loadingIndicators.setProgress('mempool', 100);
     }
 
     if (this.mempoolChangedCallback && (hasChange || deletedTransactions.length)) {
+      this.mempoolCache = newMempool;
       this.mempoolChangedCallback(this.mempoolCache, newTransactions, deletedTransactions);
     }
 
     const end = new Date().getTime();
     const time = end - start;
-    logger.debug(`New mempool size: ${Object.keys(this.mempoolCache).length} Change: ${diff}`);
+    logger.debug(`New mempool size: ${Object.keys(newMempool).length} Change: ${diff}`);
     logger.debug('Mempool updated in ' + time / 1000 + ' seconds');
   }
 
@@ -195,16 +198,6 @@ class Mempool {
       );
     }
   }
-
-  private deleteExpiredTransactions() {
-    const now = new Date().getTime();
-    for (const tx in this.mempoolCache) {
-      const lazyDeleteAt = this.mempoolCache[tx].deleteAfter;
-      if (lazyDeleteAt && lazyDeleteAt < now) {
-        delete this.mempoolCache[tx];
-      }
-    }
-  }
 }
 
 export default new Mempool();

backend/src/api/statistics.ts

@@ -68,13 +68,13 @@ class Statistics {
       }
     }
     // Remove 0 and undefined
-    memPoolArray = memPoolArray.filter((tx) => tx.effectiveFeePerVsize);
+    memPoolArray = memPoolArray.filter((tx) => tx.feePerVsize);
 
     if (!memPoolArray.length) {
       return;
     }
 
-    memPoolArray.sort((a, b) => a.effectiveFeePerVsize - b.effectiveFeePerVsize);
+    memPoolArray.sort((a, b) => a.feePerVsize - b.feePerVsize);
     const totalWeight = memPoolArray.map((tx) => tx.vsize).reduce((acc, curr) => acc + curr) * 4;
     const totalFee = memPoolArray.map((tx) => tx.fee).reduce((acc, curr) => acc + curr);
 
@@ -85,7 +85,7 @@ class Statistics {
 
     memPoolArray.forEach((transaction) => {
       for (let i = 0; i < logFees.length; i++) {
-        if ((logFees[i] === 2000 && transaction.effectiveFeePerVsize >= 2000) || transaction.effectiveFeePerVsize <= logFees[i]) {
+        if ((logFees[i] === 2000 && transaction.feePerVsize >= 2000) || transaction.feePerVsize <= logFees[i]) {
           if (weightVsizeFees[logFees[i]]) {
             weightVsizeFees[logFees[i]] += transaction.vsize;
           } else {
@@ -255,7 +255,7 @@ class Statistics {
       connection.release();
       return result.insertId;
     } catch (e) {
-      logger.err('$create() error' + (e instanceof Error ? e.message : e));
+      logger.err('$create() error' + e.message || e);
     }
   }
 
@@ -313,7 +313,7 @@ class Statistics {
         return this.mapStatisticToOptimizedStatistic([rows[0]])[0];
       }
     } catch (e) {
-      logger.err('$list2H() error' + (e instanceof Error ? e.message : e));
+      logger.err('$list2H() error' + e.message || e);
     }
   }
 
@@ -325,7 +325,7 @@ class Statistics {
       connection.release();
       return this.mapStatisticToOptimizedStatistic(rows);
     } catch (e) {
-      logger.err('$list2H() error' + (e instanceof Error ? e.message : e));
+      logger.err('$list2H() error' + e.message || e);
       return [];
     }
   }
@@ -338,7 +338,7 @@ class Statistics {
       connection.release();
       return this.mapStatisticToOptimizedStatistic(rows);
     } catch (e) {
-      logger.err('$list24h() error' + (e instanceof Error ? e.message : e));
+      logger.err('$list24h() error' + e.message || e);
       return [];
     }
   }
@@ -351,7 +351,7 @@ class Statistics {
       connection.release();
       return this.mapStatisticToOptimizedStatistic(rows);
     } catch (e) {
-      logger.err('$list1W() error' + (e instanceof Error ? e.message : e));
+      logger.err('$list1W() error' + e);
       return [];
     }
   }
@@ -364,7 +364,7 @@ class Statistics {
       connection.release();
       return this.mapStatisticToOptimizedStatistic(rows);
     } catch (e) {
-      logger.err('$list1M() error' + (e instanceof Error ? e.message : e));
+      logger.err('$list1M() error' + e);
       return [];
     }
   }
@@ -377,7 +377,7 @@ class Statistics {
       connection.release();
       return this.mapStatisticToOptimizedStatistic(rows);
     } catch (e) {
-      logger.err('$list3M() error' + (e instanceof Error ? e.message : e));
+      logger.err('$list3M() error' + e);
       return [];
     }
   }
@@ -390,7 +390,7 @@ class Statistics {
       connection.release();
       return this.mapStatisticToOptimizedStatistic(rows);
     } catch (e) {
-      logger.err('$list6M() error' + (e instanceof Error ? e.message : e));
+      logger.err('$list6M() error' + e);
       return [];
     }
   }
@@ -403,7 +403,7 @@ class Statistics {
       connection.release();
       return this.mapStatisticToOptimizedStatistic(rows);
     } catch (e) {
-      logger.err('$list6M() error' + (e instanceof Error ? e.message : e));
+      logger.err('$list6M() error' + e);
       return [];
     }
   }

backend/src/api/transaction-utils.ts

@@ -1,7 +1,7 @@
 import bitcoinApi from './bitcoin/bitcoin-api-factory';
+import logger from '../logger';
 import { TransactionExtended, TransactionMinerInfo } from '../mempool.interfaces';
 import { IEsploraApi } from './bitcoin/esplora-api.interface';
-import config from '../config';
 
 class TransactionUtils {
   constructor() { }
@@ -26,16 +26,9 @@ class TransactionUtils {
   }
 
   private extendTransaction(transaction: IEsploraApi.Transaction): TransactionExtended {
-    // @ts-ignore
-    if (transaction.vsize) {
-      // @ts-ignore
-      return transaction;
-    }
-    const feePerVbytes = Math.max(config.MEMPOOL.NETWORK === 'liquid' ? 0.1 : 1, (transaction.fee || 0) / (transaction.weight / 4));
     const transactionExtended: TransactionExtended = Object.assign({
       vsize: Math.round(transaction.weight / 4),
-      feePerVsize: feePerVbytes,
+      feePerVsize: Math.max(1, (transaction.fee || 0) / (transaction.weight / 4)),
-      effectiveFeePerVsize: feePerVbytes,
     }, transaction);
     if (!transaction.status.confirmed) {
       transactionExtended.firstSeen = Math.round((new Date().getTime() / 1000));

backend/src/api/websocket-handler.ts

@@ -34,7 +34,7 @@ class WebsocketHandler {
 
     this.wss.on('connection', (client: WebSocket) => {
       client.on('error', logger.info);
-      client.on('message', async (message: string) => {
+      client.on('message', (message: string) => {
         try {
           const parsedMessage: WebsocketResponse = JSON.parse(message);
           const response = {};
@@ -53,25 +53,9 @@ class WebsocketHandler {
               if (parsedMessage['watch-mempool']) {
                 const tx = memPool.getMempool()[client['track-tx']];
                 if (tx) {
-                  if (config.MEMPOOL.BACKEND === 'esplora') {
+                  response['tx'] = tx;
-                    response['tx'] = tx;
-                  } else {
-                    // tx.prevouts is missing from transactions when in bitcoind mode
-                    try {
-                      const fullTx = await transactionUtils.$getTransactionExtended(tx.txid, true);
-                      response['tx'] = fullTx;
-                    } catch (e) {
-                      logger.debug('Error finding transaction: ' + (e instanceof Error ? e.message : e));
-                    }
-                  }
                 } else {
-                  try {
+                  client['track-mempool-tx'] = parsedMessage['track-tx'];
-                    const fullTx = await transactionUtils.$getTransactionExtended(client['track-tx'], true);
-                    response['tx'] = fullTx;
-                  } catch (e) {
-                    logger.debug('Error finding transaction. ' + (e instanceof Error ? e.message : e));
-                    client['track-mempool-tx'] = parsedMessage['track-tx'];
-                  }
                 }
               }
             } else {
@@ -80,13 +64,9 @@ class WebsocketHandler {
           }
 
           if (parsedMessage && parsedMessage['track-address']) {
-            if (/^([a-km-zA-HJ-NP-Z1-9]{26,35}|[a-km-zA-HJ-NP-Z1-9]{80}|[a-z]{2,5}1[ac-hj-np-z02-9]{8,100}|[A-Z]{2,5}1[AC-HJ-NP-Z02-9]{8,100})$/
+            if (/^([a-km-zA-HJ-NP-Z1-9]{26,35}|[a-km-zA-HJ-NP-Z1-9]{80}|[a-z]{2,5}1[ac-hj-np-z02-9]{8,87})$/
               .test(parsedMessage['track-address'])) {
-              let matchedAddress = parsedMessage['track-address'];
+              client['track-address'] = parsedMessage['track-address'];
-              if (/^[A-Z]{2,5}1[AC-HJ-NP-Z02-9]{8,100}$/.test(parsedMessage['track-address'])) {
-                matchedAddress = matchedAddress.toLowerCase();
-              }
-              client['track-address'] = matchedAddress;
             } else {
               client['track-address'] = null;
             }
@@ -101,7 +81,7 @@ class WebsocketHandler {
           }
 
           if (parsedMessage.action === 'init') {
-            const _blocks = blocks.getBlocks().slice(-config.MEMPOOL.INITIAL_BLOCKS_AMOUNT);
+            const _blocks = blocks.getBlocks().slice(-8);
             if (!_blocks) {
               return;
             }
@@ -116,19 +96,11 @@ 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(JSON.stringify(response));
           }
         } catch (e) {
-          logger.debug('Error parsing websocket message: ' + (e instanceof Error ? e.message : e));
+          logger.debug('Error parsing websocket message: ' + e.message || e);
         }
       });
     });
@@ -177,18 +149,18 @@ class WebsocketHandler {
 
   getInitData(_blocks?: BlockExtended[]) {
     if (!_blocks) {
-      _blocks = blocks.getBlocks().slice(-config.MEMPOOL.INITIAL_BLOCKS_AMOUNT);
+      _blocks = blocks.getBlocks().slice(-8);
     }
     return {
       'mempoolInfo': memPool.getMempoolInfo(),
       'vBytesPerSecond': memPool.getVBytesPerSecond(),
       'lastDifficultyAdjustment': blocks.getLastDifficultyAdjustmentTime(),
-      'previousRetarget': blocks.getPreviousDifficultyRetarget(),
       'blocks': _blocks,
       'conversions': fiatConversion.getConversionRates(),
       'mempool-blocks': mempoolBlocks.getMempoolBlocks(),
       'transactions': memPool.getLatestTransactions(),
-      'backendInfo': backendInfo.getBackendInfo(),
+      'git-commit': backendInfo.gitCommitHash,
+      'hostname': backendInfo.hostname,
       'loadingIndicators': loadingIndicators.getLoadingIndicators(),
       ...this.extraInitProperties
     };
@@ -222,15 +194,10 @@ class WebsocketHandler {
 
     mempoolBlocks.updateMempoolBlocks(newMempool);
     const mBlocks = mempoolBlocks.getMempoolBlocks();
-    const mempool = memPool.getMempool();
     const mempoolInfo = memPool.getMempoolInfo();
     const vBytesPerSecond = memPool.getVBytesPerSecond();
     const rbfTransactions = Common.findRbfTransactions(newTransactions, deletedTransactions);
 
-    for (const rbfTransaction in rbfTransactions) {
-      delete mempool[rbfTransaction];
-    }
-
     this.wss.clients.forEach(async (client: WebSocket) => {
       if (client.readyState !== WebSocket.OPEN) {
         return;
@@ -256,7 +223,7 @@ class WebsocketHandler {
               const fullTx = await transactionUtils.$getTransactionExtended(tx.txid, true);
               response['tx'] = fullTx;
             } catch (e) {
-              logger.debug('Error finding transaction in mempool: ' + (e instanceof Error ? e.message : e));
+              logger.debug('Error finding transaction in mempool: ' + e.message || e);
             }
           } else {
             response['tx'] = tx;
@@ -276,7 +243,7 @@ class WebsocketHandler {
                 const fullTx = await transactionUtils.$getTransactionExtended(tx.txid, true);
                 foundTransactions.push(fullTx);
               } catch (e) {
-                logger.debug('Error finding transaction in mempool: ' + (e instanceof Error ? e.message : e));
+                logger.debug('Error finding transaction in mempool: ' + e.message || e);
               }
             } else {
               foundTransactions.push(tx);
@@ -290,7 +257,7 @@ class WebsocketHandler {
                 const fullTx = await transactionUtils.$getTransactionExtended(tx.txid, true);
                 foundTransactions.push(fullTx);
               } catch (e) {
-                logger.debug('Error finding transaction in mempool: ' + (e instanceof Error ? e.message : e));
+                logger.debug('Error finding transaction in mempool: ' + e.message || e);
               }
             } else {
               foundTransactions.push(tx);
@@ -341,7 +308,7 @@ class WebsocketHandler {
                 const fullTx = await transactionUtils.$getTransactionExtended(rbfTransaction, true);
                 response['rbfTransaction'] = fullTx;
               } catch (e) {
-                logger.debug('Error finding transaction in mempool: ' + (e instanceof Error ? e.message : e));
+                logger.debug('Error finding transaction in mempool: ' + e.message || e);
               }
             } else {
               response['rbfTransaction'] = rbfTx;
@@ -362,23 +329,28 @@ class WebsocketHandler {
       throw new Error('WebSocket.Server is not set');
     }
 
+    // Check how many transactions in the new block matches the latest projected mempool block
+    // If it's more than 0, recalculate the mempool blocks and send to client in the same update
     let mBlocks: undefined | MempoolBlock[];
     let matchRate = 0;
-    const _memPool = memPool.getMempool();
     const _mempoolBlocks = mempoolBlocks.getMempoolBlocksWithTransactions();
-
     if (_mempoolBlocks[0]) {
       const matches: string[] = [];
       for (const txId of txIds) {
         if (_mempoolBlocks[0].transactionIds.indexOf(txId) > -1) {
           matches.push(txId);
         }
-        delete _memPool[txId];
       }
 
       matchRate = Math.round((matches.length / (txIds.length - 1)) * 100);
-      mempoolBlocks.updateMempoolBlocks(_memPool);
+      if (matchRate > 0) {
-      mBlocks = mempoolBlocks.getMempoolBlocks();
+        const currentMemPool = memPool.getMempool();
+        for (const txId of matches) {
+          delete currentMemPool[txId];
+        }
+        mempoolBlocks.updateMempoolBlocks(currentMemPool);
+        mBlocks = mempoolBlocks.getMempoolBlocks();
+      }
     }
 
     block.matchRate = matchRate;
@@ -396,7 +368,6 @@ class WebsocketHandler {
         'block': block,
         'mempoolInfo': memPool.getMempoolInfo(),
         'lastDifficultyAdjustment': blocks.getLastDifficultyAdjustmentTime(),
-        'previousRetarget': blocks.getPreviousDifficultyRetarget(),
       };
 
       if (mBlocks && client['want-mempool-blocks']) {

backend/src/config.ts

@@ -2,7 +2,7 @@ const configFile = require('../mempool-config.json');
 
 interface IConfig {
   MEMPOOL: {
-    NETWORK: 'mainnet' | 'testnet' | 'signet' | 'liquid';
+    NETWORK: 'mainnet' | 'testnet' | 'liquid';
     BACKEND: 'esplora' | 'electrum' | 'none';
     HTTP_PORT: number;
     SPAWN_CLUSTER_PROCS: number;
@@ -10,11 +10,6 @@ interface IConfig {
     POLL_RATE_MS: number;
     CACHE_DIR: string;
     CLEAR_PROTECTION_MINUTES: number;
-    RECOMMENDED_FEE_PERCENTILE: number;
-    BLOCK_WEIGHT_UNITS: number;
-    INITIAL_BLOCKS_AMOUNT: number;
-    MEMPOOL_BLOCKS_AMOUNT: number;
-    PRICE_FEED_UPDATE_INTERVAL: number;
   };
   ESPLORA: {
     REST_API_URL: string;
@@ -45,18 +40,15 @@ interface IConfig {
     USERNAME: string;
     PASSWORD: string;
   };
-  SYSLOG: {
-    ENABLED: boolean;
-    HOST: string;
-    PORT: number;
-    MIN_PRIORITY: 'emerg' | 'alert' | 'crit' | 'err' |'warn' | 'notice' | 'info' | 'debug';
-    FACILITY: string;
-  };
   STATISTICS: {
     ENABLED: boolean;
     TX_PER_SECOND_SAMPLE_PERIOD: number;
   };
-  BISQ: {
+  BISQ_BLOCKS: {
+    ENABLED: boolean;
+    DATA_PATH: string;
+  };
+  BISQ_MARKETS: {
     ENABLED: boolean;
     DATA_PATH: string;
   };
@@ -72,11 +64,6 @@ const defaults: IConfig = {
     'POLL_RATE_MS': 2000,
     'CACHE_DIR': './cache',
     'CLEAR_PROTECTION_MINUTES': 20,
-    'RECOMMENDED_FEE_PERCENTILE': 50,
-    'BLOCK_WEIGHT_UNITS': 4000000,
-    'INITIAL_BLOCKS_AMOUNT': 8,
-    'MEMPOOL_BLOCKS_AMOUNT': 8,
-    'PRICE_FEED_UPDATE_INTERVAL': 3600,
   },
   'ESPLORA': {
     'REST_API_URL': 'http://127.0.0.1:3000',
@@ -107,18 +94,15 @@ const defaults: IConfig = {
     'USERNAME': 'mempool',
     'PASSWORD': 'mempool'
   },
-  'SYSLOG': {
-    'ENABLED': true,
-    'HOST': '127.0.0.1',
-    'PORT': 514,
-    'MIN_PRIORITY': 'info',
-    'FACILITY': 'local7'
-  },
   'STATISTICS': {
     'ENABLED': true,
     'TX_PER_SECOND_SAMPLE_PERIOD': 150
   },
-  'BISQ': {
+  'BISQ_BLOCKS': {
+    'ENABLED': false,
+    'DATA_PATH': '/bisq/statsnode-data/btc_mainnet/db/json'
+  },
+  'BISQ_MARKETS': {
     'ENABLED': false,
     'DATA_PATH': '/bisq/statsnode-data/btc_mainnet/db'
   },
@@ -131,9 +115,9 @@ class Config implements IConfig {
   CORE_RPC: IConfig['CORE_RPC'];
   CORE_RPC_MINFEE: IConfig['CORE_RPC_MINFEE'];
   DATABASE: IConfig['DATABASE'];
-  SYSLOG: IConfig['SYSLOG'];
   STATISTICS: IConfig['STATISTICS'];
-  BISQ: IConfig['BISQ'];
+  BISQ_BLOCKS: IConfig['BISQ_BLOCKS'];
+  BISQ_MARKETS: IConfig['BISQ_MARKETS'];
 
   constructor() {
     const configs = this.merge(configFile, defaults);
@@ -143,9 +127,9 @@ class Config implements IConfig {
     this.CORE_RPC = configs.CORE_RPC;
     this.CORE_RPC_MINFEE = configs.CORE_RPC_MINFEE;
     this.DATABASE = configs.DATABASE;
-    this.SYSLOG = configs.SYSLOG;
     this.STATISTICS = configs.STATISTICS;
-    this.BISQ = configs.BISQ;
+    this.BISQ_BLOCKS = configs.BISQ_BLOCKS;
+    this.BISQ_MARKETS = configs.BISQ_MARKETS;
   }
 
   merge = (...objects: object[]): IConfig => {

backend/src/database.ts

@@ -20,7 +20,7 @@ export async function checkDbConnection() {
     logger.info('Database connection established.');
     connection.release();
   } catch (e) {
-    logger.err('Could not connect to database: ' + (e instanceof Error ? e.message : e));
+    logger.err('Could not connect to database: ' + e.message || e);
     process.exit(1);
   }
 }

backend/src/index.ts

@@ -73,27 +73,29 @@ class Server {
     this.server = http.createServer(this.app);
     this.wss = new WebSocket.Server({ server: this.server });
 
-    this.setUpWebsocketHandling();
-
     diskCache.loadMempoolCache();
 
     if (config.DATABASE.ENABLED) {
       await checkDbConnection();
     }
 
-    if (config.STATISTICS.ENABLED && config.DATABASE.ENABLED && cluster.isMaster) {
+    if (config.STATISTICS.ENABLED && config.DATABASE.ENABLED) {
       statistics.startStatistics();
     }
 
     fiatConversion.startService();
 
     this.setUpHttpApiRoutes();
+    this.setUpWebsocketHandling();
     this.runMainUpdateLoop();
 
-    if (config.BISQ.ENABLED) {
+    if (config.BISQ_BLOCKS.ENABLED) {
       bisq.startBisqService();
       bisq.setPriceCallbackFunction((price) => websocketHandler.setExtraInitProperties('bsq-price', price));
       blocks.setNewBlockCallback(bisq.handleNewBitcoinBlock.bind(bisq));
+    }
+
+    if (config.BISQ_MARKETS.ENABLED) {
       bisqMarkets.startBisqService();
     }
 
@@ -108,22 +110,13 @@ class Server {
 
   async runMainUpdateLoop() {
     try {
-      try {
+      await memPool.$updateMemPoolInfo();
-        await memPool.$updateMemPoolInfo();
-      } catch (e) {
-        const msg = `updateMempoolInfo: ${(e instanceof Error ? e.message : e)}`;
-        if (config.CORE_RPC_MINFEE.ENABLED) {
-          logger.warn(msg);
-        } else {
-          logger.debug(msg);
-        }
-      }
       await blocks.$updateBlocks();
       await memPool.$updateMempool();
       setTimeout(this.runMainUpdateLoop.bind(this), config.MEMPOOL.POLL_RATE_MS);
       this.currentBackendRetryInterval = 5;
     } catch (e) {
-      const loggerMsg = `runMainLoop error: ${(e instanceof Error ? e.message : e)}. Retrying in ${this.currentBackendRetryInterval} sec.`;
+      const loggerMsg = `runMainLoop error: ${(e.message || e)}. Retrying in ${this.currentBackendRetryInterval} sec.`;
       if (this.currentBackendRetryInterval > 5) {
         logger.warn(loggerMsg);
         mempool.setOutOfSync();
@@ -152,13 +145,10 @@ class Server {
   setUpHttpApiRoutes() {
     this.app
       .get(config.MEMPOOL.API_URL_PREFIX + 'transaction-times', routes.getTransactionTimes)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'cpfp/:txId', routes.getCpfpInfo)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'difficulty-adjustment', routes.getDifficultyChange)
       .get(config.MEMPOOL.API_URL_PREFIX + 'fees/recommended', routes.getRecommendedFees)
       .get(config.MEMPOOL.API_URL_PREFIX + 'fees/mempool-blocks', routes.getMempoolBlocks)
       .get(config.MEMPOOL.API_URL_PREFIX + 'backend-info', routes.getBackendInfo)
       .get(config.MEMPOOL.API_URL_PREFIX + 'init-data', routes.getInitData)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'validate-address/:address', routes.validateAddress)
       .get(config.MEMPOOL.API_URL_PREFIX + 'donations', async (req, res) => {
         try {
           const response = await axios.get('https://mempool.space/api/v1/donations', { responseType: 'stream', timeout: 10000 });
@@ -177,24 +167,6 @@ class Server {
           res.status(500).end();
         }
       })
-      .get(config.MEMPOOL.API_URL_PREFIX + 'contributors', async (req, res) => {
-        try {
-          const response = await axios.get('https://mempool.space/api/v1/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('https://mempool.space/api/v1/contributors/images/' + req.params.id, {
-            responseType: 'stream', timeout: 10000
-          });
-          response.data.pipe(res);
-        } catch (e) {
-          res.status(500).end();
-        }
-      })
     ;
 
     if (config.STATISTICS.ENABLED && config.DATABASE.ENABLED) {
@@ -209,7 +181,7 @@ class Server {
         ;
     }
 
-    if (config.BISQ.ENABLED) {
+    if (config.BISQ_BLOCKS.ENABLED) {
       this.app
         .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/stats', routes.getBisqStats)
         .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/tx/:txId', routes.getBisqTransaction)
@@ -218,6 +190,11 @@ class Server {
         .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/blocks/:index/:length', routes.getBisqBlocks)
         .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/address/:address', routes.getBisqAddress)
         .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/txs/:index/:length', routes.getBisqTransactions)
+      ;
+    }
+
+    if (config.BISQ_MARKETS.ENABLED) {
+      this.app
         .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/currencies', routes.getBisqMarketCurrencies.bind(routes))
         .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/depth', routes.getBisqMarketDepth.bind(routes))
         .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/hloc', routes.getBisqMarketHloc.bind(routes))
@@ -226,7 +203,6 @@ class Server {
         .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/ticker', routes.getBisqMarketTicker.bind(routes))
         .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/trades', routes.getBisqMarketTrades.bind(routes))
         .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/volumes', routes.getBisqMarketVolumes.bind(routes))
-        .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/volumes/7d', routes.getBisqMarketVolumes7d.bind(routes))
         ;
     }
 
@@ -236,11 +212,9 @@ class Server {
         .get(config.MEMPOOL.API_URL_PREFIX + 'mempool/txids', routes.getMempoolTxIds)
         .get(config.MEMPOOL.API_URL_PREFIX + 'mempool/recent', routes.getRecentMempoolTransactions)
         .get(config.MEMPOOL.API_URL_PREFIX + 'tx/:txId', routes.getTransaction)
-        .get(config.MEMPOOL.API_URL_PREFIX + 'tx/:txId/hex', routes.getRawTransaction)
         .get(config.MEMPOOL.API_URL_PREFIX + 'tx/:txId/status', routes.getTransactionStatus)
         .get(config.MEMPOOL.API_URL_PREFIX + 'tx/:txId/outspends', routes.getTransactionOutspends)
         .get(config.MEMPOOL.API_URL_PREFIX + 'block/:hash', routes.getBlock)
-        .get(config.MEMPOOL.API_URL_PREFIX + 'block/:hash/header', routes.getBlockHeader)
         .get(config.MEMPOOL.API_URL_PREFIX + 'blocks', routes.getBlocks)
         .get(config.MEMPOOL.API_URL_PREFIX + 'blocks/:height', routes.getBlocks)
         .get(config.MEMPOOL.API_URL_PREFIX + 'blocks/tip/height', routes.getBlockTipHeight)

backend/src/logger.ts

@@ -50,11 +50,17 @@ class Logger {
   public debug: ((msg: string) => void);
 
   private name = 'mempool';
+  private fac: any;
+  private loghost: string;
+  private logport: number;
   private client: dgram.Socket;
   private network: string;
 
-  constructor() {
+  constructor(fac) {
     let prio;
+    this.fac = fac != null ? fac : Logger.facilities.local0;
+    this.loghost = '127.0.0.1';
+    this.logport = 514;
     for (prio in Logger.priorities) {
       if (true) {
         this.addprio(prio);
@@ -73,7 +79,7 @@ class Logger {
   }
 
   private getNetwork(): string {
-    if (config.BISQ.ENABLED) {
+    if (config.BISQ_BLOCKS.ENABLED) {
       return 'bisq';
     }
     if (config.MEMPOOL.NETWORK && config.MEMPOOL.NETWORK !== 'mainnet') {
@@ -91,12 +97,10 @@ class Logger {
     }
     const network = this.network ? ' <' + this.network + '>' : '';
     prionum = Logger.priorities[priority] || Logger.priorities.info;
+    syslogmsg = `<${(this.fac * 8 + prionum)}> ${this.name}[${process.pid}]: ${priority.toUpperCase()}${network} ${msg}`;
     consolemsg = `${this.ts()} [${process.pid}] ${priority.toUpperCase()}:${network} ${msg}`;
 
-    if (config.SYSLOG.ENABLED && Logger.priorities[priority] <= Logger.priorities[config.SYSLOG.MIN_PRIORITY]) {
+    this.syslog(syslogmsg);
-      syslogmsg = `<${(Logger.facilities[config.SYSLOG.FACILITY] * 8 + prionum)}> ${this.name}[${process.pid}]: ${priority.toUpperCase()}${network} ${msg}`;
-      this.syslog(syslogmsg);
-    }
     if (priority === 'warning') {
       priority = 'warn';
     }
@@ -112,7 +116,7 @@ class Logger {
   private syslog(msg) {
     let msgbuf;
     msgbuf = Buffer.from(msg);
-    this.client.send(msgbuf, 0, msgbuf.length, config.SYSLOG.PORT, config.SYSLOG.HOST, function(err, bytes) {
+    this.client.send(msgbuf, 0, msgbuf.length, this.logport, this.loghost, function(err, bytes) {
       if (err) {
         console.log(err);
       }
@@ -142,4 +146,4 @@ class Logger {
   }
 }
 
-export default new Logger();
+export default new Logger(Logger.facilities.local7);

backend/src/mempool.interfaces.ts

@@ -26,28 +26,6 @@ export interface TransactionExtended extends IEsploraApi.Transaction {
   vsize: number;
   feePerVsize: number;
   firstSeen?: number;
-  effectiveFeePerVsize: number;
-  ancestors?: Ancestor[];
-  bestDescendant?: BestDescendant | null;
-  cpfpChecked?: boolean;
-  deleteAfter?: number;
-}
-
-interface Ancestor {
-  txid: string;
-  weight: number;
-  fee: number;
-}
-
-interface BestDescendant {
-  txid: string;
-  weight: number;
-  fee: number;
-}
-
-export interface CpfpInfo {
-  ancestors: Ancestor[];
-  bestDescendant: BestDescendant | null;
 }
 
 export interface TransactionStripped {
@@ -144,7 +122,6 @@ export interface WebsocketResponse {
   'track-tx': string;
   'track-address': string;
   'watch-mempool': boolean;
-  'track-bisq-market': string;
 }
 
 export interface VbytesPerSecond {
@@ -161,9 +138,3 @@ interface RequiredParams {
 
 export interface ILoadingIndicators { [name: string]: number; }
 export interface IConversionRates { [currency: string]: number; }
-
-export interface IBackendInfo {
-  hostname: string;
-  gitCommit: string;
-  version: string;
-}

backend/src/routes.ts

@@ -17,7 +17,6 @@ import transactionUtils from './api/transaction-utils';
 import blocks from './api/blocks';
 import loadingIndicators from './api/loading-indicators';
 import { Common } from './api/common';
-import bitcoinBaseApi from './api/bitcoin/bitcoin-base.api';
 
 class Routes {
   constructor() {}
@@ -56,7 +55,7 @@ class Routes {
       const result = websocketHandler.getInitData();
       res.json(result);
     } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
+      res.status(500).send(e.message);
     }
   }
 
@@ -75,7 +74,7 @@ class Routes {
       const result = mempoolBlocks.getMempoolBlocks();
       res.json(result);
     } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
+      res.status(500).send(e.message);
     }
   }
 
@@ -95,31 +94,6 @@ class Routes {
     res.json(times);
   }
 
-  public getCpfpInfo(req: Request, res: Response) {
-    if (!/^[a-fA-F0-9]{64}$/.test(req.params.txId)) {
-      res.status(501).send(`Invalid transaction ID.`);
-      return;
-    }
-
-    const tx = mempool.getMempool()[req.params.txId];
-    if (!tx) {
-      res.status(404).send(`Transaction doesn't exist in the mempool.`);
-      return;
-    }
-
-    if (tx.cpfpChecked) {
-      res.json({
-        ancestors: tx.ancestors,
-        bestDescendant: tx.bestDescendant || null,
-      });
-      return;
-    }
-
-    const cpfpInfo = Common.setRelativesAndGetCpfpInfo(tx, mempool.getMempool());
-
-    res.json(cpfpInfo);
-  }
-
   public getBackendInfo(req: Request, res: Response) {
     res.json(backendInfo.getBackendInfo());
   }
@@ -427,15 +401,6 @@ class Routes {
     }
   }
 
-  public getBisqMarketVolumes7d(req: Request, res: Response) {
-    const result = bisqMarket.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) {
@@ -478,24 +443,10 @@ class Routes {
       res.json(transaction);
     } catch (e) {
       let statusCode = 500;
-      if (e instanceof Error && e instanceof Error && e.message && e.message.indexOf('No such mempool or blockchain transaction') > -1) {
+      if (e.message && e.message.indexOf('No such mempool or blockchain transaction') > -1) {
         statusCode = 404;
       }
-      res.status(statusCode).send(e instanceof Error ? e.message : e);
+      res.status(statusCode).send(e.message || e);
-    }
-  }
-
-  public async getRawTransaction(req: Request, res: Response) {
-    try {
-      const transaction: IEsploraApi.Transaction = await bitcoinApi.$getRawTransaction(req.params.txId, true);
-      res.setHeader('content-type', 'text/plain');
-      res.send(transaction.hex);
-    } catch (e) {
-      let statusCode = 500;
-      if (e instanceof Error && e.message && e.message.indexOf('No such mempool or blockchain transaction') > -1) {
-        statusCode = 404;
-      }
-      res.status(statusCode).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -505,10 +456,10 @@ class Routes {
       res.json(transaction.status);
     } catch (e) {
       let statusCode = 500;
-      if (e instanceof Error && e.message && e.message.indexOf('No such mempool or blockchain transaction') > -1) {
+      if (e.message && e.message.indexOf('No such mempool or blockchain transaction') > -1) {
         statusCode = 404;
       }
-      res.status(statusCode).send(e instanceof Error ? e.message : e);
+      res.status(statusCode).send(e.message || e);
     }
   }
 
@@ -517,17 +468,7 @@ class Routes {
       const result = await bitcoinApi.$getBlock(req.params.hash);
       res.json(result);
     } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
+      res.status(500).send(e.message || e);
-    }
-  }
-
-  public async getBlockHeader(req: Request, res: Response) {
-    try {
-      const blockHeader = await bitcoinApi.$getBlockHeader(req.params.hash);
-      res.setHeader('content-type', 'text/plain');
-      res.send(blockHeader);
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
@@ -564,7 +505,7 @@ class Routes {
       res.json(returnBlocks);
     } catch (e) {
       loadingIndicators.setProgress('blocks', 100);
-      res.status(500).send(e instanceof Error ? e.message : e);
+      res.status(500).send(e.message || e);
     }
   }
 
@@ -583,13 +524,13 @@ class Routes {
           transactions.push(transaction);
           loadingIndicators.setProgress('blocktxs-' + req.params.hash, (i + 1) / endIndex * 100);
         } catch (e) {
-          logger.debug('getBlockTransactions error: ' + (e instanceof Error ? e.message : e));
+          logger.debug('getBlockTransactions error: ' + e.message || e);
         }
       }
       res.json(transactions);
     } catch (e) {
       loadingIndicators.setProgress('blocktxs-' + req.params.hash, 100);
-      res.status(500).send(e instanceof Error ? e.message : e);
+      res.status(500).send(e.message || e);
     }
   }
 
@@ -598,7 +539,7 @@ class Routes {
       const blockHash = await bitcoinApi.$getBlockHash(parseInt(req.params.height, 10));
       res.send(blockHash);
     } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
+      res.status(500).send(e.message || e);
     }
   }
 
@@ -612,10 +553,10 @@ class Routes {
       const addressData = await bitcoinApi.$getAddress(req.params.address);
       res.json(addressData);
     } catch (e) {
-      if (e instanceof Error && e.message && e.message.indexOf('exceeds') > 0) {
+      if (e.message && e.message.indexOf('exceeds') > 0) {
-        return res.status(413).send(e instanceof Error ? e.message : e);
+        return res.status(413).send(e.message);
       }
-      res.status(500).send(e instanceof Error ? e.message : e);
+      res.status(500).send(e.message || e);
     }
   }
 
@@ -629,10 +570,10 @@ class Routes {
       const transactions = await bitcoinApi.$getAddressTransactions(req.params.address, req.params.txId);
       res.json(transactions);
     } catch (e) {
-      if (e instanceof Error && e.message && e.message.indexOf('exceeds') > 0) {
+      if (e.message && e.message.indexOf('exceeds') > 0) {
-        return res.status(413).send(e instanceof Error ? e.message : e);
+        return res.status(413).send(e.message);
       }
-      res.status(500).send(e instanceof Error ? e.message : e);
+      res.status(500).send(e.message || e);
     }
   }
 
@@ -645,7 +586,7 @@ class Routes {
       const blockHash = await bitcoinApi.$getAddressPrefix(req.params.prefix);
       res.send(blockHash);
     } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
+      res.status(500).send(e.message || e);
     }
   }
 
@@ -666,7 +607,7 @@ class Routes {
       const rawMempool = await bitcoinApi.$getRawMempool();
       res.send(rawMempool);
     } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
+      res.status(500).send(e.message || e);
     }
   }
 
@@ -675,7 +616,7 @@ class Routes {
       const result = await bitcoinApi.$getBlockHeightTip();
       res.json(result);
     } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
+      res.status(500).send(e.message || e);
     }
   }
 
@@ -684,76 +625,13 @@ class Routes {
       const result = await bitcoinApi.$getTxIdsForBlock(req.params.hash);
       res.json(result);
     } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
+      res.status(500).send(e.message || e);
-    }
-  }
-
-  public async validateAddress(req: Request, res: Response) {
-    try {
-      const result = await bitcoinBaseApi.$validateAddress(req.params.address);
-      res.json(result);
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
     }
   }
 
   public getTransactionOutspends(req: Request, res: Response) {
     res.status(501).send('Not implemented');
   }
-
-  public getDifficultyChange(req: Request, res: Response) {
-    try {
-      const DATime = blocks.getLastDifficultyAdjustmentTime();
-      const previousRetarget = blocks.getPreviousDifficultyRetarget();
-      const blockHeight = blocks.getCurrentBlockHeight();
-
-      const now = new Date().getTime() / 1000;
-      const diff = now - DATime;
-      const blocksInEpoch = blockHeight % 2016;
-      const progressPercent = (blocksInEpoch >= 0) ? blocksInEpoch / 2016 * 100 : 100;
-      const remainingBlocks = 2016 - blocksInEpoch;
-      const nextRetargetHeight = blockHeight + remainingBlocks;
-
-      let difficultyChange = 0;
-      if (blocksInEpoch > 0) {
-        difficultyChange = (600 / (diff / blocksInEpoch ) - 1) * 100;
-      }
-      if (difficultyChange > 300) {
-        difficultyChange = 300;
-      }
-      if (difficultyChange < -75) {
-        difficultyChange = -75;
-      }
-
-      const timeAvgDiff = difficultyChange * 0.1;
-
-      let timeAvgMins = 10;
-      if (timeAvgDiff > 0) {
-        timeAvgMins -= Math.abs(timeAvgDiff);
-      } else {
-        timeAvgMins += Math.abs(timeAvgDiff);
-      }
-
-      const timeAvg = timeAvgMins * 60;
-      const remainingTime =  remainingBlocks * timeAvg;
-      const estimatedRetargetDate = remainingTime + now;
-
-      const result = {
-        progressPercent,
-        difficultyChange,
-        estimatedRetargetDate,
-        remainingBlocks,
-        remainingTime,
-        previousRetarget,
-        nextRetargetHeight,
-        timeAvg,
-      };
-      res.json(result);
-
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
 }
 
 export default new Routes();

docker/README.md

@@ -58,17 +58,15 @@ services:
       RPC_PORT: "8332"
       RPC_USER: "mempool"
       RPC_PASS: "mempool"
-      ELECTRUM_HOST: "127.0.0.1"
+      ELECTRS_HOST: "127.0.0.1"
-      ELECTRUM_PORT: "50002"
+      ELECTRS_PORT: "50002"
-      ELECTRUM_TLS: "false"
       MYSQL_HOST: "db"
       MYSQL_PORT: "3306"
       MYSQL_DATABASE: "mempool"
       MYSQL_USER: "mempool"
       MYSQL_PASS: "mempool"
       BACKEND_MAINNET_HTTP_PORT: "8999"
-      CACHE_DIR: "/backend/cache"
+      CACHE_DIR: "/backend/cache/"
-      MEMPOOL_CLEAR_PROTECTION_MINUTES: "20"
   db:
     image: mariadb:10.5.8
     user: "1000:1000"
@@ -85,7 +83,7 @@ services:
 
 ```
 
-You can update all the environment variables inside the API container, especially the RPC and ELECTRUM ones
+You can update all the environment variables inside the API container, especially the RPC and ELECTRS ones
 
 ## Run it
 

docker/backend/Dockerfile

@@ -5,7 +5,8 @@ COPY . .
 
 RUN apt-get update
 RUN apt-get install -y build-essential python3 pkg-config
-RUN npm install
+RUN npm ci --production
+RUN npm i typescript
 RUN npm run build
 
 FROM node:12-buster-slim

docker/backend/mempool-config.json

@@ -6,8 +6,7 @@
     "SPAWN_CLUSTER_PROCS": 0,
     "API_URL_PREFIX": "/api/v1/",
     "POLL_RATE_MS": 2000,
-    "CACHE_DIR": "__MEMPOOL_BACKEND_MAINNET_CACHE_DIR__",
+    "CACHE_DIR": "__MEMPOOL_BACKEND_MAINNET_CACHE_DIR__"
-    "CLEAR_PROTECTION_MINUTES": __MEMPOOL_BACKEND_CLEAR_PROTECTION_MINUTES__
   },
   "CORE_RPC": {
     "HOST": "__BITCOIN_MAINNET_RPC_HOST__",
@@ -16,9 +15,10 @@
     "PASSWORD": "__BITCOIN_MAINNET_RPC_PASS__"
   },
   "ELECTRUM": {
-    "HOST": "__ELECTRUM_MAINNET_HTTP_HOST__",
+    "HOST": "__ELECTRS_MAINNET_HTTP_HOST__",
-    "PORT": __ELECTRUM_MAINNET_HTTP_PORT__,
+    "PORT": __ELECTRS_MAINNET_HTTP_PORT__,
-    "TLS_ENABLED": __ELECTRUM_MAINNET_TLS_ENABLED__
+    "TLS_ENABLED": false,
+    "TX_LOOKUPS": true
   },
   "ESPLORA": {
     "REST_API_URL": "http://127.0.0.1:3000"

docker/backend/start.sh

@@ -2,17 +2,15 @@
 
 #MEMPOOL
 __MEMPOOL_BACKEND_MAINNET_HTTP_PORT__=${BACKEND_MAINNET_HTTP_PORT:=8999}
-__MEMPOOL_BACKEND_MAINNET_CACHE_DIR__=${CACHE_DIR:=./cache}
+__MEMPOOL_BACKEND_MAINNET_CACHE_DIR__=${CACHE_DIR:=./}
-__MEMPOOL_BACKEND_CLEAR_PROTECTION_MINUTES__=${MEMPOOL_CLEAR_PROTECTION_MINUTES:=20}
 # BITCOIN
 __BITCOIN_MAINNET_RPC_HOST__=${RPC_HOST:=127.0.0.1}
 __BITCOIN_MAINNET_RPC_PORT__=${RPC_PORT:=8332}
 __BITCOIN_MAINNET_RPC_USER__=${RPC_USER:=mempool}
 __BITCOIN_MAINNET_RPC_PASS__=${RPC_PASS:=mempool}
 # ELECTRUM
-__ELECTRUM_MAINNET_HTTP_HOST__=${ELECTRUM_HOST:=127.0.0.1}
+__ELECTRS_MAINNET_HTTP_HOST__=${ELECTRS_HOST:=127.0.0.1}
-__ELECTRUM_MAINNET_HTTP_PORT__=${ELECTRUM_PORT:=50002} # 50001?
+__ELECTRS_MAINNET_HTTP_PORT__=${ELECTRS_PORT:=50002}
-__ELECTRUM_MAINNET_TLS_ENABLED__=${ELECTRUM_TLS:=false}
 # MYSQL
 __MYSQL_HOST__=${MYSQL_HOST:=127.0.0.1}
 __MYSQL_PORT__=${MYSQL_PORT:=3306}
@@ -26,9 +24,8 @@ sed -i "s/__BITCOIN_MAINNET_RPC_HOST__/${__BITCOIN_MAINNET_RPC_HOST__}/g" mempoo
 sed -i "s/__BITCOIN_MAINNET_RPC_PORT__/${__BITCOIN_MAINNET_RPC_PORT__}/g" mempool-config.json
 sed -i "s/__BITCOIN_MAINNET_RPC_USER__/${__BITCOIN_MAINNET_RPC_USER__}/g" mempool-config.json
 sed -i "s/__BITCOIN_MAINNET_RPC_PASS__/${__BITCOIN_MAINNET_RPC_PASS__}/g" mempool-config.json
-sed -i "s/__ELECTRUM_MAINNET_HTTP_HOST__/${__ELECTRUM_MAINNET_HTTP_HOST__}/g" mempool-config.json
+sed -i "s/__ELECTRS_MAINNET_HTTP_HOST__/${__ELECTRS_MAINNET_HTTP_HOST__}/g" mempool-config.json
-sed -i "s/__ELECTRUM_MAINNET_HTTP_PORT__/${__ELECTRUM_MAINNET_HTTP_PORT__}/g" mempool-config.json
+sed -i "s/__ELECTRS_MAINNET_HTTP_PORT__/${__ELECTRS_MAINNET_HTTP_PORT__}/g" mempool-config.json
-sed -i "s/__ELECTRUM_MAINNET_TLS_ENABLED__/${__ELECTRUM_MAINNET_TLS_ENABLED__}/g" mempool-config.json
 sed -i "s/__MYSQL_HOST__/${__MYSQL_HOST__}/g" mempool-config.json
 sed -i "s/__MYSQL_PORT__/${__MYSQL_PORT__}/g" mempool-config.json
 sed -i "s/__MYSQL_DATABASE__/${__MYSQL_DATABASE__}/g" mempool-config.json
@@ -36,6 +33,5 @@ sed -i "s/__MYSQL_USERNAME__/${__MYSQL_USERNAME__}/g" mempool-config.json
 sed -i "s/__MYSQL_PASSWORD__/${__MYSQL_PASSWORD__}/g" mempool-config.json
 sed -i "s!__MEMPOOL_BACKEND_MAINNET_CACHE_DIR__!${__MEMPOOL_BACKEND_MAINNET_CACHE_DIR__}!g" mempool-config.json
 sed -i "s/__MEMPOOL_BACKEND_MAINNET_HTTP_PORT__/${__MEMPOOL_BACKEND_MAINNET_HTTP_PORT__}/g" mempool-config.json
-sed -i "s/__MEMPOOL_BACKEND_CLEAR_PROTECTION_MINUTES__/${__MEMPOOL_BACKEND_CLEAR_PROTECTION_MINUTES__}/g" mempool-config.json
 
 node /backend/dist/index.js

docker/docker-compose.yml

@@ -1,67 +0,0 @@
-version: "3.7"
-
-services:
-
-  electrum:
-    build:
-      context: .
-      dockerfile: docker/electrum/Dockerfile
-    user: "1000:1000"
-    restart: on-failure
-    command: ""
-    ports:
-      - 50001:50001
-      - 50002:50002
-      - 4224:4224
-      - 8332:8332
-    environment:
-      ELECTRUM: "electrum"
-      # add electrs configs
-  web:
-    image: mempool/frontend:latest
-    user: "1000:1000"
-    restart: on-failure
-    stop_grace_period: 1m
-    command: "./wait-for db:3306 --timeout=720 -- nginx -g 'daemon off;'"
-    ports:
-      - 80:8080
-    environment:
-      FRONTEND_HTTP_PORT: "8080"
-      BACKEND_MAINNET_HTTP_HOST: "api"
-  api:
-    image: mempool/backend:latest
-    user: "1000:1000"
-    restart: on-failure
-    stop_grace_period: 1m
-    command: "./wait-for-it.sh db:3306 --timeout=720 --strict -- ./start.sh"
-    volumes:
-      - ./data:/backend/cache
-    environment:
-      RPC_HOST: "127.0.0.1"
-      RPC_PORT: "8332"
-      RPC_USER: "mempool"
-      RPC_PASS: "mempool"
-      ELECTRUM_HOST: "127.0.0.1"
-      ELECTRUM_PORT: "50002"
-      ELECTRUM_TLS: "false"
-      MYSQL_HOST: "db"
-      MYSQL_PORT: "3306"
-      MYSQL_DATABASE: "mempool"
-      MYSQL_USER: "mempool"
-      MYSQL_PASS: "mempool"
-      BACKEND_MAINNET_HTTP_PORT: "8999"
-      CACHE_DIR: "/backend/cache"
-      MEMPOOL_CLEAR_PROTECTION_MINUTES: "20"
-  db:
-    image: mariadb:10.5.8
-    user: "1000:1000"
-    restart: on-failure
-    stop_grace_period: 1m
-    volumes:
-      - ./mysql/data:/var/lib/mysql
-      - ./mysql/db-scripts:/docker-entrypoint-initdb.d
-    environment:
-      MYSQL_DATABASE: "mempool"
-      MYSQL_USER: "mempool"
-      MYSQL_PASSWORD: "mempool"
-      MYSQL_ROOT_PASSWORD: "admin"

docker/electrum/Dockerfile

@@ -1,32 +0,0 @@
-FROM ubuntu:18.04
-MAINTAINER mempool.space developers
-EXPOSE 50002
-
-# runs as UID 1000 GID 1000 inside the container
-
-ENV VERSION 4.0.9
-RUN set -x \
-        && apt-get update \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gpg gpg-agent dirmngr \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends wget xpra python3-pyqt5 python3-wheel python3-pip python3-setuptools libsecp256k1-0 libsecp256k1-dev python3-numpy python3-dev build-essential \
-	&& wget -O /tmp/Electrum-${VERSION}.tar.gz https://download.electrum.org/${VERSION}/Electrum-${VERSION}.tar.gz \
-	&& wget -O /tmp/Electrum-${VERSION}.tar.gz.asc https://download.electrum.org/${VERSION}/Electrum-${VERSION}.tar.gz.asc \
-	&& gpg --keyserver keys.gnupg.net --recv-keys 6694D8DE7BE8EE5631BED9502BD5824B7F9470E6 \
-	&& gpg --verify /tmp/Electrum-${VERSION}.tar.gz.asc /tmp/Electrum-${VERSION}.tar.gz \
-	&& pip3 install /tmp/Electrum-${VERSION}.tar.gz \
-	&& test -f /usr/local/bin/electrum \
-	&& rm -vrf /tmp/Electrum-${VERSION}.tar.gz /tmp/Electrum-${VERSION}.tar.gz.asc ${HOME}/.gnupg \
-	&& apt-get purge --autoremove -y python3-wheel python3-pip python3-setuptools python3-dev build-essential libsecp256k1-dev curl gpg gpg-agent dirmngr \
-	&& apt-get clean && rm -rf /var/lib/apt/lists/* \
-	&& useradd -d /home/mempool -m mempool \
-	&& mkdir /electrum \
-	&& ln -s /electrum /home/mempool/.electrum \
-	&& chown mempool:mempool /electrum
-
-USER mempool
-ENV HOME /home/mempool
-WORKDIR /home/mempool
-VOLUME /electrum
-
-CMD ["/usr/bin/xpra", "start", ":100", "--start-child=/usr/local/bin/electrum", "--bind-tcp=0.0.0.0:50002","--daemon=yes", "--notifications=no", "--mdns=no", "--pulseaudio=no", "--html=off", "--speaker=disabled", "--microphone=disabled", "--webcam=no", "--printing=no", "--dbus-launch=", "--exit-with-children"]
-ENTRYPOINT ["electrum"]

docker/frontend/Dockerfile

@@ -1,9 +1,5 @@
 FROM node:12-buster-slim AS builder
 
-ARG commitHash
-ENV DOCKER_COMMIT_HASH=${commitHash}
-ENV CYPRESS_INSTALL_BINARY=0
-
 WORKDIR /build
 COPY . .
 RUN apt-get update

docker/scripts/get_image_digest.sh

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-VERSION=$1
-IMAGE=""
-
-if [ -z "${VERSION}" ]; then
-    echo "no version provided (i.e, v2.2.0), using latest tag"
-    VERSION="latest"
-fi
-
-for package in frontend backend; do
-  PACKAGE=mempool/"$package"
-  IMAGE="$PACKAGE":"$VERSION"
-  HASH=`docker pull $IMAGE > /dev/null && docker inspect $IMAGE | sed -n '/RepoDigests/{n;p;}' | grep -o '[0-9a-f]\{64\}'`
-  if [ -n "${HASH}" ]; then
-    echo "$IMAGE"@sha256:"$HASH"
-  fi
-done 

frontend/.gitignore

@@ -54,11 +54,3 @@ src/resources/pools.json
 # environment config
 mempool-frontend-config.json
 generated-config.js
-
-# e2e results
-cypress/videos
-cypress/screenshots
-
-# Base index
-src/index.html
-

frontend/README.md

@@ -16,13 +16,11 @@ https://www.transifex.com/mempool/mempool/dashboard/
 * French @Bayernatoor
 * Korean @kcalvinalvinn
 * Italian @HodlBits
-* Hebrew @Sh0ham
 * Georgian @wyd_idk
 * Hungarian @btcdragonlord
 * Dutch @m__btc
 * Japanese @wiz @japananon
 * Norwegian @T82771355
-* Polish @maciejsoltysiak
 * Portugese @jgcastro1985
 * Slovenian @thepkbadger
 * Finnish @bio_bitcoin
@@ -31,4 +29,3 @@ https://www.transifex.com/mempool/mempool/dashboard/
 * Ukrainian @volbil
 * Vietnamese @bitcoin_vietnam
 * Chinese @wdljt
-* Russian @TonyCrusoe @Bitconan

frontend/angular.json

@@ -1,8 +1,5 @@
 {
   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
-  "cli": {
-    "analytics": false
-  },
   "version": 1,
   "newProjectRoot": "projects",
   "projects": {
@@ -18,18 +15,14 @@
       "prefix": "app",
       "i18n": {
         "sourceLocale": {
-          "code": "en-US",
+          "code":"en-US",
-          "baseHref": "/"
+          "baseHref":"/"
         },
         "locales": {
           "ar": {
             "translation": "src/locale/messages.ar.xlf",
             "baseHref": "/ar/"
           },
-          "ca": {
-            "translation": "src/locale/messages.ca.xlf",
-            "baseHref": "/ca/"
-          },
           "cs": {
             "translation": "src/locale/messages.cs.xlf",
             "baseHref": "/cs/"
@@ -66,10 +59,6 @@
             "translation": "src/locale/messages.it.xlf",
             "baseHref": "/it/"
           },
-          "he": {
-            "translation": "src/locale/messages.he.xlf",
-            "baseHref": "/he/"
-          },
           "nl": {
             "translation": "src/locale/messages.nl.xlf",
             "baseHref": "/nl/"
@@ -78,10 +67,6 @@
             "translation": "src/locale/messages.nb.xlf",
             "baseHref": "/nb/"
           },
-          "pl": {
-            "translation": "src/locale/messages.pl.xlf",
-            "baseHref": "/pl/"
-          },
           "pt": {
             "translation": "src/locale/messages.pt.xlf",
             "baseHref": "/pt/"
@@ -117,14 +102,6 @@
           "zh": {
             "translation": "src/locale/messages.zh.xlf",
             "baseHref": "/zh/"
-          },
-          "ru": {
-            "translation": "src/locale/messages.ru.xlf",
-            "baseHref": "/ru/"
-          },
-          "hi": {
-            "translation": "src/locale/messages.hi.xlf",
-            "baseHref": "/hi/"
           }
         }
       },
@@ -162,6 +139,7 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
+              "extractCss": true,
               "namedChunks": false,
               "extractLicenses": true,
               "vendorChunk": false,
@@ -188,22 +166,6 @@
           "configurations": {
             "production": {
               "browserTarget": "mempool:build:production"
-            },
-            "local": {
-              "proxyConfig": "proxy.conf.json",
-              "verbose": true
-            },
-            "staging": {
-              "proxyConfig": "proxy.stg.conf.json",
-              "disableHostCheck": true,
-              "host": "0.0.0.0",
-              "verbose": true
-            },
-            "local-prod": {
-              "proxyConfig": "proxy.conf.js",
-              "disableHostCheck": true,
-              "host": "0.0.0.0",
-              "verbose": false
             }
           }
         },
@@ -236,8 +198,8 @@
             "tsConfig": [
               "tsconfig.app.json",
               "tsconfig.spec.json",
-              "tsconfig.server.json",
+              "e2e/tsconfig.json",
-              "cypress/tsconfig.json"
+              "tsconfig.server.json"
             ],
             "exclude": [
               "**/node_modules/**"
@@ -245,11 +207,10 @@
           }
         },
         "e2e": {
-          "builder": "@cypress/schematic:cypress",
+          "builder": "@angular-devkit/build-angular:protractor",
           "options": {
-            "devServerTarget": "mempool:serve:local-prod",
+            "protractorConfig": "e2e/protractor.conf.js",
-            "watch": true,
+            "devServerTarget": "mempool:serve"
-            "headless": false
           },
           "configurations": {
             "production": {
@@ -304,27 +265,8 @@
           "configurations": {
             "production": {}
           }
-        },
-        "cypress-run": {
-          "builder": "@cypress/schematic:cypress",
-          "options": {
-            "devServerTarget": "mempool:serve"
-          },
-          "configurations": {
-            "production": {
-              "devServerTarget": "mempool:serve:production"
-            }
-          }
-        },
-        "cypress-open": {
-          "builder": "@cypress/schematic:cypress",
-          "options": {
-            "watch": true,
-            "headless": false
-          }
         }
       }
-    }
+    }},
-  },
   "defaultProject": "mempool"
 }

frontend/cypress.json

@@ -1,15 +0,0 @@
-{
-  "projectId": "ry4br7",
-  "integrationFolder": "cypress/integration",
-  "supportFile": "cypress/support/index.ts",
-  "videosFolder": "cypress/videos",
-  "screenshotsFolder": "cypress/screenshots",
-  "pluginsFile": "cypress/plugins/index.js",
-  "fixturesFolder": "cypress/fixtures",
-  "baseUrl": "http://localhost:4200",
-  "video": false,
-  "retries": {
-    "runMode": 3,
-    "openMode": 0
-  }
-}

frontend/cypress/fixtures/assets.json

@@ -1,119 +0,0 @@
-{
-    "f59c5f3e8141f322276daa63ed5f307085808aea6d4ef9ba61e28154533fdec7": {
-      "asset_id": "f59c5f3e8141f322276daa63ed5f307085808aea6d4ef9ba61e28154533fdec7",
-      "contract": {
-        "entity": {
-          "domain": "listedreserve.com"
-        },
-        "issuer_pubkey": "031cc579d142a03b33cdd745922112821c16e5e8b74e3bd57f16f7fda872b6f1d0",
-        "name": "Liquid AUD",
-        "precision": 2,
-        "ticker": "AUDL",
-        "version": 0
-      },
-      "issuance_txin": {
-        "txid": "e5c5144ba3dc48259ae29023fe9f7775dec1fc049f456dd3d1f7178e31901fb5",
-        "vin": 0
-      },
-      "issuance_prevout": {
-        "txid": "ed48be2e035ffa425d2c6faaa82b6a7b648aed1246b6ac76c72e0408db8cf057",
-        "vout": 1
-      },
-      "name": "Liquid AUD",
-      "ticker": "AUDL",
-      "precision": 2,
-      "entity": {
-        "domain": "listedreserve.com"
-      },
-      "version": 0,
-      "issuer_pubkey": "031cc579d142a03b33cdd745922112821c16e5e8b74e3bd57f16f7fda872b6f1d0"
-    },
-    "0e99c1a6da379d1f4151fb9df90449d40d0608f6cb33a5bcbfc8c265f42bab0a": {
-      "asset_id": "0e99c1a6da379d1f4151fb9df90449d40d0608f6cb33a5bcbfc8c265f42bab0a",
-      "contract": {
-        "entity": {
-          "domain": "lcad.bullbitcoin.com"
-        },
-        "issuer_pubkey": "027fa34026195b05f3aa217335416811dca4f5b579d00271a1bb6304c0152458a8",
-        "name": "Liquid CAD",
-        "precision": 8,
-        "ticker": "LCAD",
-        "version": 0
-      },
-      "issuance_txin": {
-        "txid": "238badf029cadcf546d90ce23c7eafc2fa2082585c9bd62dc26f1aa11c7bd850",
-        "vin": 0
-      },
-      "issuance_prevout": {
-        "txid": "a87f13917c08c7ccd8eddb1830c5c9a2bcd59c7d167e9d528659ba40808a6b76",
-        "vout": 0
-      },
-      "name": "Liquid CAD",
-      "ticker": "LCAD",
-      "precision": 8,
-      "entity": {
-        "domain": "lcad.bullbitcoin.com"
-      },
-      "version": 0,
-      "issuer_pubkey": "027fa34026195b05f3aa217335416811dca4f5b579d00271a1bb6304c0152458a8"
-    },
-    "3438ecb49fc45c08e687de4749ed628c511e326460ea4336794e1cf02741329e": {
-      "asset_id": "3438ecb49fc45c08e687de4749ed628c511e326460ea4336794e1cf02741329e",
-      "contract": {
-        "entity": {
-          "domain": "settlenet.io"
-        },
-        "issuer_pubkey": "037b09d542bf7cea6a19fa624b4441790c1a6e44823597bf190e981a846a196541",
-        "name": "SETTLENET JPY Stablecoin by Crypto Garage",
-        "precision": 0,
-        "ticker": "JPYS",
-        "version": 0
-      },
-      "issuance_txin": {
-        "txid": "e33ad5ce8879297d8bfa7daa193920b94abd3fb12f4e8dade9543dbb292387cb",
-        "vin": 0
-      },
-      "issuance_prevout": {
-        "txid": "328c4fadd817ea75e634e3648eb4be0bf7e669539b8da921c0f77af3bc148894",
-        "vout": 1
-      },
-      "name": "SETTLENET JPY Stablecoin by Crypto Garage",
-      "ticker": "JPYS",
-      "precision": 0,
-      "entity": {
-        "domain": "settlenet.io"
-      },
-      "version": 0,
-      "issuer_pubkey": "037b09d542bf7cea6a19fa624b4441790c1a6e44823597bf190e981a846a196541"
-    },
-    "ce091c998b83c78bb71a632313ba3760f1763d9cfcffae02258ffa9865a37bd2": {
-      "asset_id": "ce091c998b83c78bb71a632313ba3760f1763d9cfcffae02258ffa9865a37bd2",
-      "contract": {
-        "entity": {
-          "domain": "tether.to"
-        },
-        "issuer_pubkey": "0337cceec0beea0232ebe14cba0197a9fbd45fcf2ec946749de920e71434c2b904",
-        "name": "Tether USD",
-        "precision": 8,
-        "ticker": "USDt",
-        "version": 0
-      },
-      "issuance_txin": {
-        "txid": "abb4080d91849e933ee2ed65da6b436f7c385cf363fb4aa08399f1e27c58ff3d",
-        "vin": 0
-      },
-      "issuance_prevout": {
-        "txid": "9596d259270ef5bac0020435e6d859aea633409483ba64e232b8ba04ce288668",
-        "vout": 0
-      },
-      "name": "Tether USD",
-      "ticker": "USDt",
-      "precision": 8,
-      "entity": {
-        "domain": "tether.to"
-      },
-      "version": 0,
-      "issuer_pubkey": "0337cceec0beea0232ebe14cba0197a9fbd45fcf2ec946749de920e71434c2b904"
-    }
-  }
-  

frontend/cypress/fixtures/assets.minimal.json

@@ -1,33 +0,0 @@
-{
-    "f59c5f3e8141f322276daa63ed5f307085808aea6d4ef9ba61e28154533fdec7": [
-      "listedreserve.com",
-      "AUDL",
-      "Liquid AUD",
-      2
-    ],
-    "0e99c1a6da379d1f4151fb9df90449d40d0608f6cb33a5bcbfc8c265f42bab0a": [
-      "lcad.bullbitcoin.com",
-      "LCAD",
-      "Liquid CAD",
-      8
-    ],
-    "6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d": [
-      null,
-      "L-BTC",
-      "Liquid Bitcoin",
-      8
-    ],
-    "ce091c998b83c78bb71a632313ba3760f1763d9cfcffae02258ffa9865a37bd2": [
-      "tether.to",
-      "USDt",
-      "Tether USD",
-      8
-    ],
-    "3438ecb49fc45c08e687de4749ed628c511e326460ea4336794e1cf02741329e": [
-      "settlenet.io",
-      "JPYS",
-      "SETTLENET JPY Stablecoin by Crypto Garage",
-      0
-    ]
-  }
-  

frontend/cypress/fixtures/mainnet_live2hchart.json

@@ -1 +0,0 @@
-{"live-2h-chart":{"id":1319298,"added":"2021-07-23T18:27:34.000Z","unconfirmed_transactions":546,"tx_per_second":3.93333,"vbytes_per_second":1926,"mempool_byte_weight":1106656,"total_fee":6198583,"vsizes":[255,18128,43701,58534,17144,5532,4483,1759,2394,1089,1683,7409,751,101010,1151,592,1497,703,1369,4747,800,1221,0,0,712,0,0,0,0,0,0,0,0,0,0,0,0,0]}}

frontend/cypress/integration/bisq/bisq.spec.ts

@@ -1,88 +0,0 @@
-describe('Bisq', () => {
-    let baseModule;
-    beforeEach(() => {
-        baseModule = (Cypress.env('BASE_MODULE') && Cypress.env('BASE_MODULE') === 'bisq') ? '' : '/bisq';
-
-        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');
-        
-        Cypress.Commands.add('waitForDashboard', () => {
-            cy.wait('@socket');
-            cy.wait('@hloc');
-            cy.wait('@ticker');
-            cy.wait('@markets');
-            cy.wait('@7d');
-            cy.wait('@trades');
-          });
-    });
-
-    if (Cypress.env("BASE_MODULE") === '' || Cypress.env("BASE_MODULE") !== 'liquid') {
-
-        it('loads the dashboard', () => {
-            cy.visit(`${baseModule}`);
-            cy.waitForSkeletonGone();
-        });
-
-        it('loads the transactions screen', () => {
-            cy.visit(`${baseModule}`);
-            cy.waitForSkeletonGone();
-            cy.get('li:nth-of-type(2) > a').click().then(() => {
-                cy.get('.table > tr').should('have.length', 50);
-            });
-        });
-
-        it('loads the blocks screen', () => {
-            cy.visit(`${baseModule}`);
-            cy.waitForSkeletonGone();
-            cy.get('li:nth-of-type(3) > a').click().then(() => {
-                cy.wait('@blocks');
-                cy.get('tbody tr').should('have.length', 10);
-            });
-        });
-
-        it('loads the stats screen', () => {
-            cy.visit(`${baseModule}`);
-            cy.waitForSkeletonGone();
-            cy.get('li:nth-of-type(4) > a').click().then(() => {
-                cy.wait('@stats');
-            });
-        });
-
-        it('loads the api screen', () => {
-            cy.visit(`${baseModule}`);
-            cy.waitForSkeletonGone();
-            cy.get('li:nth-of-type(5) > a').click().then(() => {
-                cy.get('.card').should('have.length.at.least', 1);
-                cy.get('.card').first().click();
-                cy.get('.card-body');
-            });
-        });
-
-        it('shows blocks pagination with 5 pages (desktop)', () => {
-            cy.viewport(760, 800);
-            cy.visit(`${baseModule}/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(`${baseModule}/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");
-    }
-  });

frontend/cypress/integration/liquid/liquid.spec.ts

@@ -1,147 +0,0 @@
-describe('Liquid', () => {
-    let baseModule;
-    beforeEach(() => {
-        baseModule = (Cypress.env('BASE_MODULE') && Cypress.env('BASE_MODULE') === 'liquid') ? '' : '/liquid';
-
-        cy.intercept('/liquid/api/block/**').as('block');
-        cy.intercept('/liquid/api/blocks/').as('blocks');
-        cy.intercept('/liquid/api/tx/**/outspends').as('outspends');
-        cy.intercept('/liquid/api/block/**/txs/**').as('block-txs');
-        cy.intercept('/resources/pools.json').as('pools');
-
-        Cypress.Commands.add('waitForBlockData', () => {
-            cy.wait('@socket');
-            cy.wait('@block');
-            cy.wait('@outspends');
-          });
-    });
-
-    if (Cypress.env("BASE_MODULE") === '' || Cypress.env("BASE_MODULE") !== 'bisq') {
-
-        it('loads the dashboard', () => {
-            cy.visit(`${baseModule}`);
-            cy.waitForSkeletonGone();
-        });
-
-        it('loads the blocks page', () => {
-            cy.visit(`${baseModule}/blocks`);
-            cy.waitForSkeletonGone();
-        });
-
-        it('loads a specific block page', () => {
-            cy.visit(`${baseModule}/block/7e1369a23a5ab861e7bdede2aadcccae4ea873ffd9caf11c7c5541eb5bcdff54`);
-            cy.waitForSkeletonGone();
-        });
-
-        it('loads the graphs page', () => {
-            cy.visit(`${baseModule}/graphs`);
-            cy.waitForSkeletonGone();
-        });
-
-        it('loads the tv page - desktop', () => {
-            cy.visit(`${baseModule}`);
-            cy.waitForSkeletonGone();
-            cy.get('li:nth-of-type(3) > a').click().then(() => {
-                cy.wait(1000);
-            });
-        });
-
-        it('loads the graphs page - mobile', () => {
-            cy.visit(`${baseModule}`)
-            cy.waitForSkeletonGone();
-            cy.get('li:nth-of-type(3) > a').click().then(() => {
-                cy.viewport('iphone-6');
-                cy.wait(1000);
-                cy.get('.tv-only').should('not.exist');
-            });
-        });
-
-        describe('assets', () => {
-            it('shows the assets screen', () => {
-                cy.visit(`${baseModule}/assets`);
-                cy.waitForSkeletonGone();
-                cy.get('table tr').should('have.length.at.least', 5);
-            });
-
-            it('allows searching assets', () => {
-                cy.visit(`${baseModule}/assets`);
-                cy.waitForSkeletonGone();
-                cy.get('.container-xl input').click().type('Liquid Bitcoin').then(() => {
-                    cy.get('table tr').should('have.length', 1);
-                });
-            });
-
-            it('shows a specific asset ID', () => {
-                cy.visit(`${baseModule}/assets`);
-                cy.waitForSkeletonGone();
-                cy.get('.container-xl input').click().type('Liquid AUD').then(() => {
-                    cy.get('table tr td:nth-of-type(1) a').click();
-                });
-            });
-        });
-
-
-        describe('unblinded TX', () => {
-
-            it('should not show an unblinding error message for regular txs', () => {
-                cy.visit(`${baseModule}/tx/82a479043ec3841e0d3f829afc8df4f0e2bbd675a13f013ea611b2fde0027d45`);
-                cy.waitForSkeletonGone();
-                cy.get('.error-unblinded' ).should('not.exist');
-            });
-
-            it('show unblinded TX', () => {
-                cy.visit(`${baseModule}/tx/f2f41c0850e8e7e3f1af233161fd596662e67c11ef10ed15943884186fbb7f46#blinded=100000,6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d,0ab9f70650f16b1db8dfada05237f7d0d65191c3a13183da8a2ddddfbde9a2ad,fd98b2edc5530d76acd553f206a431f4c1fab27e10e290ad719582af878e98fc,2364760,6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d,90c7a43b15b905bca045ca42a01271cfe71d2efe3133f4197792c24505cb32ed,12eb5959d9293b8842e7dd8bc9aa9639fd3fd031c5de3ba911adeca94eb57a3a`);
-                cy.waitForSkeletonGone();
-                cy.get('#table-tx-vin tr').should('have.class', 'assetBox');
-                cy.get('#table-tx-vout tr').should('have.class', 'assetBox');
-            });
-
-            it('show empty unblinded TX', () => {
-                cy.visit(`${baseModule}/tx/f2f41c0850e8e7e3f1af233161fd596662e67c11ef10ed15943884186fbb7f46#blinded=`);
-                cy.waitForSkeletonGone();
-                cy.get('#table-tx-vin tr').should('have.class', '');
-                cy.get('#table-tx-vout tr').should('have.class', '');
-            });
-
-            it('show invalid unblinded TX hex', () => {
-                cy.visit(`${baseModule}/tx/f2f41c0850e8e7e3f1af233161fd596662e67c11ef10ed15943884186fbb7f46#blinded=123`);
-                cy.waitForSkeletonGone();
-                cy.get('#table-tx-vin tr').should('have.class', '');
-                cy.get('#table-tx-vout tr').should('have.class', '');
-                cy.get('.error-unblinded' ).contains('Error: Invalid blinding data (invalid hex)');
-            });
-
-            it('show first unblinded vout', () => {
-                cy.visit(`${baseModule}/tx/f2f41c0850e8e7e3f1af233161fd596662e67c11ef10ed15943884186fbb7f46#blinded=100000,6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d,0ab9f70650f16b1db8dfada05237f7d0d65191c3a13183da8a2ddddfbde9a2ad,fd98b2edc5530d76acd553f206a431f4c1fab27e10e290ad719582af878e98fc`);
-                cy.waitForSkeletonGone();
-                cy.get('#table-tx-vout tr:first-child()').should('have.class', 'assetBox');
-            });
-
-            it('show second unblinded vout', () => {
-                cy.visit(`${baseModule}/tx/f2f41c0850e8e7e3f1af233161fd596662e67c11ef10ed15943884186fbb7f46#blinded=2364760,6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d,90c7a43b15b905bca045ca42a01271cfe71d2efe3133f4197792c24505cb32ed,12eb5959d9293b8842e7dd8bc9aa9639fd3fd031c5de3ba911adeca94eb57a3a`);
-                cy.get('#table-tx-vout tr').should('have.class', 'assetBox');
-            });
-
-            it('show invalid error unblinded TX', () => {
-                cy.visit(`${baseModule}/tx/f2f41c0850e8e7e3f1af233161fd596662e67c11ef10ed15943884186fbb7f46#blinded=100000,6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d,0ab9f70650f16b1db8dfada05237f7d0d65191c3a13183da8a2ddddfbde9a2ad,fd98b2edc5530d76acd553f206a431f4c1fab27e10e290ad719582af878e98fc,2364760,6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d,90c7a43b15b905bca045ca42a01271cfe71d2efe3133f4197792c24505cb32ed,12eb5959d9293b8842e7dd8bc9aa9639fd3fd031c5de3ba911adeca94eb57a3c`);
-                cy.waitForSkeletonGone();
-                cy.get('#table-tx-vout tr').should('have.class', 'assetBox');
-                cy.get('.error-unblinded' ).contains('Error: Invalid blinding data.');
-            });
-
-            it('shows asset peg in/out and burn transactions', () => {
-                cy.visit(`${baseModule}/asset/6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d`);
-                cy.waitForSkeletonGone();
-                cy.get('#table-tx-vout tr').not('.assetBox');
-                cy.get('#table-tx-vin tr').not('.assetBox');
-            });
-
-            it('prevents regressing issue #644', () => {
-                cy.visit(`${baseModule}/tx/393b890966f305e7c440fcfb12a13f51a7a9011cc59ff5f14f6f93214261bd82`);
-                cy.waitForSkeletonGone();
-            });
-        });
-    } else {
-        it.skip("Tests cannot be run on the selected BASE_MODULE");
-    }
-});

frontend/cypress/integration/mainnet/mainnet.spec.ts

@@ -1,368 +0,0 @@
-import { emitMempoolInfo, dropWebSocket } from "../../support/websocket";
-
-describe('Mainnet', () => {
-    beforeEach(() => {
-        //cy.intercept('/sockjs-node/info*').as('socket');
-        cy.intercept('/api/block-height/*').as('block-height');
-        cy.intercept('/api/block/*').as('block');
-        cy.intercept('/api/block/*/txs/0').as('block-txs');
-        cy.intercept('/api/tx/*/outspends').as('tx-outspends');
-        cy.intercept('/resources/pools.json').as('pools');
-
-        // Search Auto Complete
-        cy.intercept('/api/address-prefix/1wiz').as('search-1wiz');
-        cy.intercept('/api/address-prefix/1wizS').as('search-1wizS');
-        cy.intercept('/api/address-prefix/1wizSA').as('search-1wizSA');
-
-        Cypress.Commands.add('waitForBlockData', () => {
-            cy.wait('@tx-outspends');
-            cy.wait('@pools');
-        });
-    });
-
-    if (Cypress.env("BASE_MODULE") === '' || Cypress.env("BASE_MODULE") === 'mempool') {
-
-        it('loads the status screen', () => {
-            cy.visit('/status');
-            cy.get('#mempool-block-0').should('be.visible');
-            cy.get('[id^="bitcoin-block-"]').should('have.length', 8);
-            cy.get('.footer').should('be.visible');
-            cy.get('.row > :nth-child(1)').invoke('text').then((text) => {
-                expect(text).to.match(/Tx vBytes per second:.* vB\/s/);
-            });
-            cy.get('.row > :nth-child(2)').invoke('text').then((text) => {
-                expect(text).to.match(/Unconfirmed:(.*)/);
-            });
-            cy.get('.row > :nth-child(3)').invoke('text').then((text) => {
-                expect(text).to.match(/Mempool size:(.*) (kB|MB) \((\d+) (block|blocks)\)/);
-            });
-        });
-
-        it('loads dashboard, drop websocket and reconnect', () => {
-            cy.viewport('macbook-16');
-            cy.mockMempoolSocket();
-            cy.visit('/');
-            cy.get('.badge').should('not.exist');
-            dropWebSocket();
-            cy.get('.badge').should('be.visible');
-            cy.get('.badge', {timeout: 25000}).should('not.exist');
-            emitMempoolInfo({
-                'params': {
-                loaded: true
-                }
-            });
-            cy.get(':nth-child(1) > #bitcoin-block-0').should('not.exist');
-            cy.get(':nth-child(2) > #bitcoin-block-0').should('not.exist');
-            cy.get(':nth-child(3) > #bitcoin-block-0').should('not.exist');
-        });
-
-        it('loads the dashboard', () => {
-            cy.visit('/');
-            cy.waitForSkeletonGone();
-        });
-
-        describe('search', () => {
-            it('allows searching for partial Bitcoin addresses', () => {
-                cy.visit('/');
-                cy.get('.search-box-container > .form-control').type('1wiz').then(() => {
-                    cy.wait('@search-1wiz');
-                    cy.get('ngb-typeahead-window button.dropdown-item').should('have.length', 10);
-                });
-
-                cy.get('.search-box-container > .form-control').type('S').then(() => {
-                    cy.wait('@search-1wizS');
-                    cy.get('ngb-typeahead-window button.dropdown-item').should('have.length', 5);
-                });
-
-                cy.get('.search-box-container > .form-control').type('A').then(() => {
-                    cy.wait('@search-1wizSA');
-                    cy.get('ngb-typeahead-window button.dropdown-item').should('have.length', 1)
-                });
-
-                cy.get('ngb-typeahead-window button.dropdown-item.active').click().then(() => {
-                    cy.url().should('include', '/address/1wizSAYSbuyXbt9d8JV8ytm5acqq2TorC');
-                    cy.waitForSkeletonGone();
-                    cy.get('.text-center').should('not.have.text', 'Invalid Bitcoin address');
-                });
-            });
-
-            ['BC1PQYQSZQ', 'bc1PqYqSzQ'].forEach((searchTerm) => {
-                it(`allows searching for partial case insensitive bc1 addresses: ${searchTerm}`, () => {
-                    cy.visit('/');
-                    cy.get('.search-box-container > .form-control').type(searchTerm).then(() => {
-                        cy.get('ngb-typeahead-window button.dropdown-item').should('have.length', 1);
-                        cy.get('ngb-typeahead-window button.dropdown-item.active').click().then(() => {
-                            cy.url().should('include', '/address/bc1pqyqszqgpqyqszqgpqyqszqgpqyqszqgpqyqszqgpqyqszqgpqyqs3wf0qm');
-                            cy.waitForSkeletonGone();
-                            cy.get('.text-center').should('not.have.text', 'Invalid Bitcoin address');
-                        });
-                    });
-                });
-            });
-        });
-
-        describe('blocks navigation', () => {
-
-            describe('keyboard events', () => {
-                it('loads first blockchain blocks visible and keypress arrow right', () => {
-                    cy.viewport('macbook-16');
-                    cy.visit('/');
-                    cy.waitForSkeletonGone();
-                    cy.get('.blockchain-blocks-0 > a').click().then(() => {
-                        cy.get('[ngbtooltip="Next Block"] > .ng-fa-icon > .svg-inline--fa').should('not.exist');
-                        cy.get('[ngbtooltip="Previous Block"] > .ng-fa-icon > .svg-inline--fa').should('be.visible');
-                        cy.waitForPageIdle();
-                        cy.document().right();
-                        cy.get('[ngbtooltip="Next Block"] > .ng-fa-icon > .svg-inline--fa').should('be.visible');
-                        cy.get('[ngbtooltip="Previous Block"] > .ng-fa-icon > .svg-inline--fa').should('be.visible');
-                    });
-                });
-
-                it('loads first blockchain blocks visible and keypress arrow left', () => {
-                    cy.viewport('macbook-16');
-                    cy.visit('/');
-                    cy.waitForSkeletonGone();
-                    cy.get('.blockchain-blocks-0 > a').click().then(() => {
-                        cy.waitForPageIdle();
-                        cy.get('[ngbtooltip="Next Block"] > .ng-fa-icon > .svg-inline--fa').should('not.exist');
-                        cy.get('[ngbtooltip="Previous Block"] > .ng-fa-icon > .svg-inline--fa').should('be.visible');
-                        cy.document().left();
-                        cy.get('.title-block h1').invoke('text').should('equal', 'Next block');
-                    });
-                });
-
-                it('loads last blockchain blocks and keypress arrow right', () => {
-                    cy.viewport('macbook-16');
-                    cy.visit('/');
-                    cy.waitForSkeletonGone();
-                    cy.get('.blockchain-blocks-4 > a').click().then(() => {
-                        cy.waitForPageIdle();
-
-                        // block 6
-                        cy.document().right();
-                        cy.wait(5000);
-                        cy.get('[ngbtooltip="Next Block"] > .ng-fa-icon > .svg-inline--fa').should('be.visible');
-                        cy.get('[ngbtooltip="Previous Block"] > .ng-fa-icon > .svg-inline--fa').should('be.visible');
-
-                        // block 7
-                        cy.document().right();
-                        cy.wait(5000);
-                        cy.get('[ngbtooltip="Next Block"] > .ng-fa-icon > .svg-inline--fa').should('be.visible');
-                        cy.get('[ngbtooltip="Previous Block"] > .ng-fa-icon > .svg-inline--fa').should('be.visible');
-
-                        // block 8 - last visible block
-                        cy.document().right();
-                        cy.wait(5000);
-                        cy.get('[ngbtooltip="Next Block"] > .ng-fa-icon > .svg-inline--fa').should('be.visible');
-                        cy.get('[ngbtooltip="Previous Block"] > .ng-fa-icon > .svg-inline--fa').should('be.visible');
-
-                        // block 9 - not visible at the blochchain blocks visible block
-                        cy.document().right();
-                        cy.wait(5000);
-                        cy.get('[ngbtooltip="Next Block"] > .ng-fa-icon > .svg-inline--fa').should('be.visible');
-                        cy.get('[ngbtooltip="Previous Block"] > .ng-fa-icon > .svg-inline--fa').should('be.visible');
-
-                    });
-                });
-
-                it('loads genesis block and keypress arrow right', () => {
-                    cy.viewport('macbook-16');
-                    cy.visit('/block/0');
-                    cy.waitForSkeletonGone();
-                    cy.waitForPageIdle();
-
-                    cy.document().right();
-                    cy.wait(5000);
-                    cy.get('[ngbtooltip="Next Block"] > .ng-fa-icon > .svg-inline--fa').should('be.visible');
-                    cy.get('[ngbtooltip="Previous Block"] > .ng-fa-icon > .svg-inline--fa').should('not.exist');
-                });
-
-                it('loads genesis block and keypress arrow left', () => {
-                    cy.viewport('macbook-16');
-                    cy.visit('/block/0');
-                    cy.waitForSkeletonGone();
-                    cy.waitForPageIdle();
-
-                    cy.document().left();
-                    cy.wait(5000);
-                    cy.get('[ngbtooltip="Next Block"] > .ng-fa-icon > .svg-inline--fa').should('be.visible');
-                    cy.get('[ngbtooltip="Previous Block"] > .ng-fa-icon > .svg-inline--fa').should('be.visible');
-                });
-            });
-            describe('mouse events', () => {
-                it('loads first blockchain blocks visible and click on the arrow right', () => {
-                    cy.viewport('macbook-16');
-                    cy.visit('/');
-                    cy.waitForSkeletonGone();
-                    cy.get('.blockchain-blocks-0 > a').click().then(() => {
-                        cy.waitForPageIdle();
-                        cy.get('[ngbtooltip="Next Block"] > .ng-fa-icon > .svg-inline--fa').should('not.exist');
-                        cy.get('[ngbtooltip="Previous Block"] > .ng-fa-icon > .svg-inline--fa').should('be.visible');
-                        cy.get('[ngbtooltip="Previous Block"] > .ng-fa-icon > .svg-inline--fa').click().then(() => {
-                            cy.get('[ngbtooltip="Next Block"] > .ng-fa-icon > .svg-inline--fa').should('be.visible');
-                            cy.get('[ngbtooltip="Previous Block"] > .ng-fa-icon > .svg-inline--fa').should('be.visible');
-                        });
-                    });
-                });
-
-                it('loads genesis block and click on the arrow left', () => {
-                    cy.viewport('macbook-16');
-                    cy.visit('/block/0');
-                    cy.waitForSkeletonGone();
-                    cy.waitForPageIdle();
-                    cy.get('[ngbtooltip="Next Block"] > .ng-fa-icon > .svg-inline--fa').should('be.visible');
-                    cy.get('[ngbtooltip="Previous Block"] > .ng-fa-icon > .svg-inline--fa').should('not.exist');
-                    cy.get('[ngbtooltip="Next Block"] > .ng-fa-icon > .svg-inline--fa').click().then(() => {
-                        cy.get('[ngbtooltip="Next Block"] > .ng-fa-icon > .svg-inline--fa').should('be.visible');
-                        cy.get('[ngbtooltip="Previous Block"] > .ng-fa-icon > .svg-inline--fa').should('be.visible');
-                    });
-                });
-            });
-        });
-
-
-        it('loads skeleton when changes between networks', () => {
-            cy.visit('/');
-            cy.waitForSkeletonGone();
-
-            cy.changeNetwork("testnet");
-            cy.changeNetwork("signet");
-            cy.changeNetwork("liquid");
-            cy.changeNetwork("mainnet");
-            cy.changeNetwork("bisq");
-        });
-
-        it('loads the dashboard with the skeleton blocks', () => {
-            cy.mockMempoolSocket();
-            cy.visit("/");
-            cy.get(':nth-child(1) > #bitcoin-block-0').should('be.visible');
-            cy.get(':nth-child(2) > #bitcoin-block-0').should('be.visible');
-            cy.get(':nth-child(3) > #bitcoin-block-0').should('be.visible');
-            cy.get('#mempool-block-0').should('be.visible');
-            cy.get('#mempool-block-1').should('be.visible');
-            cy.get('#mempool-block-2').should('be.visible');
-
-            emitMempoolInfo({
-                'params': {
-                loaded: true
-                }
-            });
-
-            cy.get(':nth-child(1) > #bitcoin-block-0').should('not.exist');
-            cy.get(':nth-child(2) > #bitcoin-block-0').should('not.exist');
-            cy.get(':nth-child(3) > #bitcoin-block-0').should('not.exist');
-        });
-
-        it('loads the blocks screen', () => {
-            cy.visit('/');
-            cy.waitForSkeletonGone();
-            cy.get('li:nth-of-type(2) > a').click().then(() => {
-                cy.waitForPageIdle();
-            });
-        });
-
-        it('loads the graphs screen', () => {
-            cy.visit('/');
-            cy.waitForSkeletonGone();
-            cy.get('li:nth-of-type(3) > a').click().then(() => {
-                cy.wait(1000);
-            });
-        });
-
-        it('loads the tv screen - desktop', () => {
-            cy.viewport('macbook-16');
-            cy.visit('/');
-            cy.waitForSkeletonGone();
-            cy.get('li:nth-of-type(4) > a').click().then(() => {
-                cy.viewport('macbook-16');
-                cy.get('.chart-holder');
-                cy.get('.blockchain-wrapper').should('be.visible');
-                cy.get('#mempool-block-0').should('be.visible');
-            });
-        });
-
-        it('loads the tv screen - mobile', () => {
-            cy.viewport('iphone-6');
-            cy.visit('/tv');
-            cy.waitForSkeletonGone();
-            cy.get('.chart-holder');
-            cy.get('.blockchain-wrapper').should('be.visible');
-        });
-
-        it('loads the api screen', () => {
-            cy.visit('/');
-            cy.waitForSkeletonGone();
-            cy.get('li:nth-of-type(5) > a').click().then(() => {
-                cy.wait(1000);
-            });
-        });
-
-        describe('blocks', () => {
-            it('shows empty blocks properly', () => {
-                cy.visit('/block/0000000000000000000bd14f744ef2e006e61c32214670de7eb891a5732ee775');
-                cy.waitForSkeletonGone();
-                cy.waitForPageIdle();
-                cy.get('h2').invoke('text').should('equal', '1 transaction');
-            });
-
-            it('expands and collapses the block details', () => {
-                cy.visit('/block/0');
-                cy.waitForSkeletonGone();
-                cy.waitForPageIdle();
-                cy.get('.btn.btn-outline-info').click().then(() => {
-                    cy.get('#details').should('be.visible');
-                });
-
-                cy.get('.btn.btn-outline-info').click().then(() => {
-                    cy.get('#details').should('not.be.visible');
-                });
-            });
-            it('shows blocks with no pagination', () => {
-                cy.visit('/block/00000000000000000001ba40caf1ad4cec0ceb77692662315c151953bfd7c4c4');
-                cy.waitForSkeletonGone();
-                cy.waitForPageIdle();
-                cy.get('.block-tx-title h2').invoke('text').should('equal', '19 transactions');
-                cy.get('.pagination-container ul.pagination').first().children().should('have.length', 5);
-            });
-
-            it('supports pagination on the block screen', () => {
-                // 41 txs
-                cy.visit('/block/00000000000000000009f9b7b0f63ad50053ad12ec3b7f5ca951332f134f83d8');
-                cy.waitForSkeletonGone();
-                cy.get('.pagination-container a').invoke('text').then((text1) => {
-                    cy.get('.active + li').first().click().then(() => {
-                        cy.waitForSkeletonGone();
-                        cy.waitForPageIdle();
-                        cy.get('.header-bg.box > a').invoke('text').then((text2) => {
-                            expect(text1).not.to.eq(text2);
-                        });
-                    });
-                });
-            });
-
-            it('shows blocks pagination with 5 pages (desktop)', () => {
-                cy.viewport(760, 800);
-                cy.visit('/block/000000000000000000049281946d26fcba7d99fdabc1feac524bc3a7003d69b3').then(() => {
-                    cy.waitForSkeletonGone();
-                    cy.waitForPageIdle();
-                });
-
-                // 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('/block/000000000000000000049281946d26fcba7d99fdabc1feac524bc3a7003d69b3').then(() => {
-                    cy.waitForSkeletonGone();
-                    cy.waitForPageIdle();
-                });
-
-                // 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");
-    }
-});

frontend/cypress/integration/signet/signet.spec.ts

@@ -1,131 +0,0 @@
-import { emitMempoolInfo } from "../../support/websocket";
-
-describe('Signet', () => {
-  beforeEach(() => {
-    cy.intercept('/api/block-height/*').as('block-height');
-    cy.intercept('/api/block/*').as('block');
-    cy.intercept('/api/block/*/txs/0').as('block-txs');
-    cy.intercept('/api/tx/*/outspends').as('tx-outspends');
-  });
-
-
-  if (Cypress.env("BASE_MODULE") === '' || Cypress.env("BASE_MODULE") === 'mempool') {
-    it('loads the dashboard', () => {
-        cy.visit('/signet');
-        cy.waitForSkeletonGone();
-    });
-
-    it('loads the dashboard with the skeleton blocks', () => {
-        cy.mockMempoolSocket();
-        cy.visit("/signet");
-        cy.get(':nth-child(1) > #bitcoin-block-0').should('be.visible');
-        cy.get(':nth-child(2) > #bitcoin-block-0').should('be.visible');
-        cy.get(':nth-child(3) > #bitcoin-block-0').should('be.visible');
-        cy.get('#mempool-block-0').should('be.visible');
-        cy.get('#mempool-block-1').should('be.visible');
-        cy.get('#mempool-block-2').should('be.visible');
-
-        emitMempoolInfo({
-            'params': {
-            "network": "signet"
-            }
-        });
-
-        cy.get(':nth-child(1) > #bitcoin-block-0').should('not.exist');
-        cy.get(':nth-child(2) > #bitcoin-block-0').should('not.exist');
-        cy.get(':nth-child(3) > #bitcoin-block-0').should('not.exist');
-    });
-
-    it('loads the blocks screen', () => {
-        cy.visit('/signet');
-        cy.waitForSkeletonGone();
-        cy.get('li:nth-of-type(2) > a').click().then(() => {
-            cy.wait(1000);
-        });
-    });
-
-    it('loads the graphs screen', () => {
-        cy.visit('/signet');
-        cy.waitForSkeletonGone();
-        cy.get('li:nth-of-type(3) > a').click().then(() => {
-            cy.wait(1000);
-        });
-    });
-
-    describe('tv mode', () => {
-        it('loads the tv screen - desktop', () => {
-            cy.viewport('macbook-16');
-            cy.visit('/signet');
-            cy.waitForSkeletonGone();
-            cy.get('li:nth-of-type(4) > a').click().then(() => {
-                cy.get('.chart-holder').should('be.visible');
-                cy.get('#mempool-block-0').should('be.visible');
-                cy.get('.tv-only').should('not.exist');
-            });
-        });
-
-        it('loads the tv screen - mobile', () => {
-            cy.visit('/signet');
-            cy.waitForSkeletonGone();
-            cy.get('li:nth-of-type(4) > a').click().then(() => {
-                cy.viewport('iphone-8');
-                cy.get('.chart-holder').should('be.visible');
-                //TODO: Remove comment when the bug is fixed
-                //cy.get('#mempool-block-0').should('be.visible');
-                cy.get('.tv-only').should('not.exist');
-            });
-        });
-    });
-
-
-    it('loads the api screen', () => {
-        cy.visit('/signet');
-        cy.waitForSkeletonGone();
-        cy.get('li:nth-of-type(5) > a').click().then(() => {
-            cy.wait(1000);
-        });
-    });
-
-    describe('blocks', () => {
-        it('shows empty blocks properly', () => {
-            cy.visit('/signet/block/00000133d54e4589f6436703b067ec23209e0a21b8a9b12f57d0592fd85f7a42');
-            cy.waitForSkeletonGone();
-            cy.get('h2').invoke('text').should('equal', '1 transaction');
-        });
-
-        it('expands and collapses the block details', () => {
-            cy.visit('/signet/block/0');
-            cy.waitForSkeletonGone();
-            cy.get('.btn.btn-outline-info').click().then(() => {
-                cy.get('#details').should('be.visible');
-            });
-
-            cy.get('.btn.btn-outline-info').click().then(() => {
-                cy.get('#details').should('not.be.visible');
-            });
-        });
-
-        it('shows blocks with no pagination', () => {
-            cy.visit('/signet/block/00000078f920a96a69089877b934ce7fd009ab55e3170920a021262cb258e7cc');
-            cy.waitForSkeletonGone();
-            cy.get('h2').invoke('text').should('equal', '13 transactions');
-            cy.get('ul.pagination').first().children().should('have.length', 5);
-        });
-
-        it('supports pagination on the block screen', () => {
-            // 43 txs
-            cy.visit('/signet/block/00000094bd52f73bdbfc4bece3a94c21fec2dc968cd54210496e69e4059d66a6');
-            cy.waitForSkeletonGone();
-            cy.get('.header-bg.box > a').invoke('text').then((text1) => {
-                cy.get('.active + li').first().click().then(() => {
-                    cy.get('.header-bg.box > a').invoke('text').then((text2) => {
-                        expect(text1).not.to.eq(text2);
-                    });
-                });
-            });
-        });
-    });
-    } else {
-        it.skip("Tests cannot be run on the selected BASE_MODULE");
-    }
-  });

frontend/cypress/integration/testnet/testnet.spec.ts

@@ -1,128 +0,0 @@
-import { confirmAddress, emitMempoolInfo, sendWsMock, showNewTx, startTrackingAddress } from "../../support/websocket";
-
-describe('Testnet', () => {
-  beforeEach(() => {
-    cy.intercept('/api/block-height/*').as('block-height');
-    cy.intercept('/api/block/*').as('block');
-    cy.intercept('/api/block/*/txs/0').as('block-txs');
-    cy.intercept('/api/tx/*/outspends').as('tx-outspends');
-  });
-
-  if (Cypress.env("BASE_MODULE") === '' || Cypress.env("BASE_MODULE") === 'mempool') {
-
-    it('loads the dashboard', () => {
-        cy.visit('/testnet');
-        cy.waitForSkeletonGone();
-    });
-
-    it('loads the dashboard with the skeleton blocks', () => {
-        cy.mockMempoolSocket();
-        cy.visit("/testnet");
-        cy.get(':nth-child(1) > #bitcoin-block-0').should('be.visible');
-        cy.get(':nth-child(2) > #bitcoin-block-0').should('be.visible');
-        cy.get(':nth-child(3) > #bitcoin-block-0').should('be.visible');
-        cy.get('#mempool-block-0').should('be.visible');
-        cy.get('#mempool-block-1').should('be.visible');
-        cy.get('#mempool-block-2').should('be.visible');
-
-        emitMempoolInfo({
-            'params': {
-            loaded: true
-            }
-        });
-
-        cy.get(':nth-child(1) > #bitcoin-block-0').should('not.exist');
-        cy.get(':nth-child(2) > #bitcoin-block-0').should('not.exist');
-        cy.get(':nth-child(3) > #bitcoin-block-0').should('not.exist');
-    });
-
-    it('loads the blocks screen', () => {
-        cy.visit('/testnet');
-        cy.waitForSkeletonGone();
-        cy.get('li:nth-of-type(2) > a').click().then(() => {
-            cy.wait(1000);
-        });
-    });
-
-    it('loads the graphs screen', () => {
-        cy.visit('/testnet');
-        cy.waitForSkeletonGone();
-        cy.get('li:nth-of-type(3) > a').click().then(() => {
-            cy.wait(1000);
-        });
-    });
-
-    describe('tv mode', () => {
-        it('loads the tv screen - desktop', () => {
-            cy.viewport('macbook-16');
-            cy.visit('/testnet');
-            cy.waitForSkeletonGone();
-            cy.get('li:nth-of-type(4) > a').click().then(() => {
-                cy.wait(1000);
-                cy.get('.tv-only').should('not.exist');
-            });
-        });
-
-        it('loads the tv screen - mobile', () => {
-            cy.visit('/testnet');
-            cy.waitForSkeletonGone();
-            cy.get('li:nth-of-type(4) > a').click().then(() => {
-                cy.viewport('iphone-6');
-                cy.wait(1000);
-                cy.get('.tv-only').should('not.exist');
-            });
-        });
-    });
-
-
-    it('loads the api screen', () => {
-        cy.visit('/testnet');
-        cy.waitForSkeletonGone();
-        cy.get('li:nth-of-type(5) > a').click().then(() => {
-            cy.wait(1000);
-        });
-    });
-
-    describe('blocks', () => {
-        it('shows empty blocks properly', () => {
-            cy.visit('/testnet/block/0');
-            cy.waitForSkeletonGone();
-            cy.get('h2').invoke('text').should('equal', '1 transaction');
-        });
-
-        it('expands and collapses the block details', () => {
-            cy.visit('/testnet/block/0');
-            cy.waitForSkeletonGone();
-            cy.get('.btn.btn-outline-info').click().then(() => {
-                cy.get('#details').should('be.visible');
-            });
-
-            cy.get('.btn.btn-outline-info').click().then(() => {
-                cy.get('#details').should('not.be.visible');
-            });
-        });
-
-        it('shows blocks with no pagination', () => {
-            cy.visit('/testnet/block/000000000000002f8ce27716e74ecc7ad9f7b5101fed12d09e28bb721b9460ea');
-            cy.waitForSkeletonGone();
-            cy.get('h2').invoke('text').should('equal', '11 transactions');
-            cy.get('ul.pagination').first().children().should('have.length', 5);
-        });
-
-        it('supports pagination on the block screen', () => {
-            // 48 txs
-            cy.visit('/testnet/block/000000000000002ca3878ebd98b313a1c2d531f2e70a6575d232ca7564dea7a9');
-            cy.waitForSkeletonGone();
-            cy.get('.header-bg.box > a').invoke('text').then((text1) => {
-                cy.get('.active + li').first().click().then(() => {
-                    cy.get('.header-bg.box > a').invoke('text').then((text2) => {
-                        expect(text1).not.to.eq(text2);
-                    });
-                });
-            });
-        });
-    });
-    } else {
-        it.skip("Tests cannot be run on the selected BASE_MODULE");
-    }
-  });

frontend/cypress/plugins/index.js

@@ -1 +0,0 @@
-module.exports = (on, config) => {}

frontend/cypress/support/PageIdleDetector.ts

@@ -1,63 +0,0 @@
-// source: chrisp_68 @ https://stackoverflow.com/questions/50525143/how-do-you-reliably-wait-for-page-idle-in-cypress-io-test
-export class PageIdleDetector
-{   
-    defaultOptions: Object = { timeout: 60000 };
-
-    public WaitForPageToBeIdle(): void
-    {
-        this.WaitForPageToLoad();
-        this.WaitForAngularRequestsToComplete();
-        this.WaitForAngularDigestCycleToComplete();
-        this.WaitForAnimationsToStop();
-    }
-
-    public WaitForPageToLoad(options: Object = this.defaultOptions): void
-    {
-        cy.document(options).should((myDocument: any) =>
-        {
-            expect(myDocument.readyState, "WaitForPageToLoad").to.be.oneOf(["interactive", "complete"]);
-        });
-    }
-
-    public WaitForAngularRequestsToComplete(options: Object = this.defaultOptions): void
-    {
-        cy.window(options).should((myWindow: any) =>
-        {
-            if (!!myWindow.angular)
-            {
-                expect(this.NumberOfPendingAngularRequests(myWindow), "WaitForAngularRequestsToComplete").to.have.length(0);
-            }
-        });
-    }
-
-    public WaitForAngularDigestCycleToComplete(options: Object = this.defaultOptions): void
-    {
-        cy.window(options).should((myWindow: any) =>
-        {
-            if (!!myWindow.angular)
-            {
-                expect(this.AngularRootScopePhase(myWindow), "WaitForAngularDigestCycleToComplete").to.be.null;
-            }
-        });
-    }
-
-    public WaitForAnimationsToStop(options: Object = this.defaultOptions): void
-    {
-        cy.get(":animated", options).should("not.exist");
-    }
-
-    private getInjector(myWindow: any)
-    {
-        return myWindow.angular.element(myWindow.document.body).injector();
-    }
-
-    private NumberOfPendingAngularRequests(myWindow: any)
-    {
-        return this.getInjector(myWindow).get('$http').pendingRequests;
-    }
-
-    private AngularRootScopePhase(myWindow: any)
-    {
-        return this.getInjector(myWindow).get("$rootScope").$$phase;
-    }
-}

frontend/cypress/support/commands.ts

@@ -1,147 +0,0 @@
-// ***********************************************
-// This example namespace declaration will help
-// with Intellisense and code completion in your
-// IDE or Text Editor.
-// ***********************************************
-// declare namespace Cypress {
-//   interface Chainable<Subject = any> {
-//     customCommand(param: any): typeof customCommand;
-//   }
-// }
-//
-// function customCommand(param: any): void {
-//   console.warn(param);
-// }
-//
-// NOTE: You can use it like so:
-// Cypress.Commands.add('customCommand', customCommand);
-//
-// ***********************************************
-// This example commands.js shows you how to
-// create various custom commands and overwrite
-// existing commands.
-//
-// For more comprehensive examples of custom
-// commands please read more here:
-// https://on.cypress.io/custom-commands
-// ***********************************************
-//
-//
-// -- This is a parent command --
-// Cypress.Commands.add("login", (email, password) => { ... })
-//
-//
-// -- This is a child command --
-// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
-//
-//
-// -- This is a dual command --
-// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
-//
-//
-// -- This will overwrite an existing command --
-// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
-
-'use strict'
-
-import 'cypress-wait-until';
-import { PageIdleDetector } from './PageIdleDetector';
-import { mockWebSocket } from './websocket';
-
-/* global Cypress */
-const codes = {
-    ArrowLeft: 37,
-    ArrowUp: 38,
-    ArrowRight: 39,
-    ArrowDown: 40
-}
-
-Cypress.Commands.add('waitForSkeletonGone', () => {
-    cy.waitUntil(() => {
-        return Cypress.$('.skeleton-loader').length === 0;
-    }, { verbose: true, description: "waitForSkeletonGone", errorMsg: "skeleton loaders never went away", timeout: 15000, interval: 50});
-});
-
-Cypress.Commands.add(
-    "waitForPageIdle",
-    () => {
-        console.warn("Waiting for page idle state");
-        const pageIdleDetector = new PageIdleDetector();
-        pageIdleDetector.WaitForPageToBeIdle();
-    }
-);
-
-Cypress.Commands.add('mockMempoolSocket', () => {
-  mockWebSocket();
-});
-
-Cypress.Commands.add('changeNetwork', (network: "testnet"|"signet"|"liquid"|"bisq"|"mainnet" ) => {
-    cy.get('.dropdown-toggle').click().then(() => {
-        cy.get(`.${network}`).click().then(() => {
-            cy.waitForPageIdle();
-            if(network !== 'bisq'){
-                cy.waitForSkeletonGone();
-            }
-        });
-    });
-});
-
-// https://github.com/bahmutov/cypress-arrows/blob/8f0303842a343550fbeaf01528d01d1ff213b70c/src/index.js
-function keydownCommand ($el, key) {
-    const message = `sending the "${key}" keydown event`
-    const log = Cypress.log({
-      name: `keydown: ${key}`,
-      message: message,
-      consoleProps: function () {
-        return {
-          Subject: $el
-        }
-      }
-    })
-  
-    const e = $el.createEvent('KeyboardEvent')
-  
-    Object.defineProperty(e, 'key', {
-      get: function () {
-        return key
-      }
-    })
-  
-    Object.defineProperty(e, 'keyCode', {
-      get: function () {
-        return this.keyCodeVal
-      }
-    })
-    Object.defineProperty(e, 'which', {
-      get: function () {
-        return this.keyCodeVal
-      }
-    })
-    var metaKey = false
-  
-    Object.defineProperty(e, 'metaKey', {
-      get: function () {
-        return metaKey
-      }
-    })
-  
-    Object.defineProperty(e, 'shiftKey', {
-      get: function () {
-        return false
-      }
-    })
-    e.keyCodeVal = codes[key]
-  
-    e.initKeyboardEvent('keydown', true, true,
-      $el.defaultView, false, false, false, false, e.keyCodeVal, e.keyCodeVal)
-  
-    $el.dispatchEvent(e)
-    log.snapshot().end()
-    return $el
-  }
-  
-  Cypress.Commands.add('keydown', { prevSubject: "dom" }, keydownCommand)
-  Cypress.Commands.add('left', { prevSubject: "dom" }, $el => keydownCommand($el, 'ArrowLeft'))
-  Cypress.Commands.add('right', { prevSubject: "dom" }, $el => keydownCommand($el, 'ArrowRight'))
-  Cypress.Commands.add('up', { prevSubject: "dom" }, $el => keydownCommand($el, 'ArrowUp'))
-  Cypress.Commands.add('down', { prevSubject: "dom" }, $el => keydownCommand($el, 'ArrowDown'))

frontend/cypress/support/index.d.ts

@@ -1,10 +0,0 @@
-
-/// <reference types="cypress" />
-declare namespace Cypress {
-    interface Chainable<Subject> {
-        waitForSkeletonGone(): Chainable<any>
-        waitForPageIdle(): Chainable<any>
-        mockMempoolSocket(): Chainable<any>
-        changeNetwork(network: "testnet"|"signet"|"liquid"|"bisq"|"mainnet"): Chainable<any>
-    }
-}

frontend/cypress/support/index.ts

@@ -1,20 +0,0 @@
-// ***********************************************************
-// This example support/index.js is processed and
-// loaded automatically before your test files.
-//
-// This is a great place to put global configuration and
-// behavior that modifies Cypress.
-//
-// You can change the location of this file or turn off
-// automatically serving support files with the
-// 'supportFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/configuration
-// ***********************************************************
-
-// When a command from ./commands is ready to use, import with `import './commands'` syntax
-import './commands';
-import failOnConsoleError from 'cypress-fail-on-console-error';
-
-failOnConsoleError();

frontend/cypress/support/websocket.ts

@@ -1,92 +0,0 @@
-import { v4 as uuid } from 'uuid';
-import { WebSocket, Server } from 'mock-socket';
-
-declare global {
-	interface Window {
-		mockServer: Server;
-		mockSocket: WebSocket;
-	}
-}
-
-const mocks: { [key: string]: { server: Server; websocket: WebSocket } } = {};
-
-const cleanupMock = (url: string) => {
-	if (mocks[url]) {
-		mocks[url].websocket.close();
-		mocks[url].server.stop();
-		delete mocks[url];
-	}
-};
-
-const createMock = (url: string) => {
-	cleanupMock(url);
-	const server = new Server(url);
-	const websocket = new WebSocket(url);
-	mocks[url] = { server, websocket };
-
-	return mocks[url];
-};
-
-export const mockWebSocket = () => {
-	cy.on('window:before:load', (win) => {
-		const winWebSocket = win.WebSocket;
-		cy.stub(win, 'WebSocket').callsFake((url) => {
-            console.log(url);
-			if ((new URL(url).pathname.indexOf('/sockjs-node/') !== 0)) {
-				const { server, websocket } = createMock(url);
-
-				win.mockServer = server;
-				win.mockServer.on('connection', (socket) => {
-					win.mockSocket = socket;
-                    win.mockSocket.send('{"action":"init"}');
-				});
-
-                win.mockServer.on('message', (message) => {
-                    console.log(message);
-                });
-
-				return websocket;
-			} else {
-				return new winWebSocket(url);
-			}
-		});
-	});
-
-	cy.on('window:before:unload', () => {
-		for (const url in mocks) {
-			cleanupMock(url);
-		}
-	});
-};
-
-export const emitMempoolInfo = ({
-	params
-}: { params?: any } = {}) => {
-	cy.window().then((win) => {
-		//TODO: Refactor to take into account different parameterized mocking scenarios
-		switch (params.network) {
-			//TODO: Use network specific mocks
-			case "signet":
-			case "testnet":
-			default:
-				win.mockSocket.send('{"action":"init"}');
-				win.mockSocket.send('{"action":"want","data":["blocks","stats","mempool-blocks","live-2h-chart"]}');
-				win.mockSocket.send('{"conversions":{"USD":32365.338815782445}}');
-				cy.readFile('cypress/fixtures/mainnet_live2hchart.json', 'ascii').then((fixture) => {
-					win.mockSocket.send(JSON.stringify(fixture));
-				});
-				cy.readFile('cypress/fixtures/mainnet_mempoolInfo.json', 'ascii').then((fixture) => {
-					win.mockSocket.send(JSON.stringify(fixture));
-				});
-		}
-	});
-    cy.waitForSkeletonGone();
-    return cy.get('#mempool-block-0');
-};
-
-export const dropWebSocket = (() => {
-    cy.window().then((win) => {
-        win.mockServer.simulate("error");
-    });
-    return cy.wait(500);
-});

frontend/cypress/tsconfig.json

@@ -1,10 +0,0 @@
-{
-  "extends": "../tsconfig.json",
-  "include": ["**/*.ts"],
-  "compilerOptions": {
-    "types": ["cypress"],
-    "lib": ["es2015", "dom"],
-    "allowJs": true,
-    "noEmit": true,
-  }
-}

frontend/e2e/protractor.conf.js

@@ -0,0 +1,32 @@
+// @ts-check
+// Protractor configuration file, see link for more information
+// https://github.com/angular/protractor/blob/master/lib/config.ts
+
+const { SpecReporter } = require('jasmine-spec-reporter');
+
+/**
+ * @type { import("protractor").Config }
+ */
+exports.config = {
+  allScriptsTimeout: 11000,
+  specs: [
+    './src/**/*.e2e-spec.ts'
+  ],
+  capabilities: {
+    'browserName': 'chrome'
+  },
+  directConnect: true,
+  baseUrl: 'http://localhost:4200/',
+  framework: 'jasmine',
+  jasmineNodeOpts: {
+    showColors: true,
+    defaultTimeoutInterval: 30000,
+    print: function() {}
+  },
+  onPrepare() {
+    require('ts-node').register({
+      project: require('path').join(__dirname, './tsconfig.json')
+    });
+    jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
+  }
+};

frontend/e2e/src/app.e2e-spec.ts

@@ -0,0 +1,23 @@
+import { AppPage } from './app.po';
+import { browser, logging } from 'protractor';
+
+describe('workspace-project App', () => {
+  let page: AppPage;
+
+  beforeEach(() => {
+    page = new AppPage();
+  });
+
+  it('should display welcome message', () => {
+    page.navigateTo();
+    expect(page.getTitleText()).toEqual('Welcome to mempool!');
+  });
+
+  afterEach(async () => {
+    // Assert that there are no errors emitted from the browser
+    const logs = await browser.manage().logs().get(logging.Type.BROWSER);
+    expect(logs).not.toContain(jasmine.objectContaining({
+      level: logging.Level.SEVERE,
+    } as logging.Entry));
+  });
+});

frontend/e2e/src/app.po.ts

@@ -0,0 +1,11 @@
+import { browser, by, element } from 'protractor';
+
+export class AppPage {
+  navigateTo() {
+    return browser.get(browser.baseUrl) as Promise<any>;
+  }
+
+  getTitleText() {
+    return element(by.css('app-root h1')).getText() as Promise<string>;
+  }
+}

frontend/e2e/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "../out-tsc/e2e",
+    "module": "commonjs",
+    "target": "es2018",
+    "types": [
+      "jasmine",
+      "jasminewd2",
+      "node"
+    ]
+  }
+}

frontend/generate-config.js

@@ -1,44 +1,20 @@
 var fs = require('fs');
-const { spawnSync } = require('child_process');
 
 const CONFIG_FILE_NAME = 'mempool-frontend-config.json';
 const GENERATED_CONFIG_FILE_NAME = 'generated-config.js';
 
 let settings = [];
 let configContent = {};
-let gitCommitHash = '';
-let packetJsonVersion = '';
 
 try {
   const rawConfig = fs.readFileSync(CONFIG_FILE_NAME);
   configContent = JSON.parse(rawConfig);
-  console.log(`${CONFIG_FILE_NAME} file found, using provided config`);
 } catch (e) {
   if (e.code !== 'ENOENT') {
     throw new Error(e);
-  } else {
-    console.log(`${CONFIG_FILE_NAME} file not found, using default config`);
   }
 }
 
-const indexFilePath = configContent.BASE_MODULE ? 'src/index.' + configContent.BASE_MODULE + '.html' : 'src/index.mempool.html';
-
-try {
-  fs.copyFileSync(indexFilePath, 'src/index.html');
-  console.log('Copied ' + indexFilePath + ' to src/index.html');
-} catch (e) {
-  console.log('Error copying the index file');
-  throw new Error(e);
-}
-
-try {
-  const packageJson = fs.readFileSync('package.json');
-  packetJsonVersion = JSON.parse(packageJson).version;
-  console.log(`mempool version ${packetJsonVersion}`);
-} catch (e) {
-  throw new Error(e);
-}
-
 for (setting in configContent) {
   settings.push({
     key: setting,
@@ -46,64 +22,15 @@ for (setting in configContent) {
   });
 }
 
-if (process.env.DOCKER_COMMIT_HASH) {
+const code = `(function (window) {
-  gitCommitHash = process.env.DOCKER_COMMIT_HASH;
-} else {
-  try {
-    const gitRevParse = spawnSync('git', ['rev-parse', '--short', 'HEAD']);
-  
-    if (!gitRevParse.error) {
-      gitCommitHash = gitRevParse.stdout.toString('utf-8').replace(/[\n\r\s]+$/, '');
-      console.log(`mempool revision ${gitCommitHash}`);
-    } else if (gitRevParse.error.code === 'ENOENT') {
-      console.log('git not found, cannot parse git hash');
-      gitCommitHash = '?';
-    }
-  } catch (e) {
-    console.log('Could not load git commit info: ' + e.message);
-    gitCommitHash = '?';
-  }
-}
-
-const newConfig = `(function (window) {
   window.__env = window.__env || {};${settings.reduce((str, obj) => `${str}
     window.__env.${obj.key} = ${ typeof obj.value === 'string' ? `'${obj.value}'` : obj.value };`, '')}
-    window.__env.GIT_COMMIT_HASH = '${gitCommitHash}';
-    window.__env.PACKAGE_JSON_VERSION = '${packetJsonVersion}';
   }(global || this));`;
 
-function readConfig(path) {
+try {
-  try {
+  fs.writeFileSync(GENERATED_CONFIG_FILE_NAME, code, 'utf8');
-    const currentConfig = fs.readFileSync(path).toString().trim();
+} catch (e) {
-    return currentConfig;
+  throw new Error(e);
-  } catch (e) {
-    return false;
-  }
 }
 
-function writeConfig(path, config) {
+console.log('Config file generated');
-  try {
-    fs.writeFileSync(path, config, 'utf8');
-  } catch (e) {
-    throw new Error(e);
-  }
-}
-
-const currentConfig = readConfig(GENERATED_CONFIG_FILE_NAME);
-
-if (currentConfig && currentConfig === newConfig) {
-  console.log(`No configuration updates, skipping ${GENERATED_CONFIG_FILE_NAME} file update`);
-  return;
-} else if (!currentConfig) {
-  console.log(`${GENERATED_CONFIG_FILE_NAME} file not found, creating new config file`);
-  console.log('CONFIG: ', newConfig);
-  writeConfig(GENERATED_CONFIG_FILE_NAME, newConfig);
-  console.log(`${GENERATED_CONFIG_FILE_NAME} file saved`);
-  return;
-} else {
-  console.log(`Configuration changes detected, updating ${GENERATED_CONFIG_FILE_NAME} file`);
-  console.log('OLD CONFIG: ', currentConfig);
-  console.log('NEW CONFIG: ', newConfig);
-  writeConfig(GENERATED_CONFIG_FILE_NAME, newConfig);
-  console.log(`${GENERATED_CONFIG_FILE_NAME} file updated`);
-};

frontend/mempool-frontend-config.sample.json

@@ -1,6 +1,5 @@
 {
   "TESTNET_ENABLED": false,
-  "SIGNET_ENABLED": false,
   "LIQUID_ENABLED": false,
   "BISQ_ENABLED": false,
   "BISQ_SEPARATE_BACKEND": false,
@@ -8,8 +7,5 @@
   "KEEP_BLOCKS_AMOUNT": 8,
   "NGINX_PROTOCOL": "http",
   "NGINX_HOSTNAME": "127.0.0.1",
-  "NGINX_PORT": "80",
+  "NGINX_PORT": "80"
-  "MEMPOOL_BLOCKS_AMOUNT": 8,
-  "BLOCK_WEIGHT_UNITS": 4000000,
-  "BASE_MODULE": "mempool"
 }

frontend/package.json

@@ -1,8 +1,8 @@
 {
   "name": "mempool-frontend",
-  "version": "2.2.2-dev",
+  "version": "2.1.2",
   "description": "Bitcoin mempool visualizer and blockchain explorer backend",
-  "license": "GNU Affero General Public License v3.0",
+  "license": "MIT",
   "homepage": "https://mempool.space",
   "repository": {
     "type": "git",
@@ -22,100 +22,75 @@
   "scripts": {
     "ng": "./node_modules/@angular/cli/bin/ng",
     "tsc": "./node_modules/typescript/bin/tsc",
-    "i18n-extract-from-source": "./node_modules/@angular/cli/bin/ng extract-i18n --ivy --out-file ./src/locale/messages.xlf",
+    "i18n-extract-from-source": "./node_modules/@angular/cli/bin/ng xi18n --ivy --out-file ./src/locale/messages.xlf",
     "i18n-pull-from-transifex": "tx pull -a --parallel --minimum-perc 1 --force",
-    "serve": "npm run generate-config && ng serve -c local",
+    "serve": "ng serve --proxy-config proxy.conf.json",
-    "serve:stg": "npm run generate-config && ng serve -c staging",
+    "start": "npm run generate-config && npm run sync-assets-dev && ng serve --proxy-config proxy.conf.json",
-    "serve:local-prod": "npm run generate-config && ng serve -c local-prod",
+    "build": "npm run generate-config && ng build --prod --localize && npm run sync-assets",
-    "start": "npm run generate-config && npm run sync-assets-dev && ng serve -c local",
-    "start:stg": "npm run generate-config && npm run sync-assets-dev && ng serve -c staging",
-    "start:local-prod": "npm run generate-config && npm run sync-assets-dev && ng serve -c local-prod",
-    "build": "npm run generate-config && ng build --prod --localize && npm run sync-assets && npm run build-mempool.js",
     "sync-assets": "node sync-assets.js && rsync -av ./dist/mempool/browser/en-US/resources ./dist/mempool/browser/resources",
     "sync-assets-dev": "node sync-assets.js dev",
     "generate-config": "node generate-config.js",
-    "build-mempool.js": "tsc | browserify -p tinyify ./node_modules/@mempool/mempool.js/lib/index.js --standalone mempoolJS > ./dist/mempool/browser/en-US/mempool.js",
     "test": "ng test",
     "lint": "ng lint",
-    "e2e": "npm run generate-config && ng e2e",
+    "e2e": "ng e2e",
-    "e2e:ci": "npm run cypress:run:ci",
-    "config:defaults:mempool": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true BISQ_ENABLED=true ITEMS_PER_PAGE=25 BASE_MODULE=mempool && npm run generate-config",
-    "config:defaults:liquid": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true BISQ_ENABLED=true ITEMS_PER_PAGE=25 BASE_MODULE=liquid && npm run generate-config",
-    "config:defaults:bisq": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true BISQ_ENABLED=true ITEMS_PER_PAGE=25 BASE_MODULE=bisq && npm run generate-config",
     "dev:ssr": "npm run generate-config && ng run mempool:serve-ssr",
     "serve:ssr": "node server.run.js",
     "build:ssr": "npm run build && ng run mempool:server:production && ./node_modules/typescript/bin/tsc server.run.ts",
-    "prerender": "ng run mempool:prerender",
+    "prerender": "ng run mempool:prerender"
-    "cypress:open": "cypress open",
-    "cypress:run": "cypress run",
-    "cypress:run:record": "cypress run --record",
-    "cypress:open:ci": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true BISQ_ENABLED=true ITEMS_PER_PAGE=25 && npm run generate-config && start-server-and-test serve:local-prod 4200 cypress:open",
-    "cypress:run:ci": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true BISQ_ENABLED=true ITEMS_PER_PAGE=25 && npm run generate-config && start-server-and-test serve:local-prod 4200 cypress:run:record"
   },
   "dependencies": {
-    "@angular/animations": "~11.2.8",
+    "@angular/animations": "~10.2.3",
-    "@angular/common": "~11.2.8",
+    "@angular/common": "~10.2.3",
-    "@angular/compiler": "~11.2.8",
+    "@angular/compiler": "~10.2.3",
-    "@angular/core": "~11.2.8",
+    "@angular/core": "~10.2.3",
-    "@angular/forms": "~11.2.8",
+    "@angular/forms": "~10.2.3",
-    "@angular/localize": "^11.2.8",
+    "@angular/localize": "^10.2.3",
-    "@angular/platform-browser": "~11.2.8",
+    "@angular/platform-browser": "~10.2.3",
-    "@angular/platform-browser-dynamic": "~11.2.8",
+    "@angular/platform-browser-dynamic": "~10.2.3",
-    "@angular/platform-server": "~11.2.8",
+    "@angular/platform-server": "~10.2.2",
-    "@angular/router": "~11.2.8",
+    "@angular/router": "~10.2.3",
-    "@fortawesome/angular-fontawesome": "^0.8.2",
+    "@fortawesome/angular-fontawesome": "^0.7.0",
-    "@fortawesome/fontawesome-common-types": "^0.2.35",
+    "@fortawesome/fontawesome-common-types": "^0.2.30",
-    "@fortawesome/fontawesome-svg-core": "^1.2.35",
+    "@fortawesome/fontawesome-svg-core": "^1.2.30",
-    "@fortawesome/free-solid-svg-icons": "^5.15.3",
+    "@fortawesome/free-solid-svg-icons": "^5.14.0",
     "@mempool/chartist": "^0.11.4",
-    "@mempool/mempool.js": "^2.2.4",
     "@ng-bootstrap/ng-bootstrap": "^7.0.0",
-    "@nguniversal/express-engine": "11.2.1",
+    "@nguniversal/express-engine": "10.1.0",
     "@types/qrcode": "^1.3.4",
     "bootstrap": "4.5.0",
-    "browserify": "^17.0.0",
     "clipboard": "^2.0.4",
     "domino": "^2.1.6",
-    "express": "^4.17.1",
+    "express": "^4.15.2",
-    "lightweight-charts": "^3.3.0",
     "ngx-bootrap-multiselect": "^2.0.0",
-    "ngx-infinite-scroll": "^10.0.1",
+    "ngx-infinite-scroll": "^9.0.0",
     "qrcode": "^1.4.4",
-    "rxjs": "^6.6.7",
+    "rxjs": "^6.6.3",
-    "tinyify": "^3.0.0",
     "tlite": "^0.1.9",
-    "tslib": "^2.2.0",
+    "tslib": "^2.0.0",
-    "zone.js": "~0.11.4"
+    "zone.js": "~0.10.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.1102.7",
+    "@angular-devkit/build-angular": "^0.1002.0",
-    "@angular/cli": "~11.2.7",
+    "@angular/cli": "~10.2.0",
-    "@angular/compiler-cli": "~11.2.8",
+    "@angular/compiler-cli": "~10.2.2",
-    "@angular/language-service": "~11.2.8",
+    "@angular/language-service": "~10.2.2",
-    "@nguniversal/builders": "^11.2.1",
+    "@nguniversal/builders": "^10.1.0",
     "@types/express": "^4.17.0",
-    "@types/jasmine": "~3.6.0",
+    "@types/jasmine": "~3.3.8",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "^12.11.1",
-    "codelyzer": "^6.0.1",
+    "codelyzer": "^6.0.0",
     "http-proxy-middleware": "^1.0.5",
-    "jasmine-core": "~3.6.0",
+    "jasmine-core": "~3.5.0",
     "jasmine-spec-reporter": "~5.0.0",
-    "karma": "~6.1.0",
+    "karma": "~5.0.0",
     "karma-chrome-launcher": "~3.1.0",
-    "karma-coverage": "~2.0.3",
+    "karma-coverage-istanbul-reporter": "~3.0.2",
-    "karma-jasmine": "~4.0.0",
+    "karma-jasmine": "~3.3.0",
     "karma-jasmine-html-reporter": "^1.5.0",
-    "ts-node": "~8.3.0",
+    "protractor": "~7.0.0",
+    "ts-node": "~7.0.0",
     "tslint": "~6.1.0",
-    "typescript": "~4.1.5"
+    "typescript": "~4.0.5"
-  },
-  "optionalDependencies": {
-    "@cypress/schematic": "^1.3.0",
-    "cypress": "^8.3.1",
-    "cypress-fail-on-console-error": "^2.1.0",
-    "cypress-wait-until": "^1.7.1",
-    "mock-socket": "^9.0.3",
-    "start-server-and-test": "^1.12.6"
   }
 }

frontend/proxy.conf.js

@@ -1,64 +0,0 @@
-const fs = require('fs');
-
-let PROXY_CONFIG;
-let configContent;
-
-const CONFIG_FILE_NAME = 'mempool-frontend-config.json';
-
-try {
-    const rawConfig = fs.readFileSync(CONFIG_FILE_NAME);
-    configContent = JSON.parse(rawConfig);
-    console.log(`${CONFIG_FILE_NAME} file found, using provided config`);
-} catch (e) {
-    console.log(e);
-    if (e.code !== 'ENOENT') {
-      throw new Error(e);
-  } else {
-      console.log(`${CONFIG_FILE_NAME} file not found, using default config`);
-      
-  }
-}
-
-PROXY_CONFIG = [
-    {
-        context: ['*', 
-        '/api/**', '!/api/v1/ws', 
-        '!/bisq', '!/bisq/**', '!/bisq/',
-        '!/liquid', '!/liquid/**', '!/liquid/',
-        '/testnet/api/**', '/signet/api/**'
-        ],
-        target: "https://mempool.space",
-        ws: true,
-        secure: false,
-        changeOrigin: true
-    },
-    {
-        context: ['/api/v1/ws'],
-        target: "https://mempool.space",
-        ws: true,
-        secure: false,
-        changeOrigin: true,
-    },
-    {
-        context: ['/api/bisq**', '/bisq/api/**'],
-        target: "https://bisq.markets",
-        pathRewrite: {
-            "^/api/bisq/": "/bisq/api"
-        },
-        ws: true,
-        secure: false,
-        changeOrigin: true
-    },
-    {
-        context: ['/api/liquid**', '/liquid/api/**'],
-        target: "https://liquid.network",
-        pathRewrite: {
-            "^/api/liquid/": "/liquid/api"
-        },
-        ws: true,
-        secure: false,
-        changeOrigin: true
-    }
-];
-
-module.exports = PROXY_CONFIG;

frontend/proxy.conf.json

@@ -1,4 +1,8 @@
 {
+  "/api/v1/donations": {
+    "target": "http://localhost:9000/",
+    "secure": false
+  },
   "/api/v1": {
     "target": "http://localhost:8999/",
     "secure": false
@@ -37,28 +41,6 @@
       "^/testnet/api": ""
     }
   },
-  "/signet/api/v1": {
-    "target": "http://localhost:8999/",
-    "secure": false,
-    "pathRewrite": {
-      "^/signet/api/v1": "/api/v1"
-    }
-  },
-  "/signet/api/v1/ws": {
-    "target": "http://localhost:8999/",
-    "secure": false,
-    "ws": true,
-    "pathRewrite": {
-      "^/signet/api": "/api/v1/ws"
-    }
-  },
-  "/signet/api/": {
-    "target": "http://localhost:50001/",
-    "secure": false,
-    "pathRewrite": {
-      "^/signet/api": ""
-    }
-  },
   "/liquid/api/v1/ws": {
     "target": "http://localhost:8999/",
     "secure": false,
@@ -67,18 +49,11 @@
       "^/liquid/api": "/api/v1/ws"
     }
   },
-  "/liquid/api/v1/": {
-    "target": "http://localhost:8999/",
-    "secure": false,
-    "pathRewrite": {
-      "^/liquid/api/": "/api/"
-    }
-  },
   "/liquid/api/": {
-    "target": "http://localhost:8999/",
+    "target": "http://localhost:50001/",
     "secure": false,
     "pathRewrite": {
-      "^/liquid/api/": "/api/v1/"
+      "^/liquid/api/": ""
     }
   },
   "/bisq/api/": {
@@ -95,20 +70,5 @@
     "pathRewrite": {
       "^/bisq/api": "/api/v1/ws"
     }
-  },
-  "/resources/assets.minimal.json": {
-    "target": "https://mempool.space",
-    "secure": false,
-    "changeOrigin": true
-  },
-  "/resources/assets.json": {
-    "target": "https://mempool.space",
-    "secure": false,
-    "changeOrigin": true
-  },
-  "/resources/pools.json": {
-    "target": "https://mempool.space",
-    "secure": false,
-    "changeOrigin": true
   }
-}
+}

frontend/proxy.prod.conf.json

@@ -1,99 +0,0 @@
-{
-  "/api/v1/ws": {
-    "target": "https://mempool.space",
-    "secure": false,
-    "ws": true
-  },
-  "/api": {
-    "target": "https://mempool.space",
-    "secure": false,
-    "changeOrigin": true,
-    "logLevel": "debug",
-    "timeout": 3600000
-  },
-  "/testnet/api/v1/ws": {
-    "target": "https://mempool.space/testnet",
-    "secure": false,
-    "ws": true,
-    "loglevel": "debug",
-    "pathRewrite": {
-      "^/testnet/api": "/api/v1/ws"
-    }
-  },
-  "/testnet/api": {
-    "target": "https://mempool.space",
-    "secure": true,
-    "changeOrigin": true,
-    "loglevel": "debug",
-    "pathRewrite": {
-      "/testnet/api": "/testnet/api"
-    },
-    "timeout": 3600000
-  },
-  "/signet/api/v1/ws": {
-    "target": "https://mempool.space/signet",
-    "secure": false,
-    "ws": true,
-    "loglevel": "debug",
-    "pathRewrite": {
-      "^/signet/api": "/api/v1/ws"
-    }
-  },
-  "/signet/api": {
-    "target": "https://mempool.space",
-    "secure": true,
-    "changeOrigin": true,
-    "loglevel": "debug",
-    "pathRewrite": {
-      "/signet/api": "/signet/api"
-    },
-    "timeout": 3600000
-  },
-
-  "/bisq/api/v1/ws": {
-    "target": "https://mempool.space/bisq",
-    "secure": false,
-    "ws": true,
-    "pathRewrite": {
-      "^/bisq/api": "/api/v1/ws"
-    }
-  },
-  "/bisq/api": {
-    "target": "https://mempool.space/bisq",
-    "secure": false,
-    "changeOrigin": true,
-    "pathRewrite": {
-      "^/bisq/api/": "/api/v1/bisq/"
-    },
-    "timeout": 3600000
-  },
-  "/liquid/api/v1/ws": {
-    "target": "https://mempool.space",
-    "secure": false,
-    "ws": true
-  },
-  "/liquid/api": {
-    "target": "https://mempool.space",
-    "secure": false,
-    "changeOrigin": true,
-    "pathRewrite": {
-      "^/liquid/api/": "/liquid/api/"
-    },
-    "timeout": 3600000
-  },
-  "/resources/assets.minimal.json": {
-    "target": "https://mempool.space",
-    "secure": false,
-    "changeOrigin": true
-  },
-  "/resources/assets.json": {
-    "target": "https://mempool.space",
-    "secure": false,
-    "changeOrigin": true
-  },
-  "/resources/pools.json": {
-    "target": "https://mempool.space",
-    "secure": false,
-    "changeOrigin": true
-  }
-}

frontend/proxy.stg.conf.json

@@ -1,100 +0,0 @@
-{
-  "/api/v1/ws": {
-    "target": "https://mempool.ninja",
-    "secure": false,
-    "ws": true
-  },
-  "/api/*": {
-    "target": "https://mempool.ninja",
-    "secure": false,
-    "changeOrigin": true,
-    "logLevel": "debug",
-    "pathRewrite": {
-      "^/api": "https://mempool.ninja/api"
-    },
-    "timeout": 3600000
-  },
-  "/testnet/api/v1/ws": {
-    "target": "https://mempool.ninja/testnet",
-    "secure": false,
-    "ws": true,
-    "pathRewrite": {
-      "^/testnet/api": "/api/v1/ws"
-    }
-  },
-  "/testnet/api/v1/*": {
-    "target": "https://mempool.ninja/testnet",
-    "secure": false,
-    "changeOrigin": true,
-    "pathRewrite": {
-      "^/testnet/api/v1": "/api/v1"
-    },
-    "timeout": 3600000
-  },
-  "/signet/api/v1/ws": {
-    "target": "https://mempool.ninja/signet",
-    "secure": false,
-    "ws": true,
-    "pathRewrite": {
-      "^/signet/api": "/api/v1/ws"
-    }
-  },
-  "/signet/api/v1/*": {
-    "target": "https://mempool.ninja/signet",
-    "secure": false,
-    "changeOrigin": true,
-    "pathRewrite": {
-      "^/signet/api/v1": "/api/v1"
-    },
-    "timeout": 3600000
-  },
-  "/bisq/api/v1/ws": {
-    "target": "https://mempool.ninja/bisq",
-    "secure": false,
-    "ws": true,
-    "pathRewrite": {
-      "^/bisq/api": "/api/v1/ws"
-    }
-  },
-  "/bisq/api/*": {
-    "target": "https://mempool.ninja/bisq",
-    "secure": false,
-    "changeOrigin": true,
-    "pathRewrite": {
-      "^/bisq/api/": "/api/v1/bisq/"
-    },
-    "timeout": 3600000
-  },
-  "/liquid/api/v1/ws": {
-    "target": "https://mempool.ninja/liquid",
-    "secure": false,
-    "ws": true,
-    "pathRewrite": {
-      "^/liquid/api": "/api/v1/ws"
-    }
-  },
-  "/liquid/api/*": {
-    "target": "https://mempool.ninja/liquid",
-    "secure": false,
-    "changeOrigin": true,
-    "pathRewrite": {
-      "^/liquid/api/": "/api/liquid/"
-    },
-    "timeout": 3600000
-  },
-  "/resources/assets.minimal.json": {
-    "target": "https://mempool.space",
-    "secure": false,
-    "changeOrigin": true
-  },
-  "/resources/assets.json": {
-    "target": "https://mempool.space",
-    "secure": false,
-    "changeOrigin": true
-  },
-  "/resources/pools.json": {
-    "target": "https://mempool.space",
-    "secure": false,
-    "changeOrigin": true
-  }
-}

frontend/server.ts

@@ -91,17 +91,6 @@ export function app(locale: string): express.Express {
   server.get('/testnet/tv', getLocalizedSSR(indexHtml));
   server.get('/testnet/status', getLocalizedSSR(indexHtml));
   server.get('/testnet/about', getLocalizedSSR(indexHtml));
-  server.get('/signet', getLocalizedSSR(indexHtml));
-  server.get('/signet/tx/*', getLocalizedSSR(indexHtml));
-  server.get('/signet/block/*', getLocalizedSSR(indexHtml));
-  server.get('/signet/mempool-block/*', getLocalizedSSR(indexHtml));
-  server.get('/signet/address/*', getLocalizedSSR(indexHtml));
-  server.get('/signet/blocks', getLocalizedSSR(indexHtml));
-  server.get('/signet/graphs', getLocalizedSSR(indexHtml));
-  server.get('/signet/api', getLocalizedSSR(indexHtml));
-  server.get('/signet/tv', getLocalizedSSR(indexHtml));
-  server.get('/signet/status', getLocalizedSSR(indexHtml));
-  server.get('/signet/about', getLocalizedSSR(indexHtml));
   server.get('/bisq', getLocalizedSSR(indexHtml));
   server.get('/bisq/tx/*', getLocalizedSSR(indexHtml));
   server.get('/bisq/blocks', getLocalizedSSR(indexHtml));

frontend/src/app/app-routing.module.ts

@@ -16,13 +16,8 @@ import { DashboardComponent } from './dashboard/dashboard.component';
 import { LatestBlocksComponent } from './components/latest-blocks/latest-blocks.component';
 import { ApiDocsComponent } from './components/api-docs/api-docs.component';
 import { TermsOfServiceComponent } from './components/terms-of-service/terms-of-service.component';
-import { PrivacyPolicyComponent } from './components/privacy-policy/privacy-policy.component';
-import { TrademarkPolicyComponent } from './components/trademark-policy/trademark-policy.component';
-import { BisqMasterPageComponent } from './components/bisq-master-page/bisq-master-page.component';
-import { SponsorComponent } from './components/sponsor/sponsor.component';
-import { LiquidMasterPageComponent } from './components/liquid-master-page/liquid-master-page.component';
 
-let routes: Routes = [
+const routes: Routes = [
   {
     path: '',
     component: MasterPageComponent,
@@ -69,23 +64,11 @@ let routes: Routes = [
         path: 'terms-of-service',
         component: TermsOfServiceComponent
       },
-      {
-        path: 'privacy-policy',
-        component: PrivacyPolicyComponent
-      },
-      {
-        path: 'trademark-policy',
-        component: TrademarkPolicyComponent
-      },
       {
         path: 'address/:id',
         children: [],
         component: AddressComponent
       },
-      {
-        path: 'sponsor',
-        component: SponsorComponent,
-      },
     ],
   },
   {
@@ -219,68 +202,6 @@ let routes: Routes = [
       },
     ]
   },
-  {
-    path: 'signet',
-    children: [
-      {
-        path: '',
-        component: MasterPageComponent,
-        children: [
-          {
-            path: '',
-            component: StartComponent,
-            children: [
-              {
-                path: '',
-                component: DashboardComponent
-              },
-              {
-                path: 'tx/:id',
-                component: TransactionComponent
-              },
-              {
-                path: 'block/:id',
-                component: BlockComponent
-              },
-              {
-                path: 'mempool-block/:id',
-                component: MempoolBlockComponent
-              },
-            ],
-          },
-          {
-            path: 'blocks',
-            component: LatestBlocksComponent,
-          },
-          {
-            path: 'graphs',
-            component: StatisticsComponent,
-          },
-          {
-            path: 'address/:id',
-            children: [],
-            component: AddressComponent
-          },
-          {
-            path: 'api',
-            component: ApiDocsComponent,
-          },
-        ],
-      },
-      {
-        path: 'tv',
-        component: TelevisionComponent
-      },
-      {
-        path: 'status',
-        component: StatusViewComponent
-      },
-      {
-        path: '**',
-        redirectTo: ''
-      },
-    ]
-  },
   {
     path: 'bisq',
     component: MasterPageComponent,
@@ -300,110 +221,9 @@ let routes: Routes = [
   },
 ];
 
-const browserWindow = window || {};
-// @ts-ignore
-const browserWindowEnv = browserWindow.__env || {};
-
-if (browserWindowEnv && browserWindowEnv.BASE_MODULE === 'bisq') {
-  routes = [{
-    path: '',
-    component: BisqMasterPageComponent,
-    loadChildren: () => import('./bisq/bisq.module').then(m => m.BisqModule)
-  }];
-}
-
-if (browserWindowEnv && browserWindowEnv.BASE_MODULE === 'liquid') {
-  routes = [{
-    path: '',
-    component: LiquidMasterPageComponent,
-    children: [
-      {
-        path: '',
-        component: StartComponent,
-        children: [
-          {
-            path: '',
-            component: DashboardComponent
-          },
-          {
-            path: 'tx/:id',
-            component: TransactionComponent
-          },
-          {
-            path: 'block/:id',
-            component: BlockComponent
-          },
-          {
-            path: 'mempool-block/:id',
-            component: MempoolBlockComponent
-          },
-        ],
-      },
-      {
-        path: 'blocks',
-        component: LatestBlocksComponent,
-      },
-      {
-        path: 'graphs',
-        component: StatisticsComponent,
-      },
-      {
-        path: 'address/:id',
-        component: AddressComponent
-      },
-      {
-        path: 'asset/:id',
-        component: AssetComponent
-      },
-      {
-        path: 'assets',
-        component: AssetsComponent,
-      },
-      {
-        path: 'api',
-        component: ApiDocsComponent,
-      },
-      {
-        path: 'about',
-        component: AboutComponent,
-      },
-      {
-        path: 'terms-of-service',
-        component: TermsOfServiceComponent
-      },
-      {
-        path: 'privacy-policy',
-        component: PrivacyPolicyComponent
-      },
-      {
-        path: 'trademark-policy',
-        component: TrademarkPolicyComponent
-      },
-      {
-        path: 'sponsor',
-        component: SponsorComponent,
-      },
-    ],
-  },
-  {
-    path: 'tv',
-    component: TelevisionComponent
-  },
-  {
-    path: 'status',
-    component: StatusViewComponent
-  },
-  {
-    path: '**',
-    redirectTo: ''
-  }];
-}
-
 @NgModule({
   imports: [RouterModule.forRoot(routes, {
-    initialNavigation: 'enabled',
+    initialNavigation: 'enabled'
-    scrollPositionRestoration: 'enabled',
-    anchorScrolling: 'enabled'
 })],
   exports: [RouterModule]
 })

frontend/src/app/app.constants.ts

@@ -43,7 +43,7 @@ export const languages: Language[] = [
    { code: 'ar', name: 'العربية' },         // Arabic
 // { code: 'bg', name: 'Български' },       // Bulgarian
 // { code: 'bs', name: 'Bosanski' },        // Bosnian
-   { code: 'ca', name: 'Català' },          // Catalan
+// { code: 'ca', name: 'Català' },          // Catalan
    { code: 'cs', name: 'Čeština' },         // Czech
 // { code: 'da', name: 'Dansk' },           // Danish
    { code: 'de', name: 'Deutsch' },         // German
@@ -59,9 +59,8 @@ export const languages: Language[] = [
    { code: 'ko', name: '한국어' },          // Korean
 // { code: 'hr', name: 'Hrvatski' },        // Croatian
 // { code: 'id', name: 'Bahasa Indonesia' },// Indonesian
-   { code: 'hi', name: 'हिन्दी' },             // Hindi
    { code: 'it', name: 'Italiano' },        // Italian
-   { code: 'he', name: 'עברית' },           // Hebrew
+// { code: 'he', name: 'עברית' },           // Hebrew
    { code: 'ka', name: 'ქართული' },         // Georgian
 // { code: 'lv', name: 'Latviešu' },        // Latvian
 // { code: 'lt', name: 'Lietuvių' },        // Lithuanian
@@ -72,11 +71,11 @@ export const languages: Language[] = [
    { code: 'ja', name: '日本語' },          // Japanese
    { code: 'nb', name: 'Norsk' },           // Norwegian Bokmål
 // { code: 'nn', name: 'Norsk Nynorsk' },   // Norwegian Nynorsk
-   { code: 'pl', name: 'Polski' },          // Polish
+// { code: 'pl', name: 'Polski' },          // Polish
    { code: 'pt', name: 'Português' },       // Portuguese
 // { code: 'pt-BR', name: 'Português (Brazil)' }, // Portuguese (Brazil)
 // { code: 'ro', name: 'Română' },          // Romanian
-   { code: 'ru', name: 'Русский' },         // Russian
+// { code: 'ru', name: 'Русский' },         // Russian
 // { code: 'sk', name: 'Slovenčina' },      // Slovak
    { code: 'sl', name: 'Slovenščina' },     // Slovenian
 // { code: 'sr', name: 'Српски / srpski' }, // Serbian

frontend/src/app/app.module.ts

@@ -21,8 +21,6 @@ import { WebsocketService } from './services/websocket.service';
 import { AddressLabelsComponent } from './components/address-labels/address-labels.component';
 import { MempoolBlocksComponent } from './components/mempool-blocks/mempool-blocks.component';
 import { MasterPageComponent } from './components/master-page/master-page.component';
-import { BisqMasterPageComponent } from './components/bisq-master-page/bisq-master-page.component';
-import { LiquidMasterPageComponent } from './components/liquid-master-page/liquid-master-page.component';
 import { AboutComponent } from './components/about/about.component';
 import { TelevisionComponent } from './components/television/television.component';
 import { StatisticsComponent } from './components/statistics/statistics.component';
@@ -33,7 +31,7 @@ import { FooterComponent } from './components/footer/footer.component';
 import { AudioService } from './services/audio.service';
 import { MempoolBlockComponent } from './components/mempool-block/mempool-block.component';
 import { FeeDistributionGraphComponent } from './components/fee-distribution-graph/fee-distribution-graph.component';
-import { TimeSpanComponent } from './components/time-span/time-span.component';
+import { TimespanComponent } from './components/timespan/timespan.component';
 import { SeoService } from './services/seo.service';
 import { MempoolGraphComponent } from './components/mempool-graph/mempool-graph.component';
 import { AssetComponent } from './components/asset/asset.component';
@@ -45,24 +43,18 @@ import { NgbTypeaheadModule } from '@ng-bootstrap/ng-bootstrap';
 import { FeesBoxComponent } from './components/fees-box/fees-box.component';
 import { DashboardComponent } from './dashboard/dashboard.component';
 import { FontAwesomeModule, FaIconLibrary } from '@fortawesome/angular-fontawesome';
-import { faAngleDown, faAngleUp, faAngleRight, faAngleLeft, faBolt, faChartArea, faCogs, faCubes, faDatabase, faExchangeAlt, faInfoCircle,
+import { faAngleDown, faAngleUp, faBolt, faChartArea, faCogs, faCubes, faDatabase, faExchangeAlt, faInfoCircle,
-  faLink, faList, faSearch, faCaretUp, faCaretDown, faTachometerAlt, faThList, faTint, faTv, faAngleDoubleDown, faSortUp, faAngleDoubleUp, faChevronDown, faFileAlt, faRedoAlt, faArrowAltCircleRight, faExternalLinkAlt } from '@fortawesome/free-solid-svg-icons';
+  faLink, faList, faSearch, faTachometerAlt, faThList, faTint, faTv } from '@fortawesome/free-solid-svg-icons';
 import { ApiDocsComponent } from './components/api-docs/api-docs.component';
-import { CodeTemplateComponent } from './components/api-docs/code-template.component';
 import { TermsOfServiceComponent } from './components/terms-of-service/terms-of-service.component';
-import { PrivacyPolicyComponent } from './components/privacy-policy/privacy-policy.component';
-import { TrademarkPolicyComponent } from './components/trademark-policy/trademark-policy.component';
 import { StorageService } from './services/storage.service';
 import { HttpCacheInterceptor } from './services/http-cache.interceptor';
-import { SponsorComponent } from './components/sponsor/sponsor.component';
 
 @NgModule({
   declarations: [
     AppComponent,
     AboutComponent,
     MasterPageComponent,
-    BisqMasterPageComponent,
-    LiquidMasterPageComponent,
     TelevisionComponent,
     BlockchainComponent,
     StartComponent,
@@ -75,7 +67,7 @@ import { SponsorComponent } from './components/sponsor/sponsor.component';
     AmountComponent,
     LatestBlocksComponent,
     SearchFormComponent,
-    TimeSpanComponent,
+    TimespanComponent,
     AddressLabelsComponent,
     MempoolBlocksComponent,
     ChartistComponent,
@@ -90,11 +82,7 @@ import { SponsorComponent } from './components/sponsor/sponsor.component';
     FeesBoxComponent,
     DashboardComponent,
     ApiDocsComponent,
-    CodeTemplateComponent,
     TermsOfServiceComponent,
-    PrivacyPolicyComponent,
-    TrademarkPolicyComponent,
-    SponsorComponent,
   ],
   imports: [
     BrowserModule.withServerTransition({ appId: 'serverApp' }),
@@ -137,17 +125,5 @@ export class AppModule {
     library.addIcons(faAngleDown);
     library.addIcons(faAngleUp);
     library.addIcons(faExchangeAlt);
-    library.addIcons(faAngleDoubleUp);
-    library.addIcons(faAngleDoubleDown);
-    library.addIcons(faChevronDown);
-    library.addIcons(faFileAlt);
-    library.addIcons(faRedoAlt);
-    library.addIcons(faArrowAltCircleRight);
-    library.addIcons(faExternalLinkAlt);
-    library.addIcons(faSortUp);
-    library.addIcons(faCaretUp);
-    library.addIcons(faCaretDown);
-    library.addIcons(faAngleRight);
-    library.addIcons(faAngleLeft);
   }
 }

frontend/src/app/assets/assets.component.html

@@ -20,13 +20,15 @@
         <th i18n="Asset ticker header">Ticker</th>
         <th class="d-none d-md-block" i18n="Asset Issuer Domain header">Issuer domain</th>
         <th i18n="Asset ID header">Asset ID</th>
+        <th class="d-none d-lg-block" i18n="Asset issuance transaction header">Issuance TX</th>
       </thead>
       <tbody>
         <tr *ngFor="let asset of filteredAssets; trackBy: trackByAsset">
-          <td class="td-name"><a [routerLink]="['/asset/' | relativeUrl, asset.asset_id]">{{ asset.name }}</a></td>
+          <td class="td-name">{{ asset.name }}</td>
           <td>{{ asset.ticker }}</td>
-          <td class="d-none d-md-block">{{ asset.entity && asset.entity.domain }}</td>
+          <td class="d-none d-md-block"><a *ngIf="asset.entity" target="_blank" href="{{ 'http://' + asset.entity.domain }}">{{ asset.entity.domain }}</a></td>
           <td><a [routerLink]="['/asset/' | relativeUrl, asset.asset_id]">{{ asset.asset_id | shortenString : 13 }}</a> <app-clipboard class="d-none d-sm-inline-block" [text]="asset.asset_id"></app-clipboard></td>
+          <td class="d-none d-lg-block"><ng-template [ngIf]="asset.issuance_txin"><a [routerLink]="['/tx/' | relativeUrl, asset.issuance_txin.txid]">{{ asset.issuance_txin.txid | shortenString : 13 }}</a> <app-clipboard class="d-none d-sm-inline-block" [text]="asset.issuance_txin.txid"></app-clipboard></ng-template></td>
         </tr> 
       </tbody>
     </table>
@@ -45,13 +47,15 @@
         <th i18n="Asset ticker header">Ticker</th>
         <th i18n="Asset Issuer Domain header">Issuer domain</th>
         <th i18n="Asset ID header">Asset ID</th>
+        <th i18n="Asset issuance transaction header">Issuance TX</th>
       </thead>
       <tbody>
-        <tr *ngFor="let dummy of [0,0,0,0,0,0,0,0,0,0]">
+        <tr *ngFor="let dummy of [0,0,0]">
           <td><span class="skeleton-loader"></span></td>
           <td><span class="skeleton-loader"></span></td>
           <td class="d-none d-md-block"><span class="skeleton-loader"></span></td>
           <td><span class="skeleton-loader"></span></td>
+          <td class="d-none d-lg-block"><span class="skeleton-loader"></span></td>
         </tr> 
       </tbody>
     </table>

frontend/src/app/assets/assets.component.ts

@@ -107,7 +107,7 @@ export class AssetsComponent implements OnInit {
         const start = (this.page - 1) * this.itemsPerPage;
         if (searchText.length ) {
           const filteredAssets = this.assetsCache.filter((asset) => asset.name.toLowerCase().indexOf(searchText.toLowerCase()) > -1
-            || (asset.ticker || '').toLowerCase().indexOf(searchText.toLowerCase()) > -1);
+            || asset.ticker.toLowerCase().indexOf(searchText.toLowerCase()) > -1);
           this.assets = filteredAssets;
           return filteredAssets.slice(start, this.itemsPerPage + start);
         } else {

frontend/src/app/bisq/bisq-address/bisq-address.component.html

@@ -1,12 +1,10 @@
 <div class="container-xl">
-  <h1 i18n="shared.address">Address</h1>
+  <h1 style="float: left;" i18n="shared.address">Address</h1>
-  <span class="address-link">
+  <a [routerLink]="['/address/' | relativeUrl, addressString]" style="line-height: 56px; margin-left: 10px;">
-    <a  [routerLink]="['/address/' | relativeUrl, addressString]">
+    <span class="d-inline d-lg-none">{{ addressString | shortenString : 24 }}</span>
-      <span class="d-inline d-lg-none">{{ addressString | shortenString : 24 }}</span>
+    <span class="d-none d-lg-inline">{{ addressString }}</span>
-      <span class="d-none d-lg-inline">{{ addressString }}</span>
+  </a>
-    </a>
+  <app-clipboard [text]="addressString"></app-clipboard>
-    <app-clipboard [text]="addressString"></app-clipboard>
-  </span>
   <br>
 
   <div class="clearfix"></div>
@@ -15,26 +13,26 @@
     <div class="box">
 
       <div class="row">
-        <div class="col-md">
+        <div class="col">
           <table class="table table-borderless table-striped">
             <tbody>
               <tr>
                 <td i18n="address.total-received">Total received</td>
-                <td>{{ totalReceived / 100 | number: '1.2-2' }} <span class="symbol">BSQ</span></td>
+                <td>{{ totalReceived / 100 | number: '1.2-2' }} BSQ</td>
               </tr>
               <tr>
                 <td i18n="address.total-sent">Total sent</td>
-                <td>{{ totalSent / 100 | number: '1.2-2' }} <span class="symbol">BSQ</span></td>
+                <td>{{ totalSent / 100 | number: '1.2-2' }} BSQ</td>
               </tr>
               <tr>
                 <td i18n="address.balance">Balance</td>
-                <td>{{ (totalReceived - totalSent) / 100 | number: '1.2-2' }} <span class="symbol">BSQ</span> <span class="fiat"><app-bsq-amount [bsq]="totalReceived - totalSent" [forceFiat]="true" [green]="true"></app-bsq-amount></span></td>
+                <td>{{ (totalReceived - totalSent) / 100 | number: '1.2-2' }} BSQ (<app-bsq-amount [bsq]="totalReceived - totalSent" [forceFiat]="true" [green]="true"></app-bsq-amount>)</td>
               </tr>
             </tbody>
           </table>
         </div>
         <div class="w-100 d-block d-md-none"></div>
-        <div class="col-md qrcode-col">
+        <div class="col qrcode-col">
           <div class="qr-wrapper">
             <app-qrcode [data]="addressString"></app-qrcode>
           </div>

frontend/src/app/bisq/bisq-address/bisq-address.component.scss

@@ -3,73 +3,21 @@
   padding: 10px;
   padding-bottom: 5px;
   display: inline-block;
+  margin-right: 25px;
 }
 
-.qrcode-col {
+@media (min-width: 576px) {
-  text-align: center;
+  .qrcode-col {
+    text-align: right;
+  }
 }
-
+@media (max-width: 575.98px) {
-.qrcode-col > div {
+  .qrcode-col {
-  margin: 20px auto 5px;
-  @media (min-width: 768px) {
     text-align: center;
-    margin: auto;
   }
-}
 
-.fiat {
+  .qrcode-col > div {
-  display: block;
+    margin-top: 20px;
-  font-size: 13px;
+    margin-right: 0px;
-  @media (min-width: 768px) {
-    display: inline-block;
-    font-size: 14px;
-    margin-left: 10px;
   }
-}
-.table {
-  tr td {
-    &:last-child {
-      text-align: right;
-      @media (min-width: 768px) {
-        text-align: left;
-      }
-    }
-  }
-}
-
-h1 {
-  margin: 0px;
-  padding: 0px;
-  @media (min-width: 576px) {
-    float: left;
-    margin-right: 10px;
-  }
-}
-
-.address-link {
-  line-height: 26px;
-  margin-left: 0px;
-  top: 14px;
-  position: relative;
-  display: flex;
-  flex-direction: row;
-  @media (min-width: 768px) {
-    line-height: 38px;
-  }
-}
-
-.row{
-	flex-direction: column;
-	@media (min-width: 576px) {
-		flex-direction: row;
-	}
-}
-
-@media (max-width: 767.98px) {
-	.mobile-bottomcol {
-		margin-top: 15px;
-	}
-	.details-table td:first-child {
-		white-space: pre-wrap;
-	}
 }

frontend/src/app/bisq/bisq-address/bisq-address.component.ts

@@ -5,7 +5,6 @@ import { ParamMap, ActivatedRoute } from '@angular/router';
 import { Subscription, of } from 'rxjs';
 import { BisqTransaction } from '../bisq.interfaces';
 import { BisqApiService } from '../bisq-api.service';
-import { WebsocketService } from 'src/app/services/websocket.service';
 
 @Component({
   selector: 'app-bisq-address',
@@ -23,15 +22,12 @@ export class BisqAddressComponent implements OnInit, OnDestroy {
   totalSent = 0;
 
   constructor(
-    private websocketService: WebsocketService,
     private route: ActivatedRoute,
     private seoService: SeoService,
     private bisqApiService: BisqApiService,
   ) { }
 
   ngOnInit() {
-    this.websocketService.want(['blocks']);
-
     this.mainSubscription = this.route.paramMap
       .pipe(
         switchMap((params: ParamMap) => {

frontend/src/app/bisq/bisq-api.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { HttpClient, HttpResponse, HttpParams } from '@angular/common/http';
 import { Observable } from 'rxjs';
-import { BisqTransaction, BisqBlock, BisqStats, MarketVolume, Trade, Markets, Tickers, Offers, Currencies, HighLowOpenClose, SummarizedInterval } from './bisq.interfaces';
+import { BisqTransaction, BisqBlock, BisqStats } from './bisq.interfaces';
 
 const API_BASE_URL = '/bisq/api';
 
@@ -42,37 +42,4 @@ export class BisqApiService {
   getAddress$(address: string): Observable<BisqTransaction[]> {
     return this.httpClient.get<BisqTransaction[]>(API_BASE_URL + '/address/' + address);
   }
-
-  getMarkets$(): Observable<Markets> {
-    return this.httpClient.get<Markets>(API_BASE_URL + '/markets/markets');
-  }
-
-  getMarketsTicker$(): Observable<Tickers> {
-    return this.httpClient.get<Tickers>(API_BASE_URL + '/markets/ticker');
-  }
-
-  getMarketsCurrencies$(): Observable<Currencies> {
-    return this.httpClient.get<Currencies>(API_BASE_URL + '/markets/currencies');
-  }
-
-  getMarketsHloc$(market: string, interval: 'minute' | 'half_hour' | 'hour' | 'half_day' | 'day'
-  | 'week' | 'month' | 'year' | 'auto'): Observable<SummarizedInterval[]> {
-    return this.httpClient.get<SummarizedInterval[]>(API_BASE_URL + '/markets/hloc?market=' + market + '&interval=' + interval);
-  }
-
-  getMarketOffers$(market: string): Observable<Offers> {
-    return this.httpClient.get<Offers>(API_BASE_URL + '/markets/offers?market=' + market);
-  }
-
-  getMarketTrades$(market: string): Observable<Trade[]> {
-    return this.httpClient.get<Trade[]>(API_BASE_URL + '/markets/trades?market=' + market);
-  }
-
-  getMarketVolumesByTime$(period: string): Observable<HighLowOpenClose[]> {
-    return this.httpClient.get<HighLowOpenClose[]>(API_BASE_URL + '/markets/volumes/' + period);
-  }
-
-  getAllVolumesDay$(): Observable<MarketVolume[]> {
-    return this.httpClient.get<MarketVolume[]>(API_BASE_URL + '/markets/volumes?interval=week');
-  }
 }

frontend/src/app/bisq/bisq-block/bisq-block.component.html

@@ -8,9 +8,9 @@
 
   <ng-template [ngIf]="!isLoading && !error">
 
-    <div class="box block-container">
+    <div class="box">
       <div class="row">
-        <div class="col">
+        <div class="col-sm">
           <table class="table table-borderless table-striped">
             <tbody>
               <tr>
@@ -22,13 +22,13 @@
                 <td>
                   {{ block.time | date:'yyyy-MM-dd HH:mm' }}
                   <div class="lg-inline">
-                    <i class="symbol">(<app-time-since [time]="block.time / 1000" [fastRender]="true"></app-time-since>)</i>
+                    <i>(<app-time-since [time]="block.time / 1000" [fastRender]="true"></app-time-since>)</i>
                   </div>
                 </td>
               </tr>
           </table>
         </div>
-        <div class="col">
+        <div class="col-sm">
           <table class="table table-borderless table-striped">
             <tbody>
               <tr>
@@ -73,7 +73,7 @@
   <ng-template [ngIf]="isLoading && !error">
     <div class="box">
       <div class="row">
-        <div class="col">
+        <div class="col-sm">
           <table class="table table-borderless table-striped">
             <tbody>
               <tr>
@@ -86,7 +86,7 @@
               </tr>
           </table>
         </div>
-        <div class="col">
+        <div class="col-sm">
           <table class="table table-borderless table-striped">
             <tbody>
               <tr>

frontend/src/app/bisq/bisq-block/bisq-block.component.scss

@@ -1,44 +1,10 @@
+
 .td-width {
-	width: 140px;
+  width: 175px;
-	@media (min-width: 768px) {
-		width: 175px;
-	}
 }
 
-h1 {
+@media (max-width: 767.98px) {
-	margin: 0px;
+	.td-width {
-	padding: 0px;
+		width: 140px;
-	@media (min-width: 576px) {
-		float: left;
-		margin-right: 10px;
 	}
 }
-
-.row{
-	flex-direction: column;
-	@media (min-width: 768px) {
-		flex-direction: row;
-	}
-}
-
-.block-container {	
-	.table {
-		tr td {
-			&:last-child {
-				text-align: right;
-				@media (min-width: 992px) {
-					text-align: left;
-				}
-			}
-		}
-	}
-	.fiat {
-		display: block;
-		font-size: 13px;
-		@media (min-width: 992px) {
-			display: inline-block;
-			font-size: 14px;
-			margin-left: 10px;
-		}
-	}
-}

frontend/src/app/bisq/bisq-block/bisq-block.component.ts

@@ -8,7 +8,6 @@ import { switchMap, catchError } from 'rxjs/operators';
 import { SeoService } from 'src/app/services/seo.service';
 import { ElectrsApiService } from 'src/app/services/electrs-api.service';
 import { HttpErrorResponse } from '@angular/common/http';
-import { WebsocketService } from 'src/app/services/websocket.service';
 
 @Component({
   selector: 'app-bisq-block',
@@ -24,7 +23,6 @@ export class BisqBlockComponent implements OnInit, OnDestroy {
   error: HttpErrorResponse | null;
 
   constructor(
-    private websocketService: WebsocketService,
     private bisqApiService: BisqApiService,
     private route: ActivatedRoute,
     private seoService: SeoService,
@@ -34,8 +32,6 @@ export class BisqBlockComponent implements OnInit, OnDestroy {
   ) { }
 
   ngOnInit(): void {
-    this.websocketService.want(['blocks']);
-
     this.subscription = this.route.paramMap
       .pipe(
         switchMap((params: ParamMap) => {

frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.html

@@ -1,5 +1,5 @@
-<div class="container-xl" (window:resize)="onResize($event)">
+<div class="container-xl">
-  <h1 style="float: left;" i18n="Bisq blocks header">BSQ Blocks</h1>
+  <h1 style="float: left;" i18n="Bisq blocks header">Blocks</h1>
   <br>
 
   <div class="clearfix"></div>
@@ -18,7 +18,7 @@
         <tr *ngFor="let block of blocks.value[0]; trackBy: trackByFn">
           <td><a [routerLink]="['/block/' | relativeUrl, block.hash]" [state]="{ data: { block: block } }">{{ block.height }}</a></td>
           <td><app-time-since [time]="block.time / 1000" [fastRender]="true"></app-time-since></td>
-          <td>{{ calculateTotalOutput(block) / 100 | number: '1.2-2' }} <span class="symbol">BSQ</span></td>
+          <td>{{ calculateTotalOutput(block) / 100 | number: '1.2-2' }}<span class="d-none d-md-inline"> BSQ</span></td>
           <td class="d-none d-md-block">{{ block.txs.length }}</td>
         </tr> 
       </tbody>
@@ -26,7 +26,9 @@
   </div>
 
   <br>
-  <ngb-pagination *ngIf="blocks.value" class="pagination-container" [size]="paginationSize" [collectionSize]="blocks.value[1]" [rotate]="true" [pageSize]="itemsPerPage" [(page)]="page" (pageChange)="pageChange(page)" [maxSize]="paginationMaxSize" [boundaryLinks]="true" [ellipses]="false"></ngb-pagination>
+
+  <ngb-pagination *ngIf="blocks.value" [size]="paginationSize" [collectionSize]="blocks.value[1]" [rotate]="true" [pageSize]="itemsPerPage" [(page)]="page" (pageChange)="pageChange(page)" [maxSize]="paginationMaxSize" [boundaryLinks]="true"></ngb-pagination>
+
   </ng-container>
 </div>
 

frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.scss

@@ -1,11 +0,0 @@
-.pagination-container {
-  float: none;
-  margin-bottom: 200px;
-  @media(min-width: 400px){
-    float: right;
-  }
-}
-
-.container-xl {
-    padding-bottom: 110px;
-}

frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.ts

@@ -5,7 +5,6 @@ import { Observable } from 'rxjs';
 import { BisqBlock, BisqOutput, BisqTransaction } from '../bisq.interfaces';
 import { SeoService } from 'src/app/services/seo.service';
 import { ActivatedRoute, Router } from '@angular/router';
-import { WebsocketService } from 'src/app/services/websocket.service';
 
 @Component({
   selector: 'app-bisq-blocks',
@@ -23,10 +22,9 @@ export class BisqBlocksComponent implements OnInit {
   isLoading = true;
   // @ts-ignore
   paginationSize: 'sm' | 'lg' = 'md';
-  paginationMaxSize = 5;
+  paginationMaxSize = 10;
 
   constructor(
-    private websocketService: WebsocketService,
     private bisqApiService: BisqApiService,
     private seoService: SeoService,
     private route: ActivatedRoute,
@@ -34,11 +32,10 @@ export class BisqBlocksComponent implements OnInit {
   ) { }
 
   ngOnInit(): void {
-    this.websocketService.want(['blocks']);
     this.seoService.setTitle($localize`:@@8a7b4bd44c0ac71b2e72de0398b303257f7d2f54:Blocks`);
     this.itemsPerPage = Math.max(Math.round(this.contentSpace / this.fiveItemsPxSize) * 5, 10);
     this.loadingItems = Array(this.itemsPerPage);
-    if (document.body.clientWidth < 670) {
+    if (document.body.clientWidth < 768) {
       this.paginationSize = 'sm';
       this.paginationMaxSize = 3;
     }
@@ -83,8 +80,4 @@ export class BisqBlocksComponent implements OnInit {
       queryParamsHandling: 'merge',
     });
   }
-
-  onResize(event: any) {
-    this.paginationMaxSize = event.target.innerWidth < 670 ? 3 : 5;
-  }
 }

frontend/src/app/bisq/bisq-dashboard/bisq-dashboard.component.html

@@ -1,63 +0,0 @@
-<div class="container-xl">
-
-  <h1 i18n="Bisq markets title">Bisq Trading Volume</h1>
-
-  <div id="volumeHolder">
-    <ng-template #loadingVolumes>
-      <div class="text-center loadingVolumes">
-        <div class="spinner-border text-light"></div>
-      </div>  
-    </ng-template>
-    <ng-container *ngIf="volumes$ | async as volumes; else loadingVolumes">
-      <app-lightweight-charts-area [data]="volumes.data" [lineData]="volumes.linesData"></app-lightweight-charts-area>
-    </ng-container>
-  </div>
-
-  <br><br>
-
-  <div class="container-info">
-    <h1>
-      <ng-template [ngIf]="stateService.env.BASE_MODULE === 'bisq'" [ngIfElse]="nonOfficialMarkets" i18n="Bisq All Markets">Markets</ng-template>
-      <ng-template #nonOfficialMarkets i18n="Bisq Bitcoin Markets">Bitcoin Markets</ng-template>
-    </h1>
-    <ng-container *ngIf="{ value: (tickers$ | async) } as tickers">
-      <div class="table-container">
-        <table class="table table-borderless table-striped">
-          <thead>
-            <th><ng-container i18n>Currency</ng-container> <button [disabled]="(sort$ | async) === 'name'" class="btn btn-link btn-sm" (click)="sort('name')"><fa-icon [icon]="['fas', 'chevron-down']" [fixedWidth]="true"></fa-icon></button></th>
-            <th i18n>Price</th>
-            <th><ng-container i18n="Trading volume 7D">Volume (7d)</ng-container> <button [disabled]="(sort$ | async) === 'volumes'" class="btn btn-link btn-sm" (click)="sort('volumes')"><fa-icon [icon]="['fas', 'chevron-down']" [fixedWidth]="true"></fa-icon></button></th>
-            <th><ng-container i18n="Trades amount 7D">Trades (7d)</ng-container> <button [disabled]="(sort$ | async) === 'trades'" class="btn btn-link btn-sm" (click)="sort('trades')"><fa-icon [icon]="['fas', 'chevron-down']" [fixedWidth]="true"></fa-icon></button></th>
-          </thead>
-          <tbody *ngIf="tickers.value; else loadingTmpl">
-            <tr *ngFor="let ticker of tickers.value; trackBy: trackByFn;">
-              <td><a [routerLink]="['/market' | relativeUrl, ticker.pair_url]">{{ ticker.name }})</a></td>
-              <td>
-                <app-fiat *ngIf="ticker.market.rtype === 'crypto'; else fiat" [value]="ticker.last * 100000000"></app-fiat>
-                <ng-template #fiat>
-                  <span class="green-color">{{ ticker.last | currency: ticker.market.rsymbol }}</span>
-                </ng-template>
-              </td>
-              <td>
-                <app-fiat [value]="ticker.volume?.volume"></app-fiat>
-              </td>
-              <td>{{ ticker.volume?.num_trades ? ticker.volume?.num_trades : 0 }}</td>
-            </tr> 
-          </tbody>
-        </table>
-      </div>
-
-      <br><br>
-
-      <h2 i18n="Latest Trades header">Latest Trades</h2>
-      <app-bisq-trades [trades$]="trades$"></app-bisq-trades>
-
-    </ng-container>
-  </div>
-</div>
-
-<ng-template #loadingTmpl>
-  <tr *ngFor="let i of [1,2,3,4,5,6,7,8,9,10]">
-    <td *ngFor="let j of [1, 2, 3, 4]"><span class="skeleton-loader"></span></td>
-  </tr>
-</ng-template>