Automated database creation and migration

fixes #1002

.github/ISSUE_TEMPLATE.md

@@ -1,14 +1,7 @@
----
-name: 🐛 Bug Report
-about: Report bugs or other issues to us on GitHub
----
-
 <!--
-   SUPPORT REQUESTS:
-   This is for reporting bugs in Mempool, not for support requests. 
-   If you have a support request, please join our Keybase or Matrix:
+   SUPPORT REQUESTS: This is for reporting bugs in Mempool.
+   If you have a support request, please join our Keybase group:
    https://keybase.io/team/mempool
-   https://matrix.to/#/#mempool:bitcoin.kyoto
 -->
 
 ### Description
@@ -21,11 +14,11 @@ about: Report bugs or other issues to us on GitHub
 
 ### Steps to reproduce
 
-<!-- if you can reliably reproduce the bug, list the steps here -->
+<!--if you can reliably reproduce the bug, list the steps here  -->
 
 ### Expected behaviour
 
-<!-- description of the expected behavior -->
+<!--description of the expected behavior -->
 
 ### Actual behaviour
 
@@ -33,7 +26,7 @@ about: Report bugs or other issues to us on GitHub
 
 ### Screenshots
 
-<!-- Screenshots if gui related, drag and drop to add to the issue -->
+<!--Screenshots if gui related, drag and drop to add to the issue -->
 
 #### Device or machine
 

.github/ISSUE_TEMPLATE/30-feature-request.md

@@ -1,28 +0,0 @@
----
-name: ✨ Feature Request
-about: Request a feature or suggest other enhancements 💡
----
-
-<!--
-   SUPPORT REQUESTS:
-   This is for requesting features in Mempool, not for support requests. 
-   If you have a support request, please join our Keybase or Matrix:
-   https://keybase.io/team/mempool
-   https://matrix.to/#/#mempool:bitcoin.kyoto
--->
-
-### Description
-
-<!-- brief description of the feature request -->
-
-### Problem to be solved
-
-<!-- description of the the problem you're having -->
-
-### Proposed solution
-
-<!-- explain how you think we should solve the problem -->
-
-#### Additional info
-
-<!-- Additional information useful for implementing (e.g. docs, links, etc.) -->

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: 💬 Need help? Chat with us on Matrix
-    url: https://matrix.to/#/#mempool:bitcoin.kyoto
-    about: For support requests or general questions
-  - name: 💬 Need help? Chat with us on Keybase
-    url: https://keybase.io/team/mempool
-    about: For support requests or general questions

GNUmakefile

@@ -25,7 +25,8 @@ help:
 .PHONY: init
 init:
 	@echo ''
-	mkdir -p   $(DATA) $(DATA)/mysql $(DATA)/mysql/data 
+	mkdir -p   $(DATA) $(DATA)/mysql $(DATA)/mysql/db-scripts $(DATA)/mysql/data 
+	install -v mariadb-structure.sql $(DATA)/mysql/db-scripts
 	#REF: https://github.com/mempool/mempool/blob/master/docker/README.md
 	cat docker/docker-compose.yml > docker-compose.yml
 	cat backend/mempool-config.sample.json > backend/mempool-config.json

README.md

@@ -14,238 +14,6 @@ Mempool can be self-hosted on a wide variety of your own hardware, ranging from
 4) [Production installation on a powerful FreeBSD server](https://github.com/mempool/mempool/tree/master/production)
 5) [High Availability cluster using powerful FreeBSD servers](https://github.com/mempool/mempool/tree/master/production#high-availability)
 
-# Docker Installation
-
-The `docker` directory contains the Dockerfiles used to build and release the official images and a `docker-compose.yml` file that is intended for end users to run a Mempool instance with minimal effort.
-
-## bitcoind only configuration
-
-To run an instance with the default settings, use the following command:
-
-```bash
-$ docker-compose up
-```
-
-The default configuration will allow you to run Mempool using `bitcoind` as the backend, so address lookups will be disabled. It assumes you have added RPC credentials for the `mempool` user with a `mempool` password in your `bitcoin.conf` file:
-
-```
-rpcuser=mempool
-rpcpassword=mempool
-```
-
-If you want to use your current credentials, update them in the `docker-compose.yml` file:
-
-```
-  api:
-    environment:
-      MEMPOOL_BACKEND: "none"
-      RPC_HOST: "172.27.0.1"
-      RPC_PORT: "8332"
-      RPC_USER: "mempool"
-      RPC_PASS: "mempool"
-```
-
-Note: the IP in the example above refers to Docker's default gateway IP address so the container can hit the `bitcoind` instance running on the host machine. If your setup is different, update it accordingly.
-
-You can check if the instance is running by visiting http://localhost - the graphs will be populated as new transactions are detected.
-
-## bitcoind+electrum configuration
-
-In order to run with a `electrum` compatible server as the backend, in addition to the settings required for running with `bitcoind` above, you will need to make the following changes to the `docker-compose.yml` file:
-
-- Under the `api` service, change the value of the `MEMPOOL_BACKEND` key from `none` to `electrum`:
-
-```
-  api:
-    environment:
-      MEMPOOL_BACKEND: "none"
-```
-
-- Under the `api` service, set the `ELECTRUM_HOST` and `ELECTRUM_PORT` keys to your Docker host IP address and set `ELECTRUM_TLS_ENABLED` to `false`:
-
-```
-  api:
-    environment:
-      ELECTRUM_HOST: "172.27.0.1"
-      ELECTRUM_PORT: "50002"
-      ELECTRUM_TLS_ENABLED: "false"
-```
-
-You can update any of the backend settings in the `mempool-config.json` file using the following environment variables to override them under the same `api` `environment` section.
-
-JSON:
-```
-  "MEMPOOL": {
-    "NETWORK": "mainnet",
-    "BACKEND": "electrum",
-    "HTTP_PORT": 8999,
-    "SPAWN_CLUSTER_PROCS": 0,
-    "API_URL_PREFIX": "/api/v1/",
-    "POLL_RATE_MS": 2000,
-    "CACHE_DIR": "./cache",
-    "CLEAR_PROTECTION_MINUTES": 20,
-    "RECOMMENDED_FEE_PERCENTILE": 50,
-    "BLOCK_WEIGHT_UNITS": 4000000,
-    "INITIAL_BLOCKS_AMOUNT": 8,
-    "MEMPOOL_BLOCKS_AMOUNT": 8,
-    "PRICE_FEED_UPDATE_INTERVAL": 3600,
-    "USE_SECOND_NODE_FOR_MINFEE": false,
-    "EXTERNAL_ASSETS": []
-  },
-```
-
-docker-compose overrides::
-```
-      MEMPOOL_NETWORK: ""
-      MEMPOOL_BACKEND: ""
-      MEMPOOL_HTTP_PORT: ""
-      MEMPOOL_SPAWN_CLUSTER_PROCS: ""
-      MEMPOOL_API_URL_PREFIX: ""
-      MEMPOOL_POLL_RATE_MS: ""
-      MEMPOOL_CACHE_DIR: ""
-      MEMPOOL_CLEAR_PROTECTION_MINUTES: ""
-      MEMPOOL_RECOMMENDED_FEE_PERCENTILE: ""
-      MEMPOOL_BLOCK_WEIGHT_UNITS: ""
-      MEMPOOL_INITIAL_BLOCKS_AMOUNT: ""
-      MEMPOOL_MEMPOOL_BLOCKS_AMOUNT: ""
-      MEMPOOL_PRICE_FEED_UPDATE_INTERVAL: ""
-      MEMPOOL_USE_SECOND_NODE_FOR_MINFEE: ""
-      MEMPOOL_EXTERNAL_ASSETS: ""
-```
-
-JSON:
-```
-"CORE_RPC": {
-    "HOST": "127.0.0.1",
-    "PORT": 8332,
-    "USERNAME": "mempool",
-    "PASSWORD": "mempool"
-  },
-```
-docker-compose overrides:
-```
-      CORE_RPC_HOST: ""
-      CORE_RPC_PORT: ""
-      CORE_RPC_USERNAME: ""
-      CORE_RPC_PASSWORD: ""
-```
-
-JSON:
-```
-  "ELECTRUM": {
-    "HOST": "127.0.0.1",
-    "PORT": 50002,
-    "TLS_ENABLED": true
-  },
-```
-
-docker-compose overrides:
-```
-      ELECTRUM_HOST: ""
-      ELECTRUM_PORT: ""
-      ELECTRUM_TLS: ""
-```
-
-JSON:
-```
-  "ESPLORA": {
-    "REST_API_URL": "http://127.0.0.1:3000"
-  },
-```
-docker-compose overrides:
-```
-      ESPLORA_REST_API_URL: ""
-```
-
-JSON:
-```
-  "SECOND_CORE_RPC": {
-    "HOST": "127.0.0.1",
-    "PORT": 8332,
-    "USERNAME": "mempool",
-    "PASSWORD": "mempool"
-  },
-```
-
-docker-compose overrides:
-```
-      SECOND_CORE_RPC_HOST: ""
-      SECOND_CORE_RPC_PORT: ""
-      SECOND_CORE_RPC_USERNAME: ""
-      SECOND_CORE_RPC_PASSWORD: ""
-```
-
-JSON:
-```
-  "DATABASE": {
-    "ENABLED": true,
-    "HOST": "127.0.0.1",
-    "PORT": 3306,
-    "DATABASE": "mempool",
-    "USERNAME": "mempool",
-    "PASSWORD": "mempool"
-  },
-```
-
-docker-compose overrides:
-```
-      DATABASE_ENABLED: ""
-      DATABASE_HOST: ""
-      DATABASE_PORT: ""
-      DATABASE_DATABASE: ""
-      DATABASE_USERAME: ""
-      DATABASE_PASSWORD: ""
-```
-
-JSON:
-```
-  "SYSLOG": {
-    "ENABLED": true,
-    "HOST": "127.0.0.1",
-    "PORT": 514,
-    "MIN_PRIORITY": "info",
-    "FACILITY": "local7"
-  },
-```
-
-docker-compose overrides:
-```
-      SYSLOG_ENABLED: ""
-      SYSLOG_HOST: ""
-      SYSLOG_PORT: ""
-      SYSLOG_MIN_PRIORITY: ""
-      SYSLOG_FACILITY: ""
-```
-
-JSON:
-```
-  "STATISTICS": {
-    "ENABLED": true,
-    "TX_PER_SECOND_SAMPLE_PERIOD": 150
-  },
-```
-
-docker-compose overrides:
-```
-      STATISTICS_ENABLED: ""
-      STATISTICS_TX_PER_SECOND_SAMPLE_PERIOD: ""
-```
-
-JSON:
-```
-  "BISQ": {
-    "ENABLED": false,
-    "DATA_PATH": "/bisq/statsnode-data/btc_mainnet/db"
-  }
-```
-
-docker-compose overrides:
-```
-      BISQ_ENABLED: ""
-      BISQ_DATA_PATH: ""
-```
-
-
 # Manual Installation
 
 The following instructions are for a manual installation on Linux or FreeBSD. The file and directory paths may need to be changed to match your OS.
@@ -301,6 +69,11 @@ Create database and grant privileges:
   Query OK, 0 rows affected (0.00 sec)
 ```
 
+From the mempool repo's top-level folder, import the database structure:
+```bash
+  mysql -u mempool -p mempool < mariadb-structure.sql
+```
+
 ## Mempool Backend
 Install mempool dependencies from npm and build the backend:
 
@@ -390,7 +163,7 @@ Install mempool dependencies from npm and build the frontend static HTML/CSS/JS:
 Install the output into nginx webroot folder:
 
 ```bash
-  sudo rsync -av --delete dist/ /var/www/
+  sudo rsync -av --delete dist/mempool/ /var/www/
 ```
 
 ## nginx + certbot

backend/.gitignore

@@ -1,10 +1,7 @@
 # See http://help.github.com/ignore-files/ for more about ignoring files.
 
-# production config and external assets
-*.json
-!mempool-config.sample.json
-
-icons.json
+# production config
+mempool-config.json
 
 # compiled output
 /dist

backend/mempool-config.sample.json

@@ -13,8 +13,7 @@
     "INITIAL_BLOCKS_AMOUNT": 8,
     "MEMPOOL_BLOCKS_AMOUNT": 8,
     "PRICE_FEED_UPDATE_INTERVAL": 3600,
-    "USE_SECOND_NODE_FOR_MINFEE": false,
-    "EXTERNAL_ASSETS": []
+    "USE_SECOND_NODE_FOR_MINFEE": false
   },
   "CORE_RPC": {
     "HOST": "127.0.0.1",

backend/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "mempool-backend",
-  "version": "2.3.0",
+  "version": "2.3.0-dev",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "mempool-backend",
-      "version": "2.3.0",
+      "version": "2.3.0-dev",
       "license": "GNU Affero General Public License v3.0",
       "dependencies": {
         "@mempool/bitcoin": "^3.0.3",
@@ -577,9 +577,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.14.7",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz",
-      "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==",
+      "version": "1.14.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz",
+      "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==",
       "funding": [
         {
           "type": "individual",
@@ -1877,9 +1877,9 @@
       }
     },
     "follow-redirects": {
-      "version": "1.14.7",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz",
-      "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ=="
+      "version": "1.14.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz",
+      "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A=="
     },
     "forwarded": {
       "version": "0.1.2",

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mempool-backend",
-  "version": "2.3.0",
+  "version": "2.3.0-dev",
   "description": "Bitcoin mempool visualizer and blockchain explorer backend",
   "license": "GNU Affero General Public License v3.0",
   "homepage": "https://mempool.space",

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

@@ -12,7 +12,6 @@ export interface AbstractBitcoinApi {
   $getAddressTransactions(address: string, lastSeenTxId: string): Promise<IEsploraApi.Transaction[]>;
   $getAddressPrefix(prefix: string): string[];
   $sendRawTransaction(rawTransaction: string): Promise<string>;
-  $getOutspends(txId: string): Promise<IEsploraApi.Outspend[]>;
 }
 export interface BitcoinRpcCredentials {
   host: string;

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

@@ -102,18 +102,6 @@ class BitcoinApi implements AbstractBitcoinApi {
     return this.bitcoindClient.sendRawTransaction(rawTransaction);
   }
 
-  async $getOutspends(txId: string): Promise<IEsploraApi.Outspend[]> {
-    const outSpends: IEsploraApi.Outspend[] = [];
-    const tx = await this.$getRawTransaction(txId, true, false);
-    for (let i = 0; i < tx.vout.length; i++) {
-      const txOut = await this.bitcoindClient.getTxOut(txId, i);
-      outSpends.push({
-        spent: txOut === null,
-      });
-    }
-    return outSpends;
-  }
-
   protected async $convertTransaction(transaction: IBitcoinApi.Transaction, addPrevout: boolean): Promise<IEsploraApi.Transaction> {
     let esploraTransaction: IEsploraApi.Transaction = {
       txid: transaction.txid,

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

@@ -113,9 +113,9 @@ export namespace IEsploraApi {
 
   export interface Outspend {
     spent: boolean;
-    txid?: string;
-    vin?: number;
-    status?: Status;
+    txid: string;
+    vin: number;
+    status: Status;
   }
 
   export interface Asset {

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

@@ -60,10 +60,6 @@ class ElectrsApi implements AbstractBitcoinApi {
   $sendRawTransaction(rawTransaction: string): Promise<string> {
     throw new Error('Method not implemented.');
   }
-
-  $getOutspends(): Promise<IEsploraApi.Outspend[]> {
-    throw new Error('Method not implemented.');
-  }
 }
 
 export default ElectrsApi;

backend/src/api/common.ts

@@ -1,14 +1,7 @@
 import { CpfpInfo, TransactionExtended, TransactionStripped } from '../mempool.interfaces';
 import config from '../config';
 export class Common {
-  static nativeAssetId = config.MEMPOOL.NETWORK === 'liquidtestnet' ?
-    '144c654344aa716d6f3abcc1ca90e5641e4e2a7f633bc09fe3baf64585819a49'
-  : '6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d';
-  static _isLiquid = config.MEMPOOL.NETWORK === 'liquid' || config.MEMPOOL.NETWORK === 'liquidtestnet';
-
-  static isLiquid(): boolean {
-    return this._isLiquid;
-  }
+  static nativeAssetId = '6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d';
 
   static median(numbers: number[]) {
     let medianNr = 0;
@@ -114,7 +107,7 @@ export class Common {
       totalFees += tx.bestDescendant.fee;
     }
 
-    tx.effectiveFeePerVsize = Math.max(Common.isLiquid() ? 0.1 : 1, totalFees / (totalWeight / 4));
+    tx.effectiveFeePerVsize = Math.max(config.MEMPOOL.NETWORK === 'liquid' ? 0.1 : 1, totalFees / (totalWeight / 4));
     tx.cpfpChecked = true;
 
     return {

backend/src/api/database-migration.ts

@@ -1,144 +1,62 @@
-import { PoolConnection } from 'mysql2/promise';
 import config from '../config';
 import { DB } from '../database';
 import logger from '../logger';
 
-const sleep = (ms: number) => new Promise( res => setTimeout(res, ms));
-
 class DatabaseMigration {
-  private static currentVersion = 2;
+  private static currentVersion = 1;
   private queryTimeout = 120000;
-  private statisticsAddedIndexed = false;
 
   constructor() { }
-  /**
-   * Entry point
-   */
+
   public async $initializeOrMigrateDatabase(): Promise<void> {
-    logger.info('MIGRATIONS: Running migrations');
-
-    await this.$printDatabaseVersion();
-
-    // First of all, if the `state` database does not exist, create it so we can track migration version
-    if (!await this.$checkIfTableExists('state')) {
-      logger.info('MIGRATIONS: `state` table does not exist. Creating it.');
-      try {
-        await this.$createMigrationStateTable();
-      } catch (e) {
-        logger.err('MIGRATIONS: Unable to create `state` table, aborting in 10 seconds. ' + e);
-        await sleep(10000);
-        process.exit(-1);
-      }
-      logger.info('MIGRATIONS: `state` table initialized.');
+    if (!await this.$checkIfTableExists('statistics')) {
+      await this.$initializeDatabaseTables();
     }
 
-    let databaseSchemaVersion = 0;
-    try {
-      databaseSchemaVersion = await this.$getSchemaVersionFromDatabase();
-    } catch (e) {
-      logger.err('MIGRATIONS: Unable to get current database migration version, aborting in 10 seconds. ' + e);
-      await sleep(10000);
-      process.exit(-1);
-    }
-
-    logger.info('MIGRATIONS: Current state.schema_version ' + databaseSchemaVersion);
-    logger.info('MIGRATIONS: Latest DatabaseMigration.version is ' + DatabaseMigration.currentVersion);
-    if (databaseSchemaVersion >= DatabaseMigration.currentVersion) {
-      logger.info('MIGRATIONS: Nothing to do.');
-      return;
-    }
-
-    // Now, create missing tables. Those queries cannot be wrapped into a transaction unfortunately
-    try {
-      await this.$createMissingTablesAndIndexes(databaseSchemaVersion);
-    } catch (e) {
-      logger.err('MIGRATIONS: Unable to create required tables, aborting in 10 seconds. ' + e);
-      await sleep(10000);
-      process.exit(-1);
-    }
-
-    if (DatabaseMigration.currentVersion > databaseSchemaVersion) {
-      logger.info('MIGRATIONS: Upgrading datababse schema');
-      try {
+    if (await this.$checkIfTableExists('state')) {
+      const databaseSchemaVersion = await this.$getSchemaVersionFromDatabase();
+      if (DatabaseMigration.currentVersion > databaseSchemaVersion) {
         await this.$migrateTableSchemaFromVersion(databaseSchemaVersion);
-        logger.info(`MIGRATIONS: OK. Database schema have been migrated from version ${databaseSchemaVersion} to ${DatabaseMigration.currentVersion} (latest version)`);
-      } catch (e) {
-        logger.err('MIGRATIONS: Unable to migrate database, aborting. ' + e);
       }
-    }
-
-    return;
-  }
-
-  /**
-   * Create all missing tables
-   */
-  private async $createMissingTablesAndIndexes(databaseSchemaVersion: number) {
-    await this.$setStatisticsAddedIndexedFlag(databaseSchemaVersion);
-
-    const connection = await DB.pool.getConnection();
-    try {
-      await this.$executeQuery(connection, this.getCreateElementsTableQuery(), await this.$checkIfTableExists('elements_pegs'));
-      await this.$executeQuery(connection, this.getCreateStatisticsQuery(), await this.$checkIfTableExists('statistics'));
-      if (databaseSchemaVersion < 2 && this.statisticsAddedIndexed === false) {
-        await this.$executeQuery(connection, `CREATE INDEX added ON statistics (added);`);
-      }
-      connection.release();
-    } catch (e) {
-      connection.release();
-      throw e;
+    } else {
+      await this.$migrateTableSchemaFromVersion(0);
     }
   }
 
-  /**
-   * Special case here for the `statistics` table - It appeared that somehow some dbs already had the `added` field indexed
-   * while it does not appear in previous schemas. The mariadb command "CREATE INDEX IF NOT EXISTS" is not supported on
-   * older mariadb version. Therefore we set a flag here in order to know if the index needs to be created or not before
-   * running the migration process
-   */
-  private async $setStatisticsAddedIndexedFlag(databaseSchemaVersion: number) {
-    if (databaseSchemaVersion >= 2) {
-      this.statisticsAddedIndexed = true;
-      return;
-    }
-
+  private async $initializeDatabaseTables(): Promise<void> {
     const connection = await DB.pool.getConnection();
-
-    try {
-      // We don't use "CREATE INDEX IF NOT EXISTS" because it is not supported on old mariadb version 5.X
-      const query = `SELECT COUNT(1) hasIndex FROM INFORMATION_SCHEMA.STATISTICS
-        WHERE table_schema=DATABASE() AND table_name='statistics' AND index_name='added';`;
-      const [rows] = await this.$executeQuery(connection, query, true);
-      if (rows[0].hasIndex === 0) {
-        logger.info('MIGRATIONS: `statistics.added` is not indexed');
-        this.statisticsAddedIndexed = false;
-      } else if (rows[0].hasIndex === 1) {
-        logger.info('MIGRATIONS: `statistics.added` is already indexed');
-        this.statisticsAddedIndexed = true;
-      }
-    } catch (e) {
-      // Should really never happen but just in case it fails, we just don't execute
-      // any query related to this indexing so it won't fail if the index actually already exists
-      logger.err('MIGRATIONS: Unable to check if `statistics.added` INDEX exist or not.');
-      this.statisticsAddedIndexed = true;
+    for (const query of this.getInitializeTableQueries()) {
+      await connection.query<any>({ sql: query, timeout: this.queryTimeout });
     }
+    connection.release();
+    logger.info(`Initial database tables have been created`);
+  }
 
+  private async $migrateTableSchemaFromVersion(version: number): Promise<void> {
+    const connection = await DB.pool.getConnection();
+    for (const query of this.getMigrationQueriesFromVersion(version)) {
+      await connection.query<any>({ sql: query, timeout: this.queryTimeout });
+    }
+    connection.release();
+    await this.$updateToLatestSchemaVersion();
+    logger.info(`Database schema have been migrated from version ${version} to ${DatabaseMigration.currentVersion} (latest version)`);
+  }
+
+  private async $getSchemaVersionFromDatabase(): Promise<number> {
+    const connection = await DB.pool.getConnection();
+    const query = `SELECT number FROM state WHERE name = 'schema_version';`;
+    const [rows] = await connection.query<any>({ sql: query, timeout: this.queryTimeout });
+    connection.release();
+    return rows[0]['number'];
+  }
+
+  private async $updateToLatestSchemaVersion(): Promise<void> {
+    const connection = await DB.pool.getConnection();
+    const query = `UPDATE state SET number = ${DatabaseMigration.currentVersion} WHERE name = 'schema_version'`;
+    const [rows] = await connection.query<any>({ sql: query, timeout: this.queryTimeout });
     connection.release();
   }
 
-  /**
-   * Small query execution wrapper to log all executed queries
-   */
-  private async $executeQuery(connection: PoolConnection, query: string, silent: boolean = false): Promise<any> {
-    if (!silent) {
-      logger.info('MIGRATIONS: Execute query:\n' + query);
-    }
-    return connection.query<any>({ sql: query, timeout: this.queryTimeout });
-  }
-
-  /**
-   * Check if 'table' exists in the database
-   */
   private async $checkIfTableExists(table: string): Promise<boolean> {
     const connection = await DB.pool.getConnection();
     const query = `SELECT COUNT(*) FROM information_schema.tables WHERE table_schema = '${config.DATABASE.DATABASE}' AND TABLE_NAME = '${table}'`;
@@ -147,132 +65,11 @@ class DatabaseMigration {
     return rows[0]['COUNT(*)'] === 1;
   }
 
-  /**
-   * Get current database version
-   */
-  private async $getSchemaVersionFromDatabase(): Promise<number> {
-    const connection = await DB.pool.getConnection();
-    const query = `SELECT number FROM state WHERE name = 'schema_version';`;
-    const [rows] = await this.$executeQuery(connection, query, true);
-    connection.release();
-    return rows[0]['number'];
-  }
-
-  /**
-   * Create the `state` table
-   */
-  private async $createMigrationStateTable(): Promise<void> {
-    const connection = await DB.pool.getConnection();
-
-    try {
-      const query = `CREATE TABLE IF NOT EXISTS state (
-        name varchar(25) NOT NULL,
-        number int(11) NULL,
-        string varchar(100) NULL,
-        CONSTRAINT name_unique UNIQUE (name)
-      ) ENGINE=InnoDB DEFAULT CHARSET=utf8;`;
-      await this.$executeQuery(connection, query);
-
-      // Set initial values
-      await this.$executeQuery(connection, `INSERT INTO state VALUES('schema_version', 0, NULL);`);
-      await this.$executeQuery(connection, `INSERT INTO state VALUES('last_elements_block', 0, NULL);`);
-
-      connection.release();
-    } catch (e) {
-      connection.release();
-      throw e;
-    }
-  }
-
-  /**
-   * We actually execute the migrations queries here
-   */
-  private async $migrateTableSchemaFromVersion(version: number): Promise<void> {
-    const transactionQueries: string[] = [];
-    for (const query of this.getMigrationQueriesFromVersion(version)) {
-      transactionQueries.push(query);
-    }
-    transactionQueries.push(this.getUpdateToLatestSchemaVersionQuery());
-
-    const connection = await DB.pool.getConnection();
-    try {
-      await this.$executeQuery(connection, 'START TRANSACTION;');
-      await this.$executeQuery(connection, 'SET autocommit = 0;');
-      for (const query of transactionQueries) {
-        await this.$executeQuery(connection, query);
-      }
-      await this.$executeQuery(connection, 'COMMIT;');
-
-      connection.release();
-    } catch (e) {
-      await this.$executeQuery(connection, 'ROLLBACK;');
-      connection.release();
-      throw e;
-    }
-  }
-
-  /**
-   * Generate migration queries based on schema version
-   */
-  private getMigrationQueriesFromVersion(version: number): string[] {
+  private getInitializeTableQueries(): string[] {
     const queries: string[] = [];
 
-    if (version < 1) {
-      if (config.MEMPOOL.NETWORK !== 'liquid' && config.MEMPOOL.NETWORK !== 'liquidtestnet') {
-        queries.push(this.getShiftStatisticsQuery());
-      }
-    }
-
-    return queries;
-  }
-
-  /**
-   * Save the schema version in the database
-   */
-  private getUpdateToLatestSchemaVersionQuery(): string {
-    return `UPDATE state SET number = ${DatabaseMigration.currentVersion} WHERE name = 'schema_version';`;
-  }
-
-  /**
-   * Print current database version
-   */
-  private async $printDatabaseVersion() {
-    const connection = await DB.pool.getConnection();
-    try {
-      const [rows] = await this.$executeQuery(connection, 'SELECT VERSION() as version;', true);
-      logger.info(`MIGRATIONS: Database engine version '${rows[0].version}'`);
-    } catch (e) {
-      logger.info(`MIGRATIONS: Could not fetch database engine version. ` + e);
-    }
-    connection.release();
-  }
-
-  // Couple of wrappers to clean the main logic
-  private getShiftStatisticsQuery(): string {
-    return `UPDATE statistics SET
-      vsize_1 = vsize_1 + vsize_2, vsize_2 = vsize_3,
-      vsize_3 = vsize_4, vsize_4 = vsize_5,
-      vsize_5 = vsize_6, vsize_6 = vsize_8,
-      vsize_8 = vsize_10, vsize_10 = vsize_12,
-      vsize_12 = vsize_15, vsize_15 = vsize_20,
-      vsize_20 = vsize_30, vsize_30 = vsize_40,
-      vsize_40 = vsize_50, vsize_50 = vsize_60,
-      vsize_60 = vsize_70, vsize_70 = vsize_80,
-      vsize_80 = vsize_90, vsize_90 = vsize_100,
-      vsize_100 = vsize_125, vsize_125 = vsize_150,
-      vsize_150 = vsize_175, vsize_175 = vsize_200,
-      vsize_200 = vsize_250, vsize_250 = vsize_300,
-      vsize_300 = vsize_350, vsize_350 = vsize_400,
-      vsize_400 = vsize_500, vsize_500 = vsize_600,
-      vsize_600 = vsize_700, vsize_700 = vsize_800,
-      vsize_800 = vsize_900, vsize_900 = vsize_1000,
-      vsize_1000 = vsize_1200, vsize_1200 = vsize_1400,
-      vsize_1400 = vsize_1800, vsize_1800 = vsize_2000, vsize_2000 = 0;`;
-  }
-
-  private getCreateStatisticsQuery(): string {
-    return `CREATE TABLE IF NOT EXISTS statistics (
-      id int(11) NOT NULL AUTO_INCREMENT,
+    queries.push(`CREATE TABLE IF NOT EXISTS statistics (
+      id int(11) NOT NULL,
       added datetime NOT NULL,
       unconfirmed_transactions int(11) UNSIGNED NOT NULL,
       tx_per_second float UNSIGNED NOT NULL,
@@ -317,23 +114,64 @@ class DatabaseMigration {
       vsize_1400 int(11) NOT NULL,
       vsize_1600 int(11) NOT NULL,
       vsize_1800 int(11) NOT NULL,
-      vsize_2000 int(11) NOT NULL,
-      CONSTRAINT PRIMARY KEY (id)
-    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;`;
+      vsize_2000 int(11) NOT NULL
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;`);
+
+    queries.push(`ALTER TABLE statistics ADD PRIMARY KEY (id);`);
+    queries.push(`ALTER TABLE statistics MODIFY id int(11) NOT NULL AUTO_INCREMENT;`);
+
+    return queries;
   }
 
-  private getCreateElementsTableQuery(): string {
-    return `CREATE TABLE IF NOT EXISTS elements_pegs (
-      block int(11) NOT NULL,
-      datetime int(11) NOT NULL,
-      amount bigint(20) NOT NULL,
-      txid varchar(65) NOT NULL,
-      txindex int(11) NOT NULL,
-      bitcoinaddress varchar(100) NOT NULL,
-      bitcointxid varchar(65) NOT NULL,
-      bitcoinindex int(11) NOT NULL,
-      final_tx int(11) NOT NULL
-    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;`;
+  private getMigrationQueriesFromVersion(version: number): string[] {
+    const queries: string[] = [];
+
+    if (version < 1) {
+      if (config.MEMPOOL.NETWORK !== 'liquid') {
+        queries.push(`UPDATE statistics SET
+          vsize_1 = vsize_1 + vsize_2, vsize_2 = vsize_3,
+          vsize_3 = vsize_4, vsize_4 = vsize_5,
+          vsize_5 = vsize_6, vsize_6 = vsize_8,
+          vsize_8 = vsize_10, vsize_10 = vsize_12,
+          vsize_12 = vsize_15, vsize_15 = vsize_20,
+          vsize_20 = vsize_30, vsize_30 = vsize_40,
+          vsize_40 = vsize_50, vsize_50 = vsize_60,
+          vsize_60 = vsize_70, vsize_70 = vsize_80,
+          vsize_80 = vsize_90, vsize_90 = vsize_100,
+          vsize_100 = vsize_125, vsize_125 = vsize_150,
+          vsize_150 = vsize_175, vsize_175 = vsize_200,
+          vsize_200 = vsize_250, vsize_250 = vsize_300,
+          vsize_300 = vsize_350, vsize_350 = vsize_400,
+          vsize_400 = vsize_500, vsize_500 = vsize_600,
+          vsize_600 = vsize_700, vsize_700 = vsize_800,
+          vsize_800 = vsize_900, vsize_900 = vsize_1000,
+          vsize_1000 = vsize_1200, vsize_1200 = vsize_1400,
+          vsize_1400 = vsize_1800, vsize_1800 = vsize_2000, vsize_2000 = 0`);
+      }
+
+      queries.push(`CREATE TABLE IF NOT EXISTS elements_pegs (
+        block int(11) NOT NULL,
+        datetime int(11) NOT NULL,
+        amount bigint(20) NOT NULL,
+        txid varchar(65) NOT NULL,
+        txindex int(11) NOT NULL,
+        bitcoinaddress varchar(100) NOT NULL,
+        bitcointxid varchar(65) NOT NULL,
+        bitcoinindex int(11) NOT NULL,
+        final_tx int(11) NOT NULL
+      ) ENGINE=InnoDB DEFAULT CHARSET=utf8;`);
+
+      queries.push(`CREATE TABLE IF NOT EXISTS state (
+        name varchar(25) NOT NULL,
+        number int(11) NULL,
+        string varchar(100) NULL
+      ) ENGINE=InnoDB DEFAULT CHARSET=utf8;`);
+
+      queries.push(`INSERT INTO state VALUES('schema_version', 0, NULL);`);
+      queries.push(`INSERT INTO state VALUES('last_elements_block', 0, NULL);`);
+    }
+
+    return queries;
   }
 }
 

backend/src/api/fee-api.ts

@@ -1,13 +1,12 @@
 import config from '../config';
 import { MempoolBlock } from '../mempool.interfaces';
-import { Common } from './common';
 import mempool from './mempool';
 import projectedBlocks from './mempool-blocks';
 
 class FeeApi {
   constructor() { }
 
-  defaultFee = Common.isLiquid() ? 0.1 : 1;
+  defaultFee = config.MEMPOOL.NETWORK === 'liquid' ? 0.1 : 1;
 
   public getRecommendedFee() {
     const pBlocks = projectedBlocks.getMempoolBlocks();

backend/src/api/liquid/icons.ts

@@ -1,39 +0,0 @@
-import * as fs from 'fs';
-import config from '../../config';
-import logger from '../../logger';
-
-class Icons {
-  private static FILE_NAME = './icons.json';
-  private iconIds: string[] = [];
-  private icons: { [assetId: string]: string; } = {};
-
-  constructor() {}
-
-  public loadIcons() {
-    if (!fs.existsSync(Icons.FILE_NAME)) {
-      logger.warn(`${Icons.FILE_NAME} does not exist. No Liquid icons loaded.`);
-      return;
-    }
-    const cacheData = fs.readFileSync(Icons.FILE_NAME, 'utf8');
-    this.icons = JSON.parse(cacheData);
-
-    for (const i in this.icons) {
-      this.iconIds.push(i);
-    }
-    logger.debug(`Liquid icons has been loaded.`);
-  }
-
-  public getIconByAssetId(assetId: string): Buffer | undefined {
-    const icon = this.icons[assetId];
-    if (icon) {
-      return Buffer.from(icon, 'base64');
-    }
-  }
-
-  public getAllIconIds() {
-    return this.iconIds;
-  }
-
-}
-
-export default new Icons();

backend/src/api/statistics.ts

@@ -4,12 +4,14 @@ import logger from '../logger';
 
 import { Statistic, TransactionExtended, OptimizedStatistic } from '../mempool.interfaces';
 import config from '../config';
-import { Common } from './common';
 
 class Statistics {
   protected intervalTimer: NodeJS.Timer | undefined;
   protected newStatisticsEntryCallback: ((stats: OptimizedStatistic) => void) | undefined;
   protected queryTimeout = 120000;
+  protected cache: { [date: string]: OptimizedStatistic[] } = {
+    '24h': [], '1w': [], '1m': [], '3m': [], '6m': [], '1y': [], '2y': [], '3y': []
+  };
 
   public setNewStatisticsEntryCallback(fn: (stats: OptimizedStatistic) => void) {
     this.newStatisticsEntryCallback = fn;
@@ -31,6 +33,25 @@ class Statistics {
         this.runStatistics();
       }, 1 * 60 * 1000);
     }, difference);
+
+    this.createCache();
+    setInterval(this.createCache.bind(this), 600000);
+  }
+
+  public getCache() {
+    return this.cache;
+  }
+
+  private async createCache() {
+    this.cache['24h'] = await this.$list24H();
+    this.cache['1w'] = await this.$list1W();
+    this.cache['1m'] = await this.$list1M();
+    this.cache['3m'] = await this.$list3M();
+    this.cache['6m'] = await this.$list6M();
+    this.cache['1y'] = await this.$list1Y();
+    this.cache['2y'] = await this.$list2Y();
+    this.cache['3y'] = await this.$list3Y();
+    logger.debug('Statistics cache created');
   }
 
   private async runStatistics(): Promise<void> {
@@ -69,9 +90,9 @@ class Statistics {
     memPoolArray.forEach((transaction) => {
       for (let i = 0; i < logFees.length; i++) {
         if (
-          (Common.isLiquid() && (i === lastItem || transaction.effectiveFeePerVsize * 10 < logFees[i + 1]))
+          (config.MEMPOOL.NETWORK === 'liquid' && (i === lastItem || transaction.effectiveFeePerVsize * 10 < logFees[i + 1]))
           ||
-          (!Common.isLiquid() && (i === lastItem || transaction.effectiveFeePerVsize < logFees[i + 1]))
+          (config.MEMPOOL.NETWORK !== 'liquid' && (i === lastItem || transaction.effectiveFeePerVsize < logFees[i + 1]))
         ) {
           if (weightVsizeFees[logFees[i]]) {
             weightVsizeFees[logFees[i]] += transaction.vsize;
@@ -247,57 +268,58 @@ class Statistics {
   }
 
   private getQueryForDaysAvg(div: number, interval: string) {
-    return `SELECT
-      UNIX_TIMESTAMP(added) as added,
-      CAST(avg(vbytes_per_second) as DOUBLE) as vbytes_per_second,
-      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,
-      CAST(avg(vsize_4) as DOUBLE) as vsize_4,
-      CAST(avg(vsize_5) as DOUBLE) as vsize_5,
-      CAST(avg(vsize_6) as DOUBLE) as vsize_6,
-      CAST(avg(vsize_8) as DOUBLE) as vsize_8,
-      CAST(avg(vsize_10) as DOUBLE) as vsize_10,
-      CAST(avg(vsize_12) as DOUBLE) as vsize_12,
-      CAST(avg(vsize_15) as DOUBLE) as vsize_15,
-      CAST(avg(vsize_20) as DOUBLE) as vsize_20,
-      CAST(avg(vsize_30) as DOUBLE) as vsize_30,
-      CAST(avg(vsize_40) as DOUBLE) as vsize_40,
-      CAST(avg(vsize_50) as DOUBLE) as vsize_50,
-      CAST(avg(vsize_60) as DOUBLE) as vsize_60,
-      CAST(avg(vsize_70) as DOUBLE) as vsize_70,
-      CAST(avg(vsize_80) as DOUBLE) as vsize_80,
-      CAST(avg(vsize_90) as DOUBLE) as vsize_90,
-      CAST(avg(vsize_100) as DOUBLE) as vsize_100,
-      CAST(avg(vsize_125) as DOUBLE) as vsize_125,
-      CAST(avg(vsize_150) as DOUBLE) as vsize_150,
-      CAST(avg(vsize_175) as DOUBLE) as vsize_175,
-      CAST(avg(vsize_200) as DOUBLE) as vsize_200,
-      CAST(avg(vsize_250) as DOUBLE) as vsize_250,
-      CAST(avg(vsize_300) as DOUBLE) as vsize_300,
-      CAST(avg(vsize_350) as DOUBLE) as vsize_350,
-      CAST(avg(vsize_400) as DOUBLE) as vsize_400,
-      CAST(avg(vsize_500) as DOUBLE) as vsize_500,
-      CAST(avg(vsize_600) as DOUBLE) as vsize_600,
-      CAST(avg(vsize_700) as DOUBLE) as vsize_700,
-      CAST(avg(vsize_800) as DOUBLE) as vsize_800,
-      CAST(avg(vsize_900) as DOUBLE) as vsize_900,
-      CAST(avg(vsize_1000) as DOUBLE) as vsize_1000,
-      CAST(avg(vsize_1200) as DOUBLE) as vsize_1200,
-      CAST(avg(vsize_1400) as DOUBLE) as vsize_1400,
-      CAST(avg(vsize_1600) as DOUBLE) as vsize_1600,
-      CAST(avg(vsize_1800) as DOUBLE) as vsize_1800,
-      CAST(avg(vsize_2000) as DOUBLE) as vsize_2000 \
+    return `SELECT id, UNIX_TIMESTAMP(added) as added,
+      CAST(avg(unconfirmed_transactions) as FLOAT) as unconfirmed_transactions,
+      CAST(avg(tx_per_second) as FLOAT) as tx_per_second,
+      CAST(avg(vbytes_per_second) as FLOAT) as vbytes_per_second,
+      CAST(avg(vsize_1) as FLOAT) as vsize_1,
+      CAST(avg(vsize_2) as FLOAT) as vsize_2,
+      CAST(avg(vsize_3) as FLOAT) as vsize_3,
+      CAST(avg(vsize_4) as FLOAT) as vsize_4,
+      CAST(avg(vsize_5) as FLOAT) as vsize_5,
+      CAST(avg(vsize_6) as FLOAT) as vsize_6,
+      CAST(avg(vsize_8) as FLOAT) as vsize_8,
+      CAST(avg(vsize_10) as FLOAT) as vsize_10,
+      CAST(avg(vsize_12) as FLOAT) as vsize_12,
+      CAST(avg(vsize_15) as FLOAT) as vsize_15,
+      CAST(avg(vsize_20) as FLOAT) as vsize_20,
+      CAST(avg(vsize_30) as FLOAT) as vsize_30,
+      CAST(avg(vsize_40) as FLOAT) as vsize_40,
+      CAST(avg(vsize_50) as FLOAT) as vsize_50,
+      CAST(avg(vsize_60) as FLOAT) as vsize_60,
+      CAST(avg(vsize_70) as FLOAT) as vsize_70,
+      CAST(avg(vsize_80) as FLOAT) as vsize_80,
+      CAST(avg(vsize_90) as FLOAT) as vsize_90,
+      CAST(avg(vsize_100) as FLOAT) as vsize_100,
+      CAST(avg(vsize_125) as FLOAT) as vsize_125,
+      CAST(avg(vsize_150) as FLOAT) as vsize_150,
+      CAST(avg(vsize_175) as FLOAT) as vsize_175,
+      CAST(avg(vsize_200) as FLOAT) as vsize_200,
+      CAST(avg(vsize_250) as FLOAT) as vsize_250,
+      CAST(avg(vsize_300) as FLOAT) as vsize_300,
+      CAST(avg(vsize_350) as FLOAT) as vsize_350,
+      CAST(avg(vsize_400) as FLOAT) as vsize_400,
+      CAST(avg(vsize_500) as FLOAT) as vsize_500,
+      CAST(avg(vsize_600) as FLOAT) as vsize_600,
+      CAST(avg(vsize_700) as FLOAT) as vsize_700,
+      CAST(avg(vsize_800) as FLOAT) as vsize_800,
+      CAST(avg(vsize_900) as FLOAT) as vsize_900,
+      CAST(avg(vsize_1000) as FLOAT) as vsize_1000,
+      CAST(avg(vsize_1200) as FLOAT) as vsize_1200,
+      CAST(avg(vsize_1400) as FLOAT) as vsize_1400,
+      CAST(avg(vsize_1600) as FLOAT) as vsize_1600,
+      CAST(avg(vsize_1800) as FLOAT) as vsize_1800,
+      CAST(avg(vsize_2000) as FLOAT) as vsize_2000 \
       FROM statistics \
       WHERE added BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW() \
       GROUP BY UNIX_TIMESTAMP(added) DIV ${div} \
-      ORDER BY statistics.added DESC;`;
+      ORDER BY id DESC;`;
   }
 
   private getQueryForDays(div: number, interval: string) {
-    return `SELECT
-      UNIX_TIMESTAMP(added) as added,
-      CAST(avg(vbytes_per_second) as DOUBLE) as vbytes_per_second,
+    return `SELECT id, UNIX_TIMESTAMP(added) as added, unconfirmed_transactions,
+      tx_per_second,
+      vbytes_per_second,
       vsize_1,
       vsize_2,
       vsize_3,
@@ -339,10 +361,10 @@ class Statistics {
       FROM statistics \
       WHERE added BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW() \
       GROUP BY UNIX_TIMESTAMP(added) DIV ${div} \
-      ORDER BY statistics.added DESC;`;
+      ORDER BY id DESC;`;
   }
 
-  private async $get(id: number): Promise<OptimizedStatistic | undefined> {
+  public async $get(id: number): Promise<OptimizedStatistic | undefined> {
     try {
       const connection = await DB.pool.getConnection();
       const query = `SELECT *, UNIX_TIMESTAMP(added) as added FROM statistics WHERE id = ?`;
@@ -359,7 +381,7 @@ class Statistics {
   public async $list2H(): Promise<OptimizedStatistic[]> {
     try {
       const connection = await DB.pool.getConnection();
-      const query = `SELECT *, UNIX_TIMESTAMP(added) as added FROM statistics ORDER BY statistics.added DESC LIMIT 120`;
+      const query = `SELECT *, UNIX_TIMESTAMP(added) as added FROM statistics ORDER BY id DESC LIMIT 120`;
       const [rows] = await connection.query<any>({ sql: query, timeout: this.queryTimeout });
       connection.release();
       return this.mapStatisticToOptimizedStatistic(rows);
@@ -372,7 +394,7 @@ class Statistics {
   public async $list24H(): Promise<OptimizedStatistic[]> {
     try {
       const connection = await DB.pool.getConnection();
-      const query = `SELECT *, UNIX_TIMESTAMP(added) as added FROM statistics ORDER BY statistics.added DESC LIMIT 1440`;
+      const query = this.getQueryForDaysAvg(120, '1 DAY'); // 2m interval
       const [rows] = await connection.query<any>({ sql: query, timeout: this.queryTimeout });
       connection.release();
       return this.mapStatisticToOptimizedStatistic(rows);
@@ -385,7 +407,7 @@ class Statistics {
   public async $list1W(): Promise<OptimizedStatistic[]> {
     try {
       const connection = await DB.pool.getConnection();
-      const query = this.getQueryForDaysAvg(300, '1 WEEK'); // 5m interval
+      const query = this.getQueryForDaysAvg(600, '1 WEEK'); // 10m interval
       const [rows] = await connection.query<any>({ sql: query, timeout: this.queryTimeout });
       connection.release();
       return this.mapStatisticToOptimizedStatistic(rows);
@@ -398,7 +420,7 @@ class Statistics {
   public async $list1M(): Promise<OptimizedStatistic[]> {
     try {
       const connection = await DB.pool.getConnection();
-      const query = this.getQueryForDaysAvg(1800, '1 MONTH'); // 30m interval
+      const query = this.getQueryForDaysAvg(3600, '1 MONTH'); // 1h interval
       const [rows] = await connection.query<any>({ sql: query, timeout: this.queryTimeout });
       connection.release();
       return this.mapStatisticToOptimizedStatistic(rows);
@@ -411,7 +433,7 @@ class Statistics {
   public async $list3M(): Promise<OptimizedStatistic[]> {
     try {
       const connection = await DB.pool.getConnection();
-      const query = this.getQueryForDaysAvg(7200, '3 MONTH'); // 2h interval
+      const query = this.getQueryForDaysAvg(14400, '3 MONTH'); // 4h interval
       const [rows] = await connection.query<any>({ sql: query, timeout: this.queryTimeout });
       connection.release();
       return this.mapStatisticToOptimizedStatistic(rows);
@@ -424,7 +446,7 @@ class Statistics {
   public async $list6M(): Promise<OptimizedStatistic[]> {
     try {
       const connection = await DB.pool.getConnection();
-      const query = this.getQueryForDaysAvg(10800, '6 MONTH'); // 3h interval 
+      const query = this.getQueryForDaysAvg(21600, '6 MONTH'); // 6h interval 
       const [rows] = await connection.query<any>({ sql: query, timeout: this.queryTimeout });
       connection.release();
       return this.mapStatisticToOptimizedStatistic(rows);
@@ -437,7 +459,7 @@ class Statistics {
   public async $list1Y(): Promise<OptimizedStatistic[]> {
     try {
       const connection = await DB.pool.getConnection();
-      const query = this.getQueryForDays(28800, '1 YEAR'); // 8h interval
+      const query = this.getQueryForDays(43200, '1 YEAR'); // 12h interval
       const [rows] = await connection.query<any>({ sql: query, timeout: this.queryTimeout });
       connection.release();
       return this.mapStatisticToOptimizedStatistic(rows);
@@ -450,7 +472,7 @@ class Statistics {
   public async $list2Y(): Promise<OptimizedStatistic[]> {
     try {
       const connection = await DB.pool.getConnection();
-      const query = this.getQueryForDays(28800, "2 YEAR"); // 8h interval
+      const query = this.getQueryForDays(86400, "2 YEAR"); // 1d interval
       const [rows] = await connection.query<any>({ sql: query, timeout: this.queryTimeout });
       connection.release();
       return this.mapStatisticToOptimizedStatistic(rows);
@@ -463,7 +485,7 @@ class Statistics {
   public async $list3Y(): Promise<OptimizedStatistic[]> {
     try {
       const connection = await DB.pool.getConnection();
-      const query = this.getQueryForDays(43200, "3 YEAR"); // 12h interval
+      const query = this.getQueryForDays(86400, "3 YEAR"); // 1d interval
       const [rows] = await connection.query<any>({ sql: query, timeout: this.queryTimeout });
       connection.release();
       return this.mapStatisticToOptimizedStatistic(rows);
@@ -476,7 +498,10 @@ class Statistics {
   private mapStatisticToOptimizedStatistic(statistic: Statistic[]): OptimizedStatistic[] {
     return statistic.map((s) => {
       return {
+        id: s.id || 0,
         added: s.added,
+        unconfirmed_transactions: s.unconfirmed_transactions,
+        tx_per_second: s.tx_per_second,
         vbytes_per_second: s.vbytes_per_second,
         mempool_byte_weight: s.mempool_byte_weight,
         total_fee: s.total_fee,

backend/src/api/transaction-utils.ts

@@ -2,7 +2,6 @@ import bitcoinApi from './bitcoin/bitcoin-api-factory';
 import { TransactionExtended, TransactionMinerInfo } from '../mempool.interfaces';
 import { IEsploraApi } from './bitcoin/esplora-api.interface';
 import config from '../config';
-import { Common } from './common';
 
 class TransactionUtils {
   constructor() { }
@@ -32,8 +31,7 @@ class TransactionUtils {
       // @ts-ignore
       return transaction;
     }
-    const feePerVbytes = Math.max(Common.isLiquid() ? 0.1 : 1,
-      (transaction.fee || 0) / (transaction.weight / 4));
+    const feePerVbytes = Math.max(config.MEMPOOL.NETWORK === 'liquid' ? 0.1 : 1, (transaction.fee || 0) / (transaction.weight / 4));
     const transactionExtended: TransactionExtended = Object.assign({
       vsize: Math.round(transaction.weight / 4),
       feePerVsize: feePerVbytes,

backend/src/config.ts

@@ -2,7 +2,7 @@ const configFile = require('../mempool-config.json');
 
 interface IConfig {
   MEMPOOL: {
-    NETWORK: 'mainnet' | 'testnet' | 'signet' | 'liquid' | 'liquidtestnet';
+    NETWORK: 'mainnet' | 'testnet' | 'signet' | 'liquid';
     BACKEND: 'esplora' | 'electrum' | 'none';
     HTTP_PORT: number;
     SPAWN_CLUSTER_PROCS: number;
@@ -16,7 +16,6 @@ interface IConfig {
     MEMPOOL_BLOCKS_AMOUNT: number;
     PRICE_FEED_UPDATE_INTERVAL: number;
     USE_SECOND_NODE_FOR_MINFEE: boolean;
-    EXTERNAL_ASSETS: string[];
   };
   ESPLORA: {
     REST_API_URL: string;
@@ -79,7 +78,6 @@ const defaults: IConfig = {
     'MEMPOOL_BLOCKS_AMOUNT': 8,
     'PRICE_FEED_UPDATE_INTERVAL': 3600,
     'USE_SECOND_NODE_FOR_MINFEE': false,
-    'EXTERNAL_ASSETS': [],
   },
   'ESPLORA': {
     'REST_API_URL': 'http://127.0.0.1:3000',

backend/src/index.ts

@@ -22,9 +22,6 @@ import loadingIndicators from './api/loading-indicators';
 import mempool from './api/mempool';
 import elementsParser from './api/liquid/elements-parser';
 import databaseMigration from './api/database-migration';
-import syncAssets from './sync-assets';
-import icons from './api/liquid/icons';
-import { Common } from './api/common';
 
 class Server {
   private wss: WebSocket.Server | undefined;
@@ -81,7 +78,6 @@ class Server {
 
     this.setUpWebsocketHandling();
 
-    await syncAssets.syncAssets();
     diskCache.loadMempoolCache();
 
     if (config.DATABASE.ENABLED) {
@@ -97,10 +93,6 @@ class Server {
       statistics.startStatistics();
     }
 
-    if (Common.isLiquid()) {
-      icons.loadIcons();
-    }
-
     fiatConversion.startService();
 
     this.setUpHttpApiRoutes();
@@ -157,7 +149,7 @@ class Server {
     if (this.wss) {
       websocketHandler.setWebsocketServer(this.wss);
     }
-    if (Common.isLiquid() && config.DATABASE.ENABLED) {
+    if (config.MEMPOOL.NETWORK === 'liquid' && config.DATABASE.ENABLED) {
       blocks.setNewBlockCallback(async () => {
         try {
           await elementsParser.$parse();
@@ -221,37 +213,19 @@ class Server {
           res.status(500).end();
         }
       })
-      .get(config.MEMPOOL.API_URL_PREFIX + 'translators', async (req, res) => {
-        try {
-          const response = await axios.get('https://mempool.space/api/v1/translators', { responseType: 'stream', timeout: 10000 });
-          response.data.pipe(res);
-        } catch (e) {
-          res.status(500).end();
-        }
-      })
-      .get(config.MEMPOOL.API_URL_PREFIX + 'translators/images/:id', async (req, res) => {
-        try {
-          const response = await axios.get('https://mempool.space/api/v1/translators/images/' + req.params.id, {
-            responseType: 'stream', timeout: 10000
-          });
-          response.data.pipe(res);
-        } catch (e) {
-          res.status(500).end();
-        }
-      })
     ;
 
     if (config.STATISTICS.ENABLED && config.DATABASE.ENABLED) {
       this.app
-        .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/2h', routes.$getStatisticsByTime.bind(routes, '2h'))
-        .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/24h', routes.$getStatisticsByTime.bind(routes, '24h'))
-        .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/1w', routes.$getStatisticsByTime.bind(routes, '1w'))
-        .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/1m', routes.$getStatisticsByTime.bind(routes, '1m'))
-        .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/3m', routes.$getStatisticsByTime.bind(routes, '3m'))
-        .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/6m', routes.$getStatisticsByTime.bind(routes, '6m'))
-        .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/1y', routes.$getStatisticsByTime.bind(routes, '1y'))
-        .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/2y', routes.$getStatisticsByTime.bind(routes, '2y'))
-        .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/3y', routes.$getStatisticsByTime.bind(routes, '3y'))
+        .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/2h', routes.get2HStatistics)
+        .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/24h', routes.get24HStatistics.bind(routes))
+        .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/1w', routes.get1WHStatistics.bind(routes))
+        .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/1m', routes.get1MStatistics.bind(routes))
+        .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/3m', routes.get3MStatistics.bind(routes))
+        .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/6m', routes.get6MStatistics.bind(routes))
+        .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/1y', routes.get1YStatistics.bind(routes))
+        .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/2y', routes.get2YStatistics.bind(routes))
+        .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/3y', routes.get3YStatistics.bind(routes))
         ;
     }
 
@@ -302,14 +276,7 @@ class Server {
       ;
     }
 
-    if (Common.isLiquid()) {
-      this.app
-        .get(config.MEMPOOL.API_URL_PREFIX + 'assets/icons', routes.getAllLiquidIcon)
-        .get(config.MEMPOOL.API_URL_PREFIX + 'asset/:assetId/icon', routes.getLiquidIcon)
-      ;
-    }
-
-    if (Common.isLiquid() && config.DATABASE.ENABLED) {
+    if (config.MEMPOOL.NETWORK === 'liquid' && config.DATABASE.ENABLED) {
       this.app
         .get(config.MEMPOOL.API_URL_PREFIX + 'liquid/pegs/month', routes.$getElementsPegsByMonth)
       ;

backend/src/mempool.interfaces.ts

@@ -128,7 +128,10 @@ export interface Statistic {
 }
 
 export interface OptimizedStatistic {
+  id: number;
   added: string;
+  unconfirmed_transactions: number;
+  tx_per_second: number;
   vbytes_per_second: number;
   total_fee: number;
   mempool_byte_weight: number;

backend/src/routes.ts

@@ -19,55 +19,45 @@ import loadingIndicators from './api/loading-indicators';
 import { Common } from './api/common';
 import bitcoinClient from './api/bitcoin/bitcoin-client';
 import elementsParser from './api/liquid/elements-parser';
-import icons from './api/liquid/icons';
 
 class Routes {
   constructor() {}
 
-  public async $getStatisticsByTime(time: '2h' | '24h' | '1w' | '1m' | '3m' | '6m' | '1y' | '2y' | '3y', req: Request, res: Response) {
-    res.header('Pragma', 'public');
-    res.header('Cache-control', 'public');
-    res.setHeader('Expires', new Date(Date.now() + 1000 * 300).toUTCString());
+  public async get2HStatistics(req: Request, res: Response) {
+    const result = await statistics.$list2H();
+    res.json(result);
+  }
 
-    try {
-      let result;
-      switch (time as string) {
-        case '2h':
-          result = await statistics.$list2H();
-          res.setHeader('Expires', new Date(Date.now() + 1000 * 30).toUTCString());
-          break;
-        case '24h':
-          result = await statistics.$list24H();
-          res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
-          break;
-        case '1w':
-          result = await statistics.$list1W();
-          break;
-        case '1m':
-          result = await statistics.$list1M();
-          break;
-        case '3m':
-          result = await statistics.$list3M();
-          break;
-        case '6m':
-          result = await statistics.$list6M();
-          break;
-        case '1y':
-          result = await statistics.$list1Y();
-          break;
-        case '2y':
-          result = await statistics.$list2Y();
-          break;
-        case '3y':
-          result = await statistics.$list3Y();
-          break;
-        default:
-          result = await statistics.$list2H();
-      }
-      res.json(result);
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
+  public get24HStatistics(req: Request, res: Response) {
+    res.json(statistics.getCache()['24h']);
+  }
+
+  public get1WHStatistics(req: Request, res: Response) {
+    res.json(statistics.getCache()['1w']);
+  }
+
+  public get1MStatistics(req: Request, res: Response) {
+    res.json(statistics.getCache()['1m']);
+  }
+
+  public get3MStatistics(req: Request, res: Response) {
+    res.json(statistics.getCache()['3m']);
+  }
+
+  public get6MStatistics(req: Request, res: Response) {
+    res.json(statistics.getCache()['6m']);
+  }
+
+  public get1YStatistics(req: Request, res: Response) {
+    res.json(statistics.getCache()['1y']);
+  }
+
+  public get2YStatistics(req: Request, res: Response) {
+    res.json(statistics.getCache()['2y']);
+  }
+  
+  public get3YStatistics(req: Request, res: Response) {
+    res.json(statistics.getCache()['3y']);
   }
 
   public getInitData(req: Request, res: Response) {
@@ -79,7 +69,7 @@ class Routes {
     }
   }
 
-  public getRecommendedFees(req: Request, res: Response) {
+  public async getRecommendedFees(req: Request, res: Response) {
     if (!mempool.isInSync()) {
       res.statusCode = 503;
       res.send('Service Unavailable');
@@ -716,13 +706,8 @@ class Routes {
     }
   }
 
-  public async getTransactionOutspends(req: Request, res: Response) {
-    try {
-      const result = await bitcoinApi.$getOutspends(req.params.txId);
-      res.json(result);
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
+  public getTransactionOutspends(req: Request, res: Response) {
+    res.status(501).send('Not implemented');
   }
 
   public getDifficultyChange(req: Request, res: Response) {
@@ -822,26 +807,6 @@ class Routes {
         : (e.message || 'Error'));
     }
   }
-
-  public getLiquidIcon(req: Request, res: Response) {
-    const result = icons.getIconByAssetId(req.params.assetId);
-    if (result) {
-      res.setHeader('content-type', 'image/png');
-      res.setHeader('content-length', result.length);
-      res.send(result);
-    } else {
-      res.status(404).send('Asset icon not found');
-    }
-  }
-
-  public getAllLiquidIcon(req: Request, res: Response) {
-    const result = icons.getAllIconIds();
-    if (result) {
-      res.json(result);
-    } else {
-      res.status(404).send('Asset icons not found');
-    }
-  }
 }
 
 export default new Routes();

backend/src/sync-assets.ts

@@ -1,32 +0,0 @@
-import axios from 'axios';
-import * as fs from 'fs';
-const fsPromises = fs.promises;
-import config from './config';
-import logger from './logger';
-
-const PATH = './';
-
-class SyncAssets {
-  constructor() { }
-
-  public async syncAssets() {
-    for (const url of config.MEMPOOL.EXTERNAL_ASSETS) {
-      await this.downloadFile(url);
-    }
-  }
-
-  private async downloadFile(url: string) {
-    const fileName = url.split('/').slice(-1)[0];
-    logger.info(`Downloading external asset: ${fileName}...`);
-    try {
-      const response = await axios.get(url, {
-        responseType: 'stream', timeout: 30000
-      });
-      await fsPromises.writeFile(PATH + fileName, response.data);
-    } catch (e: any) {
-      throw new Error(`Failed to download external asset. ` + e);
-    }
-  }
-}
-
-export default new SyncAssets();

docker/README.md

@@ -0,0 +1,101 @@
+# Docker
+
+## Initialization
+
+In an empty dir create 2 sub-dirs
+
+```bash
+mkdir -p data mysql/data mysql/db-scripts
+```
+
+In the `mysql/db-scripts` sub-dir add the `mariadb-structure.sql` file from the mempool repo
+
+Your dir should now look like that:
+
+```bash
+$ls -R
+.:
+data mysql
+
+./data:
+
+./mysql:
+data  db-scripts
+
+./mysql/data:
+
+./mysql/db-scripts:
+mariadb-structure.sql
+```
+
+In the main dir add the following `docker-compose.yml`
+
+```bash
+version: "3.7"
+
+services:
+  web:
+    image: mempool/frontend:latest
+    user: "1000:1000"
+    restart: on-failure
+    stop_grace_period: 1m
+    command: "./wait-for db:3306 --timeout=720 -- nginx -g 'daemon off;'"
+    ports:
+      - 80:8080
+    environment:
+      FRONTEND_HTTP_PORT: "8080"
+      BACKEND_MAINNET_HTTP_HOST: "api"
+  api:
+    image: mempool/backend:latest
+    user: "1000:1000"
+    restart: on-failure
+    stop_grace_period: 1m
+    command: "./wait-for-it.sh db:3306 --timeout=720 --strict -- ./start.sh"
+    volumes:
+      - ./data:/backend/cache
+    environment:
+      RPC_HOST: "127.0.0.1"
+      RPC_PORT: "8332"
+      RPC_USER: "mempool"
+      RPC_PASS: "mempool"
+      ELECTRUM_HOST: "127.0.0.1"
+      ELECTRUM_PORT: "50002"
+      ELECTRUM_TLS: "false"
+      MYSQL_HOST: "db"
+      MYSQL_PORT: "3306"
+      MYSQL_DATABASE: "mempool"
+      MYSQL_USER: "mempool"
+      MYSQL_PASS: "mempool"
+      BACKEND_MAINNET_HTTP_PORT: "8999"
+      CACHE_DIR: "/backend/cache"
+      MEMPOOL_CLEAR_PROTECTION_MINUTES: "20"
+  db:
+    image: mariadb:10.5.8
+    user: "1000:1000"
+    restart: on-failure
+    stop_grace_period: 1m
+    volumes:
+      - ./mysql/data:/var/lib/mysql
+      - ./mysql/db-scripts:/docker-entrypoint-initdb.d
+    environment:
+      MYSQL_DATABASE: "mempool"
+      MYSQL_USER: "mempool"
+      MYSQL_PASSWORD: "mempool"
+      MYSQL_ROOT_PASSWORD: "admin"
+
+```
+
+You can update all the environment variables inside the API container, especially the RPC and ELECTRUM ones
+
+## Run it
+
+To run our docker-compose use the following cmd:
+
+```bash
+docker-compose up
+```
+
+If everything went okay you should see the beautiful mempool :grin:
+
+If you get stuck on "loading blocks", this means the websocket can't connect.
+Check your nginx proxy setup, firewalls, etc. and open an issue if you need help.

docker/backend/mempool-config.json

@@ -1,62 +1,38 @@
 {
   "MEMPOOL": {
-    "NETWORK": "__MEMPOOL_NETWORK__",
-    "BACKEND": "__MEMPOOL_BACKEND__",
-    "HTTP_PORT": __MEMPOOL_HTTP_PORT__,
-    "SPAWN_CLUSTER_PROCS": __MEMPOOL_SPAWN_CLUSTER_PROCS__,
-    "API_URL_PREFIX": "__MEMPOOL_API_URL_PREFIX__",
-    "POLL_RATE_MS": __MEMPOOL_POLL_RATE_MS__,
-    "CACHE_DIR": "__MEMPOOL_CACHE_DIR__",
-    "CLEAR_PROTECTION_MINUTES": __MEMPOOL_CLEAR_PROTECTION_MINUTES__,
-    "RECOMMENDED_FEE_PERCENTILE": __MEMPOOL_RECOMMENDED_FEE_PERCENTILE__,
-    "BLOCK_WEIGHT_UNITS": __MEMPOOL_BLOCK_WEIGHT_UNITS__,
-    "INITIAL_BLOCKS_AMOUNT": __MEMPOOL_INITIAL_BLOCKS_AMOUNT__,
-    "MEMPOOL_BLOCKS_AMOUNT": __MEMPOOL_MEMPOOL_BLOCKS_AMOUNT__,
-    "PRICE_FEED_UPDATE_INTERVAL": __MEMPOOL_PRICE_FEED_UPDATE_INTERVAL__,
-    "USE_SECOND_NODE_FOR_MINFEE": __MEMPOOL_USE_SECOND_NODE_FOR_MINFEE__,
-    "EXTERNAL_ASSETS": __MEMPOOL_EXTERNAL_ASSETS__
+    "NETWORK": "mainnet",
+    "BACKEND": "electrum",
+    "HTTP_PORT": __MEMPOOL_BACKEND_MAINNET_HTTP_PORT__,
+    "SPAWN_CLUSTER_PROCS": 0,
+    "API_URL_PREFIX": "/api/v1/",
+    "POLL_RATE_MS": 2000,
+    "CACHE_DIR": "__MEMPOOL_BACKEND_MAINNET_CACHE_DIR__",
+    "CLEAR_PROTECTION_MINUTES": __MEMPOOL_BACKEND_CLEAR_PROTECTION_MINUTES__
   },
   "CORE_RPC": {
-    "HOST": "__CORE_RPC_HOST__",
-    "PORT": __CORE_RPC_PORT__,
-    "USERNAME": "__CORE_RPC_USERNAME__",
-    "PASSWORD": "__CORE_RPC_PASSWORD__"
+    "HOST": "__BITCOIN_MAINNET_RPC_HOST__",
+    "PORT": __BITCOIN_MAINNET_RPC_PORT__,
+    "USERNAME": "__BITCOIN_MAINNET_RPC_USER__",
+    "PASSWORD": "__BITCOIN_MAINNET_RPC_PASS__"
   },
   "ELECTRUM": {
-    "HOST": "__ELECTRUM_HOST__",
-    "PORT": __ELECTRUM_PORT__,
-    "TLS_ENABLED": __ELECTRUM_TLS_ENABLED__
+    "HOST": "__ELECTRUM_MAINNET_HTTP_HOST__",
+    "PORT": __ELECTRUM_MAINNET_HTTP_PORT__,
+    "TLS_ENABLED": __ELECTRUM_MAINNET_TLS_ENABLED__
   },
   "ESPLORA": {
-    "REST_API_URL": "__ESPLORA_REST_API_URL__"
-  },
-  "SECOND_CORE_RPC": {
-    "HOST": "__SECOND_CORE_RPC_HOST__",
-    "PORT": __SECOND_CORE_RPC_PORT__,
-    "USERNAME": "__SECOND_CORE_RPC_USERNAME__",
-    "PASSWORD": "__SECOND_CORE_RPC_PASSWORD__"
+    "REST_API_URL": "http://127.0.0.1:3000"
   },
   "DATABASE": {
-    "ENABLED": __DATABASE_ENABLED__,
-    "HOST": "__DATABASE_HOST__",
-    "PORT": __DATABASE_PORT__,
-    "DATABASE": "__DATABASE_DATABASE__",
-    "USERNAME": "__DATABASE_USERNAME__",
-    "PASSWORD": "__DATABASE_PASSWORD__"
-  },
-  "SYSLOG": {
-    "ENABLED": __SYSLOG_ENABLED__,
-    "HOST": "__SYSLOG_HOST__",
-    "PORT": __SYSLOG_PORT__,
-    "MIN_PRIORITY": "__SYSLOG_MIN_PRIORITY__",
-    "FACILITY": "__SYSLOG_FACILITY__"
+    "ENABLED": true,
+    "HOST": "__MYSQL_HOST__",
+    "PORT": __MYSQL_PORT__,
+    "DATABASE": "__MYSQL_DATABASE__",
+    "USERNAME": "__MYSQL_USERNAME__",
+    "PASSWORD": "__MYSQL_PASSWORD__"
   },
   "STATISTICS": {
-    "ENABLED": __STATISTICS_ENABLED__,
-    "TX_PER_SECOND_SAMPLE_PERIOD": __STATISTICS_TX_PER_SECOND_SAMPLE_PERIOD__
-  },
-  "BISQ": {
-    "ENABLED": __BISQ_ENABLED__,
-    "DATA_PATH": "__BISQ_DATA_PATH__"
+    "ENABLED": true,
+    "TX_PER_SECOND_SAMPLE_PERIOD": 150
   }
 }

docker/backend/start.sh

@@ -1,116 +1,41 @@
 #!/bin/sh
 
-# MEMPOOL
-__MEMPOOL_NETWORK__=${MEMPOOL_NETWORK:=mainnet}
-__MEMPOOL_BACKEND__=${MEMPOOL_BACKEND:=electrum}
-__MEMPOOL_HTTP_PORT__=${BACKEND_HTTP_PORT:=8999}
-__MEMPOOL_SPAWN_CLUSTER_PROCS__=${MEMPOOL_SPAWN_CLUSTER_PROCS:=0}
-__MEMPOOL_API_URL_PREFIX__=${MEMPOOL_API_URL_PREFIX:=/api/v1/}
-__MEMPOOL_POLL_RATE_MS__=${MEMPOOL_POLL_RATE_MS:=2000}
-__MEMPOOL_CACHE_DIR__=${MEMPOOL_CACHE_DIR:=./cache}
-__MEMPOOL_CLEAR_PROTECTION_MINUTES__=${MEMPOOL_CLEAR_PROTECTION_MINUTES:=20}
-__MEMPOOL_RECOMMENDED_FEE_PERCENTILE__=${MEMPOOL_RECOMMENDED_FEE_PERCENTILE:=50}
-__MEMPOOL_BLOCK_WEIGHT_UNITS__=${MEMPOOL_BLOCK_WEIGHT_UNITS:=4000000}
-__MEMPOOL_INITIAL_BLOCKS_AMOUNT__=${MEMPOOL_INITIAL_BLOCKS_AMOUNT:=8}
-__MEMPOOL_MEMPOOL_BLOCKS_AMOUNT__=${MEMPOOL_MEMPOOL_BLOCKS_AMOUNT:=8}
-__MEMPOOL_PRICE_FEED_UPDATE_INTERVAL__=${MEMPOOL_PRICE_FEED_UPDATE_INTERVAL:=3600}
-__MEMPOOL_USE_SECOND_NODE_FOR_MINFEE__=${MEMPOOL_USE_SECOND_NODE_FOR_MINFEE:=false}
-__MEMPOOL_EXTERNAL_ASSETS__=${MEMPOOL_EXTERNAL_ASSETS:=[]}
-
-# CORE_RPC
-__CORE_RPC_HOST__=${CORE_RPC_HOST:=127.0.0.1}
-__CORE_RPC_PORT__=${CORE_RPC_PORT:=8332}
-__CORE_RPC_USERNAME__=${CORE_RPC_USERNAME:=mempool}
-__CORE_RPC_PASSWORD__=${CORE_RPC_PASSWORD:=mempool}
-
+#MEMPOOL
+__MEMPOOL_BACKEND_MAINNET_HTTP_PORT__=${BACKEND_MAINNET_HTTP_PORT:=8999}
+__MEMPOOL_BACKEND_MAINNET_CACHE_DIR__=${CACHE_DIR:=./cache}
+__MEMPOOL_BACKEND_CLEAR_PROTECTION_MINUTES__=${MEMPOOL_CLEAR_PROTECTION_MINUTES:=20}
+# BITCOIN
+__BITCOIN_MAINNET_RPC_HOST__=${RPC_HOST:=127.0.0.1}
+__BITCOIN_MAINNET_RPC_PORT__=${RPC_PORT:=8332}
+__BITCOIN_MAINNET_RPC_USER__=${RPC_USER:=mempool}
+__BITCOIN_MAINNET_RPC_PASS__=${RPC_PASS:=mempool}
 # ELECTRUM
-__ELECTRUM_HOST__=${ELECTRUM_HOST:=127.0.0.1}
-__ELECTRUM_PORT__=${ELECTRUM_PORT:=50002}
-__ELECTRUM_TLS_ENABLED__=${ELECTRUM_TLS:=false}
+__ELECTRUM_MAINNET_HTTP_HOST__=${ELECTRUM_HOST:=127.0.0.1}
+__ELECTRUM_MAINNET_HTTP_PORT__=${ELECTRUM_PORT:=50002} # 50001?
+__ELECTRUM_MAINNET_TLS_ENABLED__=${ELECTRUM_TLS:=false}
+# MYSQL
+__MYSQL_HOST__=${MYSQL_HOST:=127.0.0.1}
+__MYSQL_PORT__=${MYSQL_PORT:=3306}
+__MYSQL_DATABASE__=${MYSQL_DATABASE:=mempool}
+__MYSQL_USERNAME__=${MYSQL_USER:=mempool}
+__MYSQL_PASSWORD__=${MYSQL_PASS:=mempool}
 
-# ESPLORA
-__ESPLORA_REST_API_URL__=${ESPLORA_REST_API_URL:=http://127.0.0.1:3000}
+mkdir -p "${__MEMPOOL_BACKEND_MAINNET_CACHE_DIR__}"
 
-# SECOND_CORE_RPC
-__SECOND_CORE_RPC_HOST__=${SECOND_CORE_RPC_HOST:=127.0.0.1}
-__SECOND_CORE_RPC_PORT__=${SECOND_CORE_RPC_PORT:=8332}
-__SECOND_CORE_RPC_USERNAME__=${SECOND_CORE_RPC_USERNAME:=mempool}
-__SECOND_CORE_RPC_PASSWORD__=${SECOND_CORE_RPC_PASSWORD:=mempool}
-
-# DATABASE
-__DATABASE_ENABLED__=${DATABASE_ENABLED:=true}
-__DATABASE_HOST__=${DATABASE_HOST:=127.0.0.1}
-__DATABASE_PORT__=${DATABASE_PORT:=3306}
-__DATABASE_DATABASE__=${DATABASE_DATABASE:=mempool}
-__DATABASE_USERNAME__=${DATABASE_USERNAME:=mempool}
-__DATABASE_PASSWORD__=${DATABASE_PASSWORD:=mempool}
-
-# SYSLOG
-__SYSLOG_ENABLED__=${SYSLOG_ENABLED:=false}
-__SYSLOG_HOST__=${SYSLOG_HOST:=127.0.0.1}
-__SYSLOG_PORT__=${SYSLOG_PORT:=514}
-__SYSLOG_MIN_PRIORITY__=${SYSLOG_MIN_PRIORITY:=info}
-__SYSLOG_FACILITY__=${SYSLOG_FACILITY:=local7}
-
-# STATISTICS
-__STATISTICS_ENABLED__=${STATISTICS_ENABLED:=true}
-__STATISTICS_TX_PER_SECOND_SAMPLE_PERIOD__=${STATISTICS_TX_PER_SECOND_SAMPLE_PERIOD:=150}
-
-# BISQ
-__BISQ_ENABLED__=${BISQ_ENABLED:=false}
-__BISQ_DATA_PATH__=${BISQ_DATA_PATH:=/bisq/statsnode-data/btc_mainnet/db}
-
-mkdir -p "${__MEMPOOL_CACHE_DIR__}"
-
-sed -i "s/__MEMPOOL_NETWORK__/${__MEMPOOL_NETWORK__}/g" mempool-config.json
-sed -i "s/__MEMPOOL_BACKEND__/${__MEMPOOL_BACKEND__}/g" mempool-config.json
-sed -i "s/__MEMPOOL_HTTP_PORT__/${__MEMPOOL_HTTP_PORT__}/g" mempool-config.json
-sed -i "s/__MEMPOOL_SPAWN_CLUSTER_PROCS__/${__MEMPOOL_SPAWN_CLUSTER_PROCS__}/g" mempool-config.json
-sed -i "s!__MEMPOOL_API_URL_PREFIX__!${__MEMPOOL_API_URL_PREFIX__}!g" mempool-config.json
-sed -i "s/__MEMPOOL_POLL_RATE_MS__/${__MEMPOOL_POLL_RATE_MS__}/g" mempool-config.json
-sed -i "s!__MEMPOOL_CACHE_DIR__!${__MEMPOOL_CACHE_DIR__}!g" mempool-config.json
-sed -i "s/__MEMPOOL_CLEAR_PROTECTION_MINUTES__/${__MEMPOOL_CLEAR_PROTECTION_MINUTES__}/g" mempool-config.json
-sed -i "s/__MEMPOOL_RECOMMENDED_FEE_PERCENTILE__/${__MEMPOOL_RECOMMENDED_FEE_PERCENTILE__}/g" mempool-config.json
-sed -i "s/__MEMPOOL_BLOCK_WEIGHT_UNITS__/${__MEMPOOL_BLOCK_WEIGHT_UNITS__}/g" mempool-config.json
-sed -i "s/__MEMPOOL_INITIAL_BLOCKS_AMOUNT__/${__MEMPOOL_INITIAL_BLOCKS_AMOUNT__}/g" mempool-config.json
-sed -i "s/__MEMPOOL_MEMPOOL_BLOCKS_AMOUNT__/${__MEMPOOL_MEMPOOL_BLOCKS_AMOUNT__}/g" mempool-config.json
-sed -i "s/__MEMPOOL_PRICE_FEED_UPDATE_INTERVAL__/${__MEMPOOL_PRICE_FEED_UPDATE_INTERVAL__}/g" mempool-config.json
-sed -i "s/__MEMPOOL_USE_SECOND_NODE_FOR_MINFEE__/${__MEMPOOL_USE_SECOND_NODE_FOR_MINFEE__}/g" mempool-config.json
-sed -i "s/__MEMPOOL_EXTERNAL_ASSETS__/${__MEMPOOL_EXTERNAL_ASSETS__}/g" mempool-config.json
-
-sed -i "s/__CORE_RPC_HOST__/${__CORE_RPC_HOST__}/g" mempool-config.json
-sed -i "s/__CORE_RPC_PORT__/${__CORE_RPC_PORT__}/g" mempool-config.json
-sed -i "s/__CORE_RPC_USERNAME__/${__CORE_RPC_USERNAME__}/g" mempool-config.json
-sed -i "s/__CORE_RPC_PASSWORD__/${__CORE_RPC_PASSWORD__}/g" mempool-config.json
-
-sed -i "s/__ELECTRUM_HOST__/${__ELECTRUM_HOST__}/g" mempool-config.json
-sed -i "s/__ELECTRUM_PORT__/${__ELECTRUM_PORT__}/g" mempool-config.json
-sed -i "s/__ELECTRUM_TLS_ENABLED__/${__ELECTRUM_TLS_ENABLED__}/g" mempool-config.json
-
-sed -i "s!__ESPLORA_REST_API_URL__!${__ESPLORA_REST_API_URL__}!g" mempool-config.json
-
-sed -i "s/__SECOND_CORE_RPC_HOST__/${__SECOND_CORE_RPC_HOST__}/g" mempool-config.json
-sed -i "s/__SECOND_CORE_RPC_PORT__/${__SECOND_CORE_RPC_PORT__}/g" mempool-config.json
-sed -i "s/__SECOND_CORE_RPC_USERNAME__/${__SECOND_CORE_RPC_USERNAME__}/g" mempool-config.json
-sed -i "s/__SECOND_CORE_RPC_PASSWORD__/${__SECOND_CORE_RPC_PASSWORD__}/g" mempool-config.json
-
-sed -i "s/__DATABASE_ENABLED__/${__DATABASE_ENABLED__}/g" mempool-config.json
-sed -i "s/__DATABASE_HOST__/${__DATABASE_HOST__}/g" mempool-config.json
-sed -i "s/__DATABASE_PORT__/${__DATABASE_PORT__}/g" mempool-config.json
-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/__SYSLOG_ENABLED__/${__SYSLOG_ENABLED__}/g" mempool-config.json
-sed -i "s/__SYSLOG_HOST__/${__SYSLOG_HOST__}/g" mempool-config.json
-sed -i "s/__SYSLOG_PORT__/${__SYSLOG_PORT__}/g" mempool-config.json
-sed -i "s/__SYSLOG_MIN_PRIORITY__/${__SYSLOG_MIN_PRIORITY__}/g" mempool-config.json
-sed -i "s/__SYSLOG_FACILITY__/${__SYSLOG_FACILITY__}/g" mempool-config.json
-
-sed -i "s/__STATISTICS_ENABLED__/${__STATISTICS_ENABLED__}/g" mempool-config.json
-sed -i "s/__STATISTICS_TX_PER_SECOND_SAMPLE_PERIOD__/${__STATISTICS_TX_PER_SECOND_SAMPLE_PERIOD__}/g" mempool-config.json
-
-sed -i "s/__BISQ_ENABLED__/${__BISQ_ENABLED__}/g" mempool-config.json
-sed -i "s!__BISQ_DATA_PATH__!${__BISQ_DATA_PATH__}!g" mempool-config.json
+sed -i "s/__BITCOIN_MAINNET_RPC_HOST__/${__BITCOIN_MAINNET_RPC_HOST__}/g" mempool-config.json
+sed -i "s/__BITCOIN_MAINNET_RPC_PORT__/${__BITCOIN_MAINNET_RPC_PORT__}/g" mempool-config.json
+sed -i "s/__BITCOIN_MAINNET_RPC_USER__/${__BITCOIN_MAINNET_RPC_USER__}/g" mempool-config.json
+sed -i "s/__BITCOIN_MAINNET_RPC_PASS__/${__BITCOIN_MAINNET_RPC_PASS__}/g" mempool-config.json
+sed -i "s/__ELECTRUM_MAINNET_HTTP_HOST__/${__ELECTRUM_MAINNET_HTTP_HOST__}/g" mempool-config.json
+sed -i "s/__ELECTRUM_MAINNET_HTTP_PORT__/${__ELECTRUM_MAINNET_HTTP_PORT__}/g" mempool-config.json
+sed -i "s/__ELECTRUM_MAINNET_TLS_ENABLED__/${__ELECTRUM_MAINNET_TLS_ENABLED__}/g" mempool-config.json
+sed -i "s/__MYSQL_HOST__/${__MYSQL_HOST__}/g" mempool-config.json
+sed -i "s/__MYSQL_PORT__/${__MYSQL_PORT__}/g" mempool-config.json
+sed -i "s/__MYSQL_DATABASE__/${__MYSQL_DATABASE__}/g" mempool-config.json
+sed -i "s/__MYSQL_USERNAME__/${__MYSQL_USERNAME__}/g" mempool-config.json
+sed -i "s/__MYSQL_PASSWORD__/${__MYSQL_PASSWORD__}/g" mempool-config.json
+sed -i "s!__MEMPOOL_BACKEND_MAINNET_CACHE_DIR__!${__MEMPOOL_BACKEND_MAINNET_CACHE_DIR__}!g" mempool-config.json
+sed -i "s/__MEMPOOL_BACKEND_MAINNET_HTTP_PORT__/${__MEMPOOL_BACKEND_MAINNET_HTTP_PORT__}/g" mempool-config.json
+sed -i "s/__MEMPOOL_BACKEND_CLEAR_PROTECTION_MINUTES__/${__MEMPOOL_BACKEND_CLEAR_PROTECTION_MINUTES__}/g" mempool-config.json
 
 node /backend/dist/index.js

docker/docker-compose.yml

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

docker/init.sh

@@ -2,7 +2,7 @@
 
 #backend
 gitMaster="\.\.\/\.git\/refs\/heads\/master"
-git ls-remote https://github.com/mempool/mempool.git "$1^{}" | awk '{ print $1}' > ./backend/master
+git ls-remote https://github.com/mempool/mempool.git $1 | awk '{ print $1}' > ./backend/master
 cp ./docker/backend/* ./backend/
 sed -i "s/${gitMaster}/master/g" ./backend/src/api/backend-info.ts
 

frontend/.gitignore

@@ -50,8 +50,6 @@ Thumbs.db
 
 src/resources/assets.json
 src/resources/assets.minimal.json
-src/resources/assets-testnet.json
-src/resources/assets-testnet.minimal.json
 src/resources/pools.json
 
 # environment config

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

@@ -1,6 +1,6 @@
 describe('Bisq', () => {
     const baseModule = Cypress.env("BASE_MODULE");
-    const basePath = '';
+    const basePath = (baseModule === 'bisq') ? '' : '/bisq';
     
     beforeEach(() => {
         cy.intercept('/sockjs-node/info*').as('socket');
@@ -23,7 +23,7 @@ describe('Bisq', () => {
           });
     });
 
-    if (baseModule === 'bisq') {
+    if (baseModule === 'mempool' || baseModule === 'bisq') {
 
         it('loads the dashboard', () => {
             cy.visit(`${basePath}`);
@@ -59,8 +59,9 @@ describe('Bisq', () => {
             cy.visit(`${basePath}`);
             cy.waitForSkeletonGone();
             cy.get('li:nth-of-type(5) > a').click().then(() => {
-                cy.get('.section-header').should('have.length.at.least', 1);
-                cy.get('.endpoint-container').should('have.length.at.least', 1);
+                cy.get('.card').should('have.length.at.least', 1);
+                cy.get('.card').first().click();
+                cy.get('.card-body');
             });
         });
 

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

@@ -1,6 +1,6 @@
 describe('Liquid', () => {
     const baseModule = Cypress.env("BASE_MODULE");
-    const basePath = '';
+    const basePath = (baseModule === 'liquid') ? '' : '/liquid';
 
     beforeEach(() => {
         cy.intercept('/liquid/api/block/**').as('block');
@@ -16,7 +16,7 @@ describe('Liquid', () => {
           });
     });
 
-    if (baseModule === 'liquid') {
+    if (baseModule === 'mempool' || baseModule === 'liquid') {
 
         it('check first mempool block after skeleton loads', () => {
             cy.visit(`${basePath}`);

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

@@ -296,7 +296,9 @@ describe('Mainnet', () => {
 
             cy.changeNetwork("testnet");
             cy.changeNetwork("signet");
+            cy.changeNetwork("liquid");
             cy.changeNetwork("mainnet");
+            cy.changeNetwork("bisq");
         });
 
         it.skip('loads the dashboard with the skeleton blocks', () => {

frontend/mempool-frontend-config.sample.json

@@ -2,7 +2,6 @@
   "TESTNET_ENABLED": false,
   "SIGNET_ENABLED": false,
   "LIQUID_ENABLED": false,
-  "LIQUID_TESTNET_ENABLED": false,
   "BISQ_ENABLED": false,
   "BISQ_SEPARATE_BACKEND": false,
   "ITEMS_PER_PAGE": 10,
@@ -10,10 +9,7 @@
   "NGINX_PROTOCOL": "http",
   "NGINX_HOSTNAME": "127.0.0.1",
   "NGINX_PORT": "80",
-  "BLOCK_WEIGHT_UNITS": 4000000,
   "MEMPOOL_BLOCKS_AMOUNT": 8,
-  "BASE_MODULE": "mempool",
-  "MEMPOOL_WEBSITE_URL": "https://mempool.space",
-  "LIQUID_WEBSITE_URL": "https://liquid.network",
-  "BISQ_WEBSITE_URL": "https://bisq.markets"
+  "BLOCK_WEIGHT_UNITS": 4000000,
+  "BASE_MODULE": "mempool"
 }

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mempool-frontend",
-  "version": "2.3.0",
+  "version": "2.3.0-dev",
   "description": "Bitcoin mempool visualizer and blockchain explorer backend",
   "license": "GNU Affero General Public License v3.0",
   "homepage": "https://mempool.space",
@@ -34,10 +34,7 @@
     "sync-assets": "node sync-assets.js && rsync -av ./dist/mempool/browser/en-US/resources ./dist/mempool/browser/resources",
     "sync-assets-dev": "node sync-assets.js dev",
     "generate-config": "node generate-config.js",
-    "build-mempool.js": "npm run build-mempool-js && npm run build-mempool-liquid-js && npm run build-mempool-bisq-js",
-    "build-mempool-js": "browserify -p tinyify ./node_modules/@mempool/mempool.js/lib/index.js --standalone mempoolJS > ./dist/mempool/browser/en-US/mempool.js",
-    "build-mempool-bisq-js": "browserify -p tinyify ./node_modules/@mempool/mempool.js/lib/index-bisq.js --standalone bisqJS > ./dist/mempool/browser/en-US/bisq.js",
-    "build-mempool-liquid-js": "browserify -p tinyify ./node_modules/@mempool/mempool.js/lib/index-liquid.js --standalone liquidJS > ./dist/mempool/browser/en-US/liquid.js",
+    "build-mempool.js": "tsc | browserify -p tinyify ./node_modules/@mempool/mempool.js/lib/index.js --standalone mempoolJS > ./dist/mempool/browser/en-US/mempool.js",
     "test": "ng test",
     "lint": "ng lint",
     "e2e": "npm run generate-config && ng e2e",
@@ -56,25 +53,25 @@
     "cypress:run:ci": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true BISQ_ENABLED=true ITEMS_PER_PAGE=25 && npm run generate-config && start-server-and-test serve:local-prod 4200 cypress:run:record"
   },
   "dependencies": {
-    "@angular-devkit/build-angular": "^13.1.2",
-    "@angular/animations": "~13.1.1",
+    "@angular-devkit/build-angular": "^13.0.4",
+    "@angular/animations": "~13.0.3",
     "@angular/cli": "~13.0.4",
-    "@angular/common": "~13.1.1",
-    "@angular/compiler": "~13.1.1",
-    "@angular/core": "~13.1.1",
-    "@angular/forms": "~13.1.1",
-    "@angular/localize": "^13.1.1",
-    "@angular/platform-browser": "~13.1.1",
-    "@angular/platform-browser-dynamic": "~13.1.1",
-    "@angular/platform-server": "~13.1.1",
-    "@angular/router": "~13.1.1",
+    "@angular/common": "~13.0.3",
+    "@angular/compiler": "~13.0.3",
+    "@angular/core": "~13.0.3",
+    "@angular/forms": "~13.0.3",
+    "@angular/localize": "^13.0.3",
+    "@angular/platform-browser": "~13.0.3",
+    "@angular/platform-browser-dynamic": "~13.0.3",
+    "@angular/platform-server": "~13.0.3",
+    "@angular/router": "~13.0.3",
     "@fortawesome/angular-fontawesome": "^0.8.2",
     "@fortawesome/fontawesome-common-types": "^0.2.35",
     "@fortawesome/fontawesome-svg-core": "^1.2.35",
     "@fortawesome/free-solid-svg-icons": "^5.15.3",
     "@juggle/resize-observer": "^3.3.1",
-    "@mempool/mempool.js": "2.3.0",
-    "@ng-bootstrap/ng-bootstrap": "^11.0.0",
+    "@mempool/mempool.js": "^2.2.4",
+    "@ng-bootstrap/ng-bootstrap": "^10.0.0",
     "@nguniversal/express-engine": "11.2.1",
     "@types/qrcode": "1.4.1",
     "bootstrap": "4.5.0",
@@ -95,8 +92,8 @@
     "zone.js": "~0.11.4"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "~13.1.1",
-    "@angular/language-service": "~13.1.1",
+    "@angular/compiler-cli": "~13.0.3",
+    "@angular/language-service": "~13.0.3",
     "@nguniversal/builders": "^11.2.1",
     "@types/express": "^4.17.0",
     "@types/jasmine": "~3.6.0",
@@ -123,4 +120,4 @@
     "mock-socket": "^9.0.3",
     "start-server-and-test": "^1.12.6"
   }
-}
+}

frontend/proxy.conf.js

@@ -24,7 +24,6 @@ PROXY_CONFIG = [
         '/api/**', '!/api/v1/ws', 
         '!/bisq', '!/bisq/**', '!/bisq/',
         '!/liquid', '!/liquid/**', '!/liquid/',
-        '!/liquidtestnet', '!/liquidtestnet/**', '!/liquidtestnet/',
         '/testnet/api/**', '/signet/api/**'
         ],
         target: "https://mempool.space",
@@ -58,16 +57,6 @@ PROXY_CONFIG = [
         ws: true,
         secure: false,
         changeOrigin: true
-    },
-    {
-        context: ['/api/liquidtestnet**', '/liquidtestnet/api/**'],
-        target: "https://liquid.network/testnet",
-        pathRewrite: {
-            "^/api/liquidtestnet/": "/liquidtestnet/api"
-        },
-        ws: true,
-        secure: false,
-        changeOrigin: true
     }
 ];
 

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

@@ -105,6 +105,91 @@ let routes: Routes = [
       },
     ],
   },
+  {
+    path: 'liquid',
+    children: [
+      {
+        path: '',
+        component: MasterPageComponent,
+        children: [
+          {
+            path: 'tx/push',
+            component: PushTransactionComponent,
+          },
+          {
+            path: '',
+            component: StartComponent,
+            children: [
+              {
+                path: '',
+                component: DashboardComponent
+              },
+              {
+                path: 'tx/:id',
+                component: TransactionComponent
+              },
+              {
+                path: 'block/:id',
+                component: BlockComponent
+              },
+              {
+                path: 'mempool-block/:id',
+                component: MempoolBlockComponent
+              },
+            ],
+          },
+          {
+            path: 'blocks',
+            component: LatestBlocksComponent,
+          },
+          {
+            path: 'graphs',
+            component: StatisticsComponent,
+          },
+          {
+            path: 'address/:id',
+            component: AddressComponent
+          },
+          {
+            path: 'asset/:id',
+            component: AssetComponent
+          },
+          {
+            path: 'assets',
+            component: AssetsComponent,
+          },
+          {
+            path: 'docs/api/:type',
+            component: DocsComponent
+          },
+          {
+            path: 'docs/api',
+            redirectTo: 'docs/api/rest'
+          },
+          {
+            path: 'docs',
+            redirectTo: 'docs/api/rest'
+          },
+          {
+            path: 'api',
+            redirectTo: 'docs/api/rest'
+          },
+        ],
+      },
+      {
+        path: 'tv',
+        component: TelevisionComponent
+      },
+      {
+        path: 'status',
+        component: StatusViewComponent
+      },
+      {
+        path: '**',
+        redirectTo: ''
+      },
+    ]
+  },
   {
     path: 'testnet',
     children: [
@@ -261,6 +346,11 @@ let routes: Routes = [
       },
     ]
   },
+  {
+    path: 'bisq',
+    component: MasterPageComponent,
+    loadChildren: () => import('./bisq/bisq.module').then(m => m.BisqModule)
+  },
   {
     path: 'tv',
     component: TelevisionComponent,
@@ -376,107 +466,6 @@ if (browserWindowEnv && browserWindowEnv.BASE_MODULE === 'liquid') {
       },
     ],
   },
-  {
-    path: 'testnet',
-    children: [
-      {
-        path: '',
-        component: LiquidMasterPageComponent,
-        children: [
-          {
-            path: '',
-            component: StartComponent,
-            children: [
-              {
-                path: '',
-                component: DashboardComponent
-              },
-              {
-                path: 'tx/push',
-                component: PushTransactionComponent,
-              },
-              {
-                path: 'tx/:id',
-                component: TransactionComponent
-              },
-              {
-                path: 'block/:id',
-                component: BlockComponent
-              },
-              {
-                path: 'mempool-block/:id',
-                component: MempoolBlockComponent
-              },
-            ],
-          },
-          {
-            path: 'blocks',
-            component: LatestBlocksComponent,
-          },
-          {
-            path: 'graphs',
-            component: StatisticsComponent,
-          },
-          {
-            path: 'address/:id',
-            component: AddressComponent
-          },
-          {
-            path: 'asset/:id',
-            component: AssetComponent
-          },
-          {
-            path: 'assets',
-            component: AssetsComponent,
-          },
-          {
-            path: 'docs/api/:type',
-            component: DocsComponent
-          },
-          {
-            path: 'docs/api',
-            redirectTo: 'docs/api/rest'
-          },
-          {
-            path: 'docs',
-            redirectTo: 'docs/api/rest'
-          },
-          {
-            path: 'api',
-            redirectTo: 'docs/api/rest'
-          },
-          {
-            path: 'about',
-            component: AboutComponent,
-          },
-          {
-            path: 'terms-of-service',
-            component: TermsOfServiceComponent
-          },
-          {
-            path: 'privacy-policy',
-            component: PrivacyPolicyComponent
-          },
-          {
-            path: 'trademark-policy',
-            component: TrademarkPolicyComponent
-          },
-          {
-            path: 'sponsor',
-            component: SponsorComponent,
-          },
-        ],
-      },
-      {
-        path: 'tv',
-        component: TelevisionComponent
-      },
-      {
-        path: 'status',
-        component: StatusViewComponent
-      },
-    ]
-  },
   {
     path: 'tv',
     component: TelevisionComponent

frontend/src/app/app.module.ts

@@ -48,20 +48,17 @@ import { FeesBoxComponent } from './components/fees-box/fees-box.component';
 import { DashboardComponent } from './dashboard/dashboard.component';
 import { FontAwesomeModule, FaIconLibrary } from '@fortawesome/angular-fontawesome';
 import { faFilter, faAngleDown, faAngleUp, faAngleRight, faAngleLeft, faBolt, faChartArea, faCogs, faCubes, faDatabase, faExchangeAlt, faInfoCircle,
-  faLink, faList, faSearch, faCaretUp, faCaretDown, faTachometerAlt, faThList, faTint, faTv, faAngleDoubleDown, faSortUp, faAngleDoubleUp, faChevronDown, faFileAlt, faRedoAlt, faArrowAltCircleRight, faExternalLinkAlt, faBook, faListUl } from '@fortawesome/free-solid-svg-icons';
+  faLink, faList, faSearch, faCaretUp, faCaretDown, faTachometerAlt, faThList, faTint, faTv, faAngleDoubleDown, faSortUp, faAngleDoubleUp, faChevronDown, faFileAlt, faRedoAlt, faArrowAltCircleRight, faExternalLinkAlt, faBook } from '@fortawesome/free-solid-svg-icons';
 import { ApiDocsComponent } from './components/docs/api-docs.component';
 import { DocsComponent } from './components/docs/docs.component';
-import { ApiDocsNavComponent } from './components/docs/api-docs-nav.component';
 import { CodeTemplateComponent } from './components/docs/code-template.component';
 import { TermsOfServiceComponent } from './components/terms-of-service/terms-of-service.component';
 import { PrivacyPolicyComponent } from './components/privacy-policy/privacy-policy.component';
 import { TrademarkPolicyComponent } from './components/trademark-policy/trademark-policy.component';
 import { StorageService } from './services/storage.service';
 import { HttpCacheInterceptor } from './services/http-cache.interceptor';
-import { LanguageService } from './services/language.service';
 import { SponsorComponent } from './components/sponsor/sponsor.component';
 import { PushTransactionComponent } from './components/push-transaction/push-transaction.component';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 
 @NgModule({
   declarations: [
@@ -105,7 +102,6 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
     SponsorComponent,
     PushTransactionComponent,
     DocsComponent,
-    ApiDocsNavComponent,
   ],
   imports: [
     BrowserModule.withServerTransition({ appId: 'serverApp' }),
@@ -115,7 +111,6 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
     BrowserAnimationsModule,
     InfiniteScrollModule,
     NgbTypeaheadModule,
-    NgbModule,
     FontAwesomeModule,
     SharedModule,
     NgxEchartsModule.forRoot({
@@ -129,7 +124,6 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
     AudioService,
     SeoService,
     StorageService,
-    LanguageService,
     { provide: HTTP_INTERCEPTORS, useClass: HttpCacheInterceptor, multi: true }
   ],
   bootstrap: [AppComponent]
@@ -167,6 +161,5 @@ export class AppModule {
     library.addIcons(faAngleRight);
     library.addIcons(faAngleLeft);
     library.addIcons(faBook);
-    library.addIcons(faListUl);
   }
 }

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

@@ -7,7 +7,6 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { merge, combineLatest, Observable } from 'rxjs';
 import { AssetExtended } from '../interfaces/electrs.interface';
 import { SeoService } from '../services/seo.service';
-import { StateService } from '../services/state.service';
 
 @Component({
   selector: 'app-assets',
@@ -16,8 +15,7 @@ import { StateService } from '../services/state.service';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class AssetsComponent implements OnInit {
-  nativeAssetId = this.stateService.network === 'liquidtestnet' ? environment.nativeTestAssetId : environment.nativeAssetId;
-
+  nativeAssetId = environment.nativeAssetId;
   assets: AssetExtended[];
   assetsCache: AssetExtended[];
   searchForm: FormGroup;
@@ -36,7 +34,6 @@ export class AssetsComponent implements OnInit {
     private route: ActivatedRoute,
     private router: Router,
     private seoService: SeoService,
-    private stateService: StateService,
   ) { }
 
   ngOnInit() {
@@ -55,22 +52,12 @@ export class AssetsComponent implements OnInit {
       take(1),
       mergeMap(([assets, qp]) => {
         this.assets = Object.values(assets);
-        if (this.stateService.network === 'liquid') {
-          // @ts-ignore
-          this.assets.push({
-            name: 'Liquid Bitcoin',
-            ticker: 'L-BTC',
-            asset_id: this.nativeAssetId,
-          });
-        } else if (this.stateService.network === 'liquidtestnet') {
-          // @ts-ignore
-          this.assets.push({
-            name: 'Test Liquid Bitcoin',
-            ticker: 'tL-BTC',
-            asset_id: this.nativeAssetId,
-          });
-        }
-
+        // @ts-ignore
+        this.assets.push({
+          name: 'Liquid Bitcoin',
+          ticker: 'L-BTC',
+          asset_id: this.nativeAssetId,
+        });
         this.assets = this.assets.sort((a: any, b: any) => a.name.localeCompare(b.name));
         this.assetsCache = this.assets;
         this.searchForm.get('searchText').enable();

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

@@ -105,12 +105,10 @@
   </ng-container>
   </div>
 
-  <app-language-selector></app-language-selector>
+  <app-language-selector *ngIf="stateService.env.BASE_MODULE !== 'bisq'"></app-language-selector>
 
   <div class="text-small text-center mt-3">
     <a [routerLink]="['/terms-of-service']" i18n="shared.terms-of-service|Terms of Service">Terms of Service</a>
-    |
-    <a [routerLink]="['/privacy-policy']" i18n="shared.privacy-policy|Privacy Policy">Privacy Policy</a>
   </div>
 
 </div>

frontend/src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.ts

@@ -33,7 +33,7 @@ export class BisqMainDashboardComponent implements OnInit {
   ) { }
 
   ngOnInit(): void {
-    this.seoService.resetTitle();
+    this.seoService.setTitle(`Markets`);
     this.websocketService.want(['blocks']);
 
     this.usdPrice$ = this.stateService.conversions$.asObservable().pipe(

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

@@ -4,7 +4,7 @@
     <span style="margin-left: auto; margin-right: -20px; margin-bottom: -20px">&trade;</span>
     <img class="logo" src="./resources/mempool-logo-bigger.png" />
     <div class="version">
-      v{{ packetJsonVersion }} [<a href="https://github.com/mempool/mempool/commit/{{ frontendGitCommitHash }}">{{ frontendGitCommitHash }}</a>]
+      v{{ packetJsonVersion }} [{{ frontendGitCommitHash }}]
     </div>
   </div>
 
@@ -23,12 +23,12 @@
     <a target="_blank" href="https://twitter.com/mempool">
       <svg aria-hidden="true" focusable="false" data-prefix="fab" data-icon="twitter" class="svg-inline--fa fa-twitter fa-w-16 fa-4x" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M459.37 151.716c.325 4.548.325 9.097.325 13.645 0 138.72-105.583 298.558-298.558 298.558-59.452 0-114.68-17.219-161.137-47.106 8.447.974 16.568 1.299 25.34 1.299 49.055 0 94.213-16.568 130.274-44.832-46.132-.975-84.792-31.188-98.112-72.772 6.498.974 12.995 1.624 19.818 1.624 9.421 0 18.843-1.3 27.614-3.573-48.081-9.747-84.143-51.98-84.143-102.985v-1.299c13.969 7.797 30.214 12.67 47.431 13.319-28.264-18.843-46.781-51.005-46.781-87.391 0-19.492 5.197-37.36 14.294-52.954 51.655 63.675 129.3 105.258 216.365 109.807-1.624-7.797-2.599-15.918-2.599-24.04 0-57.828 46.782-104.934 104.934-104.934 30.213 0 57.502 12.67 76.67 33.137 23.715-4.548 46.456-13.32 66.599-25.34-7.798 24.366-24.366 44.833-46.132 57.827 21.117-2.273 41.584-8.122 60.426-16.243-14.292 20.791-32.161 39.308-52.628 54.253z"></path></svg>
     </a>
+    <a target="_blank" href="https://t.me/mempoolspace">
+      <svg aria-hidden="true" focusable="false" data-prefix="fab" data-icon="telegram-plane" class="svg-inline--fa fa-telegram-plane fa-w-14 fa-4x" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="currentColor" d="M446.7 98.6l-67.6 318.8c-5.1 22.5-18.4 28.1-37.3 17.5l-103-75.9-49.7 47.8c-5.5 5.5-10.1 10.1-20.7 10.1l7.4-104.9 190.9-172.5c8.3-7.4-1.8-11.5-12.9-4.1L117.8 284 16.2 252.2c-22.1-6.9-22.5-22.1 4.6-32.7L418.2 66.4c18.4-6.9 34.5 4.1 28.5 32.2z"></path></svg>
+    </a>
     <a target="_blank" href="https://keybase.io/team/mempool">
       <svg aria-hidden="true" focusable="false" data-prefix="fab" data-icon="keybase" class="svg-inline--fa fa-keybase fa-w-14 fa-4x" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="currentColor" d="M286.17 419a18 18 0 1 0 18 18 18 18 0 0 0-18-18zm111.92-147.6c-9.5-14.62-39.37-52.45-87.26-73.71q-9.1-4.06-18.38-7.27a78.43 78.43 0 0 0-47.88-104.13c-12.41-4.1-23.33-6-32.41-5.77-.6-2-1.89-11 9.4-35L198.66 32l-5.48 7.56c-8.69 12.06-16.92 23.55-24.34 34.89a51 51 0 0 0-8.29-1.25c-41.53-2.45-39-2.33-41.06-2.33-50.61 0-50.75 52.12-50.75 45.88l-2.36 36.68c-1.61 27 19.75 50.21 47.63 51.85l8.93.54a214 214 0 0 0-46.29 35.54C14 304.66 14 374 14 429.77v33.64l23.32-29.8a148.6 148.6 0 0 0 14.56 37.56c5.78 10.13 14.87 9.45 19.64 7.33 4.21-1.87 10-6.92 3.75-20.11a178.29 178.29 0 0 1-15.76-53.13l46.82-59.83-24.66 74.11c58.23-42.4 157.38-61.76 236.25-38.59 34.2 10.05 67.45.69 84.74-23.84.72-1 1.2-2.16 1.85-3.22a156.09 156.09 0 0 1 2.8 28.43c0 23.3-3.69 52.93-14.88 81.64-2.52 6.46 1.76 14.5 8.6 15.74 7.42 1.57 15.33-3.1 18.37-11.15C429 443 434 414 434 382.32c0-38.58-13-77.46-35.91-110.92zM142.37 128.58l-15.7-.93-1.39 21.79 13.13.78a93 93 0 0 0 .32 19.57l-22.38-1.34a12.28 12.28 0 0 1-11.76-12.79L107 119c1-12.17 13.87-11.27 13.26-11.32l29.11 1.73a144.35 144.35 0 0 0-7 19.17zm148.42 172.18a10.51 10.51 0 0 1-14.35-1.39l-9.68-11.49-34.42 27a8.09 8.09 0 0 1-11.13-1.08l-15.78-18.64a7.38 7.38 0 0 1 1.34-10.34l34.57-27.18-14.14-16.74-17.09 13.45a7.75 7.75 0 0 1-10.59-1s-3.72-4.42-3.8-4.53a7.38 7.38 0 0 1 1.37-10.34L214 225.19s-18.51-22-18.6-22.14a9.56 9.56 0 0 1 1.74-13.42 10.38 10.38 0 0 1 14.3 1.37l81.09 96.32a9.58 9.58 0 0 1-1.74 13.44zM187.44 419a18 18 0 1 0 18 18 18 18 0 0 0-18-18z"></path></svg>
     </a>
-    <a target="_blank" href="https://matrix.to/#/#mempool:bitcoin.kyoto">
-      <svg aria-hidden="true" focusable="false" data-prefix="fab" data-icon="matrix" class="svg-inline--fa fa-matrix fa-w-16 fa-4x" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1536 1792"><path fill="currentColor" d="M40.467 163.152v1465.696H145.92V1664H0V128h145.92v35.152zm450.757 464.64v74.14h2.069c19.79-28.356 43.717-50.215 71.483-65.575 27.765-15.656 59.963-23.336 96-23.336 34.56 0 66.165 6.795 94.818 20.086 28.652 13.293 50.216 37.22 65.28 70.893 16.246-23.926 38.4-45.194 66.166-63.507 27.766-18.314 60.848-27.472 98.954-27.472 28.948 0 55.828 3.545 80.64 10.635 24.812 7.088 45.785 18.314 63.508 33.968 17.722 15.656 31.31 35.742 41.354 60.85 9.747 25.107 14.768 55.236 14.768 90.683v366.573h-150.35V865.28c0-18.314-.59-35.741-2.068-51.987-1.476-16.247-5.316-30.426-11.52-42.24-6.499-12.112-15.656-21.563-28.062-28.653-12.405-7.088-29.242-10.634-50.214-10.634-21.268 0-38.4 4.135-51.397 12.112-12.997 8.27-23.336 18.608-30.72 31.901-7.386 12.997-12.407 27.765-14.77 44.602-2.363 16.542-3.84 33.379-3.84 50.216v305.133H692.971v-307.2c0-16.247-.294-32.197-1.18-48.149-.591-15.95-3.84-30.424-9.157-44.011-5.317-13.293-14.178-24.223-26.585-32.197-12.406-7.976-30.425-12.112-54.646-12.112-7.088 0-16.542 1.478-28.062 4.726-11.52 3.25-23.04 9.157-33.968 18.02-10.93 8.86-20.383 21.563-28.063 38.103-7.68 16.543-11.52 38.4-11.52 65.28v317.834H349.44V627.792zm1004.309 1001.056V163.152H1390.08V128H1536v1536h-145.92v-35.152z"/></svg>
-    </a>
   </div>
 
   <div class="enterprise-sponsor">
@@ -102,10 +102,6 @@
         <img class="image" src="/resources/profile/ronindojo.png" />
         <span>RoninDojo</span>
       </a>
-      <a href="https://github.com/runcitadel/dashboard" target="_blank" title="Citadel">
-        <img class="image" src="/resources/profile/runcitadel.svg" />
-        <span>Citadel</span>
-      </a>
       <a href="https://github.com/spesmilo/electrum" target="_blank" title="Electrum Wallet">
         <img class="image" src="/resources/profile/electrum.jpg" />
         <span>Electrum</span>
@@ -146,6 +142,10 @@
         <img class="image" src="/resources/profile/satpile.jpg" />
         <span>Satpile</span>
       </a>
+      <a href="https://github.com/btcontract/lnwallet" target="_blank" title="Bitcoin Lightning Wallet">
+        <img class="image" src="/resources/profile/blw.png" />
+        <span>BLW</span>
+      </a>
     </div>
   </div>
 
@@ -163,20 +163,6 @@
       </a>
     </div>
   </div>
-
-  <ng-container *ngIf="translators$ | async | keyvalue as translators else loadingSponsors">
-    <div class="community-sponsor">
-      <h3 i18n="about.translators">Project Translators</h3>
-      <div class="wrapper">
-        <ng-template ngFor let-translator [ngForOf]="translators">
-          <a [href]="'https://twitter.com/' + translator.value" target="_blank" [title]="translator.key">
-            <img class="image" [src]="'/api/v1/translators/images/' + translator.value" />
-          </a>
-        </ng-template>
-      </div>
-    </div>
-    <br>
-  </ng-container>
   
   <ng-container *ngIf="allContributors$ | async as contributors else loadingSponsors">
     <div class="contributors">
@@ -192,7 +178,7 @@
     </div>
 
     <div class="maintainers" *ngIf="contributors.core.length">
-      <h3 i18n="about.project_members">Project Members</h3>
+      <h3 i18n="about.project_staff">Project Staff</h3>
       <div class="wrapper">
         <ng-template ngFor let-contributor [ngForOf]="contributors.core">
           <a [href]="'https://github.com/' + contributor.name" target="_blank" [title]="contributor.name">
@@ -254,7 +240,7 @@
   </div>
   
   <div class="footer-version" *ngIf="officialMempoolSpace">
-    {{ (backendInfo$ | async)?.hostname }} (v{{ (backendInfo$ | async )?.version }}) [<a href="https://github.com/mempool/mempool/commit/{{ (backendInfo$ | async )?.gitCommit | slice:0:8 }}">{{ (backendInfo$ | async )?.gitCommit | slice:0:8 }}</a>]
+    {{ (backendInfo$ | async)?.hostname }} (v{{ (backendInfo$ | async )?.version }}) [{{ (backendInfo$ | async )?.gitCommit | slice:0:8 }}]
   </div>
 
 </div>

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

@@ -116,7 +116,7 @@
         &:hover {
           text-decoration: none;
           img {
-            transform: scale(1.1);
+            box-shadow: 0px 0px 20px #1bd8f4;
           }
         }
         img, span{
@@ -180,4 +180,4 @@
 
 .no-about-margin {
   height: 10px;
-}
+}

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

@@ -7,7 +7,6 @@ import { ApiService } from 'src/app/services/api.service';
 import { IBackendInfo } from 'src/app/interfaces/websocket.interface';
 import { Router } from '@angular/router';
 import { map } from 'rxjs/operators';
-import { ITranslators } from 'src/app/interfaces/node-api.interface';
 
 @Component({
   selector: 'app-about',
@@ -18,7 +17,6 @@ import { ITranslators } from 'src/app/interfaces/node-api.interface';
 export class AboutComponent implements OnInit {
   backendInfo$: Observable<IBackendInfo>;
   sponsors$: Observable<any>;
-  translators$: Observable<ITranslators>;
   allContributors$: Observable<any>;
   frontendGitCommitHash = this.stateService.env.GIT_COMMIT_HASH;
   packetJsonVersion = this.stateService.env.PACKAGE_JSON_VERSION;
@@ -40,17 +38,6 @@ export class AboutComponent implements OnInit {
     this.websocketService.want(['blocks']);
 
     this.sponsors$ = this.apiService.getDonation$();
-    this.translators$ = this.apiService.getTranslators$()
-      .pipe(
-        map((translators) => {
-          for (const t in translators) {
-            if (translators[t] === '') {
-              delete translators[t]
-            }
-          }
-          return translators;
-        })
-      );
     this.allContributors$ = this.apiService.getContributor$().pipe(
       map((contributors) => {
         return {

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

@@ -99,7 +99,7 @@ export class AddressComponent implements OnInit, OnDestroy {
       .pipe(
         filter((address) => !!address),
         tap((address: Address) => {
-          if ((this.stateService.network === 'liquid' || this.stateService.network === 'liquidtestnet') && /^([m-zA-HJ-NP-Z1-9]{26,35}|[a-z]{2,5}1[ac-hj-np-z02-9]{8,100}|[a-km-zA-HJ-NP-Z1-9]{80})$/.test(address.address)) {
+          if (this.stateService.network === 'liquid' && /^([m-zA-HJ-NP-Z1-9]{26,35}|[a-z]{2,5}1[ac-hj-np-z02-9]{8,100}|[a-km-zA-HJ-NP-Z1-9]{80})$/.test(address.address)) {
             this.apiService.validateAddress$(address.address)
               .subscribe((addressInfo) => {
                 this.addressInfo = addressInfo;

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

@@ -2,13 +2,12 @@
   <span class="fiat">{{ conversions.USD * (satoshis / 100000000) | currency:'USD':'symbol':'1.2-2' }}</span>
 </ng-container>
 <ng-template #viewFiatVin>
-  <ng-template [ngIf]="(network === 'liquid' || network === 'liquidtestnet') && (satoshis === undefined || satoshis === null)" [ngIfElse]="default">
+  <ng-template [ngIf]="network === 'liquid' && (satoshis === undefined || satoshis === null)" [ngIfElse]="default">
     <span i18n="shared.confidential">Confidential</span>
   </ng-template>
   <ng-template #default>
     &lrm;{{ satoshis / 100000000 | number : digitsInfo }}
     <span class="symbol"><ng-template [ngIf]="network === 'liquid'">L-</ng-template>
-    <ng-template [ngIf]="network === 'liquidtestnet'">tL-</ng-template>
     <ng-template [ngIf]="network === 'testnet'">t</ng-template>
     <ng-template [ngIf]="network === 'signet'">s</ng-template>BTC</span>
   </ng-template>

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

@@ -31,7 +31,7 @@
                 <td i18n="asset.issuer|Liquid Asset issuer">Issuer</td>
                 <td><a target="_blank" href="{{ 'http://' + assetContract[0] }}">{{ assetContract[0] }}</a></td>
               </tr>
-              <tr *ngIf="asset.issuance_txin">
+              <tr *ngIf="!isNativeAsset">
                 <td i18n="asset.issuance-tx|Liquid Asset issuance TX">Issuance TX</td>
                 <td><a [routerLink]="['/tx/' | relativeUrl, asset.issuance_txin.txid]">{{ asset.issuance_txin.txid | shortenString : 13 }}</a> <app-clipboard class="d-none d-sm-inline-block" [text]="asset.issuance_txin.txid"></app-clipboard></td>
               </tr>
@@ -42,15 +42,15 @@
         <div class="col">
           <table class="table table-borderless table-striped">
             <tbody>
-              <tr *ngIf="isNativeAsset && asset.chain_stats.peg_in_amount">
+              <tr *ngIf="isNativeAsset">
                 <td i18n="asset.pegged-in|Liquid Asset pegged-in amount">Pegged in</td>
                 <td>{{ formatAmount(asset.chain_stats.peg_in_amount, assetContract[3]) | number: '1.0-' + assetContract[3] }} {{ assetContract[1] }}</td>
               </tr>
-              <tr *ngIf="isNativeAsset && asset.chain_stats.peg_out_amount">
+              <tr *ngIf="isNativeAsset">
                 <td i18n="asset.pegged-out|Liquid Asset pegged-out amount">Pegged out</td>
                 <td>{{ formatAmount(asset.chain_stats.peg_out_amount, assetContract[3]) | number: '1.0-' + assetContract[3] }} {{ assetContract[1] }}</td>
               </tr>
-              <tr *ngIf="asset.chain_stats.issued_amount">
+              <tr *ngIf="!isNativeAsset">
                 <td i18n="asset.issued-amount|Liquid Asset issued amount">Issued amount</td>
                 <td *ngIf="!blindedIssuance; else confidentialTd">{{ formatAmount(asset.chain_stats.issued_amount, assetContract[3]) | number: '1.0-' + assetContract[3] }} {{ assetContract[1] }}</td>
               </tr>
@@ -58,11 +58,11 @@
                 <td i18n="asset.burned-amount|Liquid Asset burned amount">Burned amount</td>
                 <td *ngIf="!blindedIssuance; else confidentialTd">{{ formatAmount(asset.chain_stats.burned_amount, assetContract[3]) | number: '1.0-' + assetContract[3] }} {{ assetContract[1] }}</td>
               </tr>
-              <tr *ngIf="asset.chain_stats.issued_amount">
+              <tr *ngIf="!isNativeAsset">
                 <td i18n="asset.circulating-amount|Liquid Asset circulating amount">Circulating amount</td>
                 <td *ngIf="!blindedIssuance; else confidentialTd">{{ formatAmount(asset.chain_stats.issued_amount - asset.chain_stats.burned_amount, assetContract[3]) | number: '1.0-' + assetContract[3] }} {{ assetContract[1] }}</td>
               </tr>
-              <tr *ngIf="isNativeAsset && asset.chain_stats.peg_in_amount">
+              <tr *ngIf="isNativeAsset">
                 <td i18n="asset.circulating-amount|Liquid Asset circulating amount">Circulating amount</td>
                 <td>{{ formatAmount(asset.chain_stats.peg_in_amount - asset.chain_stats.burned_amount - asset.chain_stats.peg_out_amount, assetContract[3]) | number: '1.0-' + assetContract[3] }} {{ assetContract[1] }}</td>
               </tr>
@@ -78,7 +78,7 @@
     <div class="title-tx">
       <h2>
         <ng-template [ngIf]="transactions?.length" i18n="asset.M_of_N">{{ (transactions?.length | number) || '?' }} of {{ txCount | number }}&nbsp;</ng-template>
-        <ng-template [ngIf]="isNativeAsset && network === 'liquid'" [ngIfElse]="defaultAsset" i18n="Liquid native asset transactions title">Peg In/Out and Burn Transactions</ng-template>
+        <ng-template [ngIf]="isNativeAsset" [ngIfElse]="defaultAsset" i18n="Liquid native asset transactions title">Peg In/Out and Burn Transactions</ng-template>
         <ng-template #defaultAsset i18n="Default asset transactions title">Issuance and Burn Transactions</ng-template>
       </h2>
     </div>

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

@@ -20,7 +20,7 @@ import { moveDec } from 'src/app/bitcoin.utils';
 })
 export class AssetComponent implements OnInit, OnDestroy {
   network = '';
-  nativeAssetId = this.stateService.network === 'liquidtestnet' ? environment.nativeTestAssetId : environment.nativeAssetId;
+  nativeAssetId = environment.nativeAssetId;
 
   asset: Asset;
   blindedIssuance: boolean;

frontend/src/app/components/bisq-master-page/bisq-master-page.component.html

@@ -10,18 +10,17 @@
     </ng-container>
   </a>
 
-  <div ngbDropdown (window:resize)="onResize($event)" class="dropdown-container" *ngIf="env.TESTNET_ENABLED || env.SIGNET_ENABLED || env.LIQUID_ENABLED || env.BISQ_ENABLED || env.LIQUID_TESTNET_ENABLED">
+  <div ngbDropdown (window:resize)="onResize($event)" class="dropdown-container" *ngIf="env.TESTNET_ENABLED || env.SIGNET_ENABLED || env.LIQUID_ENABLED || env.BISQ_ENABLED">
     <button ngbDropdownToggle type="button" class="btn btn-secondary dropdown-toggle-split" aria-haspopup="true">
       <img src="./resources/bisq-logo.png" style="width: 25px; height: 25px;" class="mr-1">
     </button>
     <div ngbDropdownMenu [ngClass]="{'dropdown-menu-right' : isMobile}">
-      <a [href]="env.MEMPOOL_WEBSITE_URL + urlLanguage" ngbDropdownItem class="mainnet"><img src="./resources/bitcoin-logo.png" style="width: 30px;" class="mr-1"> Mainnet</a>
-      <a [href]="env.MEMPOOL_WEBSITE_URL + urlLanguage + '/signet'" ngbDropdownItem *ngIf="env.SIGNET_ENABLED" class="signet"><img src="./resources/signet-logo.png" style="width: 30px;" class="mr-1"> Signet</a>
-      <a [href]="env.MEMPOOL_WEBSITE_URL + urlLanguage + '/testnet'" ngbDropdownItem *ngIf="env.TESTNET_ENABLED" class="testnet"><img src="./resources/testnet-logo.png" style="width: 30px;" class="mr-1"> Testnet</a>
+      <a href="https://mempool.space" ngbDropdownItem class="mainnet"><img src="./resources/bitcoin-logo.png" style="width: 30px;" class="mr-1"> Mainnet</a>
+      <a href="https://mempool.space/signet" ngbDropdownItem *ngIf="env.SIGNET_ENABLED" class="signet"><img src="./resources/signet-logo.png" style="width: 30px;" class="mr-1"> Signet</a>
+      <a href="https://mempool.space/testnet" ngbDropdownItem *ngIf="env.TESTNET_ENABLED" class="testnet"><img src="./resources/testnet-logo.png" style="width: 30px;" class="mr-1"> Testnet</a>
       <h6 class="dropdown-header" i18n="master-page.layer2-networks-header">Layer 2 Networks</h6>
       <button ngbDropdownItem class="mainnet active" routerLink="/"><img src="./resources/bisq-logo.png" style="width: 30px;" class="mr-1"> Bisq</button>
-      <a [href]="env.LIQUID_WEBSITE_URL + urlLanguage" ngbDropdownItem *ngIf="env.LIQUID_ENABLED" class="liquid"><img src="./resources/liquid-logo.png" style="width: 30px;" class="mr-1"> Liquid</a>
-      <a [href]="env.LIQUID_WEBSITE_URL + urlLanguage + '/testnet'" ngbDropdownItem *ngIf="env.LIQUID_TESTNET_ENABLED" class="liquidtestnet"><img src="./resources/liquidtestnet-logo.png" style="width: 30px;" class="mr-1"> Liquid Testnet</a>
+      <a href="https://liquid.network" ngbDropdownItem *ngIf="env.LIQUID_ENABLED" class="liquid"><img src="./resources/liquid-logo.png" style="width: 30px;" class="mr-1"> Liquid</a>
     </div>
   </div>
 

frontend/src/app/components/bisq-master-page/bisq-master-page.component.scss

@@ -102,10 +102,6 @@ nav {
   background-color: #116761;
 }
 
-.liquidtestnet.active {
-  background-color: #494a4a;
-}
-
 .testnet.active {
   background-color: #1d486f;
 }

frontend/src/app/components/bisq-master-page/bisq-master-page.component.ts

@@ -1,7 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { Env, StateService } from '../../services/state.service';
 import { Observable } from 'rxjs';
-import { LanguageService } from 'src/app/services/language.service';
 
 @Component({
   selector: 'app-bisq-master-page',
@@ -13,17 +12,14 @@ export class BisqMasterPageComponent implements OnInit {
   navCollapsed = false;
   env: Env;
   isMobile = window.innerWidth <= 767.98;
-  urlLanguage: string;
-
+  
   constructor(
     private stateService: StateService,
-    private languageService: LanguageService,
   ) { }
 
   ngOnInit() {
     this.env = this.stateService.env;
     this.connectionState$ = this.stateService.connectionState$;
-    this.urlLanguage = this.languageService.getLanguageForUrl();
   }
 
   collapse(): void {

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

@@ -81,12 +81,12 @@
               <ng-template [ngIf]="fees !== undefined" [ngIfElse]="loadingFees">
                 <tr>
                   <td i18n="block.total-fees|Total fees in a block">Total fees</td>
-                  <td *ngIf="network !== 'liquid' && network !== 'liquidtestnet'; else liquidTotalFees"><app-amount [satoshis]="fees * 100000000" digitsInfo="1.2-2" [noFiat]="true"></app-amount> <span class="fiat"><app-fiat [value]="fees * 100000000" digitsInfo="1.0-0"></app-fiat></span></td>
+                  <td *ngIf="network !== 'liquid'; else liquidTotalFees"><app-amount [satoshis]="fees * 100000000" digitsInfo="1.2-2" [noFiat]="true"></app-amount> <span class="fiat"><app-fiat [value]="fees * 100000000" digitsInfo="1.0-0"></app-fiat></span></td>
                   <ng-template #liquidTotalFees>
-                    <td><app-amount [satoshis]="fees * 100000000" digitsInfo="1.2-2" [noFiat]="true"></app-amount>&nbsp; <app-fiat [value]="fees * 100000000" digitsInfo="1.2-2"></app-fiat></td>
+                    <td>{{ fees * 100000000 | number }} L-sat (<app-fiat [value]="fees * 100000000" digitsInfo="1.2-2"></app-fiat>)</td>
                   </ng-template>
                 </tr>
-                <tr *ngIf="network !== 'liquid' && network !== 'liquidtestnet'">
+                <tr *ngIf="network !== 'liquid'">
                   <td i18n="block.subsidy-and-fees|Total subsidy and fees in a block">Subsidy + fees:</td>
                   <td>
                     <app-amount [satoshis]="(blockSubsidy + fees) * 100000000" digitsInfo="1.2-2" [noFiat]="true"></app-amount> <span class="fiat"><app-fiat [value]="(blockSubsidy + fees) * 100000000" digitsInfo="1.0-0"></app-fiat></span>
@@ -98,7 +98,7 @@
                   <td i18n="block.total-fees|Total fees in a block">Total fees</td>
                   <td style="width: 75%;"><span class="skeleton-loader"></span></td>
                 </tr>
-                <tr *ngIf="network !== 'liquid' && network !== 'liquidtestnet'">
+                <tr *ngIf="network !== 'liquid'">
                   <td i18n="block.subsidy-and-fees|Total subsidy and fees in a block">Subsidy + fees:</td>
                   <td><span class="skeleton-loader"></span></td>
                 </tr>
@@ -125,7 +125,7 @@
                   <td class="td-width" i18n="transaction.version">Version</td>
                   <td>{{ block.version | decimal2hex }} <span *ngIf="displayTaprootStatus() && hasTaproot(block.version)" class="badge badge-success ml-1" >Taproot</span></td>
                 </tr>
-                <tr *ngIf="network !== 'liquid' && network !== 'liquidtestnet'">
+                <tr *ngIf="network !== 'liquid'">
                   <td i18n="block.bits">Bits</td>
                   <td>{{ block.bits | decimal2hex }}</td>
                 </tr>
@@ -136,7 +136,7 @@
               </tbody>
             </table>
           </div>
-          <div class="col-sm" *ngIf="network !== 'liquid' && network !== 'liquidtestnet'">
+          <div class="col-sm" *ngIf="network !== 'liquid'">
             <table class="table table-borderless table-striped">
               <tbody>
                 <tr>

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

@@ -8,7 +8,6 @@ import { Observable, of, Subscription } from 'rxjs';
 import { StateService } from '../../services/state.service';
 import { SeoService } from 'src/app/services/seo.service';
 import { WebsocketService } from 'src/app/services/websocket.service';
-import { RelativeUrlPipe } from 'src/app/shared/pipes/relative-url/relative-url.pipe';
 
 @Component({
   selector: 'app-block',
@@ -52,7 +51,6 @@ export class BlockComponent implements OnInit, OnDestroy {
     private stateService: StateService,
     private seoService: SeoService,
     private websocketService: WebsocketService,
-    private relativeUrlPipe: RelativeUrlPipe,
   ) { }
 
   ngOnInit() {
@@ -196,7 +194,7 @@ export class BlockComponent implements OnInit, OnDestroy {
         if (this.showNextBlocklink) {
           this.navigateToNextBlock();
         } else {
-          this.router.navigate([this.relativeUrlPipe.transform('/mempool-block'), '0']);
+          this.router.navigate([(this.network && this.stateService.env.BASE_MODULE === 'mempool' ? '/' + this.network : '') + '/mempool-block/', '0']);
         }
       }
     });
@@ -212,7 +210,7 @@ export class BlockComponent implements OnInit, OnDestroy {
   }
 
   setBlockSubsidy() {
-    if (this.network === 'liquid' || this.network === 'liquidtestnet') {
+    if (this.network === 'liquid') {
       this.blockSubsidy = 0;
       return;
     }
@@ -279,13 +277,13 @@ export class BlockComponent implements OnInit, OnDestroy {
       return;
     }
     const block = this.latestBlocks.find((b) => b.height === this.nextBlockHeight - 2);
-    this.router.navigate([this.relativeUrlPipe.transform('/block/'),
+    this.router.navigate([(this.network && this.stateService.env.BASE_MODULE === 'mempool' ? '/' + this.network : '') + '/block/',
       block ? block.id : this.block.previousblockhash], { state: { data: { block, blockHeight: this.nextBlockHeight - 2 } } });
   }
 
   navigateToNextBlock() {
     const block = this.latestBlocks.find((b) => b.height === this.nextBlockHeight);
-    this.router.navigate([this.relativeUrlPipe.transform('/block/'),
+    this.router.navigate([(this.network && this.stateService.env.BASE_MODULE === 'mempool' ? '/' + this.network : '') + '/block/',
       block ? block.id : this.nextBlockHeight], { state: { data: { block, blockHeight: this.nextBlockHeight } } });
   }
 

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

@@ -1,8 +1,7 @@
 <div class="blocks-container blockchain-blocks-container" *ngIf="(loadingBlocks$ | async) === false; else loadingBlocksTemplate">
   <div *ngFor="let block of blocks; let i = index; trackBy: trackByBlocksFn" >
     <div class="text-center bitcoin-block mined-block blockchain-blocks-{{ i }}" id="bitcoin-block-{{ block.height }}" [ngStyle]="blockStyles[i]" [class.blink-bg]="(specialBlocks[block.height] !== undefined)">
-      <a draggable="false" [routerLink]="['/block/' | relativeUrl, block.id]" [state]="{ data: { block: block } }" 
-        class="blockLink" [ngClass]="{'disabled': (this.stateService.blockScrolling$ | async)}">&nbsp;</a>
+      <a [routerLink]="['/block/' | relativeUrl, block.id]" [state]="{ data: { block: block } }" class="blockLink">&nbsp;</a>
       <div class="block-height">
         <a [routerLink]="['/block/' | relativeUrl, block.id]" [state]="{ data: { block: block } }">{{ block.height }}</a>
       </div>

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

@@ -15,10 +15,6 @@
   text-decoration: none;
 }
 
-.blockLink.disabled {
-  pointer-events: none;
-}
-
 .mined-block {
   position: absolute;
   top: 0px;

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

@@ -36,19 +36,18 @@ export class BlockchainBlocksComponent implements OnInit, OnDestroy {
     '': ['#9339f4', '#105fb0'],
     bisq: ['#9339f4', '#105fb0'],
     liquid: ['#116761', '#183550'],
-    'liquidtestnet': ['#494a4a', '#272e46'],
     testnet: ['#1d486f', '#183550'],
     signet: ['#6f1d5d', '#471850'],
   };
 
   constructor(
-    public stateService: StateService,
+    private stateService: StateService,
     private router: Router,
     private cd: ChangeDetectorRef,
   ) { }
 
   ngOnInit() {
-    if (this.stateService.network === 'liquid' || this.stateService.network === 'liquidtestnet') {
+    if (this.stateService.network === 'liquid') {
       this.feeRounding = '1.0-1';
     }
     this.emptyBlocks.forEach((b) => this.emptyBlockStyles.push(this.getStyleForEmptyBlock(b)));

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

@@ -18,11 +18,6 @@
 .blockchain-wrapper {
   overflow: hidden;
   height: 250px;
-
-  -webkit-user-select: none; /* Safari */        
-  -moz-user-select: none; /* Firefox */
-  -ms-user-select: none; /* IE10+/Edge */
-  user-select: none; /* Standard */
 }
 
 .position-container {
@@ -31,7 +26,7 @@
   top: 75px;
 }
 
-.position-container.liquid, .position-container.liquidtestnet {
+.position-container.liquid {
   left: 420px;
 }
 
@@ -39,7 +34,7 @@
   .position-container {
     left: 95%;
   }
-  .position-container.liquid, .position-container.liquidtestnet {
+  .position-container.liquid {
     left: 50%;
   }
   .position-container.loading {

frontend/src/app/components/docs/api-docs-nav.component.html

@@ -1,76 +0,0 @@
-<ng-template [ngIf]="network.val !== 'bisq' && network.val !== 'liquid' && network.val !== 'liquidtestnet'">
-  <p>General</p>
-  <a [routerLink]="['./']" fragment="get-difficulty-adjustment" (click)="collapseItem.toggle()">GET Difficulty Adjustment</a>
-</ng-template>
-
-<ng-template [ngIf]="network.val === 'bisq'">
-  <p>Markets</p>
-  <a [routerLink]="['./']" fragment="get-market-currencies" (click)="collapseItem.toggle()">GET Market Currencies</a>
-  <a [routerLink]="['./']" fragment="get-market-depth" (click)="collapseItem.toggle()">GET Market Depth</a>
-  <a [routerLink]="['./']" fragment="get-market-hloc" (click)="collapseItem.toggle()">GET Market HLOC</a>
-  <a [routerLink]="['./']" fragment="get-markets" (click)="collapseItem.toggle()">GET Markets</a>
-  <a [routerLink]="['./']" fragment="get-market-offers" (click)="collapseItem.toggle()">GET Market Offers</a>
-  <a [routerLink]="['./']" fragment="get-market-ticker" (click)="collapseItem.toggle()">GET Market Ticker</a>
-  <a [routerLink]="['./']" fragment="get-market-trades" (click)="collapseItem.toggle()">GET Market Trades</a>
-  <a [routerLink]="['./']" fragment="get-market-volumes" (click)="collapseItem.toggle()">GET Market Volumes</a>
-</ng-template>
-
-<ng-template [ngIf]="network.val === 'bisq'">
-  <p>General</p>
-  <a [routerLink]="['./']" fragment="get-stats" (click)="collapseItem.toggle()">GET Stats</a>
-</ng-template>
-
-<p>Addresses</p>
-<a [routerLink]="['./']" fragment="get-address" (click)="collapseItem.toggle()">GET Address</a>
-<a *ngIf="network.val !== 'bisq'" [routerLink]="['./']" fragment="get-address-transactions" (click)="collapseItem.toggle()">GET Address Transactions</a>
-<a *ngIf="network.val !== 'bisq'" [routerLink]="['./']" fragment="get-address-transactions-chain" (click)="collapseItem.toggle()">GET Address Transactions Chain</a>
-<a *ngIf="network.val !== 'bisq'" [routerLink]="['./']" fragment="get-address-transactions-mempool" (click)="collapseItem.toggle()">GET Address Transactions Mempool</a>
-<a *ngIf="network.val !== 'bisq'" [routerLink]="['./']" fragment="get-address-utxo" (click)="collapseItem.toggle()">GET Address UTXO</a>
-
-<ng-template [ngIf]="network.val === 'liquid' || network.val === 'liquidtestnet'">
-  <p>Assets</p>
-  <a [routerLink]="['./']" fragment="get-asset" (click)="collapseItem.toggle()">GET Asset</a>
-  <a [routerLink]="['./']" fragment="get-asset-transactions" (click)="collapseItem.toggle()">GET Asset Transactions</a>
-  <a [routerLink]="['./']" fragment="get-asset-supply" (click)="collapseItem.toggle()">GET Asset Supply</a>
-  <a [routerLink]="['./']" fragment="get-asset-icons" (click)="collapseItem.toggle()">GET Asset Icons</a>
-  <a [routerLink]="['./']" fragment="get-asset-icon" (click)="collapseItem.toggle()">GET Asset Icon</a>
-</ng-template>
-
-<p>Blocks</p>
-<a [routerLink]="['./']" fragment="get-block" (click)="collapseItem.toggle()">GET Block</a>
-<a *ngIf="network.val !== 'bisq'" [routerLink]="['./']" fragment="get-block-header" (click)="collapseItem.toggle()">GET Block Header</a>
-<a *ngIf="network.val !== 'bisq'" [routerLink]="['./']" fragment="get-block-height" (click)="collapseItem.toggle()">GET Block Height</a>
-<a *ngIf="network.val !== 'bisq'" [routerLink]="['./']" fragment="get-block-raw" (click)="collapseItem.toggle()">GET Block Raw</a>
-<a *ngIf="network.val !== 'bisq'" [routerLink]="['./']" fragment="get-block-status" (click)="collapseItem.toggle()">GET Block Status</a>
-<a [routerLink]="['./']" fragment="get-block-tip-height" (click)="collapseItem.toggle()">GET Block Tip Height</a>
-<a *ngIf="network.val !== 'bisq'" [routerLink]="['./']" fragment="get-block-tip-hash" (click)="collapseItem.toggle()">GET Block Tip Hash</a>
-<a *ngIf="network.val !== 'bisq'" [routerLink]="['./']" fragment="get-block-transaction-id" (click)="collapseItem.toggle()">GET Block Transaction ID</a>
-<a *ngIf="network.val !== 'bisq'" [routerLink]="['./']" fragment="get-block-transaction-ids" (click)="collapseItem.toggle()">GET Block Transaction IDs</a>
-<a *ngIf="network.val !== 'bisq'" [routerLink]="['./']" fragment="get-block-transactions" (click)="collapseItem.toggle()">GET Block Transactions</a>
-<a [routerLink]="['./']" fragment="get-blocks" (click)="collapseItem.toggle()">GET Blocks</a>
-
-<ng-template [ngIf]="network.val !== 'bisq'">
-  <p>Fees</p>
-  <a [routerLink]="['./']" fragment="get-mempool-blocks-fees" (click)="collapseItem.toggle()">GET Mempool Blocks Fees</a>
-  <a [routerLink]="['./']" fragment="get-recommended-fees" (click)="collapseItem.toggle()">GET Recommended Fees</a>
-</ng-template>
-
-<ng-template [ngIf]="network.val !== 'bisq'">
-  <p>Mempool</p>
-  <a [routerLink]="['./']" fragment="get-mempool" (click)="collapseItem.toggle()">GET Mempool</a>
-  <a [routerLink]="['./']" fragment="get-mempool-transaction-ids" (click)="collapseItem.toggle()">GET Mempool Transaction IDs</a>
-  <a [routerLink]="['./']" fragment="get-mempool-recent" (click)="collapseItem.toggle()">GET Mempool Recent</a>
-</ng-template>
-
-<p>Transactions</p>
-<a *ngIf="network.val !== 'bisq'" [routerLink]="['./']" fragment="get-cpfp" (click)="collapseItem.toggle()">GET Children Pay for Parent</a>
-<a [routerLink]="['./']" fragment="get-transaction" (click)="collapseItem.toggle()">GET Transaction</a>
-<a *ngIf="network.val !== 'bisq'" [routerLink]="['./']" fragment="get-transaction-hex" (click)="collapseItem.toggle()">GET Transaction Hex</a>
-<a *ngIf="network.val !== 'bisq' && network.val !== 'liquid' && network.val !== 'liquidtestnet'" [routerLink]="['./']" fragment="get-transaction-merkleblock-proof" (click)="collapseItem.toggle()">GET Transaction Merkleblock Proof</a>
-<a *ngIf="network.val !== 'bisq'" [routerLink]="['./']" fragment="get-transaction-merkle-proof" (click)="collapseItem.toggle()">GET Transaction Merkle Proof</a>
-<a *ngIf="network.val !== 'bisq'" [routerLink]="['./']" fragment="get-transaction-outspend" (click)="collapseItem.toggle()">GET Transaction Outspend</a>
-<a *ngIf="network.val !== 'bisq'" [routerLink]="['./']" fragment="get-transaction-outspends" (click)="collapseItem.toggle()">GET Transaction Outspends</a>
-<a *ngIf="network.val !== 'bisq'" [routerLink]="['./']" fragment="get-transaction-raw" (click)="collapseItem.toggle()">GET Transaction Raw</a>
-<a *ngIf="network.val !== 'bisq'" [routerLink]="['./']" fragment="get-transaction-status" (click)="collapseItem.toggle()">GET Transaction Status</a>
-<a *ngIf="network.val === 'bisq'" [routerLink]="['./']" fragment="get-transactions" (click)="collapseItem.toggle()">GET Transactions</a>
-<a *ngIf="network.val !== 'bisq'" [routerLink]="['./']" fragment="post-transaction" (click)="collapseItem.toggle()">POST Transaction</a>

frontend/src/app/components/docs/api-docs-nav.component.scss

@@ -1,17 +0,0 @@
-p {
-  color: #4a68b9;
-  font-weight: 700;
-  margin: 10px 0;
-  margin: 15px 0 10px 0;
-}
-
-p:first-child {
-  margin-top: 0
-}
-
-a {
-  color: #fff;
-  text-decoration: none;
-  display: block;
-  margin: 5px 0;
-}

frontend/src/app/components/docs/api-docs-nav.component.ts

@@ -1,18 +0,0 @@
-import { Component, OnInit, Input } from '@angular/core';
-
-@Component({
-  selector: 'app-api-docs-nav',
-  templateUrl: './api-docs-nav.component.html',
-  styleUrls: ['./api-docs-nav.component.scss']
-})
-export class ApiDocsNavComponent implements OnInit {
-
-  @Input() network: any;
-  @Input() collapseItem: any = { toggle: () => {} };
-
-  constructor() { }
-
-  ngOnInit(): void {
-  }
-
-}

frontend/src/app/components/docs/api-docs.component.scss

@@ -22,10 +22,6 @@ li.nav-item {
   }
 }
 
-.no-bottom-space {
-  margin-bottom: 0;
-}
-
 .nav-tabs .nav-link.active {
   border-bottom: 1px solid #fff;
   @media (min-width: 676px){
@@ -76,131 +72,10 @@ li.nav-item {
   padding: 15px;
 }
 
-#doc-nav-desktop {
-  width: 300px;
+#restAPI .api-category {
+  margin: 30px 0;
 }
 
-#doc-nav-desktop.relative {
-  float: left;
-  overflow: hidden;
-}
-
-#doc-nav-desktop.fixed {
-  float: unset;
-  position: fixed;
-  top: 20px;
-  overflow-y: auto;
-  height: calc(100vh - 50px);
-  scrollbar-color: #2d3348 #11131f;
-  scrollbar-width: thin;
-}
-::-webkit-scrollbar {
-  width: 3px;
-}
-::-webkit-scrollbar-track {
-  background: #11131f;
-}
-::-webkit-scrollbar-thumb {
-  background-color: #2d3348;
-  border-radius: 5px;
-  border: none;
-}
-
-.doc-content {
-  width: calc(100% - 330px);
-  float: right;
-}
-
-.endpoint-container:before {
-	display: block;
- 	content: " ";
-  height: 1px;
-  margin-top: -1px;
-  visibility: hidden;
-}
-
-.endpoint-container .section-header {
-  display: block;
-  background-color: #2d3348;
-  color: #1bd8f4;
-  padding: 1rem 1.3rem 1rem 1.3rem;
-  font-weight: bold;
-  border-radius: 0.25rem;
-  margin: 20px 0 20px 0;
-  font-size: 24px;
-  position: relative;
-}
-.endpoint-container .section-header:hover {
-  text-decoration: none;
-}
-
-.endpoint-container .section-header span {
-  color: #fff;
-  background-color: #653b9c;
-  font-size: 12px;
-  text-transform: uppercase;
-  font-weight: 400;
-  padding: 8px 10px;
-  letter-spacing: 1px;
-  border-radius: 0.25rem;
-  font-family: monospace;
-  float: right;
-}
-
-#doc-nav-mobile {
-  position: fixed;
-  top: 20px;
-  width: calc(100% - 60px);
-  z-index: 100;
-}
-
-#doc-nav-mobile > div {
-  background-color: #2d3348;
-  z-index: 100;
-  border-radius: 0 0 0.5rem 0.5rem;
-  height: 55vh;
-  overflow-y: auto;
-}
-
-#doc-nav-mobile button {
-  width: 100%;
-  background-color: #105fb0;
-  color: #fff;
-  border-color: #105fb0;
-  border-radius: 0.5rem 0.5rem 0 0;
-}
-
-@media (max-width: 992px) {
-
-  .hide-on-mobile {
-    display: none;
-  }
-
-  .doc-content {
-    width: 100%;
-  }
-
-  .endpoint-container .section-header {
-    margin: 40px 0 70px 0;
-  }
-
-  .endpoint-container .section-header span {
-    float: none;
-    position: absolute;
-    top: unset;
-    left: 0;
-    bottom: -50px;
-  }
-
-  .endpoint-container:before {
-    height: 30px;
-    margin-top: -12px;
-  }
-
-}
-
-@media (min-width: 992px) {
-  .hide-on-desktop {
-    display: none;
-  }
+.api-category h4 {
+  margin-bottom: 15px;
 }

frontend/src/app/components/docs/code-template.component.html

@@ -7,7 +7,7 @@
         <pre><code [innerText]="wrapCurlTemplate(code)"></code></pre>
       </ng-template>
     </li>
-    <li ngbNavItem *ngIf="network !== 'liquidtestnet'">
+    <li ngbNavItem>
       <a ngbNavLink>CommonJS</a>
       <ng-template ngbNavContent>
         <div class="subtitle"><ng-container i18n="API Docs code example">Code Example</ng-container> <app-clipboard [text]="wrapCommonJS(code)"></app-clipboard></div>
@@ -18,7 +18,7 @@
       </ng-template>
     </li>
     <li ngbNavItem>
-      <a ngbNavLink *ngIf="network !== 'liquidtestnet'">ES Module</a>
+      <a ngbNavLink>ES Module</a>
       <ng-template ngbNavContent>
         <div class="subtitle"><ng-container i18n="API Docs install lib">Install Package</ng-container> <app-clipboard [text]="wrapImportTemplate()"></app-clipboard></div>
         <div class="links">

frontend/src/app/components/docs/code-template.component.ts

@@ -26,7 +26,7 @@ export class CodeTemplateComponent implements OnInit {
     if (this.network === 'bisq') {
       npmLink = `https://github.com/mempool/mempool.js/tree/main/npm-bisq-js`;
     }
-    if (this.network === 'liquid' || this.network === 'liquidtestnet') {
+    if (this.network === 'liquid') {
       npmLink = `https://github.com/mempool/mempool.js/tree/main/npm-liquid-js`;
     }
     return npmLink;
@@ -37,7 +37,7 @@ export class CodeTemplateComponent implements OnInit {
     if (this.network === 'bisq') {
       npmLink = `https://www.npmjs.org/package/@mempool/bisq.js`;
     }
-    if (this.network === 'liquid' || this.network === 'liquidtestnet') {
+    if (this.network === 'liquid') {
       npmLink = `https://www.npmjs.org/package/@mempool/liquid.js`;
     }
     return npmLink;
@@ -50,7 +50,7 @@ export class CodeTemplateComponent implements OnInit {
       } else {
         codeText = codeText.replace('%{0}', 'bitcoin');
       }
-      if(['', 'main', 'liquid', 'bisq', 'liquidtestnet'].includes(this.network)) {
+      if(['', 'main', 'liquid', 'bisq'].includes(this.network)) {
         codeText = codeText.replace('mempoolJS();', `mempoolJS({
     hostname: '${document.location.hostname}'
   });`);
@@ -119,7 +119,7 @@ export class CodeTemplateComponent implements OnInit {
       if (this.network === 'signet') {
         codeText = this.replaceJSPlaceholder(codeText, code.codeSampleSignet.esModule);
       }
-      if (this.network === 'liquid' || this.network === 'liquidtestnet') {
+      if (this.network === 'liquid') {
         codeText = this.replaceJSPlaceholder(codeText, code.codeSampleLiquid.esModule);
       }
       if (this.network === 'bisq') {
@@ -157,17 +157,13 @@ init();`;
       if (this.network === 'signet') {
         codeText = this.replaceJSPlaceholder(codeText, code.codeSampleSignet.esModule);
       }
-      if (this.network === 'liquid' || this.network === 'liquidtestnet') {
+      if (this.network === 'liquid') {
         codeText = this.replaceJSPlaceholder(codeText, code.codeSampleLiquid.esModule);
       }
       if (this.network === 'bisq') {
         codeText = this.replaceJSPlaceholder(codeText, code.codeSampleBisq.esModule);
       }
 
-      if (code.noWrap) {
-        return codeText;
-      }
-
       let importText = `<script src="https://mempool.space/mempool.js"></script>`;
       if (this.env.BASE_MODULE === 'bisq') {
         importText = `<script src="https://bisq.markets/bisq.js"></script>`;
@@ -240,9 +236,6 @@ yarn add @mempool/liquid.js`;
       if (this.network === 'liquid') {
         return this.replaceCurlPlaceholder(code.codeTemplate.curl, code.codeSampleLiquid);
       }
-      if (this.network === 'liquidtestnet') {
-        return this.replaceCurlPlaceholder(code.codeTemplate.curl, code.codeSampleLiquidTestnet);
-      }
       if (this.network === 'bisq') {
         return this.replaceCurlPlaceholder(code.codeTemplate.curl, code.codeSampleBisq);
       }
@@ -265,9 +258,6 @@ yarn add @mempool/liquid.js`;
     if (this.network === 'liquid') {
       return code.codeSampleLiquid.response;
     }
-    if (this.network === 'liquidtestnet') {
-      return code.codeSampleLiquidTestnet.response;
-    }
     if (this.network === 'bisq') {
       return code.codeSampleBisq.response;
     }
@@ -303,18 +293,10 @@ yarn add @mempool/liquid.js`;
         return `curl -X POST -sSLd "${text}"`;
       }
       return `curl -sSL "${this.hostname}/${this.network}${text}"`;
-    } else if (this.env.BASE_MODULE === 'liquid') {
-      if (this.method === 'post') {
-        if (this.network !== 'liquid') {
-          text = text.replace('/api', `/${this.network}/api`);
-        }
-        return `curl -X POST -sSLd "${text}"`;
-      }
-      return ( this.network === 'liquid' ? `curl -sSL "${this.hostname}${text}"` : `curl -sSL "${this.hostname}/${this.network}${text}"` );
-    } else {
-        return `curl -sSL "${this.hostname}${text}"`;
     }
-
+    if (this.env.BASE_MODULE !== 'mempool') {
+      return `curl -sSL "${this.hostname}${text}"`;
+    }
   }
 
 }

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

@@ -27,13 +27,5 @@
 
     <div id="main-tab-content" [ngbNavOutlet]="nav" class="mt-2"></div>
 
-    <br>
-
-    <div id="footer" class="text-center">
-      <a [routerLink]="['/terms-of-service']" i18n="shared.terms-of-service|Terms of Service">Terms of Service</a>
-      |
-      <a [routerLink]="['/privacy-policy']" i18n="shared.privacy-policy|Privacy Policy">Privacy Policy</a>
-    </div>
-
   </div>
 </div>

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

@@ -1,9 +1,4 @@
 #main-tab-content {
   text-align: left;
   padding-top: 10px;
-  scroll-behavior: smooth;
-}
-
-#footer {
-  clear: both;
 }

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

@@ -22,6 +22,6 @@ export class DocsComponent implements OnInit {
     const url = this.route.snapshot.url;
     this.activeTab = ( url[2].path === "rest" ) ? 0 : 1;
     this.env = this.stateService.env;
-    this.showWebSocketTab = ( ! ( ( this.env.BASE_MODULE === "bisq" ) || ( this.stateService.network === "bisq" ) || ( this.stateService.network === "liquidtestnet" ) ) );
+    this.showWebSocketTab = ( ! ( ( this.env.BASE_MODULE === "bisq" ) || ( this.stateService.network === "bisq" ) ) );
   }
 }

frontend/src/app/components/fees-box/fees-box.component.ts

@@ -26,7 +26,7 @@ export class FeesBoxComponent implements OnInit {
   ) { }
 
   ngOnInit(): void {
-    this.defaultFee = this.stateService.network === 'liquid' || this.stateService.network === 'liquidtestnet' ? 0.1 : 1;
+    this.defaultFee = this.stateService.network === 'liquid' ? 0.1 : 1;
 
     this.isLoadingWebSocket$ = this.stateService.isLoadingWebSocket$;
     this.feeEstimations$ = this.stateService.mempoolBlocks$

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

@@ -67,12 +67,10 @@ export class IncomingTransactionsGraphComponent implements OnInit, OnChanges {
         left: this.left,
       },
       animation: false,
-      dataZoom: (this.template === 'widget' && this.isMobile()) ? null : [{
+      dataZoom: [{
         type: 'inside',
         realtime: true,
-        zoomLock: (this.template === 'widget') ? true : false,
         zoomOnMouseWheel: (this.template === 'advanced') ? true : false,
-        moveOnMouseMove: (this.template === 'widget') ? true : false,
         maxSpan: 100,
         minSpan: 10,
       }, {
@@ -93,7 +91,6 @@ export class IncomingTransactionsGraphComponent implements OnInit, OnChanges {
         },
       }],
       tooltip: {
-        show: !this.isMobile(),
         trigger: 'axis',
         position: (pos, params, el, elRect, size) => {
           const obj = { top: -20 };
@@ -220,8 +217,4 @@ export class IncomingTransactionsGraphComponent implements OnInit, OnChanges {
       },
     };
   }
-
-  isMobile() {
-    return window.innerWidth <= 767.98;
-  }
 }

frontend/src/app/components/language-selector/language-selector.component.ts

@@ -1,8 +1,8 @@
 import { DOCUMENT } from '@angular/common';
 import { ChangeDetectionStrategy, Component, Inject, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup } from '@angular/forms';
-import { languages } from 'src/app/app.constants';
-import { LanguageService } from 'src/app/services/language.service';
+import { Language, languages } from 'src/app/app.constants';
+import { StateService } from 'src/app/services/state.service';
 
 @Component({
   selector: 'app-language-selector',
@@ -12,25 +12,42 @@ import { LanguageService } from 'src/app/services/language.service';
 })
 export class LanguageSelectorComponent implements OnInit {
   languageForm: FormGroup;
-  languages = languages;
+  languages: Language[];
 
   constructor(
-    @Inject(DOCUMENT) private document: Document,
     private formBuilder: FormBuilder,
-    private languageService: LanguageService,
+    private stateService: StateService,
+    @Inject(DOCUMENT) private document: Document
   ) { }
 
   ngOnInit() {
+    this.languages = languages;
+
     this.languageForm = this.formBuilder.group({
-      language: ['en']
+      language: ['']
     });
-    this.languageForm.get('language').setValue(this.languageService.getLanguage());
+    this.setLanguageFromUrl();
+  }
+
+  setLanguageFromUrl() {
+    const urlLanguage = this.document.location.pathname.split('/')[1];
+    if (this.languages.map((lang) => lang.code).indexOf(urlLanguage) > -1) {
+      this.languageForm.get('language').setValue(urlLanguage);
+    } else {
+      this.languageForm.get('language').setValue('en');
+    }
   }
 
   changeLanguage() {
-    const newLang = this.languageForm.get('language').value;
-    this.languageService.setLanguage(newLang);
-    const rawUrlPath = this.languageService.stripLanguageFromUrl(null);
-    this.document.location.href = (newLang !== 'en' ? `/${newLang}` : '') + rawUrlPath;
+    const language = this.languageForm.get('language').value;
+    try {
+      document.cookie = `lang=${language}; expires=Thu, 18 Dec 2050 12:00:00 UTC; path=/`;
+    } catch (e) { }
+    
+    if (this.stateService.env.BASE_MODULE === 'mempool') {
+      this.document.location.href = `/${language}/${this.stateService.network}`;
+    } else {
+      this.document.location.href = `/${language}`;
+    }
   }
 }

frontend/src/app/components/liquid-master-page/liquid-master-page.component.html

@@ -1,4 +1,3 @@
-<ng-container *ngIf="{ val: network$ | async } as network">
 <header>
   <nav class="navbar navbar-expand-md navbar-dark bg-dark">
   <a class="navbar-brand" [routerLink]="['/' | relativeUrl]" style="position: relative;">
@@ -11,23 +10,22 @@
     </ng-container>
   </a>
 
-  <div ngbDropdown (window:resize)="onResize($event)" class="dropdown-container" *ngIf="env.TESTNET_ENABLED || env.SIGNET_ENABLED || env.LIQUID_ENABLED || env.BISQ_ENABLED || env.LIQUID_TESTNET_ENABLED">
+  <div ngbDropdown (window:resize)="onResize($event)" class="dropdown-container" *ngIf="env.TESTNET_ENABLED || env.SIGNET_ENABLED || env.LIQUID_ENABLED || env.BISQ_ENABLED">
     <button ngbDropdownToggle type="button" class="btn btn-secondary dropdown-toggle-split" aria-haspopup="true">
-      <img src="./resources/{{ network.val === '' ? 'liquid' : network.val }}-logo.png" style="width: 25px; height: 25px;" class="mr-1">
+      <img src="./resources/liquid-logo.png" style="width: 25px; height: 25px;" class="mr-1">
     </button>
     <div ngbDropdownMenu [ngClass]="{'dropdown-menu-right' : isMobile}">
-      <a [href]="env.MEMPOOL_WEBSITE_URL + urlLanguage" ngbDropdownItem class="mainnet"><img src="./resources/bitcoin-logo.png" style="width: 30px;" class="mr-1"> Mainnet</a>
-      <a [href]="env.MEMPOOL_WEBSITE_URL + urlLanguage + '/signet'" ngbDropdownItem *ngIf="env.SIGNET_ENABLED" class="signet"><img src="./resources/signet-logo.png" style="width: 30px;" class="mr-1"> Signet</a>
-      <a [href]="env.MEMPOOL_WEBSITE_URL + urlLanguage + '/testnet'" ngbDropdownItem *ngIf="env.TESTNET_ENABLED" class="testnet"><img src="./resources/testnet-logo.png" style="width: 30px;" class="mr-1"> Testnet</a>
+      <a href="https://mempool.space" ngbDropdownItem class="mainnet"><img src="./resources/bitcoin-logo.png" style="width: 30px;" class="mr-1"> Mainnet</a>
+      <a href="https://mempool.space/signet" ngbDropdownItem *ngIf="env.SIGNET_ENABLED" class="signet"><img src="./resources/signet-logo.png" style="width: 30px;" class="mr-1"> Signet</a>
+      <a href="https://mempool.space/testnet" ngbDropdownItem *ngIf="env.TESTNET_ENABLED" class="testnet"><img src="./resources/testnet-logo.png" style="width: 30px;" class="mr-1"> Testnet</a>
       <h6 class="dropdown-header" i18n="master-page.layer2-networks-header">Layer 2 Networks</h6>
-      <a [href]="env.BISQ_WEBSITE_URL + urlLanguage" ngbDropdownItem class="mainnet"><img src="./resources/bisq-logo.png" style="width: 30px;" class="mr-1"> Bisq</a>
-      <button ngbDropdownItem class="liquid" [class.active]="network.val === 'liquid'" routerLink="/"><img src="./resources/liquid-logo.png" style="width: 30px;" class="mr-1"> Liquid</button>
-      <button ngbDropdownItem *ngIf="env.LIQUID_TESTNET_ENABLED" class="liquidtestnet" [class.active]="network.val === 'liquidtestnet'" routerLink="/testnet"><img src="./resources/liquidtestnet-logo.png" style="width: 30px;" class="mr-1"> Liquid Testnet</button>
+      <a href="https://bisq.markets" ngbDropdownItem class="mainnet"><img src="./resources/bisq-logo.png" style="width: 30px;" class="mr-1"> Bisq</a>
+      <button ngbDropdownItem class="liquid active" routerLink="/"><img src="./resources/liquid-logo.png" style="width: 30px;" class="mr-1"> Liquid</button>
     </div>
   </div>
 
   <div class="navbar-collapse" id="navbarCollapse">
-    <ul class="navbar-nav {{ network.val }}">
+    <ul class="navbar-nav liquid">
       <li class="nav-item" routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}">
         <a class="nav-link" [routerLink]="['/' | relativeUrl]" (click)="collapse()"><fa-icon [icon]="['fas', 'tachometer-alt']" [fixedWidth]="true" i18n-title="master-page.dashboard" title="Dashboard"></fa-icon></a>
       </li>
@@ -43,7 +41,7 @@
       </li>
       -->
       <li class="nav-item" routerLinkActive="active">
-        <a class="nav-link" [routerLink]="['/assets' | relativeUrl]" (click)="collapse()"><fa-icon [icon]="['fas', 'database']" [fixedWidth]="true" i18n-title="master-page.assets" title="Assets"></fa-icon></a>
+        <a class="nav-link" [routerLink]="['/assets']" (click)="collapse()"><fa-icon [icon]="['fas', 'database']" [fixedWidth]="true" i18n-title="master-page.assets" title="Assets"></fa-icon></a>
       </li>
       <li [hidden]="isMobile" class="nav-item mr-2" routerLinkActive="active">
         <a class="nav-link" [routerLink]="['/docs' | relativeUrl]" (click)="collapse()"><fa-icon [icon]="['fas', 'book']" [fixedWidth]="true" i18n-title="master-page.docs" title="Docs"></fa-icon></a>
@@ -62,4 +60,3 @@
 <router-outlet></router-outlet>
 
 <br>
-</ng-container>

frontend/src/app/components/liquid-master-page/liquid-master-page.component.scss

@@ -102,10 +102,6 @@ nav {
   background-color: #116761;
 }
 
-.liquidtestnet.active {
-  background-color: #494a4a;
-}
-
 .testnet.active {
   background-color: #1d486f;
 }

frontend/src/app/components/liquid-master-page/liquid-master-page.component.ts

@@ -1,7 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { Env, StateService } from '../../services/state.service';
-import { merge, Observable, of} from 'rxjs';
-import { LanguageService } from 'src/app/services/language.service';
+import { Observable} from 'rxjs';
 
 @Component({
   selector: 'app-liquid-master-page',
@@ -14,19 +13,14 @@ export class LiquidMasterPageComponent implements OnInit {
   navCollapsed = false;
   isMobile = window.innerWidth <= 767.98;
   officialMempoolSpace = this.stateService.env.OFFICIAL_MEMPOOL_SPACE;
-  network$: Observable<string>;
-  urlLanguage: string;
 
   constructor(
     private stateService: StateService,
-    private languageService: LanguageService,
   ) { }
 
   ngOnInit() {
     this.env = this.stateService.env;
     this.connectionState$ = this.stateService.connectionState$;
-    this.network$ = merge(of(''), this.stateService.networkChanged$);
-    this.urlLanguage = this.languageService.getLanguageForUrl();
   }
 
   collapse(): void {

frontend/src/app/components/master-page/master-page.component.html

@@ -11,7 +11,7 @@
     </ng-container>
   </a>
 
-  <div (window:resize)="onResize($event)" ngbDropdown class="dropdown-container" *ngIf="env.TESTNET_ENABLED || env.SIGNET_ENABLED || env.LIQUID_ENABLED || env.BISQ_ENABLED || env.LIQUID_TESTNET_ENABLED">
+  <div (window:resize)="onResize($event)" ngbDropdown class="dropdown-container" *ngIf="env.TESTNET_ENABLED || env.SIGNET_ENABLED || env.LIQUID_ENABLED || env.BISQ_ENABLED">
     <button ngbDropdownToggle type="button" class="btn btn-secondary dropdown-toggle-split" aria-haspopup="true">
       <img src="./resources/{{ network.val === '' ? 'bitcoin' : network.val }}-logo.png" style="width: 25px; height: 25px;" class="mr-1">
     </button>
@@ -20,9 +20,10 @@
       <button ngbDropdownItem *ngIf="env.SIGNET_ENABLED" class="signet" [class.active]="network.val === 'signet'" routerLink="/signet"><img src="./resources/signet-logo.png" style="width: 30px;" class="mr-1"> Signet</button>
       <button ngbDropdownItem *ngIf="env.TESTNET_ENABLED" class="testnet" [class.active]="network.val === 'testnet'" routerLink="/testnet"><img src="./resources/testnet-logo.png" style="width: 30px;" class="mr-1"> Testnet</button>
       <h6 *ngIf="env.LIQUID_ENABLED || env.BISQ_ENABLED" class="dropdown-header" i18n="master-page.layer2-networks-header">Layer 2 Networks</h6>
-      <a [href]="env.BISQ_WEBSITE_URL + urlLanguage" ngbDropdownItem *ngIf="env.BISQ_ENABLED" class="bisq"><img src="./resources/bisq-logo.png" style="width: 30px;" class="mr-1"> Bisq</a>
-      <a [href]="env.LIQUID_WEBSITE_URL + urlLanguage" ngbDropdownItem *ngIf="env.LIQUID_ENABLED" class="liquid" [class.active]="network.val === 'liquid'"><img src="./resources/liquid-logo.png" style="width: 30px;" class="mr-1"> Liquid</a>
-      <a [href]="env.LIQUID_WEBSITE_URL + urlLanguage + '/testnet'" ngbDropdownItem *ngIf="env.LIQUID_TESTNET_ENABLED" class="liquidtestnet" [class.active]="network.val === 'liquid'"><img src="./resources/liquidtestnet-logo.png" style="width: 30px;" class="mr-1"> Liquid Testnet</a>
+      <a href="https://bisq.markets" ngbDropdownItem *ngIf="env.BISQ_ENABLED && env.OFFICIAL_MEMPOOL_SPACE" class="bisq"><img src="./resources/bisq-logo.png" style="width: 30px;" class="mr-1"> Bisq</a>
+      <button ngbDropdownItem *ngIf="env.BISQ_ENABLED && !env.OFFICIAL_MEMPOOL_SPACE" class="bisq" [class.active]="network.val === 'bisq'" routerLink="/bisq"><img src="./resources/bisq-logo.png" style="width: 30px;" class="mr-1"> Bisq</button>
+      <a href="https://liquid.network" ngbDropdownItem *ngIf="env.LIQUID_ENABLED && env.OFFICIAL_MEMPOOL_SPACE" class="liquid" [class.active]="network.val === 'liquid'"><img src="./resources/liquid-logo.png" style="width: 30px;" class="mr-1"> Liquid</a>
+      <button ngbDropdownItem *ngIf="env.LIQUID_ENABLED && !env.OFFICIAL_MEMPOOL_SPACE" class="liquid" [class.active]="network.val === 'liquid'" routerLink="/liquid"><img src="./resources/liquid-logo.png" style="width: 30px;" class="mr-1"> Liquid</button>
     </div>
   </div>
 
@@ -53,8 +54,8 @@
           <a class="nav-link" [routerLink]="['/tv' | relativeUrl]" (click)="collapse()"><fa-icon [icon]="['fas', 'tv']" [fixedWidth]="true" i18n-title="master-page.tvview" title="TV view"></fa-icon></a>
         </li>
       </ng-template>
-      <li *ngIf="network.val === 'liquid' || network.val === 'liquidtestnet'" class="nav-item" routerLinkActive="active">
-        <a class="nav-link" [routerLink]="['/assets' | relativeUrl]" (click)="collapse()"><fa-icon [icon]="['fas', 'database']" [fixedWidth]="true" i18n-title="master-page.assets" title="Assets"></fa-icon></a>
+      <li *ngIf="network.val === 'liquid'" class="nav-item" routerLinkActive="active">
+        <a class="nav-link" [routerLink]="['/liquid/assets']" (click)="collapse()"><fa-icon [icon]="['fas', 'database']" [fixedWidth]="true" i18n-title="master-page.assets" title="Assets"></fa-icon></a>
       </li>
       <li class="nav-item" routerLinkActive="active">
         <a class="nav-link" [routerLink]="['/docs' | relativeUrl ]" (click)="collapse()"><fa-icon [icon]="['fas', 'book']" [fixedWidth]="true" i18n-title="documentation.title" title="Documentation"></fa-icon></a>

frontend/src/app/components/master-page/master-page.component.scss

@@ -110,10 +110,6 @@ nav {
   background-color: #116761;
 }
 
-.liquidtestnet.active {
-  background-color: #494a4a;
-}
-
 .testnet.active {
   background-color: #1d486f;
 }

frontend/src/app/components/master-page/master-page.component.ts

@@ -1,7 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { Env, StateService } from '../../services/state.service';
 import { Observable, merge, of } from 'rxjs';
-import { LanguageService } from 'src/app/services/language.service';
 
 @Component({
   selector: 'app-master-page',
@@ -15,18 +14,15 @@ export class MasterPageComponent implements OnInit {
   navCollapsed = false;
   isMobile = window.innerWidth <= 767.98;
   officialMempoolSpace = this.stateService.env.OFFICIAL_MEMPOOL_SPACE;
-  urlLanguage: string;
 
   constructor(
     private stateService: StateService,
-    private languageService: LanguageService,
   ) { }
 
   ngOnInit() {
     this.env = this.stateService.env;
     this.connectionState$ = this.stateService.connectionState$;
     this.network$ = merge(of(''), this.stateService.networkChanged$);
-    this.urlLanguage = this.languageService.getLanguageForUrl();
   }
 
   collapse(): void {

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

@@ -3,8 +3,7 @@
     <div class="flashing">
       <ng-template ngFor let-projectedBlock [ngForOf]="mempoolBlocks$ | async" let-i="index" [ngForTrackBy]="trackByFn">
         <div class="bitcoin-block text-center mempool-block" id="mempool-block-{{ i }}" [ngStyle]="mempoolBlockStyles[i]" [class.blink-bg]="projectedBlock.blink">
-          <a draggable="false" [routerLink]="['/mempool-block/' | relativeUrl, i]"
-            class="blockLink" [ngClass]="{'disabled': (this.stateService.blockScrolling$ | async)}">&nbsp;</a>
+          <a [routerLink]="['/mempool-block/' | relativeUrl, i]" class="blockLink">&nbsp;</a>
           <div class="block-body">
             <div class="fees">
               ~{{ projectedBlock.medianFee | number:feeRounding }} <span i18n="shared.sat-vbyte|sat/vB">sat/vB</span>
@@ -19,7 +18,7 @@
               <ng-template #transactionsPlural let-i i18n="shared.transaction-count.plural">{{ i }} transactions</ng-template>
             </div>
             <div class="time-difference" *ngIf="projectedBlock.blockVSize <= stateService.blockVSize; else mergedBlock">
-              <ng-template [ngIf]="network === 'liquid' || network === 'liquidtestnet'" [ngIfElse]="timeDiffMainnet">
+              <ng-template [ngIf]="network === 'liquid'" [ngIfElse]="timeDiffMainnet">
                 <app-time-until [time]="(1 * i) + now + 61000" [fastRender]="false" [fixedRender]="true"></app-time-until>
               </ng-template>
               <ng-template #timeDiffMainnet>

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

@@ -117,10 +117,6 @@
   z-index: 10;
 }
 
-.blockLink.disabled {
-  pointer-events: none;
-}
-
 .blockLink:hover {
   text-decoration: none;
 }

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

@@ -6,7 +6,6 @@ import { Router } from '@angular/router';
 import { take, map, switchMap } from 'rxjs/operators';
 import { feeLevels, mempoolFeeColors } from 'src/app/app.constants';
 import { specialBlocks } from 'src/app/app.constants';
-import { RelativeUrlPipe } from 'src/app/shared/pipes/relative-url/relative-url.pipe';
 
 @Component({
   selector: 'app-mempool-blocks',
@@ -53,11 +52,10 @@ export class MempoolBlocksComponent implements OnInit, OnDestroy {
     private router: Router,
     public stateService: StateService,
     private cd: ChangeDetectorRef,
-    private relativeUrlPipe: RelativeUrlPipe,
   ) { }
 
   ngOnInit() {
-    if (this.stateService.network === 'liquid' || this.stateService.network === 'liquidtestnet') {
+    if (this.stateService.network === 'liquid') {
       this.feeRounding = '1.0-1';
     }
     this.mempoolEmptyBlocks.forEach((b) => {
@@ -168,19 +166,19 @@ export class MempoolBlocksComponent implements OnInit, OnDestroy {
 
       if (event.key === 'ArrowRight') {
         if (this.mempoolBlocks[this.markIndex - 1]) {
-          this.router.navigate([this.relativeUrlPipe.transform('mempool-block/'), this.markIndex - 1]);
+          this.router.navigate([(this.network ? '/' + this.network : '') + '/mempool-block/', this.markIndex - 1]);
         } else {
           this.stateService.blocks$
             .pipe(take(this.stateService.env.MEMPOOL_BLOCKS_AMOUNT))
             .subscribe(([block]) => {
               if (this.stateService.latestBlockHeight === block.height) {
-                this.router.navigate([this.relativeUrlPipe.transform('/block/'), block.id], { state: { data: { block } }});
+                this.router.navigate([(this.network ? '/' + this.network : '') + '/block/', block.id], { state: { data: { block } }});
               }
             });
         }
       } else if (event.key === 'ArrowLeft') {
         if (this.mempoolBlocks[this.markIndex + 1]) {
-          this.router.navigate([this.relativeUrlPipe.transform('/mempool-block/'), this.markIndex + 1]);
+          this.router.navigate([(this.network ? '/' + this.network : '') + '/mempool-block/', this.markIndex + 1]);
         }
       }
     });

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

@@ -170,7 +170,7 @@ export class MempoolGraphComponent implements OnInit, OnChanges {
       hover: true,
       color: this.inverted ? [...newColors].reverse() : newColors,
       tooltip: {
-        show: !this.isMobile(),
+        show: (window.innerWidth >= 768) ? true : false,
         trigger: 'axis',
         alwaysShowContent: false,
         position: (pos, params, el, elRect, size) => {
@@ -282,12 +282,10 @@ export class MempoolGraphComponent implements OnInit, OnChanges {
           </div>`;
         }
       },
-      dataZoom: (this.template === 'widget' && this.isMobile()) ? null : [{
+      dataZoom: [{
         type: 'inside',
         realtime: true,
-        zoomLock: (this.template === 'widget') ? true : false,
         zoomOnMouseWheel: (this.template === 'advanced') ? true : false,
-        moveOnMouseMove: (this.template === 'widget') ? true : false,
         maxSpan: 100,
         minSpan: 10,
       }, {
@@ -373,7 +371,7 @@ export class MempoolGraphComponent implements OnInit, OnChanges {
         this.feeLimitIndex = i;
       }
       if (feeLevels[i] <= this.limitFee) {
-        if (this.stateService.network === 'liquid' || this.stateService.network === 'liquidtestnet') {
+        if (this.stateService.network === 'liquid') {
           this.feeLevelsOrdered.push(`${(feeLevels[i] / 10).toFixed(1)} - ${(feeLevels[i + 1]  / 10).toFixed(1)}`);
         } else {
           this.feeLevelsOrdered.push(`${feeLevels[i]} - ${feeLevels[i + 1]}`);
@@ -382,9 +380,5 @@ export class MempoolGraphComponent implements OnInit, OnChanges {
     }
     this.chartColorsOrdered =  chartColors.slice(0, this.feeLevelsOrdered.length);
   }
-
-  isMobile() {
-    return window.innerWidth <= 767.98;
-  }
 }
 

frontend/src/app/components/search-form/search-form.component.ts

@@ -7,7 +7,6 @@ import { Observable, of, Subject, merge } from 'rxjs';
 import { debounceTime, distinctUntilChanged, switchMap, filter, catchError, map } from 'rxjs/operators';
 import { ElectrsApiService } from 'src/app/services/electrs-api.service';
 import { NgbTypeahead } from '@ng-bootstrap/ng-bootstrap';
-import { RelativeUrlPipe } from 'src/app/shared/pipes/relative-url/relative-url.pipe';
 
 @Component({
   selector: 'app-search-form',
@@ -39,7 +38,6 @@ export class SearchFormComponent implements OnInit {
     private assetsService: AssetsService,
     private stateService: StateService,
     private electrsApiService: ElectrsApiService,
-    private relativeUrlPipe: RelativeUrlPipe,
   ) { }
 
   ngOnInit() {
@@ -50,7 +48,7 @@ export class SearchFormComponent implements OnInit {
       searchText: ['', Validators.required],
     });
 
-    if (this.network === 'liquid' || this.network === 'liquidtestnet') {
+    if (this.network === 'liquid') {
       this.assetsService.getAssetsMinimalJson$
         .subscribe((assets) => {
           this.assets = assets;
@@ -103,7 +101,7 @@ export class SearchFormComponent implements OnInit {
         this.navigate('/block/', searchText);
       } else if (this.regexTransaction.test(searchText)) {
         const matches = this.regexTransaction.exec(searchText);
-        if (this.network === 'liquid' || this.network === 'liquidtestnet') {
+        if (this.network === 'liquid') {
           if (this.assets[matches[1]]) {
             this.navigate('/asset/', matches[1]);
           }
@@ -127,7 +125,7 @@ export class SearchFormComponent implements OnInit {
   }
 
   navigate(url: string, searchText: string, extras?: any) {
-    this.router.navigate([this.relativeUrlPipe.transform(url), searchText], extras);
+    this.router.navigate([(this.network && this.stateService.env.BASE_MODULE === 'mempool' ? '/' + this.network : '') + url, searchText], extras);
     this.searchTriggered.emit();
     this.searchForm.setValue({
       searchText: '',

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

@@ -117,7 +117,7 @@
 
       </ng-template>
 
-      <ng-template [ngIf]="paymentForm.get('method').value === 'lbtc' || paymentForm.get('method').value === 'tlbtc'">
+      <ng-template [ngIf]="paymentForm.get('method').value === 'lbtc'">
 
          <div class="qr-wrapper">
             <a [href]="bypassSecurityTrustUrl('liquidnetwork:' + donationObj.addresses.LBTC + '?amount=' + donationObj.amount + '&assetid=6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d')" target="_blank">

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

@@ -8,11 +8,8 @@
 
 <div *ngIf="countdown > 0" class="warning-label">{{ eventName }} in {{ countdown | number }} block{{ countdown === 1 ? '' : 's' }}!</div>
 
-<div id="blockchain-container" dir="ltr" #blockchainContainer
-  (mousedown)="onMouseDown($event)"
-  (dragstart)="onDragStart($event)"
->
-<app-blockchain></app-blockchain>
+<div id="blockchain-container" dir="ltr">
+  <app-blockchain></app-blockchain>
 </div>
 
 <router-outlet></router-outlet>

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

@@ -1,7 +1,8 @@
-import { Component, ElementRef, HostListener, OnInit, ViewChild } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { WebsocketService } from 'src/app/services/websocket.service';
 import { StateService } from 'src/app/services/state.service';
 import { specialBlocks } from 'src/app/app.constants';
+import { takeLast } from 'rxjs/operators';
 
 @Component({
   selector: 'app-start',
@@ -15,9 +16,6 @@ export class StartComponent implements OnInit {
   countdown = 0;
   specialEvent = false;
   eventName = '';
-  mouseDragStartX: number;
-  blockchainScrollLeftInit: number;
-  @ViewChild('blockchainContainer') blockchainContainer: ElementRef;
 
   constructor(
     private websocketService: WebsocketService,
@@ -52,27 +50,4 @@ export class StartComponent implements OnInit {
       });
   }
 
-  onMouseDown(event: MouseEvent) {
-    this.mouseDragStartX = event.clientX;
-    this.blockchainScrollLeftInit = this.blockchainContainer.nativeElement.scrollLeft;
-  }
-  onDragStart(event: MouseEvent) { // Ignore Firefox annoying default drag behavior
-    event.preventDefault();
-  }
-
-  // We're catching the whole page event here because we still want to scroll blocks
-  // even if the mouse leave the blockchain blocks container. Same idea for mouseup below.
-  @HostListener('document:mousemove', ['$event'])
-  onMouseMove(event: MouseEvent): void {
-    if (this.mouseDragStartX != null) {
-      this.stateService.setBlockScrollingInProgress(true);
-      this.blockchainContainer.nativeElement.scrollLeft =
-        this.blockchainScrollLeftInit + this.mouseDragStartX - event.clientX
-    }
-  }
-  @HostListener('document:mouseup', [])
-  onMouseUp() {
-    this.mouseDragStartX = null;
-    this.stateService.setBlockScrollingInProgress(false);
-  }
 }

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

@@ -41,11 +41,17 @@
                 </button>
                 <div class="dropdown-fees" ngbDropdownMenu aria-labelledby="dropdownFees">
                   <ul>
-                    <ng-template ngFor let-feeData let-i="index" [ngForOf]="feeLevelDropdownData">
-                      <ng-template [ngIf]="feeData.fee <= 400">
-                        <li (click)="filterFeeIndex = feeData.fee" [class]="filterFeeIndex > feeData.fee ? 'inactive' : ''">
-                          <span class="square" [ngStyle]="{'backgroundColor': feeData.color}"></span>
-                          <span class="fee-text">{{ feeData.range }}</span>
+                    <ng-template ngFor let-fee let-i="index" [ngForOf]="feeLevels">
+                      <ng-template [ngIf]="fee <= 400">
+                        <li (click)="filterFees(fee)" [class]="filterFeeIndex > fee ? 'inactive' : ''">
+                        <ng-template [ngIf]="inverted">
+                          <span class="square" [ngStyle]="{'backgroundColor': chartColors[i]}"></span>
+                          <span class="fee-text" >{{feeLevels[i]}} - {{ feeLevels[i + 1] }}</span>
+                        </ng-template>
+                        <ng-template [ngIf]="!inverted">
+                          <span class="square" [ngStyle]="{'backgroundColor': chartColors[i - 1]}"></span>
+                          <span class="fee-text" >{{feeLevels[i]}} - {{ feeLevels[i - 1] }}</span>
+                        </ng-template>
                       </li>
                       </ng-template>
                     </ng-template>

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

@@ -37,7 +37,6 @@ export class StatisticsComponent implements OnInit {
   radioGroupForm: FormGroup;
   graphWindowPreference: string;
   inverted: boolean;
-  feeLevelDropdownData = [];
 
   constructor(
     @Inject(LOCALE_ID) private locale: string,
@@ -52,10 +51,19 @@ export class StatisticsComponent implements OnInit {
 
   ngOnInit() {
     this.inverted = this.storageService.getValue('inverted-graph') === 'true';
-    this.setFeeLevelDropdownData();
+    if (!this.inverted) {
+      this.feeLevels = [...feeLevels].reverse();
+      this.chartColors = [...chartColors].reverse();
+    }
     this.seoService.setTitle($localize`:@@5d4f792f048fcaa6df5948575d7cb325c9393383:Graphs`);
     this.stateService.networkChanged$.subscribe((network) => this.network = network);
     this.graphWindowPreference = this.storageService.getValue('graphWindowPreference') ? this.storageService.getValue('graphWindowPreference').trim() : '2h';
+    const isMobile = window.innerWidth <= 767.98;
+    let labelHops = isMobile ? 48 : 24;
+
+    if (isMobile) {
+      labelHops = 96;
+    }
 
     this.radioGroupForm = this.formBuilder.group({
       dateSpan: this.graphWindowPreference
@@ -124,8 +132,6 @@ export class StatisticsComponent implements OnInit {
     mempoolStats.reverse();
     const labels = mempoolStats.map(stats => stats.added);
 
-    this.capExtremeVbytesValues();
-
     this.mempoolTransactionsWeightPerSecondData = {
       labels: labels,
       series: [mempoolStats.map((stats) => [stats.added * 1000, stats.vbytes_per_second])],
@@ -141,54 +147,11 @@ export class StatisticsComponent implements OnInit {
     document.location.reload();
   }
 
-  setFeeLevelDropdownData() {
-    let _feeLevels = feeLevels
-    let _chartColors = chartColors;
-    if (!this.inverted) {
-      _feeLevels = [...feeLevels].reverse();
-      _chartColors = [...chartColors].reverse();
-    }
-    _feeLevels.forEach((fee, i) => {
-      if (this.inverted) {
-        this.feeLevelDropdownData.push({
-          fee: fee,
-          range: this.stateService.isLiquid() ? `${(_feeLevels[i] / 10).toFixed(1)} - ${(_feeLevels[i + 1] / 10).toFixed(1)}` : `${_feeLevels[i]} - ${_feeLevels[i + 1]}`,
-          color: _chartColors[i],
-        });
-      } else {
-        this.feeLevelDropdownData.push({
-          fee: fee,
-          range: this.stateService.isLiquid() ? `${(_feeLevels[i] / 10).toFixed(1)} - ${(_feeLevels[i - 1] / 10).toFixed(1)}` : `${_feeLevels[i]} - ${_feeLevels[i - 1]}`,
-          color: _chartColors[i - 1],
-        });
-      }
-    })
+  filterFees(index: number) {
+    this.filterFeeIndex = index;
   }
 
-  /**
-   * All value higher that "median * capRatio" are capped
-   */
-  capExtremeVbytesValues() {
-    let capRatio = 10;
-    if (['1m', '3m',  '6m', '1y', '2y', '3y'].includes(this.graphWindowPreference)) {
-      capRatio = 4;
-    }
-
-    // Find median value
-    let vBytes : number[] = [];
-    for (let i = 0; i < this.mempoolStats.length; ++i) {
-      vBytes.push(this.mempoolStats[i].vbytes_per_second);
-    }
-    const sorted = vBytes.slice().sort((a, b) => a - b);
-    const middle = Math.floor(sorted.length / 2);
-    let median = sorted[middle];
-    if (sorted.length % 2 === 0) {
-      median = (sorted[middle - 1] + sorted[middle]) / 2;
-    }
-
-    // Cap
-    for (let i = 0; i < this.mempoolStats.length; ++i) {
-      this.mempoolStats[i].vbytes_per_second = Math.min(median * capRatio, this.mempoolStats[i].vbytes_per_second);
-    }
+  filterClick() {
+    this.dropDownOpen = !this.dropDownOpen;
   }
 }

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

@@ -66,7 +66,7 @@
                     <td><app-time-span [time]="tx.status.block_time - transactionTime" [fastRender]="true"></app-time-span></td>
                   </tr>
                 </ng-template>
-                <tr *ngIf="network !== 'liquid' && network !== 'liquidtestnet'">
+                <tr *ngIf="network !== 'liquid'">
                   <td class="td-width" i18n="transaction.features|Transaction features">Features</td>
                   <td>
                     <app-tx-features [tx]="tx"></app-tx-features>
@@ -114,7 +114,7 @@
                         <span i18n="transaction.eta.in-several-hours|Transaction ETA in several hours or more">In several hours (or more)</span>
                       </ng-template>
                       <ng-template #belowBlockLimit>
-                        <ng-template [ngIf]="network === 'liquid' || network === 'liquidtestnet'" [ngIfElse]="timeEstimateDefault">
+                        <ng-template [ngIf]="network === 'liquid'" [ngIfElse]="timeEstimateDefault">
                           <app-time-until [time]="(60 * 1000 * txInBlockIndex) + now" [fastRender]="false" [fixedRender]="true"></app-time-until>
                         </ng-template>
                         <ng-template #timeEstimateDefault>
@@ -124,7 +124,7 @@
                     </ng-template>
                   </td>
                 </tr>
-                <tr *ngIf="network !== 'liquid' && network !== 'liquidtestnet'">
+                <tr *ngIf="network !== 'liquid'">
                   <td class="td-width" i18n="transaction.features|Transaction Features">Features</td>
                   <td>
                     <app-tx-features [tx]="tx"></app-tx-features>

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

@@ -159,7 +159,7 @@ export class TransactionComponent implements OnInit, OnDestroy {
           );
         }),
         switchMap((tx) => {
-          if (this.network === 'liquid' || this.network === 'liquidtestnet') {
+          if (this.network === 'liquid') {
             return from(this.liquidUnblinding.checkUnblindedTx(tx))
               .pipe(
                 catchError((error) => {

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

@@ -48,7 +48,7 @@
                 </td>
                 <td>
                   <div [ngSwitch]="true">
-                    <ng-container *ngSwitchCase="vin.is_coinbase"><span i18n="transactions-list.coinbase">Coinbase</span><ng-template [ngIf]="network !== 'liquid' && network !== 'liquidtestnet'">&nbsp;<span i18n="transactions-list.newly-generated-coins">(Newly Generated Coins)</span></ng-template><br /><a placement="bottom" [ngbTooltip]="vin.scriptsig | hex2ascii"><span class="badge badge-secondary scriptmessage longer">{{ vin.scriptsig | hex2ascii }}</span></a></ng-container>
+                    <ng-container *ngSwitchCase="vin.is_coinbase"><span i18n="transactions-list.coinbase">Coinbase</span><ng-template [ngIf]="network !== 'liquid'">&nbsp;<span i18n="transactions-list.newly-generated-coins">(Newly Generated Coins)</span></ng-template><br /><a placement="bottom" [ngbTooltip]="vin.scriptsig | hex2ascii"><span class="badge badge-secondary scriptmessage longer">{{ vin.scriptsig | hex2ascii }}</span></a></ng-container>
                     <ng-container *ngSwitchCase="vin.is_pegin">
                       <span i18n="transactions-list.peg-in">Peg-in</span>
                     </ng-container>
@@ -56,18 +56,13 @@
                       <span>P2PK</span>
                     </ng-container>
                     <ng-container *ngSwitchDefault>
-                      <ng-template [ngIf]="!vin.prevout" [ngIfElse]="defaultAddress">
-                        <span>{{ vin.issuance ? 'Issuance' : 'UNKNOWN' }}</span>
-                      </ng-template>
-                      <ng-template #defaultAddress>
-                        <a [routerLink]="['/address/' | relativeUrl, vin.prevout.scriptpubkey_address]" title="{{ vin.prevout.scriptpubkey_address }}">
-                          <span class="d-block d-lg-none">{{ vin.prevout.scriptpubkey_address | shortenString : 16 }}</span>
-                          <span class="d-none d-lg-block">{{ vin.prevout.scriptpubkey_address | shortenString : 35 }}</span>
-                        </a>
-                        <div>
-                          <app-address-labels [vin]="vin"></app-address-labels>
-                        </div>
-                      </ng-template>
+                      <a [routerLink]="['/address/' | relativeUrl, vin.prevout.scriptpubkey_address]" title="{{ vin.prevout.scriptpubkey_address }}">
+                        <span class="d-block d-lg-none">{{ vin.prevout.scriptpubkey_address | shortenString : 16 }}</span>
+                        <span class="d-none d-lg-block">{{ vin.prevout.scriptpubkey_address | shortenString : 35 }}</span>
+                      </a>
+                      <div>
+                        <app-address-labels [vin]="vin"></app-address-labels>
+                      </div>
                     </ng-container>
                   </div>
                 </td>
@@ -189,14 +184,9 @@
                       <fa-icon [icon]="['fas', 'arrow-alt-circle-right']" [fixedWidth]="true"></fa-icon>
                     </span>
                     <ng-template #spent>
-                      <a *ngIf="outspends[i][vindex].txid else outputNoTxId" [routerLink]="['/tx/' | relativeUrl, outspends[i][vindex].txid]" class="red">
+                      <a [routerLink]="['/tx/' | relativeUrl, outspends[i][vindex].txid]" class="red">
                         <fa-icon [icon]="['fas', 'arrow-alt-circle-right']" [fixedWidth]="true"></fa-icon>
                       </a>
-                      <ng-template #outputNoTxId>
-                        <span class="red">
-                          <fa-icon [icon]="['fas', 'arrow-alt-circle-right']" [fixedWidth]="true"></fa-icon>
-                        </span>
-                      </ng-template>
                     </ng-template>
                   </ng-template>
                 </td>
@@ -254,7 +244,7 @@
           &nbsp;
         </span>
         <button type="button" class="btn btn-sm btn-primary mt-2" (click)="switchCurrency()">
-          <ng-template [ngIf]="network === 'liquid' || network === 'liquidtestnet'" [ngIfElse]="defaultAmount" i18n="shared.confidential">Confidential</ng-template>
+          <ng-template [ngIf]="network === 'liquid'" [ngIfElse]="defaultAmount" i18n="shared.confidential">Confidential</ng-template>
           <ng-template #defaultAmount>
             <app-amount [satoshis]="getTotalTxOutput(tx)"></app-amount>
           </ng-template>

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

@@ -15,7 +15,7 @@ import { map } from 'rxjs/operators';
 })
 export class TransactionsListComponent implements OnInit, OnChanges {
   network = '';
-  nativeAssetId = this.stateService.network === 'liquidtestnet' ? environment.nativeTestAssetId : environment.nativeAssetId;
+  nativeAssetId = environment.nativeAssetId;
   displayDetails = false;
 
   @Input() transactions: Transaction[];
@@ -41,7 +41,7 @@ export class TransactionsListComponent implements OnInit, OnChanges {
     this.latestBlock$ = this.stateService.blocks$.pipe(map(([block]) => block));
     this.stateService.networkChanged$.subscribe((network) => this.network = network);
 
-    if (this.network === 'liquid' || this.network === 'liquidtestnet') {
+    if (this.network === 'liquid') {
       this.assetsService.getAssetsMinimalJson$.subscribe((assets) => {
         this.assetsMinimal = assets;
       });
@@ -99,7 +99,7 @@ export class TransactionsListComponent implements OnInit, OnChanges {
   }
 
   switchCurrency() {
-    if (this.network === 'liquid' || this.network === 'liquidtestnet') {
+    if (this.network === 'liquid') {
       return;
     }
     const oldvalue = !this.stateService.viewFiat$.value;

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

@@ -2,7 +2,7 @@
 <div class="container-xl dashboard-container">
   <div class="row row-cols-1 row-cols-md-2" *ngIf="{ value: (mempoolInfoData$ | async) } as mempoolInfoData">
     <ng-template [ngIf]="collapseLevel === 'three'" [ngIfElse]="expanded">
-      <div class="col card-wrapper" *ngIf="(network$ | async) !== 'liquid' && (network$ | async) !== 'liquidtestnet'">
+      <div class="col card-wrapper" *ngIf="(network$ | async) !== 'liquid'">
         <div class="main-title" i18n="fees-box.transaction-fees">Transaction Fees</div>
         <div class="card">
           <div class="card-body">
@@ -10,7 +10,7 @@
           </div>
         </div>
       </div>
-      <div class="col" *ngIf="(network$ | async) !== 'liquid' && (network$ | async) !== 'liquidtestnet'">
+      <div class="col" *ngIf="(network$ | async) !== 'liquid'">
         <ng-container *ngTemplateOutlet="difficultyEpoch"></ng-container>
       </div>
       <div class="col">
@@ -29,7 +29,7 @@
       </div>
     </ng-template>
     <ng-template #expanded>
-      <div class="col card-wrapper" *ngIf="(network$ | async) !== 'liquid' && (network$ | async) !== 'liquidtestnet'">
+      <div class="col card-wrapper" *ngIf="(network$ | async) !== 'liquid'">
         <div class="main-title" i18n="fees-box.transaction-fees">Transaction Fees</div>
         <div class="card">
           <div class="card-body">
@@ -37,7 +37,7 @@
           </div>
         </div>
       </div>
-      <div class="col" *ngIf="(network$ | async) !== 'liquid' && (network$ | async) !== 'liquidtestnet'">
+      <div class="col" *ngIf="(network$ | async) !== 'liquid'">
         <ng-container *ngTemplateOutlet="difficultyEpoch"></ng-container>
       </div>
       <div class="col">
@@ -125,7 +125,7 @@
               <tbody>
                 <tr *ngFor="let transaction of transactions$ | async; let i = index;">
                   <td class="table-cell-txid"><a [routerLink]="['/tx' | relativeUrl, transaction.txid]">{{ transaction.txid | shortenString : 10 }}</a></td>
-                  <td class="table-cell-satoshis"><app-amount *ngIf="(network$ | async) !== 'liquid' && (network$ | async) !== 'liquidtestnet'; else liquidAmount" [satoshis]="transaction.value" digitsInfo="1.2-4" [noFiat]="true"></app-amount><ng-template #liquidAmount i18n="shared.confidential">Confidential</ng-template></td>
+                  <td class="table-cell-satoshis"><app-amount *ngIf="(network$ | async) !== 'liquid'; else liquidAmount" [satoshis]="transaction.value" digitsInfo="1.2-4" [noFiat]="true"></app-amount><ng-template #liquidAmount i18n="shared.confidential">Confidential</ng-template></td>
                   <td class="table-cell-fiat" *ngIf="(network$ | async) === ''" ><app-fiat [value]="transaction.value" digitsInfo="1.0-0"></app-fiat></td>
                   <td class="table-cell-fees">{{ transaction.fee / transaction.vsize | feeRounding }} <span class="symbol" i18n="shared.sat-vbyte|sat/vB">sat/vB</span></td>
                 </tr>

frontend/src/app/dashboard/dashboard.component.ts

@@ -262,7 +262,7 @@ export class DashboardComponent implements OnInit {
         share(),
       );
 
-    if (this.stateService.network === 'liquid' || this.stateService.network === 'liquidtestnet') {
+    if (this.stateService.network === 'liquid') {
       this.liquidPegsMonth$ = this.apiService.listLiquidPegsMonth$()
         .pipe(
           map((pegs) => {

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

@@ -1,5 +1,8 @@
 export interface OptimizedMempoolStats {
+  id: number;
   added: number;
+  unconfirmed_transactions: number;
+  tx_per_second: number;
   vbytes_per_second: number;
   total_fee: number;
   mempool_byte_weight: number;
@@ -49,5 +52,3 @@ export interface LiquidPegs {
   amount: string;
   date: string;
 }
-
-export interface ITranslators { [language: string]: string; }

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

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
-import { HttpClient, HttpParams } from '@angular/common/http';
-import { CpfpInfo, OptimizedMempoolStats, DifficultyAdjustment, AddressInformation, LiquidPegs, ITranslators } from '../interfaces/node-api.interface';
+import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
+import { CpfpInfo, OptimizedMempoolStats, DifficultyAdjustment, AddressInformation, LiquidPegs } from '../interfaces/node-api.interface';
 import { Observable } from 'rxjs';
 import { StateService } from './state.service';
 import { WebsocketResponse } from '../interfaces/websocket.interface';
@@ -85,10 +85,6 @@ export class ApiService {
     return this.httpClient.get<any[]>(this.apiBaseUrl + this.apiBasePath + '/api/v1/donations');
   }
 
-  getTranslators$(): Observable<ITranslators> {
-    return this.httpClient.get<ITranslators>(this.apiBaseUrl + this.apiBasePath + '/api/v1/translators');
-  }
-
   getContributor$(): Observable<any[]> {
     return this.httpClient.get<any[]>(this.apiBaseUrl + this.apiBasePath + '/api/v1/contributors');
   }

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

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
-import { map, shareReplay, switchMap } from 'rxjs/operators';
+import { shareReplay } from 'rxjs/operators';
 import { StateService } from './state.service';
 
 @Injectable({
@@ -21,23 +21,8 @@ export class AssetsService {
       apiBaseUrl = this.stateService.env.NGINX_PROTOCOL + '://' + this.stateService.env.NGINX_HOSTNAME + ':' + this.stateService.env.NGINX_PORT;
     }
 
-    this.getAssetsJson$ = this.stateService.networkChanged$
-      .pipe(
-        switchMap(() => this.httpClient.get(`${apiBaseUrl}/resources/assets${this.stateService.network === 'liquidtestnet' ? '-testnet' : ''}.json`)),
-        shareReplay(1),
-      );
-    this.getAssetsMinimalJson$ = this.stateService.networkChanged$
-    .pipe(
-      switchMap(() => this.httpClient.get(`${apiBaseUrl}/resources/assets${this.stateService.network === 'liquidtestnet' ? '-testnet' : ''}.minimal.json`)),
-      map((assetsMinimal) => {
-        if (this.stateService.network === 'liquidtestnet') {
-          // Hard coding the Liquid Testnet native asset
-          assetsMinimal['144c654344aa716d6f3abcc1ca90e5641e4e2a7f633bc09fe3baf64585819a49'] = [null, "tL-BTC", "Test Liquid Bitcoin", 8];
-        }
-        return assetsMinimal;
-      }),
-      shareReplay(1),
-    );
-    this.getMiningPools$ = this.httpClient.get(apiBaseUrl + '/resources/pools.json').pipe(shareReplay(1));
+    this.getAssetsJson$ = this.httpClient.get(apiBaseUrl + '/resources/assets.json').pipe(shareReplay());
+    this.getAssetsMinimalJson$ = this.httpClient.get(apiBaseUrl + '/resources/assets.minimal.json').pipe(shareReplay());
+    this.getMiningPools$ = this.httpClient.get(apiBaseUrl + '/resources/pools.json').pipe(shareReplay());
   }
 }

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

@@ -1,40 +0,0 @@
-import { DOCUMENT, getLocaleId } from '@angular/common';
-import { LOCALE_ID, Inject, Injectable } from '@angular/core';
-import { languages } from 'src/app/app.constants';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class LanguageService {
-  private language = 'en';
-  private languages = languages;
-  constructor(
-    @Inject(DOCUMENT) private document: Document,
-    @Inject(LOCALE_ID) private locale: string,
-  ) {
-    this.language = getLocaleId(this.locale).substring(0, 2);
-  }
-
-  getLanguage(): string {
-    return this.language;
-  }
-
-  stripLanguageFromUrl(urlPath: string) {
-    let rawUrlPath = urlPath ? urlPath : document.location.pathname;
-    const urlLanguage = this.document.location.pathname.split('/')[1];
-    if (this.languages.map((lang) => lang.code).indexOf(urlLanguage) != -1) {
-      rawUrlPath = rawUrlPath.substring(3);
-    }
-    return rawUrlPath;
-  }
-
-  getLanguageForUrl(): string {
-    return this.language === 'en' ? '' : '/' + this.language;
-  }
-
-  setLanguage(language: string): void {
-    try {
-      document.cookie = `lang=${language}; expires=Thu, 18 Dec 2050 12:00:00 UTC; path=/`;
-    } catch (e) { }
-  }
-}