Change hard-coded references from blockstream.info to mempool.space

.gitattributes

@@ -1,3 +0,0 @@
-# ignore all differences in line endings
-package.json eol=crlf -crlf
-*/package.json eol=crlf -crlf

.github/ISSUE_TEMPLATE.md

@@ -1,37 +0,0 @@
-<!--
-   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
--->
-
-### Description
-
-<!-- brief description of the bug -->
-
-#### Version
-
-<!-- commit id or version number -->
-
-### Steps to reproduce
-
-<!--if you can reliably reproduce the bug, list the steps here  -->
-
-### Expected behaviour
-
-<!--description of the expected behavior -->
-
-### Actual behaviour
-
-<!-- explain what happened instead of the expected behaviour -->
-
-### Screenshots
-
-<!--Screenshots if gui related, drag and drop to add to the issue -->
-
-#### Device or machine
-
-<!-- device/machine used, operating system -->
-
-#### Additional info
-
-<!-- Additional information useful for debugging (e.g. logs) -->

.gitignore

@@ -1 +0,0 @@
-sitemap

Dockerfile

@@ -4,9 +4,8 @@ RUN mkdir /mempool.space/
 COPY ./backend /mempool.space/backend/
 COPY ./frontend /mempool.space/frontend/
 COPY ./mariadb-structure.sql /mempool.space/mariadb-structure.sql
-#COPY ./nginx.conf /mempool.space/nginx.conf
 
-RUN apk add mariadb mariadb-client jq git nginx npm rsync
+RUN apk add mariadb mariadb-client git nginx npm rsync bash
 
 RUN mysql_install_db --user=mysql --datadir=/var/lib/mysql/
 RUN /usr/bin/mysqld_safe --datadir='/var/lib/mysql/'& \
@@ -32,23 +31,19 @@ ENV DB_PORT 3306
 ENV DB_USER mempool
 ENV DB_PASSWORD mempool
 ENV DB_DATABASE mempool
-ENV HTTP_PORT 80
 ENV API_ENDPOINT /api/v1/
 ENV CHAT_SSL_ENABLED false
-#ENV CHAT_SSL_PRIVKEY
-#ENV CHAT_SSL_CERT
-#ENV CHAT_SSL_CHAIN
 ENV MEMPOOL_REFRESH_RATE_MS 500
 ENV INITIAL_BLOCK_AMOUNT 8
-ENV DEFAULT_PROJECTED_BLOCKS_AMOUNT 8
+ENV DEFAULT_PROJECTED_BLOCKS_AMOUNT 3
 ENV KEEP_BLOCK_AMOUNT 24
 ENV BITCOIN_NODE_HOST bitcoinhost
 ENV BITCOIN_NODE_PORT 8332
 ENV BITCOIN_NODE_USER bitcoinuser
 ENV BITCOIN_NODE_PASS bitcoinpass
 ENV TX_PER_SECOND_SPAN_SECONDS 150
-
-#RUN echo "mysqld_safe& sleep 20 && cd /mempool.space/backend && rm -f mempool-config.json && rm -f cache.json && touch cache.json && jq -n env > mempool-config.json && node dist/index.js" > /entrypoint.sh
+ENV BACKEND_API bitcoind
+ENV ELECTRS_API_URL https://mempool.space/api
 
 RUN cd /mempool.space/frontend/ && \
     npm run build && \

README.md

@@ -200,13 +200,6 @@ Build the frontend static HTML/CSS/JS, rsync the output into nginx folder:
   sudo rsync -av --delete dist/mempool/ /var/www/html/
 ```
 
-### Optional frontend configuration
-In the `frontend` folder, make a copy of the sample config and modify it to fit your settings.
-
-```bash
-  cp mempool-frontend-config.sample.json mempool-frontend-config.json
-```
-
 ## Try It Out
 
 If everything went okay you should see the beautiful mempool :grin:

backend/mempool-config.sample.json

@@ -1,22 +1,25 @@
 {
-  "HTTP_PORT": 8999,
+  "ENV": "dev",
   "DB_HOST": "localhost",
   "DB_PORT": 3306,
   "DB_USER": "mempool",
   "DB_PASSWORD": "mempool",
   "DB_DATABASE": "mempool",
-  "DB_DISABLED": false,
+  "HTTP_PORT": 3000,
   "API_ENDPOINT": "/api/v1/",
-  "ELECTRS_POLL_RATE_MS": 2000,
-  "MEMPOOL_REFRESH_RATE_MS": 2000,
-  "DEFAULT_PROJECTED_BLOCKS_AMOUNT": 8,
-  "KEEP_BLOCK_AMOUNT": 24,
+  "CHAT_SSL_ENABLED": false,
+  "CHAT_SSL_PRIVKEY": "",
+  "CHAT_SSL_CERT": "",
+  "CHAT_SSL_CHAIN": "",
+  "MEMPOOL_REFRESH_RATE_MS": 500,
   "INITIAL_BLOCK_AMOUNT": 8,
-  "TX_PER_SECOND_SPAN_SECONDS": 150,
-  "ELECTRS_API_URL": "https://www.blockstream.info/testnet/api",
-  "BISQ_ENABLED": false,
-  "BSQ_BLOCKS_DATA_PATH": "/bisq/data",
-  "SSL": false,
-  "SSL_CERT_FILE_PATH": "/etc/letsencrypt/live/mysite/fullchain.pem",
-  "SSL_KEY_FILE_PATH": "/etc/letsencrypt/live/mysite/privkey.pem"
+  "DEFAULT_PROJECTED_BLOCKS_AMOUNT": 3,
+  "KEEP_BLOCK_AMOUNT": 24,
+  "BITCOIN_NODE_HOST": "localhost",
+  "BITCOIN_NODE_PORT": 8332,
+  "BITCOIN_NODE_USER": "",
+  "BITCOIN_NODE_PASS": "",
+  "BACKEND_API": "bitcoind",
+  "ELECTRS_API_URL": "https://mempool.space/api",
+  "TX_PER_SECOND_SPAN_SECONDS": 150
 }

backend/package.json

@@ -1,42 +1,31 @@
 {
   "name": "mempool-backend",
-  "version": "2.0.0",
-  "description": "Bitcoin mempool visualizer and blockchain explorer backend",
-  "license": "MIT",
-  "homepage": "https://mempool.space",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/mempool/mempool"
-  },
-  "bugs": {
-    "url": "https://github.com/mempool/mempool/issues"
-  },
-  "keywords": [
-    "bitcoin",
-    "mempool",
-    "blockchain",
-    "explorer",
-    "liquid"
-  ],
+  "version": "1.0.0",
+  "description": "Bitcoin Mempool Visualizer",
   "main": "index.ts",
   "scripts": {
     "build": "tsc",
-    "start": "npm run build && node dist/index.js",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "start": "npm run build && node dist/index.js"
   },
+  "author": {
+    "name": "Simon Lindh",
+    "url": "https://github.com/mempool-space/mempool.space"
+  },
+  "license": "MIT",
   "dependencies": {
-    "compression": "^1.7.4",
-    "express": "^4.17.1",
+    "bitcoin": "^3.0.1",
+    "compression": "^1.7.3",
+    "express": "^4.16.3",
     "mysql2": "^1.6.1",
-    "request": "^2.88.2",
-    "ws": "^7.3.1"
+    "request": "^2.88.0",
+    "ws": "^6.0.0"
   },
   "devDependencies": {
-    "@types/compression": "^1.0.1",
-    "@types/express": "^4.17.2",
+    "@types/express": "^4.16.0",
+    "@types/mysql2": "github:types/mysql2",
     "@types/request": "^2.48.2",
-    "@types/ws": "^6.0.4",
-    "tslint": "~6.1.0",
-    "typescript": "~3.9.7"
+    "@types/ws": "^6.0.1",
+    "tslint": "^5.11.0",
+    "typescript": "^3.1.1"
   }
 }

backend/src/api/backend-info.ts

@@ -1,29 +0,0 @@
-import * as fs from 'fs';
-import * as os from 'os';
-
-class BackendInfo {
-  gitCommitHash = '';
-  hostname = '';
-
-  constructor() {
-    this.setLatestCommitHash();
-    this.hostname = os.hostname();
-  }
-
-  public getBackendInfo() {
-    return {
-      'hostname': this.hostname,
-      'git-commit': this.gitCommitHash,
-    };
-  }
-
-  private setLatestCommitHash(): void {
-    try {
-      this.gitCommitHash = fs.readFileSync('../.git/refs/heads/master').toString().trim();
-    } catch (e) {
-      console.log('Could not load git commit info, skipping.');
-    }
-  }
-}
-
-export default new BackendInfo();

backend/src/api/bisq.ts

@@ -1,259 +0,0 @@
-const config = require('../../mempool-config.json');
-import * as fs from 'fs';
-import * as request from 'request';
-import { BisqBlocks, BisqBlock, BisqTransaction, BisqStats, BisqTrade } from '../interfaces';
-import { Common } from './common';
-
-class Bisq {
-  private static BLOCKS_JSON_FILE_PATH = '/all/blocks.json';
-  private latestBlockHeight = 0;
-  private blocks: BisqBlock[] = [];
-  private transactions: BisqTransaction[] = [];
-  private transactionIndex: { [txId: string]: BisqTransaction } = {};
-  private blockIndex: { [hash: string]: BisqBlock } = {};
-  private addressIndex: { [address: string]: BisqTransaction[] } = {};
-  private stats: BisqStats = {
-    minted: 0,
-    burnt: 0,
-    addresses: 0,
-    unspent_txos: 0,
-    spent_txos: 0,
-  };
-  private price: number = 0;
-  private priceUpdateCallbackFunction: ((price: number) => void) | undefined;
-  private topDirectoryWatcher: fs.FSWatcher | undefined;
-  private subdirectoryWatcher: fs.FSWatcher | undefined;
-
-  constructor() {}
-
-  startBisqService(): void {
-    this.checkForBisqDataFolder();
-    this.loadBisqDumpFile();
-    setInterval(this.updatePrice.bind(this), 1000 * 60 * 60);
-    this.updatePrice();
-    this.startTopDirectoryWatcher();
-    this.startSubDirectoryWatcher();
-  }
-
-  getTransaction(txId: string): BisqTransaction | undefined {
-    return this.transactionIndex[txId];
-  }
-
-  getTransactions(start: number, length: number, types: string[]): [BisqTransaction[], number] {
-    let transactions = this.transactions;
-    if (types.length) {
-      transactions = transactions.filter((tx) => types.indexOf(tx.txType) > -1);
-    }
-    return [transactions.slice(start, length + start), transactions.length];
-  }
-
-  getBlock(hash: string): BisqBlock | undefined {
-    return this.blockIndex[hash];
-  }
-
-  getAddress(hash: string): BisqTransaction[] {
-    return this.addressIndex[hash];
-  }
-
-  getBlocks(start: number, length: number): [BisqBlock[], number] {
-    return [this.blocks.slice(start, length + start), this.blocks.length];
-  }
-
-  getStats(): BisqStats {
-    return this.stats;
-  }
-
-  setPriceCallbackFunction(fn: (price: number) => void) {
-    this.priceUpdateCallbackFunction = fn;
-  }
-
-  getLatestBlockHeight(): number {
-    return this.latestBlockHeight;
-  }
-
-  private checkForBisqDataFolder() {
-    if (!fs.existsSync(config.BSQ_BLOCKS_DATA_PATH + Bisq.BLOCKS_JSON_FILE_PATH)) {
-      console.log(config.BSQ_BLOCKS_DATA_PATH + Bisq.BLOCKS_JSON_FILE_PATH + ` doesn't exist. Make sure Bisq is running and the config is correct before starting the server.`);
-      return process.exit(1);
-    }
-  }
-
-  private startTopDirectoryWatcher() {
-    if (this.topDirectoryWatcher) {
-      this.topDirectoryWatcher.close();
-    }
-    let fsWait: NodeJS.Timeout | null = null;
-    this.topDirectoryWatcher = fs.watch(config.BSQ_BLOCKS_DATA_PATH, () => {
-      if (fsWait) {
-        clearTimeout(fsWait);
-      }
-      if (this.subdirectoryWatcher) {
-        this.subdirectoryWatcher.close();
-      }
-      fsWait = setTimeout(() => {
-        console.log(`Bisq restart detected. Resetting both watchers in 3 minutes.`);
-        setTimeout(() => {
-          this.startTopDirectoryWatcher();
-          this.startSubDirectoryWatcher();
-          this.loadBisqDumpFile();
-        }, 180000);
-      }, 15000);
-    });
-  }
-
-  private startSubDirectoryWatcher() {
-    if (this.subdirectoryWatcher) {
-      this.subdirectoryWatcher.close();
-    }
-    if (!fs.existsSync(config.BSQ_BLOCKS_DATA_PATH + Bisq.BLOCKS_JSON_FILE_PATH)) {
-      console.log(config.BSQ_BLOCKS_DATA_PATH + Bisq.BLOCKS_JSON_FILE_PATH + ` doesn't exist. Trying to restart sub directory watcher again in 3 minutes.`);
-      setTimeout(() => this.startSubDirectoryWatcher(), 180000);
-      return;
-    }
-    let fsWait: NodeJS.Timeout | null = null;
-    this.subdirectoryWatcher = fs.watch(config.BSQ_BLOCKS_DATA_PATH + '/all', () => {
-      if (fsWait) {
-        clearTimeout(fsWait);
-      }
-      fsWait = setTimeout(() => {
-        console.log(`Change detected in the Bisq data folder.`);
-        this.loadBisqDumpFile();
-      }, 2000);
-    });
-  }
-
-  private updatePrice() {
-    request('https://markets.bisq.network/api/trades/?market=bsq_btc', { json: true }, (err, res, trades: BisqTrade[]) => {
-      if (err) { return console.log(err); }
-
-      const prices: number[] = [];
-      trades.forEach((trade) => {
-        prices.push(parseFloat(trade.price) * 100000000);
-      });
-      prices.sort((a, b) => a - b);
-      this.price = Common.median(prices);
-      if (this.priceUpdateCallbackFunction) {
-        this.priceUpdateCallbackFunction(this.price);
-      }
-    });
-  }
-
-  private async loadBisqDumpFile(): Promise<void> {
-    try {
-      const data = await this.loadData();
-      await this.loadBisqBlocksDump(data);
-      this.buildIndex();
-      this.calculateStats();
-    } catch (e) {
-      console.log('loadBisqDumpFile() error.', e.message);
-    }
-  }
-
-  private buildIndex() {
-    const start = new Date().getTime();
-    this.transactions = [];
-    this.transactionIndex = {};
-    this.addressIndex = {};
-
-    this.blocks.forEach((block) => {
-      /* Build block index */
-      if (!this.blockIndex[block.hash]) {
-        this.blockIndex[block.hash] = block;
-      }
-
-      /* Build transactions index */
-      block.txs.forEach((tx) => {
-        this.transactions.push(tx);
-        this.transactionIndex[tx.id] = tx;
-      });
-    });
-
-    /* Build address index */
-    this.transactions.forEach((tx) => {
-      tx.inputs.forEach((input) => {
-        if (!this.addressIndex[input.address]) {
-          this.addressIndex[input.address] = [];
-        }
-        if (this.addressIndex[input.address].indexOf(tx) === -1) {
-          this.addressIndex[input.address].push(tx);
-        }
-      });
-      tx.outputs.forEach((output) => {
-        if (!this.addressIndex[output.address]) {
-          this.addressIndex[output.address] = [];
-        }
-        if (this.addressIndex[output.address].indexOf(tx) === -1) {
-          this.addressIndex[output.address].push(tx);
-        }
-      });
-    });
-
-    const time = new Date().getTime() - start;
-    console.log('Bisq data index rebuilt in ' + time + ' ms');
-  }
-
-  private calculateStats() {
-    let minted = 0;
-    let burned = 0;
-    let unspent = 0;
-    let spent = 0;
-
-    this.transactions.forEach((tx) => {
-      tx.outputs.forEach((output) => {
-        if (output.opReturn) {
-          return;
-        }
-        if (output.txOutputType === 'GENESIS_OUTPUT' || output.txOutputType === 'ISSUANCE_CANDIDATE_OUTPUT' && output.isVerified) {
-          minted += output.bsqAmount;
-        }
-        if (output.isUnspent) {
-          unspent++;
-        } else {
-          spent++;
-        }
-      });
-      burned += tx['burntFee'];
-    });
-
-    this.stats = {
-      addresses: Object.keys(this.addressIndex).length,
-      minted: minted,
-      burnt: burned,
-      spent_txos: spent,
-      unspent_txos: unspent,
-    };
-  }
-
-  private async loadBisqBlocksDump(cacheData: string): Promise<void> {
-    const start = new Date().getTime();
-    if (cacheData && cacheData.length !== 0) {
-      console.log('Processing Bisq data dump...');
-      const data: BisqBlocks = JSON.parse(cacheData);
-      if (data.blocks && data.blocks.length !== this.blocks.length) {
-        this.blocks = data.blocks.filter((block) => block.txs.length > 0);
-        this.blocks.reverse();
-        this.latestBlockHeight = data.chainHeight;
-        const time = new Date().getTime() - start;
-        console.log('Bisq dump processed in ' + time + ' ms');
-      } else {
-        throw new Error(`Bisq dump didn't contain any blocks`);
-      }
-    }
-  }
-
-  private loadData(): Promise<string> {
-    return new Promise((resolve, reject) => {
-      if (!fs.existsSync(config.BSQ_BLOCKS_DATA_PATH + Bisq.BLOCKS_JSON_FILE_PATH)) {
-        return reject(Bisq.BLOCKS_JSON_FILE_PATH + ` doesn't exist`);
-      }
-      fs.readFile(config.BSQ_BLOCKS_DATA_PATH + Bisq.BLOCKS_JSON_FILE_PATH, 'utf8', (err, data) => {
-        if (err) {
-          reject(err);
-        }
-        resolve(data);
-      });
-    });
-  }
-}
-
-export default new Bisq();

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

@@ -0,0 +1,19 @@
+import { IMempoolInfo, ITransaction, IBlock } from '../../interfaces';
+
+export interface AbstractBitcoinApi {
+  getMempoolInfo(): Promise<IMempoolInfo>;
+  getRawMempool(): Promise<ITransaction['txid'][]>;
+  getRawTransaction(txId: string): Promise<ITransaction>;
+  getBlockCount(): Promise<number>;
+  getBlockAndTransactions(hash: string): Promise<IBlock>;
+  getBlockHash(height: number): Promise<string>;
+
+  getBlock(hash: string): Promise<IBlock>;
+  getBlockTransactions(hash: string): Promise<IBlock>;
+  getBlockTransactionsFromIndex(hash: string, index: number): Promise<IBlock>;
+  getBlocks(): Promise<string>;
+  getBlocksFromHeight(height: number): Promise<string>;
+  getAddress(address: string): Promise<IBlock>;
+  getAddressTransactions(address: string): Promise<IBlock>;
+  getAddressTransactionsFromLastSeenTxid(address: string, lastSeenTxid: string): Promise<IBlock>;
+}

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

@@ -0,0 +1,16 @@
+const config = require('../../../mempool-config.json');
+import { AbstractBitcoinApi } from './bitcoin-api-abstract-factory';
+import BitcoindApi from './bitcoind-api';
+import ElectrsApi from './electrs-api';
+
+function factory(): AbstractBitcoinApi {
+  switch (config.BACKEND_API) {
+    case 'electrs':
+      return new ElectrsApi();
+    case 'bitcoind':
+    default:
+      return new BitcoindApi();
+  }
+}
+
+export default factory();

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

@@ -0,0 +1,110 @@
+const config = require('../../../mempool-config.json');
+import * as bitcoin from 'bitcoin';
+import { ITransaction, IMempoolInfo, IBlock } from '../../interfaces';
+import { AbstractBitcoinApi } from './bitcoin-api-abstract-factory';
+
+class BitcoindApi implements AbstractBitcoinApi {
+  client: any;
+
+  constructor() {
+    this.client = new bitcoin.Client({
+      host: config.BITCOIN_NODE_HOST,
+      port: config.BITCOIN_NODE_PORT,
+      user: config.BITCOIN_NODE_USER,
+      pass: config.BITCOIN_NODE_PASS,
+    });
+  }
+
+  getMempoolInfo(): Promise<IMempoolInfo> {
+    return new Promise((resolve, reject) => {
+      this.client.getMempoolInfo((err: Error, mempoolInfo: any) => {
+        if (err) {
+          return reject(err);
+        }
+        resolve(mempoolInfo);
+      });
+    });
+  }
+
+  getRawMempool(): Promise<ITransaction['txid'][]> {
+    return new Promise((resolve, reject) => {
+      this.client.getRawMemPool((err: Error, transactions: ITransaction['txid'][]) => {
+        if (err) {
+          return reject(err);
+        }
+        resolve(transactions);
+      });
+    });
+  }
+
+  getRawTransaction(txId: string): Promise<ITransaction> {
+    return new Promise((resolve, reject) => {
+      this.client.getRawTransaction(txId, true, (err: Error, txData: ITransaction) => {
+        if (err) {
+          return reject(err);
+        }
+        resolve(txData);
+      });
+    });
+  }
+
+  getBlockCount(): Promise<number> {
+    return new Promise((resolve, reject) => {
+      this.client.getBlockCount((err: Error, response: number) => {
+        if (err) {
+          return reject(err);
+        }
+        resolve(response);
+      });
+    });
+  }
+
+  getBlockAndTransactions(hash: string, verbosity:  1 | 2 = 1): Promise<IBlock> {
+    return new Promise((resolve, reject) => {
+      this.client.getBlock(hash, verbosity, (err: Error, block: IBlock) => {
+        if (err) {
+          return reject(err);
+        }
+        resolve(block);
+      });
+    });
+  }
+
+  getBlockHash(height: number): Promise<string> {
+    return new Promise((resolve, reject) => {
+      this.client.getBlockHash(height, (err: Error, response: string) => {
+        if (err) {
+          return reject(err);
+        }
+        resolve(response);
+      });
+    });
+  }
+
+  getBlock(hash: string): Promise<IBlock> {
+    throw new Error('Method not implemented.');
+  }
+  getBlocks(): Promise<string> {
+    throw new Error('Method not implemented.');
+  }
+  getBlocksFromHeight(height: number): Promise<string> {
+    throw new Error('Method not implemented.');
+  }
+  getBlockTransactions(hash: string): Promise<IBlock> {
+    throw new Error('Method not implemented.');
+  }
+  getBlockTransactionsFromIndex(hash: string, index: number): Promise<IBlock> {
+    throw new Error('Method not implemented.');
+  }
+  getAddress(address: string): Promise<IBlock> {
+    throw new Error('Method not implemented.');
+  }
+  getAddressTransactions(address: string): Promise<IBlock> {
+    throw new Error('Method not implemented.');
+  }
+  getAddressTransactionsFromLastSeenTxid(address: string, lastSeenTxid: string): Promise<IBlock> {
+    throw new Error('Method not implemented.');
+  }
+}
+
+export default BitcoindApi;

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

@@ -1,13 +1,14 @@
 const config = require('../../../mempool-config.json');
-import { Transaction, Block, MempoolInfo } from '../../interfaces';
+import { ITransaction, IMempoolInfo, IBlock } from '../../interfaces';
+import { AbstractBitcoinApi } from './bitcoin-api-abstract-factory';
 import * as request from 'request';
 
-class ElectrsApi {
+class ElectrsApi implements AbstractBitcoinApi {
 
   constructor() {
   }
 
-  getMempoolInfo(): Promise<MempoolInfo> {
+  getMempoolInfo(): Promise<IMempoolInfo> {
     return new Promise((resolve, reject) => {
       request(config.ELECTRS_API_URL + '/mempool', { json: true, timeout: 10000 }, (err, res, response) => {
         if (err) {
@@ -15,10 +16,6 @@ class ElectrsApi {
         } else if (res.statusCode !== 200) {
           reject(response);
         } else {
-          if (typeof response.count !== 'number') {
-            reject('Empty data');
-            return;
-          }
           resolve({
             size: response.count,
             bytes: response.vsize,
@@ -28,43 +25,38 @@ class ElectrsApi {
     });
   }
 
-  getRawMempool(): Promise<Transaction['txid'][]> {
+  getRawMempool(): Promise<ITransaction['txid'][]> {
     return new Promise((resolve, reject) => {
-      request(config.ELECTRS_API_URL + '/mempool/txids', { json: true, timeout: 10000, forever: true }, (err, res, response) => {
+      request(config.ELECTRS_API_URL + '/mempool/txids', { json: true, timeout: 10000 }, (err, res, response) => {
         if (err) {
           reject(err);
         } else if (res.statusCode !== 200) {
           reject(response);
         } else {
-          if (response.constructor === Array) {
-            resolve(response);
-          } else {
-            reject('returned invalid data');
-          }
+          resolve(response);
         }
       });
     });
   }
 
-  getRawTransaction(txId: string): Promise<Transaction> {
+  getRawTransaction(txId: string): Promise<ITransaction> {
     return new Promise((resolve, reject) => {
-      request(config.ELECTRS_API_URL + '/tx/' + txId, { json: true, timeout: 10000, forever: true }, (err, res, response) => {
+      request(config.ELECTRS_API_URL + '/tx/' + txId, { json: true, timeout: 10000 }, (err, res, response) => {
         if (err) {
           reject(err);
         } else if (res.statusCode !== 200) {
           reject(response);
         } else {
-          if (response.constructor === Object) {
-            resolve(response);
-          } else {
-            reject('returned invalid data');
-          }
+          response.vsize = Math.round(response.weight / 4);
+          response.fee = response.fee / 100000000;
+          response.blockhash = response.status.block_hash;
+          resolve(response);
         }
       });
     });
   }
 
-  getBlockHeightTip(): Promise<number> {
+  getBlockCount(): Promise<number> {
     return new Promise((resolve, reject) => {
       request(config.ELECTRS_API_URL + '/blocks/tip/height', { json: true, timeout: 10000 }, (err, res, response) => {
         if (err) {
@@ -78,19 +70,29 @@ class ElectrsApi {
     });
   }
 
-  getTxIdsForBlock(hash: string): Promise<string[]> {
+  getBlockAndTransactions(hash: string): Promise<IBlock> {
     return new Promise((resolve, reject) => {
-      request(config.ELECTRS_API_URL + '/block/' + hash + '/txids', { json: true, timeout: 10000 }, (err, res, response) => {
+      request(config.ELECTRS_API_URL + '/block/' + hash, { json: true, timeout: 10000 }, (err, res, response) => {
         if (err) {
           reject(err);
         } else if (res.statusCode !== 200) {
           reject(response);
         } else {
-          if (response.constructor === Array) {
-            resolve(response);
-          } else {
-            reject('returned invalid data');
-          }
+          request(config.ELECTRS_API_URL + '/block/' + hash + '/txids', { json: true, timeout: 10000 }, (err2, res2, response2) => {
+            if (err2) {
+              reject(err2);
+            } else if (res.statusCode !== 200) {
+              reject(response);
+            } else {
+              const block = response;
+              block.hash = hash;
+              block.nTx = block.tx_count;
+              block.time = block.timestamp;
+              block.tx = response2;
+
+              resolve(block);
+            }
+          });
         }
       });
     });
@@ -110,6 +112,20 @@ class ElectrsApi {
     });
   }
 
+  getBlocks(): Promise<string> {
+    return new Promise((resolve, reject) => {
+      request(config.ELECTRS_API_URL + '/blocks', { json: true, timeout: 10000 }, (err, res, response) => {
+        if (err) {
+          reject(err);
+        } else if (res.statusCode !== 200) {
+          reject(response);
+        } else  {
+          resolve(response);
+        }
+      });
+    });
+  }
+
   getBlocksFromHeight(height: number): Promise<string> {
     return new Promise((resolve, reject) => {
       request(config.ELECTRS_API_URL + '/blocks/' + height, { json: true, timeout: 10000 }, (err, res, response) => {
@@ -124,23 +140,90 @@ class ElectrsApi {
     });
   }
 
-  getBlock(hash: string): Promise<Block> {
+  getBlock(hash: string): Promise<IBlock> {
     return new Promise((resolve, reject) => {
       request(config.ELECTRS_API_URL + '/block/' + hash, { json: true, timeout: 10000 }, (err, res, response) => {
         if (err) {
           reject(err);
         } else if (res.statusCode !== 200) {
           reject(response);
-        } else {
-          if (response.constructor === Object) {
-            resolve(response);
-          } else {
-            reject('getBlock returned invalid data');
-          }
+        } else  {
+          resolve(response);
+        }
+      });
+    });
+  }
+
+  getBlockTransactions(hash: string): Promise<IBlock> {
+    return new Promise((resolve, reject) => {
+      request(config.ELECTRS_API_URL + '/block/' + hash + '/txs', { json: true, timeout: 10000 }, (err, res, response) => {
+        if (err) {
+          reject(err);
+        } else if (res.statusCode !== 200) {
+          reject(response);
+        } else  {
+          resolve(response);
+        }
+      });
+    });
+  }
+
+  getBlockTransactionsFromIndex(hash: string, index: number): Promise<IBlock> {
+    return new Promise((resolve, reject) => {
+      request(config.ELECTRS_API_URL + '/block/' + hash + '/txs/' + index, { json: true, timeout: 10000 }, (err, res, response) => {
+        if (err) {
+          reject(err);
+        } else if (res.statusCode !== 200) {
+          reject(response);
+        } else  {
+          resolve(response);
+        }
+      });
+    });
+  }
+
+  getAddress(address: string): Promise<IBlock> {
+    return new Promise((resolve, reject) => {
+      request(config.ELECTRS_API_URL + '/address/' + address, { json: true, timeout: 10000 }, (err, res, response) => {
+        if (err) {
+          reject(err);
+        } else if (res.statusCode !== 200) {
+          reject(response);
+        } else  {
+          resolve(response);
+        }
+      });
+    });
+  }
+
+  getAddressTransactions(address: string): Promise<IBlock> {
+    return new Promise((resolve, reject) => {
+      request(config.ELECTRS_API_URL + '/address/' + address + '/txs', { json: true, timeout: 10000 }, (err, res, response) => {
+        if (err) {
+          reject(err);
+        } else if (res.statusCode !== 200) {
+          reject(response);
+        } else  {
+          resolve(response);
+        }
+      });
+    });
+  }
+
+  getAddressTransactionsFromLastSeenTxid(address: string, lastSeenTxid: string): Promise<IBlock> {
+    return new Promise((resolve, reject) => {
+      request(config.ELECTRS_API_URL + '/address/' + address + '/txs/chain/' + lastSeenTxid,
+        { json: true, timeout: 10000 }, (err, res, response) => {
+        if (err) {
+          reject(err);
+        } else if (res.statusCode !== 200) {
+          reject(response);
+        } else  {
+          resolve(response);
         }
       });
     });
   }
 }
 
-export default new ElectrsApi();
+export default ElectrsApi;

backend/src/api/blocks.ts

@@ -1,107 +1,214 @@
 const config = require('../../mempool-config.json');
-import bitcoinApi from './bitcoin/electrs-api';
+import bitcoinApi from './bitcoin/bitcoin-api-factory';
+import { DB } from '../database';
+import { IBlock, ITransaction } from '../interfaces';
 import memPool from './mempool';
-import { Block, TransactionExtended, TransactionMinerInfo } from '../interfaces';
-import { Common } from './common';
 
 class Blocks {
-  private blocks: Block[] = [];
+  private blocks: IBlock[] = [];
+  private newBlockCallback: Function | undefined;
   private currentBlockHeight = 0;
-  private newBlockCallback: ((block: Block, txIds: string[], transactions: TransactionExtended[]) => void) | undefined;
 
-  constructor() { }
+  constructor() {
+    setInterval(this.$clearOldTransactionsAndBlocksFromDatabase.bind(this), 86400000);
+  }
 
-  public getBlocks(): Block[] {
+  public setNewBlockCallback(fn: Function) {
+    this.newBlockCallback = fn;
+  }
+
+  public getBlocks(): IBlock[] {
     return this.blocks;
   }
 
-  public setBlocks(blocks: Block[]) {
-    this.blocks = blocks;
-  }
-
-  public setNewBlockCallback(fn: (block: Block, txIds: string[], transactions: TransactionExtended[]) => void) {
-    this.newBlockCallback = fn;
+  public formatBlock(block: IBlock) {
+    return {
+      hash: block.hash,
+      height: block.height,
+      nTx: block.nTx - 1,
+      size: block.size,
+      time: block.time,
+      weight: block.weight,
+      fees: block.fees,
+      minFee: block.minFee,
+      maxFee: block.maxFee,
+      medianFee: block.medianFee,
+    };
   }
 
   public async updateBlocks() {
     try {
-      const blockHeightTip = await bitcoinApi.getBlockHeightTip();
+      const blockCount = await bitcoinApi.getBlockCount();
 
       if (this.blocks.length === 0) {
-        this.currentBlockHeight = blockHeightTip - config.INITIAL_BLOCK_AMOUNT;
+        this.currentBlockHeight = blockCount - config.INITIAL_BLOCK_AMOUNT;
       } else {
         this.currentBlockHeight = this.blocks[this.blocks.length - 1].height;
       }
 
-      if (blockHeightTip - this.currentBlockHeight > config.INITIAL_BLOCK_AMOUNT * 2) {
-        console.log(`${blockHeightTip - this.currentBlockHeight} blocks since tip. Fast forwarding to the ${config.INITIAL_BLOCK_AMOUNT} recent blocks`);
-        this.currentBlockHeight = blockHeightTip - config.INITIAL_BLOCK_AMOUNT;
-      }
+      while (this.currentBlockHeight < blockCount) {
+        this.currentBlockHeight++;
 
-      while (this.currentBlockHeight < blockHeightTip) {
-        if (this.currentBlockHeight === 0) {
-          this.currentBlockHeight = blockHeightTip;
+        let block: IBlock | undefined;
+
+        const storedBlock = await this.$getBlockFromDatabase(this.currentBlockHeight);
+        if (storedBlock) {
+          block = storedBlock;
         } else {
-          this.currentBlockHeight++;
-          console.log(`New block found (#${this.currentBlockHeight})!`);
-        }
+          const blockHash = await bitcoinApi.getBlockHash(this.currentBlockHeight);
+          block = await bitcoinApi.getBlockAndTransactions(blockHash);
 
-        const blockHash = await bitcoinApi.getBlockHash(this.currentBlockHeight);
-        const block = await bitcoinApi.getBlock(blockHash);
-        const txIds = await bitcoinApi.getTxIdsForBlock(blockHash);
-
-        const mempool = memPool.getMempool();
-        let found = 0;
-        let notFound = 0;
-
-        const transactions: TransactionExtended[] = [];
-
-        for (let i = 0; i < txIds.length; i++) {
-          if (mempool[txIds[i]]) {
-            transactions.push(mempool[txIds[i]]);
-            found++;
-          } else {
-            console.log(`Fetching block tx ${i} of ${txIds.length}`);
-            const tx = await memPool.getTransactionExtended(txIds[i]);
-            if (tx) {
-              transactions.push(tx);
-            }
-            notFound++;
+          const coinbase = await memPool.getRawTransaction(block.tx[0], true);
+          if (coinbase && coinbase.totalOut) {
+            block.fees = coinbase.totalOut;
           }
+
+          const mempool = memPool.getMempool();
+          let found = 0;
+          let notFound = 0;
+
+          let transactions: ITransaction[] = [];
+
+          for (let i = 1; i < block.tx.length; i++) {
+            if (mempool[block.tx[i]]) {
+              transactions.push(mempool[block.tx[i]]);
+              found++;
+            } else {
+              console.log(`Fetching block tx ${i} of ${block.tx.length}`);
+              const tx = await memPool.getRawTransaction(block.tx[i]);
+              if (tx) {
+                transactions.push(tx);
+              }
+              notFound++;
+            }
+          }
+
+          transactions.sort((a, b) => b.feePerVsize - a.feePerVsize);
+          transactions = transactions.filter((tx: ITransaction) => tx.feePerVsize);
+
+          block.minFee = transactions[transactions.length - 1] ? transactions[transactions.length - 1].feePerVsize : 0;
+          block.maxFee = transactions[0] ? transactions[0].feePerVsize : 0;
+          block.medianFee = this.median(transactions.map((tx) => tx.feePerVsize));
+
+          console.log(`New block found (#${this.currentBlockHeight})! `
+           + `${found} of ${block.tx.length} found in mempool. ${notFound} not found.`);
+
+           if (this.newBlockCallback) {
+            this.newBlockCallback(block);
+          }
+
+          this.$saveBlockToDatabase(block);
+          this.$saveTransactionsToDatabase(block.height, transactions);
         }
 
-        console.log(`${found} of ${txIds.length} found in mempool. ${notFound} not found.`);
-
-        block.reward = transactions[0].vout.reduce((acc, curr) => acc + curr.value, 0);
-        block.coinbaseTx = this.stripCoinbaseTransaction(transactions[0]);
-        transactions.sort((a, b) => b.feePerVsize - a.feePerVsize);
-        block.medianFee = transactions.length > 1 ? Common.median(transactions.map((tx) => tx.feePerVsize)) : 0;
-        block.feeRange = transactions.length > 1 ? Common.getFeesInRange(transactions.slice(0, transactions.length - 1), 8) : [0, 0];
-
         this.blocks.push(block);
         if (this.blocks.length > config.KEEP_BLOCK_AMOUNT) {
           this.blocks.shift();
         }
 
-        if (this.newBlockCallback) {
-          this.newBlockCallback(block, txIds, transactions);
-        }
       }
-
     } catch (err) {
-      console.log('updateBlocks error', err);
+      console.log('Error getBlockCount', err);
     }
   }
 
-  private stripCoinbaseTransaction(tx: TransactionExtended): TransactionMinerInfo {
-    return {
-      vin: [{
-        scriptsig: tx.vin[0].scriptsig
-      }],
-      vout: tx.vout
-        .map((vout) => ({ scriptpubkey_address: vout.scriptpubkey_address, value: vout.value }))
-        .filter((vout) => vout.value)
-    };
+  private async $getBlockFromDatabase(height: number): Promise<IBlock | undefined> {
+    try {
+      const connection = await DB.pool.getConnection();
+      const query = `
+        SELECT * FROM blocks WHERE height = ?
+      `;
+
+      const [rows] = await connection.query<any>(query, [height]);
+      connection.release();
+
+      if (rows[0]) {
+        return rows[0];
+      }
+    } catch (e) {
+      console.log('$get() block error', e);
+    }
+  }
+
+  private async $saveBlockToDatabase(block: IBlock) {
+    try {
+      const connection = await DB.pool.getConnection();
+      const query = `
+        INSERT IGNORE INTO blocks
+        (height, hash, size, weight, minFee, maxFee, time, fees, nTx, medianFee)
+        VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+      `;
+
+      const params: (any)[] = [
+        block.height,
+        block.hash,
+        block.size,
+        block.weight,
+        block.minFee,
+        block.maxFee,
+        block.time,
+        block.fees,
+        block.nTx - 1,
+        block.medianFee,
+      ];
+
+      await connection.query(query, params);
+      connection.release();
+    } catch (e) {
+      console.log('$create() block error', e);
+    }
+  }
+
+  private async $saveTransactionsToDatabase(blockheight: number, transactions: ITransaction[]) {
+    try {
+      const connection = await DB.pool.getConnection();
+
+      for (let i = 0; i < transactions.length; i++) {
+        const query = `
+          INSERT IGNORE INTO transactions
+          (blockheight, txid, fee, feePerVsize)
+          VALUES(?, ?, ?, ?)
+        `;
+
+        const params: (any)[] = [
+          blockheight,
+          transactions[i].txid,
+          transactions[i].fee,
+          transactions[i].feePerVsize,
+        ];
+
+        await connection.query(query, params);
+      }
+
+      connection.release();
+    } catch (e) {
+      console.log('$create() transaction error', e);
+    }
+  }
+
+  private async $clearOldTransactionsAndBlocksFromDatabase() {
+    try {
+      const connection = await DB.pool.getConnection();
+      let query = `DELETE FROM blocks WHERE height < ?`;
+      await connection.query<any>(query, [this.currentBlockHeight - config.KEEP_BLOCK_AMOUNT]);
+      query = `DELETE FROM transactions WHERE blockheight < ?`;
+      await connection.query<any>(query, [this.currentBlockHeight - config.KEEP_BLOCK_AMOUNT]);
+      connection.release();
+    } catch (e) {
+      console.log('$clearOldTransactionsFromDatabase() error', e);
+    }
+  }
+
+  private median(numbers: number[]) {
+    if (!numbers.length) { return 0; }
+    let medianNr = 0;
+    const numsLen = numbers.length;
+    if (numsLen % 2 === 0) {
+        medianNr = (numbers[numsLen / 2 - 1] + numbers[numsLen / 2]) / 2;
+    } else {
+        medianNr = numbers[(numsLen - 1) / 2];
+    }
+    return medianNr;
   }
 }
 

backend/src/api/common.ts

@@ -1,50 +0,0 @@
-import { TransactionExtended } from '../interfaces';
-
-export class Common {
-  static median(numbers: number[]) {
-    let medianNr = 0;
-    const numsLen = numbers.length;
-    if (numsLen % 2 === 0) {
-        medianNr = (numbers[numsLen / 2 - 1] + numbers[numsLen / 2]) / 2;
-    } else {
-        medianNr = numbers[(numsLen - 1) / 2];
-    }
-    return medianNr;
-  }
-
-  static getFeesInRange(transactions: TransactionExtended[], rangeLength: number) {
-    const arr = [transactions[transactions.length - 1].feePerVsize];
-    const chunk = 1 / (rangeLength - 1);
-    let itemsToAdd = rangeLength - 2;
-
-    while (itemsToAdd > 0) {
-      arr.push(transactions[Math.floor(transactions.length * chunk * itemsToAdd)].feePerVsize);
-      itemsToAdd--;
-    }
-
-    arr.push(transactions[0].feePerVsize);
-    return arr;
-  }
-
-  static findRbfTransactions(added: TransactionExtended[], deleted: TransactionExtended[]): { [txid: string]: TransactionExtended } {
-    const matches: { [txid: string]: TransactionExtended } = {};
-    deleted
-      // The replaced tx must have at least one input with nSequence < maxint-1 (That’s the opt-in)
-      .filter((tx) => tx.vin.some((vin) => vin.sequence < 0xfffffffe))
-      .forEach((deletedTx) => {
-        const foundMatches = added.find((addedTx) => {
-          // The new tx must, absolutely speaking, pay at least as much fee as the replaced tx.
-          return addedTx.fee > deletedTx.fee
-            // The new transaction must pay more fee per kB than the replaced tx.
-            && addedTx.feePerVsize > deletedTx.feePerVsize
-            // Spends one or more of the same inputs
-            && deletedTx.vin.some((deletedVin) =>
-              addedTx.vin.some((vin) => vin.txid === deletedVin.txid));
-            });
-        if (foundMatches) {
-          matches[deletedTx.txid] = foundMatches;
-        }
-      });
-    return matches;
-  }
-}

backend/src/api/disk-cache.ts

@@ -1,49 +1,14 @@
 import * as fs from 'fs';
-import memPool from './mempool';
-import blocks from './blocks';
 
 class DiskCache {
   static FILE_NAME = './cache.json';
+  constructor() { }
 
-  constructor() {
-    process.on('SIGINT', () => {
-      this.saveCacheToDisk();
-      process.exit(2);
-    });
-
-    process.on('SIGTERM', () => {
-      this.saveCacheToDisk();
-      process.exit(2);
-    });
-  }
-
-  saveCacheToDisk() {
-    this.saveData(JSON.stringify({
-      mempool: memPool.getMempool(),
-      blocks: blocks.getBlocks(),
-    }));
-    console.log('Mempool and blocks data saved to disk cache');
-  }
-
-  loadMempoolCache() {
-    const cacheData = this.loadData();
-    if (cacheData) {
-      console.log('Restoring mempool and blocks data from disk cache');
-      const data = JSON.parse(cacheData);
-      if (data.mempool) {
-        memPool.setMempool(data.mempool);
-        blocks.setBlocks(data.blocks);
-      } else {
-        memPool.setMempool(data);
-      }
-    }
-  }
-
-  private saveData(dataBlob: string) {
+  saveData(dataBlob: string) {
     fs.writeFileSync(DiskCache.FILE_NAME, dataBlob, 'utf8');
   }
 
-  private loadData(): string {
+  loadData(): string {
     return fs.readFileSync(DiskCache.FILE_NAME, 'utf8');
   }
 }

backend/src/api/fee-api.ts

@@ -1,10 +1,11 @@
-import projectedBlocks from './mempool-blocks';
+import projectedBlocks from './projected-blocks';
+import { DB } from '../database';
 
 class FeeApi {
   constructor() { }
 
   public getRecommendedFee() {
-    const pBlocks = projectedBlocks.getMempoolBlocks();
+    const pBlocks = projectedBlocks.getProjectedBlocks();
     if (!pBlocks.length) {
       return {
         'fastestFee': 0,
@@ -14,7 +15,7 @@ class FeeApi {
     }
     let firstMedianFee = Math.ceil(pBlocks[0].medianFee);
 
-    if (pBlocks.length === 1 && pBlocks[0].blockVSize <= 500000) {
+    if (pBlocks.length === 1 && pBlocks[0].blockWeight <= 2000000) {
       firstMedianFee = 1;
     }
 
@@ -27,6 +28,20 @@ class FeeApi {
       'hourFee': thirdMedianFee,
     };
   }
+
+  public async $getTransactionsForBlock(blockHeight: number): Promise<any[]> {
+    try {
+      const connection = await DB.pool.getConnection();
+      const query = `SELECT feePerVsize AS fpv FROM transactions WHERE blockheight = ? ORDER BY feePerVsize ASC`;
+      const [rows] = await connection.query<any>(query, [blockHeight]);
+      connection.release();
+      return rows;
+    } catch (e) {
+      console.log('$getTransactionsForBlock() error', e);
+      return [];
+    }
+  }
+
 }
 
 export default new FeeApi();

backend/src/api/fiat-conversion.ts

@@ -10,7 +10,6 @@ class FiatConversion {
   constructor() { }
 
   public startService() {
-    console.log('Starting currency rates service');
     setInterval(this.updateCurrency.bind(this), 1000 * 60 * 60);
     this.updateCurrency();
   }

backend/src/api/mempool-blocks.ts

@@ -1,86 +0,0 @@
-const config = require('../../mempool-config.json');
-import { MempoolBlock, TransactionExtended, MempoolBlockWithTransactions } from '../interfaces';
-import { Common } from './common';
-
-class MempoolBlocks {
-  private mempoolBlocks: MempoolBlockWithTransactions[] = [];
-
-  constructor() {}
-
-  public getMempoolBlocks(): MempoolBlock[] {
-    return this.mempoolBlocks.map((block) => {
-      return {
-        blockSize: block.blockSize,
-        blockVSize: block.blockVSize,
-        nTx: block.nTx,
-        totalFees: block.totalFees,
-        medianFee: block.medianFee,
-        feeRange: block.feeRange,
-      };
-    });
-  }
-
-  public getMempoolBlocksWithTransactions(): MempoolBlockWithTransactions[] {
-    return this.mempoolBlocks;
-  }
-
-  public updateMempoolBlocks(memPool: { [txid: string]: TransactionExtended }): void {
-    const latestMempool = memPool;
-    const memPoolArray: TransactionExtended[] = [];
-    for (const i in latestMempool) {
-      if (latestMempool.hasOwnProperty(i)) {
-        memPoolArray.push(latestMempool[i]);
-      }
-    }
-    memPoolArray.sort((a, b) => b.feePerVsize - a.feePerVsize);
-    const transactionsSorted = memPoolArray.filter((tx) => tx.feePerVsize);
-    this.mempoolBlocks = this.calculateMempoolBlocks(transactionsSorted);
-  }
-
-  private calculateMempoolBlocks(transactionsSorted: TransactionExtended[]): MempoolBlockWithTransactions[] {
-    const mempoolBlocks: MempoolBlockWithTransactions[] = [];
-    let blockVSize = 0;
-    let blockSize = 0;
-    let transactions: TransactionExtended[] = [];
-    transactionsSorted.forEach((tx) => {
-      if (blockVSize + tx.vsize <= 1000000 || mempoolBlocks.length === config.DEFAULT_PROJECTED_BLOCKS_AMOUNT - 1) {
-        blockVSize += tx.vsize;
-        blockSize += tx.size;
-        transactions.push(tx);
-      } else {
-        mempoolBlocks.push(this.dataToMempoolBlocks(transactions, blockSize, blockVSize, mempoolBlocks.length));
-        blockVSize = tx.vsize;
-        blockSize = tx.size;
-        transactions = [tx];
-      }
-    });
-    if (transactions.length) {
-      mempoolBlocks.push(this.dataToMempoolBlocks(transactions, blockSize, blockVSize, mempoolBlocks.length));
-    }
-    return mempoolBlocks;
-  }
-
-  private dataToMempoolBlocks(transactions: TransactionExtended[],
-    blockSize: number, blockVSize: number, blocksIndex: number): MempoolBlockWithTransactions {
-    let rangeLength = 4;
-    if (blocksIndex === 0) {
-      rangeLength = 8;
-    }
-    if (transactions.length > 4000) {
-      rangeLength = 6;
-    } else if (transactions.length > 10000) {
-      rangeLength = 8;
-    }
-    return {
-      blockSize: blockSize,
-      blockVSize: blockVSize,
-      nTx: transactions.length,
-      totalFees: transactions.reduce((acc, cur) => acc + cur.fee, 0),
-      medianFee: Common.median(transactions.map((tx) => tx.feePerVsize)),
-      feeRange: Common.getFeesInRange(transactions, rangeLength),
-      transactionIds: transactions.map((tx) => tx.txid),
-    };
-  }
-}
-
-export default new MempoolBlocks();

backend/src/api/mempool.ts

@@ -1,54 +1,35 @@
 const config = require('../../mempool-config.json');
-import bitcoinApi from './bitcoin/electrs-api';
-import { MempoolInfo, TransactionExtended, Transaction, VbytesPerSecond } from '../interfaces';
+import bitcoinApi from './bitcoin/bitcoin-api-factory';
+import { ITransaction, IMempoolInfo, IMempool } from '../interfaces';
 
 class Mempool {
-  private inSync: boolean = false;
-  private mempoolCache: { [txId: string]: TransactionExtended } = {};
-  private mempoolInfo: MempoolInfo = { size: 0, bytes: 0 };
-  private mempoolChangedCallback: ((newMempool: { [txId: string]: TransactionExtended; }, newTransactions: TransactionExtended[],
-    deletedTransactions: TransactionExtended[]) => void) | undefined;
+  private mempool: IMempool = {};
+  private mempoolInfo: IMempoolInfo | undefined;
+  private mempoolChangedCallback: Function | undefined;
 
   private txPerSecondArray: number[] = [];
   private txPerSecond: number = 0;
 
-  private vBytesPerSecondArray: VbytesPerSecond[] = [];
+  private vBytesPerSecondArray: any[] = [];
   private vBytesPerSecond: number = 0;
-  private mempoolProtection = 0;
 
   constructor() {
     setInterval(this.updateTxPerSecond.bind(this), 1000);
   }
 
-  public isInSync() {
-    return this.inSync;
-  }
-
-  public setMempoolChangedCallback(fn: (newMempool: { [txId: string]: TransactionExtended; },
-    newTransactions: TransactionExtended[], deletedTransactions: TransactionExtended[]) => void) {
+  public setMempoolChangedCallback(fn: Function) {
     this.mempoolChangedCallback = fn;
   }
 
-  public getMempool(): { [txid: string]: TransactionExtended } {
-    return this.mempoolCache;
+  public getMempool(): { [txid: string]: ITransaction } {
+    return this.mempool;
   }
 
-  public setMempool(mempoolData: { [txId: string]: TransactionExtended }) {
-    this.mempoolCache = mempoolData;
-    if (this.mempoolChangedCallback) {
-      this.mempoolChangedCallback(this.mempoolCache, [], []);
-    }
+  public setMempool(mempoolData: any) {
+    this.mempool = mempoolData;
   }
 
-  public async updateMemPoolInfo() {
-    try {
-      this.mempoolInfo = await bitcoinApi.getMempoolInfo();
-    } catch (err) {
-      console.log('Error getMempoolInfo', err);
-    }
-  }
-
-  public getMempoolInfo(): MempoolInfo | undefined {
+  public getMempoolInfo(): IMempoolInfo | undefined {
     return this.mempoolInfo;
   }
 
@@ -60,26 +41,52 @@ class Mempool {
     return this.vBytesPerSecond;
   }
 
-  public getFirstSeenForTransactions(txIds: string[]): number[] {
-    const txTimes: number[] = [];
-    txIds.forEach((txId: string) => {
-      if (this.mempoolCache[txId]) {
-        txTimes.push(this.mempoolCache[txId].firstSeen);
-      } else {
-        txTimes.push(0);
-      }
-    });
-    return txTimes;
+  public async updateMemPoolInfo() {
+    try {
+      this.mempoolInfo = await bitcoinApi.getMempoolInfo();
+    } catch (err) {
+      console.log('Error getMempoolInfo', err);
+    }
   }
 
-  public async getTransactionExtended(txId: string): Promise<TransactionExtended | false> {
+  public async getRawTransaction(txId: string, isCoinbase = false): Promise<ITransaction | false> {
     try {
-      const transaction: Transaction = await bitcoinApi.getRawTransaction(txId);
-      return Object.assign({
-        vsize: transaction.weight / 4,
-        feePerVsize: (transaction.fee || 0) / (transaction.weight / 4),
-        firstSeen: Math.round((new Date().getTime() / 1000)),
-      }, transaction);
+      const transaction = await bitcoinApi.getRawTransaction(txId);
+
+      let totalOut = 0;
+      transaction.vout.forEach((output) => totalOut += output.value);
+
+      if (config.BACKEND_API === 'electrs') {
+        transaction.feePerWeightUnit = (transaction.fee * 100000000) / transaction.weight || 0;
+        transaction.feePerVsize = (transaction.fee * 100000000) / (transaction.vsize) || 0;
+        transaction.totalOut = totalOut / 100000000;
+      } else {
+        let totalIn = 0;
+        if (!isCoinbase) {
+          for (let i = 0; i < transaction.vin.length; i++) {
+            try {
+              const result = await bitcoinApi.getRawTransaction(transaction.vin[i].txid);
+              transaction.vin[i]['value'] = result.vout[transaction.vin[i].vout].value;
+              totalIn += result.vout[transaction.vin[i].vout].value;
+            } catch (err) {
+              console.log('Locating historical tx error');
+            }
+          }
+        }
+
+        if (totalIn > totalOut) {
+          transaction.fee = parseFloat((totalIn - totalOut).toFixed(8));
+          transaction.feePerWeightUnit = (transaction.fee * 100000000) / (transaction.vsize * 4) || 0;
+          transaction.feePerVsize = (transaction.fee * 100000000) / (transaction.vsize) || 0;
+        } else if (!isCoinbase) {
+          transaction.fee = 0;
+          transaction.feePerVsize = 0;
+          transaction.feePerWeightUnit = 0;
+          console.log('Minus fee error!');
+        }
+        transaction.totalOut = totalOut;
+      }
+      return transaction;
     } catch (e) {
       console.log(txId + ' not found');
       return false;
@@ -90,33 +97,27 @@ class Mempool {
     console.log('Updating mempool');
     const start = new Date().getTime();
     let hasChange: boolean = false;
-    const currentMempoolSize = Object.keys(this.mempoolCache).length;
     let txCount = 0;
     try {
       const transactions = await bitcoinApi.getRawMempool();
-      const diff = transactions.length - currentMempoolSize;
-      const newTransactions: TransactionExtended[] = [];
-
-      for (const txid of transactions) {
-        if (!this.mempoolCache[txid]) {
-          const transaction = await this.getTransactionExtended(txid);
+      const diff = transactions.length - Object.keys(this.mempool).length;
+      for (const tx of transactions) {
+        if (!this.mempool[tx]) {
+          const transaction = await this.getRawTransaction(tx);
           if (transaction) {
-            this.mempoolCache[txid] = transaction;
+            this.mempool[tx] = transaction;
             txCount++;
-            if (this.inSync) {
-              this.txPerSecondArray.push(new Date().getTime());
-              this.vBytesPerSecondArray.push({
-                unixTime: new Date().getTime(),
-                vSize: transaction.vsize,
-              });
-            }
+            this.txPerSecondArray.push(new Date().getTime());
+            this.vBytesPerSecondArray.push({
+              unixTime: new Date().getTime(),
+              vSize: transaction.vsize,
+            });
             hasChange = true;
             if (diff > 0) {
-              console.log('Fetched transaction ' + txCount + ' / ' + diff);
+              console.log('Calculated fee for transaction ' + txCount + ' / ' + diff);
             } else {
-              console.log('Fetched transaction ' + txCount);
+              console.log('Calculated fee for transaction ' + txCount);
             }
-            newTransactions.push(transaction);
           } else {
             console.log('Error finding transaction in mempool.');
           }
@@ -127,51 +128,23 @@ class Mempool {
         }
       }
 
-      // Prevent mempool from clear on bitcoind restart by delaying the deletion
-      if (this.mempoolProtection === 0 && transactions.length / currentMempoolSize <= 0.80) {
-        this.mempoolProtection = 1;
-        this.inSync = false;
-        console.log('Mempool clear protection triggered.');
-        setTimeout(() => {
-          this.mempoolProtection = 2;
-          console.log('Mempool clear protection resumed.');
-        }, 1000 * 60 * 2);
-      }
-
-      let newMempool = {};
-      const deletedTransactions: TransactionExtended[] = [];
-
-      if (this.mempoolProtection !== 1) {
-        this.mempoolProtection = 0;
-        // Index object for faster search
-        const transactionsObject = {};
-        transactions.forEach((txId) => transactionsObject[txId] = true);
-
-        // Replace mempool to separate deleted transactions
-        for (const tx in this.mempoolCache) {
-          if (transactionsObject[tx]) {
-            newMempool[tx] = this.mempoolCache[tx];
-          } else {
-            deletedTransactions.push(this.mempoolCache[tx]);
-          }
+      const newMempool: IMempool = {};
+      transactions.forEach((tx) => {
+        if (this.mempool[tx]) {
+          newMempool[tx] = this.mempool[tx];
+        } else {
+          hasChange = true;
         }
-      } else {
-        newMempool = this.mempoolCache;
-      }
+      });
 
-      if (!this.inSync && transactions.length === Object.keys(newMempool).length) {
-        this.inSync = true;
-        console.log('The mempool is now in sync!');
-      }
+      this.mempool = newMempool;
 
-      if (this.mempoolChangedCallback && (hasChange || deletedTransactions.length)) {
-        this.mempoolCache = newMempool;
-        this.mempoolChangedCallback(this.mempoolCache, newTransactions, deletedTransactions);
+      if (hasChange && this.mempoolChangedCallback) {
+        this.mempoolChangedCallback(this.mempool);
       }
 
       const end = new Date().getTime();
       const time = end - start;
-      console.log(`New mempool size: ${Object.keys(newMempool).length} Change: ${diff}`);
       console.log('Mempool updated in ' + time / 1000 + ' seconds');
     } catch (err) {
       console.log('getRawMempool error.', err);

backend/src/api/projected-blocks.ts

@@ -0,0 +1,101 @@
+const config = require('../../mempool-config.json');
+import { ITransaction, IProjectedBlock, IMempool, IProjectedBlockInternal } from '../interfaces';
+
+class ProjectedBlocks {
+  private transactionsSorted: ITransaction[] = [];
+
+  constructor() {}
+
+  public getProjectedBlockFeesForBlock(index: number) {
+    const projectedBlock = this.getProjectedBlocksInternal()[index];
+
+    if (!projectedBlock) {
+      throw new Error('No projected block for that index');
+    }
+
+    return projectedBlock.txFeePerVsizes.map((fpv) => {
+      return {'fpv': fpv};
+    });
+  }
+
+  public updateProjectedBlocks(memPool: IMempool): void {
+    const latestMempool = memPool;
+    const memPoolArray: ITransaction[] = [];
+    for (const i in latestMempool) {
+      if (latestMempool.hasOwnProperty(i)) {
+        memPoolArray.push(latestMempool[i]);
+      }
+    }
+    memPoolArray.sort((a, b) => b.feePerWeightUnit - a.feePerWeightUnit);
+    this.transactionsSorted = memPoolArray.filter((tx) => tx.feePerWeightUnit);
+  }
+
+  public getProjectedBlocks(txId?: string, numberOfBlocks: number = config.DEFAULT_PROJECTED_BLOCKS_AMOUNT): IProjectedBlock[] {
+    return this.getProjectedBlocksInternal(numberOfBlocks).map((projectedBlock) => {
+      return {
+        blockSize: projectedBlock.blockSize,
+        blockWeight: projectedBlock.blockWeight,
+        nTx: projectedBlock.nTx,
+        minFee: projectedBlock.minFee,
+        maxFee: projectedBlock.maxFee,
+        minWeightFee: projectedBlock.minWeightFee,
+        maxWeightFee: projectedBlock.maxWeightFee,
+        medianFee: projectedBlock.medianFee,
+        fees: projectedBlock.fees,
+        hasMytx: txId ? projectedBlock.txIds.some((tx) => tx === txId) : false
+      };
+    });
+  }
+
+  private getProjectedBlocksInternal(numberOfBlocks: number = config.DEFAULT_PROJECTED_BLOCKS_AMOUNT): IProjectedBlockInternal[] {
+    const projectedBlocks: IProjectedBlockInternal[] = [];
+    let blockWeight = 0;
+    let blockSize = 0;
+    let transactions: ITransaction[] = [];
+    this.transactionsSorted.forEach((tx) => {
+      if (blockWeight + tx.vsize * 4 < 4000000 || projectedBlocks.length === numberOfBlocks) {
+        blockWeight += tx.weight || tx.vsize * 4;
+        blockSize += tx.size;
+        transactions.push(tx);
+      } else {
+        projectedBlocks.push(this.dataToProjectedBlock(transactions, blockSize, blockWeight));
+        blockWeight = 0;
+        blockSize = 0;
+        transactions = [];
+      }
+    });
+    if (transactions.length) {
+      projectedBlocks.push(this.dataToProjectedBlock(transactions, blockSize, blockWeight));
+    }
+    return projectedBlocks;
+  }
+
+  private dataToProjectedBlock(transactions: ITransaction[], blockSize: number, blockWeight: number): IProjectedBlockInternal {
+    return {
+      blockSize: blockSize,
+      blockWeight: blockWeight,
+      nTx: transactions.length,
+      minFee: transactions[transactions.length - 1].feePerVsize,
+      maxFee: transactions[0].feePerVsize,
+      minWeightFee: transactions[transactions.length - 1].feePerWeightUnit,
+      maxWeightFee: transactions[0].feePerWeightUnit,
+      medianFee: this.median(transactions.map((tx) => tx.feePerVsize)),
+      txIds: transactions.map((tx) => tx.txid),
+      txFeePerVsizes: transactions.map((tx) => tx.feePerVsize).reverse(),
+      fees: transactions.map((tx) => tx.fee).reduce((acc, currValue) => acc + currValue),
+    };
+  }
+
+  private median(numbers: number[]) {
+    let medianNr = 0;
+    const numsLen = numbers.length;
+    if (numsLen % 2 === 0) {
+        medianNr = (numbers[numsLen / 2 - 1] + numbers[numsLen / 2]) / 2;
+    } else {
+        medianNr = numbers[(numsLen - 1) / 2];
+    }
+    return medianNr;
+  }
+}
+
+export default new ProjectedBlocks();

backend/src/api/statistics.ts

@@ -1,21 +1,20 @@
 import memPool from './mempool';
 import { DB } from '../database';
 
-import { Statistic, TransactionExtended, OptimizedStatistic } from '../interfaces';
+import { ITransaction, IMempoolStats } from '../interfaces';
 
 class Statistics {
   protected intervalTimer: NodeJS.Timer | undefined;
-  protected newStatisticsEntryCallback: ((stats: OptimizedStatistic) => void) | undefined;
+  protected newStatisticsEntryCallback: Function | undefined;
 
-  public setNewStatisticsEntryCallback(fn: (stats: OptimizedStatistic) => void) {
+  public setNewStatisticsEntryCallback(fn: Function) {
     this.newStatisticsEntryCallback = fn;
   }
 
-  constructor() { }
+  constructor() {
+  }
 
   public startStatistics(): void {
-    console.log('Starting statistics service');
-
     const now = new Date();
     const nextInterval = new Date(now.getFullYear(), now.getMonth(), now.getDate(), now.getHours(),
       Math.floor(now.getMinutes() / 1) * 1 + 1, 0, 0);
@@ -23,12 +22,7 @@ class Statistics {
 
     setTimeout(() => {
       this.runStatistics();
-      this.intervalTimer = setInterval(() => {
-        if (!memPool.isInSync()) {
-          return;
-        }
-        this.runStatistics();
-      }, 1 * 60 * 1000);
+      this.intervalTimer = setInterval(() => { this.runStatistics(); }, 1 * 60 * 1000);
     }, difference);
   }
 
@@ -37,30 +31,48 @@ class Statistics {
     const txPerSecond = memPool.getTxPerSecond();
     const vBytesPerSecond = memPool.getVBytesPerSecond();
 
+    if (txPerSecond === 0) {
+      return;
+    }
+
     console.log('Running statistics');
 
-    let memPoolArray: TransactionExtended[] = [];
+    let memPoolArray: ITransaction[] = [];
     for (const i in currentMempool) {
       if (currentMempool.hasOwnProperty(i)) {
         memPoolArray.push(currentMempool[i]);
       }
     }
     // Remove 0 and undefined
-    memPoolArray = memPoolArray.filter((tx) => tx.feePerVsize);
+    memPoolArray = memPoolArray.filter((tx) => tx.feePerWeightUnit);
 
     if (!memPoolArray.length) {
       return;
     }
 
-    memPoolArray.sort((a, b) => a.feePerVsize - b.feePerVsize);
+    memPoolArray.sort((a, b) => a.feePerWeightUnit - b.feePerWeightUnit);
     const totalWeight = memPoolArray.map((tx) => tx.vsize).reduce((acc, curr) => acc + curr) * 4;
     const totalFee = memPoolArray.map((tx) => tx.fee).reduce((acc, curr) => acc + curr);
 
     const logFees = [1, 2, 3, 4, 5, 6, 8, 10, 12, 15, 20, 30, 40, 50, 60, 70, 80, 90, 100, 125, 150, 175, 200,
       250, 300, 350, 400, 500, 600, 700, 800, 900, 1000, 1200, 1400, 1600, 1800, 2000];
 
+    const weightUnitFees: { [feePerWU: number]: number } = {};
     const weightVsizeFees: { [feePerWU: number]: number } = {};
 
+    memPoolArray.forEach((transaction) => {
+      for (let i = 0; i < logFees.length; i++) {
+        if ((logFees[i] === 2000 && transaction.feePerWeightUnit >= 2000) || transaction.feePerWeightUnit <= logFees[i]) {
+          if (weightUnitFees[logFees[i]]) {
+            weightUnitFees[logFees[i]] += transaction.vsize * 4;
+          } else {
+            weightUnitFees[logFees[i]] = transaction.vsize * 4;
+          }
+          break;
+        }
+      }
+    });
+
     memPoolArray.forEach((transaction) => {
       for (let i = 0; i < logFees.length; i++) {
         if ((logFees[i] === 2000 && transaction.feePerVsize >= 2000) || transaction.feePerVsize <= logFees[i]) {
@@ -81,7 +93,10 @@ class Statistics {
       vbytes_per_second: Math.round(vBytesPerSecond),
       mempool_byte_weight: totalWeight,
       total_fee: totalFee,
-      fee_data: '',
+      fee_data: JSON.stringify({
+        'wu': weightUnitFees,
+        'vsize': weightVsizeFees
+      }),
       vsize_1: weightVsizeFees['1'] || 0,
       vsize_2: weightVsizeFees['2'] || 0,
       vsize_3: weightVsizeFees['3'] || 0,
@@ -124,13 +139,11 @@ class Statistics {
 
     if (this.newStatisticsEntryCallback && insertId) {
       const newStats = await this.$get(insertId);
-      if (newStats) {
-        this.newStatisticsEntryCallback(newStats);
-      }
+      this.newStatisticsEntryCallback(newStats);
     }
   }
 
-  private async $create(statistics: Statistic): Promise<number | undefined> {
+  private async $create(statistics: IMempoolStats): Promise<number | undefined> {
     try {
       const connection = await DB.pool.getConnection();
       const query = `INSERT INTO statistics(
@@ -282,163 +295,95 @@ class Statistics {
             AVG(vsize_2000) AS vsize_2000 FROM statistics GROUP BY UNIX_TIMESTAMP(added) DIV ${groupBy} ORDER BY id DESC LIMIT ${days}`;
   }
 
-  public async $get(id: number): Promise<OptimizedStatistic | undefined> {
+  public async $get(id: number): Promise<IMempoolStats | undefined> {
     try {
       const connection = await DB.pool.getConnection();
       const query = `SELECT * FROM statistics WHERE id = ?`;
       const [rows] = await connection.query<any>(query, [id]);
       connection.release();
-      if (rows[0]) {
-        return this.mapStatisticToOptimizedStatistic([rows[0]])[0];
-      }
+      return rows[0];
     } catch (e) {
       console.log('$list2H() error', e);
     }
   }
 
-  public async $list2H(): Promise<OptimizedStatistic[]> {
+  public async $list2H(): Promise<IMempoolStats[]> {
     try {
       const connection = await DB.pool.getConnection();
       const query = `SELECT * FROM statistics ORDER BY id DESC LIMIT 120`;
       const [rows] = await connection.query<any>(query);
       connection.release();
-      return this.mapStatisticToOptimizedStatistic(rows);
+      return rows;
     } catch (e) {
       console.log('$list2H() error', e);
       return [];
     }
   }
 
-  public async $list24H(): Promise<OptimizedStatistic[]> {
+  public async $list24H(): Promise<IMempoolStats[]> {
     try {
       const connection = await DB.pool.getConnection();
       const query = this.getQueryForDays(120, 720);
       const [rows] = await connection.query<any>(query);
       connection.release();
-      return this.mapStatisticToOptimizedStatistic(rows);
+      return rows;
     } catch (e) {
       return [];
     }
   }
 
-  public async $list1W(): Promise<OptimizedStatistic[]> {
+  public async $list1W(): Promise<IMempoolStats[]> {
     try {
       const connection = await DB.pool.getConnection();
       const query = this.getQueryForDays(120, 5040);
       const [rows] = await connection.query<any>(query);
       connection.release();
-      return this.mapStatisticToOptimizedStatistic(rows);
+      return rows;
     } catch (e) {
       console.log('$list1W() error', e);
       return [];
     }
   }
 
-  public async $list1M(): Promise<OptimizedStatistic[]> {
+  public async $list1M(): Promise<IMempoolStats[]> {
     try {
       const connection = await DB.pool.getConnection();
       const query = this.getQueryForDays(120, 20160);
       const [rows] = await connection.query<any>(query);
       connection.release();
-      return this.mapStatisticToOptimizedStatistic(rows);
+      return rows;
     } catch (e) {
       console.log('$list1M() error', e);
       return [];
     }
   }
 
-  public async $list3M(): Promise<OptimizedStatistic[]> {
+  public async $list3M(): Promise<IMempoolStats[]> {
     try {
       const connection = await DB.pool.getConnection();
       const query = this.getQueryForDays(120, 60480);
       const [rows] = await connection.query<any>(query);
       connection.release();
-      return this.mapStatisticToOptimizedStatistic(rows);
+      return rows;
     } catch (e) {
       console.log('$list3M() error', e);
       return [];
     }
   }
 
-  public async $list6M(): Promise<OptimizedStatistic[]> {
+  public async $list6M(): Promise<IMempoolStats[]> {
     try {
       const connection = await DB.pool.getConnection();
       const query = this.getQueryForDays(120, 120960);
       const [rows] = await connection.query<any>(query);
       connection.release();
-      return this.mapStatisticToOptimizedStatistic(rows);
+      return rows;
     } catch (e) {
       console.log('$list6M() error', e);
       return [];
     }
   }
 
-  public async $list1Y(): Promise<OptimizedStatistic[]> {
-    try {
-      const connection = await DB.pool.getConnection();
-      const query = this.getQueryForDays(120, 241920);
-      const [rows] = await connection.query<any>(query);
-      connection.release();
-      return this.mapStatisticToOptimizedStatistic(rows);
-    } catch (e) {
-      console.log('$list6M() error', e);
-      return [];
-    }
-  }
-  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,
-        vsizes: [
-          s.vsize_1,
-          s.vsize_2,
-          s.vsize_3,
-          s.vsize_4,
-          s.vsize_5,
-          s.vsize_6,
-          s.vsize_8,
-          s.vsize_10,
-          s.vsize_12,
-          s.vsize_15,
-          s.vsize_20,
-          s.vsize_30,
-          s.vsize_40,
-          s.vsize_50,
-          s.vsize_60,
-          s.vsize_70,
-          s.vsize_80,
-          s.vsize_90,
-          s.vsize_100,
-          s.vsize_125,
-          s.vsize_150,
-          s.vsize_175,
-          s.vsize_200,
-          s.vsize_250,
-          s.vsize_300,
-          s.vsize_350,
-          s.vsize_400,
-          s.vsize_500,
-          s.vsize_600,
-          s.vsize_700,
-          s.vsize_800,
-          s.vsize_900,
-          s.vsize_1000,
-          s.vsize_1200,
-          s.vsize_1400,
-          s.vsize_1600,
-          s.vsize_1800,
-          s.vsize_2000,
-        ]
-      };
-    });
-  }
-
 }
 
 export default new Statistics();

backend/src/api/websocket-handler.ts

@@ -1,353 +0,0 @@
-const config = require('../../mempool-config.json');
-
-import * as WebSocket from 'ws';
-import { Block, TransactionExtended, WebsocketResponse, MempoolBlock, OptimizedStatistic } from '../interfaces';
-import blocks from './blocks';
-import memPool from './mempool';
-import backendInfo from './backend-info';
-import mempoolBlocks from './mempool-blocks';
-import fiatConversion from './fiat-conversion';
-import { Common } from './common';
-
-class WebsocketHandler {
-  private wss: WebSocket.Server | undefined;
-  private nativeAssetId = '6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d';
-  private extraInitProperties = {};
-
-  constructor() { }
-
-  setWebsocketServer(wss: WebSocket.Server) {
-    this.wss = wss;
-  }
-
-  setExtraInitProperties(property: string, value: any) {
-    this.extraInitProperties[property] = value;
-  }
-
-  setupConnectionHandling() {
-    if (!this.wss) {
-      throw new Error('WebSocket.Server is not set');
-    }
-
-    this.wss.on('connection', (client: WebSocket) => {
-      client.on('message', (message: string) => {
-        try {
-          const parsedMessage: WebsocketResponse = JSON.parse(message);
-          const response = {};
-
-          if (parsedMessage.action === 'want') {
-            client['want-blocks'] = parsedMessage.data.indexOf('blocks') > -1;
-            client['want-mempool-blocks'] = parsedMessage.data.indexOf('mempool-blocks') > -1;
-            client['want-live-2h-chart'] = parsedMessage.data.indexOf('live-2h-chart') > -1;
-            client['want-stats'] = parsedMessage.data.indexOf('stats') > -1;
-          }
-
-          if (parsedMessage && parsedMessage['track-tx']) {
-            if (/^[a-fA-F0-9]{64}$/.test(parsedMessage['track-tx'])) {
-              client['track-tx'] = parsedMessage['track-tx'];
-              // Client is telling the transaction wasn't found but it might have appeared before we had the time to start watching for it
-              if (parsedMessage['watch-mempool']) {
-                const tx = memPool.getMempool()[client['track-tx']];
-                if (tx) {
-                  response['tx'] = tx;
-                } else {
-                  client['track-mempool-tx'] = parsedMessage['track-tx'];
-                }
-              }
-            } else {
-              client['track-tx'] = null;
-            }
-          }
-
-          if (parsedMessage && parsedMessage['track-address']) {
-            if (/^([a-km-zA-HJ-NP-Z1-9]{26,35}|[a-km-zA-HJ-NP-Z1-9]{80}|[a-z]{2,5}1[ac-hj-np-z02-9]{8,87})$/
-              .test(parsedMessage['track-address'])) {
-              client['track-address'] = parsedMessage['track-address'];
-            } else {
-              client['track-address'] = null;
-            }
-          }
-
-          if (parsedMessage && parsedMessage['track-asset']) {
-            if (/^[a-fA-F0-9]{64}$/.test(parsedMessage['track-asset'])) {
-              client['track-asset'] = parsedMessage['track-asset'];
-            } else {
-              client['track-asset'] = null;
-            }
-          }
-
-          if (parsedMessage.action === 'init') {
-            const _blocks = blocks.getBlocks();
-            if (!_blocks) {
-              return;
-            }
-            client.send(JSON.stringify({
-              'mempoolInfo': memPool.getMempoolInfo(),
-              'vBytesPerSecond': memPool.getVBytesPerSecond(),
-              'blocks': _blocks.slice(Math.max(_blocks.length - config.INITIAL_BLOCK_AMOUNT, 0)),
-              'conversions': fiatConversion.getTickers()['BTCUSD'],
-              'mempool-blocks': mempoolBlocks.getMempoolBlocks(),
-              'git-commit': backendInfo.gitCommitHash,
-              'hostname': backendInfo.hostname,
-              ...this.extraInitProperties
-            }));
-          }
-
-          if (parsedMessage.action === 'ping') {
-            response['pong'] = true;
-          }
-
-          if (Object.keys(response).length) {
-            client.send(JSON.stringify(response));
-          }
-        } catch (e) {
-          console.log(e);
-        }
-      });
-    });
-  }
-
-  handleNewStatistic(stats: OptimizedStatistic) {
-    if (!this.wss) {
-      throw new Error('WebSocket.Server is not set');
-    }
-
-    this.wss.clients.forEach((client: WebSocket) => {
-      if (client.readyState !== WebSocket.OPEN) {
-        return;
-      }
-
-      if (!client['want-live-2h-chart']) {
-        return;
-      }
-
-      client.send(JSON.stringify({
-        'live-2h-chart': stats
-      }));
-    });
-  }
-
-  handleMempoolChange(newMempool: { [txid: string]: TransactionExtended },
-    newTransactions: TransactionExtended[], deletedTransactions: TransactionExtended[]) {
-    if (!this.wss) {
-      throw new Error('WebSocket.Server is not set');
-    }
-
-    mempoolBlocks.updateMempoolBlocks(newMempool);
-    const mBlocks = mempoolBlocks.getMempoolBlocks();
-    const mempoolInfo = memPool.getMempoolInfo();
-    const vBytesPerSecond = memPool.getVBytesPerSecond();
-    const rbfTransactions = Common.findRbfTransactions(newTransactions, deletedTransactions);
-
-    this.wss.clients.forEach((client: WebSocket) => {
-      if (client.readyState !== WebSocket.OPEN) {
-        return;
-      }
-
-      const response = {};
-
-      if (client['want-stats']) {
-        response['mempoolInfo'] = mempoolInfo;
-        response['vBytesPerSecond'] = vBytesPerSecond;
-      }
-
-      if (client['want-mempool-blocks']) {
-        response['mempool-blocks'] = mBlocks;
-      }
-
-      if (client['track-mempool-tx']) {
-        const tx = newTransactions.find((t) => t.txid === client['track-mempool-tx']);
-        if (tx) {
-          response['tx'] = tx;
-          client['track-mempool-tx'] = null;
-        }
-      }
-
-      if (client['track-address']) {
-        const foundTransactions: TransactionExtended[] = [];
-
-        newTransactions.forEach((tx) => {
-          const someVin = tx.vin.some((vin) => !!vin.prevout && vin.prevout.scriptpubkey_address === client['track-address']);
-          if (someVin) {
-            foundTransactions.push(tx);
-            return;
-          }
-          const someVout = tx.vout.some((vout) => vout.scriptpubkey_address === client['track-address']);
-          if (someVout) {
-            foundTransactions.push(tx);
-          }
-        });
-
-        if (foundTransactions.length) {
-          response['address-transactions'] = foundTransactions;
-        }
-      }
-
-      if (client['track-asset']) {
-        const foundTransactions: TransactionExtended[] = [];
-
-        newTransactions.forEach((tx) => {
-
-          if (client['track-asset'] === this.nativeAssetId) {
-            if (tx.vin.some((vin) => !!vin.is_pegin)) {
-              foundTransactions.push(tx);
-              return;
-            }
-            if (tx.vout.some((vout) => !!vout.pegout)) {
-              foundTransactions.push(tx);
-            }
-          } else {
-            if (tx.vin.some((vin) => !!vin.issuance && vin.issuance.asset_id === client['track-asset'])) {
-              foundTransactions.push(tx);
-              return;
-            }
-            if (tx.vout.some((vout) => !!vout.asset && vout.asset === client['track-asset'])) {
-              foundTransactions.push(tx);
-            }
-          }
-        });
-
-        if (foundTransactions.length) {
-          response['address-transactions'] = foundTransactions;
-        }
-      }
-
-      if (client['track-tx'] && rbfTransactions[client['track-tx']]) {
-        for (const rbfTransaction in rbfTransactions) {
-          if (client['track-tx'] === rbfTransaction) {
-            response['rbfTransaction'] = rbfTransactions[rbfTransaction];
-            break;
-          }
-        }
-      }
-
-      if (Object.keys(response).length) {
-        client.send(JSON.stringify(response));
-      }
-    });
-  }
-
-  handleNewBlock(block: Block, txIds: string[], transactions: TransactionExtended[]) {
-    if (!this.wss) {
-      throw new Error('WebSocket.Server is not set');
-    }
-
-    // Check how many transactions in the new block matches the latest projected mempool block
-    // If it's more than 0, recalculate the mempool blocks and send to client in the same update
-    let mBlocks: undefined | MempoolBlock[];
-    let matchRate = 0;
-    const _mempoolBlocks = mempoolBlocks.getMempoolBlocksWithTransactions();
-    if (_mempoolBlocks[0]) {
-      const matches: string[] = [];
-      for (const txId of txIds) {
-        if (_mempoolBlocks[0].transactionIds.indexOf(txId) > -1) {
-          matches.push(txId);
-        }
-      }
-
-      matchRate = Math.round((matches.length / (txIds.length - 1)) * 100);
-      if (matchRate > 0) {
-        const currentMemPool = memPool.getMempool();
-        for (const txId of matches) {
-          delete currentMemPool[txId];
-        }
-        mempoolBlocks.updateMempoolBlocks(currentMemPool);
-        mBlocks = mempoolBlocks.getMempoolBlocks();
-      }
-    }
-
-    block.matchRate = matchRate;
-
-    this.wss.clients.forEach((client) => {
-      if (client.readyState !== WebSocket.OPEN) {
-        return;
-      }
-
-      if (!client['want-blocks']) {
-        return;
-      }
-
-      const response = {
-        'block': block,
-        'mempoolInfo': memPool.getMempoolInfo(),
-      };
-
-      if (mBlocks && client['want-mempool-blocks']) {
-        response['mempool-blocks'] = mBlocks;
-      }
-
-      if (client['track-tx'] && txIds.indexOf(client['track-tx']) > -1) {
-        client['track-tx'] = null;
-        response['txConfirmed'] = true;
-      }
-
-      if (client['track-address']) {
-        const foundTransactions: TransactionExtended[] = [];
-
-        transactions.forEach((tx) => {
-          if (tx.vin && tx.vin.some((vin) => !!vin.prevout && vin.prevout.scriptpubkey_address === client['track-address'])) {
-            foundTransactions.push(tx);
-            return;
-          }
-          if (tx.vout && tx.vout.some((vout) => vout.scriptpubkey_address === client['track-address'])) {
-            foundTransactions.push(tx);
-          }
-        });
-
-        if (foundTransactions.length) {
-          foundTransactions.forEach((tx) => {
-            tx.status = {
-              confirmed: true,
-              block_height: block.height,
-              block_hash: block.id,
-              block_time: block.timestamp,
-            };
-          });
-
-          response['block-transactions'] = foundTransactions;
-        }
-      }
-
-      if (client['track-asset']) {
-        const foundTransactions: TransactionExtended[] = [];
-
-        transactions.forEach((tx) => {
-          if (client['track-asset'] === this.nativeAssetId) {
-            if (tx.vin && tx.vin.some((vin) => !!vin.is_pegin)) {
-              foundTransactions.push(tx);
-              return;
-            }
-            if (tx.vout && tx.vout.some((vout) => !!vout.pegout)) {
-              foundTransactions.push(tx);
-            }
-          } else {
-            if (tx.vin && tx.vin.some((vin) => !!vin.issuance && vin.issuance.asset_id === client['track-asset'])) {
-              foundTransactions.push(tx);
-              return;
-            }
-            if (tx.vout && tx.vout.some((vout) => !!vout.asset && vout.asset === client['track-asset'])) {
-              foundTransactions.push(tx);
-            }
-          }
-        });
-
-        if (foundTransactions.length) {
-          foundTransactions.forEach((tx) => {
-            tx.status = {
-              confirmed: true,
-              block_height: block.height,
-              block_hash: block.id,
-              block_time: block.timestamp,
-            };
-          });
-
-          response['block-transactions'] = foundTransactions;
-        }
-      }
-
-      client.send(JSON.stringify(response));
-    });
-  }
-}
-
-export default new WebsocketHandler();

backend/src/database.ts

@@ -16,10 +16,10 @@ export class DB {
 export async function checkDbConnection() {
   try {
     const connection = await DB.pool.getConnection();
-    console.log('Database connection established.');
+    console.log('MySQL connection established.');
     connection.release();
   } catch (e) {
-    console.log('Could not connect to database.');
+    console.log('Could not connect to MySQL.');
     console.log(e);
     process.exit(1);
   }

backend/src/index.ts

@@ -1,5 +1,4 @@
 const config = require('../mempool-config.json');
-import { Express, Request, Response, NextFunction } from 'express';
 import * as fs from 'fs';
 import * as express from 'express';
 import * as compression from 'compression';
@@ -7,107 +6,279 @@ import * as http from 'http';
 import * as https from 'https';
 import * as WebSocket from 'ws';
 
-import { checkDbConnection } from './database';
-import routes from './routes';
-import blocks from './api/blocks';
-import memPool from './api/mempool';
+import bitcoinApi from './api/bitcoin/bitcoin-api-factory';
 import diskCache from './api/disk-cache';
+import memPool from './api/mempool';
+import blocks from './api/blocks';
+import projectedBlocks from './api/projected-blocks';
 import statistics from './api/statistics';
-import websocketHandler from './api/websocket-handler';
-import fiatConversion from './api/fiat-conversion';
-import bisq from './api/bisq';
+import { IBlock, IMempool, ITransaction, IMempoolStats } from './interfaces';
 
-class Server {
-  wss: WebSocket.Server;
-  server: https.Server | http.Server;
-  app: Express;
+import routes from './routes';
+import fiatConversion from './api/fiat-conversion';
+
+class MempoolSpace {
+  private wss: WebSocket.Server;
+  private server: https.Server | http.Server;
+  private app: any;
 
   constructor() {
     this.app = express();
-
     this.app
-      .use((req: Request, res: Response, next: NextFunction) => {
+      .use((req, res, next)  => {
         res.setHeader('Access-Control-Allow-Origin', '*');
         next();
       })
       .use(compression());
-
-    if (config.SSL === true) {
+    if (config.ENV === 'dev') {
+      this.server = http.createServer(this.app);
+      this.wss = new WebSocket.Server({ server: this.server });
+    } else {
       const credentials = {
-        cert: fs.readFileSync(config.SSL_CERT_FILE_PATH),
-        key: fs.readFileSync(config.SSL_KEY_FILE_PATH),
+        cert: fs.readFileSync('/etc/letsencrypt/live/mempool.space/fullchain.pem'),
+        key: fs.readFileSync('/etc/letsencrypt/live/mempool.space/privkey.pem'),
       };
       this.server = https.createServer(credentials, this.app);
       this.wss = new WebSocket.Server({ server: this.server });
-    } else {
-      this.server = http.createServer(this.app);
-      this.wss = new WebSocket.Server({ server: this.server });
     }
 
-    if (!config.DB_DISABLED) {
-      checkDbConnection();
-      statistics.startStatistics();
-    }
-
-    this.setUpHttpApiRoutes();
+    this.setUpRoutes();
     this.setUpWebsocketHandling();
+    this.setUpMempoolCache();
     this.runMempoolIntervalFunctions();
 
+    statistics.startStatistics();
     fiatConversion.startService();
-    diskCache.loadMempoolCache();
 
-    if (config.BISQ_ENABLED) {
-      bisq.startBisqService();
-      bisq.setPriceCallbackFunction((price) => websocketHandler.setExtraInitProperties('bsq-price', price));
-    }
-
-    this.server.listen(config.HTTP_PORT, () => {
-      console.log(`Server started on port ${config.HTTP_PORT}`);
+    const opts = {
+        host: '127.0.0.1',
+        port: 8999
+    };
+    this.server.listen(opts, () => {
+      console.log(`Server started on ${opts.host}:${opts.port}`);
     });
   }
 
-  async runMempoolIntervalFunctions() {
-    await memPool.updateMemPoolInfo();
+  private async runMempoolIntervalFunctions() {
     await blocks.updateBlocks();
+    await memPool.updateMemPoolInfo();
     await memPool.updateMempool();
-    setTimeout(this.runMempoolIntervalFunctions.bind(this), config.ELECTRS_POLL_RATE_MS);
+    setTimeout(this.runMempoolIntervalFunctions.bind(this), config.MEMPOOL_REFRESH_RATE_MS);
   }
 
-  setUpWebsocketHandling() {
-    websocketHandler.setWebsocketServer(this.wss);
-    websocketHandler.setupConnectionHandling();
-    statistics.setNewStatisticsEntryCallback(websocketHandler.handleNewStatistic.bind(websocketHandler));
-    blocks.setNewBlockCallback(websocketHandler.handleNewBlock.bind(websocketHandler));
-    memPool.setMempoolChangedCallback(websocketHandler.handleMempoolChange.bind(websocketHandler));
+  private setUpMempoolCache() {
+    const cacheData = diskCache.loadData();
+    if (cacheData) {
+      memPool.setMempool(JSON.parse(cacheData));
+    }
+
+    process.on('SIGINT', (options) => {
+      console.log('SIGINT');
+      diskCache.saveData(JSON.stringify(memPool.getMempool()));
+      process.exit(2);
+    });
   }
 
-  setUpHttpApiRoutes() {
+  private setUpWebsocketHandling() {
+    this.wss.on('connection', (client: WebSocket) => {
+      let theBlocks = blocks.getBlocks();
+      theBlocks = theBlocks.concat([]).splice(theBlocks.length - config.INITIAL_BLOCK_AMOUNT);
+      const formatedBlocks = theBlocks.map((b) => blocks.formatBlock(b));
+
+      client.send(JSON.stringify({
+        'mempoolInfo': memPool.getMempoolInfo(),
+        'blocks': formatedBlocks,
+        'projectedBlocks': projectedBlocks.getProjectedBlocks(),
+        'txPerSecond': memPool.getTxPerSecond(),
+        'vBytesPerSecond': memPool.getVBytesPerSecond(),
+        'conversions': fiatConversion.getTickers()['BTCUSD'],
+      }));
+
+      client.on('message', async (message: any) => {
+        try {
+          const parsedMessage = JSON.parse(message);
+
+          if (parsedMessage.action === 'want') {
+            client['want-stats'] = parsedMessage.data.indexOf('stats') > -1;
+            client['want-blocks'] = parsedMessage.data.indexOf('blocks') > -1;
+            client['want-projected-blocks'] = parsedMessage.data.indexOf('projected-blocks') > -1;
+            client['want-live-2h-chart'] = parsedMessage.data.indexOf('live-2h-chart') > -1;
+          }
+
+          if (parsedMessage.action === 'track-tx' && parsedMessage.txId && /^[a-fA-F0-9]{64}$/.test(parsedMessage.txId)) {
+            const tx = await memPool.getRawTransaction(parsedMessage.txId);
+            if (tx) {
+              console.log('Now tracking: ' + parsedMessage.txId);
+              client['trackingTx'] = true;
+              client['txId'] = parsedMessage.txId;
+              client['tx'] = tx;
+
+              if (tx.blockhash) {
+                const currentBlocks = blocks.getBlocks();
+                const foundBlock = currentBlocks.find((block) => block.tx && block.tx.some((i: string) => i === parsedMessage.txId));
+                if (foundBlock) {
+                  console.log('Found block by looking in local cache');
+                  client['blockHeight'] = foundBlock.height;
+                } else {
+                  const theBlock = await bitcoinApi.getBlockAndTransactions(tx.blockhash);
+                  if (theBlock) {
+                    client['blockHeight'] = theBlock.height;
+                  }
+                }
+              } else {
+                client['blockHeight'] = 0;
+              }
+              client.send(JSON.stringify({
+                'projectedBlocks': projectedBlocks.getProjectedBlocks(client['txId']),
+                'track-tx': {
+                  tracking: true,
+                  blockHeight: client['blockHeight'],
+                  tx: client['tx'],
+                }
+              }));
+            } else {
+              console.log('TX NOT FOUND, NOT TRACKING');
+              client['trackingTx'] = false;
+              client['blockHeight'] = 0;
+              client['tx'] = null;
+              client.send(JSON.stringify({
+                'track-tx': {
+                  tracking: false,
+                  blockHeight: 0,
+                  message: 'not-found',
+                }
+              }));
+            }
+          }
+          if (parsedMessage.action === 'stop-tracking-tx') {
+            console.log('STOP TRACKING');
+            client['trackingTx'] = false;
+            client.send(JSON.stringify({
+              'track-tx': {
+                tracking: false,
+                blockHeight: 0,
+                message: 'not-found',
+              }
+            }));
+          }
+        } catch (e) {
+          console.log(e);
+        }
+      });
+
+      client.on('close', () => {
+        client['trackingTx'] = false;
+      });
+    });
+
+    blocks.setNewBlockCallback((block: IBlock) => {
+      const formattedBlocks = blocks.formatBlock(block);
+
+      this.wss.clients.forEach((client) => {
+        if (client.readyState !== WebSocket.OPEN) {
+          return;
+        }
+
+        const response = {};
+
+        if (client['trackingTx'] === true && client['blockHeight'] === 0) {
+          if (block.tx.some((tx: ITransaction) => tx === client['txId'])) {
+            client['blockHeight'] = block.height;
+          }
+        }
+
+        response['track-tx'] = {
+          tracking: client['trackingTx'] || false,
+          blockHeight: client['blockHeight'],
+        };
+
+        response['block'] = formattedBlocks;
+
+        client.send(JSON.stringify(response));
+      });
+    });
+
+    memPool.setMempoolChangedCallback((newMempool: IMempool) => {
+      projectedBlocks.updateProjectedBlocks(newMempool);
+
+      const pBlocks = projectedBlocks.getProjectedBlocks();
+      const mempoolInfo = memPool.getMempoolInfo();
+      const txPerSecond = memPool.getTxPerSecond();
+      const vBytesPerSecond = memPool.getVBytesPerSecond();
+
+      this.wss.clients.forEach((client: WebSocket) => {
+        if (client.readyState !== WebSocket.OPEN) {
+          return;
+        }
+
+        const response = {};
+
+        if (client['want-stats']) {
+          response['mempoolInfo'] = mempoolInfo;
+          response['txPerSecond'] = txPerSecond;
+          response['vBytesPerSecond'] = vBytesPerSecond;
+          response['track-tx'] = {
+            tracking: client['trackingTx'] || false,
+            blockHeight: client['blockHeight'],
+          };
+        }
+
+        if (client['want-projected-blocks'] && client['trackingTx'] && client['blockHeight'] === 0) {
+          response['projectedBlocks'] = projectedBlocks.getProjectedBlocks(client['txId']);
+        } else if (client['want-projected-blocks']) {
+          response['projectedBlocks'] = pBlocks;
+        }
+
+        if (Object.keys(response).length) {
+          client.send(JSON.stringify(response));
+        }
+      });
+    });
+
+    statistics.setNewStatisticsEntryCallback((stats: IMempoolStats) => {
+      this.wss.clients.forEach((client: WebSocket) => {
+        if (client.readyState !== WebSocket.OPEN) {
+          return;
+        }
+
+        if (client['want-live-2h-chart']) {
+          client.send(JSON.stringify({
+            'live-2h-chart': stats
+          }));
+        }
+      });
+    });
+  }
+
+  private setUpRoutes() {
     this.app
-      .get(config.API_ENDPOINT + 'transaction-times', routes.getTransactionTimes)
+      .get(config.API_ENDPOINT + 'transactions/height/:id', routes.$getgetTransactionsForBlock)
+      .get(config.API_ENDPOINT + 'transactions/projected/:id', routes.getgetTransactionsForProjectedBlock)
       .get(config.API_ENDPOINT + 'fees/recommended', routes.getRecommendedFees)
-      .get(config.API_ENDPOINT + 'fees/mempool-blocks', routes.getMempoolBlocks)
+      .get(config.API_ENDPOINT + 'fees/projected-blocks', routes.getProjectedBlocks)
       .get(config.API_ENDPOINT + 'statistics/2h', routes.get2HStatistics)
       .get(config.API_ENDPOINT + 'statistics/24h', routes.get24HStatistics.bind(routes))
       .get(config.API_ENDPOINT + 'statistics/1w', routes.get1WHStatistics.bind(routes))
       .get(config.API_ENDPOINT + 'statistics/1m', routes.get1MStatistics.bind(routes))
       .get(config.API_ENDPOINT + 'statistics/3m', routes.get3MStatistics.bind(routes))
       .get(config.API_ENDPOINT + 'statistics/6m', routes.get6MStatistics.bind(routes))
-      .get(config.API_ENDPOINT + 'statistics/1y', routes.get1YStatistics.bind(routes))
-      .get(config.API_ENDPOINT + 'backend-info', routes.getBackendInfo)
-    ;
-
-    if (config.BISQ_ENABLED) {
-      this.app
-        .get(config.API_ENDPOINT + 'bisq/stats', routes.getBisqStats)
-        .get(config.API_ENDPOINT + 'bisq/tx/:txId', routes.getBisqTransaction)
-        .get(config.API_ENDPOINT + 'bisq/block/:hash', routes.getBisqBlock)
-        .get(config.API_ENDPOINT + 'bisq/blocks/tip/height', routes.getBisqTip)
-        .get(config.API_ENDPOINT + 'bisq/blocks/:index/:length', routes.getBisqBlocks)
-        .get(config.API_ENDPOINT + 'bisq/address/:address', routes.getBisqAddress)
-        .get(config.API_ENDPOINT + 'bisq/txs/:index/:length', routes.getBisqTransactions)
       ;
+
+    if (config.BACKEND_API === 'electrs') {
+      this.app
+        .get(config.API_ENDPOINT + 'explorer/blocks', routes.getBlocks)
+        .get(config.API_ENDPOINT + 'explorer/blocks/:height', routes.getBlocks)
+        .get(config.API_ENDPOINT + 'explorer/tx/:id', routes.getRawTransaction)
+        .get(config.API_ENDPOINT + 'explorer/block/:hash', routes.getBlock)
+        .get(config.API_ENDPOINT + 'explorer/block/:hash/tx', routes.getBlockTransactions)
+        .get(config.API_ENDPOINT + 'explorer/block/:hash/tx/:index', routes.getBlockTransactionsFromIndex)
+        .get(config.API_ENDPOINT + 'explorer/address/:address', routes.getAddress)
+        .get(config.API_ENDPOINT + 'explorer/address/:address/tx', routes.getAddressTransactions)
+        .get(config.API_ENDPOINT + 'explorer/address/:address/tx/chain/:txid', routes.getAddressTransactionsFromTxid)
+        ;
+    }
+
     }
   }
-}
 
-const server = new Server();
+const mempoolSpace = new MempoolSpace();

backend/src/interfaces.ts

@@ -1,4 +1,4 @@
-export interface MempoolInfo {
+export interface IMempoolInfo {
   size: number;
   bytes: number;
   usage?: number;
@@ -7,151 +7,80 @@ export interface MempoolInfo {
   minrelaytxfee?: number;
 }
 
-export interface MempoolBlock {
-  blockSize: number;
-  blockVSize: number;
-  nTx: number;
-  medianFee: number;
-  totalFees: number;
-  feeRange: number[];
-}
-
-export interface MempoolBlockWithTransactions extends MempoolBlock {
-  transactionIds: string[];
-}
-
-export interface Transaction {
+export interface ITransaction {
   txid: string;
+  hash: string;
   version: number;
-  locktime: number;
-  fee: number;
   size: number;
+  vsize: number;
   weight: number;
+  locktime: number;
   vin: Vin[];
   vout: Vout[];
-  status: Status;
-}
-
-export interface TransactionMinerInfo {
-  vin: VinStrippedToScriptsig[];
-  vout: VoutStrippedToScriptPubkey[];
-}
-
-interface VinStrippedToScriptsig {
-  scriptsig: string;
-}
-
-interface VoutStrippedToScriptPubkey {
-  scriptpubkey_address: string | undefined;
-  value: number;
-}
-
-export interface TransactionExtended extends Transaction {
-  vsize: number;
+  hex: string;
+  fee: number;
+  feePerWeightUnit: number;
   feePerVsize: number;
-  firstSeen: number;
+  blockhash?: string;
+  confirmations?: number;
+  time?: number;
+  blocktime?: number;
+  totalOut?: number;
 }
 
-export interface Vin {
-  txid: string;
-  vout: number;
-  is_coinbase: boolean;
-  scriptsig: string;
-  scriptsig_asm: string;
-  inner_redeemscript_asm?: string;
-  inner_witnessscript_asm?: string;
-  sequence: any;
-  witness?: string[];
-  prevout: Vout;
-  // Elements
-  is_pegin?: boolean;
-  issuance?: Issuance;
-}
-
-interface Issuance {
-  asset_id: string;
-  is_reissuance: string;
-  asset_blinding_nonce: string;
-  asset_entropy: string;
-  contract_hash: string;
-  assetamount?: number;
-  assetamountcommitment?: string;
-  tokenamount?: number;
-  tokenamountcommitment?: string;
-}
-
-export interface Vout {
-  scriptpubkey: string;
-  scriptpubkey_asm: string;
-  scriptpubkey_type: string;
-  scriptpubkey_address: string;
-  value: number;
-  // Elements
-  valuecommitment?: number;
-  asset?: string;
-  pegout?: Pegout;
-}
-
-interface Pegout {
-  genesis_hash: string;
-  scriptpubkey: string;
-  scriptpubkey_asm: string;
-  scriptpubkey_address: string;
-}
-
-export interface Status {
-  confirmed: boolean;
-  block_height?: number;
-  block_hash?: string;
-  block_time?: number;
-}
-
-export interface Block {
-  id: string;
-  height: number;
-  version: number;
-  timestamp: number;
-  bits: number;
-  nounce: number;
-  difficulty: number;
-  merkle_root: string;
-  tx_count: number;
+export interface IBlock {
+  hash: string;
+  confirmations: number;
+  strippedsize: number;
   size: number;
   weight: number;
+  height: number;
+  version: number;
+  versionHex: string;
+  merkleroot: string;
+  tx: any;
+  time: number;
+  mediantime: number;
+  nonce: number;
+  bits: string;
+  difficulty: number;
+  chainwork: string;
+  nTx: number;
   previousblockhash: string;
+  fees: number;
 
-  // Custom properties
+  minFee?: number;
+  maxFee?: number;
   medianFee?: number;
-  feeRange?: number[];
-  reward?: number;
-  coinbaseTx?: TransactionMinerInfo;
-  matchRate: number;
-  stage: number;
 }
 
-export interface Address {
-  address: string;
-  chain_stats: ChainStats;
-  mempool_stats: MempoolStats;
+interface ScriptSig {
+  asm: string;
+  hex: string;
 }
 
-export interface ChainStats {
-  funded_txo_count: number;
-  funded_txo_sum: number;
-  spent_txo_count: number;
-  spent_txo_sum: number;
-  tx_count: number;
+interface Vin {
+  txid: string;
+  vout: number;
+  scriptSig: ScriptSig;
+  sequence: number;
 }
 
-export interface MempoolStats {
-  funded_txo_count: number;
-  funded_txo_sum: number;
-  spent_txo_count: number;
-  spent_txo_sum: number;
-  tx_count: number;
+interface ScriptPubKey {
+  asm: string;
+  hex: string;
+  reqSigs: number;
+  type: string;
+  addresses: string[];
 }
 
-export interface Statistic {
+interface Vout {
+  value: number;
+  n: number;
+  scriptPubKey: ScriptPubKey;
+}
+
+export interface IMempoolStats {
   id?: number;
   added: string;
   unconfirmed_transactions: number;
@@ -201,124 +130,23 @@ export interface Statistic {
   vsize_2000: number;
 }
 
-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;
-  vsizes: number[];
+export interface IProjectedBlockInternal extends IProjectedBlock {
+  txIds: string[];
+  txFeePerVsizes: number[];
 }
 
-export interface Outspend {
-  spent: boolean;
-  txid: string;
-  vin: number;
-  status: Status;
-}
-export interface WebsocketResponse {
-  action: string;
-  data: string[];
-  'track-tx': string;
-  'track-address': string;
-  'watch-mempool': boolean;
+export interface IProjectedBlock {
+  blockSize: number;
+  blockWeight: number;
+  maxFee: number;
+  maxWeightFee: number;
+  medianFee: number;
+  minFee: number;
+  minWeightFee: number;
+  nTx: number;
+  fees: number;
+  hasMyTxId?: boolean;
 }
 
-export interface VbytesPerSecond {
-  unixTime: number;
-  vSize: number;
-}
+export interface IMempool { [txid: string]: ITransaction; }
 
-export interface BisqBlocks {
-  chainHeight: number;
-  blocks: BisqBlock[];
-}
-
-export interface BisqBlock {
-  height: number;
-  time: number;
-  hash: string;
-  previousBlockHash: string;
-  txs: BisqTransaction[];
-}
-
-export interface BisqTransaction {
-  txVersion: string;
-  id: string;
-  blockHeight: number;
-  blockHash: string;
-  time: number;
-  inputs: BisqInput[];
-  outputs: BisqOutput[];
-  txType: string;
-  txTypeDisplayString: string;
-  burntFee: number;
-  invalidatedBsq: number;
-  unlockBlockHeight: number;
-}
-
-export interface BisqStats {
-  minted: number;
-  burnt: number;
-  addresses: number;
-  unspent_txos: number;
-  spent_txos: number;
-}
-
-interface BisqInput {
-  spendingTxOutputIndex: number;
-  spendingTxId: string;
-  bsqAmount: number;
-  isVerified: boolean;
-  address: string;
-  time: number;
-}
-
-interface BisqOutput {
-  txVersion: string;
-  txId: string;
-  index: number;
-  bsqAmount: number;
-  btcAmount: number;
-  height: number;
-  isVerified: boolean;
-  burntFee: number;
-  invalidatedBsq: number;
-  address: string;
-  scriptPubKey: BisqScriptPubKey;
-  time: any;
-  txType: string;
-  txTypeDisplayString: string;
-  txOutputType: string;
-  txOutputTypeDisplayString: string;
-  lockTime: number;
-  isUnspent: boolean;
-  spentInfo: SpentInfo;
-  opReturn?: string;
-}
-
-interface BisqScriptPubKey {
-  addresses: string[];
-  asm: string;
-  hex: string;
-  reqSigs: number;
-  type: string;
-}
-
-interface SpentInfo {
-  height: number;
-  inputIndex: number;
-  txId: string;
-}
-
-export interface BisqTrade {
-  direction: string;
-  price: string;
-  amount: string;
-  volume: string;
-  payment_method: string;
-  trade_id: string;
-  trade_date: number;
-}

backend/src/routes.ts

@@ -1,10 +1,7 @@
-import { Request, Response } from 'express';
 import statistics from './api/statistics';
 import feeApi from './api/fee-api';
-import backendInfo from './api/backend-info';
-import mempoolBlocks from './api/mempool-blocks';
-import mempool from './api/mempool';
-import bisq from './api/bisq';
+import projectedBlocks from './api/projected-blocks';
+import bitcoinApi from './api/bitcoin/bitcoin-api-factory';
 
 class Routes {
   private cache = {};
@@ -20,137 +17,180 @@ class Routes {
     this.cache['1m'] = await statistics.$list1M();
     this.cache['3m'] = await statistics.$list3M();
     this.cache['6m'] = await statistics.$list6M();
-    this.cache['1y'] = await statistics.$list1Y();
     console.log('Statistics cache created');
   }
 
-  public async get2HStatistics(req: Request, res: Response) {
+  public async get2HStatistics(req, res) {
     const result = await statistics.$list2H();
-    res.json(result);
+    res.send(result);
   }
 
-  public get24HStatistics(req: Request, res: Response) {
-    res.json(this.cache['24h']);
+  public get24HStatistics(req, res) {
+    res.send(this.cache['24h']);
   }
 
-  public get1WHStatistics(req: Request, res: Response) {
-    res.json(this.cache['1w']);
+  public get1WHStatistics(req, res) {
+    res.send(this.cache['1w']);
   }
 
-  public get1MStatistics(req: Request, res: Response) {
-    res.json(this.cache['1m']);
+  public get1MStatistics(req, res) {
+    res.send(this.cache['1m']);
   }
 
-  public get3MStatistics(req: Request, res: Response) {
-    res.json(this.cache['3m']);
+  public get3MStatistics(req, res) {
+    res.send(this.cache['3m']);
   }
 
-  public get6MStatistics(req: Request, res: Response) {
-    res.json(this.cache['6m']);
+  public get6MStatistics(req, res) {
+    res.send(this.cache['6m']);
   }
 
-  public get1YStatistics(req: Request, res: Response) {
-    res.json(this.cache['1y']);
-  }
-
-  public async getRecommendedFees(req: Request, res: Response) {
+  public async getRecommendedFees(req, res) {
     const result = feeApi.getRecommendedFee();
-    res.json(result);
+    res.send(result);
   }
 
-  public getMempoolBlocks(req: Request, res: Response) {
+  public async $getgetTransactionsForBlock(req, res) {
+    const result = await feeApi.$getTransactionsForBlock(req.params.id);
+    res.send(result);
+  }
+
+  public async getgetTransactionsForProjectedBlock(req, res) {
     try {
-      const result = mempoolBlocks.getMempoolBlocks();
-      res.json(result);
+      const result = await projectedBlocks.getProjectedBlockFeesForBlock(req.params.id);
+      res.send(result);
     } catch (e) {
       res.status(500).send(e.message);
     }
   }
 
-  public getTransactionTimes(req: Request, res: Response) {
-    if (!Array.isArray(req.query.txId)) {
-      res.status(500).send('Not an array');
-      return;
+  public async getProjectedBlocks(req, res) {
+    try {
+      let txId: string | undefined;
+      if (req.query.txId && /^[a-fA-F0-9]{64}$/.test(req.query.txId)) {
+        txId = req.query.txId;
+      }
+      const result = await projectedBlocks.getProjectedBlocks(txId, 6);
+      res.send(result);
+    } catch (e) {
+      res.status(500).send(e.message);
     }
-    const txIds: string[] = [];
-    for (const _txId in req.query.txId) {
-      if (typeof req.query.txId[_txId] === 'string') {
-        txIds.push(req.query.txId[_txId].toString());
+  }
+
+  public async getBlocks(req, res) {
+    try {
+      let result: string;
+      if (req.params.height) {
+        result = await bitcoinApi.getBlocksFromHeight(req.params.height);
+      } else {
+        result = await bitcoinApi.getBlocks();
+      }
+      res.send(result);
+    } catch (e) {
+      res.status(500).send(e.message);
+    }
+  }
+
+  public async getRawTransaction(req, res) {
+    try {
+      const result = await bitcoinApi.getRawTransaction(req.params.id);
+      res.send(result);
+    } catch (e) {
+      if (e.response) {
+        res.status(e.response.status).send(e.response.data);
+      } else {
+        res.status(500, e.message);
       }
     }
-
-    const times = mempool.getFirstSeenForTransactions(txIds);
-    res.json(times);
   }
 
-  public getBackendInfo(req: Request, res: Response) {
-    res.json(backendInfo.getBackendInfo());
-  }
-
-  public getBisqStats(req: Request, res: Response) {
-    const result = bisq.getStats();
-    res.json(result);
-  }
-
-  public getBisqTip(req: Request, res: Response) {
-    const result = bisq.getLatestBlockHeight();
-    res.type('text/plain');
-    res.send(result.toString());
-  }
-
-  public getBisqTransaction(req: Request, res: Response) {
-    const result = bisq.getTransaction(req.params.txId);
-    if (result) {
-      res.json(result);
-    } else {
-      res.status(404).send('Bisq transaction not found');
-    }
-  }
-
-  public getBisqTransactions(req: Request, res: Response) {
-    const types: string[] = [];
-    req.query.types = req.query.types || [];
-    if (!Array.isArray(req.query.types)) {
-      res.status(500).send('Types is not an array');
-      return;
-    }
-
-    for (const _type in req.query.types) {
-      if (typeof req.query.types[_type] === 'string') {
-        types.push(req.query.types[_type].toString());
+  public async getBlock(req, res) {
+    try {
+      const result = await bitcoinApi.getBlock(req.params.hash);
+      res.send(result);
+    } catch (e) {
+      if (e.response) {
+        res.status(e.response.status).send(e.response.data);
+      } else {
+        res.status(500, e.message);
       }
     }
-
-    const index = parseInt(req.params.index, 10) || 0;
-    const length = parseInt(req.params.length, 10) > 100 ? 100 : parseInt(req.params.length, 10) || 25;
-    const [transactions, count] = bisq.getTransactions(index, length, types);
-    res.header('X-Total-Count', count.toString());
-    res.json(transactions);
   }
 
-  public getBisqBlock(req: Request, res: Response) {
-    const result = bisq.getBlock(req.params.hash);
-    if (result) {
-      res.json(result);
-    } else {
-      res.status(404).send('Bisq block not found');
+  public async getBlockTransactions(req, res) {
+    try {
+      const result = await bitcoinApi.getBlockTransactions(req.params.hash);
+      res.send(result);
+    } catch (e) {
+      if (e.response) {
+        res.status(e.response.status).send(e.response.data);
+      } else {
+        if (e.response) {
+          res.status(e.response.status).send(e.response.data);
+        } else {
+          res.status(500, e.message);
+        }
+      }
     }
   }
 
-  public getBisqBlocks(req: Request, res: Response) {
-    const index = parseInt(req.params.index, 10) || 0;
-    const length = parseInt(req.params.length, 10) > 100 ? 100 : parseInt(req.params.length, 10) || 25;
-    const [transactions, count] = bisq.getBlocks(index, length);
-    res.header('X-Total-Count', count.toString());
-    res.json(transactions);
+  public async getBlockTransactionsFromIndex(req, res) {
+    try {
+      const result = await bitcoinApi.getBlockTransactionsFromIndex(req.params.hash, req.params.index);
+      res.send(result);
+    } catch (e) {
+      if (e.response) {
+        res.status(e.response.status).send(e.response.data);
+      } else {
+        if (e.response) {
+          res.status(e.response.status).send(e.response.data);
+        } else {
+          res.status(500, e.message);
+        }
+      }
+    }
   }
 
-  public getBisqAddress(req: Request, res: Response) {
-    const result = bisq.getAddress(req.params.address.substr(1));
-    if (result) {
-      res.json(result);
-    } else {
-      res.status(404).send('Bisq address not found');
+  public async getAddress(req, res) {
+    try {
+      const result = await bitcoinApi.getAddress(req.params.address);
+      res.send(result);
+    } catch (e) {
+      if (e.response) {
+        res.status(e.response.status).send(e.response.data);
+      } else {
+        if (e.response) {
+          res.status(e.response.status).send(e.response.data);
+        } else {
+          res.status(500, e.message);
+        }
+      }
+    }
+  }
+
+  public async getAddressTransactions(req, res) {
+    try {
+      const result = await bitcoinApi.getAddressTransactions(req.params.address);
+      res.send(result);
+    } catch (e) {
+      if (e.response) {
+        res.status(e.response.status).send(e.response.data);
+      } else {
+        res.status(500, e.message);
+      }
+    }
+  }
+
+  public async getAddressTransactionsFromTxid(req, res) {
+    try {
+      const result = await bitcoinApi.getAddressTransactionsFromLastSeenTxid(req.params.address, req.params.txid);
+      res.send(result);
+    } catch (e) {
+      if (e.response) {
+        res.status(e.response.status).send(e.response.data);
+      } else {
+        res.status(500, e.message);
+      }
     }
   }
 }

backend/yarn.lock

@@ -31,13 +31,6 @@
   resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.2.tgz#f65d3d6389e01eeb458bd54dc8f52b95a9463bc8"
   integrity sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==
 
-"@types/compression@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@types/compression/-/compression-1.0.1.tgz#f3682a6b3ce2dbd4aece48547153ebc592281fa7"
-  integrity sha512-GuoIYzD70h+4JUqUabsm31FGqvpCYHGKcLtor7nQ/YvUyNX0o9SJZ9boFI5HjFfbOda5Oe/XOvNK6FES8Y/79w==
-  dependencies:
-    "@types/express" "*"
-
 "@types/connect@*":
   version "3.4.32"
   resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.32.tgz#aa0e9616b9435ccad02bc52b5b454ffc2c70ba28"
@@ -46,17 +39,17 @@
     "@types/node" "*"
 
 "@types/express-serve-static-core@*":
-  version "4.17.0"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.0.tgz#e80c25903df5800e926402b7e8267a675c54a281"
-  integrity sha512-Xnub7w57uvcBqFdIGoRg1KhNOeEj0vB6ykUM7uFWyxvbdE89GFyqgmUcanAriMr4YOxNFZBAWkfcWIb4WBPt3g==
+  version "4.16.10"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.16.10.tgz#3c1313c6e6b75594561b473a286f016a9abf2132"
+  integrity sha512-gM6evDj0OvTILTRKilh9T5dTaGpv1oYiFcJAfgSejuMJgGJUsD9hKEU2lB4aiTNy4WwChxRnjfYFuBQsULzsJw==
   dependencies:
     "@types/node" "*"
     "@types/range-parser" "*"
 
-"@types/express@*", "@types/express@^4.17.2":
-  version "4.17.2"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.2.tgz#a0fb7a23d8855bac31bc01d5a58cadd9b2173e6c"
-  integrity sha512-5mHFNyavtLoJmnusB8OKJ5bshSzw+qkMIBAobLrIM48HJvunFva9mOa6aBwh64lBFyNwBbs0xiEFuj4eU/NjCA==
+"@types/express@^4.16.0":
+  version "4.17.1"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.1.tgz#4cf7849ae3b47125a567dfee18bfca4254b88c5c"
+  integrity sha512-VfH/XCP0QbQk5B5puLqTLEeFgR8lfCJHZJKkInZ9mkYd+u8byX0kztXEQxEk4wZXJs8HI+7km2ALXjn4YKcX9w==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "*"
@@ -67,10 +60,20 @@
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.1.tgz#dc488842312a7f075149312905b5e3c0b054c79d"
   integrity sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw==
 
+"@types/mysql2@github:types/mysql2":
+  version "1.0.0"
+  resolved "https://codeload.github.com/types/mysql2/tar.gz/217efd4ccf9eccc0797522aa745d8a9e264f6a75"
+  dependencies:
+    "@types/mysql" types/mysql#v2.0.0
+
+"@types/mysql@types/mysql#v2.0.0":
+  version "2.0.0"
+  resolved "https://codeload.github.com/types/mysql/tar.gz/da645a82afd66419ed439dddf174648aa68ba1f9"
+
 "@types/node@*":
-  version "12.12.17"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.17.tgz#191b71e7f4c325ee0fb23bc4a996477d92b8c39b"
-  integrity sha512-Is+l3mcHvs47sKy+afn2O1rV4ldZFU7W8101cNlOd+MRbjM4Onida8jSZnJdTe/0Pcf25g9BNIUsuugmE6puHA==
+  version "12.11.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.1.tgz#1fd7b821f798b7fa29f667a1be8f3442bb8922a3"
+  integrity sha512-TJtwsqZ39pqcljJpajeoofYRfeZ7/I/OMUQ5pR4q5wOKf2ocrUvBAZUMhWsOvKx3dVc/aaV5GluBivt0sWqA5A==
 
 "@types/range-parser@*":
   version "1.2.3"
@@ -96,14 +99,14 @@
     "@types/mime" "*"
 
 "@types/tough-cookie@*":
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-2.3.6.tgz#c880579e087d7a0db13777ff8af689f4ffc7b0d5"
-  integrity sha512-wHNBMnkoEBiRAd3s8KTKwIuO9biFtTf0LehITzBhSco+HQI0xkXZbLOD55SW3Aqw3oUkHstkm5SPv58yaAdFPQ==
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-2.3.5.tgz#9da44ed75571999b65c37b60c9b2b88db54c585d"
+  integrity sha512-SCcK7mvGi3+ZNz833RRjFIxrn4gI1PPR3NtuIS+6vMkvmsGjosqTJwRt5bAEFLRz+wtJMWv8+uOnZf2hi2QXTg==
 
-"@types/ws@^6.0.4":
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-6.0.4.tgz#7797707c8acce8f76d8c34b370d4645b70421ff1"
-  integrity sha512-PpPrX7SZW9re6+Ha8ojZG4Se8AZXgf0GK6zmfqEuCsY49LFDNXO3SByp44X3dFEqtB73lkCDAdUazhAjVPiNwg==
+"@types/ws@^6.0.1":
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-6.0.3.tgz#b772375ba59d79066561c8d87500144d674ba6b3"
+  integrity sha512-yBTM0P05Tx9iXGq00BbJPo37ox68R5vaGTXivs6RGh/BQ6QP5zqZDGWdAO6JbRE/iR1l80xeGAwCQS2nMV9S/w==
   dependencies:
     "@types/node" "*"
 
@@ -156,6 +159,11 @@ assert-plus@1.0.0, assert-plus@^1.0.0:
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
   integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
 
+async-limiter@~1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
+  integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -167,9 +175,17 @@ aws-sign2@~0.7.0:
   integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
 aws4@^1.8.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.0.tgz#24390e6ad61386b0a747265754d2a17219de862c"
-  integrity sha512-Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A==
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
+  integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
+
+axios@^0.19.0:
+  version "0.19.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.0.tgz#8e09bff3d9122e133f7b8101c8fbdd00ed3d2ab8"
+  integrity sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==
+  dependencies:
+    follow-redirects "1.5.10"
+    is-buffer "^2.0.2"
 
 balanced-match@^1.0.0:
   version "1.0.0"
@@ -183,6 +199,11 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
+bitcoin@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/bitcoin/-/bitcoin-3.0.1.tgz#ff9e0b62a71bbb8adddb34ee2e427dac21c1096f"
+  integrity sha1-/54LYqcbu4rd2zTuLkJ9rCHBCW8=
+
 body-parser@1.19.0:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
@@ -267,7 +288,7 @@ compressible@~2.0.16:
   dependencies:
     mime-db ">= 1.40.0 < 2"
 
-compression@^1.7.4:
+compression@^1.7.3:
   version "1.7.4"
   resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
   integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
@@ -326,6 +347,13 @@ debug@2.6.9:
   dependencies:
     ms "2.0.0"
 
+debug@=3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
+  dependencies:
+    ms "2.0.0"
+
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
@@ -394,7 +422,7 @@ etag@~1.8.1:
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
   integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
 
-express@^4.17.1:
+express@^4.16.3:
   version "4.17.1"
   resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
   integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
@@ -468,6 +496,13 @@ finalhandler@~1.1.2:
     statuses "~1.5.0"
     unpipe "~1.0.0"
 
+follow-redirects@1.5.10:
+  version "1.5.10"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
+  integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==
+  dependencies:
+    debug "=3.1.0"
+
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@@ -521,9 +556,9 @@ getpass@^0.1.1:
     assert-plus "^1.0.0"
 
 glob@^7.1.1:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
+  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -537,7 +572,7 @@ har-schema@^2.0.0:
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
   integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
-har-validator@~5.1.3:
+har-validator@~5.1.0:
   version "5.1.3"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
   integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
@@ -589,9 +624,9 @@ iconv-lite@0.4.24:
     safer-buffer ">= 2.1.2 < 3"
 
 iconv-lite@^0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.1.tgz#b2425d3c7b18f7219f2ca663d103bddb91718d64"
-  integrity sha512-ONHr16SQvKZNSqjQT9gy5z24Jw+uqfO02/ngBSBoqChZ+W8qXX7GPRa1RoUnzGADw8K63R1BXUMzarCVQBpY8Q==
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.0.tgz#59cdde0a2a297cc2aeb0c6445a195ee89f127550"
+  integrity sha512-NnEhI9hIEKHOzJ4f697DMz9IQEXr/MMJ5w64vN2/4Ai+wRnvV7SBrL0KLoRlwaKVghOc7LQ5YkPLuX146b6Ydw==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
@@ -618,6 +653,11 @@ ipaddr.js@1.9.0:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65"
   integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==
 
+is-buffer@^2.0.2:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623"
+  integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==
+
 is-property@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
@@ -711,17 +751,22 @@ methods@~1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
-mime-db@1.42.0, "mime-db@>= 1.40.0 < 2":
+mime-db@1.40.0:
+  version "1.40.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
+  integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
+
+"mime-db@>= 1.40.0 < 2":
   version "1.42.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.42.0.tgz#3e252907b4c7adb906597b4b65636272cf9e7bac"
   integrity sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ==
 
 mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24:
-  version "2.1.25"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.25.tgz#39772d46621f93e2a80a856c53b86a62156a6437"
-  integrity sha512-5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg==
+  version "2.1.24"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
+  integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==
   dependencies:
-    mime-db "1.42.0"
+    mime-db "1.40.0"
 
 mime@1.6.0:
   version "1.6.0"
@@ -845,12 +890,17 @@ pseudomap@^1.0.2:
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
   integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
-psl@^1.1.28:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
-  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
+psl@^1.1.24:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.4.0.tgz#5dd26156cdb69fa1fdb8ab1991667d3f80ced7c2"
+  integrity sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==
 
-punycode@^2.1.0, punycode@^2.1.1:
+punycode@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
+
+punycode@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
@@ -880,10 +930,10 @@ raw-body@2.4.0:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-request@^2.88.2:
-  version "2.88.2"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
-  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
+request@^2.88.0:
+  version "2.88.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
+  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -892,7 +942,7 @@ request@^2.88.2:
     extend "~3.0.2"
     forever-agent "~0.6.1"
     form-data "~2.3.2"
-    har-validator "~5.1.3"
+    har-validator "~5.1.0"
     http-signature "~1.2.0"
     is-typedarray "~1.0.0"
     isstream "~0.1.2"
@@ -902,14 +952,14 @@ request@^2.88.2:
     performance-now "^2.1.0"
     qs "~6.5.2"
     safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
+    tough-cookie "~2.4.3"
     tunnel-agent "^0.6.0"
     uuid "^3.3.2"
 
 resolve@^1.3.2:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.13.1.tgz#be0aa4c06acd53083505abb35f4d66932ab35d16"
-  integrity sha512-CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w==
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6"
+  integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==
   dependencies:
     path-parse "^1.0.6"
 
@@ -1014,13 +1064,13 @@ toidentifier@1.0.0:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
   integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
 
-tough-cookie@~2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
-  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+tough-cookie@~2.4.3:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
+  integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
   dependencies:
-    psl "^1.1.28"
-    punycode "^2.1.1"
+    psl "^1.1.24"
+    punycode "^1.4.1"
 
 tslib@^1.8.0, tslib@^1.8.1:
   version "1.10.0"
@@ -1028,9 +1078,9 @@ tslib@^1.8.0, tslib@^1.8.1:
   integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
 
 tslint@^5.11.0:
-  version "5.20.1"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.20.1.tgz#e401e8aeda0152bc44dd07e614034f3f80c67b7d"
-  integrity sha512-EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg==
+  version "5.20.0"
+  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.20.0.tgz#fac93bfa79568a5a24e7be9cdde5e02b02d00ec1"
+  integrity sha512-2vqIvkMHbnx8acMogAERQ/IuINOq6DFqgF8/VDvhEkBqQh/x6SP0Y+OHnKth9/ZcHQSroOZwUQSN18v8KKF0/g==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     builtin-modules "^1.1.1"
@@ -1073,10 +1123,10 @@ type-is@~1.6.17, type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
-typescript@^3.6.4:
-  version "3.9.7"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa"
-  integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==
+typescript@^3.1.1:
+  version "3.6.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.4.tgz#b18752bb3792bc1a0281335f7f6ebf1bbfc5b91d"
+  integrity sha512-unoCll1+l+YK4i4F8f22TaNVPRHcD9PA3yCuZ8g5e0qGqlVlJ/8FSateOLLSagn+Yg5+ZwuPkL8LFUc0Jcvksg==
 
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
@@ -1119,10 +1169,12 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-ws@^7.3.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.3.1.tgz#d0547bf67f7ce4f12a72dfe31262c68d7dc551c8"
-  integrity sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==
+ws@^6.0.0:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
+  integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
+  dependencies:
+    async-limiter "~1.0.0"
 
 yallist@^2.1.2:
   version "2.1.2"

entrypoint.sh

@@ -1,10 +1,51 @@
-#!/bin/sh
+#!/bin/bash
+## Start SQL
 mysqld_safe&
 sleep 5
+## http server:
 nginx
+
+## Set up some files:
 cd /mempool.space/backend 
-rm -f mempool-config.json
 rm -f cache.json
 touch cache.json
-jq -n env > mempool-config.json
+
+## Build mempool-config.json file ourseleves.
+## We used to use jq for this but that produced output which caused bugs,
+## specifically numbers were surrounded by quotes, which breaks things.
+## Old command was jq -n env > mempool-config.json
+## This way is more complex, but more compatible with the backend functions.
+
+## Define a function to allow us to easily get indexes of the = string in from the env output:
+strindex() { 
+  x="${1%%$2*}"
+  [[ "$x" = "$1" ]] && echo -1 || echo "${#x}"
+}
+## Regex to check if we have a number or not:
+NumberRegEx='^[0-9]+$'
+## Delete the old file, and start a new one:
+rm -f mempool-config.json
+echo "{" >> mempool-config.json
+## For each env we add into the mempool-config.json file in one of two ways.
+## Either:
+## "Variable": "Value",
+## if a string, or
+## "Variable": Value,
+## if a integer
+for e in `env`; do
+    if [[ ${e:`strindex "$e" "="`+1} =~ $NumberRegEx ]] ; then
+        ## Integer add:
+        echo "\""${e:0:`strindex "$e" "="`}"\": "${e:`strindex "$e" "="`+1}","  >> mempool-config.json
+    else
+        ## String add:
+        echo "\""${e:0:`strindex "$e" "="`}"\": \""${e:`strindex "$e" "="`+1}$"\","  >> mempool-config.json
+    fi
+done
+## Take out the trailing , from the last entry.
+## This means replacing the file with one that is missing the last character
+echo `sed '$ s/.$//' mempool-config.json` > mempool-config.json
+## And finally finish off:
+echo "}" >> mempool-config.json
+
+## Start mempoolspace:
 node dist/index.js

frontend/.browserslistrc

@@ -1,12 +0,0 @@
-# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
-# For additional information regarding the format and rule options, please see:
-# https://github.com/browserslist/browserslist#queries
-
-# You can see what browsers were selected by your queries by running:
-#   npx browserslist
-
-> 0.5%
-last 2 versions
-Firefox ESR
-not dead
-not IE 9-11 # For IE 9-11 support, remove 'not'.

frontend/.editorconfig

@@ -1,4 +1,4 @@
-# Editor configuration, see https://editorconfig.org
+# Editor configuration, see http://editorconfig.org
 root = true
 
 [*]

frontend/.gitignore

@@ -4,16 +4,10 @@
 /dist
 /tmp
 /out-tsc
-# Only exists if Bazel was run
-/bazel-out
 
 # dependencies
 /node_modules
 
-# profiling files
-chrome-profiler-events.json
-speed-measure-plugin.json
-
 # IDEs and editors
 /.idea
 .project
@@ -29,7 +23,6 @@ speed-measure-plugin.json
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
-.history/*
 
 # misc
 /.sass-cache
@@ -44,11 +37,3 @@ testem.log
 # System Files
 .DS_Store
 Thumbs.db
-
-src/resources/assets.json
-src/resources/assets.minimal.json
-src/resources/pools.json
-
-# environment config
-mempool-frontend-config.json
-generated-config.js

frontend/README.md

@@ -1,27 +0,0 @@
-# Mempool Space
-
-This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 8.1.2.
-
-## Development server
-
-Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
-
-## Code scaffolding
-
-Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
-
-## Build
-
-Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.
-
-## Running unit tests
-
-Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
-
-## Running end-to-end tests
-
-Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
-
-## Further help
-
-To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).

frontend/angular.json

@@ -4,15 +4,15 @@
   "newProjectRoot": "projects",
   "projects": {
     "mempool": {
-      "projectType": "application",
-      "schematics": {
-        "@schematics/angular:component": {
-          "style": "scss"
-        }
-      },
       "root": "",
       "sourceRoot": "src",
+      "projectType": "application",
       "prefix": "app",
+      "schematics": {
+        "@schematics/angular:component": {
+          "styleext": "scss"
+        }
+      },
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
@@ -21,18 +21,15 @@
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
-            "tsConfig": "tsconfig.app.json",
-            "aot": true,
+            "tsConfig": "src/tsconfig.app.json",
             "assets": [
               "src/favicon.ico",
-              "src/resources"
+              "src/assets"
             ],
             "styles": [
               "src/styles.scss"
             ],
-            "scripts": [
-              "generated-config.js"
-            ]
+            "scripts": []
           },
           "configurations": {
             "production": {
@@ -47,20 +44,27 @@
               "sourceMap": false,
               "extractCss": true,
               "namedChunks": false,
+              "aot": true,
               "extractLicenses": true,
               "vendorChunk": false,
-              "buildOptimizer": true,
-              "budgets": [
+              "buildOptimizer": true
+            },
+            "electrs": {
+              "fileReplacements": [
                 {
-                  "type": "initial",
-                  "maximumWarning": "2mb",
-                  "maximumError": "5mb"
-                },
-                {
-                  "type": "anyComponentStyle",
-                  "maximumWarning": "6kb"
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment-electrs.prod.ts"
                 }
-              ]
+              ],
+              "optimization": true,
+              "outputHashing": "all",
+              "sourceMap": false,
+              "extractCss": true,
+              "namedChunks": false,
+              "aot": true,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true
             }
           }
         },
@@ -86,44 +90,54 @@
           "options": {
             "main": "src/test.ts",
             "polyfills": "src/polyfills.ts",
-            "tsConfig": "tsconfig.spec.json",
-            "karmaConfig": "karma.conf.js",
-            "assets": [
-              "src/favicon.ico",
-              "src/resources"
-            ],
+            "tsConfig": "src/tsconfig.spec.json",
+            "karmaConfig": "src/karma.conf.js",
             "styles": [
               "src/styles.scss"
             ],
-            "scripts": []
+            "scripts": [],
+            "assets": [
+              "src/favicon.ico",
+              "src/assets"
+            ]
           }
         },
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
             "tsConfig": [
-              "tsconfig.app.json",
-              "tsconfig.spec.json",
-              "e2e/tsconfig.json"
+              "src/tsconfig.app.json",
+              "src/tsconfig.spec.json"
             ],
             "exclude": [
               "**/node_modules/**"
             ]
           }
-        },
+        }
+      }
+    },
+    "mempool-e2e": {
+      "root": "e2e/",
+      "projectType": "application",
+      "architect": {
         "e2e": {
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {
             "protractorConfig": "e2e/protractor.conf.js",
             "devServerTarget": "mempool:serve"
-          },
-          "configurations": {
-            "production": {
-              "devServerTarget": "mempool:serve:production"
-            }
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": "e2e/tsconfig.e2e.json",
+            "exclude": [
+              "**/node_modules/**"
+            ]
           }
         }
       }
-    }},
+    }
+  },
   "defaultProject": "mempool"
-}
+}

frontend/e2e/protractor.conf.js

@@ -1,12 +1,8 @@
-// @ts-check
 // Protractor configuration file, see link for more information
 // https://github.com/angular/protractor/blob/master/lib/config.ts
 
 const { SpecReporter } = require('jasmine-spec-reporter');
 
-/**
- * @type { import("protractor").Config }
- */
 exports.config = {
   allScriptsTimeout: 11000,
   specs: [
@@ -25,7 +21,7 @@ exports.config = {
   },
   onPrepare() {
     require('ts-node').register({
-      project: require('path').join(__dirname, './tsconfig.json')
+      project: require('path').join(__dirname, './tsconfig.e2e.json')
     });
     jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
   }

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

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

frontend/e2e/src/app.po.ts

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

frontend/e2e/tsconfig.e2e.json

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

frontend/generate-config.js

@@ -1,36 +0,0 @@
-var fs = require('fs');
-
-const CONFIG_FILE_NAME = 'mempool-frontend-config.json';
-const GENERATED_CONFIG_FILE_NAME = 'generated-config.js';
-
-let settings = [];
-let configContent = {};
-
-try {
-  const rawConfig = fs.readFileSync(CONFIG_FILE_NAME);
-  configContent = JSON.parse(rawConfig);
-} catch (e) {
-  if (e.code !== 'ENOENT') {
-    throw new Error(e);
-  }
-}
-
-for (setting in configContent) {
-  settings.push({
-    key: setting,
-    value: configContent[setting]
-  });
-}
-
-const code = `(function (window) {
-  window.__env = window.__env || {};${settings.reduce((str, obj) => `${str}
-    window.__env.${obj.key} = ${ typeof obj.value === 'string' ? `'${obj.value}'` : obj.value };`, '')}
-  }(this));`;
-
-try {
-  fs.writeFileSync(GENERATED_CONFIG_FILE_NAME, code, 'utf8');
-} catch (e) {
-  throw new Error(e);
-}
-
-console.log('Config file generated');

frontend/mempool-frontend-config.sample.json

@@ -1,8 +0,0 @@
-{
-  "TESTNET_ENABLED": false,
-  "LIQUID_ENABLED": false,
-  "BISQ_ENABLED": false,
-  "BISQ_SEPARATE_BACKEND": false,
-  "ELCTRS_ITEMS_PER_PAGE": 25,
-  "KEEP_BLOCKS_AMOUNT": 8
-}

frontend/package.json

@@ -1,80 +1,50 @@
 {
   "name": "mempool-frontend",
-  "version": "2.0.0",
-  "description": "Bitcoin mempool visualizer and blockchain explorer backend",
-  "license": "MIT",
-  "homepage": "https://mempool.space",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/mempool/mempool"
-  },
-  "bugs": {
-    "url": "https://github.com/mempool/mempool/issues"
-  },
-  "keywords": [
-    "bitcoin",
-    "mempool",
-    "blockchain",
-    "explorer",
-    "liquid"
-  ],
-  "main": "index.ts",
+  "version": "1.0.0",
+  "description": "Bitcoin Mempool Visualizer",
   "scripts": {
     "ng": "ng",
-    "start": "npm run generate-config && npm run sync-assets-dev && ng serve --proxy-config proxy.conf.json",
-    "build": "npm run generate-config && ng build --prod && npm run sync-assets",
-    "sync-assets": "node sync-assets.js",
-    "sync-assets-dev": "node sync-assets.js dev",
-    "generate-config": "node generate-config.js",
+    "start": "ng serve --aot --proxy-config proxy.conf.json",
+    "build": "ng build --prod",
+    "build-electrs": "ng build --prod --configuration=electrs",
     "test": "ng test",
     "lint": "ng lint",
     "e2e": "ng e2e"
   },
+  "author": {
+    "name": "Simon Lindh",
+    "url": "https://github.com/mempool-space/mempool.space"
+  },
+  "license": "MIT",
   "dependencies": {
-    "@angular/animations": "~10.0.4",
-    "@angular/common": "~10.0.4",
-    "@angular/compiler": "~10.0.4",
-    "@angular/core": "~10.0.4",
-    "@angular/forms": "~10.0.4",
-    "@angular/localize": "^10.0.4",
-    "@angular/platform-browser": "~10.0.4",
-    "@angular/platform-browser-dynamic": "~10.0.4",
-    "@angular/router": "~10.0.4",
-    "@fortawesome/angular-fontawesome": "^0.7.0",
-    "@fortawesome/fontawesome-common-types": "^0.2.30",
-    "@fortawesome/fontawesome-svg-core": "^1.2.30",
-    "@fortawesome/free-solid-svg-icons": "^5.14.0",
-    "@ng-bootstrap/ng-bootstrap": "^7.0.0",
-    "@types/qrcode": "^1.3.4",
-    "bootstrap": "4.5.0",
-    "chartist": "^0.11.4",
-    "clipboard": "^2.0.4",
-    "ngx-infinite-scroll": "^9.0.0",
-    "qrcode": "^1.4.4",
-    "rxjs": "^6.6.0",
-    "tlite": "^0.1.9",
-    "tslib": "^2.0.0",
-    "zone.js": "~0.10.3"
+    "@angular/animations": "^8.2.11",
+    "@angular/common": "^8.2.11",
+    "@angular/compiler": "^8.2.11",
+    "@angular/core": "^8.2.11",
+    "@angular/forms": "^8.2.11",
+    "@angular/platform-browser": "^8.2.11",
+    "@angular/platform-browser-dynamic": "^8.2.11",
+    "@angular/router": "^8.2.11",
+    "@ng-bootstrap/ng-bootstrap": "^5.1.1",
+    "angularx-qrcode": "^1.7.0-beta.5",
+    "bootstrap": "^4.3.1",
+    "chartist": "^0.11.2",
+    "core-js": "^3.4.1",
+    "ng-chartist": "^2.0.0-beta.1",
+    "rxjs": "^6.5.3",
+    "tslib": "^1.9.0",
+    "zone.js": "~0.10.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.1000.3",
-    "@angular/cli": "~10.0.3",
-    "@angular/compiler-cli": "~10.0.4",
-    "@angular/language-service": "~10.0.4",
-    "@types/jasmine": "~3.3.8",
-    "@types/jasminewd2": "~2.0.3",
-    "@types/node": "^12.11.1",
-    "codelyzer": "^6.0.0",
-    "jasmine-core": "~3.5.0",
-    "jasmine-spec-reporter": "~5.0.0",
-    "karma": "~5.0.0",
-    "karma-chrome-launcher": "~3.1.0",
-    "karma-coverage-istanbul-reporter": "~3.0.2",
-    "karma-jasmine": "~3.3.0",
-    "karma-jasmine-html-reporter": "^1.5.0",
-    "protractor": "~7.0.0",
+    "@angular-devkit/build-angular": "~0.800.0",
+    "@angular/cli": "~8.3.12",
+    "@angular/compiler-cli": "^8.2.11",
+    "@angular/language-service": "^8.2.11",
+    "@types/chartist": "^0.9.46",
+    "@types/node": "~8.9.4",
+    "codelyzer": "~5.1.0",
     "ts-node": "~7.0.0",
-    "tslint": "~6.1.0",
-    "typescript": "~3.9.7"
+    "tslint": "~5.15.0",
+    "typescript": "~3.4.3"
   }
-}
+}

frontend/proxy.conf.json

@@ -1,25 +1,11 @@
 {
-  "/api/v1": {
+  "/api": {
     "target": "http://localhost:8999/",
     "secure": false
   },
-  "/api/v1/ws": {
+  "/ws": {
     "target": "http://localhost:8999/",
     "secure": false,
     "ws": true
-  },
-  "/bisq/api": {
-    "target": "http://localhost:8999/",
-    "secure": false,
-    "pathRewrite": {
-      "^/bisq/api": "/api/v1/bisq"
-    }
-  },
-  "/api": {
-    "target": "http://localhost:50001/",
-    "secure": false,
-    "pathRewrite": {
-      "^/api": ""
-    }
   }
 }

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

@@ -0,0 +1,42 @@
+<div class="text-center">
+  <img src="./assets/mempool-tube.png" width="63" height="63" />
+  <br /><br />
+
+  <h2>About</h2>
+
+  <p>Mempool.Space is a realtime Bitcoin blockchain visualizer and statistics website focused on SegWit.</p>
+  <p>Created by <a href="http://t.me/softcrypto">@softcrypto</a> (Telegram). <a href="https://twitter.com/softcrypt0">@softcrypt0</a> (Twitter).
+  <br />Designed by <a href="https://emeraldo.io">emeraldo.io</a>.
+  <br />Hosted by <a href="https://twitter.com/wiz">@wiz</a></p>
+
+
+  <h2>Fee API</h2>
+
+  <div class="col-4 mx-auto">
+    <input class="form-control" type="text" value="https://mempool.space/api/v1/fees/recommended" readonly>
+  </div>
+
+  <br />
+
+  <h1>Donate</h1>
+  <h3>Segwit native</h3>
+  <img src="./assets/btc-qr-code-segwit.png" width="200" height="200" />
+  <br />
+  bc1qqrmgr60uetlmrpylhtllawyha9z5gw6hwdmk2t
+
+  <br /><br />
+  <h3>Segwit compatibility</h3>
+  <img src="./assets/btc-qr-code.png" width="200" height="200" />
+  <br />
+  3Ccig4G4u8hbExnxBJHeE5ZmxxWxvEQ65f
+
+
+  <br /><br />
+
+  <h3>PayNym</h3>
+  <img src="./assets/paynym-code.png" width="200" height="200" />
+  <br />
+  <p style="word-wrap: break-word; overflow-wrap: break-word;max-width: 300px; text-align: center; margin: auto;">
+    PM8TJZWDn1XbYmVVMR3RP9Kt1BW69VCSLTC12UB8iWUiKcEBJsxB4UUKBMJxc3LVaxtU5d524sLFrTy9kFuyPQ73QkEagGcMfCE6M38E5C67EF8KAqvS
+  </p>
+</div>

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

@@ -0,0 +1,19 @@
+import { Component, OnInit } from '@angular/core';
+import { ApiService } from '../services/api.service';
+
+@Component({
+  selector: 'app-about',
+  templateUrl: './about.component.html',
+  styleUrls: ['./about.component.scss']
+})
+export class AboutComponent implements OnInit {
+
+  constructor(
+    private apiService: ApiService,
+  ) { }
+
+  ngOnInit() {
+    this.apiService.webSocketWant([]);
+  }
+
+}

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

@@ -1,18 +1,10 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
-import { StartComponent } from './components/start/start.component';
-import { TransactionComponent } from './components/transaction/transaction.component';
-import { BlockComponent } from './components/block/block.component';
-import { AddressComponent } from './components/address/address.component';
-import { MasterPageComponent } from './components/master-page/master-page.component';
-import { AboutComponent } from './components/about/about.component';
-import { TelevisionComponent } from './components/television/television.component';
-import { StatisticsComponent } from './components/statistics/statistics.component';
-import { MempoolBlockComponent } from './components/mempool-block/mempool-block.component';
-import { LatestBlocksComponent } from './components/latest-blocks/latest-blocks.component';
-import { AssetComponent } from './components/asset/asset.component';
-import { AssetsComponent } from './assets/assets.component';
-import { StatusViewComponent } from './components/status-view/status-view.component';
+import { BlockchainComponent } from './blockchain/blockchain.component';
+import { AboutComponent } from './about/about.component';
+import { StatisticsComponent } from './statistics/statistics.component';
+import { TelevisionComponent } from './television/television.component';
+import { MasterPageComponent } from './master-page/master-page.component';
 
 const routes: Routes = [
   {
@@ -21,183 +13,42 @@ const routes: Routes = [
     children: [
       {
         path: '',
-        component: StartComponent,
-        children: [
-          {
-            path: '',
-            component: LatestBlocksComponent
-          },
-          {
-            path: 'tx/:id',
-            component: TransactionComponent
-          },
-          {
-            path: 'block/:id',
-            component: BlockComponent
-          },
-          {
-            path: 'mempool-block/:id',
-            component: MempoolBlockComponent
-          },
-        ],
+        children: [],
+        component: BlockchainComponent
+      },
+      {
+        path: 'tx/:id',
+        children: [],
+        component: BlockchainComponent
+      },
+      {
+        path: 'about',
+        children: [],
+        component: AboutComponent
+      },
+      {
+        path: 'statistics',
+        component: StatisticsComponent,
       },
       {
         path: 'graphs',
         component: StatisticsComponent,
       },
       {
-        path: 'about',
-        component: AboutComponent,
-      },
-      {
-        path: 'address/:id',
-        children: [],
-        component: AddressComponent
+        path: 'explorer',
+        loadChildren: './explorer/explorer.module#ExplorerModule',
       },
     ],
   },
-  {
-    path: 'liquid',
-    children: [
-      {
-        path: '',
-        component: MasterPageComponent,
-        children: [
-          {
-            path: '',
-            component: StartComponent,
-            children: [
-              {
-                path: '',
-                component: LatestBlocksComponent
-              },
-              {
-                path: 'tx/:id',
-                component: TransactionComponent
-              },
-              {
-                path: 'block/:id',
-                component: BlockComponent
-              },
-              {
-                path: 'mempool-block/:id',
-                component: MempoolBlockComponent
-              },
-            ],
-          },
-          {
-            path: 'graphs',
-            component: StatisticsComponent,
-          },
-          {
-            path: 'about',
-            component: AboutComponent,
-          },
-          {
-            path: 'address/:id',
-            component: AddressComponent
-          },
-          {
-            path: 'asset/:id',
-            component: AssetComponent
-          },
-          {
-            path: 'assets',
-            component: AssetsComponent,
-          },
-        ],
-      },
-      {
-        path: 'tv',
-        component: TelevisionComponent
-      },
-      {
-        path: 'status',
-        component: StatusViewComponent
-      },
-      {
-        path: '**',
-        redirectTo: ''
-      },
-    ]
-  },
-  {
-    path: 'testnet',
-    children: [
-      {
-        path: '',
-        component: MasterPageComponent,
-        children: [
-          {
-            path: '',
-            component: StartComponent,
-            children: [
-              {
-                path: '',
-                component: LatestBlocksComponent
-              },
-              {
-                path: 'tx/:id',
-                component: TransactionComponent
-              },
-              {
-                path: 'block/:id',
-                component: BlockComponent
-              },
-              {
-                path: 'mempool-block/:id',
-                component: MempoolBlockComponent
-              },
-            ],
-          },
-          {
-            path: 'graphs',
-            component: StatisticsComponent,
-          },
-          {
-            path: 'about',
-            component: AboutComponent,
-          },
-          {
-            path: 'address/:id',
-            children: [],
-            component: AddressComponent
-          },
-        ],
-      },
-      {
-        path: 'tv',
-        component: TelevisionComponent
-      },
-      {
-        path: 'status',
-        component: StatusViewComponent
-      },
-      {
-        path: '**',
-        redirectTo: ''
-      },
-    ]
-  },
-  {
-    path: 'bisq',
-    component: MasterPageComponent,
-    loadChildren: () => import('./bisq/bisq.module').then(m => m.BisqModule)
-  },
   {
     path: 'tv',
     component: TelevisionComponent,
   },
-  {
-    path: 'status',
-    component: StatusViewComponent
-  },
   {
     path: '**',
     redirectTo: ''
-  },
+  }
 ];
-
 @NgModule({
   imports: [RouterModule.forRoot(routes)],
   exports: [RouterModule]

frontend/src/app/app.component.html

@@ -0,0 +1 @@
+<router-outlet></router-outlet>

frontend/src/app/app.component.ts

@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-root',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.scss']
+})
+export class AppComponent {
+  constructor() { }
+}

frontend/src/app/app.constants.ts

@@ -1,58 +0,0 @@
-export const mempoolFeeColors = [
-  '557d00',
-  '5d7d01',
-  '637d02',
-  '6d7d04',
-  '757d05',
-  '7d7d06',
-  '867d08',
-  '8c7d09',
-  '957d0b',
-  '9b7d0c',
-  'a67d0e',
-  'aa7d0f',
-  'b27d10',
-  'bb7d11',
-  'bf7d12',
-  'bf7815',
-  'bf7319',
-  'be6c1e',
-  'be6820',
-  'bd6125',
-  'bd5c28',
-  'bc552d',
-  'bc4f30',
-  'bc4a34',
-  'bb4339',
-  'bb3d3c',
-  'bb373f',
-  'ba3243',
-  'b92b48',
-  'b9254b',
-];
-
-export const feeLevels = [1, 2, 3, 4, 5, 6, 8, 10, 12, 15, 20, 30, 40, 50, 60, 70, 80, 90, 100, 125, 150, 175, 200,
-  250, 300, 350, 400, 500, 600, 700, 800, 900, 1000, 1200, 1400, 1600, 1800, 2000];
-
-interface Env {
-  TESTNET_ENABLED: boolean;
-  LIQUID_ENABLED: boolean;
-  BISQ_ENABLED: boolean;
-  BISQ_SEPARATE_BACKEND: boolean;
-  ELCTRS_ITEMS_PER_PAGE: number;
-  KEEP_BLOCKS_AMOUNT: number;
-}
-
-const defaultEnv: Env = {
-  'TESTNET_ENABLED': false,
-  'LIQUID_ENABLED': false,
-  'BISQ_ENABLED': false,
-  'BISQ_SEPARATE_BACKEND': false,
-  'ELCTRS_ITEMS_PER_PAGE': 25,
-  'KEEP_BLOCKS_AMOUNT': 8
-};
-
-const browserWindow = window || {};
-// @ts-ignore
-const browserWindowEnv = browserWindow.__env || {};
-export const env: Env = Object.assign(defaultEnv, browserWindowEnv);

frontend/src/app/app.module.ts

@@ -1,91 +1,56 @@
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
-import { HttpClientModule } from '@angular/common/http';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 
+import { AppComponent } from './app.component';
+import { BlockchainComponent } from './blockchain/blockchain.component';
 import { AppRoutingModule } from './app-routing.module';
-import { AppComponent } from './components/app/app.component';
-
-import { StartComponent } from './components/start/start.component';
-import { ElectrsApiService } from './services/electrs-api.service';
-import { TransactionComponent } from './components/transaction/transaction.component';
-import { TransactionsListComponent } from './components/transactions-list/transactions-list.component';
-import { AmountComponent } from './components/amount/amount.component';
-import { StateService } from './services/state.service';
-import { BlockComponent } from './components/block/block.component';
-import { AddressComponent } from './components/address/address.component';
-import { SearchFormComponent } from './components/search-form/search-form.component';
-import { LatestBlocksComponent } from './components/latest-blocks/latest-blocks.component';
-import { WebsocketService } from './services/websocket.service';
-import { AddressLabelsComponent } from './components/address-labels/address-labels.component';
-import { MempoolBlocksComponent } from './components/mempool-blocks/mempool-blocks.component';
-import { MasterPageComponent } from './components/master-page/master-page.component';
-import { AboutComponent } from './components/about/about.component';
-import { TelevisionComponent } from './components/television/television.component';
-import { StatisticsComponent } from './components/statistics/statistics.component';
-import { ChartistComponent } from './components/statistics/chartist.component';
-import { BlockchainBlocksComponent } from './components/blockchain-blocks/blockchain-blocks.component';
-import { BlockchainComponent } from './components/blockchain/blockchain.component';
-import { FooterComponent } from './components/footer/footer.component';
-import { AudioService } from './services/audio.service';
-import { MempoolBlockComponent } from './components/mempool-block/mempool-block.component';
-import { FeeDistributionGraphComponent } from './components/fee-distribution-graph/fee-distribution-graph.component';
-import { TimespanComponent } from './components/timespan/timespan.component';
-import { SeoService } from './services/seo.service';
-import { MempoolGraphComponent } from './components/mempool-graph/mempool-graph.component';
-import { AssetComponent } from './components/asset/asset.component';
-import { AssetsComponent } from './assets/assets.component';
-import { StatusViewComponent } from './components/status-view/status-view.component';
-import { MinerComponent } from './components/miner/miner.component';
 import { SharedModule } from './shared/shared.module';
-import { NgbTypeaheadModule } from '@ng-bootstrap/ng-bootstrap';
+import { MemPoolService } from './services/mem-pool.service';
+import { HttpClientModule } from '@angular/common/http';
+import { FooterComponent } from './footer/footer.component';
+import { AboutComponent } from './about/about.component';
+import { TxBubbleComponent } from './tx-bubble/tx-bubble.component';
+import { ReactiveFormsModule } from '@angular/forms';
+import { BlockModalComponent } from './blockchain-blocks/block-modal/block-modal.component';
+import { StatisticsComponent } from './statistics/statistics.component';
+import { ProjectedBlockModalComponent } from './blockchain-projected-blocks/projected-block-modal/projected-block-modal.component';
+import { TelevisionComponent } from './television/television.component';
+import { BlockchainBlocksComponent } from './blockchain-blocks/blockchain-blocks.component';
+import { BlockchainProjectedBlocksComponent } from './blockchain-projected-blocks/blockchain-projected-blocks.component';
+import { ApiService } from './services/api.service';
+import { MasterPageComponent } from './master-page/master-page.component';
+import { FeeDistributionGraphComponent } from './fee-distribution-graph/fee-distribution-graph.component';
 
 @NgModule({
   declarations: [
     AppComponent,
-    AboutComponent,
-    MasterPageComponent,
-    TelevisionComponent,
     BlockchainComponent,
-    StartComponent,
-    BlockchainBlocksComponent,
-    StatisticsComponent,
-    TransactionComponent,
-    BlockComponent,
-    TransactionsListComponent,
-    AddressComponent,
-    AmountComponent,
-    SearchFormComponent,
-    LatestBlocksComponent,
-    TimespanComponent,
-    AddressLabelsComponent,
-    MempoolBlocksComponent,
-    ChartistComponent,
     FooterComponent,
-    MempoolBlockComponent,
+    StatisticsComponent,
+    AboutComponent,
+    TxBubbleComponent,
+    BlockModalComponent,
+    ProjectedBlockModalComponent,
+    TelevisionComponent,
+    BlockchainBlocksComponent,
+    BlockchainProjectedBlocksComponent,
+    MasterPageComponent,
     FeeDistributionGraphComponent,
-    MempoolGraphComponent,
-    AssetComponent,
-    AssetsComponent,
-    MinerComponent,
-    StatusViewComponent,
   ],
   imports: [
+    ReactiveFormsModule,
     BrowserModule,
-    AppRoutingModule,
     HttpClientModule,
-    BrowserAnimationsModule,
-    InfiniteScrollModule,
-    NgbTypeaheadModule,
+    AppRoutingModule,
     SharedModule,
   ],
   providers: [
-    ElectrsApiService,
-    StateService,
-    WebsocketService,
-    AudioService,
-    SeoService,
+    ApiService,
+    MemPoolService,
+  ],
+  entryComponents: [
+    BlockModalComponent,
+    ProjectedBlockModalComponent,
   ],
   bootstrap: [AppComponent]
 })

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

@@ -1,75 +0,0 @@
-<div class="container-xl">
-  <h1 style="float: left;">Registered assets</h1>
-  <br>
-
-  <div class="clearfix"></div>
-
-  <form [formGroup]="searchForm" class="form-inline">
-    <div class="input-group m-2">
-      <input style="width: 250px;" formControlName="searchText" type="text" class="form-control" placeholder="Search asset">
-      <div class="input-group-append">
-        <button [disabled]="!searchForm.get('searchText')?.value.length" class="btn btn-secondary" type="button" (click)="searchForm.get('searchText')?.setValue('');" autocomplete="off">Clear</button>
-      </div>
-    </div>
-  </form>
-
-  <ng-template [ngIf]="!isLoading && !error">
-    <table class="table table-borderless table-striped">
-      <thead>
-        <th class="td-name">Name</th>
-        <th>Ticker</th>
-        <th class="d-none d-md-block">Issuer domain</th>
-        <th>Asset ID</th>
-        <th class="d-none d-lg-block">Issuance TX</th>
-      </thead>
-      <tbody>
-        <tr *ngFor="let asset of filteredAssets; trackBy: trackByAsset">
-          <td class="td-name">{{ asset.name }}</td>
-          <td>{{ asset.ticker }}</td>
-          <td class="d-none d-md-block"><a *ngIf="asset.entity" target="_blank" href="{{ 'http://' + asset.entity.domain }}">{{ asset.entity.domain }}</a></td>
-          <td><a [routerLink]="['/asset/' | relativeUrl, asset.asset_id]">{{ asset.asset_id | shortenString : 13 }}</a> <app-clipboard class="d-none d-sm-inline-block" [text]="asset.asset_id"></app-clipboard></td>
-          <td class="d-none d-lg-block"><ng-template [ngIf]="asset.issuance_txin"><a [routerLink]="['/tx/' | relativeUrl, asset.issuance_txin.txid]">{{ asset.issuance_txin.txid | shortenString : 13 }}</a> <app-clipboard class="d-none d-sm-inline-block" [text]="asset.issuance_txin.txid"></app-clipboard></ng-template></td>
-        </tr> 
-      </tbody>
-    </table>
-
-    <br>
-
-    <ngb-pagination [collectionSize]="assets.length" [rotate]="true" [pageSize]="itemsPerPage" [(page)]="page" (pageChange)="pageChange(page)" [maxSize]="5" [boundaryLinks]="true"></ngb-pagination>
-
-  </ng-template>
-
-  <ng-template [ngIf]="isLoading && !error">
-
-    <table class="table table-borderless table-striped">
-      <thead>
-        <th>Name</th>
-        <th>Ticker</th>
-        <th>Issuer domain</th>
-        <th>Asset ID</th>
-        <th>Issuance TX</th>
-      </thead>
-      <tbody>
-        <tr *ngFor="let dummy of [0,0,0]">
-          <td><span class="skeleton-loader"></span></td>
-          <td><span class="skeleton-loader"></span></td>
-          <td class="d-none d-md-block"><span class="skeleton-loader"></span></td>
-          <td><span class="skeleton-loader"></span></td>
-          <td class="d-none d-lg-block"><span class="skeleton-loader"></span></td>
-        </tr> 
-      </tbody>
-    </table>
-
-  </ng-template>
-
-  <ng-template [ngIf]="error">
-    <div class="text-center">
-      Error loading assets data.
-      <br>
-      <i>{{ error.error }}</i>
-    </div>
-  </ng-template>
-
-</div>
-
-<br>

frontend/src/app/assets/assets.component.scss

@@ -1,6 +0,0 @@
-.td-name {
-  max-width: 200px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}

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

@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AssetsComponent } from './assets.component';
-
-describe('AssetsComponent', () => {
-  let component: AssetsComponent;
-  let fixture: ComponentFixture<AssetsComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ AssetsComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(AssetsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

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

@@ -1,89 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { AssetsService } from '../services/assets.service';
-import { environment } from 'src/environments/environment';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
-import { distinctUntilChanged } from 'rxjs/operators';
-
-@Component({
-  selector: 'app-assets',
-  templateUrl: './assets.component.html',
-  styleUrls: ['./assets.component.scss']
-})
-export class AssetsComponent implements OnInit {
-  nativeAssetId = environment.nativeAssetId;
-  assets: any[];
-  assetsCache: any[];
-  filteredAssets: any[];
-  searchForm: FormGroup;
-
-  isLoading = true;
-  error: any;
-
-  page = 1;
-  itemsPerPage: number;
-  contentSpace = window.innerHeight - (250 + 200);
-  fiveItemsPxSize = 250;
-
-  constructor(
-    private assetsService: AssetsService,
-    private formBuilder: FormBuilder,
-  ) { }
-
-  ngOnInit() {
-    this.itemsPerPage = Math.max(Math.round(this.contentSpace / this.fiveItemsPxSize) * 5, 10);
-
-    this.searchForm = this.formBuilder.group({
-      searchText: [{ value: '', disabled: true }, Validators.required]
-    });
-
-    this.searchForm.get('searchText').valueChanges
-      .pipe(
-        distinctUntilChanged(),
-      )
-      .subscribe((searchText) => {
-        this.page = 1;
-        if (searchText.length ) {
-          this.filteredAssets = this.assetsCache.filter((asset) => asset.name.toLowerCase().indexOf(searchText.toLowerCase()) > -1
-            || asset.ticker.toLowerCase().indexOf(searchText.toLowerCase()) > -1);
-          this.assets = this.filteredAssets;
-          this.filteredAssets = this.filteredAssets.slice(0, this.itemsPerPage);
-        } else {
-          this.assets = this.assetsCache;
-          this.filteredAssets = this.assets.slice(0, this.itemsPerPage);
-        }
-      });
-
-    this.getAssets();
-  }
-
-  getAssets() {
-    this.assetsService.getAssetsJson$
-      .subscribe((assets) => {
-        this.assets = Object.values(assets);
-        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();
-        this.filteredAssets = this.assets.slice(0, this.itemsPerPage);
-        this.isLoading = false;
-      },
-      (error) => {
-        console.log(error);
-        this.error = error;
-        this.isLoading = false;
-      });
-  }
-
-  pageChange(page: number) {
-    const start = (page - 1) * this.itemsPerPage;
-    this.filteredAssets = this.assets.slice(start, this.itemsPerPage + start);
-  }
-
-  trackByAsset(index: number, asset: any) {
-    return asset.asset_id;
-  }
-}

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

@@ -1,106 +0,0 @@
-<div class="container-xl">
-  <h1 style="float: left;">Address</h1>
-  <a [routerLink]="['/address/' | relativeUrl, addressString]" style="line-height: 56px; margin-left: 10px;">
-    <span class="d-inline d-lg-none">{{ addressString | shortenString : 24 }}</span>
-    <span class="d-none d-lg-inline">{{ addressString }}</span>
-  </a>
-  <app-clipboard [text]="addressString"></app-clipboard>
-  <br>
-
-  <div class="clearfix"></div>
-
-  <ng-template [ngIf]="!isLoadingAddress && !error">
-    <div class="box">
-
-      <div class="row">
-        <div class="col">
-          <table class="table table-borderless table-striped">
-            <tbody>
-              <tr>
-                <td>Total received</td>
-                <td>{{ totalReceived / 100 | number: '1.2-2' }} BSQ</td>
-              </tr>
-              <tr>
-                <td>Total sent</td>
-                <td>{{ totalSent / 100 | number: '1.2-2' }} BSQ</td>
-              </tr>
-              <tr>
-                <td>Final balance</td>
-                <td>{{ (totalReceived - totalSent) / 100 | number: '1.2-2' }} BSQ (<app-bsq-amount [bsq]="totalReceived - totalSent" [forceFiat]="true" [green]="true"></app-bsq-amount>)</td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-        <div class="w-100 d-block d-md-none"></div>
-        <div class="col qrcode-col">
-          <div class="qr-wrapper">
-            <app-qrcode [data]="addressString"></app-qrcode>
-          </div>
-        </div>
-      </div>
-
-    </div>
-
-    <br>
-
-    <h2>{{ transactions.length | number }} transactions</h2>
-
-    <ng-template ngFor let-tx [ngForOf]="transactions">
-
-      <div class="header-bg box" style="padding: 10px; margin-bottom: 10px;">
-        <a [routerLink]="['/tx/' | relativeUrl, tx.id]" [state]="{ data: tx }">
-          <span style="float: left;" class="d-block d-md-none">{{ tx.id | shortenString : 16 }}</span>
-          <span style="float: left;" class="d-none d-md-block">{{ tx.id }}</span>
-        </a>
-        <div class="float-right">
-          {{ tx.time | date:'yyyy-MM-dd HH:mm' }}
-        </div>
-        <div class="clearfix"></div>
-      </div>
-  
-      <app-bisq-transfers [tx]="tx" [showConfirmations]="true"></app-bisq-transfers>
-  
-      <br>
-    </ng-template>
-
-  </ng-template>
-
-  <ng-template [ngIf]="isLoadingAddress && !error">
-
-    <div class="box">
-      <div class="row">
-        <div class="col">
-          <table class="table table-borderless table-striped">
-            <tbody>
-              <tr>
-                <td colspan="2"><span class="skeleton-loader"></span></td>
-              </tr>
-              <tr>
-                <td colspan="2"><span class="skeleton-loader"></span></td>
-              </tr>
-              <tr>
-                <td colspan="2"><span class="skeleton-loader"></span></td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-        <div class="w-100 d-block d-md-none"></div>
-        <div class="col">
-          
-        </div>
-      </div>
-    </div>
-
-  </ng-template>
-
-  <ng-template [ngIf]="error">
-    <div class="text-center">
-      Error loading address data.
-      <br>
-      <i>{{ error.error }}</i>
-    </div>
-  </ng-template>
-
-</div>
-
-<br>

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

@@ -1,23 +0,0 @@
-.qr-wrapper {
-  background-color: #FFF;
-  padding: 10px;
-  padding-bottom: 5px;
-  display: inline-block;
-  margin-right: 25px;
-}
-
-@media (min-width: 576px) {
-  .qrcode-col {
-    text-align: right;
-  }
-}
-@media (max-width: 575.98px) {
-  .qrcode-col {
-    text-align: center;
-  }
-
-  .qrcode-col > div {
-    margin-top: 20px;
-    margin-right: 0px;
-  }
-}

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

@@ -1,82 +0,0 @@
-import { Component, OnInit, OnDestroy } from '@angular/core';
-import { SeoService } from 'src/app/services/seo.service';
-import { switchMap, filter, catchError } from 'rxjs/operators';
-import { ParamMap, ActivatedRoute } from '@angular/router';
-import { Subscription, of } from 'rxjs';
-import { BisqTransaction } from '../bisq.interfaces';
-import { BisqApiService } from '../bisq-api.service';
-
-@Component({
-  selector: 'app-bisq-address',
-  templateUrl: './bisq-address.component.html',
-  styleUrls: ['./bisq-address.component.scss']
-})
-export class BisqAddressComponent implements OnInit, OnDestroy {
-  transactions: BisqTransaction[];
-  addressString: string;
-  isLoadingAddress = true;
-  error: any;
-  mainSubscription: Subscription;
-
-  totalReceived = 0;
-  totalSent = 0;
-
-  constructor(
-    private route: ActivatedRoute,
-    private seoService: SeoService,
-    private bisqApiService: BisqApiService,
-  ) { }
-
-  ngOnInit() {
-    this.mainSubscription = this.route.paramMap
-      .pipe(
-        switchMap((params: ParamMap) => {
-          this.error = undefined;
-          this.isLoadingAddress = true;
-          this.transactions = null;
-          document.body.scrollTo(0, 0);
-          this.addressString = params.get('id') || '';
-          this.seoService.setTitle('Address: ' + this.addressString, true);
-
-          return this.bisqApiService.getAddress$(this.addressString)
-            .pipe(
-              catchError((err) => {
-                this.isLoadingAddress = false;
-                this.error = err;
-                console.log(err);
-                return of(null);
-              })
-            );
-          }),
-        filter((transactions) => transactions !== null)
-      )
-      .subscribe((transactions: BisqTransaction[]) => {
-        this.transactions = transactions;
-        this.updateChainStats();
-        this.isLoadingAddress = false;
-      },
-      (error) => {
-        console.log(error);
-        this.error = error;
-        this.isLoadingAddress = false;
-      });
-  }
-
-  updateChainStats() {
-    const shortenedAddress = this.addressString.substr(1);
-
-    this.totalSent = this.transactions.reduce((acc, tx) =>
-      acc + tx.inputs
-        .filter((input) => input.address === shortenedAddress)
-        .reduce((a, input) => a + input.bsqAmount, 0), 0);
-
-    this.totalReceived = this.transactions.reduce((acc, tx) =>
-      acc + tx.outputs
-        .filter((output) => output.address === shortenedAddress)
-        .reduce((a, output) => a + output.bsqAmount, 0), 0);
-  }
-
-  ngOnDestroy() {
-    this.mainSubscription.unsubscribe();
-  }
-}

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

@@ -1,45 +0,0 @@
-import { Injectable } from '@angular/core';
-import { HttpClient, HttpResponse, HttpParams } from '@angular/common/http';
-import { Observable } from 'rxjs';
-import { BisqTransaction, BisqBlock, BisqStats } from './bisq.interfaces';
-
-const API_BASE_URL = '/bisq/api';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class BisqApiService {
-  apiBaseUrl: string;
-
-  constructor(
-    private httpClient: HttpClient,
-  ) { }
-
-  getStats$(): Observable<BisqStats> {
-    return this.httpClient.get<BisqStats>(API_BASE_URL + '/stats');
-  }
-
-  getTransaction$(txId: string): Observable<BisqTransaction> {
-    return this.httpClient.get<BisqTransaction>(API_BASE_URL + '/tx/' + txId);
-  }
-
-  listTransactions$(start: number, length: number, types: string[]): Observable<HttpResponse<BisqTransaction[]>> {
-    let params = new HttpParams();
-    types.forEach((t: string) => {
-      params = params.append('types[]', t);
-    });
-    return this.httpClient.get<BisqTransaction[]>(API_BASE_URL + `/txs/${start}/${length}`, { params, observe: 'response' });
-  }
-
-  getBlock$(hash: string): Observable<BisqBlock> {
-    return this.httpClient.get<BisqBlock>(API_BASE_URL + '/block/' + hash);
-  }
-
-  listBlocks$(start: number, length: number): Observable<HttpResponse<BisqBlock[]>> {
-    return this.httpClient.get<BisqBlock[]>(API_BASE_URL + `/blocks/${start}/${length}`, { observe: 'response' });
-  }
-
-  getAddress$(address: string): Observable<BisqTransaction[]> {
-    return this.httpClient.get<BisqTransaction[]>(API_BASE_URL + '/address/' + address);
-  }
-}

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

@@ -1,108 +0,0 @@
-<div class="container-xl">
-
-  <div class="title-block">
-    <h1>Block <ng-template [ngIf]="blockHeight"><a [routerLink]="['/block/' | relativeUrl, blockHash]">{{ blockHeight }}</a></ng-template></h1>
-  </div>
-
-  <div class="clearfix"></div>
-
-  <ng-template [ngIf]="!isLoading && !error">
-
-    <div class="box">
-      <div class="row">
-        <div class="col-sm">
-          <table class="table table-borderless table-striped">
-            <tbody>
-              <tr>
-                <td class="td-width">Hash</td>
-                <td><a [routerLink]="['/block/' | relativeUrl, block.hash]" title="{{ block.hash }}">{{ block.hash | shortenString : 13 }}</a> <app-clipboard class="d-none d-sm-inline-block" [text]="block.hash"></app-clipboard></td>
-              </tr>
-              <tr>
-                <td>Timestamp</td>
-                <td>
-                  {{ block.time | date:'yyyy-MM-dd HH:mm' }}
-                  <div class="lg-inline">
-                    <i>(<app-time-since [time]="block.time / 1000" [fastRender]="true"></app-time-since> ago)</i>
-                  </div>
-                </td>
-              </tr>
-          </table>
-        </div>
-        <div class="col-sm">
-          <table class="table table-borderless table-striped">
-            <tbody>
-              <tr>
-                <td class="td-width">Previous hash</td>
-                <td><a [routerLink]="['/block/' | relativeUrl, block.previousBlockHash]" title="{{ block.hash }}">{{ block.previousBlockHash | shortenString : 13 }}</a> <app-clipboard class="d-none d-sm-inline-block" [text]="block.previousBlockHash"></app-clipboard></td>
-              </tr>
-          </table>
-        </div>
-      </div>
-    </div>
-
-    <div class="clearfix"></div>
-
-    <br>
-
-    <h2>{{ block.txs.length | number }} transactions</h2>
-
-    <ng-template ngFor let-tx [ngForOf]="block.txs">
-
-      <div class="header-bg box" style="padding: 10px; margin-bottom: 10px;">
-        <a [routerLink]="['/tx/' | relativeUrl, tx.id]" [state]="{ data: tx }">
-          <span style="float: left;" class="d-block d-md-none">{{ tx.id | shortenString : 16 }}</span>
-          <span style="float: left;" class="d-none d-md-block">{{ tx.id }}</span>
-        </a>
-        <div class="float-right">
-          {{ tx.time | date:'yyyy-MM-dd HH:mm' }}
-        </div>
-        <div class="clearfix"></div>
-      </div>
-  
-      <app-bisq-transfers [tx]="tx" [showConfirmations]="true"></app-bisq-transfers>
-  
-      <br>
-    </ng-template>
-
-  </ng-template>
-
-  <ng-template [ngIf]="isLoading && !error">
-    <div class="box">
-      <div class="row">
-        <div class="col-sm">
-          <table class="table table-borderless table-striped">
-            <tbody>
-              <tr>
-                <td class="td-width">Hash</td>
-                <td><span class="skeleton-loader"></span></td>
-              </tr>
-              <tr>
-                <td>Timestamp</td>
-                <td><span class="skeleton-loader"></span></td>
-              </tr>
-          </table>
-        </div>
-        <div class="col-sm">
-          <table class="table table-borderless table-striped">
-            <tbody>
-              <tr>
-                <td class="td-width">Previous hash</td>
-                <td><span class="skeleton-loader"></span></td>
-              </tr>
-          </table>
-        </div>
-      </div>
-    </div>
-  </ng-template>
-
-  <ng-template [ngIf]="error">
-    <div class="clearfix"></div>
-
-    <div class="text-center">
-      Error loading block
-      <br>
-      <i>{{ error.status }}: {{ error.statusText }}</i>
-    </div>
-  </ng-template>
-
-</div>

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

@@ -1,10 +0,0 @@
-
-.td-width {
-  width: 175px;
-}
-
-@media (max-width: 767.98px) {
-	.td-width {
-		width: 140px;
-	}
-}

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

@@ -1,98 +0,0 @@
-import { Component, OnInit, OnDestroy } from '@angular/core';
-import { BisqBlock } from 'src/app/bisq/bisq.interfaces';
-import { Location } from '@angular/common';
-import { BisqApiService } from '../bisq-api.service';
-import { ActivatedRoute, ParamMap, Router } from '@angular/router';
-import { Subscription, of } from 'rxjs';
-import { switchMap, catchError } from 'rxjs/operators';
-import { SeoService } from 'src/app/services/seo.service';
-import { ElectrsApiService } from 'src/app/services/electrs-api.service';
-import { HttpErrorResponse } from '@angular/common/http';
-
-@Component({
-  selector: 'app-bisq-block',
-  templateUrl: './bisq-block.component.html',
-  styleUrls: ['./bisq-block.component.scss']
-})
-export class BisqBlockComponent implements OnInit, OnDestroy {
-  block: BisqBlock;
-  subscription: Subscription;
-  blockHash = '';
-  blockHeight = 0;
-  isLoading = true;
-  error: HttpErrorResponse | null;
-
-  constructor(
-    private bisqApiService: BisqApiService,
-    private route: ActivatedRoute,
-    private seoService: SeoService,
-    private electrsApiService: ElectrsApiService,
-    private router: Router,
-    private location: Location,
-  ) { }
-
-  ngOnInit(): void {
-    this.subscription = this.route.paramMap
-      .pipe(
-        switchMap((params: ParamMap) => {
-          const blockHash = params.get('id') || '';
-          document.body.scrollTo(0, 0);
-          this.isLoading = true;
-          this.error = null;
-          if (history.state.data && history.state.data.blockHeight) {
-            this.blockHeight = history.state.data.blockHeight;
-          }
-          if (history.state.data && history.state.data.block) {
-            this.blockHeight = history.state.data.block.height;
-            return of(history.state.data.block);
-          }
-
-          let isBlockHeight = false;
-          if (/^[0-9]+$/.test(blockHash)) {
-            isBlockHeight = true;
-          } else {
-            this.blockHash = blockHash;
-          }
-
-          if (isBlockHeight) {
-            return this.electrsApiService.getBlockHashFromHeight$(parseInt(blockHash, 10))
-              .pipe(
-                switchMap((hash) => {
-                  if (!hash) {
-                    return;
-                  }
-                  this.blockHash = hash;
-                  this.location.replaceState(
-                    this.router.createUrlTree(['/bisq/block/', hash]).toString()
-                  );
-                  return this.bisqApiService.getBlock$(this.blockHash)
-                    .pipe(catchError(this.caughtHttpError.bind(this)));
-                }),
-                catchError(this.caughtHttpError.bind(this))
-              );
-          }
-
-          return this.bisqApiService.getBlock$(this.blockHash)
-            .pipe(catchError(this.caughtHttpError.bind(this)));
-        })
-      )
-      .subscribe((block: BisqBlock) => {
-        if (!block) {
-          return;
-        }
-        this.isLoading = false;
-        this.blockHeight = block.height;
-        this.seoService.setTitle('Block: #' + block.height + ': ' + block.hash, true);
-        this.block = block;
-      });
-  }
-
-  ngOnDestroy() {
-    this.subscription.unsubscribe();
-  }
-
-  caughtHttpError(err: HttpErrorResponse){
-    this.error = err;
-    return of(null);
-  }
-}

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

@@ -1,36 +0,0 @@
-<div class="container-xl">
-  <h1 style="float: left;">Blocks</h1>
-  <br>
-
-  <div class="clearfix"></div>
-
-  <div class="table-responsive-sm">
-    <table class="table table-borderless table-striped">
-      <thead>
-        <th style="width: 25%;">Height</th>
-        <th style="width: 25%;">Confirmed</th>
-        <th style="width: 25%;">Total Sent</th>
-        <th class="d-none d-md-block" style="width: 25%;">Transactions</th>
-      </thead>
-      <tbody *ngIf="!isLoading; else loadingTmpl">
-        <tr *ngFor="let block of blocks; trackBy: trackByFn">
-          <td><a [routerLink]="['/block/' | relativeUrl, block.hash]" [state]="{ data: { block: block } }">{{ block.height }}</a></td>
-          <td><app-time-since [time]="block.time / 1000" [fastRender]="true"></app-time-since> ago</td>
-          <td>{{ calculateTotalOutput(block) / 100 | number: '1.2-2' }}<span class="d-none d-md-inline"> BSQ</span></td>
-          <td class="d-none d-md-block">{{ block.txs.length }}</td>
-        </tr> 
-      </tbody>
-    </table>
-  </div>
-
-  <br>
-
-  <ngb-pagination [size]="paginationSize" [collectionSize]="totalCount" [rotate]="true" [pageSize]="itemsPerPage" [(page)]="page" (pageChange)="pageChange(page)" [maxSize]="paginationMaxSize" [boundaryLinks]="true"></ngb-pagination>
-
-</div>
-
-<ng-template #loadingTmpl>
-  <tr *ngFor="let i of loadingItems">
-    <td *ngFor="let j of [1, 2, 3, 4, 5]"><span class="skeleton-loader"></span></td>
-  </tr>
-</ng-template>

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

@@ -1,71 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { BisqApiService } from '../bisq-api.service';
-import { switchMap, tap } from 'rxjs/operators';
-import { Subject } from 'rxjs';
-import { BisqBlock, BisqOutput, BisqTransaction } from '../bisq.interfaces';
-import { SeoService } from 'src/app/services/seo.service';
-
-@Component({
-  selector: 'app-bisq-blocks',
-  templateUrl: './bisq-blocks.component.html',
-  styleUrls: ['./bisq-blocks.component.scss']
-})
-export class BisqBlocksComponent implements OnInit {
-  blocks: BisqBlock[];
-  totalCount: number;
-  page = 1;
-  itemsPerPage: number;
-  contentSpace = window.innerHeight - (165 + 75);
-  fiveItemsPxSize = 250;
-  loadingItems: number[];
-  isLoading = true;
-  // @ts-ignore
-  paginationSize: 'sm' | 'lg' = 'md';
-  paginationMaxSize = 10;
-
-  pageSubject$ = new Subject<number>();
-
-  constructor(
-    private bisqApiService: BisqApiService,
-    private seoService: SeoService,
-  ) { }
-
-  ngOnInit(): void {
-    this.seoService.setTitle('Blocks', true);
-    this.itemsPerPage = Math.max(Math.round(this.contentSpace / this.fiveItemsPxSize) * 5, 10);
-    this.loadingItems = Array(this.itemsPerPage);
-    if (document.body.clientWidth < 768) {
-      this.paginationSize = 'sm';
-      this.paginationMaxSize = 3;
-    }
-
-    this.pageSubject$
-      .pipe(
-        tap(() => this.isLoading = true),
-        switchMap((page) => this.bisqApiService.listBlocks$((page - 1) * this.itemsPerPage, this.itemsPerPage))
-      )
-      .subscribe((response) => {
-        this.isLoading = false;
-        this.blocks = response.body;
-        this.totalCount = parseInt(response.headers.get('x-total-count'), 10);
-      }, (error) => {
-        console.log(error);
-      });
-
-    this.pageSubject$.next(1);
-  }
-
-  calculateTotalOutput(block: BisqBlock): number {
-    return block.txs.reduce((a: number, tx: BisqTransaction) =>
-      a + tx.outputs.reduce((acc: number, output: BisqOutput) => acc + output.bsqAmount, 0), 0
-    );
-  }
-
-  trackByFn(index: number) {
-    return index;
-  }
-
-  pageChange(page: number) {
-    this.pageSubject$.next(page);
-  }
-}

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

@@ -1 +0,0 @@
-<router-outlet></router-outlet>

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

@@ -1,18 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { WebsocketService } from 'src/app/services/websocket.service';
-
-@Component({
-  selector: 'app-bisq-explorer',
-  templateUrl: './bisq-explorer.component.html',
-  styleUrls: ['./bisq-explorer.component.scss']
-})
-export class BisqExplorerComponent implements OnInit {
-
-  constructor(
-    private websocketService: WebsocketService,
-  ) { }
-
-  ngOnInit(): void {
-    this.websocketService.want(['blocks']);
-  }
-}

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

@@ -1 +0,0 @@
-<fa-icon [icon]="iconProp" [fixedWidth]="true" [ngStyle]="{ 'color': '#' + color }"></fa-icon>

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

@@ -1,81 +0,0 @@
-import { Component, ChangeDetectionStrategy, Input, OnChanges } from '@angular/core';
-import { IconPrefix, IconName } from '@fortawesome/fontawesome-common-types';
-
-@Component({
-  selector: 'app-bisq-icon',
-  templateUrl: './bisq-icon.component.html',
-  styleUrls: ['./bisq-icon.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush,
-})
-export class BisqIconComponent implements OnChanges {
-  @Input() txType: string;
-
-  iconProp: [IconPrefix, IconName] = ['fas', 'leaf'];
-  color: string;
-
-  constructor() { }
-
-  ngOnChanges() {
-    switch (this.txType) {
-      case 'UNVERIFIED':
-        this.iconProp[1] = 'question';
-        this.color = 'ffac00';
-        break;
-      case 'INVALID':
-        this.iconProp[1] = 'exclamation-triangle';
-        this.color = 'ff4500';
-        break;
-      case 'GENESIS':
-        this.iconProp[1] = 'rocket';
-        this.color = '25B135';
-        break;
-      case 'TRANSFER_BSQ':
-        this.iconProp[1] = 'retweet';
-        this.color = 'a3a3a3';
-        break;
-      case 'PAY_TRADE_FEE':
-        this.iconProp[1] = 'leaf';
-        this.color = '689f43';
-        break;
-      case 'PROPOSAL':
-        this.iconProp[1] = 'file-alt';
-        this.color = '6c8b3b';
-        break;
-      case 'COMPENSATION_REQUEST':
-        this.iconProp[1] = 'money-bill';
-        this.color = '689f43';
-        break;
-      case 'REIMBURSEMENT_REQUEST':
-        this.iconProp[1] = 'money-bill';
-        this.color = '04a908';
-        break;
-      case 'BLIND_VOTE':
-        this.iconProp[1] = 'eye-slash';
-        this.color = '07579a';
-        break;
-      case 'VOTE_REVEAL':
-        this.iconProp[1] = 'eye';
-        this.color = '4AC5FF';
-        break;
-      case 'LOCKUP':
-        this.iconProp[1] = 'lock';
-        this.color = '0056c4';
-        break;
-      case 'UNLOCK':
-        this.iconProp[1] = 'lock-open';
-        this.color = '1d965f';
-        break;
-      case 'ASSET_LISTING_FEE':
-        this.iconProp[1] = 'file-alt';
-        this.color = '6c8b3b';
-        break;
-      case 'PROOF_OF_BURN':
-        this.iconProp[1] = 'file-alt';
-        this.color = '6c8b3b';
-        break;
-      default:
-        this.iconProp[1] = 'question';
-        this.color = 'ffac00';
-    }
-  }
-}

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

@@ -1,90 +0,0 @@
-<div class="container-xl">
-  <h1 style="float: left;">BSQ Statistics</h1>
-  <br>
-
-  <div class="clearfix"></div>
-
-  <div class="row">
-    <div class="col-sm">
-      <table class="table table-borderless table-striped">
-        <thead>
-          <th>Property</th>
-          <th>Value</th>
-        </thead>
-        <tbody *ngIf="!isLoading; else loadingTemplate">
-          <tr>
-            <td class="td-width">Existing amount</td>
-            <td>{{ (stats.minted - stats.burnt) / 100 | number: '1.2-2' }} BSQ</td>
-          </tr>
-          <tr>
-            <td>Minted amount</td>
-            <td>{{ stats.minted | number: '1.2-2' }} BSQ</td>
-          </tr>
-          <tr>
-            <td>Burnt amount</td>
-            <td>{{ stats.burnt | number: '1.2-2' }} BSQ</td>
-          </tr>
-          <tr>
-            <td>Addresses</td>
-            <td>{{ stats.addresses | number }}</td>
-          </tr>
-          <tr>
-            <td>Unspent TXOs</td>
-            <td>{{ stats.unspent_txos | number }}</td>
-          </tr>
-          <tr>
-            <td>Spent TXOs</td>
-            <td>{{ stats.spent_txos | number }}</td>
-          </tr>
-          <tr>
-            <td>Price</td>
-            <td><app-fiat [value]="price"></app-fiat></td>
-          </tr>
-          <tr>
-            <td>Market cap</td>
-            <td><app-fiat [value]="price * (stats.minted - stats.burnt) / 100"></app-fiat></td>
-          </tr>
-        </tbody>
-      </table>
-
-    </div>
-    <div class="col-sm"></div>
-  </div>
-</div>
-
-<ng-template #loadingTemplate>
-  <tbody>
-    <tr>
-      <td class="td-width">Existing amount</td>
-      <td><span class="skeleton-loader"></span></td>
-    </tr>
-    <tr>
-      <td>Minted amount</td>
-      <td><span class="skeleton-loader"></span></td>
-    </tr>
-    <tr>
-      <td>Burnt amount</td>
-      <td><span class="skeleton-loader"></span></td>
-    </tr>
-    <tr>
-      <td>Addresses</td>
-      <td><span class="skeleton-loader"></span></td>
-    </tr>
-    <tr>
-      <td>Unspent TXOs</td>
-      <td><span class="skeleton-loader"></span></td>
-    </tr>
-    <tr>
-      <td>Spent TXOs</td>
-      <td><span class="skeleton-loader"></span></td>
-    </tr>
-    <tr>
-      <td>Price</td>
-      <td><span class="skeleton-loader"></span></td>
-    </tr>
-    <tr>
-      <td>Market cap</td>
-      <td><span class="skeleton-loader"></span></td>
-    </tr>
-  </tbody>
-</ng-template>

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

@@ -1,9 +0,0 @@
-.td-width {
-  width: 250px;
-}
-
-@media (max-width: 767.98px) {
-	.td-width {
-		width: 175px;
-	}
-}

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

@@ -1,38 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { BisqApiService } from '../bisq-api.service';
-import { BisqStats } from '../bisq.interfaces';
-import { SeoService } from 'src/app/services/seo.service';
-import { StateService } from 'src/app/services/state.service';
-
-@Component({
-  selector: 'app-bisq-stats',
-  templateUrl: './bisq-stats.component.html',
-  styleUrls: ['./bisq-stats.component.scss']
-})
-export class BisqStatsComponent implements OnInit {
-  isLoading = true;
-  stats: BisqStats;
-  price: number;
-
-  constructor(
-    private bisqApiService: BisqApiService,
-    private seoService: SeoService,
-    private stateService: StateService,
-  ) { }
-
-  ngOnInit() {
-    this.seoService.setTitle('BSQ Statistics', false);
-
-    this.stateService.bsqPrice$
-      .subscribe((bsqPrice) => {
-        this.price = bsqPrice;
-      });
-
-    this.bisqApiService.getStats$()
-      .subscribe((stats) => {
-        this.isLoading = false;
-        this.stats = stats;
-      });
-  }
-
-}

frontend/src/app/bisq/bisq-transaction-details/bisq-transaction-details.component.html

@@ -1,36 +0,0 @@
-<div class="box">
-  <div class="row">
-    <div class="col-sm">
-      <table class="table table-borderless table-striped">
-        <tbody>
-          <tr>
-            <td class="td-width">Inputs</td>
-            <td>{{ totalInput / 100 | number: '1.2-2' }} BSQ</td>
-          </tr>
-          <tr>
-            <td>Outputs</td>
-            <td>{{ totalOutput / 100 | number: '1.2-2' }} BSQ</td>
-          </tr>
-          <tr>
-            <td>Issuance</td>
-            <td>{{ totalIssued / 100 | number: '1.2-2' }} BSQ</td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-    <div class="col-sm">
-      <table class="table table-borderless table-striped">
-        <tbody class="mobile-even">
-          <tr>
-            <td class="td-width">Type</td>
-            <td><app-bisq-icon class="mr-1" [txType]="tx.txType"></app-bisq-icon> {{ tx.txTypeDisplayString }}</td>
-          </tr>
-          <tr>
-            <td>Version</td>
-            <td>{{ tx.txVersion }}</td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-  </div>
-</div>

frontend/src/app/bisq/bisq-transaction-details/bisq-transaction-details.component.scss

@@ -1,11 +0,0 @@
-@media (max-width: 767.98px) {
-	.td-width {
-		width: 150px;
-	}
-	.mobile-even tr:nth-of-type(even) {
-		background-color: #181b2d;
-	}
-	.mobile-even tr:nth-of-type(odd) {
-		background-color: inherit;
-	}
-}

frontend/src/app/bisq/bisq-transaction-details/bisq-transaction-details.component.ts

@@ -1,26 +0,0 @@
-import { Component, ChangeDetectionStrategy, Input, OnChanges } from '@angular/core';
-import { BisqTransaction } from 'src/app/bisq/bisq.interfaces';
-
-@Component({
-  selector: 'app-bisq-transaction-details',
-  templateUrl: './bisq-transaction-details.component.html',
-  styleUrls: ['./bisq-transaction-details.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush,
-})
-export class BisqTransactionDetailsComponent implements OnChanges {
-  @Input() tx: BisqTransaction;
-
-  totalInput: number;
-  totalOutput: number;
-  totalIssued: number;
-
-  constructor() { }
-
-  ngOnChanges() {
-    this.totalInput = this.tx.inputs.filter((input) => input.isVerified).reduce((acc, input) => acc + input.bsqAmount, 0);
-    this.totalOutput = this.tx.outputs.filter((output) => output.isVerified).reduce((acc, output) => acc + output.bsqAmount, 0);
-    this.totalIssued = this.tx.outputs
-      .filter((output) => output.isVerified && output.txOutputType === 'ISSUANCE_CANDIDATE_OUTPUT')
-      .reduce((acc, output) => acc + output.bsqAmount, 0);
-  }
-}

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

@@ -1,164 +0,0 @@
-<div class="container-xl">
-
-  <h1 class="float-left mr-3 mb-md-3">Transaction</h1>
-
-  <ng-template [ngIf]="!isLoading && !error">
-
-    <button *ngIf="(latestBlock$ | async) as latestBlock" type="button" class="btn btn-sm btn-success float-right mr-2 mt-1 mt-md-3">{{ latestBlock.height - bisqTx.blockHeight + 1 }} confirmation<ng-container *ngIf="latestBlock.height - bisqTx.blockHeight + 1 > 1">s</ng-container></button>
-
-    <div>
-      <a [routerLink]="['/bisq-tx' | relativeUrl, bisqTx.id]" style="line-height: 56px;">
-        <span class="d-inline d-lg-none">{{ bisqTx.id | shortenString : 24 }}</span>
-        <span class="d-none d-lg-inline">{{ bisqTx.id }}</span>
-      </a>
-      <app-clipboard [text]="bisqTx.id"></app-clipboard>
-    </div>
-    <div class="clearfix"></div>
-
-    <div class="box">
-      <div class="row">
-        <div class="col-sm">
-          <table class="table table-borderless table-striped">
-            <tbody>
-              <tr>
-                <td class="td-width">Included in block</td>
-                <td>
-                  <a [routerLink]="['/block/' | relativeUrl, bisqTx.blockHash]" [state]="{ data: { blockHeight: bisqTx.blockHeight } }">{{ bisqTx.blockHeight }}</a>
-                  <i> (<app-time-since [time]="bisqTx.time / 1000" [fastRender]="true"></app-time-since> ago)</i>
-                </td>
-              </tr>
-              <tr>
-                <td class="td-width">Features</td>
-                <td>
-                  <app-tx-features *ngIf="tx; else loadingTx" [tx]="tx"></app-tx-features>
-                  <ng-template #loadingTx>
-                    <span class="skeleton-loader"></span>
-                  </ng-template>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-        <div class="col-sm">
-          <table class="table table-borderless table-striped">
-            <tbody>
-              <tr>
-                <td class="td-width">Burnt</td>
-                <td>
-                  {{ bisqTx.burntFee / 100 | number: '1.2-2' }} BSQ (<app-bsq-amount [bsq]="bisqTx.burntFee" [forceFiat]="true" [green]="true"></app-bsq-amount>)
-              </tr>
-              <tr>
-                <td>Fee per vByte</td>
-                <td *ngIf="!isLoadingTx; else loadingTxFee">
-                  {{ tx.fee / (tx.weight / 4) | number : '1.1-1' }} sat/vB
-                  &nbsp;
-                  <app-tx-fee-rating [tx]="tx"></app-tx-fee-rating>
-                </td>
-                <ng-template #loadingTxFee>
-                  <td><span class="skeleton-loader"></span></td>
-                </ng-template>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-
-      </div>
-    </div>
-
-    <br>
-
-    <h2>Details</h2>
-
-
-    <app-bisq-transaction-details [tx]="bisqTx"></app-bisq-transaction-details>
-
-    <br>
-
-    <h2>Inputs & Outputs</h2>
-
-    <app-bisq-transfers [tx]="bisqTx"></app-bisq-transfers>
-
-    <br>
-
-  </ng-template>
-
-  <ng-template [ngIf="isLoading && !error">
-
-    <div class="clearfix"></div>
-
-    <div class="box">
-      <div class="row">
-        <div class="col-sm">
-          <table class="table table-borderless table-striped">
-            <tbody>
-              <tr>
-                <td class="td-width"><span class="skeleton-loader"></span></td>
-                <td><span class="skeleton-loader"></span></td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-        <div class="col-sm">
-          <table class="table table-borderless table-striped">
-            <tbody>
-              <tr>
-                <td class="td-width"><span class="skeleton-loader"></span></td>
-                <td><span class="skeleton-loader"></span></td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      </div>
-    </div>
-
-    <br>
-
-    <h2>Details</h2>
-    <div class="box">
-      <table class="table table-borderless table-striped">
-        <tbody>
-          <tr>
-            <td><span class="skeleton-loader"></span></td>
-            <td><span class="skeleton-loader"></span></td>
-          </tr>
-          <tr>
-            <td><span class="skeleton-loader"></span></td>
-            <td><span class="skeleton-loader"></span></td>
-          </tr>
-          <tr>
-            <td><span class="skeleton-loader"></span></td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-
-    <br>
-
-    <h2>Inputs & Outputs</h2>
-
-    <div class="box">
-      <div class="row">
-        <table class="table table-borderless table-striped">
-          <tbody>
-            <tr>
-              <td><span class="skeleton-loader"></span></td>
-              <td><span class="skeleton-loader"></span></td>
-            </tr>
-          </tbody>
-        </table>
-      </div>
-    </div>
-
-  </ng-template>
-
-  <ng-template [ngIf]="error">
-    <div class="clearfix"></div>
-
-    <div class="text-center">
-      Error loading transaction
-      <br><br>
-      <i>{{ error.status }}: {{ error.statusText }}</i>
-    </div>
-  </ng-template>
-
-</div>

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

@@ -1,9 +0,0 @@
-.td-width {
-  width: 175px;
-}
-
-@media (max-width: 767.98px) {
-	.td-width {
-		width: 150px;
-	}
-}

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

@@ -1,118 +0,0 @@
-import { Component, OnInit, OnDestroy } from '@angular/core';
-import { ActivatedRoute, ParamMap, Router } from '@angular/router';
-import { BisqTransaction } from 'src/app/bisq/bisq.interfaces';
-import { switchMap, map, catchError } from 'rxjs/operators';
-import { of, Observable, Subscription } from 'rxjs';
-import { StateService } from 'src/app/services/state.service';
-import { Block, Transaction } from 'src/app/interfaces/electrs.interface';
-import { BisqApiService } from '../bisq-api.service';
-import { SeoService } from 'src/app/services/seo.service';
-import { ElectrsApiService } from 'src/app/services/electrs-api.service';
-import { HttpErrorResponse } from '@angular/common/http';
-
-@Component({
-  selector: 'app-bisq-transaction',
-  templateUrl: './bisq-transaction.component.html',
-  styleUrls: ['./bisq-transaction.component.scss']
-})
-export class BisqTransactionComponent implements OnInit, OnDestroy {
-  bisqTx: BisqTransaction;
-  tx: Transaction;
-  latestBlock$: Observable<Block>;
-  txId: string;
-  price: number;
-  isLoading = true;
-  isLoadingTx = true;
-  error = null;
-  subscription: Subscription;
-
-  constructor(
-    private route: ActivatedRoute,
-    private bisqApiService: BisqApiService,
-    private electrsApiService: ElectrsApiService,
-    private stateService: StateService,
-    private seoService: SeoService,
-    private router: Router,
-  ) { }
-
-  ngOnInit(): void {
-    this.subscription = this.route.paramMap.pipe(
-      switchMap((params: ParamMap) => {
-        this.isLoading = true;
-        this.isLoadingTx = true;
-        this.error = null;
-        document.body.scrollTo(0, 0);
-        this.txId = params.get('id') || '';
-        this.seoService.setTitle('Transaction: ' + this.txId, true);
-        if (history.state.data) {
-          return of(history.state.data);
-        }
-        return this.bisqApiService.getTransaction$(this.txId)
-          .pipe(
-            catchError((bisqTxError: HttpErrorResponse) => {
-              if (bisqTxError.status === 404) {
-                return this.electrsApiService.getTransaction$(this.txId)
-                  .pipe(
-                    map((tx) => {
-                      if (tx.status.confirmed) {
-                        this.error = {
-                          status: 200,
-                          statusText: 'Transaction is confirmed but not available in the Bisq database, please try reloading this page.'
-                        };
-                        return null;
-                      }
-                      return tx;
-                    }),
-                    catchError((txError: HttpErrorResponse) => {
-                      console.log(txError);
-                      this.error = txError;
-                      return of(null);
-                    })
-                  );
-              }
-              this.error = bisqTxError;
-              return of(null);
-            })
-          );
-      }),
-      switchMap((tx) => {
-        if (!tx) {
-          return of(null);
-        }
-
-        if (tx.version) {
-          this.router.navigate(['/tx/', this.txId], { state: { data: tx, bsqTx: true }});
-          return of(null);
-        }
-
-        this.bisqTx = tx;
-        this.isLoading = false;
-
-        return this.electrsApiService.getTransaction$(this.txId);
-      }),
-    )
-    .subscribe((tx) => {
-      this.isLoadingTx = false;
-
-      if (!tx) {
-        return;
-      }
-
-      this.tx = tx;
-    },
-    (error) => {
-      this.error = error;
-    });
-
-    this.latestBlock$ = this.stateService.blocks$.pipe(map((([block]) => block)));
-
-    this.stateService.bsqPrice$
-      .subscribe((bsqPrice) => {
-        this.price = bsqPrice;
-      });
-  }
-
-  ngOnDestroy() {
-    this.subscription.unsubscribe();
-  }
-}

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

@@ -1,103 +0,0 @@
-<div class="container-xl">
-  <h1 style="float: left;">Transactions</h1>
-
-  <div ngbDropdown class="d-block float-right">
-    <button class="btn btn-primary" id="dropdownForm1" ngbDropdownToggle>Filter</button>
-    <div ngbDropdownMenu aria-labelledby="dropdownForm1">
-      <form [formGroup]="radioGroupForm">
-        <label>
-          <input type="checkbox" formControlName="ASSET_LISTING_FEE"> Asset listing fee
-        </label>
-        <br>
-        <label>
-          <input type="checkbox" formControlName="BLIND_VOTE"> Blind vote
-        </label>
-        <br>
-        <label>
-          <input type="checkbox" formControlName="COMPENSATION_REQUEST"> Compensation request
-        </label>
-        <br>
-        <label>
-          <input type="checkbox" formControlName="GENESIS"> Genesis
-        </label>
-        <br>
-        <label>
-          <input type="checkbox" formControlName="LOCKUP"> Lockup
-        </label>
-        <br>
-        <label>
-          <input type="checkbox" formControlName="PAY_TRADE_FEE"> Pay trade fee
-        </label>
-        <br>
-        <label>
-          <input type="checkbox" formControlName="PROOF_OF_BURN"> Proof of burn
-        </label>
-        <br>
-        <label>
-          <input type="checkbox" formControlName="PROPOSAL"> Proposal
-        </label>
-        <br>
-        <label>
-          <input type="checkbox" formControlName="REIMBURSEMENT_REQUEST"> Reimbursement request
-        </label>
-        <br>
-        <label>
-          <input type="checkbox" formControlName="TRANSFER_BSQ"> Transfer BSQ
-        </label>
-        <br>
-        <label>
-          <input type="checkbox" formControlName="UNLOCK"> Unlock
-        </label>
-        <br>
-        <label>
-          <input type="checkbox" formControlName="VOTE_REVEAL"> Vote reveal
-        </label>
-      </form>
-    </div>
-  </div>
-
-  <br>
-
-  <div class="clearfix"></div>
-
-  <table class="table table-borderless table-striped">
-    <thead>
-      <th style="width: 20%;">Transaction</th>
-      <th class="d-none d-md-block" style="width: 20%;">Type</th>
-      <th style="width: 20%;">Amount</th>
-      <th style="width: 20%;">Confirmed</th>
-      <th class="d-none d-md-block" style="width: 20%;">Height</th>
-    </thead>
-    <tbody *ngIf="!isLoading; else loadingTmpl">
-      <tr *ngFor="let tx of transactions; trackBy: trackByFn">
-        <td><a [routerLink]="['/tx/' | relativeUrl, tx.id]" [state]="{ data: tx }">{{ tx.id | slice : 0 : 8 }}</a></td>
-        <td class="d-none d-md-block">
-          <app-bisq-icon class="mr-1" [txType]="tx.txType"></app-bisq-icon>
-          <span class="d-none d-md-inline"> {{ tx.txTypeDisplayString }}</span>
-        </td>
-        <td>
-          <app-bisq-icon class="d-inline d-md-none mr-1" [txType]="tx.txType"></app-bisq-icon>
-          <ng-template [ngIf]="tx.txType === 'PAY_TRADE_FEE'" [ngIfElse]="defaultTxType">
-            {{ tx.burntFee / 100 | number: '1.2-2' }}<span class="d-none d-md-inline"> BSQ</span>
-          </ng-template>
-          <ng-template #defaultTxType>
-            {{ calculateTotalOutput(tx.outputs) / 100 | number: '1.2-2' }}<span class="d-none d-md-inline"> BSQ</span>
-          </ng-template>
-        </td>
-        <td><app-time-since [time]="tx.time / 1000" [fastRender]="true"></app-time-since> ago</td>
-        <td class="d-none d-md-block"><a [routerLink]="['/block/' | relativeUrl, tx.blockHash]" [state]="{ data: { blockHeight: tx.blockHeight } }">{{ tx.blockHeight }}</a></td>
-      </tr> 
-    </tbody>
-  </table>
-
-  <br>
-
-  <ngb-pagination [size]="paginationSize" [collectionSize]="totalCount" [rotate]="true" [pageSize]="itemsPerPage" [(page)]="page" (pageChange)="pageChange(page)" [maxSize]="paginationMaxSize" [boundaryLinks]="true"></ngb-pagination>
-
-</div>
-
-<ng-template #loadingTmpl>
-  <tr *ngFor="let i of loadingItems">
-    <td *ngFor="let j of [1, 2, 3, 4, 5]"><span class="skeleton-loader"></span></td>
-  </tr>
-</ng-template>

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

@@ -1,4 +0,0 @@
-label {
-  padding: 0.25rem 1rem;
-  white-space: nowrap;
-}

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

@@ -1,107 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { BisqTransaction, BisqOutput } from '../bisq.interfaces';
-import { Subject, merge } from 'rxjs';
-import { switchMap, tap, map } from 'rxjs/operators';
-import { BisqApiService } from '../bisq-api.service';
-import { SeoService } from 'src/app/services/seo.service';
-import { FormGroup, FormBuilder } from '@angular/forms';
-
-@Component({
-  selector: 'app-bisq-transactions',
-  templateUrl: './bisq-transactions.component.html',
-  styleUrls: ['./bisq-transactions.component.scss']
-})
-export class BisqTransactionsComponent implements OnInit {
-  transactions: BisqTransaction[];
-  totalCount: number;
-  page = 1;
-  itemsPerPage: number;
-  contentSpace = window.innerHeight - (165 + 75);
-  fiveItemsPxSize = 250;
-  isLoading = true;
-  loadingItems: number[];
-  pageSubject$ = new Subject<number>();
-  radioGroupForm: FormGroup;
-  types: string[] = [];
-
-  // @ts-ignore
-  paginationSize: 'sm' | 'lg' = 'md';
-  paginationMaxSize = 10;
-
-  constructor(
-    private bisqApiService: BisqApiService,
-    private seoService: SeoService,
-    private formBuilder: FormBuilder,
-  ) { }
-
-  ngOnInit(): void {
-    this.seoService.setTitle('Transactions', true);
-
-    this.radioGroupForm = this.formBuilder.group({
-      UNVERIFIED: false,
-      INVALID: false,
-      GENESIS: false,
-      TRANSFER_BSQ: false,
-      PAY_TRADE_FEE: false,
-      PROPOSAL: false,
-      COMPENSATION_REQUEST: false,
-      REIMBURSEMENT_REQUEST: false,
-      BLIND_VOTE: false,
-      VOTE_REVEAL: false,
-      LOCKUP: false,
-      UNLOCK: false,
-      ASSET_LISTING_FEE: false,
-      PROOF_OF_BURN: false,
-    });
-
-    this.itemsPerPage = Math.max(Math.round(this.contentSpace / this.fiveItemsPxSize) * 5, 10);
-    this.loadingItems = Array(this.itemsPerPage);
-
-    if (document.body.clientWidth < 768) {
-      this.paginationSize = 'sm';
-      this.paginationMaxSize = 3;
-    }
-
-    merge(
-      this.pageSubject$,
-      this.radioGroupForm.valueChanges
-        .pipe(
-          map((data) => {
-            const types: string[] = [];
-            for (const i in data) {
-              if (data[i]) {
-                types.push(i);
-              }
-            }
-            this.types = types;
-            return 1;
-          })
-        )
-      )
-      .pipe(
-        tap(() => this.isLoading = true),
-        switchMap((page) => this.bisqApiService.listTransactions$((page - 1) * this.itemsPerPage, this.itemsPerPage, this.types))
-      )
-      .subscribe((response) => {
-        this.isLoading = false;
-        this.transactions = response.body;
-        this.totalCount = parseInt(response.headers.get('x-total-count'), 10);
-      }, (error) => {
-        console.log(error);
-      });
-
-    this.pageSubject$.next(1);
-  }
-
-  pageChange(page: number) {
-    this.pageSubject$.next(page);
-  }
-
-  calculateTotalOutput(outputs: BisqOutput[]): number {
-    return outputs.reduce((acc: number, output: BisqOutput) => acc + output.bsqAmount, 0);
-  }
-
-  trackByFn(index: number) {
-    return index;
-  }
-}

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

@@ -1,77 +0,0 @@
-<div class="header-bg box">
-  <div class="row">
-    <div class="col">
-      <table class="table table-borderless smaller-text table-xs" style="margin: 0;">
-        <tbody>
-          <ng-template ngFor let-input [ngForOf]="tx.inputs" [ngForTrackBy]="trackByIndexFn">
-            <tr *ngIf="input.isVerified">
-              <td class="arrow-td">
-                <ng-template [ngIf]="input.spendingTxId === null" [ngIfElse]="hasPreoutput">
-                  <i class="arrow grey"></i>
-                </ng-template>
-                <ng-template #hasPreoutput>
-                  <a [routerLink]="['/tx/' | relativeUrl, input.spendingTxId]">
-                    <i class="arrow red"></i>
-                  </a>
-                </ng-template>
-              </td>
-              <td>
-                <a [routerLink]="['/address/' | relativeUrl, 'B' + input.address]" title="B{{ input.address }}">
-                  <span class="d-block d-lg-none">B{{ input.address | shortenString : 16 }}</span>
-                  <span class="d-none d-lg-block">B{{ input.address | shortenString : 35 }}</span>
-                </a>
-              </td>
-              <td class="text-right nowrap">
-                <app-bsq-amount [bsq]="input.bsqAmount"></app-bsq-amount>
-              </td>
-            </tr>
-          </ng-template>
-        </tbody>
-      </table>
-    </div>
-    <div class="w-100 d-block d-md-none"></div>
-    <div class="col mobile-bottomcol">
-      <table class="table table-borderless smaller-text table-xs"  style="margin: 0;">
-        <tbody>
-          <ng-template ngFor let-output [ngForOf]="tx.outputs" [ngForTrackBy]="trackByIndexFn">
-            <tr *ngIf="output.isVerified && output.opReturn === undefined">
-              <td>
-                <a [routerLink]="['/address/' | relativeUrl, 'B' + output.address]" title="B{{ output.address }}">
-                  <span class="d-block d-lg-none">B{{ output.address | shortenString : 16 }}</span>
-                  <span class="d-none d-lg-block">B{{ output.address | shortenString : 35 }}</span>
-                </a>
-              </td>
-              <td class="text-right nowrap">
-                <app-bsq-amount [bsq]="output.bsqAmount"></app-bsq-amount>
-              </td>
-              <td class="pl-1 arrow-td">
-                <i *ngIf="!output.spentInfo; else spent" class="arrow green"></i>
-                <ng-template #spent>
-                  <a [routerLink]="['/tx/' | relativeUrl, output.spentInfo.txId]"><i class="arrow red"></i></a>
-                </ng-template>
-              </td>
-            </tr>
-          </ng-template>
-        </tbody>
-      </table>
-    </div>
-  </div>
-
-  <div>
-    <div class="float-left mt-2-5" *ngIf="showConfirmations && tx.burntFee">
-      Burnt: {{ tx.burntFee / 100 | number: '1.2-2' }} BSQ (<app-bsq-amount [bsq]="tx.burntFee" [forceFiat]="true" [green]="true"></app-bsq-amount>)
-    </div>
-
-    <div class="float-right">
-      <span *ngIf="showConfirmations && latestBlock$ | async as latestBlock">
-        <button type="button" class="btn btn-sm btn-success mt-2">{{ latestBlock.height - tx.blockHeight + 1 }} confirmation<ng-container *ngIf="latestBlock.height - tx.blockHeight + 1 > 1">s</ng-container></button>
-        &nbsp;
-      </span>
-      <button type="button" class="btn btn-sm btn-primary mt-2" (click)="switchCurrency()">
-        <app-bsq-amount [bsq]="totalOutput"></app-bsq-amount>
-      </button>
-    </div>
-    <div class="clearfix"></div>
-  </div>
-
-</div>

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

@@ -1,84 +0,0 @@
-.arrow-td {
-	width: 22px;
-}
-
-.arrow {
-	display: inline-block!important;
-	position: relative;
-	width: 14px;
-	height: 22px;
-	box-sizing: content-box
-}
-
-.arrow:before {
-	position: absolute;
-	content: '';
-	margin: auto;
-	top: 0;
-	bottom: 0;
-	left: 0;
-	right: calc(-1*30px/3);
-	width: 0;
-  height: 0;
-	border-top: 6.66px solid transparent;
-  border-bottom: 6.66px solid transparent
-}
-
-.arrow:after {
-	position: absolute;
-	content: '';
-	margin: auto;
-	top: 0;
-	bottom: 0;
-	left: 0;
-	right: calc(30px/6);
-	width: calc(30px/3);
-	height: calc(20px/3);
-	background: rgba(0, 0, 0, 0);
-}
-
-.arrow.green:before {
-  border-left: 10px solid #28a745;
-}
-.arrow.green:after {
-  background-color:#28a745;
-}
-
-.arrow.red:before {
-  border-left: 10px solid #dc3545;
-}
-.arrow.red:after {
-  background-color:#dc3545;
-}
-
-.arrow.grey:before {
-  border-left: 10px solid #6c757d;
-}
-
-.arrow.grey:after {
-  background-color:#6c757d;
-}
-
-.scriptmessage {
-	max-width: 280px;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	vertical-align: middle;
-}
-
-.scriptmessage.longer {
-	max-width: 500px;
-}
-
-@media (max-width: 767.98px) {
-	.mobile-bottomcol {
-		margin-top: 15px;
-	}
-
-	.scriptmessage {
-		max-width: 90px !important;
-	}
-	.scriptmessage.longer {
-		max-width: 280px !important;
-	}
-}

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

@@ -1,42 +0,0 @@
-import { Component, OnInit, ChangeDetectionStrategy, Input, OnChanges } from '@angular/core';
-import { BisqTransaction } from 'src/app/bisq/bisq.interfaces';
-import { StateService } from 'src/app/services/state.service';
-import { map } from 'rxjs/operators';
-import { Observable } from 'rxjs';
-import { Block } from 'src/app/interfaces/electrs.interface';
-
-@Component({
-  selector: 'app-bisq-transfers',
-  templateUrl: './bisq-transfers.component.html',
-  styleUrls: ['./bisq-transfers.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush
-})
-export class BisqTransfersComponent implements OnInit, OnChanges {
-  @Input() tx: BisqTransaction;
-  @Input() showConfirmations = false;
-
-  totalOutput: number;
-  latestBlock$: Observable<Block>;
-
-  constructor(
-    private stateService: StateService,
-  ) { }
-
-  trackByIndexFn(index: number) {
-    return index;
-  }
-
-  ngOnInit() {
-    this.latestBlock$ = this.stateService.blocks$.pipe(map(([block]) => block));
-  }
-
-  ngOnChanges() {
-    this.totalOutput = this.tx.outputs.filter((output) => output.isVerified).reduce((acc, output) => acc + output.bsqAmount, 0);;
-  }
-
-  switchCurrency() {
-    const oldvalue = !this.stateService.viewFiat$.value;
-    this.stateService.viewFiat$.next(oldvalue);
-  }
-
-}

frontend/src/app/bisq/bisq.interfaces.ts

@@ -1,82 +0,0 @@
-
-export interface BisqBlocks {
-  chainHeight: number;
-  blocks: BisqBlock[];
-}
-
-export interface BisqBlock {
-  height: number;
-  time: number;
-  hash: string;
-  previousBlockHash: string;
-  txs: BisqTransaction[];
-}
-
-export interface BisqTransaction {
-  txVersion: string;
-  id: string;
-  blockHeight: number;
-  blockHash: string;
-  time: number;
-  inputs: BisqInput[];
-  outputs: BisqOutput[];
-  txType: string;
-  txTypeDisplayString: string;
-  burntFee: number;
-  invalidatedBsq: number;
-  unlockBlockHeight: number;
-}
-
-interface BisqInput {
-  spendingTxOutputIndex: number;
-  spendingTxId: string;
-  bsqAmount: number;
-  isVerified: boolean;
-  address: string;
-  time: number;
-}
-
-export interface BisqOutput {
-  txVersion: string;
-  txId: string;
-  index: number;
-  bsqAmount: number;
-  btcAmount: number;
-  height: number;
-  isVerified: boolean;
-  burntFee: number;
-  invalidatedBsq: number;
-  address: string;
-  scriptPubKey: BisqScriptPubKey;
-  spentInfo?: SpentInfo;
-  time: any;
-  txType: string;
-  txTypeDisplayString: string;
-  txOutputType: string;
-  txOutputTypeDisplayString: string;
-  lockTime: number;
-  isUnspent: boolean;
-  opReturn?: string;
-}
-
-export interface BisqStats {
-  minted: number;
-  burnt: number;
-  addresses: number;
-  unspent_txos: number;
-  spent_txos: number;
-}
-
-interface BisqScriptPubKey {
-  addresses: string[];
-  asm: string;
-  hex: string;
-  reqSigs: number;
-  type: string;
-}
-
-interface SpentInfo {
-  height: number;
-  inputIndex: number;
-  txId: string;
-}

frontend/src/app/bisq/bisq.module.ts

@@ -1,60 +0,0 @@
-import { NgModule } from '@angular/core';
-import { BisqRoutingModule } from './bisq.routing.module';
-import { SharedModule } from '../shared/shared.module';
-import { BisqTransactionsComponent } from './bisq-transactions/bisq-transactions.component';
-import { NgbPaginationModule } from '@ng-bootstrap/ng-bootstrap';
-import { BisqTransactionComponent } from './bisq-transaction/bisq-transaction.component';
-import { BisqBlockComponent } from './bisq-block/bisq-block.component';
-import { BisqIconComponent } from './bisq-icon/bisq-icon.component';
-import { BisqTransactionDetailsComponent } from './bisq-transaction-details/bisq-transaction-details.component';
-import { BisqTransfersComponent } from './bisq-transfers/bisq-transfers.component';
-import { FontAwesomeModule, FaIconLibrary } from '@fortawesome/angular-fontawesome';
-import { faLeaf, faQuestion, faExclamationTriangle, faRocket, faRetweet, faFileAlt, faMoneyBill,
-  faEye, faEyeSlash, faLock, faLockOpen } from '@fortawesome/free-solid-svg-icons';
-import { BisqBlocksComponent } from './bisq-blocks/bisq-blocks.component';
-import { BisqExplorerComponent } from './bisq-explorer/bisq-explorer.component';
-import { BisqApiService } from './bisq-api.service';
-import { BisqAddressComponent } from './bisq-address/bisq-address.component';
-import { BisqStatsComponent } from './bisq-stats/bisq-stats.component';
-import { BsqAmountComponent } from './bsq-amount/bsq-amount.component';
-
-@NgModule({
-  declarations: [
-    BisqTransactionsComponent,
-    BisqTransactionComponent,
-    BisqBlockComponent,
-    BisqTransactionComponent,
-    BisqIconComponent,
-    BisqTransactionDetailsComponent,
-    BisqTransfersComponent,
-    BisqBlocksComponent,
-    BisqExplorerComponent,
-    BisqAddressComponent,
-    BisqStatsComponent,
-    BsqAmountComponent,
-  ],
-  imports: [
-    BisqRoutingModule,
-    SharedModule,
-    NgbPaginationModule,
-    FontAwesomeModule,
-  ],
-  providers: [
-    BisqApiService,
-  ]
-})
-export class BisqModule {
-  constructor(library: FaIconLibrary) {
-    library.addIcons(faQuestion);
-    library.addIcons(faExclamationTriangle);
-    library.addIcons(faRocket);
-    library.addIcons(faRetweet);
-    library.addIcons(faLeaf);
-    library.addIcons(faFileAlt);
-    library.addIcons(faMoneyBill);
-    library.addIcons(faEye);
-    library.addIcons(faEyeSlash);
-    library.addIcons(faLock);
-    library.addIcons(faLockOpen);
-  }
-}

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

@@ -1,59 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
-import { AboutComponent } from '../components/about/about.component';
-import { AddressComponent } from '../components/address/address.component';
-import { BisqTransactionsComponent } from './bisq-transactions/bisq-transactions.component';
-import { BisqTransactionComponent } from './bisq-transaction/bisq-transaction.component';
-import { BisqBlockComponent } from './bisq-block/bisq-block.component';
-import { BisqBlocksComponent } from './bisq-blocks/bisq-blocks.component';
-import { BisqExplorerComponent } from './bisq-explorer/bisq-explorer.component';
-import { BisqAddressComponent } from './bisq-address/bisq-address.component';
-import { BisqStatsComponent } from './bisq-stats/bisq-stats.component';
-
-const routes: Routes = [
-  {
-    path: '',
-    component: BisqExplorerComponent,
-    children: [
-      {
-        path: '',
-        component: BisqTransactionsComponent
-      },
-      {
-        path: 'tx/:id',
-        component: BisqTransactionComponent
-      },
-      {
-        path: 'blocks',
-        children: [],
-        component: BisqBlocksComponent
-      },
-      {
-        path: 'block/:id',
-        component: BisqBlockComponent,
-      },
-      {
-        path: 'address/:id',
-        component: BisqAddressComponent,
-      },
-      {
-        path: 'stats',
-        component: BisqStatsComponent,
-      },
-      {
-        path: 'about',
-        component: AboutComponent,
-      },
-      {
-        path: '**',
-        redirectTo: ''
-      }
-    ]
-  }
-];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule]
-})
-export class BisqRoutingModule { }

frontend/src/app/bisq/bsq-amount/bsq-amount.component.html

@@ -1,6 +0,0 @@
-<ng-container *ngIf="(forceFiat || (viewFiat$ | async)) && (conversions$ | async) as conversions; else viewFiatVin">
-  <span [class.green-color]="green">{{ conversions.USD * bsq / 100 * (bsqPrice$ | async) / 100000000 | currency:'USD':'symbol':'1.2-2' }}</span>
-</ng-container>
-<ng-template #viewFiatVin>
-  {{ bsq / 100 | number : digitsInfo }} BSQ
-</ng-template>

frontend/src/app/bisq/bsq-amount/bsq-amount.component.scss

@@ -1,3 +0,0 @@
-.green-color {
-  color: #3bcc49;
-}

frontend/src/app/bisq/bsq-amount/bsq-amount.component.ts

@@ -1,30 +0,0 @@
-import { Component, OnInit, ChangeDetectionStrategy, Input } from '@angular/core';
-import { StateService } from 'src/app/services/state.service';
-import { Observable } from 'rxjs';
-
-@Component({
-  selector: 'app-bsq-amount',
-  templateUrl: './bsq-amount.component.html',
-  styleUrls: ['./bsq-amount.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush,
-})
-export class BsqAmountComponent implements OnInit {
-  conversions$: Observable<any>;
-  viewFiat$: Observable<boolean>;
-  bsqPrice$: Observable<number>;
-
-  @Input() bsq: number;
-  @Input() digitsInfo = '1.2-2';
-  @Input() forceFiat = false;
-  @Input() green = false;
-
-  constructor(
-    private stateService: StateService,
-  ) { }
-
-  ngOnInit() {
-    this.viewFiat$ = this.stateService.viewFiat$.asObservable();
-    this.conversions$ = this.stateService.conversions$.asObservable();
-    this.bsqPrice$ = this.stateService.bsqPrice$;
-  }
-}

frontend/src/app/bitcoin.utils.ts

@@ -1,68 +0,0 @@
-import { Transaction, Vin } from './interfaces/electrs.interface';
-
-const P2SH_P2WPKH_COST = 21 * 4; // the WU cost for the non-witness part of P2SH-P2WPKH
-const P2SH_P2WSH_COST  = 35 * 4; // the WU cost for the non-witness part of P2SH-P2WSH
-
-export function calcSegwitFeeGains(tx: Transaction) {
-  // calculated in weight units
-  let realizedGains = 0;
-  let potentialBech32Gains = 0;
-  let potentialP2shGains = 0;
-
-  for (const vin of tx.vin) {
-    if (!vin.prevout) { continue; }
-
-    const isP2pkh = vin.prevout.scriptpubkey_type === 'p2pkh';
-    const isP2sh  = vin.prevout.scriptpubkey_type === 'p2sh';
-    const isP2wsh = vin.prevout.scriptpubkey_type === 'v0_p2wsh';
-    const isP2wpkh = vin.prevout.scriptpubkey_type === 'v0_p2wpkh';
-
-    const op = vin.scriptsig ? vin.scriptsig_asm.split(' ')[0] : null;
-    const isP2sh2Wpkh = isP2sh && !!vin.witness && op === 'OP_PUSHBYTES_22';
-    const isP2sh2Wsh = isP2sh && !!vin.witness && op === 'OP_PUSHBYTES_34';
-
-    switch (true) {
-      // Native Segwit - P2WPKH/P2WSH (Bech32)
-      case isP2wpkh:
-      case isP2wsh:
-        // maximal gains: the scriptSig is moved entirely to the witness part
-        realizedGains += witnessSize(vin) * 3;
-        // XXX P2WSH output creation is more expensive, should we take this into consideration?
-        break;
-
-      // Backward compatible Segwit - P2SH-P2WPKH
-      case isP2sh2Wpkh:
-        // the scriptSig is moved to the witness, but we have extra 21 extra non-witness bytes (48 WU)
-        realizedGains += witnessSize(vin) * 3 - P2SH_P2WPKH_COST;
-        potentialBech32Gains += P2SH_P2WPKH_COST;
-        break;
-
-      // Backward compatible Segwit - P2SH-P2WSH
-      case isP2sh2Wsh:
-        // the scriptSig is moved to the witness, but we have extra 35 extra non-witness bytes
-        realizedGains += witnessSize(vin) * 3 - P2SH_P2WSH_COST;
-        potentialBech32Gains += P2SH_P2WSH_COST;
-        break;
-
-      // Non-segwit P2PKH/P2SH
-      case isP2pkh:
-      case isP2sh:
-        const fullGains = scriptSigSize(vin) * 3;
-        potentialBech32Gains += fullGains;
-        potentialP2shGains += fullGains - (isP2pkh ? P2SH_P2WPKH_COST : P2SH_P2WSH_COST);
-        break;
-
-    // TODO: should we also consider P2PK and pay-to-bare-script (non-p2sh-wrapped) as upgradable to P2WPKH and P2WSH?
-    }
-  }
-
-  // returned as percentage of the total tx weight
-  return { realizedGains: realizedGains / (tx.weight + realizedGains) // percent of the pre-segwit tx size
-         , potentialBech32Gains: potentialBech32Gains / tx.weight
-         , potentialP2shGains: potentialP2shGains / tx.weight
-         };
-}
-
-// Utilities for segwitFeeGains
-const witnessSize = (vin: Vin) => vin.witness.reduce((S, w) => S + (w.length / 2), 0);
-const scriptSigSize = (vin: Vin) => vin.scriptsig ? vin.scriptsig.length / 2 : 0;

frontend/src/app/blockchain-blocks/block-modal/block-modal.component.html

@@ -0,0 +1,37 @@
+<div class="modal-header">
+  <h4 class="modal-title">Fee distribution for block 
+    <a *ngIf="!isElectrsEnabled" href="https://mempool.space/block-height/{{ block.height }}" target="_blank">#{{ block.height }}</a>
+    <a *ngIf="isElectrsEnabled" (click)="activeModal.dismiss()" [routerLink]="['/explorer/block/', block.hash]">#{{ block.height }}</a>
+  </h4>
+  <button type="button" class="close" aria-label="Close" (click)="activeModal.dismiss('Cross click')">
+    <span aria-hidden="true">&times;</span>
+  </button>
+</div>
+<div class="modal-body">
+  <div>
+    <table class="table table-borderless table-sm">
+      <tr>
+        <th>Median fee:</th>
+        <td>~{{ block.medianFee | ceil }} sat/vB <span *ngIf="conversions">(~<span class="green-color">{{ conversions.USD * (block.medianFee/100000000)*250 | currency:'USD':'symbol':'1.2-2' }}</span>/tx)</span></td>
+        <th>Block size:</th>
+        <td>{{ block.size | bytes: 2 }}</td>
+      </tr>
+      <tr>
+        <th>Fee span:</th>
+        <td class="yellow-color">{{ block.minFee | ceil }} - {{ block.maxFee | ceil }} sat/vB</td>
+        <th>Tx count:</th>
+        <td>{{ block.nTx }} transactions</td>
+      </tr>
+      <tr>
+        <th>Total fees:</th>
+        <td>{{ (block.fees - blockSubsidy) | number: '1.2-2' }} BTC <span *ngIf="conversions">(<span class="green-color">{{ conversions.USD * (block.fees - blockSubsidy) | currency:'USD':'symbol':'1.0-0' }}</span>)</span></td>
+        <th>Block reward + fees:</th>
+        <td>{{ block.fees | number: '1.2-2' }} BTC <span *ngIf="conversions">(<span class="green-color">{{ conversions.USD * block.fees | currency:'USD':'symbol':'1.0-0' }}</span>)</span></td>
+      </tr>
+    </table>
+  </div>
+
+  <hr>
+
+  <app-fee-distribution-graph [blockHeight]="block.height"></app-fee-distribution-graph>
+</div>

frontend/src/app/blockchain-blocks/block-modal/block-modal.component.scss

@@ -0,0 +1 @@
+

frontend/src/app/blockchain-blocks/block-modal/block-modal.component.ts

@@ -0,0 +1,35 @@
+import { Component, OnInit, Input } from '@angular/core';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { IBlock } from '../../blockchain/interfaces';
+import { MemPoolService } from '../../services/mem-pool.service';
+import { environment } from '../../../environments/environment';
+
+@Component({
+  selector: 'app-block-modal',
+  templateUrl: './block-modal.component.html',
+  styleUrls: ['./block-modal.component.scss']
+})
+export class BlockModalComponent implements OnInit {
+  @Input() block: IBlock;
+  blockSubsidy = 50;
+  isElectrsEnabled = !!environment.electrs;
+  conversions: any;
+
+  constructor(
+    public activeModal: NgbActiveModal,
+    private memPoolService: MemPoolService,
+  ) { }
+
+  ngOnInit() {
+    this.memPoolService.conversions$
+      .subscribe((conversions) => {
+        this.conversions = conversions;
+      });
+
+    let halvenings = Math.floor(this.block.height / 210000);
+    while (halvenings > 0) {
+      this.blockSubsidy = this.blockSubsidy / 2;
+      halvenings--;
+    }
+  }
+}

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

@@ -0,0 +1,21 @@
+<div class="blocks-container" *ngIf="blocks.length">
+  <div *ngFor="let block of blocks; let i = index; trackBy: trackByBlocksFn" >
+    <div (click)="openBlockModal(block);" class="text-center bitcoin-block mined-block" id="bitcoin-block-{{ block.height }}" [ngStyle]="getStyleForBlock(block)">
+      <div class="block-height">
+        <a *ngIf="!isElectrsEnabled" href="https://mempool.space/block-height/{{ block.height }}" target="_blank">#{{ block.height }}</a>
+        <a *ngIf="isElectrsEnabled" [routerLink]="['/explorer/block/', block.hash]">#{{ block.height }}</a>
+      </div>
+      <div class="block-body">
+        <div class="fees">
+          ~{{ block.medianFee | ceil }} sat/vB
+          <br/>
+          <span class="yellow-color">{{ block.minFee | ceil }} - {{ block.maxFee | ceil }} sat/vB</span>
+        </div>
+        <div class="block-size">{{ block.size | bytes: 2 }}</div>
+        <div class="transaction-count">{{ block.nTx }} transactions</div>
+        <br /><br />
+        <div class="time-difference">{{ block.time | timeSince : trigger }} ago</div>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,96 @@
+.bitcoin-block {
+  width: 125px;
+  height: 125px;
+  cursor: pointer;
+}
+
+.mined-block {
+  position: absolute;
+  top: 0px;
+  transition: 1s;
+}
+
+.block-size {
+  font-size: 18px;
+  font-weight: bold;
+}
+
+.blocks-container {
+  position: absolute;
+  top: 0px;
+  left: 40px;
+}
+
+.block-body {
+  text-align: center;
+}
+
+.time-difference {
+  position: absolute;
+  bottom: 10px;
+  text-align: center;
+  width: 100%;
+  font-size: 14px;
+}
+
+.fees {
+  font-size: 10px;
+  margin-top: 10px;
+  margin-bottom: 2px;
+}
+
+.transaction-count {
+  font-size: 12px;
+}
+
+.block-height {
+  position: absolute;
+  font-size: 12px;
+  bottom: 160px;
+  width: 100%;
+  left: -12px;
+  text-shadow: 0px 32px 3px #111;
+  z-index: 100;
+}
+
+@media (max-width: 767.98px) {
+  .block-height {
+    bottom: 125px;
+    left: inherit;
+    text-shadow: inherit;
+    z-index: inherit;
+  }
+}
+
+@media (min-width: 768px) {
+  .bitcoin-block::after {
+    content: '';   
+    width: 125px;
+    height: 24px;
+    position:absolute;
+    top: -24px;
+    left: -20px;
+    background-color: #232838;
+    transform:skew(40deg);
+    transform-origin:top;    
+  }
+
+  .bitcoin-block::before {
+    content: '';
+    width: 20px;
+    height: 125px;
+    position: absolute;
+    top: -12px;
+    left: -20px;
+    background-color: #191c27; 
+    
+    transform: skewY(50deg);
+    transform-origin: top;     
+  }
+}
+
+.black-background {
+  background-color: #11131f;
+  z-index: 100;
+  position: relative;
+}

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

@@ -0,0 +1,70 @@
+import { Component, OnInit, OnDestroy } from '@angular/core';
+import { IBlock } from '../blockchain/interfaces';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { BlockModalComponent } from './block-modal/block-modal.component';
+import { MemPoolService } from '../services/mem-pool.service';
+import { Subscription } from 'rxjs';
+import { environment } from '../../environments/environment';
+
+@Component({
+  selector: 'app-blockchain-blocks',
+  templateUrl: './blockchain-blocks.component.html',
+  styleUrls: ['./blockchain-blocks.component.scss']
+})
+export class BlockchainBlocksComponent implements OnInit, OnDestroy {
+  blocks: IBlock[] = [];
+  blocksSubscription: Subscription;
+  interval: any;
+  trigger = 0;
+  isElectrsEnabled = !!environment.electrs;
+
+  constructor(
+    private modalService: NgbModal,
+    private memPoolService: MemPoolService,
+  ) { }
+
+  ngOnInit() {
+    this.blocksSubscription = this.memPoolService.blocks$
+      .subscribe((block) => {
+        if (this.blocks.some((b) => b.height === block.height)) {
+          return;
+        }
+        this.blocks.unshift(block);
+        this.blocks = this.blocks.slice(0, 8);
+      });
+
+    this.interval = setInterval(() => this.trigger++, 10 * 1000);
+  }
+
+  ngOnDestroy() {
+    this.blocksSubscription.unsubscribe();
+    clearInterval(this.interval);
+  }
+
+  trackByBlocksFn(index: number, item: IBlock) {
+    return item.height;
+  }
+
+  openBlockModal(block: IBlock) {
+    const modalRef = this.modalService.open(BlockModalComponent, { size: 'lg' });
+    modalRef.componentInstance.block = block;
+  }
+
+  getStyleForBlock(block: IBlock) {
+    const greenBackgroundHeight = 100 - (block.weight / 4000000) * 100;
+    if (window.innerWidth <= 768) {
+      return {
+        'top': 155 * this.blocks.indexOf(block) + 'px',
+        'background': `repeating-linear-gradient(#2d3348, #2d3348 ${greenBackgroundHeight}%,
+          #9339f4 ${Math.max(greenBackgroundHeight, 0)}%, #105fb0 100%)`,
+      };
+    } else {
+      return {
+        'left': 155 * this.blocks.indexOf(block) + 'px',
+        'background': `repeating-linear-gradient(#2d3348, #2d3348 ${greenBackgroundHeight}%,
+          #9339f4 ${Math.max(greenBackgroundHeight, 0)}%, #105fb0 100%)`,
+      };
+    }
+  }
+
+}

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

@@ -0,0 +1,20 @@
+<div class="projected-blocks-container">
+  <div *ngFor="let projectedBlock of projectedBlocks; let i = index; trackBy: trackByProjectedFn">
+    <div (click)="openProjectedBlockModal(projectedBlock, i);" class="bitcoin-block text-center projected-block" id="projected-block-{{ i }}" [ngStyle]="getStyleForProjectedBlockAtIndex(i)">
+      <div class="block-body" *ngIf="projectedBlocks?.length">
+        <div class="fees">
+          ~{{ projectedBlock.medianFee | ceil }} sat/vB
+          <br/>
+          <span class="yellow-color">{{ projectedBlock.minFee | ceil }} - {{ projectedBlock.maxFee | ceil }} sat/vB</span>
+        </div>
+        <div class="block-size">{{ projectedBlock.blockSize | bytes: 2 }}</div>
+        <div class="transaction-count">{{ projectedBlock.nTx }} transactions</div>
+        <div class="time-difference" *ngIf="i !== 3">In ~{{ 10 * i + 10 }} minutes</div>
+        <ng-template [ngIf]="i === 3 && projectedBlocks?.length >= 4 && (projectedBlock.blockWeight / 4000000 | ceil) > 1">
+          <div class="time-difference">+{{ projectedBlock.blockWeight / 4000000 | ceil }} blocks</div>
+        </ng-template>
+      </div>
+      <span class="animated-border"></span>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,103 @@
+.bitcoin-block {
+  width: 125px;
+  height: 125px;
+  cursor: pointer;
+}
+
+.block-size {
+  font-size: 18px;
+  font-weight: bold;
+}
+
+.projected-blocks-container {
+  position: absolute;
+  top: 0px;
+  right: 0px;
+  left: 0px;
+
+  animation: opacityPulse 2s ease-out;
+  animation-iteration-count: infinite; 
+  opacity: 1;
+}
+
+.projected-block {
+  position: absolute;
+  top: 0;
+}
+
+.block-body {
+  text-align: center;
+}
+
+@keyframes opacityPulse {
+  0% {opacity: 0.7;}
+  50% {opacity: 1.0;}
+  100% {opacity: 0.7;}
+}
+
+.time-difference {
+  position: absolute;
+  bottom: 10px;
+  text-align: center;
+  width: 100%;
+  font-size: 14px;
+}
+
+.fees {
+  font-size: 10px;
+  margin-top: 10px;
+  margin-bottom: 2px;
+}
+
+.transaction-count {
+  font-size: 12px;
+}
+
+@media (max-width: 767.98px) {
+  .projected-blocks-container {
+    position: absolute;
+    left: -165px;
+    top: -40px;
+  }
+}
+
+@media (min-width: 768px) {
+  .bitcoin-block::after {
+    content: '';   
+    width: 125px;
+    height: 24px;
+    position:absolute;
+    top: -24px;
+    left: -20px;
+    background-color: #232838;
+    transform:skew(40deg);
+    transform-origin:top;    
+  }
+
+  .bitcoin-block::before {
+    content: '';
+    width: 20px;
+    height: 125px;
+    position: absolute;
+    top: -12px;
+    left: -20px;
+    background-color: #191c27; 
+    
+    transform: skewY(50deg);
+    transform-origin: top;     
+  }
+
+  .projected-block.bitcoin-block::after {
+    background-color: #403834; 
+  }
+
+  .projected-block.bitcoin-block::before {
+    background-color: #2d2825; 
+  }
+}
+
+.black-background {
+  background-color: #11131f;
+  z-index: 100;
+  position: relative;
+}