Extend esplora api to support returning origin, improve stats pause logic

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ jobs:
     if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')"
     strategy:
       matrix:
-        node: ["18", "20"]
+        node: ["16", "17", "18", "20"]
         flavor: ["dev", "prod"]
       fail-fast: false
     runs-on: "ubuntu-latest"
@@ -67,7 +67,7 @@ jobs:
     if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')"
     strategy:
       matrix:
-        node: ["18", "20"]
+        node: ["16", "17", "18", "20"]
         flavor: ["dev", "prod"]
       fail-fast: false
     runs-on: "ubuntu-latest"

.github/workflows/cypress.yml

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

.github/workflows/get_backend_hash.yml

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

.github/workflows/on-tag.yml

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

.nvmrc

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

GNUmakefile

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

Makefile

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

backend/mempool-config.sample.json

@@ -68,8 +68,7 @@
     "DATABASE": "mempool",
     "USERNAME": "mempool",
     "PASSWORD": "mempool",
-    "TIMEOUT": 180000,
-    "PID_DIR": ""
+    "TIMEOUT": 180000
   },
   "SYSLOG": {
     "ENABLED": true,

backend/package.json

@@ -38,12 +38,12 @@
     "rust-build": "cd rust-gbt && npm run build-release"
   },
   "dependencies": {
-    "@babel/core": "^7.23.2",
+    "@babel/core": "^7.21.3",
     "@mempool/electrum-client": "1.1.9",
     "@types/node": "^18.15.3",
-    "axios": "~1.5.0",
+    "axios": "~1.4.0",
     "bitcoinjs-lib": "~6.1.3",
-    "crypto-js": "~4.2.0",
+    "crypto-js": "~4.1.1",
     "express": "~4.18.2",
     "maxmind": "~4.3.11",
     "mysql2": "~3.6.0",
@@ -55,7 +55,7 @@
   },
   "devDependencies": {
     "@babel/code-frame": "^7.18.6",
-    "@babel/core": "^7.23.2",
+    "@babel/core": "^7.21.3",
     "@types/compression": "^1.7.2",
     "@types/crypto-js": "^4.1.1",
     "@types/express": "^4.17.17",

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

@@ -69,7 +69,6 @@
     "DATABASE": "__DATABASE_DATABASE__",
     "USERNAME": "__DATABASE_USERNAME__",
     "PASSWORD": "__DATABASE_PASSWORD__",
-    "PID_DIR": "__DATABASE_PID_FILE__",
     "TIMEOUT": 3000
   },
   "SYSLOG": {

backend/src/__tests__/config.test.ts

@@ -84,7 +84,6 @@ describe('Mempool Backend Config', () => {
         USERNAME: 'mempool',
         PASSWORD: 'mempool',
         TIMEOUT: 180000,
-        PID_DIR: ''
       });
 
       expect(config.SYSLOG).toStrictEqual({

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

@@ -1,7 +1,7 @@
 import { IEsploraApi } from './esplora-api.interface';
 
 export interface AbstractBitcoinApi {
-  $getRawMempool(): Promise<IEsploraApi.Transaction['txid'][]>;
+  $getRawMempool(): Promise<{ txids: IEsploraApi.Transaction['txid'][], local: boolean}>;
   $getRawTransaction(txId: string, skipConversion?: boolean, addPrevout?: boolean, lazyPrevouts?: boolean): Promise<IEsploraApi.Transaction>;
   $getMempoolTransactions(txids: string[]): Promise<IEsploraApi.Transaction[]>;
   $getAllMempoolTransactions(lastTxid: string);
@@ -25,6 +25,7 @@ export interface AbstractBitcoinApi {
   $getBatchedOutspends(txId: string[]): Promise<IEsploraApi.Outspend[][]>;
 
   startHealthChecks(): void;
+  isFailedOver(): boolean;
 }
 export interface BitcoinRpcCredentials {
   host: string;

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

@@ -137,8 +137,12 @@ class BitcoinApi implements AbstractBitcoinApi {
     throw new Error('Method getScriptHashTransactions not supported by the Bitcoin RPC API.');
   }
 
-  $getRawMempool(): Promise<IEsploraApi.Transaction['txid'][]> {
-    return this.bitcoindClient.getRawMemPool();
+  async $getRawMempool(): Promise<{ txids: IEsploraApi.Transaction['txid'][], local: boolean}> {
+    const txids = await this.bitcoindClient.getRawMemPool();
+    return {
+      txids,
+      local: true,
+    };
   }
 
   $getAddressPrefix(prefix: string): string[] {
@@ -356,6 +360,9 @@ class BitcoinApi implements AbstractBitcoinApi {
   }
 
   public startHealthChecks(): void {};
+  public isFailedOver(): boolean {
+    return false;
+  }
 }
 
 export default BitcoinApi;

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

@@ -478,7 +478,7 @@ class BitcoinRoutes {
       }
 
       let nextHash = startFromHash;
-      for (let i = 0; i < 15 && nextHash; i++) {
+      for (let i = 0; i < 10 && nextHash; i++) {
         const localBlock = blocks.getBlocks().find((b) => b.id === nextHash);
         if (localBlock) {
           returnBlocks.push(localBlock);
@@ -638,8 +638,8 @@ class BitcoinRoutes {
 
   private async getMempoolTxIds(req: Request, res: Response) {
     try {
-      const rawMempool = await bitcoinApi.$getRawMempool();
-      res.send(rawMempool);
+      const { txids } = await bitcoinApi.$getRawMempool();
+      res.send(txids);
     } catch (e) {
       res.status(500).send(e instanceof Error ? e.message : e);
     }

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

@@ -4,6 +4,7 @@ import http from 'http';
 import { AbstractBitcoinApi } from './bitcoin-api-abstract-factory';
 import { IEsploraApi } from './esplora-api.interface';
 import logger from '../../logger';
+import mempool from '../mempool';
 
 interface FailoverHost {
   host: string,
@@ -17,6 +18,8 @@ interface FailoverHost {
 }
 
 class FailoverRouter {
+  isFailedOver: boolean = false;
+  preferredHost: FailoverHost;
   activeHost: FailoverHost;
   fallbackHost: FailoverHost;
   hosts: FailoverHost[];
@@ -46,6 +49,7 @@ class FailoverRouter {
       socket: !!config.ESPLORA.UNIX_SOCKET_PATH,
       preferred: true,
     };
+    this.preferredHost = this.activeHost;
     this.fallbackHost = this.activeHost;
     this.hosts.unshift(this.activeHost);
     this.multihost = this.hosts.length > 1;
@@ -151,6 +155,7 @@ class FailoverRouter {
     this.sortHosts();
     this.activeHost = this.hosts[0];
     logger.warn(`Switching esplora host to ${this.activeHost.host}`);
+    this.isFailedOver = this.activeHost !== this.preferredHost;
   }
 
   private addFailure(host: FailoverHost): FailoverHost {
@@ -164,7 +169,7 @@ class FailoverRouter {
     }
   }
 
-  private async $query<T>(method: 'get'| 'post', path, data: any, responseType = 'json', host = this.activeHost, retry: boolean = true): Promise<T> {
+  private async $query<T>(method: 'get'| 'post', path, data: any, responseType = 'json', host = this.activeHost, retry: boolean = true, withSource = false): Promise<T | { data: T, host: FailoverHost }> {
     let axiosConfig;
     let url;
     if (host.socket) {
@@ -177,8 +182,17 @@ class FailoverRouter {
     return (method === 'post'
         ? this.requestConnection.post<T>(url, data, axiosConfig)
         : this.requestConnection.get<T>(url, axiosConfig)
-    ).then((response) => { host.failures = Math.max(0, host.failures - 1); return response.data; })
-      .catch((e) => {
+    ).then((response) => {
+      host.failures = Math.max(0, host.failures - 1);
+      if (withSource) {
+        return {
+          data: response.data,
+          host,
+        };
+      } else {
+        return response.data;
+      }
+    }).catch((e) => {
         let fallbackHost = this.fallbackHost;
         if (e?.response?.status !== 404) {
           logger.warn(`esplora request failed ${e?.response?.status || 500} ${host.host}${path}`);
@@ -186,7 +200,7 @@ class FailoverRouter {
         }
         if (retry && e?.code === 'ECONNREFUSED' && this.multihost) {
           // Retry immediately
-          return this.$query(method, path, data, responseType, fallbackHost, false);
+          return this.$query(method, path, data, responseType, fallbackHost, false, withSource);
         } else {
           throw e;
         }
@@ -194,19 +208,27 @@ class FailoverRouter {
   }
 
   public async $get<T>(path, responseType = 'json'): Promise<T> {
-    return this.$query<T>('get', path, null, responseType);
+    return this.$query<T>('get', path, null, responseType, this.activeHost, true) as Promise<T>;
   }
 
   public async $post<T>(path, data: any, responseType = 'json'): Promise<T> {
-    return this.$query<T>('post', path, data, responseType);
+    return this.$query<T>('post', path, data, responseType) as Promise<T>;
+  }
+
+  public async $getWithSource<T>(path, responseType = 'json'): Promise<{ data: T, host: FailoverHost }> {
+    return this.$query<T>('get', path, null, responseType, this.activeHost, true, true) as Promise<{ data: T, host: FailoverHost }>;
   }
 }
 
 class ElectrsApi implements AbstractBitcoinApi {
   private failoverRouter = new FailoverRouter();
 
-  $getRawMempool(): Promise<IEsploraApi.Transaction['txid'][]> {
-    return this.failoverRouter.$get<IEsploraApi.Transaction['txid'][]>('/mempool/txids');
+  async $getRawMempool(): Promise<{ txids: IEsploraApi.Transaction['txid'][], local: boolean}> {
+    const result = await this.failoverRouter.$getWithSource<IEsploraApi.Transaction['txid'][]>('/mempool/txids', 'json');
+    return {
+      txids: result.data,
+      local: result.host === this.failoverRouter.preferredHost,
+    };
   }
 
   $getRawTransaction(txId: string): Promise<IEsploraApi.Transaction> {
@@ -302,6 +324,10 @@ class ElectrsApi implements AbstractBitcoinApi {
   public startHealthChecks(): void {
     this.failoverRouter.startHealthChecks();
   }
+
+  public isFailedOver(): boolean {
+    return this.failoverRouter.isFailedOver;
+  }
 }
 
 export default ElectrsApi;

backend/src/api/database-migration.ts

@@ -7,7 +7,7 @@ import cpfpRepository from '../repositories/CpfpRepository';
 import { RowDataPacket } from 'mysql2';
 
 class DatabaseMigration {
-  private static currentVersion = 66;
+  private static currentVersion = 65;
   private queryTimeout = 3600_000;
   private statisticsAddedIndexed = false;
   private uniqueLogs: string[] = [];
@@ -553,11 +553,6 @@ class DatabaseMigration {
       await this.$executeQuery('ALTER TABLE `blocks_audits` ADD accelerated_txs JSON DEFAULT "[]"');
       await this.updateToSchemaVersion(65);
     }
-
-    if (databaseSchemaVersion < 66) {
-      await this.$executeQuery('ALTER TABLE `statistics` ADD min_fee FLOAT UNSIGNED DEFAULT NULL');
-      await this.updateToSchemaVersion(66);
-    }
   }
 
   /**

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

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

backend/src/api/memory-cache.ts

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

backend/src/api/mempool.ts

@@ -26,6 +26,9 @@ class Mempool {
 
   private accelerations: { [txId: string]: Acceleration } = {};
 
+  private failoverTimes: number[] = [];
+  private statisticsPaused: boolean = false;
+
   private txPerSecondArray: number[] = [];
   private txPerSecond: number = 0;
 
@@ -164,6 +167,15 @@ class Mempool {
     return this.mempoolInfo;
   }
 
+  public getStatisticsIsPaused(): boolean {
+    return this.statisticsPaused;
+  }
+
+  public logFailover(): void {
+    this.failoverTimes.push(Date.now());
+    this.statisticsPaused = true;
+  }
+
   public getTxPerSecond(): number {
     return this.txPerSecond;
   }
@@ -242,6 +254,10 @@ class Mempool {
         logger.debug(`fetched ${txs.length} transactions`);
         this.updateTimerProgress(timer, 'fetched new transactions');
 
+        if (bitcoinApi.isFailedOver()) {
+          this.failoverTimes.push(Date.now());
+        }
+
         for (const transaction of txs) {
           this.mempoolCache[transaction.txid] = transaction;
           if (this.inSync) {
@@ -259,6 +275,10 @@ class Mempool {
           }
         }
 
+        if (bitcoinApi.isFailedOver()) {
+          this.failoverTimes.push(Date.now());
+        }
+
         if (txs.length < slice.length) {
           const missing = slice.length - txs.length;
           if (config.MEMPOOL.BACKEND === 'esplora') {
@@ -491,6 +511,10 @@ class Mempool {
 
   private updateTxPerSecond() {
     const nowMinusTimeSpan = new Date().getTime() - (1000 * config.STATISTICS.TX_PER_SECOND_SAMPLE_PERIOD);
+
+    this.failoverTimes = this.failoverTimes.filter((unixTime) => unixTime > nowMinusTimeSpan);
+    this.statisticsPaused = this.failoverTimes.length > 0;
+
     this.txPerSecondArray = this.txPerSecondArray.filter((unixTime) => unixTime > nowMinusTimeSpan);
     this.txPerSecond = this.txPerSecondArray.length / config.STATISTICS.TX_PER_SECOND_SAMPLE_PERIOD || 0;
 

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

@@ -15,7 +15,6 @@ class StatisticsApi {
               mempool_byte_weight,
               fee_data,
               total_fee,
-              min_fee,
               vsize_1,
               vsize_2,
               vsize_3,
@@ -55,7 +54,7 @@ class StatisticsApi {
               vsize_1800,
               vsize_2000
             )
-            VALUES (NOW(), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            VALUES (NOW(), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)`;
       const [result]: any = await DB.query(query);
       return result.insertId;
@@ -74,7 +73,6 @@ class StatisticsApi {
               mempool_byte_weight,
               fee_data,
               total_fee,
-              min_fee,
               vsize_1,
               vsize_2,
               vsize_3,
@@ -114,7 +112,7 @@ class StatisticsApi {
               vsize_1800,
               vsize_2000
             )
-            VALUES (${statistics.added}, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
+            VALUES (${statistics.added}, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
                ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`;
 
       const params: (string | number)[] = [
@@ -124,7 +122,6 @@ class StatisticsApi {
         statistics.mempool_byte_weight,
         statistics.fee_data,
         statistics.total_fee,
-        statistics.min_fee,
         statistics.vsize_1,
         statistics.vsize_2,
         statistics.vsize_3,
@@ -174,9 +171,7 @@ class StatisticsApi {
   private getQueryForDaysAvg(div: number, interval: string) {
     return `SELECT
       UNIX_TIMESTAMP(added) as added,
-      CAST(avg(unconfirmed_transactions) as DOUBLE) as unconfirmed_transactions,
       CAST(avg(vbytes_per_second) as DOUBLE) as vbytes_per_second,
-      CAST(avg(min_fee) as DOUBLE) as min_fee,
       CAST(avg(vsize_1) as DOUBLE) as vsize_1,
       CAST(avg(vsize_2) as DOUBLE) as vsize_2,
       CAST(avg(vsize_3) as DOUBLE) as vsize_3,
@@ -224,9 +219,7 @@ class StatisticsApi {
   private getQueryForDays(div: number, interval: string) {
     return `SELECT
       UNIX_TIMESTAMP(added) as added,
-      CAST(avg(unconfirmed_transactions) as DOUBLE) as unconfirmed_transactions,
       CAST(avg(vbytes_per_second) as DOUBLE) as vbytes_per_second,
-      CAST(avg(min_fee) as DOUBLE) as min_fee,
       vsize_1,
       vsize_2,
       vsize_3,
@@ -408,11 +401,9 @@ class StatisticsApi {
     return statistic.map((s) => {
       return {
         added: s.added,
-        count: s.unconfirmed_transactions,
         vbytes_per_second: s.vbytes_per_second,
         mempool_byte_weight: s.mempool_byte_weight,
         total_fee: s.total_fee,
-        min_fee: s.min_fee,
         vsizes: [
           s.vsize_1,
           s.vsize_2,

backend/src/api/statistics/statistics.ts

@@ -29,9 +29,10 @@ class Statistics {
   }
 
   private async runStatistics(): Promise<void> {
-    if (!memPool.isInSync()) {
+    if (!memPool.isInSync() || memPool.getStatisticsIsPaused()) {
       return;
     }
+
     const currentMempool = memPool.getMempool();
     const txPerSecond = memPool.getTxPerSecond();
     const vBytesPerSecond = memPool.getVBytesPerSecond();
@@ -89,9 +90,6 @@ class Statistics {
       }
     });
 
-    // get minFee and convert to sats/vb
-    const minFee = memPool.getMempoolInfo().mempoolminfee * 100000;
-
     try {
       const insertId = await statisticsApi.$create({
         added: 'NOW()',
@@ -101,7 +99,6 @@ class Statistics {
         mempool_byte_weight: totalWeight,
         total_fee: totalFee,
         fee_data: '',
-        min_fee: minFee,
         vsize_1: weightVsizeFees['1'] || 0,
         vsize_2: weightVsizeFees['2'] || 0,
         vsize_3: weightVsizeFees['3'] || 0,

backend/src/api/websocket-handler.ts

@@ -71,9 +71,8 @@ class WebsocketHandler {
   private updateSocketData(): void {
     const _blocks = blocks.getBlocks().slice(-config.MEMPOOL.INITIAL_BLOCKS_AMOUNT);
     const da = difficultyAdjustment.getDifficultyAdjustment();
-    this.updateSocketDataFields({
+    const socketData = {
       'mempoolInfo': memPool.getMempoolInfo(),
-      'vBytesPerSecond': memPool.getVBytesPerSecond(),
       'blocks': _blocks,
       'conversions': priceUpdater.getLatestPrices(),
       'mempool-blocks': mempoolBlocks.getMempoolBlocks(),
@@ -82,7 +81,11 @@ class WebsocketHandler {
       'loadingIndicators': loadingIndicators.getLoadingIndicators(),
       'da': da?.previousTime ? da : undefined,
       'fees': feeApi.getRecommendedFee(),
-    });
+    };
+    if (!memPool.getStatisticsIsPaused()) {
+      socketData['vBytesPerSecond'] = memPool.getVBytesPerSecond();
+    }
+    this.updateSocketDataFields(socketData);
   }
 
   public getSerializedInitData(): string {
@@ -414,7 +417,7 @@ class WebsocketHandler {
     const mBlocks = mempoolBlocks.getMempoolBlocks();
     const mBlockDeltas = mempoolBlocks.getMempoolBlockDeltas();
     const mempoolInfo = memPool.getMempoolInfo();
-    const vBytesPerSecond = memPool.getVBytesPerSecond();
+    const vBytesPerSecond = memPool.getStatisticsIsPaused() ? null : memPool.getVBytesPerSecond();
     const rbfTransactions = Common.findRbfTransactions(newTransactions, deletedTransactions);
     const da = difficultyAdjustment.getDifficultyAdjustment();
     memPool.handleRbfTransactions(rbfTransactions);
@@ -440,13 +443,15 @@ class WebsocketHandler {
     // update init data
     const socketDataFields = {
       'mempoolInfo': mempoolInfo,
-      'vBytesPerSecond': vBytesPerSecond,
       'mempool-blocks': mBlocks,
       'transactions': latestTransactions,
       'loadingIndicators': loadingIndicators.getLoadingIndicators(),
       'da': da?.previousTime ? da : undefined,
       'fees': recommendedFees,
     };
+    if (vBytesPerSecond != null) {
+      socketDataFields['vBytesPerSecond'] = vBytesPerSecond;
+    }
     if (rbfSummary) {
       socketDataFields['rbfSummary'] = rbfSummary;
     }
@@ -486,7 +491,6 @@ class WebsocketHandler {
 
     // pre-compute address transactions
     const addressCache = this.makeAddressCache(newTransactions);
-    const removedAddressCache = this.makeAddressCache(deletedTransactions);
 
     this.wss.clients.forEach(async (client) => {
       if (client.readyState !== WebSocket.OPEN) {
@@ -497,7 +501,9 @@ class WebsocketHandler {
 
       if (client['want-stats']) {
         response['mempoolInfo'] = getCachedResponse('mempoolInfo', mempoolInfo);
-        response['vBytesPerSecond'] = getCachedResponse('vBytesPerSecond', vBytesPerSecond);
+        if (vBytesPerSecond != null) {
+          response['vBytesPerSecond'] = getCachedResponse('vBytesPerSecond', vBytesPerSecond);
+        }
         response['transactions'] = getCachedResponse('transactions', latestTransactions);
         if (da?.previousTime) {
           response['da'] = getCachedResponse('da', da);
@@ -527,15 +533,11 @@ class WebsocketHandler {
       }
 
       if (client['track-address']) {
-        const newTransactions = Array.from(addressCache[client['track-address']]?.values() || []);
-        const removedTransactions = Array.from(removedAddressCache[client['track-address']]?.values() || []);
+        const foundTransactions = Array.from(addressCache[client['track-address']]?.values() || []);
         // txs may be missing prevouts in non-esplora backends
         // so fetch the full transactions now
-        const fullTransactions = (config.MEMPOOL.BACKEND !== 'esplora') ? await this.getFullTransactions(newTransactions) : newTransactions;
+        const fullTransactions = (config.MEMPOOL.BACKEND !== 'esplora') ? await this.getFullTransactions(foundTransactions) : foundTransactions;
 
-        if (removedTransactions.length) {
-          response['address-removed-transactions'] = JSON.stringify(removedTransactions);
-        }
         if (fullTransactions.length) {
           response['address-transactions'] = JSON.stringify(fullTransactions);
         }
@@ -789,7 +791,9 @@ class WebsocketHandler {
 
       if (client['want-stats']) {
         response['mempoolInfo'] = getCachedResponse('mempoolInfo', mempoolInfo);
-        response['vBytesPerSecond'] = getCachedResponse('vBytesPerSecond', memPool.getVBytesPerSecond());
+        if (!memPool.getStatisticsIsPaused()) {
+          response['vBytesPerSecond'] = getCachedResponse('vBytesPerSecond', memPool.getVBytesPerSecond());
+        }
         response['fees'] = getCachedResponse('fees', fees);
 
         if (da?.previousTime) {

backend/src/config.ts

@@ -93,7 +93,6 @@ interface IConfig {
     USERNAME: string;
     PASSWORD: string;
     TIMEOUT: number;
-    PID_DIR: string;
   };
   SYSLOG: {
     ENABLED: boolean;
@@ -220,7 +219,6 @@ const defaults: IConfig = {
     'USERNAME': 'mempool',
     'PASSWORD': 'mempool',
     'TIMEOUT': 180000,
-    'PID_DIR': '',
   },
   'SYSLOG': {
     'ENABLED': true,

backend/src/database.ts

@@ -1,5 +1,3 @@
-import * as fs from 'fs';
-import path from 'path';
 import config from './config';
 import { createPool, Pool, PoolConnection } from 'mysql2/promise';
 import logger from './logger';
@@ -103,33 +101,6 @@ import { FieldPacket, OkPacket, PoolOptions, ResultSetHeader, RowDataPacket } fr
     }
   }
 
-  public getPidLock(): boolean {
-    const filePath = path.join(config.DATABASE.PID_DIR || __dirname, `/mempool-${config.DATABASE.DATABASE}.pid`);
-    if (fs.existsSync(filePath)) {
-      const pid = fs.readFileSync(filePath).toString();
-      if (pid !== `${process.pid}`) {
-        const msg = `Already running on PID ${pid} (or pid file '${filePath}' is stale)`;
-        logger.err(msg);
-        throw new Error(msg);
-      } else {
-        return true;
-      }
-    } else {
-      fs.writeFileSync(filePath, `${process.pid}`);
-      return true;
-    }
-  }
-
-  public releasePidLock(): void {
-    const filePath = path.join(config.DATABASE.PID_DIR || __dirname, `/mempool-${config.DATABASE.DATABASE}.pid`);
-    if (fs.existsSync(filePath)) {
-      const pid = fs.readFileSync(filePath).toString();
-      if (pid === `${process.pid}`) {
-        fs.unlinkSync(filePath);
-      }
-    }
-  }
-
   private async getPool(): Promise<Pool> {
     if (this.pool === null) {
       this.pool = createPool(this.poolConfig);

backend/src/index.ts

@@ -91,18 +91,11 @@ class Server {
   async startServer(worker = false): Promise<void> {
     logger.notice(`Starting Mempool Server${worker ? ' (worker)' : ''}... (${backendInfo.getShortCommitHash()})`);
 
-    // Register cleanup listeners for exit events
-    ['exit', 'SIGINT', 'SIGTERM', 'SIGUSR1', 'SIGUSR2', 'uncaughtException', 'unhandledRejection'].forEach(event => {
-      process.on(event, () => { this.onExit(event); });
-    });
-
     if (config.MEMPOOL.BACKEND === 'esplora') {
       bitcoinApi.startHealthChecks();
     }
 
     if (config.DATABASE.ENABLED) {
-      DB.getPidLock();
-
       await DB.checkDbConnection();
       try {
         if (process.env.npm_config_reindex_blocks === 'true') { // Re-index requests
@@ -198,10 +191,14 @@ class Server {
           logger.debug(msg);
         }
       }
-      const newMempool = await bitcoinApi.$getRawMempool();
+
+      const { txids: newMempool, local: fromLocalNode } = await bitcoinApi.$getRawMempool();
       const numHandledBlocks = await blocks.$updateBlocks();
       const pollRate = config.MEMPOOL.POLL_RATE_MS * (indexer.indexerRunning ? 10 : 1);
       if (numHandledBlocks === 0) {
+        if (!fromLocalNode) {
+          memPool.logFailover();
+        }
         await memPool.$updateMempool(newMempool, pollRate);
       }
       indexer.$run();
@@ -313,15 +310,6 @@ class Server {
       this.lastHeapLogTime = now;
     }
   }
-
-  onExit(exitEvent): void {
-    if (config.DATABASE.ENABLED) {
-      DB.releasePidLock();
-    }
-    process.exit(0);
-  }
 }
 
-
-
 ((): Server => new Server())();

backend/src/mempool.interfaces.ts

@@ -300,7 +300,6 @@ export interface Statistic {
   total_fee: number;
   mempool_byte_weight: number;
   fee_data: string;
-  min_fee: number;
 
   vsize_1: number;
   vsize_2: number;
@@ -347,7 +346,6 @@ export interface OptimizedStatistic {
   vbytes_per_second: number;
   total_fee: number;
   mempool_byte_weight: number;
-  min_fee: number;
   vsizes: number[];
 }
 

contributors/TKone7.txt

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

contributors/fubz.txt

@@ -1,3 +0,0 @@
-I hereby accept the terms of the Contributor License Agreement in the CONTRIBUTING.md file of the mempool/mempool git repository as of January 25, 2022.
-
-Signed: fubz

contributors/orangesurf.txt

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

docker/backend/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20.8.0-buster-slim AS builder
+FROM node:16.16.0-buster-slim AS builder
 
 ARG commitHash
 ENV MEMPOOL_COMMIT_HASH=${commitHash}
@@ -17,7 +17,7 @@ ENV PATH="/root/.cargo/bin:$PATH"
 RUN npm install --omit=dev --omit=optional
 RUN npm run package
 
-FROM node:20.8.0-buster-slim
+FROM node:16.16.0-buster-slim
 
 WORKDIR /backend
 

docker/backend/mempool-config.json

@@ -69,8 +69,7 @@
     "DATABASE": "__DATABASE_DATABASE__",
     "USERNAME": "__DATABASE_USERNAME__",
     "PASSWORD": "__DATABASE_PASSWORD__",
-    "TIMEOUT": __DATABASE_TIMEOUT__,
-    "PID_DIR": "__DATABASE_PID_DIR__"
+    "TIMEOUT": __DATABASE_TIMEOUT__
   },
   "SYSLOG": {
     "ENABLED": __SYSLOG_ENABLED__,

docker/backend/start.sh

@@ -71,7 +71,6 @@ __DATABASE_DATABASE__=${DATABASE_DATABASE:=mempool}
 __DATABASE_USERNAME__=${DATABASE_USERNAME:=mempool}
 __DATABASE_PASSWORD__=${DATABASE_PASSWORD:=mempool}
 __DATABASE_TIMEOUT__=${DATABASE_TIMEOUT:=180000}
-__DATABASE_PID_DIR__=${DATABASE_PID_DIR:=""}
 
 # SYSLOG
 __SYSLOG_ENABLED__=${SYSLOG_ENABLED:=false}
@@ -140,7 +139,7 @@ __MEMPOOL_SERVICES_API__=${MEMPOOL_SERVICES_API:=""}
 __MEMPOOL_SERVICES_ACCELERATIONS__=${MEMPOOL_SERVICES_ACCELERATIONS:=false}
 
 # REDIS
-__REDIS_ENABLED__=${REDIS_ENABLED:=false}
+__REDIS_ENABLED__=${REDIS_ENABLED:=true}
 __REDIS_UNIX_SOCKET_PATH__=${REDIS_UNIX_SOCKET_PATH:=true}
 
 mkdir -p "${__MEMPOOL_CACHE_DIR__}"
@@ -210,7 +209,6 @@ sed -i "s!__DATABASE_DATABASE__!${__DATABASE_DATABASE__}!g" mempool-config.json
 sed -i "s!__DATABASE_USERNAME__!${__DATABASE_USERNAME__}!g" mempool-config.json
 sed -i "s!__DATABASE_PASSWORD__!${__DATABASE_PASSWORD__}!g" mempool-config.json
 sed -i "s!__DATABASE_TIMEOUT__!${__DATABASE_TIMEOUT__}!g" mempool-config.json
-sed -i "s!__DATABASE_PID_DIR__!${__DATABASE_PID_DIR__}!g" mempool-config.json
 
 sed -i "s!__SYSLOG_ENABLED__!${__SYSLOG_ENABLED__}!g" mempool-config.json
 sed -i "s!__SYSLOG_HOST__!${__SYSLOG_HOST__}!g" mempool-config.json

docker/docker-compose.yml

@@ -38,7 +38,7 @@ services:
       MYSQL_USER: "mempool"
       MYSQL_PASSWORD: "mempool"
       MYSQL_ROOT_PASSWORD: "admin"
-    image: mariadb:10.5.21
+    image: mariadb:10.5.8
     user: "1000:1000"
     restart: on-failure
     stop_grace_period: 1m

docker/electrum/Dockerfile

@@ -0,0 +1,32 @@
+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,4 +1,4 @@
-FROM node:20.8.0-buster-slim AS builder
+FROM node:16.16.0-buster-slim AS builder
 
 ARG commitHash
 ENV DOCKER_COMMIT_HASH=${commitHash}
@@ -13,7 +13,7 @@ RUN npm install --omit=dev --omit=optional
 
 RUN npm run build
 
-FROM nginx:1.24.0-alpine
+FROM nginx:1.17.8-alpine
 
 WORKDIR /patch
 

docker/frontend/entrypoint.sh

@@ -39,7 +39,6 @@ __AUDIT__=${AUDIT:=false}
 __MAINNET_BLOCK_AUDIT_START_HEIGHT__=${MAINNET_BLOCK_AUDIT_START_HEIGHT:=0}
 __TESTNET_BLOCK_AUDIT_START_HEIGHT__=${TESTNET_BLOCK_AUDIT_START_HEIGHT:=0}
 __SIGNET_BLOCK_AUDIT_START_HEIGHT__=${SIGNET_BLOCK_AUDIT_START_HEIGHT:=0}
-__ACCELERATOR__=${ACCELERATOR:=false}
 __HISTORICAL_PRICE__=${HISTORICAL_PRICE:=true}
 
 # Export as environment variables to be used by envsubst
@@ -66,7 +65,6 @@ export __AUDIT__
 export __MAINNET_BLOCK_AUDIT_START_HEIGHT__
 export __TESTNET_BLOCK_AUDIT_START_HEIGHT__
 export __SIGNET_BLOCK_AUDIT_START_HEIGHT__
-export __ACCELERATOR__
 export __HISTORICAL_PRICE__
 
 folder=$(find /var/www/mempool -name "config.js" | xargs dirname)

frontend/package-lock.json

@@ -59,9 +59,9 @@
       "optionalDependencies": {
         "@cypress/schematic": "^2.5.0",
         "@types/cypress": "^1.1.3",
-        "cypress": "^13.3.0",
-        "cypress-fail-on-console-error": "~5.0.0",
-        "cypress-wait-until": "^2.0.1",
+        "cypress": "^12.17.2",
+        "cypress-fail-on-console-error": "~4.0.3",
+        "cypress-wait-until": "^2.0.0",
         "mock-socket": "~9.2.1",
         "start-server-and-test": "~2.0.0"
       }
@@ -1250,12 +1250,11 @@
       "integrity": "sha512-H71nDOOL8Y7kWRLqf6Sums+01Q5msqBW2KhDUTemh1tvY04eSkSXrK0uj/4mmY0Xr16/3zyZmsrxN7CKuRbNRg=="
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.22.13",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
-      "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz",
+      "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==",
       "dependencies": {
-        "@babel/highlight": "^7.22.13",
-        "chalk": "^2.4.2"
+        "@babel/highlight": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1465,33 +1464,20 @@
       }
     },
     "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
+      "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-function-name": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
+      "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
       "dependencies": {
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.23.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name/node_modules/@babel/template": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
-      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
-      "dependencies": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/parser": "^7.22.15",
-        "@babel/types": "^7.22.15"
+        "@babel/template": "^7.22.5",
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1641,9 +1627,9 @@
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
+      "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -1683,12 +1669,12 @@
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
-      "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz",
+      "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "chalk": "^2.4.2",
+        "@babel/helper-validator-identifier": "^7.22.5",
+        "chalk": "^2.0.0",
         "js-tokens": "^4.0.0"
       },
       "engines": {
@@ -1696,9 +1682,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
-      "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
+      "version": "7.22.7",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz",
+      "integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -2893,18 +2879,18 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
-      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
+      "version": "7.22.8",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.8.tgz",
+      "integrity": "sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==",
       "dependencies": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.23.0",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
+        "@babel/code-frame": "^7.22.5",
+        "@babel/generator": "^7.22.7",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.23.0",
-        "@babel/types": "^7.23.0",
+        "@babel/parser": "^7.22.7",
+        "@babel/types": "^7.22.5",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -2912,36 +2898,13 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/traverse/node_modules/@babel/generator": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
-      "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
-      "dependencies": {
-        "@babel/types": "^7.23.0",
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "@jridgewell/trace-mapping": "^0.3.17",
-        "jsesc": "^2.5.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/traverse/node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.20",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz",
-      "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==",
-      "dependencies": {
-        "@jridgewell/resolve-uri": "^3.1.0",
-        "@jridgewell/sourcemap-codec": "^1.4.14"
-      }
-    },
     "node_modules/@babel/types": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
-      "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz",
+      "integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==",
       "dependencies": {
         "@babel/helper-string-parser": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.20",
+        "@babel/helper-validator-identifier": "^7.22.5",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
@@ -3053,9 +3016,9 @@
       }
     },
     "node_modules/@cypress/request": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.1.tgz",
-      "integrity": "sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==",
+      "version": "2.88.11",
+      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.11.tgz",
+      "integrity": "sha512-M83/wfQ1EkspjkE2lNWNV5ui2Cv7UCv1swW1DqljahbzLVWltcsexQh8jYtuS/vzFXP+HySntGM83ZXA9fn17w==",
       "optional": true,
       "dependencies": {
         "aws-sign2": "~0.7.0",
@@ -3071,9 +3034,9 @@
         "json-stringify-safe": "~5.0.1",
         "mime-types": "~2.1.19",
         "performance-now": "^2.1.0",
-        "qs": "6.10.4",
+        "qs": "~6.10.3",
         "safe-buffer": "^5.1.2",
-        "tough-cookie": "^4.1.3",
+        "tough-cookie": "~2.5.0",
         "tunnel-agent": "^0.6.0",
         "uuid": "^8.3.2"
       },
@@ -4370,9 +4333,9 @@
       "integrity": "sha512-Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q=="
     },
     "node_modules/@types/node": {
-      "version": "18.17.18",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.18.tgz",
-      "integrity": "sha512-/4QOuy3ZpV7Ya1GTRz5CYSz3DgkKpyUptXuQ5PPce7uuyJAOR7r9FhkmxJfvcNUXyklbC63a+YvB3jxy7s9ngw=="
+      "version": "18.11.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz",
+      "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg=="
     },
     "node_modules/@types/qrcode": {
       "version": "1.5.0",
@@ -5611,9 +5574,9 @@
       "optional": true
     },
     "node_modules/bn.js": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
-      "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ=="
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
+      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw=="
     },
     "node_modules/body-parser": {
       "version": "1.20.1",
@@ -5908,28 +5871,25 @@
       }
     },
     "node_modules/browserify-sign": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz",
-      "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
+      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
       "dependencies": {
-        "bn.js": "^5.2.1",
-        "browserify-rsa": "^4.1.0",
+        "bn.js": "^5.1.1",
+        "browserify-rsa": "^4.0.1",
         "create-hash": "^1.2.0",
         "create-hmac": "^1.1.7",
-        "elliptic": "^6.5.4",
+        "elliptic": "^6.5.3",
         "inherits": "^2.0.4",
-        "parse-asn1": "^5.1.6",
-        "readable-stream": "^3.6.2",
-        "safe-buffer": "^5.2.1"
-      },
-      "engines": {
-        "node": ">= 4"
+        "parse-asn1": "^5.1.5",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
       }
     },
     "node_modules/browserify-sign/node_modules/readable-stream": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -7153,15 +7113,15 @@
       "peer": true
     },
     "node_modules/cypress": {
-      "version": "13.3.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.3.0.tgz",
-      "integrity": "sha512-mpI8qcTwLGiA4zEQvTC/U1xGUezVV4V8HQCOYjlEOrVmU1etVvxOjkCXHGwrlYdZU/EPmUiWfsO3yt1o+Q2bgw==",
+      "version": "12.17.2",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.2.tgz",
+      "integrity": "sha512-hxWAaWbqQBzzMuadSGSuQg5PDvIGOovm6xm0hIfpCVcORsCAj/gF2p0EvfnJ4f+jK2PCiDgP6D2eeE9/FK4Mjg==",
       "hasInstallScript": true,
       "optional": true,
       "dependencies": {
-        "@cypress/request": "^3.0.0",
+        "@cypress/request": "^2.88.11",
         "@cypress/xvfb": "^1.2.4",
-        "@types/node": "^18.17.5",
+        "@types/node": "^14.14.31",
         "@types/sinonjs__fake-timers": "8.1.1",
         "@types/sizzle": "^2.3.2",
         "arch": "^2.2.0",
@@ -7194,7 +7154,6 @@
         "minimist": "^1.2.8",
         "ospath": "^1.2.2",
         "pretty-bytes": "^5.6.0",
-        "process": "^0.11.10",
         "proxy-from-env": "1.0.0",
         "request-progress": "^3.0.0",
         "semver": "^7.5.3",
@@ -7207,13 +7166,13 @@
         "cypress": "bin/cypress"
       },
       "engines": {
-        "node": "^16.0.0 || ^18.0.0 || >=20.0.0"
+        "node": "^14.0.0 || ^16.0.0 || >=18.0.0"
       }
     },
     "node_modules/cypress-fail-on-console-error": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cypress-fail-on-console-error/-/cypress-fail-on-console-error-5.0.0.tgz",
-      "integrity": "sha512-xui/aSu8rmExZjZNgId3iX0MsGZih6ZoFH+54vNHrK3HaqIZZX5hUuNhAcmfSoM1rIDc2DeITeVaMn/hiQ9IWQ==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/cypress-fail-on-console-error/-/cypress-fail-on-console-error-4.0.3.tgz",
+      "integrity": "sha512-v2nPupd2brtxKLkDQX58SbEPWRF/2nDbqPTnYyhPIYHqG7U3P2dGUZ3zraETKKoLhU3+C0otjgB6Vg/bHhocQw==",
       "optional": true,
       "dependencies": {
         "chai": "^4.3.4",
@@ -7223,9 +7182,19 @@
       }
     },
     "node_modules/cypress-wait-until": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/cypress-wait-until/-/cypress-wait-until-2.0.1.tgz",
-      "integrity": "sha512-+IyVnYNiaX1+C+V/LazrJWAi/CqiwfNoRSrFviECQEyolW1gDRy765PZosL2alSSGK8V10Y7BGfOQyZUDgmnjQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/cypress-wait-until/-/cypress-wait-until-2.0.0.tgz",
+      "integrity": "sha512-ulUZyrWBn+OuC8oiQuGKAScDYfpaWnE3dEE/raUo64w4RHQxZrQ/iMIWT4ZjGMMPr3P+BFEALCRnjQeRqzZj6g==",
+      "optional": true,
+      "engines": {
+        "node": ">=18.16.0",
+        "npm": ">=9.5.1"
+      }
+    },
+    "node_modules/cypress/node_modules/@types/node": {
+      "version": "14.18.53",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.53.tgz",
+      "integrity": "sha512-soGmOpVBUq+gaBMwom1M+krC/NNbWlosh4AtGA03SyWNDiqSKtwp7OulO1M6+mg8YkHMvJ/y0AkCeO8d1hNb7A==",
       "optional": true
     },
     "node_modules/cypress/node_modules/ansi-styles": {
@@ -11007,6 +10976,28 @@
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
       "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
     },
+    "node_modules/jsdom/node_modules/tough-cookie": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
+      "dependencies": {
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jsdom/node_modules/universalify": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
     "node_modules/jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -15691,25 +15682,16 @@
       }
     },
     "node_modules/tough-cookie": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
-      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+      "optional": true,
       "dependencies": {
-        "psl": "^1.1.33",
-        "punycode": "^2.1.1",
-        "universalify": "^0.2.0",
-        "url-parse": "^1.5.3"
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
       },
       "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/tough-cookie/node_modules/universalify": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
-      "engines": {
-        "node": ">= 4.0.0"
+        "node": ">=0.8"
       }
     },
     "node_modules/tr46": {
@@ -17808,12 +17790,11 @@
       "integrity": "sha512-H71nDOOL8Y7kWRLqf6Sums+01Q5msqBW2KhDUTemh1tvY04eSkSXrK0uj/4mmY0Xr16/3zyZmsrxN7CKuRbNRg=="
     },
     "@babel/code-frame": {
-      "version": "7.22.13",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
-      "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz",
+      "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==",
       "requires": {
-        "@babel/highlight": "^7.22.13",
-        "chalk": "^2.4.2"
+        "@babel/highlight": "^7.22.5"
       }
     },
     "@babel/compat-data": {
@@ -17978,29 +17959,17 @@
       }
     },
     "@babel/helper-environment-visitor": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA=="
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
+      "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q=="
     },
     "@babel/helper-function-name": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
+      "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
       "requires": {
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.23.0"
-      },
-      "dependencies": {
-        "@babel/template": {
-          "version": "7.22.15",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
-          "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
-          "requires": {
-            "@babel/code-frame": "^7.22.13",
-            "@babel/parser": "^7.22.15",
-            "@babel/types": "^7.22.15"
-          }
-        }
+        "@babel/template": "^7.22.5",
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-hoist-variables": {
@@ -18102,9 +18071,9 @@
       "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw=="
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A=="
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
+      "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ=="
     },
     "@babel/helper-validator-option": {
       "version": "7.22.5",
@@ -18132,19 +18101,19 @@
       }
     },
     "@babel/highlight": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
-      "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz",
+      "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==",
       "requires": {
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "chalk": "^2.4.2",
+        "@babel/helper-validator-identifier": "^7.22.5",
+        "chalk": "^2.0.0",
         "js-tokens": "^4.0.0"
       }
     },
     "@babel/parser": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
-      "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw=="
+      "version": "7.22.7",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz",
+      "integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q=="
     },
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
       "version": "7.22.5",
@@ -18921,51 +18890,29 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
-      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
+      "version": "7.22.8",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.8.tgz",
+      "integrity": "sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==",
       "requires": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.23.0",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
+        "@babel/code-frame": "^7.22.5",
+        "@babel/generator": "^7.22.7",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.23.0",
-        "@babel/types": "^7.23.0",
+        "@babel/parser": "^7.22.7",
+        "@babel/types": "^7.22.5",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
-      },
-      "dependencies": {
-        "@babel/generator": {
-          "version": "7.23.0",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
-          "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
-          "requires": {
-            "@babel/types": "^7.23.0",
-            "@jridgewell/gen-mapping": "^0.3.2",
-            "@jridgewell/trace-mapping": "^0.3.17",
-            "jsesc": "^2.5.1"
-          }
-        },
-        "@jridgewell/trace-mapping": {
-          "version": "0.3.20",
-          "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz",
-          "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==",
-          "requires": {
-            "@jridgewell/resolve-uri": "^3.1.0",
-            "@jridgewell/sourcemap-codec": "^1.4.14"
-          }
-        }
       }
     },
     "@babel/types": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
-      "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz",
+      "integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==",
       "requires": {
         "@babel/helper-string-parser": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.20",
+        "@babel/helper-validator-identifier": "^7.22.5",
         "to-fast-properties": "^2.0.0"
       }
     },
@@ -19063,9 +19010,9 @@
       }
     },
     "@cypress/request": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.1.tgz",
-      "integrity": "sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==",
+      "version": "2.88.11",
+      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.11.tgz",
+      "integrity": "sha512-M83/wfQ1EkspjkE2lNWNV5ui2Cv7UCv1swW1DqljahbzLVWltcsexQh8jYtuS/vzFXP+HySntGM83ZXA9fn17w==",
       "optional": true,
       "requires": {
         "aws-sign2": "~0.7.0",
@@ -19081,9 +19028,9 @@
         "json-stringify-safe": "~5.0.1",
         "mime-types": "~2.1.19",
         "performance-now": "^2.1.0",
-        "qs": "6.10.4",
+        "qs": "~6.10.3",
         "safe-buffer": "^5.1.2",
-        "tough-cookie": "^4.1.3",
+        "tough-cookie": "~2.5.0",
         "tunnel-agent": "^0.6.0",
         "uuid": "^8.3.2"
       }
@@ -19980,9 +19927,9 @@
       "integrity": "sha512-Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q=="
     },
     "@types/node": {
-      "version": "18.17.18",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.18.tgz",
-      "integrity": "sha512-/4QOuy3ZpV7Ya1GTRz5CYSz3DgkKpyUptXuQ5PPce7uuyJAOR7r9FhkmxJfvcNUXyklbC63a+YvB3jxy7s9ngw=="
+      "version": "18.11.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz",
+      "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg=="
     },
     "@types/qrcode": {
       "version": "1.5.0",
@@ -20921,9 +20868,9 @@
       "optional": true
     },
     "bn.js": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
-      "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ=="
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
+      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw=="
     },
     "body-parser": {
       "version": "1.20.1",
@@ -21267,25 +21214,25 @@
       }
     },
     "browserify-sign": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz",
-      "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
+      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
       "requires": {
-        "bn.js": "^5.2.1",
-        "browserify-rsa": "^4.1.0",
+        "bn.js": "^5.1.1",
+        "browserify-rsa": "^4.0.1",
         "create-hash": "^1.2.0",
         "create-hmac": "^1.1.7",
-        "elliptic": "^6.5.4",
+        "elliptic": "^6.5.3",
         "inherits": "^2.0.4",
-        "parse-asn1": "^5.1.6",
-        "readable-stream": "^3.6.2",
-        "safe-buffer": "^5.2.1"
+        "parse-asn1": "^5.1.5",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
       },
       "dependencies": {
         "readable-stream": {
-          "version": "3.6.2",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-          "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
           "requires": {
             "inherits": "^2.0.3",
             "string_decoder": "^1.1.1",
@@ -22118,14 +22065,14 @@
       "peer": true
     },
     "cypress": {
-      "version": "13.3.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.3.0.tgz",
-      "integrity": "sha512-mpI8qcTwLGiA4zEQvTC/U1xGUezVV4V8HQCOYjlEOrVmU1etVvxOjkCXHGwrlYdZU/EPmUiWfsO3yt1o+Q2bgw==",
+      "version": "12.17.2",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.2.tgz",
+      "integrity": "sha512-hxWAaWbqQBzzMuadSGSuQg5PDvIGOovm6xm0hIfpCVcORsCAj/gF2p0EvfnJ4f+jK2PCiDgP6D2eeE9/FK4Mjg==",
       "optional": true,
       "requires": {
-        "@cypress/request": "^3.0.0",
+        "@cypress/request": "^2.88.11",
         "@cypress/xvfb": "^1.2.4",
-        "@types/node": "^18.17.5",
+        "@types/node": "^14.14.31",
         "@types/sinonjs__fake-timers": "8.1.1",
         "@types/sizzle": "^2.3.2",
         "arch": "^2.2.0",
@@ -22158,7 +22105,6 @@
         "minimist": "^1.2.8",
         "ospath": "^1.2.2",
         "pretty-bytes": "^5.6.0",
-        "process": "^0.11.10",
         "proxy-from-env": "1.0.0",
         "request-progress": "^3.0.0",
         "semver": "^7.5.3",
@@ -22168,6 +22114,12 @@
         "yauzl": "^2.10.0"
       },
       "dependencies": {
+        "@types/node": {
+          "version": "14.18.53",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.53.tgz",
+          "integrity": "sha512-soGmOpVBUq+gaBMwom1M+krC/NNbWlosh4AtGA03SyWNDiqSKtwp7OulO1M6+mg8YkHMvJ/y0AkCeO8d1hNb7A==",
+          "optional": true
+        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -22284,9 +22236,9 @@
       }
     },
     "cypress-fail-on-console-error": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cypress-fail-on-console-error/-/cypress-fail-on-console-error-5.0.0.tgz",
-      "integrity": "sha512-xui/aSu8rmExZjZNgId3iX0MsGZih6ZoFH+54vNHrK3HaqIZZX5hUuNhAcmfSoM1rIDc2DeITeVaMn/hiQ9IWQ==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/cypress-fail-on-console-error/-/cypress-fail-on-console-error-4.0.3.tgz",
+      "integrity": "sha512-v2nPupd2brtxKLkDQX58SbEPWRF/2nDbqPTnYyhPIYHqG7U3P2dGUZ3zraETKKoLhU3+C0otjgB6Vg/bHhocQw==",
       "optional": true,
       "requires": {
         "chai": "^4.3.4",
@@ -22296,9 +22248,9 @@
       }
     },
     "cypress-wait-until": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/cypress-wait-until/-/cypress-wait-until-2.0.1.tgz",
-      "integrity": "sha512-+IyVnYNiaX1+C+V/LazrJWAi/CqiwfNoRSrFviECQEyolW1gDRy765PZosL2alSSGK8V10Y7BGfOQyZUDgmnjQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/cypress-wait-until/-/cypress-wait-until-2.0.0.tgz",
+      "integrity": "sha512-ulUZyrWBn+OuC8oiQuGKAScDYfpaWnE3dEE/raUo64w4RHQxZrQ/iMIWT4ZjGMMPr3P+BFEALCRnjQeRqzZj6g==",
       "optional": true
     },
     "d": {
@@ -25015,6 +24967,22 @@
           "version": "6.0.1",
           "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
           "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
+        },
+        "tough-cookie": {
+          "version": "4.1.3",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+          "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
+          "requires": {
+            "psl": "^1.1.33",
+            "punycode": "^2.1.1",
+            "universalify": "^0.2.0",
+            "url-parse": "^1.5.3"
+          }
+        },
+        "universalify": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+          "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg=="
         }
       }
     },
@@ -28529,21 +28497,13 @@
       "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
     },
     "tough-cookie": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
-      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+      "optional": true,
       "requires": {
-        "psl": "^1.1.33",
-        "punycode": "^2.1.1",
-        "universalify": "^0.2.0",
-        "url-parse": "^1.5.3"
-      },
-      "dependencies": {
-        "universalify": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-          "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg=="
-        }
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
       }
     },
     "tr46": {

frontend/package.json

@@ -35,7 +35,7 @@
     "start:local-staging": "npm run generate-config && npm run sync-assets-dev && npm run ng -- serve -c local-staging",
     "start:mixed": "npm run generate-config && npm run sync-assets-dev && npm run ng -- serve -c mixed",
     "build": "npm run generate-config && npm run ng -- build --configuration production --localize && npm run sync-assets && npm run build-mempool.js",
-    "sync-assets": "rsync -av ./src/resources ./dist/mempool/browser && node sync-assets.js 'dist/mempool/browser/resources/'",
+    "sync-assets": "rsync -av ./src/resources ./dist/mempool/browser && node sync-assets.js 'dist/mempool/browser/resources'",
     "sync-assets-dev": "node sync-assets.js 'src/resources/'",
     "generate-config": "node generate-config.js",
     "build-mempool.js": "npm run build-mempool-js && npm run build-mempool-liquid-js && npm run build-mempool-bisq-js",
@@ -111,9 +111,9 @@
   "optionalDependencies": {
     "@cypress/schematic": "^2.5.0",
     "@types/cypress": "^1.1.3",
-    "cypress": "^13.3.0",
-    "cypress-fail-on-console-error": "~5.0.0",
-    "cypress-wait-until": "^2.0.1",
+    "cypress": "^12.17.2",
+    "cypress-fail-on-console-error": "~4.0.3",
+    "cypress-wait-until": "^2.0.0",
     "mock-socket": "~9.2.1",
     "start-server-and-test": "~2.0.0"
   },

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

@@ -69,7 +69,6 @@ export class BisqBlockComponent implements OnInit, OnDestroy {
                   this.location.replaceState(
                     this.router.createUrlTree(['/bisq/block/', hash]).toString()
                   );
-                  this.seoService.updateCanonical(this.location.path());
                   return this.bisqApiService.getBlock$(this.blockHash)
                     .pipe(catchError(this.caughtHttpError.bind(this)));
                 }),

frontend/src/app/components/about/about.component.html

@@ -10,7 +10,7 @@
   </div>
 
   <div class="about-text">
-    <h5><ng-container i18n="about.about-the-project">The Mempool Open Source Project</ng-container><ng-template [ngIf]="locale.substr(0, 2) === 'en'"> &reg;</ng-template></h5>
+    <h5><ng-container i18n="about.about-the-project">The Mempool Open Source Project</ng-container><ng-template [ngIf]="locale.substr(0, 2) === 'en'"> &trade;</ng-template></h5>
     <p i18n>Our mempool and blockchain explorer for the Bitcoin community, focusing on the transaction fee market and multi-layer ecosystem, completely self-hosted without any trusted third-parties.</p>
   </div>
 

frontend/src/app/components/about/about.component.ts

@@ -43,7 +43,7 @@ export class AboutComponent implements OnInit {
   ngOnInit() {
     this.backendInfo$ = this.stateService.backendInfo$;
     this.seoService.setTitle($localize`:@@004b222ff9ef9dd4771b777950ca1d0e4cd4348a:About`);
-    this.seoService.setDescription($localize`:@@meta.description.about:Learn more about The Mempool Open Source Project®\: enterprise sponsors, individual sponsors, integrations, who contributes, FOSS licensing, and more.`);
+    this.seoService.setDescription($localize`:@@meta.description.about:Learn more about The Mempool Open Source Project™\: enterprise sponsors, individual sponsors, integrations, who contributes, FOSS licensing, and more.`);
     this.websocketService.want(['blocks']);
 
     this.profiles$ = this.apiService.getAboutPageProfiles$().pipe(

frontend/src/app/components/address/address.component.ts

@@ -174,11 +174,6 @@ export class AddressComponent implements OnInit, OnDestroy {
         this.addTransaction(tx);
       });
 
-    this.stateService.mempoolRemovedTransactions$
-      .subscribe(tx => {
-        this.removeTransaction(tx);
-      });
-
     this.stateService.blockTransactions$
       .subscribe((transaction) => {
         const tx = this.transactions.find((t) => t.txid === transaction.txid);
@@ -227,30 +222,6 @@ export class AddressComponent implements OnInit, OnDestroy {
     return true;
   }
 
-  removeTransaction(transaction: Transaction): boolean {
-    const index = this.transactions.findIndex(((tx) => tx.txid === transaction.txid));
-    if (index === -1) {
-      return false;
-    }
-
-    this.transactions.splice(index, 1);
-    this.transactions = this.transactions.slice();
-    this.txCount--;
-
-    transaction.vin.forEach((vin) => {
-      if (vin?.prevout?.scriptpubkey_address === this.address.address) {
-        this.sent -= vin.prevout.value;
-      }
-    });
-    transaction.vout.forEach((vout) => {
-      if (vout?.scriptpubkey_address === this.address.address) {
-        this.received -= vout.value;
-      }
-    });
-
-    return true;
-  }
-
   loadMore() {
     if (this.isLoadingTransactions || !this.totalConfirmedTxCount || this.loadedConfirmedTxCount >= this.totalConfirmedTxCount) {
       return;

frontend/src/app/components/block/block.component.ts

@@ -166,6 +166,7 @@ export class BlockComponent implements OnInit, OnDestroy {
         this.page = 1;
         this.error = undefined;
         this.fees = undefined;
+        this.stateService.markBlock$.next({});
 
         if (history.state.data && history.state.data.blockHeight) {
           this.blockHeight = history.state.data.blockHeight;
@@ -175,7 +176,6 @@ export class BlockComponent implements OnInit, OnDestroy {
         let isBlockHeight = false;
         if (/^[0-9]+$/.test(blockHash)) {
           isBlockHeight = true;
-          this.stateService.markBlock$.next({ blockHeight: parseInt(blockHash, 10)});
         } else {
           this.blockHash = blockHash;
         }
@@ -202,7 +202,6 @@ export class BlockComponent implements OnInit, OnDestroy {
                   this.location.replaceState(
                     this.router.createUrlTree([(this.network ? '/' + this.network : '') + '/block/', hash]).toString()
                   );
-                  this.seoService.updateCanonical(this.location.path());
                   return this.apiService.getBlock$(hash).pipe(
                     catchError((err) => {
                       this.error = err;

frontend/src/app/components/blockchain/blockchain.component.html

@@ -1,5 +1,5 @@
 <div class="text-center" class="blockchain-wrapper" [class.time-ltr]="timeLtr" [class.ltr-transition]="ltrTransitionEnabled" #container>
-  <div #positionContainer class="position-container" [ngClass]="network ? network : ''" [style]="positionStyle">
+  <div class="position-container" [ngClass]="network ? network : ''" [style.--divider-offset]="dividerOffset + 'px'" [style.--mempool-offset]="mempoolOffset + 'px'">
     <span>
       <div class="blocks-wrapper">
         <div class="scroll-spacer" *ngIf="minScrollWidth" [style.left]="minScrollWidth + 'px'"></div>

frontend/src/app/components/blockchain/blockchain.component.scss

@@ -26,7 +26,15 @@
   position: absolute;
   left: 0;
   top: 75px;
-  transform: translateX(1280px);
+  --divider-offset: 50vw;
+  --mempool-offset: 0px;
+  transform: translateX(calc(var(--divider-offset) + var(--mempool-offset)));
+}
+
+.blockchain-wrapper.time-ltr {
+  .position-container {
+    transform: translateX(calc(100vw - var(--divider-offset) - var(--mempool-offset)));
+  }
 }
 
 .black-background {

frontend/src/app/components/blockchain/blockchain.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, OnDestroy, ChangeDetectionStrategy, Input, Output, EventEmitter, ChangeDetectorRef, OnChanges, SimpleChanges } from '@angular/core';
+import { Component, OnInit, OnDestroy, ChangeDetectionStrategy, Input, Output, EventEmitter, HostListener, ChangeDetectorRef, OnChanges, SimpleChanges } from '@angular/core';
 import { firstValueFrom, Subscription } from 'rxjs';
 import { StateService } from '../../services/state.service';
 
@@ -27,11 +27,8 @@ export class BlockchainComponent implements OnInit, OnDestroy, OnChanges {
   loadingTip: boolean = true;
   connected: boolean = true;
 
-  dividerOffset: number | null = null;
-  mempoolOffset: number | null = null;
-  positionStyle = {
-    transform: "translateX(1280px)",
-  };
+  dividerOffset: number = 0;
+  mempoolOffset: number = 0;
 
   constructor(
     public stateService: StateService,
@@ -43,7 +40,6 @@ export class BlockchainComponent implements OnInit, OnDestroy, OnChanges {
     this.network = this.stateService.network;
     this.timeLtrSubscription = this.stateService.timeLtr.subscribe((ltr) => {
       this.timeLtr = !!ltr;
-      this.updateStyle();
     });
     this.connectionStateSubscription = this.stateService.connectionState$.subscribe(state => {
       this.connected = (state === 2);
@@ -67,47 +63,29 @@ export class BlockchainComponent implements OnInit, OnDestroy, OnChanges {
     const prevOffset = this.mempoolOffset;
     this.mempoolOffset = 0;
     this.mempoolOffsetChange.emit(0);
-    this.updateStyle();
     setTimeout(() => {
       this.ltrTransitionEnabled = true;
       this.flipping = true;
       this.stateService.timeLtr.next(!this.timeLtr);
-      this.cd.markForCheck();
       setTimeout(() => {
         this.ltrTransitionEnabled = false;
         this.flipping = false;
         this.mempoolOffset = prevOffset;
-        this.mempoolOffsetChange.emit((this.mempoolOffset || 0));
-        this.updateStyle();
-        this.cd.markForCheck();
+        this.mempoolOffsetChange.emit(this.mempoolOffset);
       },  1000);
     }, 0);
+    this.cd.markForCheck();
   }
 
   onMempoolWidthChange(width): void {
     if (this.flipping) {
       return;
     }
-    this.mempoolOffset = Math.max(0, width - (this.dividerOffset || 0));
-    this.updateStyle();
+    this.mempoolOffset = Math.max(0, width - this.dividerOffset);
+    this.cd.markForCheck();
     this.mempoolOffsetChange.emit(this.mempoolOffset);
   }
 
-  updateStyle(): void {
-    if (this.dividerOffset == null || this.mempoolOffset == null) {
-      return;
-    }
-    const oldTransform = this.positionStyle.transform;
-    this.positionStyle = this.timeLtr ? {
-      transform: `translateX(calc(100vw - ${this.dividerOffset + this.mempoolOffset}px)`,
-    } : {
-      transform: `translateX(${this.dividerOffset + this.mempoolOffset}px)`,
-    };
-    if (oldTransform !== this.positionStyle.transform) {
-      this.cd.detectChanges();
-    }
-  }
-
   ngOnChanges(changes: SimpleChanges): void {
     if (changes.containerWidth) {
       this.onResize();
@@ -129,6 +107,6 @@ export class BlockchainComponent implements OnInit, OnDestroy, OnChanges {
         this.dividerOffset = width * 0.95;
       }
     }
-    this.updateStyle();
+    this.cd.markForCheck();
   }
 }

frontend/src/app/components/blocks-list/blocks-list.component.html

@@ -1,6 +1,6 @@
 <app-indexing-progress *ngIf="!widget"></app-indexing-progress>
 
-<div class="container-xl" style="min-height: 335px" [ngClass]="{'widget': widget, 'full-height': !widget, 'legacy': !isMempoolModule}">
+<div class="container-xl" style="min-height: 335px" [ngClass]="{'widget': widget, 'full-height': !widget, 'legacy': !indexingAvailable}">
   <h1 *ngIf="!widget" class="float-left" i18n="master-page.blocks">Blocks</h1>
   <div *ngIf="!widget && isLoading" class="spinner-border ml-3" role="status"></div>
 
@@ -9,28 +9,28 @@
   <div style="min-height: 295px">
     <table class="table table-borderless">
       <thead>
-        <th class="height text-left" [ngClass]="{'widget': widget, 'legacy': !isMempoolModule}" i18n="latest-blocks.height">Height</th>
-        <th *ngIf="isMempoolModule" class="pool text-left" [ngClass]="{'widget': widget, 'legacy': !isMempoolModule}" i18n="mining.pool-name"
+        <th class="height text-left" [ngClass]="{'widget': widget, 'legacy': !indexingAvailable}" i18n="latest-blocks.height">Height</th>
+        <th *ngIf="indexingAvailable" class="pool text-left" [ngClass]="{'widget': widget, 'legacy': !indexingAvailable}" i18n="mining.pool-name"
           i18n-ngbTooltip="mining.pool-name" ngbTooltip="Pool" placement="bottom" #miningpool [disableTooltip]="!isEllipsisActive(miningpool)">Pool</th>
-        <th class="timestamp" i18n="latest-blocks.timestamp" *ngIf="!widget" [class]="isMempoolModule ? '' : 'legacy'">Timestamp</th>
-        <th *ngIf="auditAvailable" class="health text-right" i18n="latest-blocks.health" [ngClass]="{'widget': widget, 'legacy': !isMempoolModule}"
+        <th class="timestamp" i18n="latest-blocks.timestamp" *ngIf="!widget" [class]="indexingAvailable ? '' : 'legacy'">Timestamp</th>
+        <th *ngIf="auditAvailable" class="health text-right" i18n="latest-blocks.health" [ngClass]="{'widget': widget, 'legacy': !indexingAvailable}"
           i18n-ngbTooltip="latest-blocks.health" ngbTooltip="Health" placement="bottom" #health [disableTooltip]="!isEllipsisActive(health)">Health</th>
-        <th *ngIf="isMempoolModule" class="reward text-right" i18n="latest-blocks.reward" [ngClass]="{'widget': widget, 'legacy': !isMempoolModule}"
+        <th *ngIf="indexingAvailable" class="reward text-right" i18n="latest-blocks.reward" [ngClass]="{'widget': widget, 'legacy': !indexingAvailable}"
           i18n-ngbTooltip="latest-blocks.reward" ngbTooltip="Reward" placement="bottom" #reward [disableTooltip]="!isEllipsisActive(reward)">Reward</th>
-        <th *ngIf="isMempoolModule && !auditAvailable || isMempoolModule && !widget" class="fees text-right" i18n="latest-blocks.fees" [class]="isMempoolModule ? '' : 'legacy'">Fees</th>
-        <th *ngIf="auditAvailable && !widget" class="fee-delta" [ngClass]="{'widget': widget, 'legacy': !isMempoolModule}"></th>
-        <th *ngIf="isMempoolModule" class="txs text-right" i18n="dashboard.txs" [ngClass]="{'widget': widget, 'legacy': !isMempoolModule}"
+        <th *ngIf="indexingAvailable && !widget" class="fees text-right" i18n="latest-blocks.fees" [class]="indexingAvailable ? '' : 'legacy'">Fees</th>
+        <th *ngIf="auditAvailable && !widget" class="fee-delta" [ngClass]="{'widget': widget, 'legacy': !indexingAvailable}"></th>
+        <th *ngIf="indexingAvailable" class="txs text-right" i18n="dashboard.txs" [ngClass]="{'widget': widget, 'legacy': !indexingAvailable}"
           i18n-ngbTooltip="dashboard.txs" ngbTooltip="TXs" placement="bottom" #txs [disableTooltip]="!isEllipsisActive(txs)">TXs</th>
-        <th *ngIf="!isMempoolModule" class="txs text-right" i18n="dashboard.txs" [ngClass]="{'widget': widget, 'legacy': !isMempoolModule}">Transactions</th>
-        <th class="size" i18n="latest-blocks.size" *ngIf="!widget" [class]="isMempoolModule ? '' : 'legacy'">Size</th>
+        <th *ngIf="!indexingAvailable" class="txs text-right" i18n="dashboard.txs" [ngClass]="{'widget': widget, 'legacy': !indexingAvailable}">Transactions</th>
+        <th class="size" i18n="latest-blocks.size" *ngIf="!widget" [class]="indexingAvailable ? '' : 'legacy'">Size</th>
       </thead>
       <tbody *ngIf="blocks$ | async as blocks; else skeleton" [style]="isLoading ? 'opacity: 0.75' : ''">
         <tr *ngFor="let block of blocks; let i= index; trackBy: trackByBlock">
           <td class="height text-left" [class]="widget ? 'widget' : ''">
             <a [routerLink]="['/block' | relativeUrl, block.id]" [state]="{ data: { block: block } }">{{ block.height }}</a>
           </td>
-          <td  *ngIf="isMempoolModule" class="pool text-left" [ngClass]="{'widget': widget, 'legacy': !isMempoolModule}">
-            <div *ngIf="indexingAvailable" class="tooltip-custom">
+          <td  *ngIf="indexingAvailable" class="pool text-left" [ngClass]="{'widget': widget, 'legacy': !indexingAvailable}">
+            <div class="tooltip-custom">
               <a class="clear-link" [routerLink]="['/mining/pool' | relativeUrl, block.extras.pool.slug]">
                 <img width="22" height="22" src="{{ block.extras.pool['logo'] }}"
                   onError="this.src = '/resources/mining-pools/default.svg'" [alt]="'Logo of ' + block.extras.pool.name + ' mining pool'">
@@ -38,17 +38,11 @@
               </a>
               <span *ngIf="!widget" class="tooltiptext badge badge-secondary scriptmessage">{{ block.extras.coinbaseRaw | hex2ascii }}</span>
             </div>
-            <div *ngIf="!indexingAvailable" class="tooltip-custom">
-              <img width="22" height="22" src="{{ block.extras.pool['logo'] }}"
-                onError="this.src = '/resources/mining-pools/default.svg'" [alt]="'Logo of ' + block.extras.pool.name + ' mining pool'">
-              <span class="pool-name">{{ block.extras.pool.name }}</span>
-              <span *ngIf="!widget" class="tooltiptext badge badge-secondary scriptmessage">{{ block.extras.coinbaseRaw | hex2ascii }}</span>
-            </div>
           </td>
-          <td class="timestamp" *ngIf="!widget" [ngClass]="{'widget': widget, 'legacy': !isMempoolModule}">
+          <td class="timestamp" *ngIf="!widget" [ngClass]="{'widget': widget, 'legacy': !indexingAvailable}">
             &lrm;{{ block.timestamp * 1000 | date:'yyyy-MM-dd HH:mm' }}
           </td>
-          <td *ngIf="auditAvailable" class="health text-right" [ngClass]="{'widget': widget, 'legacy': !isMempoolModule}">
+          <td *ngIf="auditAvailable" class="health text-right" [ngClass]="{'widget': widget, 'legacy': !indexingAvailable}">
             <a
               *ngIf="block?.extras?.matchRate != null; else nullHealth"
               class="health-badge badge"
@@ -62,21 +56,21 @@
               <span class="health-badge badge badge-secondary" i18n="unknown">Unknown</span>
             </ng-template>
           </td>
-          <td *ngIf="isMempoolModule" class="reward text-right" [ngClass]="{'widget': widget, 'legacy': !isMempoolModule}">
+          <td *ngIf="indexingAvailable" class="reward text-right" [ngClass]="{'widget': widget, 'legacy': !indexingAvailable}">
             <app-amount [satoshis]="block.extras.reward" [noFiat]="true" digitsInfo="1.2-2"></app-amount>
           </td>
-          <td *ngIf="isMempoolModule && !auditAvailable || isMempoolModule && !widget" class="fees text-right" [class]="isMempoolModule ? '' : 'legacy'">
+          <td *ngIf="indexingAvailable && !widget" class="fees text-right" [class]="indexingAvailable ? '' : 'legacy'">
             <app-amount [satoshis]="block.extras.totalFees" [noFiat]="true" digitsInfo="1.2-2"></app-amount>
           </td>
-          <td *ngIf="auditAvailable" class="fee-delta" [ngClass]="{'widget': widget, 'legacy': !isMempoolModule}">
+          <td *ngIf="auditAvailable" class="fee-delta" [ngClass]="{'widget': widget, 'legacy': !indexingAvailable}">
             <span *ngIf="block.extras.feeDelta" class="difference" [class.positive]="block.extras.feeDelta >= 0" [class.negative]="block.extras.feeDelta < 0">
               {{ block.extras.feeDelta > 0 ? '+' : '' }}{{ (block.extras.feeDelta * 100) | amountShortener: 2 }}%
             </span>
           </td>
-          <td class="txs text-right" [ngClass]="{'widget': widget, 'legacy': !isMempoolModule}">
+          <td class="txs text-right" [ngClass]="{'widget': widget, 'legacy': !indexingAvailable}">
             {{ block.tx_count | number }}
           </td>
-          <td class="size" *ngIf="!widget" [class]="isMempoolModule ? '' : 'legacy'">
+          <td class="size" *ngIf="!widget" [class]="indexingAvailable ? '' : 'legacy'">
             <div class="progress">
               <div class="progress-bar progress-mempool" role="progressbar"
                 [ngStyle]="{'width': (block.weight / stateService.env.BLOCK_WEIGHT_UNITS)*100 + '%' }"></div>
@@ -88,34 +82,34 @@
       <ng-template #skeleton>
         <tbody>
           <tr *ngFor="let item of skeletonLines">
-            <td class="height text-left" [ngClass]="{'widget': widget, 'legacy': !isMempoolModule}">
+            <td class="height text-left" [ngClass]="{'widget': widget, 'legacy': !indexingAvailable}">
               <span class="skeleton-loader" style="max-width: 75px"></span>
             </td>
-            <td *ngIf="isMempoolModule" class="pool text-left" [ngClass]="{'widget': widget, 'legacy': !isMempoolModule}">
+            <td *ngIf="indexingAvailable" class="pool text-left" [ngClass]="{'widget': widget, 'legacy': !indexingAvailable}">
               <span class="skeleton-loader" style="max-width: 125px"></span>
             </td>
-            <td class="timestamp" *ngIf="!widget" [class]="isMempoolModule ? '' : 'legacy'">
+            <td class="timestamp" *ngIf="!widget" [class]="indexingAvailable ? '' : 'legacy'">
               <span class="skeleton-loader" style="max-width: 150px"></span>
             </td>
-            <td class="mined" *ngIf="!widget" [class]="isMempoolModule ? '' : 'legacy'">
+            <td class="mined" *ngIf="!widget" [class]="indexingAvailable ? '' : 'legacy'">
               <span class="skeleton-loader" style="max-width: 125px"></span>
             </td>
-            <td *ngIf="auditAvailable" class="health text-right" [ngClass]="{'widget': widget, 'legacy': !isMempoolModule}">
+            <td *ngIf="auditAvailable" class="health text-right" [ngClass]="{'widget': widget, 'legacy': !indexingAvailable}">
               <span class="skeleton-loader" style="max-width: 75px"></span>
             </td>
-            <td *ngIf="isMempoolModule" class="reward text-right" [ngClass]="{'widget': widget, 'legacy': !isMempoolModule}">
+            <td *ngIf="indexingAvailable" class="reward text-right" [ngClass]="{'widget': widget, 'legacy': !indexingAvailable}">
               <span class="skeleton-loader" style="max-width: 75px"></span>
             </td>
-            <td *ngIf="isMempoolModule && !widget" class="fees text-right" [class]="isMempoolModule ? '' : 'legacy'">
+            <td *ngIf="indexingAvailable && !widget" class="fees text-right" [class]="indexingAvailable ? '' : 'legacy'">
               <span class="skeleton-loader" style="max-width: 75px"></span>
             </td>
-            <td *ngIf="auditAvailable && !widget" class="fee-delta" [class]="isMempoolModule ? '' : 'legacy'">
+            <td *ngIf="auditAvailable && !widget" class="fee-delta" [class]="indexingAvailable ? '' : 'legacy'">
               <span class="skeleton-loader" style="max-width: 75px"></span>
             </td>
-            <td class="txs text-right" [ngClass]="{'widget': widget, 'legacy': !isMempoolModule}">
+            <td class="txs text-right" [ngClass]="{'widget': widget, 'legacy': !indexingAvailable}">
               <span class="skeleton-loader" style="max-width: 75px"></span>
             </td>
-            <td class="size" *ngIf="!widget" [class]="isMempoolModule ? '' : 'legacy'">
+            <td class="size" *ngIf="!widget" [class]="indexingAvailable ? '' : 'legacy'">
               <span class="skeleton-loader"></span>
             </td>
           </tr>

frontend/src/app/components/blocks-list/blocks-list.component.ts

@@ -19,7 +19,6 @@ export class BlocksList implements OnInit {
 
   blocks$: Observable<BlockExtended[]> = undefined;
 
-  isMempoolModule = false;
   indexingAvailable = false;
   auditAvailable = false;
   isLoading = true;
@@ -40,7 +39,6 @@ export class BlocksList implements OnInit {
     private cd: ChangeDetectorRef,
     private seoService: SeoService,
   ) {
-    this.isMempoolModule = this.stateService.env.BASE_MODULE === 'mempool';
   }
 
   ngOnInit(): void {
@@ -77,10 +75,11 @@ export class BlocksList implements OnInit {
                 this.lastBlockHeight = Math.max(...blocks.map(o => o.height));
               }),
               map(blocks => {
-                if (this.stateService.env.BASE_MODULE === 'mempool') {
+                if (this.indexingAvailable) {
                   for (const block of blocks) {
                     // @ts-ignore: Need to add an extra field for the template
-                    block.extras.pool.logo = `/resources/mining-pools/` + block.extras.pool.slug + '.svg';
+                    block.extras.pool.logo = `/resources/mining-pools/` +
+                      block.extras.pool.slug + '.svg';
                   }
                 }
                 if (this.widget) {
@@ -111,7 +110,7 @@ export class BlocksList implements OnInit {
           }
           if (blocks[1]) {
             this.blocksCount = Math.max(this.blocksCount, blocks[1][0].height) + 1;
-            if (this.isMempoolModule) {
+            if (this.stateService.env.MINING_DASHBOARD) {
               // @ts-ignore: Need to add an extra field for the template
               blocks[1][0].extras.pool.logo = `/resources/mining-pools/` +
                 blocks[1][0].extras.pool.slug + '.svg';
@@ -122,11 +121,9 @@ export class BlocksList implements OnInit {
           return acc;
         }, []),
         switchMap((blocks) => {
-          if (this.isMempoolModule && this.auditAvailable) {
-            blocks.forEach(block => {
-              block.extras.feeDelta = block.extras.expectedFees ? (block.extras.totalFees - block.extras.expectedFees) / block.extras.expectedFees : 0;
-            });
-          }
+          blocks.forEach(block => {
+            block.extras.feeDelta = block.extras.expectedFees ? (block.extras.totalFees - block.extras.expectedFees) / block.extras.expectedFees : 0;
+          });
           return of(blocks);
         })
       );

frontend/src/app/components/incoming-transactions-graph/incoming-transactions-graph.component.ts

@@ -37,7 +37,6 @@ export class IncomingTransactionsGraphComponent implements OnInit, OnChanges, On
   };
   windowPreference: string;
   chartInstance: any = undefined;
-  MA: number[][] = [];
   weightMode: boolean = false;
   rateUnitSub: Subscription;
 
@@ -63,7 +62,6 @@ export class IncomingTransactionsGraphComponent implements OnInit, OnChanges, On
       return;
     }
     this.windowPreference = this.windowPreferenceOverride ? this.windowPreferenceOverride : this.storageService.getValue('graphWindowPreference');
-    this.MA = this.calculateMA(this.data.series[0]);
     this.mountChart();
   }
 
@@ -74,101 +72,7 @@ export class IncomingTransactionsGraphComponent implements OnInit, OnChanges, On
     this.isLoading = false;
   }
 
-  /// calculate the moving average of maData
-  calculateMA(maData): number[][] {
-    //update const variables that are not changed
-    const ma: number[][] = [];
-    let sum = 0;
-    let i = 0;
-    const len = maData.length;
-
-    //Adjust window length based on the length of the data
-    //5% appeared as a good amount from tests
-    //TODO: make this a text box in the UI
-    const maWindowLen = Math.ceil(len * 0.05);
-
-    //calculate the center of the moving average window
-    const center = Math.floor(maWindowLen / 2);
-
-    //calculate the centered moving average
-    for (i = center; i < len - center; i++) {
-      sum = 0;
-      //build out ma as we loop through the data
-      ma[i] = [];
-      ma[i].push(maData[i][0]);
-      for (let j = i - center; j <= i + center; j++) {
-        sum += maData[j][1];
-      }
-
-      ma[i].push(sum / maWindowLen);
-    }
-
-    //return the moving average array
-    return ma;
-  }
-
   mountChart(): void {
-    //create an array for the echart series
-    //similar to how it is done in mempool-graph.component.ts
-    const seriesGraph = [];
-    seriesGraph.push({
-      zlevel: 0,
-      name: 'data',
-      data: this.data.series[0],
-      type: 'line',
-      smooth: false,
-      showSymbol: false,
-      symbol: 'none',
-      lineStyle: {
-        width: 3,
-      },
-      markLine: {
-        silent: true,
-        symbol: 'none',
-        lineStyle: {
-          color: '#fff',
-          opacity: 1,
-          width: 2,
-        },
-        data: [{
-          yAxis: 1667,
-          label: {
-            show: false,
-            color: '#ffffff',
-          }
-        }],
-      }
-    },
-    {
-      zlevel: 0,
-      name: 'MA',
-      data: this.MA,
-      type: 'line',
-      smooth: false,
-      showSymbol: false,
-      symbol: 'none',
-      lineStyle: {
-        width: 1,
-        color: "white",
-      },
-      markLine: {
-        silent: true,
-        symbol: 'none',
-        lineStyle: {
-          color: '#fff',
-          opacity: 1,
-          width: 2,
-        },
-        data: [{
-          yAxis: 1667,
-          label: {
-            show: false,
-            color: '#ffffff',
-          }
-        }],
-      }
-    });
-
     this.mempoolStatsChartOption = {
       grid: {
         height: this.height,
@@ -218,20 +122,16 @@ export class IncomingTransactionsGraphComponent implements OnInit, OnChanges, On
           type: 'line',
         },
         formatter: (params: any) => {
-          const axisValueLabel: string = formatterXAxis(this.locale, this.windowPreference, params[0].axisValue);
+          const axisValueLabel: string = formatterXAxis(this.locale, this.windowPreference, params[0].axisValue);         
           const colorSpan = (color: string) => `<span class="indicator" style="background-color: ` + color + `"></span>`;
           let itemFormatted = '<div class="title">' + axisValueLabel + '</div>';
           params.map((item: any, index: number) => {
-
-            //Do no include MA in tooltip legend!
-            if (item.seriesName !== 'MA') {
-              if (index < 26) {
-                itemFormatted += `<div class="item">
-                  <div class="indicator-container">${colorSpan(item.color)}</div>
-                  <div class="grow"></div>
-                  <div class="value">${formatNumber(item.value[1], this.locale, '1.0-0')}<span class="symbol">vB/s</span></div>
-                </div>`;
-              }
+            if (index < 26) {
+              itemFormatted += `<div class="item">
+                <div class="indicator-container">${colorSpan(item.color)}</div>
+                <div class="grow"></div>
+                <div class="value">${formatNumber(this.weightMode ? item.value[1] * 4 : item.value[1], this.locale, '1.0-0')} <span class="symbol">${this.weightMode ? 'WU' : 'vB'}/s</span></div>
+              </div>`;
             }
           });
           return `<div class="tx-wrapper-tooltip-chart ${(this.template === 'advanced') ? 'tx-wrapper-tooltip-chart-advanced' : ''}">${itemFormatted}</div>`;
@@ -271,7 +171,35 @@ export class IncomingTransactionsGraphComponent implements OnInit, OnChanges, On
           }
         }
       },
-      series: seriesGraph,
+      series: [
+        {
+          zlevel: 0,
+          data: this.data.series[0],
+          type: 'line',
+          smooth: false,
+          showSymbol: false,
+          symbol: 'none',
+          lineStyle: {
+            width: 3,
+          },
+          markLine: {
+            silent: true,
+            symbol: 'none',
+            lineStyle: {
+              color: '#fff',
+              opacity: 1,
+              width: 2,
+            },
+            data: [{
+              yAxis: 1667,
+              label: {
+                show: false,
+                color: '#ffffff',
+              }
+            }],
+          }
+        },
+      ],
       visualMap: {
         show: false,
         top: 50,

frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts

@@ -97,10 +97,6 @@ export class MempoolBlocksComponent implements OnInit, OnChanges, OnDestroy {
   ngOnInit() {
     this.chainTip = this.stateService.latestBlockHeight;
 
-    const width = this.containerOffset + (this.stateService.env.MEMPOOL_BLOCKS_AMOUNT) * this.blockOffset;
-    this.mempoolWidth = width;
-    this.widthChange.emit(this.mempoolWidth);
-
     if (['', 'testnet', 'signet'].includes(this.stateService.network)) {
       this.enabledMiningInfoIfNeeded(this.location.path());
       this.location.onUrlChange((url) => this.enabledMiningInfoIfNeeded(url));
@@ -165,11 +161,11 @@ export class MempoolBlocksComponent implements OnInit, OnChanges, OnDestroy {
           return this.mempoolBlocks;
         }),
         tap(() => {
+          this.cd.markForCheck();
           const width = this.containerOffset + this.mempoolBlocks.length * this.blockOffset;
           if (this.mempoolWidth !== width) {
             this.mempoolWidth = width;
             this.widthChange.emit(this.mempoolWidth);
-            this.cd.markForCheck();
           }
         })
       );
@@ -219,13 +215,11 @@ export class MempoolBlocksComponent implements OnInit, OnChanges, OnDestroy {
         if (isNewBlock && (block?.extras?.similarity == null || block?.extras?.similarity > 0.5) && !this.tabHidden) {
           this.blockIndex++;
         }
-        this.cd.markForCheck();
       });
 
     this.chainTipSubscription = this.stateService.chainTip$.subscribe((height) => {
       if (this.chainTip === -1) {
         this.chainTip = height;
-        this.cd.markForCheck();
       }
     });
 
@@ -263,7 +257,6 @@ export class MempoolBlocksComponent implements OnInit, OnChanges, OnDestroy {
       this.blockPadding = 0.24 * this.blockWidth;
       this.containerOffset = 0.32 * this.blockWidth;
       this.blockOffset = this.blockWidth + this.blockPadding;
-      this.cd.markForCheck();
     }
   }
 
@@ -282,7 +275,6 @@ export class MempoolBlocksComponent implements OnInit, OnChanges, OnDestroy {
   onResize(): void {
     this.animateEntry = false;
     this.reduceEmptyBlocksToFitScreen(this.mempoolEmptyBlocks);
-    this.cd.markForCheck();
   }
 
   trackByFn(index: number, block: MempoolBlock) {

frontend/src/app/components/mempool-graph/mempool-graph.component.ts

@@ -1,7 +1,6 @@
 import { Component, OnInit, Input, Inject, LOCALE_ID, ChangeDetectionStrategy, OnChanges } from '@angular/core';
 import { VbytesPipe } from '../../shared/pipes/bytes-pipe/vbytes.pipe';
 import { WuBytesPipe } from '../../shared/pipes/bytes-pipe/wubytes.pipe';
-import { AmountShortenerPipe } from '../../shared/pipes/amount-shortener.pipe';
 import { formatNumber } from '@angular/common';
 import { OptimizedMempoolStats } from '../../interfaces/node-api.interface';
 import { StateService } from '../../services/state.service';
@@ -27,7 +26,6 @@ export class MempoolGraphComponent implements OnInit, OnChanges {
   @Input() data: any[];
   @Input() filterSize = 100000;
   @Input() limitFilterFee = 1;
-  @Input() hideCount: boolean = false;
   @Input() height: number | string = 200;
   @Input() top: number | string = 20;
   @Input() right: number | string = 10;
@@ -52,13 +50,10 @@ export class MempoolGraphComponent implements OnInit, OnChanges {
   inverted: boolean;
   chartInstance: any = undefined;
   weightMode: boolean = false;
-  isWidget: boolean = false;
-  showCount: boolean = true;
 
   constructor(
     private vbytesPipe: VbytesPipe,
     private wubytesPipe: WuBytesPipe,
-    private amountShortenerPipe: AmountShortenerPipe,
     private stateService: StateService,
     private storageService: StorageService,
     @Inject(LOCALE_ID) private locale: string,
@@ -67,16 +62,12 @@ export class MempoolGraphComponent implements OnInit, OnChanges {
   ngOnInit(): void {
     this.isLoading = true;
     this.inverted = this.storageService.getValue('inverted-graph') === 'true';
-    this.isWidget = this.template === 'widget';
-    this.showCount = !this.isWidget && !this.hideCount;
   }
 
-  ngOnChanges(changes) {
+  ngOnChanges() {
     if (!this.data) {
       return;
     }
-    this.isWidget = this.template === 'widget';
-    this.showCount = !this.isWidget && !this.hideCount;
     this.windowPreference = this.windowPreferenceOverride ? this.windowPreferenceOverride : this.storageService.getValue('graphWindowPreference');
     this.mempoolVsizeFeesData = this.handleNewMempoolData(this.data.concat([]));
     this.mountFeeChart();
@@ -105,12 +96,10 @@ export class MempoolGraphComponent implements OnInit, OnChanges {
     mempoolStats.reverse();
     const labels = mempoolStats.map(stats => stats.added);
     const finalArrayVByte = this.generateArray(mempoolStats);
-    const finalArrayCount = this.generateCountArray(mempoolStats);
 
     return {
       labels: labels,
-      series: finalArrayVByte,
-      countSeries: finalArrayCount,
+      series: finalArrayVByte
     };
   }
 
@@ -135,13 +124,9 @@ export class MempoolGraphComponent implements OnInit, OnChanges {
     return finalArray;
   }
 
-  generateCountArray(mempoolStats: OptimizedMempoolStats[]) {
-    return mempoolStats.filter(stats => stats.count > 0).map(stats => [stats.added * 1000, stats.count]);
-  }
-
   mountFeeChart() {
     this.orderLevels();
-    const { series, countSeries } = this.mempoolVsizeFeesData;
+    const { series } = this.mempoolVsizeFeesData;
 
     const seriesGraph = [];
     const newColors = [];
@@ -193,29 +178,6 @@ export class MempoolGraphComponent implements OnInit, OnChanges {
         });
       }
     }
-    if (this.showCount) {
-      newColors.push('white');
-      seriesGraph.push({
-        zlevel: 1,
-        yAxisIndex: 1,
-        name: 'count',
-        type: 'line',
-        stack: 'count',
-        smooth: false,
-        markPoint: false,
-        lineStyle: {
-          width: 2,
-          opacity: 1,
-        },
-        symbol: 'none',
-        silent: true,
-        areaStyle: {
-          color: null,
-          opacity: 0,
-        },
-        data: countSeries,
-      });
-    }
 
     this.mempoolVsizeFeesOptions = {
       series: this.inverted ? [...seriesGraph].reverse() : seriesGraph,
@@ -239,11 +201,7 @@ export class MempoolGraphComponent implements OnInit, OnChanges {
           label: {
             formatter: (params: any) => {
               if (params.axisDimension === 'y') {
-                if (params.axisIndex === 0) {
-                  return this.vbytesPipe.transform(params.value, 2, 'vB', 'MvB', true);
-                } else {
-                  return this.amountShortenerPipe.transform(params.value, 2, undefined, true);
-                }
+                return this.vbytesPipe.transform(params.value, 2, 'vB', 'MvB', true)
               } else {
                 return formatterXAxis(this.locale, this.windowPreference, params.value);
               }
@@ -256,11 +214,7 @@ export class MempoolGraphComponent implements OnInit, OnChanges {
           const itemFormatted = [];
           let totalParcial = 0;
           let progressPercentageText = '';
-          let countItem;
-          let items = this.inverted ? [...params].reverse() : params;
-          if (items[items.length - 1].seriesName === 'count') {
-            countItem = items.pop();
-          }
+          const items = this.inverted ? [...params].reverse() : params;
           items.map((item: any, index: number) => {
             totalParcial += item.value[1];
             const progressPercentage = (item.value[1] / totalValue) * 100;
@@ -322,7 +276,6 @@ export class MempoolGraphComponent implements OnInit, OnChanges {
             </tr>`);
           });
           const classActive = (this.template === 'advanced') ? 'fees-wrapper-tooltip-chart-advanced' : '';
-          const titleCount = $localize`Count`;
           const titleRange = $localize`Range`;
           const titleSize = $localize`:@@7faaaa08f56427999f3be41df1093ce4089bbd75:Size`;
           const titleSum = $localize`Sum`;
@@ -333,25 +286,6 @@ export class MempoolGraphComponent implements OnInit, OnChanges {
                 ${this.vbytesPipe.transform(totalValue, 2, 'vB', 'MvB', false)}
               </span>
             </div>
-            ` +
-              (this.showCount && countItem ? `
-                <table class="count">
-                  <tbody>
-                    <tr class="item">
-                      <td class="indicator-container">
-                        <span class="indicator" style="background-color: white"></span>
-                        <span>
-                          ${titleCount}
-                        </span>
-                      </td>
-                      <td style="text-align: right;">
-                        <span>${this.amountShortenerPipe.transform(countItem.value[1], 2, undefined, true)}</span>
-                      </td>
-                    </tr>
-                  </tbody>
-                </table>
-              ` : '')
-            + `
             <table>
               <thead>
                 <tr>
@@ -371,12 +305,12 @@ export class MempoolGraphComponent implements OnInit, OnChanges {
           </div>`;
         }
       },
-      dataZoom: (this.isWidget && this.isMobile()) ? null : [{
+      dataZoom: (this.template === 'widget' && this.isMobile()) ? null : [{
         type: 'inside',
         realtime: true,
-        zoomLock: (this.isWidget) ? true : false,
+        zoomLock: (this.template === 'widget') ? true : false,
         zoomOnMouseWheel: (this.template === 'advanced') ? true : false,
-        moveOnMouseMove: (this.isWidget) ? true : false,
+        moveOnMouseMove: (this.template === 'widget') ? true : false,
         maxSpan: 100,
         minSpan: 10,
       }, {
@@ -405,7 +339,7 @@ export class MempoolGraphComponent implements OnInit, OnChanges {
       },
       xAxis: [
         {
-          name: this.isWidget ? '' : formatterXAxisLabel(this.locale, this.windowPreference),
+          name: this.template === 'widget' ? '' : formatterXAxisLabel(this.locale, this.windowPreference),
           nameLocation: 'middle',
           nameTextStyle: {
             padding: [20, 0, 0, 0],
@@ -423,7 +357,7 @@ export class MempoolGraphComponent implements OnInit, OnChanges {
           },
         }
       ],
-      yAxis: [{
+      yAxis: {
         type: 'value',
         axisLine: { onZero: false },
         axisLabel: {
@@ -437,17 +371,7 @@ export class MempoolGraphComponent implements OnInit, OnChanges {
             opacity: 0.25,
           }
         }
-      }, this.showCount ? {
-        type: 'value',
-        position: 'right',
-        axisLine: { onZero: false },
-        axisLabel: {
-          formatter: (value: number) => (`${this.amountShortenerPipe.transform(value, 2, undefined, true)}`),
-        },
-        splitLine: {
-          show: false,
-        }
-      } : null],
+      },
     };
   }
 

frontend/src/app/components/privacy-policy/privacy-policy.component.ts

@@ -17,6 +17,6 @@ export class PrivacyPolicyComponent {
 
   ngOnInit(): void {
     this.seoService.setTitle('Privacy Policy');
-    this.seoService.setDescription('Trusted third parties are security holes, as are trusted first parties...you should only trust your own self-hosted instance of The Mempool Open Source Project®.');
+    this.seoService.setDescription('Trusted third parties are security holes, as are trusted first parties...you should only trust your own self-hosted instance of The Mempool Open Source Project™.');
   }
 }

frontend/src/app/components/start/start.component.html

@@ -14,7 +14,6 @@
   <div id="blockchain-container" [dir]="timeLtr ? 'rtl' : 'ltr'" #blockchainContainer
     [class.menu-open]="menuOpen"
     [class.menu-closing]="menuSliding && !menuOpen"
-    [class.with-menu]="hasMenu"
     (mousedown)="onMouseDown($event)"
     (pointerdown)="onPointerDown($event)"
     (touchmove)="onTouchMove($event)"

frontend/src/app/components/start/start.component.scss

@@ -6,7 +6,7 @@
   overflow-y: hidden;
   scrollbar-width: none;
   -ms-overflow-style: none;
-  width: 100%;
+  width: calc(100% + 120px);
 
   transform: translateX(0px);
   transition: transform 0;
@@ -20,10 +20,6 @@
     transform: translateX(0px);
     transition: transform 0.25s;
   }
-
-  &.with-menu {
-    width: calc(100% + 120px);
-  }
 }
 
 #blockchain-container::-webkit-scrollbar {

frontend/src/app/components/start/start.component.ts

@@ -1,4 +1,4 @@
-import { Component, ElementRef, HostListener, OnInit, OnDestroy, ViewChild, Input, ChangeDetectorRef, ChangeDetectionStrategy, AfterViewChecked } from '@angular/core';
+import { Component, ElementRef, HostListener, OnInit, OnDestroy, ViewChild, Input, DoCheck } from '@angular/core';
 import { Subscription } from 'rxjs';
 import { MarkBlockState, StateService } from '../../services/state.service';
 import { specialBlocks } from '../../app.constants';
@@ -8,9 +8,8 @@ import { BlockExtended } from '../../interfaces/node-api.interface';
   selector: 'app-start',
   templateUrl: './start.component.html',
   styleUrls: ['./start.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class StartComponent implements OnInit, AfterViewChecked, OnDestroy {
+export class StartComponent implements OnInit, OnDestroy, DoCheck {
   @Input() showLoadingIndicator = false;
 
   interval = 60;
@@ -24,7 +23,7 @@ export class StartComponent implements OnInit, AfterViewChecked, OnDestroy {
   timeLtrSubscription: Subscription;
   timeLtr: boolean = this.stateService.timeLtr.value;
   chainTipSubscription: Subscription;
-  chainTip: number = 100;
+  chainTip: number = -1;
   tipIsSet: boolean = false;
   lastMark: MarkBlockState;
   markBlockSubscription: Subscription;
@@ -42,8 +41,7 @@ export class StartComponent implements OnInit, AfterViewChecked, OnDestroy {
   blocksPerPage: number = 1;
   pageWidth: number;
   firstPageWidth: number;
-  minScrollWidth: number = 40 + (155 * (8 + (2 * Math.ceil(window.innerWidth / 155))));
-  currentScrollWidth: number = null;
+  minScrollWidth: number;
   pageIndex: number = 0;
   pages: any[] = [];
   pendingMark: number | null = null;
@@ -51,24 +49,25 @@ export class StartComponent implements OnInit, AfterViewChecked, OnDestroy {
   lastUpdate: number = 0;
   lastMouseX: number;
   velocity: number = 0;
-  mempoolOffset: number = null;
-  mempoolWidth: number = 0;
-  scrollLeft: number = null;
+  mempoolOffset: number = 0;
 
+  private resizeObserver: ResizeObserver;
   chainWidth: number = window.innerWidth;
   menuOpen: boolean = false;
   menuSliding: boolean = false;
   menuTimeout: number;
 
-  hasMenu = false;
-
   constructor(
     private stateService: StateService,
-    private cd: ChangeDetectorRef,
   ) {
     this.isiOS = ['iPhone','iPod','iPad'].includes((navigator as any)?.userAgentData?.platform || navigator.platform);
-    if (this.stateService.network === '') {
-      this.hasMenu = true;
+  }
+
+  ngDoCheck(): void {
+    if (this.pendingOffset != null) {
+      const offset = this.pendingOffset;
+      this.pendingOffset = null;
+      this.addConvertedScrollOffset(offset);
     }
   }
 
@@ -78,7 +77,6 @@ export class StartComponent implements OnInit, AfterViewChecked, OnDestroy {
       this.blockCount = blocks.length;
       this.dynamicBlocksAmount = Math.min(this.blockCount, this.stateService.env.KEEP_BLOCKS_AMOUNT, 8);
       this.firstPageWidth = 40 + (this.blockWidth * this.dynamicBlocksAmount);
-      this.minScrollWidth = 40 + (8 * this.blockWidth) + (this.pageWidth * 2);
       if (this.blockCount <= Math.min(8, this.stateService.env.KEEP_BLOCKS_AMOUNT)) {
         this.onResize();
       }
@@ -124,7 +122,7 @@ export class StartComponent implements OnInit, AfterViewChecked, OnDestroy {
             this.scrollToBlock(scrollToHeight);
           }
         }
-        if (!this.tipIsSet || (blockHeight < 0 && this.mempoolOffset == null)) {
+        if (!this.tipIsSet || (blockHeight < 0 && !this.mempoolOffset)) {
           this.pendingMark = blockHeight;
         }
       }
@@ -170,47 +168,15 @@ export class StartComponent implements OnInit, AfterViewChecked, OnDestroy {
     });
   }
 
-  ngAfterViewChecked(): void {
-    if (this.currentScrollWidth !== this.blockchainContainer?.nativeElement?.scrollWidth) {
-      this.currentScrollWidth = this.blockchainContainer?.nativeElement?.scrollWidth;
-      if (this.pendingOffset != null) {
-        const delta = this.pendingOffset - (this.mempoolOffset || 0);
-        this.mempoolOffset = this.pendingOffset;
-        this.currentScrollWidth = this.blockchainContainer?.nativeElement?.scrollWidth;
-        this.pendingOffset = null;
-        this.addConvertedScrollOffset(delta);
-        this.applyPendingMarkArrow();
-      } else {
-        this.applyScrollLeft();
-      }
-    }
-  }
-
   onMempoolOffsetChange(offset): void {
-    if (offset !== this.mempoolOffset) {
-      this.pendingOffset = offset;
-    }
-  }
-
-  applyScrollLeft(): void {
-    if (this.blockchainContainer?.nativeElement?.scrollWidth) {
-      let lastScrollLeft = null;
-      while (this.scrollLeft < 0 && this.shiftPagesForward() && lastScrollLeft !== this.scrollLeft) {
-        lastScrollLeft = this.scrollLeft;
-        this.scrollLeft += this.pageWidth;
-      }
-      lastScrollLeft = null;
-      while (this.scrollLeft > this.blockchainContainer.nativeElement.scrollWidth && this.shiftPagesBack() && lastScrollLeft !== this.scrollLeft) {
-        lastScrollLeft = this.scrollLeft;
-        this.scrollLeft -= this.pageWidth;
-      }
-      this.blockchainContainer.nativeElement.scrollLeft = this.scrollLeft;
-    }
-    this.cd.detectChanges();
+    const delta = offset - this.mempoolOffset;
+    this.addConvertedScrollOffset(delta);
+    this.mempoolOffset = offset;
+    this.applyPendingMarkArrow();
   }
 
   applyPendingMarkArrow(): void {
-    if (this.pendingMark != null && this.pendingMark <= this.chainTip) {
+    if (this.pendingMark != null) {
       if (this.pendingMark < 0) {
         this.scrollToBlock(this.chainTip - this.pendingMark);
       } else {
@@ -225,7 +191,6 @@ export class StartComponent implements OnInit, AfterViewChecked, OnDestroy {
     window.clearTimeout(this.menuTimeout);
     this.menuTimeout = window.setTimeout(() => {
       this.menuSliding = false;
-      this.cd.markForCheck();
     }, 300);
   }
 
@@ -235,33 +200,34 @@ export class StartComponent implements OnInit, AfterViewChecked, OnDestroy {
     this.isMobile = this.chainWidth <= 767.98;
     let firstVisibleBlock;
     let offset;
-    this.pages.forEach(page => {
-      const left = page.offset - this.getConvertedScrollOffset(this.scrollLeft);
-      const right = left + this.pageWidth;
-      if (left <= 0 && right > 0) {
-        const blockIndex = Math.max(0, Math.floor(left / -this.blockWidth));
-        firstVisibleBlock = page.height - blockIndex;
-        offset = left + (blockIndex * this.blockWidth);
-      }
-    });
+    if (this.blockchainContainer?.nativeElement != null) {
+      this.pages.forEach(page => {
+        const left = page.offset - this.getConvertedScrollOffset();
+        const right = left + this.pageWidth;
+        if (left <= 0 && right > 0) {
+          const blockIndex = Math.max(0, Math.floor(left / -this.blockWidth));
+          firstVisibleBlock = page.height - blockIndex;
+          offset = left + (blockIndex * this.blockWidth);
+        }
+      });
+    }
 
     this.blocksPerPage = Math.ceil(this.chainWidth / this.blockWidth);
     this.pageWidth = this.blocksPerPage * this.blockWidth;
-    this.minScrollWidth = 40 + (8 * this.blockWidth) + (this.pageWidth * 2);
+    this.minScrollWidth = this.firstPageWidth + (this.pageWidth * 2);
 
     if (firstVisibleBlock != null) {
-      this.scrollToBlock(firstVisibleBlock, offset);
+      this.scrollToBlock(firstVisibleBlock, offset + (this.isMobile ? this.blockWidth : 0));
     } else {
       this.updatePages();
     }
-    this.cd.markForCheck();
   }
 
   onMouseDown(event: MouseEvent) {
     if (!(event.which > 1 || event.button > 0)) {
       this.mouseDragStartX = event.clientX;
       this.resetMomentum(event.clientX);
-      this.blockchainScrollLeftInit = this.scrollLeft;
+      this.blockchainScrollLeftInit = this.blockchainContainer.nativeElement.scrollLeft;
     }
   }
   onPointerDown(event: PointerEvent) {
@@ -287,8 +253,8 @@ export class StartComponent implements OnInit, AfterViewChecked, OnDestroy {
     if (this.mouseDragStartX != null) {
       this.updateVelocity(event.clientX);
       this.stateService.setBlockScrollingInProgress(true);
-      this.scrollLeft = this.blockchainScrollLeftInit + this.mouseDragStartX - event.clientX;
-      this.applyScrollLeft();
+      this.blockchainContainer.nativeElement.scrollLeft =
+        this.blockchainScrollLeftInit + this.mouseDragStartX - event.clientX;
     }
   }
   @HostListener('document:mouseup', [])
@@ -344,31 +310,25 @@ export class StartComponent implements OnInit, AfterViewChecked, OnDestroy {
         } else {
           this.velocity += dv;
         }
-        this.scrollLeft -= displacement;
-        this.applyScrollLeft();
+        this.blockchainContainer.nativeElement.scrollLeft -= displacement;
         this.animateMomentum();
       }
     });
   }
 
   onScroll(e) {
-    if (this.blockchainContainer?.nativeElement?.scrollLeft == null) {
-      return;
-    }
-    this.scrollLeft = this.blockchainContainer?.nativeElement?.scrollLeft;
     const middlePage = this.pageIndex === 0 ? this.pages[0] : this.pages[1];
     // compensate for css transform
     const translation = (this.isMobile ? this.chainWidth * 0.95 : this.chainWidth * 0.5);
     const backThreshold = middlePage.offset + (this.pageWidth * 0.5) + translation;
     const forwardThreshold = middlePage.offset - (this.pageWidth * 0.5) + translation;
-    this.scrollLeft = this.blockchainContainer.nativeElement.scrollLeft;
-    const offsetScroll = this.getConvertedScrollOffset(this.scrollLeft);
-    if (offsetScroll > backThreshold) {
+    const scrollLeft = this.getConvertedScrollOffset();
+    if (scrollLeft > backThreshold) {
       if (this.shiftPagesBack()) {
         this.addConvertedScrollOffset(-this.pageWidth);
         this.blockchainScrollLeftInit -= this.pageWidth;
       }
-    } else if (offsetScroll < forwardThreshold) {
+    } else if (scrollLeft < forwardThreshold) {
       if (this.shiftPagesForward()) {
         this.addConvertedScrollOffset(this.pageWidth);
         this.blockchainScrollLeftInit += this.pageWidth;
@@ -377,6 +337,10 @@ export class StartComponent implements OnInit, AfterViewChecked, OnDestroy {
   }
 
   scrollToBlock(height, blockOffset = 0) {
+    if (!this.blockchainContainer?.nativeElement) {
+      setTimeout(() => { this.scrollToBlock(height, blockOffset); }, 50);
+      return;
+    }
     if (this.isMobile) {
       blockOffset -= this.blockWidth;
     }
@@ -384,15 +348,15 @@ export class StartComponent implements OnInit, AfterViewChecked, OnDestroy {
     const pages = [];
     this.pageIndex = Math.max(viewingPageIndex - 1, 0);
     let viewingPage = this.getPageAt(viewingPageIndex);
-    const isLastPage = viewingPage.height <= 0;
+    const isLastPage = viewingPage.height < this.blocksPerPage;
     if (isLastPage) {
       this.pageIndex = Math.max(viewingPageIndex - 2, 0);
       viewingPage = this.getPageAt(viewingPageIndex);
     }
-    const left = viewingPage.offset - this.getConvertedScrollOffset(this.scrollLeft);
+    const left = viewingPage.offset - this.getConvertedScrollOffset();
     const blockIndex = viewingPage.height - height;
     const targetOffset = (this.blockWidth * blockIndex) + left;
-    const deltaOffset = targetOffset - blockOffset;
+    let deltaOffset = targetOffset - blockOffset;
 
     if (isLastPage) {
       pages.push(this.getPageAt(viewingPageIndex - 2));
@@ -422,7 +386,6 @@ export class StartComponent implements OnInit, AfterViewChecked, OnDestroy {
     pages.push(this.getPageAt(this.pageIndex + 1));
     pages.push(this.getPageAt(this.pageIndex + 2));
     this.pages = pages;
-    this.cd.markForCheck();
   }
 
   shiftPagesBack(): boolean {
@@ -476,40 +439,44 @@ export class StartComponent implements OnInit, AfterViewChecked, OnDestroy {
   blockInViewport(height: number): boolean {
     const firstHeight = this.pages[0].height;
     const translation = (this.isMobile ? this.chainWidth * 0.95 : this.chainWidth * 0.5);
-    const firstX = this.pages[0].offset - this.getConvertedScrollOffset(this.scrollLeft) + translation;
+    const firstX = this.pages[0].offset - this.getConvertedScrollOffset() + translation;
     const xPos = firstX + ((firstHeight - height) * 155);
     return xPos > -55 && xPos < (this.chainWidth - 100);
   }
 
-  getConvertedScrollOffset(scrollLeft): number {
+  getConvertedScrollOffset(): number {
     if (this.timeLtr) {
-      return -(scrollLeft || 0) - (this.mempoolOffset || 0);
+      return -(this.blockchainContainer?.nativeElement?.scrollLeft || 0) - this.mempoolOffset;
     } else {
-      return (scrollLeft || 0) - (this.mempoolOffset || 0);
+      return (this.blockchainContainer?.nativeElement?.scrollLeft || 0) - this.mempoolOffset;
     }
   }
 
   setScrollLeft(offset: number): void {
     if (this.timeLtr) {
-      this.scrollLeft = offset - (this.mempoolOffset || 0);
+      this.blockchainContainer.nativeElement.scrollLeft = offset - this.mempoolOffset;
     } else {
-      this.scrollLeft = offset + (this.mempoolOffset || 0);
+      this.blockchainContainer.nativeElement.scrollLeft = offset + this.mempoolOffset;
     }
-    this.applyScrollLeft();
   }
 
   addConvertedScrollOffset(offset: number): void {
-    if (this.timeLtr) {
-      this.scrollLeft -= offset;
-    } else {
-      this.scrollLeft += offset;
+    if (!this.blockchainContainer?.nativeElement) {
+      this.pendingOffset = offset;
+      return;
+    }
+    if (this.timeLtr) {
+      this.blockchainContainer.nativeElement.scrollLeft -= offset;
+    } else {
+      this.blockchainContainer.nativeElement.scrollLeft += offset;
     }
-    this.applyScrollLeft();
   }
 
   ngOnDestroy() {
-    // clean up scroll position to prevent caching wrong scroll in Firefox
-    this.setScrollLeft(0);
+    if (this.blockchainContainer?.nativeElement) {
+      // clean up scroll position to prevent caching wrong scroll in Firefox
+      this.setScrollLeft(0);
+    }
     this.timeLtrSubscription.unsubscribe();
     this.chainTipSubscription.unsubscribe();
     this.markBlockSubscription.unsubscribe();

frontend/src/app/components/statistics/statistics.component.html

@@ -69,12 +69,6 @@
                 </button>
                 <div class="dropdown-fees" ngbDropdownMenu aria-labelledby="dropdownFees">
                   <ul>
-                    <li (click)="this.showCount = !this.showCount"
-                      [class]="this.showCount ? '' : 'inactive'">
-                      <span class="square" [ngStyle]="{'backgroundColor': 'white'}"></span>
-                      <span class="fee-text">{{ titleCount }}</span>
-                    </li>
-                    <hr style="margin: 4px;">
                     <ng-template ngFor let-feeData let-i="index" [ngForOf]="feeLevelDropdownData">
                       <ng-template [ngIf]="feeData.fee <= (feeLevels[maxFeeIndex])">
                         <li (click)="filterFeeIndex = feeData.fee"
@@ -98,8 +92,8 @@
         </div>
         <div class="card-body">
           <div class="incoming-transactions-graph">
-            <app-mempool-graph #mempoolgraph dir="ltr" [template]="'advanced'" [hideCount]="!showCount"
-              [limitFilterFee]="filterFeeIndex" [height]="500" [left]="65" [right]="showCount ? 50 : 10"
+            <app-mempool-graph #mempoolgraph dir="ltr" [template]="'advanced'"
+              [limitFilterFee]="filterFeeIndex" [height]="500" [left]="65" [right]="10"
               [data]="mempoolStats && mempoolStats.length ? mempoolStats : null"></app-mempool-graph>
           </div>
         </div>

frontend/src/app/components/statistics/statistics.component.ts

@@ -32,7 +32,6 @@ export class StatisticsComponent implements OnInit {
   chartColors = chartColors;
   filterSize = 100000;
   filterFeeIndex = 1;
-  showCount = true;
   maxFeeIndex: number;
   dropDownOpen = false;
 
@@ -47,7 +46,6 @@ export class StatisticsComponent implements OnInit {
   inverted: boolean;
   feeLevelDropdownData = [];
   timespan = '';
-  titleCount = $localize`Count`;
 
   constructor(
     @Inject(LOCALE_ID) private locale: string,

frontend/src/app/components/trademark-policy/trademark-policy.component.ts

@@ -17,6 +17,6 @@ export class TrademarkPolicyComponent {
 
   ngOnInit(): void {
     this.seoService.setTitle('Trademark Policy');
-    this.seoService.setDescription('An overview of the trademarks registered by Mempool Space K.K. and The Mempool Open Source Project® and what we consider to be lawful usage of those trademarks.');
+    this.seoService.setDescription('An overview of the trademarks registered by Mempool Space K.K. and The Mempool Open Source Project™ and what we consider to be lawful usage of those trademarks.');
   }
 }

frontend/src/app/interfaces/node-api.interface.ts

@@ -2,7 +2,6 @@ import { Block, Transaction } from "./electrs.interface";
 
 export interface OptimizedMempoolStats {
   added: number;
-  count: number;
   vbytes_per_second: number;
   total_fee: number;
   mempool_byte_weight: number;

frontend/src/app/lightning/nodes-map/nodes-map.component.ts

@@ -114,7 +114,7 @@ export class NodesMap implements OnInit, OnChanges {
           node[3], // Alias
           node[2], // Public key
           node[5], // Channels
-          node[6]?.en, // Country
+          node[6].en, // Country
           node[7], // ISO Code
         ]);
       }

frontend/src/app/services/seo.service.ts

@@ -12,8 +12,6 @@ export class SeoService {
   baseTitle = 'mempool';
   baseDescription = 'Explore the full Bitcoin ecosystem with The Mempool Open Project™.';
 
-  canonicalLink: HTMLElement = document.getElementById('canonical');
-
   constructor(
     private titleService: Title,
     private metaService: Meta,
@@ -67,16 +65,6 @@ export class SeoService {
     this.metaService.updateTag({ property: 'og:description', content: this.getDescription()});
   }
 
-  updateCanonical(path) {
-    let domain = 'mempool.space';
-    if (this.stateService.env.BASE_MODULE === 'liquid') {
-      domain = 'liquid.network';
-    } else if (this.stateService.env.BASE_MODULE === 'bisq') {
-      domain = 'bisq.markets';
-    }
-    this.canonicalLink.setAttribute('href', 'https://' + domain + path);
-  }
-
   getTitle(): string {
     if (this.network === 'testnet')
       return this.baseTitle + ' - Bitcoin Testnet';

frontend/src/app/services/state.service.ts

@@ -117,7 +117,6 @@ export class StateService {
   difficultyAdjustment$ = new ReplaySubject<DifficultyAdjustment>(1);
   mempoolTransactions$ = new Subject<Transaction>();
   mempoolTxPosition$ = new Subject<{ txid: string, position: MempoolPosition, cpfp: CpfpInfo | null}>();
-  mempoolRemovedTransactions$ = new Subject<Transaction>();
   blockTransactions$ = new Subject<Transaction>();
   isLoadingWebSocket$ = new ReplaySubject<boolean>(1);
   isLoadingMempool$ = new BehaviorSubject<boolean>(true);

frontend/src/app/services/websocket.service.ts

@@ -358,12 +358,6 @@ export class WebsocketService {
       });
     }
 
-    if (response['address-removed-transactions']) {
-      response['address-removed-transactions'].forEach((addressTransaction: Transaction) => {
-        this.stateService.mempoolRemovedTransactions$.next(addressTransaction);
-      });
-    }
-
     if (response['block-transactions']) {
       response['block-transactions'].forEach((addressTransaction: Transaction) => {
         this.stateService.blockTransactions$.next(addressTransaction);

frontend/src/app/shared/components/geolocation/geolocation.component.ts

@@ -20,11 +20,6 @@ export class GeolocationComponent implements OnChanges {
   formattedLocation: string = '';
 
   ngOnChanges(): void {
-    if (!this.data) {
-      this.formattedLocation = '-';
-      return;
-    }
-
     const city = this.data.city ? this.data.city : '';
     const subdivisionLikeCity = this.data.city === this.data.subdivision;
     let subdivision = this.data.subdivision;

frontend/src/app/shared/components/global-footer/global-footer.component.html

@@ -84,7 +84,6 @@
         <a href="https://github.com/mempool" target="_blank"><svg fill="#fff" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>GitHub</title><path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"/></svg></a>
         <a href="https://twitter.com/mempool" target="_blank"><svg fill="#fff" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Twitter</title><path d="M23.953 4.57a10 10 0 01-2.825.775 4.958 4.958 0 002.163-2.723c-.951.555-2.005.959-3.127 1.184a4.92 4.92 0 00-8.384 4.482C7.69 8.095 4.067 6.13 1.64 3.162a4.822 4.822 0 00-.666 2.475c0 1.71.87 3.213 2.188 4.096a4.904 4.904 0 01-2.228-.616v.06a4.923 4.923 0 003.946 4.827 4.996 4.996 0 01-2.212.085 4.936 4.936 0 004.604 3.417 9.867 9.867 0 01-6.102 2.105c-.39 0-.779-.023-1.17-.067a13.995 13.995 0 007.557 2.209c9.053 0 13.998-7.496 13.998-13.985 0-.21 0-.42-.015-.63A9.935 9.935 0 0024 4.59z"/></svg></a>
         <a href="nostr:npub18d4r6wanxkyrdfjdrjqzj2ukua5cas669ew2g5w7lf4a8te7awzqey6lt3" target="_blank"><svg fill="#fff" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 875 875"><path d="M684.72 485.57c.22 12.59-11.93 51.47-38.67 81.3-26.74 29.83-56.02 20.85-58.42 20.16s-3.09-4.46-7.89-3.77-9.6 6.17-18.86 7.2-17.49 1.71-26.06-1.37c-4.46.69-5.14.71-7.2 2.24s-17.83 10.79-21.6 11.47c0 7.2-1.37 44.57 0 55.89s3.77 25.71 7.54 36 2.74 10.63 7.54 9.94 13.37.34 15.77 4.11c2.4 3.77 1.37 6.51 5.49 8.23s60.69 17.14 99.43 19.2c26.74.69 42.86 2.74 52.12 19.54 1.37 7.89 7.54 13.03 11.31 14.06s8.23 2.06 12 5.83 1.03 8.23 5.49 11.66c4.46 3.43 14.74 8.57 25.37 13.71 10.63 5.14 15.09 13.37 15.77 16.11s1.71 10.97 1.71 10.97-8.91 0-10.97-2.06-2.74-5.83-2.74-5.83-6.17 1.03-7.54 3.43.69 2.74-7.89.69-11.66-3.77-18.17-8.57c-6.51-4.8-16.46-17.14-25.03-16.8 4.11 8.23 5.83 8.23 10.63 10.97s8.23 5.83 8.23 5.83l-7.2 4.46s-4.46 2.06-14.74-.69-11.66-4.46-12.69-10.63 0-9.26-2.74-14.4-4.11-15.77-22.29-21.26c-18.17-5.49-66.52-21.26-100.12-24.69s-22.63-2.74-28.11-1.37-15.77 4.46-26.4-1.37c-10.63-5.83-16.8-13.71-17.49-20.23s-1.71-10.97 0-19.2 3.43-19.89 1.71-26.74-14.06-55.89-19.89-64.12c-13.03 1.03-50.74-.69-50.74-.69s-2.4-.69-17.49 5.83-36.48 13.76-46.77 19.93-14.4 9.7-16.12 13.13c.12 3-1.23 7.72-2.79 9.06s-12.48 2.42-12.48 2.42-5.85 5.86-8.25 9.97c-6.86 9.6-55.2 125.14-66.52 149.83-13.54 32.57-9.77 27.43-37.71 27.43s-8.06.3-8.06.3-12.34 5.88-16.8 5.88-18.86-2.4-26.4 0-16.46 9.26-23.31 10.29-4.95-1.34-8.38-3.74c-4-.21-14.27-.12-14.27-.12s1.74-6.51 7.91-10.88c8.23-5.83 25.37-16.11 34.63-21.26s17.49-7.89 23.31-9.26 18.51-6.17 30.51-9.94 19.54-8.23 29.83-31.54 50.4-111.43 51.43-116.23c.63-2.96 3.73-6.48 4.8-15.09.66-5.35-2.49-13.04 1.71-22.63 10.97-25.03 21.6-20.23 26.4-20.23s17.14.34 26.4-1.37 15.43-2.74 24.69-7.89 11.31-8.91 11.31-8.91l-19.89-3.43s-18.51.69-25.03-4.46-15.43-15.77-15.43-15.77l-7.54-7.2 1.03 8.57s-5.14-8.91-6.51-10.29-8.57-6.51-11.31-11.31-7.54-25.03-7.54-25.03l-6.17 13.03-1.71-18.86-5.14 7.2-2.74-16.11-4.8 8.23-3.43-14.4-5.83 4.46-2.4-10.29-5.83-3.43s-14.06-9.26-16.46-9.6-4.46 3.43-4.46 3.43l1.37 12-12.2-6.27-7-11.9s2.36 4.01-9.62 7.53c-20.55 0-21.89-2.28-24.93-3.94-1.31-6.56-5.57-10.11-5.57-10.11h-20.57l-.34-6.86-7.89 3.09.69-10.29h-14.06l1.03-11.31h-8.91s3.09-9.26 25.71-22.97 25.03-16.46 46.29-17.14c21.26-.69 32.91 2.74 46.29 8.23s38.74 13.71 43.89 17.49c11.31-9.94 28.46-19.89 34.29-19.89 1.03-2.4 6.19-12.33 17.96-17.6 35.31-15.81 108.13-34 131.53-35.54 31.2-2.06 7.89-1.37 39.09 2.06 31.2 3.43 54.17 7.54 69.6 12.69 12.58 4.19 25.03 9.6 34.29 2.06 4.33-1.81 11.81-1.34 17.83-5.14 30.69-25.09 34.72-32.35 43.63-41.95s20.14-24.91 22.54-45.14 4.46-58.29-10.63-88.12-28.8-45.26-34.63-69.26c-5.83-24-8.23-61.03-6.17-73.03 2.06-12 5.14-22.29 6.86-30.51s9.94-14.74 19.89-16.46c9.94-1.71 17.83 1.37 22.29 4.8 4.46 3.43 11.65 6.28 13.37 10.29.34 1.71-1.37 6.51 8.23 8.23 9.6 1.71 16.05 4.16 16.05 4.16s15.64 4.29 3.11 7.73c-12.69 2.06-20.52-.71-24.29 1.69s-7.21 10.08-9.61 11.1-7.2.34-12 4.11-9.6 6.86-12.69 14.4-5.49 15.77-3.43 26.74 8.57 31.54 14.4 43.2c5.83 11.66 20.23 40.8 24.34 47.66s15.77 29.49 16.8 53.83 1.03 44.23 0 54.86-10.84 51.65-35.53 85.94c-8.16 14.14-23.21 31.9-24.67 35.03-1.45 3.13-3.02 4.88-1.61 7.65 4.62 9.05 12.87 22.13 14.71 29.22 2.29 6.64 6.99 16.13 7.22 28.72Z" style="stroke:#000;stroke-miterlimit:10;stroke-width:6px"/></svg></a>
-        <a href="https://primal.net/mempool" target="_blank"><svg fill="#fff" role="img" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg" ><path d="m155.5 253c-8.9 2-18.1 3-27.5 3-25.9 0-50-7.7-70.2-20.9-5-7.2-7.2-11.1-8.9-14-0.8-1.4-1.5-2.6-2.2-3.8-7.7-12.2-11.7-28-12.5-46.6-2.7-57.4 32.2-94 67.8-100.1 22.6-3.8 40.6 0.1 54.3 7.5-12.1-3.4-26.6-3.6-43.2 1.1-40.1 12.9-53.5 52.3-47.8 95.8 10 54.6 63.5 74.1 90.2 78zm-114.3-30.9c-7.4-13.2-14.2-33-15-51-2.9-60.9 34.4-101.6 74.5-108.3 54.7-9.3 85.1 23.1 95.6 47.1 0.4-0.3 0.6-0.9 0.3-1.4-17.2-37.4-52.8-63.2-94-63.2-46.8 0-88.5 33.6-102.6 83.4 0.2 36.9 16 70.2 41.2 93.4zm158.8 11.7c-9.2 6.3-19.3 11.5-30.1 15.2-5.1-0.9-10.9-2-14.9-2.8-1.9-0.4-3.4-0.7-4.3-0.9-24.4-4.4-67.9-20.1-77.5-71.6-2.6-20.6-0.7-39.7 6.1-54.8 6.7-14.9 18.4-26.3 36.1-32 20.6-5.6 37.7-2.9 50.3 3.9q-4.7-0.9-9.6-1c-27.4 0-49.7 23.9-49.7 53.3 0 11.7 3.6 22.5 9.6 31.3 0 0 17.2 32.5 64 29.6 41.7-2.6 63.4-40 66-53.8 1.3-7.2 2-14.6 2-22.2 0-66.3-53.7-120-120-120-50.1 0-93.1 30.8-111.1 74.4-6 7.9-11.2 16.7-15.4 26.2 9.3-61.5 62.4-108.6 126.5-108.6 70.7 0 128 57.3 128 128 0 44-22.2 82.8-56 105.8z" style="fill:#ffffff"/></svg></a>
         <a href="https://youtube.com/@mempool" target="_blank"><svg fill="#fff" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>YouTube</title><path d="M23.498 6.186a3.016 3.016 0 0 0-2.122-2.136C19.505 3.545 12 3.545 12 3.545s-7.505 0-9.377.505A3.017 3.017 0 0 0 .502 6.186C0 8.07 0 12 0 12s0 3.93.502 5.814a3.016 3.016 0 0 0 2.122 2.136c1.871.505 9.376.505 9.376.505s7.505 0 9.377-.505a3.015 3.015 0 0 0 2.122-2.136C24 15.93 24 12 24 12s0-3.93-.502-5.814zM9.545 15.568V8.432L15.818 12l-6.273 3.568z"/></svg></a>
         <a href="https://bitcointv.com/c/mempool/videos" target="_blank"><svg _ngcontent-serverApp-c90="" xmlns="http://www.w3.org/2000/svg" focusable="false" viewBox="0 0 440 440"><path _ngcontent-serverApp-c90="" d="M225.57,2.08l-.69-.45a4.22,4.22,0,0,0-5.72,1.23L182.33,46.09a4,4,0,0,0,.88,5.81l9.38,6.38L173.48,97.49a4.22,4.22,0,0,0,2.45,4.19s3.55.7,4.53-1l41.92-40.56a3.62,3.62,0,0,0-1.51-5.1l-10.55-6.12L227.44,6.79A4.26,4.26,0,0,0,225.57,2.08Z" fill="#fff"></path><path _ngcontent-serverApp-c90="" d="M118.52,401.83c-62.51,0-113.37-51-113.37-113.67V214.68C5.15,152,56,101,118.52,101H342.08a24.82,24.82,0,0,1,24.76,24.83V377a24.81,24.81,0,0,1-24.76,24.82Z"></path><path _ngcontent-serverApp-c90="" d="M342.08,105.18a20.65,20.65,0,0,1,20.61,20.66V377a20.66,20.66,0,0,1-20.61,20.66H118.52C58.3,397.67,9.31,348.55,9.31,288.16V214.68c0-60.38,49-109.5,109.21-109.5H342.08m0-8.34H118.52C53.62,96.84,1,149.6,1,214.68v73.48C1,353.24,53.62,406,118.52,406H342.08A29,29,0,0,0,371,377V125.84a29,29,0,0,0-28.92-29Z" fill="#fff"></path><path _ngcontent-serverApp-c90="" fill="#fff" d="M344.69,346.23A25.84,25.84,0,1,0,335,369.87l-10.22-10.2a11.69,11.69,0,1,1,4.77-5.12l10.31,10.28A25.84,25.84,0,0,0,344.69,346.23Z"></path><path _ngcontent-serverApp-c90="" fill="#fff" d="M315.82,257.61a25.67,25.67,0,0,0-12.53,5.22L315,274.49a9.58,9.58,0,0,1,2.11-.73A9.72,9.72,0,1,1,309.4,283a9.4,9.4,0,0,1,.75-3.41L298.4,267.84a25.77,25.77,0,1,0,17.42-10.23Z"></path><path _ngcontent-serverApp-c90="" fill="#fff" d="M313,214a7.76,7.76,0,1,1,1.41,10.91,7.62,7.62,0,0,1-2.19-2.69l-18.67-.14a25.94,25.94,0,1,0,.05-7l18.64.14A7.4,7.4,0,0,1,313,214Z"></path><path _ngcontent-serverApp-c90="" fill="#fff" d="M341.2,144.08h-6.32c-1.67,0-3.61,1.87-3.61,4.29s1.94,4.29,3.61,4.29h6.32c1.67,0,3.61-1.87,3.61-4.29S342.87,144.08,341.2,144.08Z"></path><path _ngcontent-serverApp-c90="" fill="#fff" d="M301.75,144.08h-6.44c-1.67,0-3.61,1.87-3.61,4.29s1.94,4.29,3.61,4.29h6.44c1.67,0,3.61-1.87,3.61-4.29S303.42,144.08,301.75,144.08Z"></path><path _ngcontent-serverApp-c90="" fill="#fff" d="M321.77,144.08h-7c-1.67,0-3.62,1.87-3.62,4.29s1.95,4.29,3.62,4.29h7c1.67,0,3.62-1.87,3.62-4.29S323.44,144.08,321.77,144.08Z"></path><ellipse _ngcontent-serverApp-c90="" fill="#fff" cx="295.97" cy="127.61" rx="4.27" ry="4.29"></ellipse><path _ngcontent-serverApp-c90="" fill="#fff" d="M340.54,131.9a4.29,4.29,0,1,0-4.27-4.29A4.28,4.28,0,0,0,340.54,131.9Z"></path><path _ngcontent-serverApp-c90="" fill="#fff" d="M318.26,131.9a4.29,4.29,0,1,0-4.27-4.29A4.29,4.29,0,0,0,318.26,131.9Z"></path><ellipse _ngcontent-serverApp-c90="" fill="#fff" cx="295.97" cy="169.13" rx="4.27" ry="4.29"></ellipse><path _ngcontent-serverApp-c90="" fill="#fff" d="M340.54,164.84a4.3,4.3,0,1,0,4.27,4.29A4.29,4.29,0,0,0,340.54,164.84Z"></path><path _ngcontent-serverApp-c90="" fill="#fff" d="M318.26,164.84a4.3,4.3,0,1,0,4.28,4.29A4.29,4.29,0,0,0,318.26,164.84Z"></path><path _ngcontent-serverApp-c90="" d="M108.62,256.87c8.36-1,7.68-7.76,3.14-17-3.64-7.4-9.74-16.39-15.75-25.36-14.23-21.23-27.69-42.23-5.35-41.07,19.55,1,42.9,18.63,68.22,36.74,31.1,22.24,65.16,45.21,98.81,39.11a151.19,151.19,0,0,1,20-2.37V221a92,92,0,0,0-91.91-92.16H124.33A92,92,0,0,0,32.42,221v17.59c17.71,3.81,31,9.94,43.8,14.15C86.6,256.16,96.69,258.31,108.62,256.87Z"></path><path _ngcontent-serverApp-c90="" d="M273.37,310.79c-35-15.26-76.67-32.1-104-23.59-3.15,1-5,2.3-6,3.85-3.35,5.31,4.67,13.57,14.89,22.17,7.17,6,15.36,12.21,21.44,17.64,11.47,10.26,15.35,17.84-9.89,16.62-29.75-1.44-49.18-13.75-71.18-24l-.29-.14a165.84,165.84,0,0,0-22.93-8.91c-15.74-4.67-34.22-6.79-58.51-3.28A91.93,91.93,0,0,0,124.33,375h61.45A92,92,0,0,0,273.37,310.79Z"></path><path _ngcontent-serverApp-c90="" fill="#fff" d="M257.69,249.31C224,255.41,190,232.44,158.88,210.2c-25.32-18.11-48.67-35.72-68.22-36.74C68.32,172.3,81.78,193.3,96,214.53c6,9,12.11,18,15.75,25.36,4.54,9.22,5.22,16-3.14,17-11.93,1.44-22-.71-32.4-4.13-12.8-4.21-26.09-10.34-43.8-14.15v44.26c0,1.26.14,2.48.19,3.72a91.8,91.8,0,0,0,2.9,19.62c.43,1.67.84,3.34,1.37,5,24.29-3.51,42.77-1.39,58.51,3.28a165.84,165.84,0,0,1,22.93,8.91c.39-.12.76-.26,1.14-.39l-.85.53c22,10.25,41.43,22.56,71.18,24,25.24,1.22,21.36-6.36,9.89-16.62-6.08-5.43-14.27-11.61-21.44-17.64-10.22-8.6-18.24-16.86-14.89-22.17,1-1.55,2.87-2.87,6-3.85,27.33-8.51,69,8.33,104,23.59.32-1,.56-2.05.84-3.07a92.33,92.33,0,0,0,3.48-24.87V246.94A151.19,151.19,0,0,0,257.69,249.31Z"></path><path _ngcontent-serverApp-c90="" fill="#fff" d="M192,137a78,78,0,0,1,77.78,78v73.91a78,78,0,0,1-77.78,78H118.51a78,78,0,0,1-77.78-78V215a78,78,0,0,1,77.78-78H192m0-8.33H118.51A86.21,86.21,0,0,0,32.42,215v73.91a86.21,86.21,0,0,0,86.09,86.33H192a86.21,86.21,0,0,0,86.09-86.33V215A86.21,86.21,0,0,0,192,128.64Z"></path></svg></a>
         <a href="https://mempool.chat" target="_blank"><svg fill="#fff" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Matrix</title><path d="M.632.55v22.9H2.28V24H0V0h2.28v.55zm7.043 7.26v1.157h.033c.309-.443.683-.784 1.117-1.024.433-.245.936-.365 1.5-.365.54 0 1.033.107 1.481.314.448.208.785.582 1.02 1.108.254-.374.6-.706 1.034-.992.434-.287.95-.43 1.546-.43.453 0 .872.056 1.26.167.388.11.716.286.993.53.276.245.489.559.646.951.152.392.23.863.23 1.417v5.728h-2.349V11.52c0-.286-.01-.559-.032-.812a1.755 1.755 0 0 0-.18-.66 1.106 1.106 0 0 0-.438-.448c-.194-.11-.457-.166-.785-.166-.332 0-.6.064-.803.189a1.38 1.38 0 0 0-.48.499 1.946 1.946 0 0 0-.231.696 5.56 5.56 0 0 0-.06.785v4.768h-2.35v-4.8c0-.254-.004-.503-.018-.752a2.074 2.074 0 0 0-.143-.688 1.052 1.052 0 0 0-.415-.503c-.194-.125-.476-.19-.854-.19-.111 0-.259.024-.439.074-.18.051-.36.143-.53.282-.171.138-.319.337-.439.595-.12.259-.18.6-.18 1.02v4.966H5.46V7.81zm15.693 15.64V.55H21.72V0H24v24h-2.28v-.55z"/></svg></a>

frontend/src/app/shared/components/global-footer/global-footer.component.scss

@@ -88,14 +88,7 @@ footer .row.link-tree {
 
 footer .row.social-links {
   text-align: center;
-  display: flex;
-  flex-wrap: wrap;
-  width: fit-content;
-  margin: 0 auto; 
-
-  @media (max-width: 450px){
-    width: 250px;
-  }
+  margin: 24px 0;
 }
 
 footer .row.social-links a {
@@ -104,7 +97,6 @@ footer .row.social-links a {
 
 footer .row.social-links svg {
   width: 20px;
-  margin: 10px 0 10px 0;
 }
 
 footer .row.version {
@@ -197,6 +189,10 @@ footer .sponsor {
     margin-top: 15px;
   }
 
+  footer .row.social-links {
+    margin: 48px 0 24px 0;
+  }
+
   footer .selector:not(:last-child) {
     margin-right: 10px;
   }
@@ -240,6 +236,10 @@ footer .sponsor {
     margin-top: 15px;
   }
 
+  footer .services.row.social-links {
+    margin: 48px 0 24px 0;
+  }
+
   footer .services.selector:not(:last-child) {
     margin-right: 10px;
   }

frontend/src/index.mempool.html

@@ -7,17 +7,17 @@
   <script src="/resources/config.js"></script>
   <base href="/">
 
-  <meta name="description" content="Explore the full Bitcoin ecosystem with The Mempool Open Source Project®. See the real-time status of your transactions, get network info, and more." />
+  <meta name="description" content="Explore the full Bitcoin ecosystem with The Mempool Open Source Project™. See the real-time status of your transactions, get network info, and more." />
   <meta property="og:image" content="https://mempool.space/resources/mempool-space-preview.png" />
   <meta property="og:image:type" content="image/png" />
   <meta property="og:image:width" content="1000" />
   <meta property="og:image:height" content="500" />
-  <meta property="og:description" content="Explore the full Bitcoin ecosystem with The Mempool Open Source Project®. See the real-time status of your transactions, get network info, and more." />
+  <meta property="og:description" content="Explore the full Bitcoin ecosystem with The Mempool Open Source Project™. See the real-time status of your transactions, get network info, and more." />
   <meta name="twitter:card" content="summary_large_image">
   <meta name="twitter:site" content="@mempool">
   <meta name="twitter:creator" content="@mempool">
   <meta name="twitter:title" content="The Mempool Open Source Project®">
-  <meta name="twitter:description" content="Explore the full Bitcoin ecosystem with The Mempool Open Source Project®. See the real-time status of your transactions, get network info, and more." />
+  <meta name="twitter:description" content="Explore the full Bitcoin ecosystem with The Mempool Open Source Project™. See the real-time status of your transactions, get network info, and more." />
   <meta name="twitter:image:src" content="https://mempool.space/resources/mempool-space-preview.png" />
   <meta name="twitter:domain" content="mempool.space">
 

frontend/sync-assets.js

@@ -1,19 +1,6 @@
 var https = require('https');
 var fs = require('fs');
 var crypto = require('crypto');
-var path = require('node:path');
-const LOG_TAG = '[sync-assets]';
-let verbose = false;
-
-if (parseInt(process.env.SKIP_SYNC) === 1) {
-  console.log(`${LOG_TAG} SKIP_SYNC is set, not checking any assets`);
-  process.exit(0);
-}
-
-if (parseInt(process.env.VERBOSE) === 1) {
-  console.log(`${LOG_TAG} VERBOSE is set, logs will be more verbose`);
-  verbose = true;
-}
 
 const CONFIG_FILE_NAME = 'mempool-frontend-config.json';
 let configContent = {};
@@ -21,13 +8,6 @@ let configContent = {};
 var PATH;
 if (process.argv[2]) {
   PATH = process.argv[2];
-  PATH += PATH.endsWith("/") ? "" : "/"
-  PATH = path.normalize(PATH);
-  console.log(`[sync-assets] using PATH ${PATH}`);
-  if (!fs.existsSync(PATH)){
-    console.log(`${LOG_TAG} ${PATH} does not exist, creating`);
-    fs.mkdirSync(PATH, { recursive: true });
-  }
 }
 
 if (!PATH) {
@@ -37,12 +17,12 @@ if (!PATH) {
 try {
   const rawConfig = fs.readFileSync(CONFIG_FILE_NAME);
   configContent = JSON.parse(rawConfig);
-  console.log(`${LOG_TAG} ${CONFIG_FILE_NAME} file found, using provided config`);
+  console.log(`${CONFIG_FILE_NAME} file found, using provided config`);
 } catch (e) {
   if (e.code !== 'ENOENT') {
     throw new Error(e);
   } else {
-    console.log(`${LOG_TAG} ${CONFIG_FILE_NAME} file not found, using default config`);
+    console.log(`${CONFIG_FILE_NAME} file not found, using default config`);
   }
 }
 
@@ -57,11 +37,6 @@ function download(filename, url) {
   })
   .on('error', function(e) {
     throw new Error(e);
-  })
-  .on('finish', () => {
-    if (verbose) {
-      console.log(`${LOG_TAG} Finished downloading ${url} to ${filename}`);
-    }
   });
 }
 
@@ -69,18 +44,12 @@ function getLocalHash(filePath) {
   const size = fs.statSync(filePath);
   const buffer = fs.readFileSync(filePath);
   const bufferWithHeader = Buffer.concat([Buffer.from('blob '), Buffer.from(`${size.size}`), Buffer.from('\0'), buffer]);
-  const hash = crypto.createHash('sha1').update(bufferWithHeader).digest('hex');
-
-  if (verbose) {
-    console.log(`${LOG_TAG} \tgetLocalHash ${filePath} ${hash}`);
-  }
-
-  return hash;
+  return crypto.createHash('sha1').update(bufferWithHeader).digest('hex');
 }
 
 function downloadMiningPoolLogos$() {
   return new Promise((resolve, reject) => {
-    console.log(`${LOG_TAG} Checking if mining pool logos needs downloading or updating...`);
+    console.log('Checking if mining pool logos needs downloading or updating...');
     const options = {
       host: 'api.github.com',
       path: '/repos/mempool/mining-pool-logos/contents/',
@@ -89,7 +58,7 @@ function downloadMiningPoolLogos$() {
     };
 
     if (githubSecret) {
-      console.log(`${LOG_TAG} Downloading the mining pool logos with authentication`);
+      console.log('Downloading the mining pool logos with authentication');
       options.headers['authorization'] = `Bearer ${githubSecret}`;
       options.headers['X-GitHub-Api-Version'] = '2022-11-28';
     }
@@ -110,29 +79,21 @@ function downloadMiningPoolLogos$() {
           }
           let downloadedCount = 0;
           for (const poolLogo of poolLogos) {
-            const filePath = PATH + `mining-pools/${poolLogo.name}`;
+            const filePath = `${PATH}/mining-pools/${poolLogo.name}`;
             if (fs.existsSync(filePath)) {
               const localHash = getLocalHash(filePath);
-              if (verbose) {
-                console.log(`${LOG_TAG} Remote ${poolLogo.name} logo hash ${poolLogo.sha}`);
-                console.log(`${LOG_TAG} \tchecking if ${filePath} exists: ${fs.existsSync(filePath)}`);
-              }
               if (localHash !== poolLogo.sha) {
-                console.log(`${LOG_TAG} \t\t${poolLogo.name} is different on the remote, downloading...`);
+                console.log(`${poolLogo.name} is different on the remote, downloading...`);
                 download(filePath, poolLogo.download_url);
                 downloadedCount++;
               }
             } else {
-              console.log(`${LOG_TAG} ${poolLogo.name} is missing, downloading...`);
-              const miningPoolsDir = PATH + `mining-pools/`;
-              if (!fs.existsSync(miningPoolsDir)){
-                fs.mkdirSync(miningPoolsDir, { recursive: true });
-              }
+              console.log(`${poolLogo.name} is missing, downloading...`);
               download(filePath, poolLogo.download_url);
               downloadedCount++;
             }
           }
-          console.log(`${LOG_TAG} Downloaded ${downloadedCount} and skipped ${poolLogos.length - downloadedCount} existing mining pool logos`);
+          console.log(`Downloaded ${downloadedCount} and skipped ${poolLogos.length - downloadedCount} existing mining pool logos`);
           resolve();
         } catch (e) {
           reject(`Unable to download mining pool logos. Trying again at next restart. Reason: ${e instanceof Error ? e.message : e}`);
@@ -148,7 +109,7 @@ function downloadMiningPoolLogos$() {
 
 function downloadPromoVideoSubtiles$() {
   return new Promise((resolve, reject) => {
-    console.log(`${LOG_TAG} Checking if promo video subtitles needs downloading or updating...`);
+    console.log('Checking if promo video subtitles needs downloading or updating...');
     const options = {
       host: 'api.github.com',
       path: '/repos/mempool/mempool-promo/contents/subtitles',
@@ -157,7 +118,7 @@ function downloadPromoVideoSubtiles$() {
     };
 
     if (githubSecret) {
-      console.log(`${LOG_TAG} Downloading the promo video subtitles with authentication`);
+      console.log('Downloading the promo video subtitles with authentication');
       options.headers['authorization'] = `Bearer ${githubSecret}`;
       options.headers['X-GitHub-Api-Version'] = '2022-11-28';
     }
@@ -179,30 +140,21 @@ function downloadPromoVideoSubtiles$() {
           }
           let downloadedCount = 0;
           for (const language of videoLanguages) {
-            const filePath = PATH + `promo-video/${language.name}`;
+            const filePath = `${PATH}/promo-video/${language.name}`;
             if (fs.existsSync(filePath)) {
-              if (verbose) {
-                console.log(`${LOG_TAG} ${language.name} remote promo video hash ${language.sha}`);
-              }
               const localHash = getLocalHash(filePath);
-
               if (localHash !== language.sha) {
-                console.log(`${LOG_TAG} ${language.name} is different on the remote, updating`);
+                console.log(`${language.name} is different on the remote, updating`);
                 download(filePath, language.download_url);
                 downloadedCount++;
               }
             } else {
-              console.log(`${LOG_TAG} ${language.name} is missing, downloading`);
-              const promoVideosDir = PATH + `promo-video/`;
-              if (!fs.existsSync(promoVideosDir)){
-                fs.mkdirSync(promoVideosDir, { recursive: true });
-              }
-
+              console.log(`${language.name} is missing, downloading`);
               download(filePath, language.download_url);
               downloadedCount++;
             }
           }
-          console.log(`${LOG_TAG} Downloaded ${downloadedCount} and skipped ${videoLanguages.length - downloadedCount} existing video subtitles`);
+          console.log(`Downloaded ${downloadedCount} and skipped ${videoLanguages.length - downloadedCount} existing video subtitles`);
           resolve();
         } catch (e) {
           reject(`Unable to download video subtitles. Trying again at next restart. Reason: ${e instanceof Error ? e.message : e}`);
@@ -218,7 +170,7 @@ function downloadPromoVideoSubtiles$() {
 
 function downloadPromoVideo$() {
   return new Promise((resolve, reject) => {
-    console.log(`${LOG_TAG} Checking if promo video needs downloading or updating...`);
+    console.log('Checking if promo video needs downloading or updating...');
     const options = {
       host: 'api.github.com',
       path: '/repos/mempool/mempool-promo/contents',
@@ -227,7 +179,7 @@ function downloadPromoVideo$() {
     };
 
     if (githubSecret) {
-      console.log(`${LOG_TAG} Downloading the promo video with authentication`);
+      console.log('Downloading the promo videos with authentication');
       options.headers['authorization'] = `Bearer ${githubSecret}`;
       options.headers['X-GitHub-Api-Version'] = '2022-11-28';
     }
@@ -250,19 +202,18 @@ function downloadPromoVideo$() {
             if (item.name !== 'promo.mp4') {
               continue;
             }
-            const filePath = PATH + `promo-video/mempool-promo.mp4`;
+            const filePath = `${PATH}/promo-video/mempool-promo.mp4`;
             if (fs.existsSync(filePath)) {
               const localHash = getLocalHash(filePath);
-
               if (localHash !== item.sha) {
-                console.log(`${LOG_TAG} \tmempool-promo.mp4 is different on the remote, updating`);
+                console.log(`mempool-promo.mp4 is different on the remote, updating`);
                 download(filePath, item.download_url);
-                console.log(`${LOG_TAG} \tmempool-promo.mp4 downloaded.`);
+                console.log('mempool-promo.mp4 downloaded.');
               } else {
-                console.log(`${LOG_TAG} \tmempool-promo.mp4 is already up to date. Skipping.`);
+                console.log(`mempool-promo.mp4 is already up to date. Skipping.`);
               }
             } else {
-              console.log(`${LOG_TAG} \tmempool-promo.mp4 is missing, downloading`);
+              console.log(`mempool-promo.mp4 is missing, downloading`);
               download(filePath, item.download_url);
             }
           }
@@ -281,47 +232,30 @@ function downloadPromoVideo$() {
 }
 
 
+
+let assetsJsonUrl = 'https://raw.githubusercontent.com/mempool/asset_registry_db/master/index.json';
+let assetsMinimalJsonUrl = 'https://raw.githubusercontent.com/mempool/asset_registry_db/master/index.minimal.json';
+
 if (configContent.BASE_MODULE && configContent.BASE_MODULE === 'liquid') {
-  const assetsJsonUrl = 'https://raw.githubusercontent.com/Blockstream/asset_registry_db/master/index.json';
-  const assetsMinimalJsonUrl = 'https://raw.githubusercontent.com/Blockstream/asset_registry_db/master/index.minimal.json';
-  const testnetAssetsJsonUrl = 'https://raw.githubusercontent.com/Blockstream/asset_registry_testnet_db/master/index.json';
-  const testnetAssetsMinimalJsonUrl = 'https://raw.githubusercontent.com/Blockstream/asset_registry_testnet_db/master/index.minimal.json';
-
-  console.log(`${LOG_TAG} Downloading assets`);
-  download(PATH + 'assets.json', assetsJsonUrl);
-
-  console.log(`${LOG_TAG} Downloading assets minimal`);
-  download(PATH + 'assets.minimal.json', assetsMinimalJsonUrl);
-
-  console.log(`${LOG_TAG} Downloading testnet assets`);
-  download(PATH + 'assets-testnet.json', testnetAssetsJsonUrl);
-
-  console.log(`${LOG_TAG} Downloading testnet assets minimal`);
-  download(PATH + 'assets-testnet.minimal.json', testnetAssetsMinimalJsonUrl);
-} else {
-  if (verbose) {
-    console.log(`${LOG_TAG} BASE_MODULE is not set to Liquid (${configContent.BASE_MODULE}), skipping downloading assets`);
-  }
+  assetsJsonUrl = 'https://raw.githubusercontent.com/Blockstream/asset_registry_db/master/index.json';
+  assetsMinimalJsonUrl = 'https://raw.githubusercontent.com/Blockstream/asset_registry_db/master/index.minimal.json';
 }
 
-(() => {
-  if (verbose) {
-    console.log(`${LOG_TAG} Downloading mining pool logos`);
-  }
-  downloadMiningPoolLogos$()
-  .then(() => {
-    if (verbose) {
-      console.log(`${LOG_TAG} Downloading promo video subtitles`);
-    }
-    downloadPromoVideoSubtiles$();
-  })
-  .then(() => {
-    if (verbose) {
-      console.log(`${LOG_TAG} Downloading promo video`);
-    }
-    downloadPromoVideo$();
-  })
+const testnetAssetsJsonUrl = 'https://raw.githubusercontent.com/Blockstream/asset_registry_testnet_db/master/index.json';
+const testnetAssetsMinimalJsonUrl = 'https://raw.githubusercontent.com/Blockstream/asset_registry_testnet_db/master/index.minimal.json';
+
+console.log('Downloading assets');
+download(PATH + 'assets.json', assetsJsonUrl);
+console.log('Downloading assets minimal');
+download(PATH + 'assets.minimal.json', assetsMinimalJsonUrl);
+console.log('Downloading testnet assets');
+download(PATH + 'assets-testnet.json', testnetAssetsJsonUrl);
+console.log('Downloading testnet assets minimal');
+download(PATH + 'assets-testnet.minimal.json', testnetAssetsMinimalJsonUrl);
+
+downloadMiningPoolLogos$()
+  .then(() => downloadPromoVideoSubtiles$())
+  .then(() => downloadPromoVideo$())
   .catch((error) => {
     throw new Error(error);
   });
-})();

production/install

@@ -1046,8 +1046,8 @@ echo "[*] Installing nvm.sh from GitHub"
 osSudo "${MEMPOOL_USER}" sh -c 'curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | zsh'
 
 echo "[*] Building NodeJS v20.5.1 via nvm.sh"
-osSudo "${MEMPOOL_USER}" zsh -c 'source ~/.zshrc ; nvm install v20.7.0 --shared-zlib'
-osSudo "${MEMPOOL_USER}" zsh -c 'source ~/.zshrc ; nvm alias default 20.7.0'
+osSudo "${MEMPOOL_USER}" zsh -c 'source ~/.zshrc ; nvm install v20.5.1 --shared-zlib'
+osSudo "${MEMPOOL_USER}" zsh -c 'source ~/.zshrc ; nvm alias default 20.5.1'
 
 ####################
 # Tor installation #
@@ -1489,7 +1489,7 @@ EOF
             osSudo "${UNFURL_USER}" sh -c 'curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | zsh'
 
             echo "[*] Building NodeJS via nvm.sh"
-            osSudo "${UNFURL_USER}" zsh -c 'source ~/.zshrc ; nvm install v20.7.0 --shared-zlib'
+            osSudo "${UNFURL_USER}" zsh -c 'source ~/.zshrc ; nvm install v16.16.0 --shared-zlib'
 
         ;;
     esac
@@ -1660,15 +1660,15 @@ case $OS in
         crontab_bitcoin=()
         if [ "${BITCOIN_MAINNET_ENABLE}" = ON ];then
             echo "[*] Installing Electrs Mainnet Cronjob"
-            crontab_bitcoin+="@reboot sleep 30 ; screen -dmS mainnet /bitcoin/electrs/start mainnet\n"
+            crontab_bitcoin+="@reboot sleep 30 ; screen -dmS mainnet /bitcoin/electrs/electrs-start-mainnet\n"
         fi
         if [ "${BITCOIN_TESTNET_ENABLE}" = ON ];then
             echo "[*] Installing Electrs Testnet Cronjob"
-            crontab_bitcoin+="@reboot sleep 70 ; screen -dmS testnet /bitcoin/electrs/start testnet\n"
+            crontab_bitcoin+="@reboot sleep 70 ; screen -dmS testnet /bitcoin/electrs/electrs-start-testnet\n"
         fi
         if [ "${BITCOIN_SIGNET_ENABLE}" = ON ];then
             echo "[*] Installing Electrs Signet Cronjob"
-            crontab_bitcoin+="@reboot sleep 90 ; screen -dmS signet /bitcoin/electrs/start signet\n"
+            crontab_bitcoin+="@reboot sleep 90 ; screen -dmS signet /bitcoin/electrs/electrs-start-signet\n"
         fi
         if [ "${BITCOIN_MAINNET_ENABLE}" = ON -o "${BITCOIN_TESTNET_ENABLE}" = ON -o "${BITCOIN_SIGNET_ENABLE}" = ON ];then
             echo "${crontab_bitcoin}" | crontab -u "${BITCOIN_USER}" -

production/mempool-config.liquid.json

@@ -25,12 +25,6 @@
   "ESPLORA": {
     "UNIX_SOCKET_PATH": "/elements/socket/esplora-liquid-mainnet",
     "FALLBACK": [
-      "http://node201.va1.mempool.space:3001",
-      "http://node202.va1.mempool.space:3001",
-      "http://node203.va1.mempool.space:3001",
-      "http://node204.va1.mempool.space:3001",
-      "http://node205.va1.mempool.space:3001",
-      "http://node206.va1.mempool.space:3001",
       "http://node201.fmt.mempool.space:3001",
       "http://node202.fmt.mempool.space:3001",
       "http://node203.fmt.mempool.space:3001",

production/mempool-config.liquidtestnet.json

@@ -25,12 +25,6 @@
   "ESPLORA": {
     "UNIX_SOCKET_PATH": "/elements/socket/esplora-liquid-testnet",
     "FALLBACK": [
-      "http://node201.va1.mempool.space:3004",
-      "http://node202.va1.mempool.space:3004",
-      "http://node203.va1.mempool.space:3004",
-      "http://node204.va1.mempool.space:3004",
-      "http://node205.va1.mempool.space:3004",
-      "http://node206.va1.mempool.space:3004",
       "http://node201.fmt.mempool.space:3004",
       "http://node202.fmt.mempool.space:3004",
       "http://node203.fmt.mempool.space:3004",

production/mempool-config.mainnet-lightning.json

@@ -16,33 +16,8 @@
     "PASSWORD": "__BITCOIN_RPC_PASS__"
   },
   "ESPLORA": {
-    "UNIX_SOCKET_PATH": "/bitcoin/socket/esplora-bitcoin-mainnet",
-    "FALLBACK": [
-      "http://node201.va1.mempool.space:3000",
-      "http://node202.va1.mempool.space:3000",
-      "http://node203.va1.mempool.space:3000",
-      "http://node204.va1.mempool.space:3000",
-      "http://node205.va1.mempool.space:3000",
-      "http://node206.va1.mempool.space:3000",
-      "http://node201.fmt.mempool.space:3000",
-      "http://node202.fmt.mempool.space:3000",
-      "http://node203.fmt.mempool.space:3000",
-      "http://node204.fmt.mempool.space:3000",
-      "http://node205.fmt.mempool.space:3000",
-      "http://node206.fmt.mempool.space:3000",
-      "http://node201.fra.mempool.space:3000",
-      "http://node202.fra.mempool.space:3000",
-      "http://node203.fra.mempool.space:3000",
-      "http://node204.fra.mempool.space:3000",
-      "http://node205.fra.mempool.space:3000",
-      "http://node206.fra.mempool.space:3000",
-      "http://node201.tk7.mempool.space:3000",
-      "http://node202.tk7.mempool.space:3000",
-      "http://node203.tk7.mempool.space:3000",
-      "http://node204.tk7.mempool.space:3000",
-      "http://node205.tk7.mempool.space:3000",
-      "http://node206.tk7.mempool.space:3000"
-    ]
+    "REST_API_URL": "http://127.0.0.1:5000",
+    "UNIX_SOCKET_PATH": "/bitcoin/socket/esplora-bitcoin-mainnet"
   },
   "LIGHTNING": {
     "ENABLED": true,

production/mempool-config.mainnet.json

@@ -37,12 +37,6 @@
   "ESPLORA": {
     "UNIX_SOCKET_PATH": "/bitcoin/socket/esplora-bitcoin-mainnet",
     "FALLBACK": [
-      "http://node201.va1.mempool.space:3000",
-      "http://node202.va1.mempool.space:3000",
-      "http://node203.va1.mempool.space:3000",
-      "http://node204.va1.mempool.space:3000",
-      "http://node205.va1.mempool.space:3000",
-      "http://node206.va1.mempool.space:3000",
       "http://node201.fmt.mempool.space:3000",
       "http://node202.fmt.mempool.space:3000",
       "http://node203.fmt.mempool.space:3000",
@@ -80,12 +74,6 @@
     "AUDIT": true,
     "AUDIT_START_HEIGHT": 774000,
     "SERVERS": [
-      "node201.va1.mempool.space",
-      "node202.va1.mempool.space",
-      "node203.va1.mempool.space",
-      "node204.va1.mempool.space",
-      "node205.va1.mempool.space",
-      "node206.va1.mempool.space",
       "node201.fmt.mempool.space",
       "node202.fmt.mempool.space",
       "node203.fmt.mempool.space",

production/mempool-config.signet-lightning.json

@@ -16,33 +16,8 @@
     "PASSWORD": "__BITCOIN_RPC_PASS__"
   },
   "ESPLORA": {
-    "UNIX_SOCKET_PATH": "/bitcoin/socket/esplora-bitcoin-signet",
-    "FALLBACK": [
-      "http://node201.va1.mempool.space:3003",
-      "http://node202.va1.mempool.space:3003",
-      "http://node203.va1.mempool.space:3003",
-      "http://node204.va1.mempool.space:3003",
-      "http://node205.va1.mempool.space:3003",
-      "http://node206.va1.mempool.space:3003",
-      "http://node201.fmt.mempool.space:3003",
-      "http://node202.fmt.mempool.space:3003",
-      "http://node203.fmt.mempool.space:3003",
-      "http://node204.fmt.mempool.space:3003",
-      "http://node205.fmt.mempool.space:3003",
-      "http://node206.fmt.mempool.space:3003",
-      "http://node201.fra.mempool.space:3003",
-      "http://node202.fra.mempool.space:3003",
-      "http://node203.fra.mempool.space:3003",
-      "http://node204.fra.mempool.space:3003",
-      "http://node205.fra.mempool.space:3003",
-      "http://node206.fra.mempool.space:3003",
-      "http://node201.tk7.mempool.space:3003",
-      "http://node202.tk7.mempool.space:3003",
-      "http://node203.tk7.mempool.space:3003",
-      "http://node204.tk7.mempool.space:3003",
-      "http://node205.tk7.mempool.space:3003",
-      "http://node206.tk7.mempool.space:3003"
-    ]
+    "REST_API_URL": "http://127.0.0.1:5003",
+    "UNIX_SOCKET_PATH": "/bitcoin/socket/esplora-bitcoin-signet"
   },
   "LIGHTNING": {
     "ENABLED": true,

production/mempool-config.signet.json

@@ -27,12 +27,6 @@
   "ESPLORA": {
     "UNIX_SOCKET_PATH": "/bitcoin/socket/esplora-bitcoin-signet",
     "FALLBACK": [
-      "http://node201.va1.mempool.space:3003",
-      "http://node202.va1.mempool.space:3003",
-      "http://node203.va1.mempool.space:3003",
-      "http://node204.va1.mempool.space:3003",
-      "http://node205.va1.mempool.space:3003",
-      "http://node206.va1.mempool.space:3003",
       "http://node201.fmt.mempool.space:3003",
       "http://node202.fmt.mempool.space:3003",
       "http://node203.fmt.mempool.space:3003",

production/mempool-config.testnet-lightning.json

@@ -16,33 +16,8 @@
     "PASSWORD": "__BITCOIN_RPC_PASS__"
   },
   "ESPLORA": {
-    "UNIX_SOCKET_PATH": "/bitcoin/socket/esplora-bitcoin-testnet",
-    "FALLBACK": [
-      "http://node201.va1.mempool.space:3002",
-      "http://node202.va1.mempool.space:3002",
-      "http://node203.va1.mempool.space:3002",
-      "http://node204.va1.mempool.space:3002",
-      "http://node205.va1.mempool.space:3002",
-      "http://node206.va1.mempool.space:3002",
-      "http://node201.fmt.mempool.space:3002",
-      "http://node202.fmt.mempool.space:3002",
-      "http://node203.fmt.mempool.space:3002",
-      "http://node204.fmt.mempool.space:3002",
-      "http://node205.fmt.mempool.space:3002",
-      "http://node206.fmt.mempool.space:3002",
-      "http://node201.fra.mempool.space:3002",
-      "http://node202.fra.mempool.space:3002",
-      "http://node203.fra.mempool.space:3002",
-      "http://node204.fra.mempool.space:3002",
-      "http://node205.fra.mempool.space:3002",
-      "http://node206.fra.mempool.space:3002",
-      "http://node201.tk7.mempool.space:3002",
-      "http://node202.tk7.mempool.space:3002",
-      "http://node203.tk7.mempool.space:3002",
-      "http://node204.tk7.mempool.space:3002",
-      "http://node205.tk7.mempool.space:3002",
-      "http://node206.tk7.mempool.space:3002"
-    ]
+    "REST_API_URL": "http://127.0.0.1:5002",
+    "UNIX_SOCKET_PATH": "/bitcoin/socket/esplora-bitcoin-testnet"
   },
   "LIGHTNING": {
     "ENABLED": true,

production/mempool-config.testnet.json

@@ -27,12 +27,6 @@
   "ESPLORA": {
     "UNIX_SOCKET_PATH": "/bitcoin/socket/esplora-bitcoin-testnet",
     "FALLBACK": [
-      "http://node201.va1.mempool.space:3002",
-      "http://node202.va1.mempool.space:3002",
-      "http://node203.va1.mempool.space:3002",
-      "http://node204.va1.mempool.space:3002",
-      "http://node205.va1.mempool.space:3002",
-      "http://node206.va1.mempool.space:3002",
       "http://node201.fmt.mempool.space:3002",
       "http://node202.fmt.mempool.space:3002",
       "http://node203.fmt.mempool.space:3002",

production/mempool-start-all

@@ -1,7 +1,7 @@
 #!/usr/bin/env zsh
 export NVM_DIR="$HOME/.nvm"
 source "$NVM_DIR/nvm.sh"
-nvm use v20.7.0
+nvm use v20.5.1
 
 # start all mempool backends that exist
 for site in mainnet mainnet-lightning testnet testnet-lightning signet signet-lightning bisq liquid liquidtestnet;do

production/nginx/http-proxy-cache.conf

@@ -5,4 +5,3 @@ proxy_cache_path /var/cache/nginx/slurper keys_zone=slurper:20m levels=1:2 inact
 proxy_cache_path /var/cache/nginx/services keys_zone=services:20m levels=1:2 inactive=365d max_size=100m;
 proxy_cache_path /var/cache/nginx/markets keys_zone=markets:20m levels=1:2 inactive=365d max_size=100m;
 types_hash_max_size 4096;
-proxy_buffer_size 8k;

scripts/get_backend_hash.sh

@@ -1,7 +0,0 @@
-for LOCATION in fmt va1 fra tk7
-do
-  for NODE in 201 202 203 204 205 206
-  do
-    echo $(curl -sk https://node$NODE.$LOCATION.mempool.space/api/v1/backend-info)
-  done
-done