From 63939ddbe41f6b1954e267c7161ad825a72dad79 Mon Sep 17 00:00:00 2001
From: Antoni Spaanderman <56turtle56@gmail.com>
Date: Tue, 18 Jan 2022 22:25:38 +0100
Subject: [PATCH 01/47] outputs of genesis coinbase are always unspent

---
 backend/src/api/bitcoin/bitcoin-api.ts | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/backend/src/api/bitcoin/bitcoin-api.ts b/backend/src/api/bitcoin/bitcoin-api.ts
index 79505d5c3..c23e86ee0 100644
--- a/backend/src/api/bitcoin/bitcoin-api.ts
+++ b/backend/src/api/bitcoin/bitcoin-api.ts
@@ -106,10 +106,16 @@ class BitcoinApi implements AbstractBitcoinApi {
     const outSpends: IEsploraApi.Outspend[] = [];
     const tx = await this.$getRawTransaction(txId, true, false);
     for (let i = 0; i < tx.vout.length; i++) {
-      const txOut = await this.bitcoindClient.getTxOut(txId, i);
-      outSpends.push({
-        spent: txOut === null,
-      });
+      if (tx.status && tx.status.block_height == 0) {
+        outSpends.push({
+          spent: false
+        });
+      } else {
+        const txOut = await this.bitcoindClient.getTxOut(txId, i);
+        outSpends.push({
+          spent: txOut === null,
+        });
+      }
     }
     return outSpends;
   }

From 2848f56c2b975c39533294a6f7309224e4c3e1c2 Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Wed, 19 Jan 2022 18:50:52 +0900
Subject: [PATCH 02/47] Import mining pools into the database - Increment db
 schema to 3

---
 backend/src/api/database-migration.ts |  20 ++++-
 backend/src/api/pools-parser.ts       | 118 ++++++++++++++++++++++++++
 backend/src/index.ts                  |   2 +
 3 files changed, 137 insertions(+), 3 deletions(-)
 create mode 100644 backend/src/api/pools-parser.ts

diff --git a/backend/src/api/database-migration.ts b/backend/src/api/database-migration.ts
index 2ac97636e..9fdd4d210 100644
--- a/backend/src/api/database-migration.ts
+++ b/backend/src/api/database-migration.ts
@@ -3,10 +3,10 @@ import config from '../config';
 import { DB } from '../database';
 import logger from '../logger';
 
-const sleep = (ms: number) => new Promise( res => setTimeout(res, ms));
+const sleep = (ms: number) => new Promise(res => setTimeout(res, ms));
 
 class DatabaseMigration {
-  private static currentVersion = 2;
+  private static currentVersion = 3;
   private queryTimeout = 120000;
   private statisticsAddedIndexed = false;
 
@@ -83,6 +83,9 @@ class DatabaseMigration {
       if (databaseSchemaVersion < 2 && this.statisticsAddedIndexed === false) {
         await this.$executeQuery(connection, `CREATE INDEX added ON statistics (added);`);
       }
+      if (databaseSchemaVersion < 3) {
+        await this.$executeQuery(connection, this.getCreatePoolsTableQuery(), await this.$checkIfTableExists('pools'));
+      }
       connection.release();
     } catch (e) {
       connection.release();
@@ -335,6 +338,17 @@ class DatabaseMigration {
       final_tx int(11) NOT NULL
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8;`;
   }
+
+  private getCreatePoolsTableQuery(): string {
+    return `CREATE TABLE IF NOT EXISTS pools (
+      id int(11) NOT NULL AUTO_INCREMENT,
+      name varchar(50) NOT NULL,
+      link varchar(255) NOT NULL,
+      addresses text NOT NULL,
+      regexes text NOT NULL,
+      PRIMARY KEY (id)
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;`;
+  }
 }
 
-export default new DatabaseMigration();
+export default new DatabaseMigration();
\ No newline at end of file
diff --git a/backend/src/api/pools-parser.ts b/backend/src/api/pools-parser.ts
new file mode 100644
index 000000000..c17336288
--- /dev/null
+++ b/backend/src/api/pools-parser.ts
@@ -0,0 +1,118 @@
+import {readFileSync} from 'fs';
+import { DB } from '../database';
+import logger from '../logger';
+
+interface Pool {
+  name: string,
+  link: string,
+  regexes: string[],
+  addresses: string[],
+}
+
+class PoolsParser {
+  /**
+   * Parse the pools.json file, consolidate the data and dump it into the database
+   */
+  public async migratePoolsJson() {
+    logger.info('Importing pools.json to the database');
+    let connection = await DB.pool.getConnection();
+
+    // Check if the pools table does not have data already, for now we do not support updating it
+    // but that will come in a later version
+    let [rows] = await connection.query<any>({ sql: 'SELECT count(id) as count from pools;', timeout: 120000 });
+    if (rows[0].count !== 0) {
+      logger.info('Pools table already contain data, updating it is not yet supported, skipping.');
+      connection.release();
+      return;
+    }
+
+    logger.info('Open ../frontend/cypress/fixtures/pools.json');
+    const fileContent: string = readFileSync('../frontend/cypress/fixtures/pools.json','utf8');
+    const poolsJson: object = JSON.parse(fileContent);
+
+    // First we save every entries without paying attention to pool duplication
+    let poolsDuplicated: Pool[] = [];
+
+    logger.info('Parse coinbase_tags');
+    const coinbaseTags = Object.entries(poolsJson['coinbase_tags']);
+    for (let i = 0; i < coinbaseTags.length; ++i) {
+      poolsDuplicated.push({
+        'name': (<Pool>coinbaseTags[i][1]).name,
+        'link': (<Pool>coinbaseTags[i][1]).link,
+        'regexes': [coinbaseTags[i][0]],
+        'addresses': [],
+      });
+    }
+    logger.info('Parse payout_addresses');
+    const addressesTags = Object.entries(poolsJson['payout_addresses']);
+    for (let i = 0; i < addressesTags.length; ++i) {
+      poolsDuplicated.push({
+        'name': (<Pool>addressesTags[i][1]).name,
+        'link': (<Pool>addressesTags[i][1]).link,
+        'regexes': [],
+        'addresses': [addressesTags[i][0]],
+      });
+    }
+
+    // Then, we find unique mining pool names
+    logger.info('Identify unique mining pools');
+    let poolNames : string[] = [];
+    for (let i = 0; i < poolsDuplicated.length; ++i) {
+      if (poolNames.indexOf(poolsDuplicated[i].name) === -1) {
+        poolNames.push(poolsDuplicated[i].name);
+      }
+    }
+    logger.info(`Found ${poolNames.length} unique mining pools`);
+
+    // Finally, we generate the final consolidated pools data
+    let finalPoolData: Pool[] = [];
+    for (let i = 0; i < poolNames.length; ++i) {
+      let allAddresses: string[] = [];
+      let allRegexes: string[] = [];
+      let match = poolsDuplicated.filter((pool: Pool) => pool.name === poolNames[i]);
+
+      for (let y = 0; y < match.length; ++y) {
+        allAddresses = allAddresses.concat(match[y].addresses);
+        allRegexes = allRegexes.concat(match[y].regexes);
+      }
+
+      finalPoolData.push({
+        'name': poolNames[i].replace("'", "''"),
+        'link': match[0].link,
+        'regexes': allRegexes,
+        'addresses': allAddresses,
+      })
+    }
+
+    // Manually add the 'unknown pool'
+    finalPoolData.push({
+      'name': 'Unknown',
+      'link': 'https://learnmeabitcoin.com/technical/coinbase-transaction',
+      regexes: [],
+      addresses: [],
+    })
+
+    // Dump everything into the database
+    logger.info(`Insert mining pool info into the database`);
+    let query: string = 'INSERT INTO pools(name, link, regexes, addresses) VALUES ';
+    for (let i = 0; i < finalPoolData.length; ++i) {
+      query += `('${finalPoolData[i].name}', '${finalPoolData[i].link}',
+        '${JSON.stringify(finalPoolData[i].regexes)}', '${JSON.stringify(finalPoolData[i].addresses)}'),`;
+    }
+    query = query.slice(0, -1) + ';';
+
+    try {
+      await connection.query<any>({ sql: 'DELETE FROM pools;', timeout: 120000 }); // We clear the table before insertion
+      await connection.query<any>({ sql: query, timeout: 120000 });
+      connection.release();
+      logger.info('Import completed');
+    } catch (e) {
+      connection.release();
+      logger.info(`Unable to import pools in the database!`);
+      throw e;
+    }
+  }
+
+}
+
+export default new PoolsParser();
\ No newline at end of file
diff --git a/backend/src/index.ts b/backend/src/index.ts
index f6615d1c8..9e4dcee35 100644
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -22,6 +22,7 @@ import loadingIndicators from './api/loading-indicators';
 import mempool from './api/mempool';
 import elementsParser from './api/liquid/elements-parser';
 import databaseMigration from './api/database-migration';
+import poolsParser from './api/pools-parser';
 import syncAssets from './sync-assets';
 import icons from './api/liquid/icons';
 import { Common } from './api/common';
@@ -88,6 +89,7 @@ class Server {
       await checkDbConnection();
       try {
         await databaseMigration.$initializeOrMigrateDatabase();
+        await poolsParser.migratePoolsJson();
       } catch (e) {
         throw new Error(e instanceof Error ? e.message : 'Error');
       }

From 979c52d3c413532411e0ca713333f12592e21c69 Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Thu, 20 Jan 2022 13:53:08 +0900
Subject: [PATCH 03/47] Add pools.json to EXTERNAL_ASSETS - Now supports
 updating the table

---
 backend/mempool-config.sample.json |  4 +-
 backend/src/api/pools-parser.ts    | 94 +++++++++++++++++++-----------
 2 files changed, 63 insertions(+), 35 deletions(-)

diff --git a/backend/mempool-config.sample.json b/backend/mempool-config.sample.json
index ea656c1de..1b55f38f4 100644
--- a/backend/mempool-config.sample.json
+++ b/backend/mempool-config.sample.json
@@ -14,7 +14,9 @@
     "MEMPOOL_BLOCKS_AMOUNT": 8,
     "PRICE_FEED_UPDATE_INTERVAL": 3600,
     "USE_SECOND_NODE_FOR_MINFEE": false,
-    "EXTERNAL_ASSETS": []
+    "EXTERNAL_ASSETS": [
+      "https://mempool.space/resources/pools.json"
+    ]
   },
   "CORE_RPC": {
     "HOST": "127.0.0.1",
diff --git a/backend/src/api/pools-parser.ts b/backend/src/api/pools-parser.ts
index c17336288..5e6a38e49 100644
--- a/backend/src/api/pools-parser.ts
+++ b/backend/src/api/pools-parser.ts
@@ -14,20 +14,14 @@ class PoolsParser {
    * Parse the pools.json file, consolidate the data and dump it into the database
    */
   public async migratePoolsJson() {
+    const connection = await DB.pool.getConnection();
     logger.info('Importing pools.json to the database');
-    let connection = await DB.pool.getConnection();
 
-    // Check if the pools table does not have data already, for now we do not support updating it
-    // but that will come in a later version
-    let [rows] = await connection.query<any>({ sql: 'SELECT count(id) as count from pools;', timeout: 120000 });
-    if (rows[0].count !== 0) {
-      logger.info('Pools table already contain data, updating it is not yet supported, skipping.');
-      connection.release();
-      return;
-    }
+    // Get existing pools from the db
+    const [existingPools] = await connection.query<any>({ sql: 'SELECT * FROM pools;', timeout: 120000 }); // We clear the table before insertion    
 
-    logger.info('Open ../frontend/cypress/fixtures/pools.json');
-    const fileContent: string = readFileSync('../frontend/cypress/fixtures/pools.json','utf8');
+    logger.info('Open ./pools.json');
+    const fileContent: string = readFileSync('./pools.json','utf8');
     const poolsJson: object = JSON.parse(fileContent);
 
     // First we save every entries without paying attention to pool duplication
@@ -65,7 +59,8 @@ class PoolsParser {
     logger.info(`Found ${poolNames.length} unique mining pools`);
 
     // Finally, we generate the final consolidated pools data
-    let finalPoolData: Pool[] = [];
+    let finalPoolDataAdd: Pool[] = [];
+    let finalPoolDataUpdate: Pool[] = [];
     for (let i = 0; i < poolNames.length; ++i) {
       let allAddresses: string[] = [];
       let allRegexes: string[] = [];
@@ -76,34 +71,65 @@ class PoolsParser {
         allRegexes = allRegexes.concat(match[y].regexes);
       }
 
-      finalPoolData.push({
-        'name': poolNames[i].replace("'", "''"),
-        'link': match[0].link,
-        'regexes': allRegexes,
-        'addresses': allAddresses,
-      })
+      const finalPoolName = poolNames[i].replace("'", "''"); // To support single quote in names when doing db queries
+
+      if (existingPools.find((pool) => { return pool.name === poolNames[i]}) !== undefined) {
+        logger.debug(`Update '${finalPoolName} mining pool`);
+        finalPoolDataUpdate.push({
+          'name': finalPoolName,
+          'link': match[0].link,
+          'regexes': allRegexes,
+          'addresses': allAddresses,
+        })
+      } else {
+        logger.debug(`Add '${finalPoolName} mining pool`);
+        finalPoolDataAdd.push({
+          'name': finalPoolName,
+          'link': match[0].link,
+          'regexes': allRegexes,
+          'addresses': allAddresses,
+        })
+      }
     }
 
     // Manually add the 'unknown pool'
-    finalPoolData.push({
-      'name': 'Unknown',
-      'link': 'https://learnmeabitcoin.com/technical/coinbase-transaction',
-      regexes: [],
-      addresses: [],
-    })
-
-    // Dump everything into the database
-    logger.info(`Insert mining pool info into the database`);
-    let query: string = 'INSERT INTO pools(name, link, regexes, addresses) VALUES ';
-    for (let i = 0; i < finalPoolData.length; ++i) {
-      query += `('${finalPoolData[i].name}', '${finalPoolData[i].link}',
-        '${JSON.stringify(finalPoolData[i].regexes)}', '${JSON.stringify(finalPoolData[i].addresses)}'),`;
+    if (existingPools.find((pool) => { return pool.name === "Uknown"}) !== undefined) {
+      finalPoolDataAdd.push({
+        'name': 'Unknown',
+        'link': 'https://learnmeabitcoin.com/technical/coinbase-transaction',
+        regexes: [],
+        addresses: [],
+      })
+    }
+
+    logger.info(`Update pools table now`);
+
+    // Add new mining pools into the database
+    let queryAdd: string = 'INSERT INTO pools(name, link, regexes, addresses) VALUES ';
+    for (let i = 0; i < finalPoolDataAdd.length; ++i) {
+      queryAdd += `('${finalPoolDataAdd[i].name}', '${finalPoolDataAdd[i].link}',
+        '${JSON.stringify(finalPoolDataAdd[i].regexes)}', '${JSON.stringify(finalPoolDataAdd[i].addresses)}'),`;
+    }
+    queryAdd = queryAdd.slice(0, -1) + ';';
+
+    // Add new mining pools into the database
+    let updateQueries: string[] = [];
+    for (let i = 0; i < finalPoolDataUpdate.length; ++i) {
+      updateQueries.push(`
+        UPDATE pools
+        SET name='${finalPoolDataUpdate[i].name}', link='${finalPoolDataUpdate[i].link}',
+        regexes='${JSON.stringify(finalPoolDataUpdate[i].regexes)}', addresses='${JSON.stringify(finalPoolDataUpdate[i].addresses)}'
+        WHERE name='${finalPoolDataUpdate[i].name}'
+      ;`);
     }
-    query = query.slice(0, -1) + ';';
 
     try {
-      await connection.query<any>({ sql: 'DELETE FROM pools;', timeout: 120000 }); // We clear the table before insertion
-      await connection.query<any>({ sql: query, timeout: 120000 });
+      if (finalPoolDataAdd.length > 0) {
+        await connection.query<any>({ sql: queryAdd, timeout: 120000 });
+      }
+      updateQueries.forEach(async query => {
+        await connection.query<any>({ sql: query, timeout: 120000 });
+      });
       connection.release();
       logger.info('Import completed');
     } catch (e) {

From 1210643e8ec9aaaa6952f000bdf9c82bdc5dc0e1 Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Thu, 20 Jan 2022 16:34:14 +0900
Subject: [PATCH 04/47] Fix linter issues and typo

---
 backend/src/api/pools-parser.ts | 42 ++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/backend/src/api/pools-parser.ts b/backend/src/api/pools-parser.ts
index 5e6a38e49..da048f2d3 100644
--- a/backend/src/api/pools-parser.ts
+++ b/backend/src/api/pools-parser.ts
@@ -3,10 +3,10 @@ import { DB } from '../database';
 import logger from '../logger';
 
 interface Pool {
-  name: string,
-  link: string,
-  regexes: string[],
-  addresses: string[],
+  name: string;
+  link: string;
+  regexes: string[];
+  addresses: string[];
 }
 
 class PoolsParser {
@@ -18,14 +18,14 @@ class PoolsParser {
     logger.info('Importing pools.json to the database');
 
     // Get existing pools from the db
-    const [existingPools] = await connection.query<any>({ sql: 'SELECT * FROM pools;', timeout: 120000 }); // We clear the table before insertion    
+    const [existingPools] = await connection.query<any>({ sql: 'SELECT * FROM pools;', timeout: 120000 });
 
     logger.info('Open ./pools.json');
-    const fileContent: string = readFileSync('./pools.json','utf8');
+    const fileContent: string = readFileSync('./pools.json', 'utf8');
     const poolsJson: object = JSON.parse(fileContent);
 
     // First we save every entries without paying attention to pool duplication
-    let poolsDuplicated: Pool[] = [];
+    const poolsDuplicated: Pool[] = [];
 
     logger.info('Parse coinbase_tags');
     const coinbaseTags = Object.entries(poolsJson['coinbase_tags']);
@@ -50,7 +50,7 @@ class PoolsParser {
 
     // Then, we find unique mining pool names
     logger.info('Identify unique mining pools');
-    let poolNames : string[] = [];
+    const poolNames: string[] = [];
     for (let i = 0; i < poolsDuplicated.length; ++i) {
       if (poolNames.indexOf(poolsDuplicated[i].name) === -1) {
         poolNames.push(poolsDuplicated[i].name);
@@ -59,47 +59,47 @@ class PoolsParser {
     logger.info(`Found ${poolNames.length} unique mining pools`);
 
     // Finally, we generate the final consolidated pools data
-    let finalPoolDataAdd: Pool[] = [];
-    let finalPoolDataUpdate: Pool[] = [];
+    const finalPoolDataAdd: Pool[] = [];
+    const finalPoolDataUpdate: Pool[] = [];
     for (let i = 0; i < poolNames.length; ++i) {
       let allAddresses: string[] = [];
       let allRegexes: string[] = [];
-      let match = poolsDuplicated.filter((pool: Pool) => pool.name === poolNames[i]);
+      const match = poolsDuplicated.filter((pool: Pool) => pool.name === poolNames[i]);
 
       for (let y = 0; y < match.length; ++y) {
         allAddresses = allAddresses.concat(match[y].addresses);
         allRegexes = allRegexes.concat(match[y].regexes);
       }
 
-      const finalPoolName = poolNames[i].replace("'", "''"); // To support single quote in names when doing db queries
+      const finalPoolName = poolNames[i].replace(`'`, `''`); // To support single quote in names when doing db queries
 
-      if (existingPools.find((pool) => { return pool.name === poolNames[i]}) !== undefined) {
-        logger.debug(`Update '${finalPoolName} mining pool`);
+      if (existingPools.find((pool) => pool.name === poolNames[i]) !== undefined) {
+        logger.debug(`Update '${finalPoolName}' mining pool`);
         finalPoolDataUpdate.push({
           'name': finalPoolName,
           'link': match[0].link,
           'regexes': allRegexes,
           'addresses': allAddresses,
-        })
+        });
       } else {
-        logger.debug(`Add '${finalPoolName} mining pool`);
+        logger.debug(`Add '${finalPoolName}' mining pool`);
         finalPoolDataAdd.push({
           'name': finalPoolName,
           'link': match[0].link,
           'regexes': allRegexes,
           'addresses': allAddresses,
-        })
+        });
       }
     }
 
     // Manually add the 'unknown pool'
-    if (existingPools.find((pool) => { return pool.name === "Uknown"}) !== undefined) {
+    if (existingPools.find((pool) => pool.name === 'Unknown') !== undefined) {
       finalPoolDataAdd.push({
         'name': 'Unknown',
         'link': 'https://learnmeabitcoin.com/technical/coinbase-transaction',
         regexes: [],
         addresses: [],
-      })
+      });
     }
 
     logger.info(`Update pools table now`);
@@ -113,7 +113,7 @@ class PoolsParser {
     queryAdd = queryAdd.slice(0, -1) + ';';
 
     // Add new mining pools into the database
-    let updateQueries: string[] = [];
+    const updateQueries: string[] = [];
     for (let i = 0; i < finalPoolDataUpdate.length; ++i) {
       updateQueries.push(`
         UPDATE pools
@@ -141,4 +141,4 @@ class PoolsParser {
 
 }
 
-export default new PoolsParser();
\ No newline at end of file
+export default new PoolsParser();

From 8d1cc40459679d10f0ce12b44a3452fc2208d827 Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Thu, 20 Jan 2022 16:56:25 +0900
Subject: [PATCH 05/47] Fix add 'Unknown' pool logic

---
 backend/src/api/pools-parser.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/api/pools-parser.ts b/backend/src/api/pools-parser.ts
index da048f2d3..9bfcd3366 100644
--- a/backend/src/api/pools-parser.ts
+++ b/backend/src/api/pools-parser.ts
@@ -93,7 +93,7 @@ class PoolsParser {
     }
 
     // Manually add the 'unknown pool'
-    if (existingPools.find((pool) => pool.name === 'Unknown') !== undefined) {
+    if (existingPools.find((pool) => pool.name === 'Unknown') === undefined) {
       finalPoolDataAdd.push({
         'name': 'Unknown',
         'link': 'https://learnmeabitcoin.com/technical/coinbase-transaction',

From 19a564062bed4ced0a5e407a744218941ca5c77d Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Thu, 20 Jan 2022 22:59:10 +0900
Subject: [PATCH 06/47] Add pools.json file in default config.ts - Handle file
 exception - Only import pools for MAINNET

---
 backend/src/api/pools-parser.ts | 82 ++++++++++++++++++++-------------
 backend/src/config.ts           |  4 +-
 2 files changed, 54 insertions(+), 32 deletions(-)

diff --git a/backend/src/api/pools-parser.ts b/backend/src/api/pools-parser.ts
index 9bfcd3366..bb7779089 100644
--- a/backend/src/api/pools-parser.ts
+++ b/backend/src/api/pools-parser.ts
@@ -1,6 +1,7 @@
-import {readFileSync} from 'fs';
+import { readFileSync } from 'fs';
 import { DB } from '../database';
 import logger from '../logger';
+import config from '../config';
 
 interface Pool {
   name: string;
@@ -14,20 +15,26 @@ class PoolsParser {
    * Parse the pools.json file, consolidate the data and dump it into the database
    */
   public async migratePoolsJson() {
-    const connection = await DB.pool.getConnection();
-    logger.info('Importing pools.json to the database');
+    if (config.MEMPOOL.NETWORK !== 'mainnet') {
+      return;
+    }
 
-    // Get existing pools from the db
-    const [existingPools] = await connection.query<any>({ sql: 'SELECT * FROM pools;', timeout: 120000 });
+    logger.debug('Importing pools.json to the database, open ./pools.json');
 
-    logger.info('Open ./pools.json');
-    const fileContent: string = readFileSync('./pools.json', 'utf8');
-    const poolsJson: object = JSON.parse(fileContent);
+    let poolsJson: object = {};
+    try {
+      const fileContent: string = readFileSync('./pools.json', 'utf8');
+      poolsJson = JSON.parse(fileContent);
+    } catch (e) {
+      logger.err('Unable to open ./pools.json, does the file exist?');
+      await this.insertUnknownPool();
+      return;
+    }
 
     // First we save every entries without paying attention to pool duplication
     const poolsDuplicated: Pool[] = [];
 
-    logger.info('Parse coinbase_tags');
+    logger.debug('Parse coinbase_tags');
     const coinbaseTags = Object.entries(poolsJson['coinbase_tags']);
     for (let i = 0; i < coinbaseTags.length; ++i) {
       poolsDuplicated.push({
@@ -37,7 +44,7 @@ class PoolsParser {
         'addresses': [],
       });
     }
-    logger.info('Parse payout_addresses');
+    logger.debug('Parse payout_addresses');
     const addressesTags = Object.entries(poolsJson['payout_addresses']);
     for (let i = 0; i < addressesTags.length; ++i) {
       poolsDuplicated.push({
@@ -49,14 +56,18 @@ class PoolsParser {
     }
 
     // Then, we find unique mining pool names
-    logger.info('Identify unique mining pools');
+    logger.debug('Identify unique mining pools');
     const poolNames: string[] = [];
     for (let i = 0; i < poolsDuplicated.length; ++i) {
       if (poolNames.indexOf(poolsDuplicated[i].name) === -1) {
         poolNames.push(poolsDuplicated[i].name);
       }
     }
-    logger.info(`Found ${poolNames.length} unique mining pools`);
+    logger.debug(`Found ${poolNames.length} unique mining pools`);
+
+    // Get existing pools from the db
+    const connection = await DB.pool.getConnection();
+    const [existingPools] = await connection.query<any>({ sql: 'SELECT * FROM pools;', timeout: 120000 });
 
     // Finally, we generate the final consolidated pools data
     const finalPoolDataAdd: Pool[] = [];
@@ -92,23 +103,13 @@ class PoolsParser {
       }
     }
 
-    // Manually add the 'unknown pool'
-    if (existingPools.find((pool) => pool.name === 'Unknown') === undefined) {
-      finalPoolDataAdd.push({
-        'name': 'Unknown',
-        'link': 'https://learnmeabitcoin.com/technical/coinbase-transaction',
-        regexes: [],
-        addresses: [],
-      });
-    }
-
-    logger.info(`Update pools table now`);
+    logger.debug(`Update pools table now`);
 
     // Add new mining pools into the database
     let queryAdd: string = 'INSERT INTO pools(name, link, regexes, addresses) VALUES ';
     for (let i = 0; i < finalPoolDataAdd.length; ++i) {
       queryAdd += `('${finalPoolDataAdd[i].name}', '${finalPoolDataAdd[i].link}',
-        '${JSON.stringify(finalPoolDataAdd[i].regexes)}', '${JSON.stringify(finalPoolDataAdd[i].addresses)}'),`;
+      '${JSON.stringify(finalPoolDataAdd[i].regexes)}', '${JSON.stringify(finalPoolDataAdd[i].addresses)}'),`;
     }
     queryAdd = queryAdd.slice(0, -1) + ';';
 
@@ -116,11 +117,11 @@ class PoolsParser {
     const updateQueries: string[] = [];
     for (let i = 0; i < finalPoolDataUpdate.length; ++i) {
       updateQueries.push(`
-        UPDATE pools
-        SET name='${finalPoolDataUpdate[i].name}', link='${finalPoolDataUpdate[i].link}',
-        regexes='${JSON.stringify(finalPoolDataUpdate[i].regexes)}', addresses='${JSON.stringify(finalPoolDataUpdate[i].addresses)}'
-        WHERE name='${finalPoolDataUpdate[i].name}'
-      ;`);
+      UPDATE pools
+      SET name='${finalPoolDataUpdate[i].name}', link='${finalPoolDataUpdate[i].link}',
+      regexes='${JSON.stringify(finalPoolDataUpdate[i].regexes)}', addresses='${JSON.stringify(finalPoolDataUpdate[i].addresses)}'
+      WHERE name='${finalPoolDataUpdate[i].name}'
+    ;`);
     }
 
     try {
@@ -130,15 +131,34 @@ class PoolsParser {
       updateQueries.forEach(async query => {
         await connection.query<any>({ sql: query, timeout: 120000 });
       });
+      await this.insertUnknownPool();
       connection.release();
-      logger.info('Import completed');
+      logger.info('Mining pools.json import completed');
     } catch (e) {
       connection.release();
-      logger.info(`Unable to import pools in the database!`);
+      logger.err(`Unable to import pools in the database!`);
       throw e;
     }
   }
 
+  /**
+   * Manually add the 'unknown pool'
+   */
+  private async insertUnknownPool() {
+    const connection = await DB.pool.getConnection();
+    try {
+      const [rows]: any[] = await connection.query({ sql: 'SELECT name from pools where name="Unknown"', timeout: 120000 });
+      if (rows.length === 0) {
+        logger.debug('Manually inserting "Unknown" mining pool into the databse');
+        await connection.query({
+          sql: `INSERT INTO pools(name, link, regexes, addresses)
+          VALUES("Unknown", "https://learnmeabitcoin.com/technical/coinbase-transaction", "[]", "[]");
+        `});
+      }
+    } catch (e) {
+      logger.err('Unable to insert "Unknown" mining pool');
+    }
+  }
 }
 
 export default new PoolsParser();
diff --git a/backend/src/config.ts b/backend/src/config.ts
index 4c2888834..3cc928327 100644
--- a/backend/src/config.ts
+++ b/backend/src/config.ts
@@ -79,7 +79,9 @@ const defaults: IConfig = {
     'MEMPOOL_BLOCKS_AMOUNT': 8,
     'PRICE_FEED_UPDATE_INTERVAL': 3600,
     'USE_SECOND_NODE_FOR_MINFEE': false,
-    'EXTERNAL_ASSETS': [],
+    'EXTERNAL_ASSETS': [
+      'https://mempool.space/resources/pools.json'
+    ]
   },
   'ESPLORA': {
     'REST_API_URL': 'http://127.0.0.1:3000',

From a1a2e9363fc7137980ba37a2e80889539a50cd4a Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Thu, 20 Jan 2022 23:07:20 +0900
Subject: [PATCH 07/47] Make sure to release all db connections

---
 backend/src/api/pools-parser.ts | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/backend/src/api/pools-parser.ts b/backend/src/api/pools-parser.ts
index bb7779089..2b0901551 100644
--- a/backend/src/api/pools-parser.ts
+++ b/backend/src/api/pools-parser.ts
@@ -67,7 +67,14 @@ class PoolsParser {
 
     // Get existing pools from the db
     const connection = await DB.pool.getConnection();
-    const [existingPools] = await connection.query<any>({ sql: 'SELECT * FROM pools;', timeout: 120000 });
+    let existingPools: any[] = [];
+    try {
+      existingPools = await connection.query<any>({ sql: 'SELECT * FROM pools;', timeout: 120000 });
+    } catch (e) {
+      logger.err('Unable to get existing pools from the database, skipping pools.json import');
+      connection.release();
+      return;
+    }
 
     // Finally, we generate the final consolidated pools data
     const finalPoolDataAdd: Pool[] = [];
@@ -117,11 +124,11 @@ class PoolsParser {
     const updateQueries: string[] = [];
     for (let i = 0; i < finalPoolDataUpdate.length; ++i) {
       updateQueries.push(`
-      UPDATE pools
-      SET name='${finalPoolDataUpdate[i].name}', link='${finalPoolDataUpdate[i].link}',
-      regexes='${JSON.stringify(finalPoolDataUpdate[i].regexes)}', addresses='${JSON.stringify(finalPoolDataUpdate[i].addresses)}'
-      WHERE name='${finalPoolDataUpdate[i].name}'
-    ;`);
+        UPDATE pools
+        SET name='${finalPoolDataUpdate[i].name}', link='${finalPoolDataUpdate[i].link}',
+        regexes='${JSON.stringify(finalPoolDataUpdate[i].regexes)}', addresses='${JSON.stringify(finalPoolDataUpdate[i].addresses)}'
+        WHERE name='${finalPoolDataUpdate[i].name}'
+      ;`);
     }
 
     try {
@@ -158,6 +165,8 @@ class PoolsParser {
     } catch (e) {
       logger.err('Unable to insert "Unknown" mining pool');
     }
+
+    connection.release();
   }
 }
 

From 87175869dd741ca366eddce5bdcc36928157e552 Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Thu, 20 Jan 2022 23:31:32 +0900
Subject: [PATCH 08/47] Fix typescript miss use

---
 backend/src/api/pools-parser.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/api/pools-parser.ts b/backend/src/api/pools-parser.ts
index 2b0901551..e3f5f0b89 100644
--- a/backend/src/api/pools-parser.ts
+++ b/backend/src/api/pools-parser.ts
@@ -67,9 +67,9 @@ class PoolsParser {
 
     // Get existing pools from the db
     const connection = await DB.pool.getConnection();
-    let existingPools: any[] = [];
+    let existingPools;
     try {
-      existingPools = await connection.query<any>({ sql: 'SELECT * FROM pools;', timeout: 120000 });
+      [existingPools] = await connection.query<any>({ sql: 'SELECT * FROM pools;', timeout: 120000 });
     } catch (e) {
       logger.err('Unable to get existing pools from the database, skipping pools.json import');
       connection.release();

From a8c04624f08f4550c2ae3b4e2c909936845ad7e6 Mon Sep 17 00:00:00 2001
From: softsimon <softsimon@protonmail.com>
Date: Fri, 21 Jan 2022 01:32:19 +0400
Subject: [PATCH 09/47] Fixing liqud asset precision

fixes #1166
---
 .../transactions-list/transactions-list.component.html        | 2 +-
 .../transactions-list/transactions-list.component.ts          | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.html b/frontend/src/app/components/transactions-list/transactions-list.component.html
index 36aed7fe6..680b6be53 100644
--- a/frontend/src/app/components/transactions-list/transactions-list.component.html
+++ b/frontend/src/app/components/transactions-list/transactions-list.component.html
@@ -270,7 +270,7 @@
 </ng-container>
 
 <ng-template #assetBox let-item>
-  {{ item.value / 100000000 | number: '1.0-' + assetsMinimal[item.asset][3] }} {{ assetsMinimal[item.asset][1] }}
+  {{ item.value / pow(10, assetsMinimal[item.asset][3]) | number: '1.' + assetsMinimal[item.asset][3] + '-' + assetsMinimal[item.asset][3] }} {{ assetsMinimal[item.asset][1] }}
   <br />
   {{ assetsMinimal[item.asset][0] }}
   <br />
diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.ts b/frontend/src/app/components/transactions-list/transactions-list.component.ts
index ecddf4436..e1fb7d2e6 100644
--- a/frontend/src/app/components/transactions-list/transactions-list.component.ts
+++ b/frontend/src/app/components/transactions-list/transactions-list.component.ts
@@ -119,6 +119,10 @@ export class TransactionsListComponent implements OnInit, OnChanges {
     return '0x' + (str.length % 2 ? '0' : '') + str;
   }
 
+  pow(base: number, exponent: number): number {
+    return Math.pow(base, exponent);
+  }
+
   toggleDetails() {
     this.displayDetails = !this.displayDetails;
     this.ref.markForCheck();

From 1322298a06a0c9f0182ac7ea0317dfe16573858f Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Mon, 24 Jan 2022 14:34:03 +0900
Subject: [PATCH 10/47] Make sure to wait for all mining pools queries before
 continuing

---
 backend/src/api/pools-parser.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/api/pools-parser.ts b/backend/src/api/pools-parser.ts
index e3f5f0b89..b81bf9d15 100644
--- a/backend/src/api/pools-parser.ts
+++ b/backend/src/api/pools-parser.ts
@@ -135,9 +135,9 @@ class PoolsParser {
       if (finalPoolDataAdd.length > 0) {
         await connection.query<any>({ sql: queryAdd, timeout: 120000 });
       }
-      updateQueries.forEach(async query => {
+      for (const query of updateQueries) {
         await connection.query<any>({ sql: query, timeout: 120000 });
-      });
+      }
       await this.insertUnknownPool();
       connection.release();
       logger.info('Mining pools.json import completed');

From 703b4cc92a3ec728a6767044254b33aac05ab622 Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Tue, 25 Jan 2022 16:45:52 +0900
Subject: [PATCH 11/47] Remove useless autocommit=0 in db migration script

---
 backend/src/api/database-migration.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/backend/src/api/database-migration.ts b/backend/src/api/database-migration.ts
index 9fdd4d210..a375b7bf4 100644
--- a/backend/src/api/database-migration.ts
+++ b/backend/src/api/database-migration.ts
@@ -200,7 +200,6 @@ class DatabaseMigration {
     const connection = await DB.pool.getConnection();
     try {
       await this.$executeQuery(connection, 'START TRANSACTION;');
-      await this.$executeQuery(connection, 'SET autocommit = 0;');
       for (const query of transactionQueries) {
         await this.$executeQuery(connection, query);
       }

From 000dfc4d9e315f0d45e7f0b6b7689330e43292e3 Mon Sep 17 00:00:00 2001
From: wiz <j@wiz.biz>
Date: Tue, 25 Jan 2022 09:15:19 +0000
Subject: [PATCH 12/47] Add new Contributor License Agreement policy

---
 CONTRIBUTING.md | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000..91006c3f6
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,49 @@
+# Contributing to The Mempool Open Source Project
+
+Thank you for contributing to The Mempool Open Source Project managed by Mempool Space K.K. (“Mempool”).
+
+In order to clarify the intellectual property license granted with Contributions from any person or entity, Mempool must have a statement on file from each Contributor indicating their agreement to the Contributor License Agreement (“Agreement”). This license is for your protection as a Contributor as well as the protection of Mempool and its other contributors and users; it does not change your rights to use your own Contributions for any other purpose.
+
+When submitting a pull request for the first time, please create a file with a name like `/contributors/{github_username}.txt`, and in the content of that file indicate your agreement to the Contributor License Agreement terms below. An example of what that file should contain can be seen in wiz's agreement file. (This method of CLA "signing" is borrowed from Medium's open source project.)
+
+# Contributor License Agreement
+
+Last Updated: January 25, 2022
+
+By accepting this Agreement, You agree to the following terms and conditions for Your present and future Contributions submitted to Mempool. Except for the license granted herein to Mempool and recipients of software distributed by Mempool, You reserve all right, title, and interest in and to Your Contributions.
+
+### 1. Definitions
+
+“You” (or “Your”) shall mean the copyright owner or legal entity authorized by the copyright owner that is making this Agreement with Mempool. For legal entities, the entity making a Contribution and all other entities that control, are controlled by, or are under common control with that entity are considered to be a single Contributor. For the purposes of this definition, “control” means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+“Contribution” shall mean any original work of authorship, including any modifications or additions to an existing work, that is intentionally submitted by You to Mempool for inclusion in, or documentation of, any of the products owned or managed by Mempool (“Work”). For the purposes of this definition, “submitted” means any form of electronic, verbal, or written communication sent to Mempool or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Mempool for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as “Not a Contribution.”
+
+### 2. Grant of Copyright License
+
+Subject to the terms and conditions of this Agreement, You hereby grant to Mempool and to recipients of software distributed by Mempool a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your Contributions and such derivative works.
+
+### 3. Grant of Patent License
+
+Subject to the terms and conditions of this Agreement, You hereby grant to Mempool and to recipients of software distributed by Mempool a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which such Contribution(s) was submitted. If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that your Contribution, or the Work to which you have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed.
+
+### 4. Authority
+
+You represent that you are legally entitled to grant the above license. If your employer(s) has rights to intellectual property that you create that includes your Contributions, you represent that you have received permission to make Contributions on behalf of that employer, that your employer has waived such rights for your Contributions to Mempool, or that your employer has executed a separate Corporate Contributor License Agreement with Mempool.
+
+### 5. Originality
+
+You represent that each of Your Contributions is Your original creation (see section 7 for submissions on behalf of others). You represent that Your Contribution submissions include complete details of any third-party license or other restriction (including, but not limited to, related patents and trademarks) of which you are personally aware, and which are associated with any part of Your Contributions.
+
+### 6. Support
+
+You are not expected to provide support for Your Contributions, except to the extent You desire to provide support. You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in writing, You provide Your Contributions on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON- INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
+
+### 7. Third Party Contributions
+
+Should You wish to submit work that is not Your original creation, You may submit it to Mempool separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which you are personally aware, and conspicuously marking the work as “Submitted on behalf of a third-party: [named here]”.
+
+### 8. Notifications
+
+You agree to notify Mempool of any facts or circumstances of which you become aware that would make these representations inaccurate in any respect.
+
+EOF

From 707ae7be01aaa3d3cd2f2471b9b341cd13c404f3 Mon Sep 17 00:00:00 2001
From: wiz <j@wiz.biz>
Date: Tue, 25 Jan 2022 09:19:09 +0000
Subject: [PATCH 13/47] Accept the CLA for @wiz

---
 contributors/wiz.txt | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 contributors/wiz.txt

diff --git a/contributors/wiz.txt b/contributors/wiz.txt
new file mode 100644
index 000000000..a006b4e04
--- /dev/null
+++ b/contributors/wiz.txt
@@ -0,0 +1,3 @@
+I hereby accept the terms of the Contributor License Agreement in the CONTRIBUTING.md file of the mempool/mempool git repository as of January 25, 2022.
+
+Signed: wiz

From bd033541b7cdc769cdbe18b8feb08231180144ef Mon Sep 17 00:00:00 2001
From: wiz <j@wiz.biz>
Date: Tue, 25 Jan 2022 09:19:30 +0000
Subject: [PATCH 14/47] Update copyright years in legal notices

---
 LICENSE                                                | 2 +-
 frontend/src/app/components/about/about.component.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/LICENSE b/LICENSE
index 1826f463d..966417847 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
 The Mempool Open Source Project
-Copyright (c) 2019-2021 The Mempool Open Source Project Developers
+Copyright (c) 2019-2022 The Mempool Open Source Project Developers
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of (at your option) either:
diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html
index 847ed152a..5c4732651 100644
--- a/frontend/src/app/components/about/about.component.html
+++ b/frontend/src/app/components/about/about.component.html
@@ -220,7 +220,7 @@
 
   <div class="copyright">
     <div class="title">
-      Copyright &copy; 2019-2021<br>
+      Copyright &copy; 2019-2022<br>
       The Mempool Open Source Project
     </div>
     <p>

From f2a9933d21e7e286d14cf11b5f34056d7c924c24 Mon Sep 17 00:00:00 2001
From: softsimon <softsimon@protonmail.com>
Date: Tue, 25 Jan 2022 13:41:28 +0400
Subject: [PATCH 15/47] Accept the CLA for @softsimon

---
 contributors/softsimon.txt | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 contributors/softsimon.txt

diff --git a/contributors/softsimon.txt b/contributors/softsimon.txt
new file mode 100644
index 000000000..f33f99034
--- /dev/null
+++ b/contributors/softsimon.txt
@@ -0,0 +1,3 @@
+I hereby accept the terms of the Contributor License Agreement in the CONTRIBUTING.md file of the mempool/mempool git repository as of January 25, 2022.
+
+Signed: softsimon

From 2aaa42716ad1418de91eae4e965fc4d1136252a5 Mon Sep 17 00:00:00 2001
From: Antoni Spaanderman <56turtle56@gmail.com>
Date: Tue, 25 Jan 2022 16:50:03 +0100
Subject: [PATCH 16/47] sign cla

---
 contributors/antonilol.txt | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 contributors/antonilol.txt

diff --git a/contributors/antonilol.txt b/contributors/antonilol.txt
new file mode 100644
index 000000000..94f5ba0c6
--- /dev/null
+++ b/contributors/antonilol.txt
@@ -0,0 +1,3 @@
+I hereby accept the terms of the Contributor License Agreement in the CONTRIBUTING.md file of the mempool/mempool git repository as of January 25, 2022.
+
+Signed: antonilol

From 493dbb1b1a27e5e7a33758c2b1d7aac2621c5fac Mon Sep 17 00:00:00 2001
From: wiz <j@wiz.biz>
Date: Thu, 27 Jan 2022 05:56:38 +0000
Subject: [PATCH 17/47] Increase nginx send_timeout and keepalive_requests

Fixes #425
---
 nginx.conf                       | 4 ++--
 production/nginx/http-basic.conf | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nginx.conf b/nginx.conf
index 166da5348..e9bd6034c 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -32,10 +32,10 @@ http {
 	# timeout which a single keep-alive client connection will stay open
 	keepalive_timeout 69s;
 	# maximum time between packets nginx is allowed to pause when sending the client data
-	send_timeout 10s;
+	send_timeout 69s;
 
 	# number of requests per connection, does not affect SPDY
-	keepalive_requests 100;
+	keepalive_requests 1337;
 
 	# enable gzip compression
 	gzip on;
diff --git a/production/nginx/http-basic.conf b/production/nginx/http-basic.conf
index ce257591a..a79c73382 100644
--- a/production/nginx/http-basic.conf
+++ b/production/nginx/http-basic.conf
@@ -20,10 +20,10 @@ client_header_timeout 10s;
 # timeout which a single keep-alive client connection will stay open
 keepalive_timeout 69s;
 # maximum time between packets nginx is allowed to pause when sending the client data
-send_timeout 10s;
+send_timeout 69s;
 
 # number of requests per connection, does not affect SPDY
-keepalive_requests 100;
+keepalive_requests 1337;
 
 # enable gzip compression
 gzip on;

From 8a4a003620d3fe1b08a2d4db9a162c32d8454b40 Mon Sep 17 00:00:00 2001
From: Aaron Dewes <aaron.dewes@protonmail.com>
Date: Thu, 27 Jan 2022 08:11:18 +0100
Subject: [PATCH 18/47] Change Citadel link to core

---
 frontend/src/app/components/about/about.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html
index 5c4732651..b9050d41e 100644
--- a/frontend/src/app/components/about/about.component.html
+++ b/frontend/src/app/components/about/about.component.html
@@ -102,7 +102,7 @@
         <img class="image" src="/resources/profile/ronindojo.png" />
         <span>RoninDojo</span>
       </a>
-      <a href="https://github.com/runcitadel/dashboard" target="_blank" title="Citadel">
+      <a href="https://github.com/runcitadel/core" target="_blank" title="Citadel">
         <img class="image" src="/resources/profile/runcitadel.svg" />
         <span>Citadel</span>
       </a>

From 1a22923cd8e5a21bf0c164fb11dcc74162bcc807 Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Thu, 6 Jan 2022 02:26:07 +0900
Subject: [PATCH 19/47] Migrate pools.json to the database in one command -
 Updated latest pools.json file from Blockchain-Known-Pools master

---
 backend/package.json                  |  3 +-
 backend/src/api/database-migration.ts |  2 +-
 backend/src/index.ts                  |  1 +
 frontend/cypress/fixtures/pools.json  | 72 ++++++++++++++++++++++++---
 4 files changed, 70 insertions(+), 8 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index a5c9a32ff..594e25427 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -25,7 +25,8 @@
     "build": "npm run tsc",
     "start": "node --max-old-space-size=2048 dist/index.js",
     "start-production": "node --max-old-space-size=4096 dist/index.js",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "migrate-pools": "npm run tsc ; node dist/api/pools-parser.js"
   },
   "dependencies": {
     "@mempool/bitcoin": "^3.0.3",
diff --git a/backend/src/api/database-migration.ts b/backend/src/api/database-migration.ts
index a375b7bf4..efdf6755c 100644
--- a/backend/src/api/database-migration.ts
+++ b/backend/src/api/database-migration.ts
@@ -350,4 +350,4 @@ class DatabaseMigration {
   }
 }
 
-export default new DatabaseMigration();
\ No newline at end of file
+export default new DatabaseMigration();
diff --git a/backend/src/index.ts b/backend/src/index.ts
index 9e4dcee35..420c60365 100644
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -25,6 +25,7 @@ import databaseMigration from './api/database-migration';
 import poolsParser from './api/pools-parser';
 import syncAssets from './sync-assets';
 import icons from './api/liquid/icons';
+import poolsParser from './api/pools-parser';
 import { Common } from './api/common';
 
 class Server {
diff --git a/frontend/cypress/fixtures/pools.json b/frontend/cypress/fixtures/pools.json
index ab198b6d0..55c91a99a 100644
--- a/frontend/cypress/fixtures/pools.json
+++ b/frontend/cypress/fixtures/pools.json
@@ -488,10 +488,14 @@
             "name" : "Binance Pool",
             "link" : "https://pool.binance.com/"
         },
-        "/Minerium.com/" : {
+        "/Mined in the USA by: /Minerium.com/" : {
             "name" : "Minerium",
             "link" : "https://www.minerium.com/"
         },
+        "/Minerium.com/" : {
+            "name" : "Minerium",
+            "link" : "https://www.minerium.com/"
+        },        
         "/Buffett/": {
             "name" : "Lubian.com",
             "link" : ""
@@ -504,15 +508,15 @@
             "name" : "OKKONG",
             "link" : "https://hash.okkong.com"
         },
-        "/TMSPOOL/" : {
-            "name" : "TMSPool",
+        "/AAOPOOL/" : {
+            "name" : "AAO Pool",
             "link" : "https://btc.tmspool.top"
         },
         "/one_more_mcd/" : {
             "name" : "EMCDPool",
             "link" : "https://pool.emcd.io"
         },
-        "/Foundry USA Pool #dropgold/" : {
+        "Foundry USA Pool" : {
             "name" : "Foundry USA",
             "link" : "https://foundrydigital.com/"
         },
@@ -539,9 +543,29 @@
         "/PureBTC.COM/": {
             "name": "PureBTC.COM",
             "link": "https://purebtc.com"
+        },
+        "MARA Pool": {
+            "name": "MARA Pool",
+            "link": "https://marapool.com"
+        },
+        "KuCoinPool": {
+            "name": "KuCoinPool",
+            "link": "https://www.kucoin.com/mining-pool/"
+        },
+        "Entrustus" : {
+            "name": "Entrust Charity Pool",
+            "link": "pool.entustus.org"
         }
     },
     "payout_addresses" : {
+        "1MkCDCzHpBsYQivp8MxjY5AkTGG1f2baoe": {
+            "name": "Luxor",
+            "link": "https://mining.luxor.tech"
+        },
+        "1ArTPjj6pV3aNRhLPjJVPYoxB98VLBzUmb": {
+            "name" : "KuCoinPool",
+            "link" : "https://www.kucoin.com/mining-pool/"
+         },
         "3Bmb9Jig8A5kHdDSxvDZ6eryj3AXd3swuJ": {
             "name" : "NovaBlock",
             "link" : "https://novablock.com"
@@ -606,7 +630,7 @@
             "name" : "BitMinter",
             "link" : "http://bitminter.com/"
         },
-        "15xiShqUqerfjFdyfgBH1K7Gwp6cbYmsTW " : {
+        "15xiShqUqerfjFdyfgBH1K7Gwp6cbYmsTW" : {
             "name" : "EclipseMC",
             "link" : "https://eclipsemc.com/"
         },
@@ -634,6 +658,14 @@
             "name" : "Huobi.pool",
             "link" : "https://www.hpt.com/"
         },
+        "1BDbsWi3Mrcjp1wdop3PWFNCNZtu4R7Hjy" : {
+            "name" : "EMCDPool",
+            "link" : "https://pool.emcd.io"
+        },
+        "12QVFmJH2b4455YUHkMpEnWLeRY3eJ4Jb5" : {
+            "name" : "AAO Pool",
+            "link" : "https://btc.tmspool.top "
+        },
         "1ALA5v7h49QT7WYLcRsxcXqXUqEqaWmkvw" : {
             "name" : "CloudHashing",
             "link" : "https://cloudhashing.com/"
@@ -934,6 +966,22 @@
             "name" : "Poolin",
             "link" : "https://www.poolin.com/"
         },
+        "1E8CZo2S3CqWg1VZSJNFCTbtT8hZPuQ2kB" : {
+            "name" : "Poolin",
+            "link" : "https://www.poolin.com/"
+        },
+        "14sA8jqYQgMRQV9zUtGFvpeMEw7YDn77SK" : {
+            "name" : "Poolin",
+            "link" : "https://www.poolin.com/"
+        },
+        "1GNgwA8JfG7Kc8akJ8opdNWJUihqUztfPe" : {
+            "name" : "Poolin",
+            "link" : "https://www.poolin.com/"
+        },
+        "17tUZLvy3X2557JGhceXRiij2TNYuhRr4r" : {
+            "name" : "Poolin",
+            "link" : "https://www.poolin.com/"
+        },
         "12Taz8FFXQ3E2AGn3ZW1SZM5bLnYGX4xR6" : {
             "name" : "Tangpool",
             "link" : "http://www.tangpool.com/"
@@ -1126,6 +1174,10 @@
             "name" : "Binance Pool",
             "link" : "https://pool.binance.com/"
         },
+        "1JvXhnHCi6XqcanvrZJ5s2Qiv4tsmm2UMy": {
+            "name" : "Binance Pool",
+            "link" : "https://pool.binance.com/"
+        },
         "34Jpa4Eu3ApoPVUKNTN2WeuXVVq1jzxgPi": {
             "name" : "Lubian.com",
             "link" : "http://www.lubian.com/"
@@ -1173,6 +1225,14 @@
         "3CLigLYNkrtoNgNcUwTaKoUSHCwr9W851W": {
             "name": "Rawpool",
             "link": "https://www.rawpool.com"
+        },
+        "bc1qf274x7penhcd8hsv3jcmwa5xxzjl2a6pa9pxwm": {
+            "name" : "F2Pool",
+            "link" : "https://www.f2pool.com/"
+        },
+        "1A32KFEX7JNPmU1PVjrtiXRrTQcesT3Nf1": {
+            "name": "MARA Pool",
+            "link": "https://marapool.com"
         }
     }
-}
+}
\ No newline at end of file

From 031f69a403e69220d12d7388b8b5fcaafb30597b Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Mon, 3 Jan 2022 11:47:04 +0900
Subject: [PATCH 20/47] Add backend README - Backend watchers setup

---
 backend/README.md | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 backend/README.md

diff --git a/backend/README.md b/backend/README.md
new file mode 100644
index 000000000..a6d0fb60f
--- /dev/null
+++ b/backend/README.md
@@ -0,0 +1,33 @@
+# Setup backend watchers
+
+The backend is static. Typescript scripts are compiled into the `dist` folder and served through a node web server.
+
+You can avoid the manual shutdown/recompile/restart command line cycle by setting up watchers.
+
+Make sure you are in the `backend` directory `cd backend`.
+
+1. Install nodemon 
+```
+sudo npm install -g nodemon
+```
+2. [Optional] Add the following configuration into `tsconfig.json`. You can find watch options here https://www.typescriptlang.org/docs/handbook/configuring-watch.html
+```
+    "watchOptions": {
+      "watchFile": "useFsEvents",
+      "watchDirectory": "useFsEvents",
+      "fallbackPolling": "dynamicPriority",
+      "synchronousWatchDirectory": true,
+      "excludeDirectories": ["**/node_modules", "_build"],
+      "excludeFiles": ["build/fileWhichChangesOften.ts"]
+    }
+```
+3. In one terminal, watch typescript scripts
+```
+./node_modules/typescript/bin/tsc --watch
+```
+4. In another terminal, watch compiled javascript
+```
+nodemon --max-old-space-size=2048 dist/index.js
+```
+
+Everytime you save a backend `.ts` file, `tsc` will recompile it and genereate a new static `.js` file in the `dist` folder. `nodemon` will detect this new file and restart the node web server automatically.

From 37031ec9139be270d7e93ae4ef6354700c3f7280 Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Wed, 5 Jan 2022 15:41:14 +0900
Subject: [PATCH 21/47] Refactor blocks.ts and index 10k block headers at
 launch

---
 backend/src/api/blocks.ts                    | 183 +++++++++++++++----
 backend/src/api/mempool.ts                   |  10 +-
 backend/src/api/transaction-utils.ts         |   8 +
 backend/src/index.ts                         |  10 +-
 backend/src/mempool.interfaces.ts            |   8 +
 backend/src/repositories/BlocksRepository.ts |  73 ++++++++
 backend/src/repositories/PoolsRepository.ts  |  30 +++
 7 files changed, 275 insertions(+), 47 deletions(-)
 create mode 100644 backend/src/repositories/BlocksRepository.ts
 create mode 100644 backend/src/repositories/PoolsRepository.ts

diff --git a/backend/src/api/blocks.ts b/backend/src/api/blocks.ts
index 1043c344f..c9bb46754 100644
--- a/backend/src/api/blocks.ts
+++ b/backend/src/api/blocks.ts
@@ -2,11 +2,15 @@ import config from '../config';
 import bitcoinApi from './bitcoin/bitcoin-api-factory';
 import logger from '../logger';
 import memPool from './mempool';
-import { BlockExtended, TransactionExtended } from '../mempool.interfaces';
+import { BlockExtended, PoolTag, TransactionExtended, TransactionMinerInfo } from '../mempool.interfaces';
 import { Common } from './common';
 import diskCache from './disk-cache';
 import transactionUtils from './transaction-utils';
 import bitcoinClient from './bitcoin/bitcoin-client';
+import { DB } from '../database';
+import { IEsploraApi } from './bitcoin/esplora-api.interface';
+import poolsRepository from '../repositories/PoolsRepository';
+import blocksRepository from '../repositories/BlocksRepository';
 
 class Blocks {
   private blocks: BlockExtended[] = [];
@@ -30,6 +34,137 @@ class Blocks {
     this.newBlockCallbacks.push(fn);
   }
 
+  /**
+   * Return the list of transaction for a block
+   * @param blockHash
+   * @param blockHeight
+   * @param onlyCoinbase - Set to true if you only need the coinbase transaction
+   * @returns Promise<TransactionExtended[]>
+   */
+  private async $getTransactionsExtended(blockHash: string, blockHeight: number, onlyCoinbase: boolean) : Promise<TransactionExtended[]> {
+    const transactions: TransactionExtended[] = [];
+    const txIds: string[] = await bitcoinApi.$getTxIdsForBlock(blockHash);
+
+    const mempool = memPool.getMempool();
+    let transactionsFound = 0;
+    let transactionsFetched = 0;
+
+    for (let i = 0; i < txIds.length; i++) {
+      if (mempool[txIds[i]]) {
+        // We update blocks before the mempool (index.ts), therefore we can
+        // optimize here by directly fetching txs in the "outdated" mempool
+        transactions.push(mempool[txIds[i]]);
+        transactionsFound++;
+      } else if (config.MEMPOOL.BACKEND === 'esplora' || memPool.isInSync() || i === 0) {
+        // Otherwise we fetch the tx data through backend services (esplora, electrum, core rpc...)
+        if (i % (Math.round((txIds.length) / 10)) === 0 || i + 1 === txIds.length) { // Avoid log spam
+          logger.debug(`Indexing tx ${i + 1} of ${txIds.length} in block #${blockHeight}`);
+        }
+        try {
+          const tx = await transactionUtils.$getTransactionExtended(txIds[i]);
+          transactions.push(tx);
+          transactionsFetched++;
+        } catch (e) {
+          logger.debug('Error fetching block tx: ' + (e instanceof Error ? e.message : e));
+          if (i === 0) {
+            throw new Error('Failed to fetch Coinbase transaction: ' + txIds[i]);
+          }
+        }
+      }
+
+      if (onlyCoinbase === true) {
+        break; // Fetch the first transaction and exit
+      }
+    }
+
+    transactions.forEach((tx) => {
+      if (!tx.cpfpChecked) {
+        Common.setRelativesAndGetCpfpInfo(tx, mempool); // Child Pay For Parent
+      }
+    });
+
+    logger.debug(`${transactionsFound} of ${txIds.length} found in mempool. ${transactionsFetched} fetched through backend service.`);
+
+    return transactions;
+  }
+
+  /**
+   * Return a block with additional data (reward, coinbase, fees...)
+   * @param block
+   * @param transactions
+   * @returns BlockExtended
+   */
+  private getBlockExtended(block: IEsploraApi.Block, transactions: TransactionExtended[]) : BlockExtended {
+    const blockExtended: BlockExtended = Object.assign({}, block);
+    blockExtended.reward = transactions[0].vout.reduce((acc, curr) => acc + curr.value, 0);
+    blockExtended.coinbaseTx = transactionUtils.stripCoinbaseTransaction(transactions[0]);
+
+    const transactionsTmp = [...transactions];
+    transactionsTmp.shift();
+    transactionsTmp.sort((a, b) => b.effectiveFeePerVsize - a.effectiveFeePerVsize);
+    blockExtended.medianFee = transactionsTmp.length > 0 ? Common.median(transactionsTmp.map((tx) => tx.effectiveFeePerVsize)) : 0;
+    blockExtended.feeRange = transactionsTmp.length > 0 ? Common.getFeesInRange(transactionsTmp, 8) : [0, 0];
+
+    return blockExtended;
+  }
+
+  /**
+   * Try to find which miner found the block
+   * @param txMinerInfo
+   * @returns
+   */
+  private async $findBlockMiner(txMinerInfo: TransactionMinerInfo | undefined) : Promise<PoolTag> {
+    if (txMinerInfo === undefined) {
+      return poolsRepository.getUnknownPool();
+    }
+
+    const asciiScriptSig = transactionUtils.hex2ascii(txMinerInfo.vin[0].scriptsig);
+    const address = txMinerInfo.vout[0].scriptpubkey_address;
+
+    const pools: PoolTag[] = await poolsRepository.$getPools();
+    for (let i = 0; i < pools.length; ++i) {
+      if (address !== undefined) {
+        let addresses: string[] = JSON.parse(pools[i].addresses);
+        if (addresses.indexOf(address) !== -1) {
+          return pools[i];
+        }
+      }
+
+      let regexes: string[] = JSON.parse(pools[i].regexes);
+      for (let y = 0; y < regexes.length; ++y) {
+        let match = asciiScriptSig.match(regexes[y]);
+        if (match !== null) {
+          return pools[i];
+        }
+      }
+    }
+
+    return poolsRepository.getUnknownPool();
+  }
+
+  /**
+   * Index all blocks metadata for the mining dashboard
+   */
+  public async $generateBlockDatabase() {
+    let currentBlockHeight = await bitcoinApi.$getBlockHeightTip();
+    let maxBlocks = 100; // tmp
+
+    while (currentBlockHeight-- > 0 && maxBlocks-- > 0) {
+      if (await blocksRepository.$isBlockAlreadyIndexed(currentBlockHeight)) {
+        // logger.debug(`Block #${currentBlockHeight} already indexed, skipping`);
+        continue;
+      }
+      logger.debug(`Indexing block #${currentBlockHeight}`);
+      const blockHash = await bitcoinApi.$getBlockHash(currentBlockHeight);
+      const block = await bitcoinApi.$getBlock(blockHash);
+      const transactions = await this.$getTransactionsExtended(blockHash, block.height, true);
+      const blockExtended = this.getBlockExtended(block, transactions);
+      const miner = await this.$findBlockMiner(blockExtended.coinbaseTx);
+      const coinbase: IEsploraApi.Transaction = await bitcoinApi.$getRawTransaction(transactions[0].txid, true);
+      await blocksRepository.$saveBlockInDatabase(blockExtended, blockHash, coinbase.hex, miner);
+    }
+  }
+
   public async $updateBlocks() {
     const blockHeightTip = await bitcoinApi.$getBlockHeightTip();
 
@@ -70,48 +205,14 @@ class Blocks {
         logger.debug(`New block found (#${this.currentBlockHeight})!`);
       }
 
-      const transactions: TransactionExtended[] = [];
-
       const blockHash = await bitcoinApi.$getBlockHash(this.currentBlockHeight);
       const block = await bitcoinApi.$getBlock(blockHash);
       const txIds: string[] = await bitcoinApi.$getTxIdsForBlock(blockHash);
-
-      const mempool = memPool.getMempool();
-      let transactionsFound = 0;
-
-      for (let i = 0; i < txIds.length; i++) {
-        if (mempool[txIds[i]]) {
-          transactions.push(mempool[txIds[i]]);
-          transactionsFound++;
-        } else if (config.MEMPOOL.BACKEND === 'esplora' || memPool.isInSync() || i === 0) {
-          logger.debug(`Fetching block tx ${i} of ${txIds.length}`);
-          try {
-            const tx = await transactionUtils.$getTransactionExtended(txIds[i]);
-            transactions.push(tx);
-          } catch (e) {
-            logger.debug('Error fetching block tx: ' + (e instanceof Error ? e.message : e));
-            if (i === 0) {
-              throw new Error('Failed to fetch Coinbase transaction: ' + txIds[i]);
-            }
-          }
-        }
-      }
-
-      transactions.forEach((tx) => {
-        if (!tx.cpfpChecked) {
-          Common.setRelativesAndGetCpfpInfo(tx, mempool);
-        }
-      });
-
-      logger.debug(`${transactionsFound} of ${txIds.length} found in mempool. ${txIds.length - transactionsFound} not found.`);
-
-      const blockExtended: BlockExtended = Object.assign({}, block);
-      blockExtended.reward = transactions[0].vout.reduce((acc, curr) => acc + curr.value, 0);
-      blockExtended.coinbaseTx = transactionUtils.stripCoinbaseTransaction(transactions[0]);
-      transactions.shift();
-      transactions.sort((a, b) => b.effectiveFeePerVsize - a.effectiveFeePerVsize);
-      blockExtended.medianFee = transactions.length > 0 ? Common.median(transactions.map((tx) => tx.effectiveFeePerVsize)) : 0;
-      blockExtended.feeRange = transactions.length > 0 ? Common.getFeesInRange(transactions, 8) : [0, 0];
+      const transactions = await this.$getTransactionsExtended(blockHash, block.height, false);
+      const blockExtended: BlockExtended = this.getBlockExtended(block, transactions);
+      const miner = await this.$findBlockMiner(blockExtended.coinbaseTx);
+      const coinbase: IEsploraApi.Transaction = await bitcoinApi.$getRawTransaction(transactions[0].txid, true);
+      await blocksRepository.$saveBlockInDatabase(blockExtended, blockHash, coinbase.hex, miner);
 
       if (block.height % 2016 === 0) {
         this.previousDifficultyRetarget = (block.difficulty - this.currentDifficulty) / this.currentDifficulty * 100;
@@ -130,6 +231,8 @@ class Blocks {
       if (memPool.isInSync()) {
         diskCache.$saveCacheToDisk();
       }
+
+      return;
     }
   }
 
diff --git a/backend/src/api/mempool.ts b/backend/src/api/mempool.ts
index 4d6c35860..859912f6c 100644
--- a/backend/src/api/mempool.ts
+++ b/backend/src/api/mempool.ts
@@ -118,11 +118,11 @@ class Mempool {
             });
           }
           hasChange = true;
-          if (diff > 0) {
-            logger.debug('Fetched transaction ' + txCount + ' / ' + diff);
-          } else {
-            logger.debug('Fetched transaction ' + txCount);
-          }
+          // if (diff > 0) {
+          //   logger.debug('Fetched transaction ' + txCount + ' / ' + diff);
+          // } else {
+          //   logger.debug('Fetched transaction ' + txCount);
+          // }
           newTransactions.push(transaction);
         } catch (e) {
           logger.debug('Error finding transaction in mempool: ' + (e instanceof Error ? e.message : e));
diff --git a/backend/src/api/transaction-utils.ts b/backend/src/api/transaction-utils.ts
index 1496b810b..2e669d709 100644
--- a/backend/src/api/transaction-utils.ts
+++ b/backend/src/api/transaction-utils.ts
@@ -44,6 +44,14 @@ class TransactionUtils {
     }
     return transactionExtended;
   }
+
+  public hex2ascii(hex: string) {
+    let str = '';
+    for (let i = 0; i < hex.length; i += 2) {
+      str += String.fromCharCode(parseInt(hex.substr(i, 2), 16));
+    }
+    return str;
+  }
 }
 
 export default new TransactionUtils();
diff --git a/backend/src/index.ts b/backend/src/index.ts
index 420c60365..be26d53fe 100644
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -25,7 +25,6 @@ import databaseMigration from './api/database-migration';
 import poolsParser from './api/pools-parser';
 import syncAssets from './sync-assets';
 import icons from './api/liquid/icons';
-import poolsParser from './api/pools-parser';
 import { Common } from './api/common';
 
 class Server {
@@ -33,6 +32,7 @@ class Server {
   private server: http.Server | undefined;
   private app: Express;
   private currentBackendRetryInterval = 5;
+  private blockIndexingStarted = false;
 
   constructor() {
     this.app = express();
@@ -90,7 +90,6 @@ class Server {
       await checkDbConnection();
       try {
         await databaseMigration.$initializeOrMigrateDatabase();
-        await poolsParser.migratePoolsJson();
       } catch (e) {
         throw new Error(e instanceof Error ? e.message : 'Error');
       }
@@ -139,6 +138,13 @@ class Server {
       }
       await blocks.$updateBlocks();
       await memPool.$updateMempool();
+
+      if (this.blockIndexingStarted === false/* && memPool.isInSync()*/) {
+        blocks.$generateBlockDatabase();
+        this.blockIndexingStarted = true;
+        logger.info("START OLDER BLOCK INDEXING");
+      }
+
       setTimeout(this.runMainUpdateLoop.bind(this), config.MEMPOOL.POLL_RATE_MS);
       this.currentBackendRetryInterval = 5;
     } catch (e) {
diff --git a/backend/src/mempool.interfaces.ts b/backend/src/mempool.interfaces.ts
index 2604a233c..ae921f073 100644
--- a/backend/src/mempool.interfaces.ts
+++ b/backend/src/mempool.interfaces.ts
@@ -1,5 +1,13 @@
+import { RowDataPacket } from 'mysql2';
 import { IEsploraApi } from './api/bitcoin/esplora-api.interface';
 
+export interface PoolTag extends RowDataPacket {
+  name: string,
+  link: string,
+  regexes: string,
+  addresses: string,
+}
+
 export interface MempoolBlock {
   blockSize: number;
   blockVSize: number;
diff --git a/backend/src/repositories/BlocksRepository.ts b/backend/src/repositories/BlocksRepository.ts
new file mode 100644
index 000000000..f62b261a1
--- /dev/null
+++ b/backend/src/repositories/BlocksRepository.ts
@@ -0,0 +1,73 @@
+import { IEsploraApi } from "../api/bitcoin/esplora-api.interface";
+import { BlockExtended, PoolTag } from "../mempool.interfaces";
+import { DB } from "../database";
+import logger from "../logger";
+import bitcoinApi from '../api/bitcoin/bitcoin-api-factory';
+
+class BlocksRepository {
+  /**
+   * Save indexed block data in the database
+   * @param block 
+   * @param blockHash 
+   * @param coinbaseTxid 
+   * @param poolTag 
+   */
+  public async $saveBlockInDatabase(
+    block: BlockExtended,
+    blockHash: string,
+    coinbaseHex: string | undefined,
+    poolTag: PoolTag
+  ) {
+    const connection = await DB.pool.getConnection();
+
+    try {
+      const query = `INSERT INTO blocks(
+        height,  hash,     timestamp,    size,
+        weight,  tx_count, coinbase_raw, difficulty,
+        pool_id, fees,     fee_span,     median_fee
+      ) VALUE (
+        ?, ?, ?, ?,
+        ?, ?, ?, ?,
+        ?, ?, ?, ?
+      )`;
+
+      const params: any[] = [
+        block.height, blockHash, block.timestamp, block.size,
+        block.weight, block.tx_count, coinbaseHex ? coinbaseHex : "", block.difficulty,
+        poolTag.id, 0, "[]", block.medianFee,
+      ];
+
+      await connection.query(query, params);
+    } catch (e) {
+      console.log(e);
+      logger.err('$updateBlocksDatabase() error' + (e instanceof Error ? e.message : e));
+    }
+
+    connection.release();
+  }
+
+  /**
+   * Check if a block has already been indexed in the database. Query the databse directly.
+   * This can be cached/optimized if required later on to avoid too many db queries.
+   * @param blockHeight
+   * @returns
+   */
+  public async $isBlockAlreadyIndexed(blockHeight: number) {
+    const connection = await DB.pool.getConnection();
+    let exists = false;
+
+    try {
+      const query = `SELECT height from blocks where blocks.height = ${blockHeight}`;
+      const [rows]: any[] = await connection.query(query);
+      exists = rows.length === 1;
+    } catch (e) {
+      console.log(e);
+      logger.err('$isBlockAlreadyIndexed() error' + (e instanceof Error ? e.message : e));
+    }
+    connection.release();
+
+    return exists;
+  }
+}
+
+export default new BlocksRepository();
\ No newline at end of file
diff --git a/backend/src/repositories/PoolsRepository.ts b/backend/src/repositories/PoolsRepository.ts
new file mode 100644
index 000000000..aa6f457f2
--- /dev/null
+++ b/backend/src/repositories/PoolsRepository.ts
@@ -0,0 +1,30 @@
+import { FieldPacket } from "mysql2";
+import { DB } from "../database";
+import { PoolTag } from "../mempool.interfaces"
+
+class PoolsRepository {
+  /**
+   * Get all pools tagging info
+   */
+  public async $getPools() : Promise<PoolTag[]> {
+    const connection = await DB.pool.getConnection();
+    const [rows]: [PoolTag[], FieldPacket[]] = await connection.query("SELECT * FROM pools;");        
+    connection.release();
+    return rows;
+  }
+
+  /**
+   * Get unknown pool tagging info
+   */
+  public getUnknownPool(): PoolTag {
+    return <PoolTag>{
+      id: null,
+      name: 'Unknown',
+      link: 'rickroll?',
+      regexes: "[]",
+      addresses: "[]",
+    };
+  } 
+}
+
+export default new PoolsRepository();
\ No newline at end of file

From bfe9f99c35951325c57d3b13197b7119f641901c Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Thu, 6 Jan 2022 19:59:33 +0900
Subject: [PATCH 22/47] Generate mining basic pool ranking (sorted by block
 found) for a specified timeframe

---
 backend/src/api/bitcoin/bitcoin-api.ts        |   5 +
 backend/src/api/blocks.ts                     |   6 +-
 backend/src/api/mining.ts                     |  53 +++++++++
 backend/src/index.ts                          |   1 +
 backend/src/mempool.interfaces.ts             |  20 +++-
 backend/src/repositories/BlocksRepository.ts  |  57 +++++++---
 backend/src/repositories/PoolsRepository.ts   |  41 ++++---
 backend/src/routes.ts                         |  10 ++
 frontend/server.ts                            |   2 +-
 frontend/src/app/app-routing.module.ts        |   5 +
 frontend/src/app/app.module.ts                |   2 +
 .../pool-ranking/pool-ranking.component.html  |  68 ++++++++++++
 .../pool-ranking/pool-ranking.component.ts    | 103 ++++++++++++++++++
 .../src/app/interfaces/node-api.interface.ts  |  13 +++
 frontend/src/app/services/api.service.ts      |   7 +-
 frontend/src/app/services/storage.service.ts  |  21 ++--
 16 files changed, 366 insertions(+), 48 deletions(-)
 create mode 100644 backend/src/api/mining.ts
 create mode 100644 frontend/src/app/components/pool-ranking/pool-ranking.component.html
 create mode 100644 frontend/src/app/components/pool-ranking/pool-ranking.component.ts

diff --git a/backend/src/api/bitcoin/bitcoin-api.ts b/backend/src/api/bitcoin/bitcoin-api.ts
index b0a04116f..75d3e6e8f 100644
--- a/backend/src/api/bitcoin/bitcoin-api.ts
+++ b/backend/src/api/bitcoin/bitcoin-api.ts
@@ -115,6 +115,11 @@ class BitcoinApi implements AbstractBitcoinApi {
     return outSpends;
   }
 
+  $getEstimatedHashrate(blockHeight: number): Promise<number> {
+    // 120 is the default block span in Core
+    return this.bitcoindClient.getNetworkHashPs(120, blockHeight);
+  }
+
   protected async $convertTransaction(transaction: IBitcoinApi.Transaction, addPrevout: boolean): Promise<IEsploraApi.Transaction> {
     let esploraTransaction: IEsploraApi.Transaction = {
       txid: transaction.txid,
diff --git a/backend/src/api/blocks.ts b/backend/src/api/blocks.ts
index c9bb46754..4f1e17101 100644
--- a/backend/src/api/blocks.ts
+++ b/backend/src/api/blocks.ts
@@ -115,7 +115,7 @@ class Blocks {
    */
   private async $findBlockMiner(txMinerInfo: TransactionMinerInfo | undefined) : Promise<PoolTag> {
     if (txMinerInfo === undefined) {
-      return poolsRepository.getUnknownPool();
+      return await poolsRepository.$getUnknownPool();
     }
 
     const asciiScriptSig = transactionUtils.hex2ascii(txMinerInfo.vin[0].scriptsig);
@@ -139,7 +139,7 @@ class Blocks {
       }
     }
 
-    return poolsRepository.getUnknownPool();
+    return await poolsRepository.$getUnknownPool();
   }
 
   /**
@@ -147,7 +147,7 @@ class Blocks {
    */
   public async $generateBlockDatabase() {
     let currentBlockHeight = await bitcoinApi.$getBlockHeightTip();
-    let maxBlocks = 100; // tmp
+    let maxBlocks = 1008*2; // tmp
 
     while (currentBlockHeight-- > 0 && maxBlocks-- > 0) {
       if (await blocksRepository.$isBlockAlreadyIndexed(currentBlockHeight)) {
diff --git a/backend/src/api/mining.ts b/backend/src/api/mining.ts
new file mode 100644
index 000000000..d22a29d5b
--- /dev/null
+++ b/backend/src/api/mining.ts
@@ -0,0 +1,53 @@
+import { PoolInfo, PoolStats } from "../mempool.interfaces";
+import BlocksRepository, { EmptyBlocks } from "../repositories/BlocksRepository";
+import PoolsRepository from "../repositories/PoolsRepository";
+import bitcoinClient from "./bitcoin/bitcoin-client";
+import BitcoinApi from "./bitcoin/bitcoin-api";
+
+class Mining {
+  private bitcoinApi: BitcoinApi;
+
+  constructor() {
+    this.bitcoinApi = new BitcoinApi(bitcoinClient);
+  }
+
+  /**
+   * Generate high level overview of the pool ranks and general stats
+   */
+  public async $getPoolsStats(interval: string = "100 YEAR") : Promise<object> {
+    let poolsStatistics = {};
+
+    const lastBlockHashrate = await this.bitcoinApi.$getEstimatedHashrate(717960);
+    const poolsInfo: PoolInfo[] = await PoolsRepository.$getPoolsInfo(interval);
+    const blockCount: number = await BlocksRepository.$blockCount(interval);
+    const emptyBlocks: EmptyBlocks[] = await BlocksRepository.$countEmptyBlocks(interval);
+
+    let poolsStats: PoolStats[] = [];
+    let rank = 1;
+
+    poolsInfo.forEach((poolInfo: PoolInfo) => {
+      let poolStat: PoolStats = {
+        poolId: poolInfo.poolId, // mysql row id
+        name: poolInfo.name,
+        link: poolInfo.link,
+        blockCount: poolInfo.blockCount,
+        rank: rank++,
+        emptyBlocks: 0, 
+      }
+      for (let i = 0; i < emptyBlocks.length; ++i) {
+        if (emptyBlocks[i].poolId === poolInfo.poolId) {
+          poolStat.emptyBlocks++;
+        }
+      }
+      poolsStats.push(poolStat);
+    })
+
+    poolsStatistics["blockCount"] = blockCount;
+    poolsStatistics["poolsStats"] = poolsStats;
+    poolsStatistics["lastEstimatedHashrate"] = lastBlockHashrate;
+
+    return poolsStatistics;
+  }
+}
+
+export default new Mining();
\ No newline at end of file
diff --git a/backend/src/index.ts b/backend/src/index.ts
index be26d53fe..bf3abf01f 100644
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -261,6 +261,7 @@ class Server {
         .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/1y', routes.$getStatisticsByTime.bind(routes, '1y'))
         .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/2y', routes.$getStatisticsByTime.bind(routes, '2y'))
         .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/3y', routes.$getStatisticsByTime.bind(routes, '3y'))
+        .get(config.MEMPOOL.API_URL_PREFIX + 'pools', routes.getPools)
         ;
     }
 
diff --git a/backend/src/mempool.interfaces.ts b/backend/src/mempool.interfaces.ts
index ae921f073..5fb83d792 100644
--- a/backend/src/mempool.interfaces.ts
+++ b/backend/src/mempool.interfaces.ts
@@ -1,11 +1,23 @@
-import { RowDataPacket } from 'mysql2';
 import { IEsploraApi } from './api/bitcoin/esplora-api.interface';
 
-export interface PoolTag extends RowDataPacket {
+export interface PoolTag {
+  id: number | null, // mysql row id
   name: string,
   link: string,
-  regexes: string,
-  addresses: string,
+  regexes: string, // JSON array
+  addresses: string, // JSON array
+}
+
+export interface PoolInfo {
+  poolId: number, // mysql row id
+  name: string,
+  link: string,
+  blockCount: number,
+}
+
+export interface PoolStats extends PoolInfo {
+  rank: number,
+  emptyBlocks: number,
 }
 
 export interface MempoolBlock {
diff --git a/backend/src/repositories/BlocksRepository.ts b/backend/src/repositories/BlocksRepository.ts
index f62b261a1..9802a0a74 100644
--- a/backend/src/repositories/BlocksRepository.ts
+++ b/backend/src/repositories/BlocksRepository.ts
@@ -1,16 +1,15 @@
-import { IEsploraApi } from "../api/bitcoin/esplora-api.interface";
 import { BlockExtended, PoolTag } from "../mempool.interfaces";
 import { DB } from "../database";
 import logger from "../logger";
-import bitcoinApi from '../api/bitcoin/bitcoin-api-factory';
+
+export interface EmptyBlocks {
+  emptyBlocks: number,
+  poolId: number,
+}
 
 class BlocksRepository {
   /**
    * Save indexed block data in the database
-   * @param block 
-   * @param blockHash 
-   * @param coinbaseTxid 
-   * @param poolTag 
    */
   public async $saveBlockInDatabase(
     block: BlockExtended,
@@ -26,7 +25,7 @@ class BlocksRepository {
         weight,  tx_count, coinbase_raw, difficulty,
         pool_id, fees,     fee_span,     median_fee
       ) VALUE (
-        ?, ?, ?, ?,
+        ?, ?, FROM_UNIXTIME(?), ?,
         ?, ?, ?, ?,
         ?, ?, ?, ?
       )`;
@@ -49,25 +48,49 @@ class BlocksRepository {
   /**
    * Check if a block has already been indexed in the database. Query the databse directly.
    * This can be cached/optimized if required later on to avoid too many db queries.
-   * @param blockHeight
-   * @returns
    */
   public async $isBlockAlreadyIndexed(blockHeight: number) {
     const connection = await DB.pool.getConnection();
     let exists = false;
 
-    try {
-      const query = `SELECT height from blocks where blocks.height = ${blockHeight}`;
-      const [rows]: any[] = await connection.query(query);
-      exists = rows.length === 1;
-    } catch (e) {
-      console.log(e);
-      logger.err('$isBlockAlreadyIndexed() error' + (e instanceof Error ? e.message : e));
-    }
+    const query = `SELECT height from blocks where blocks.height = ${blockHeight}`;
+    const [rows]: any[] = await connection.query(query);
+    exists = rows.length === 1;
     connection.release();
 
     return exists;
   }
+
+  /**
+   * Count empty blocks for all pools
+   */
+  public async $countEmptyBlocks(interval: string = "100 YEAR") : Promise<EmptyBlocks[]> {
+    const connection = await DB.pool.getConnection();
+    const [rows] = await connection.query(`
+      SELECT pool_id as poolId
+      FROM blocks
+      WHERE timestamp BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()
+      AND tx_count = 1;
+    `);
+    connection.release();
+
+    return <EmptyBlocks[]>rows;
+  }
+
+  /**
+   * Get blocks count for a period
+   */
+   public async $blockCount(interval: string = "100 YEAR") : Promise<number> {
+    const connection = await DB.pool.getConnection();
+    const [rows] = await connection.query(`
+      SELECT count(height) as blockCount
+      FROM blocks
+      WHERE timestamp BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW();
+    `);
+    connection.release();
+
+    return <number>rows[0].blockCount;
+  }
 }
 
 export default new BlocksRepository();
\ No newline at end of file
diff --git a/backend/src/repositories/PoolsRepository.ts b/backend/src/repositories/PoolsRepository.ts
index aa6f457f2..bf3ee18e0 100644
--- a/backend/src/repositories/PoolsRepository.ts
+++ b/backend/src/repositories/PoolsRepository.ts
@@ -1,30 +1,43 @@
-import { FieldPacket } from "mysql2";
 import { DB } from "../database";
-import { PoolTag } from "../mempool.interfaces"
+import { PoolInfo, PoolTag } from "../mempool.interfaces"
 
 class PoolsRepository {
   /**
    * Get all pools tagging info
    */
-  public async $getPools() : Promise<PoolTag[]> {
+  public async $getPools(): Promise<PoolTag[]> {
     const connection = await DB.pool.getConnection();
-    const [rows]: [PoolTag[], FieldPacket[]] = await connection.query("SELECT * FROM pools;");        
+    const [rows] = await connection.query("SELECT * FROM pools;");
     connection.release();
-    return rows;
+    return <PoolTag[]>rows;
   }
 
   /**
    * Get unknown pool tagging info
    */
-  public getUnknownPool(): PoolTag {
-    return <PoolTag>{
-      id: null,
-      name: 'Unknown',
-      link: 'rickroll?',
-      regexes: "[]",
-      addresses: "[]",
-    };
-  } 
+  public async $getUnknownPool(): Promise<PoolTag> {
+    const connection = await DB.pool.getConnection();
+    const [rows] = await connection.query("SELECT * FROM pools where name = 'Unknown'");
+    connection.release();
+    return <PoolTag>rows[0];
+  }
+
+  /**
+   * Get basic pool info and block count
+   */
+  public async $getPoolsInfo(interval: string = "100 YEARS"): Promise<PoolInfo[]> {
+    const connection = await DB.pool.getConnection();
+    const [rows] = await connection.query(`
+      SELECT COUNT(height) as blockCount, pool_id as poolId, pools.name as name, pools.link as link
+      FROM blocks
+      JOIN pools on pools.id = pool_id
+      WHERE timestamp BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()
+      GROUP BY pool_id
+      ORDER BY COUNT(height) DESC;
+    `);
+    connection.release();
+    return <PoolInfo[]>rows;
+  }
 }
 
 export default new PoolsRepository();
\ No newline at end of file
diff --git a/backend/src/routes.ts b/backend/src/routes.ts
index 1d98c9f4e..b7956cd64 100644
--- a/backend/src/routes.ts
+++ b/backend/src/routes.ts
@@ -20,6 +20,7 @@ import { Common } from './api/common';
 import bitcoinClient from './api/bitcoin/bitcoin-client';
 import elementsParser from './api/liquid/elements-parser';
 import icons from './api/liquid/icons';
+import miningStats from './api/mining';
 
 class Routes {
   constructor() {}
@@ -531,6 +532,15 @@ class Routes {
     }
   }
 
+  public async getPools(req: Request, res: Response) {
+    try {
+      let stats = await miningStats.$getPoolsStats(req.query.interval as string);
+      res.json(stats);
+    } catch (e) {
+      res.status(500).send(e instanceof Error ? e.message : e);
+    }
+  }
+
   public async getBlock(req: Request, res: Response) {
     try {
       const result = await bitcoinApi.$getBlock(req.params.hash);
diff --git a/frontend/server.ts b/frontend/server.ts
index af27fcd08..059522a05 100644
--- a/frontend/server.ts
+++ b/frontend/server.ts
@@ -6,7 +6,6 @@ import * as express from 'express';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as domino from 'domino';
-import { createProxyMiddleware } from 'http-proxy-middleware';
 
 import { join } from 'path';
 import { AppServerModule } from './src/main.server';
@@ -66,6 +65,7 @@ export function app(locale: string): express.Express {
   server.get('/mempool-block/*', getLocalizedSSR(indexHtml));
   server.get('/address/*', getLocalizedSSR(indexHtml));
   server.get('/blocks', getLocalizedSSR(indexHtml));
+  server.get('/pools', getLocalizedSSR(indexHtml));
   server.get('/graphs', getLocalizedSSR(indexHtml));
   server.get('/liquid', getLocalizedSSR(indexHtml));
   server.get('/liquid/tx/*', getLocalizedSSR(indexHtml));
diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts
index 43705b85e..19e4ee7ab 100644
--- a/frontend/src/app/app-routing.module.ts
+++ b/frontend/src/app/app-routing.module.ts
@@ -22,6 +22,7 @@ import { BisqMasterPageComponent } from './components/bisq-master-page/bisq-mast
 import { SponsorComponent } from './components/sponsor/sponsor.component';
 import { LiquidMasterPageComponent } from './components/liquid-master-page/liquid-master-page.component';
 import { PushTransactionComponent } from './components/push-transaction/push-transaction.component';
+import { PoolRankingComponent } from './components/pool-ranking/pool-ranking.component';
 
 let routes: Routes = [
   {
@@ -58,6 +59,10 @@ let routes: Routes = [
         path: 'blocks',
         component: LatestBlocksComponent,
       },
+      {
+        path: 'pools',
+        component: PoolRankingComponent,
+      },
       {
         path: 'graphs',
         component: StatisticsComponent,
diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
index 3e2c40b25..b16c5bdea 100644
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -37,6 +37,7 @@ import { IncomingTransactionsGraphComponent } from './components/incoming-transa
 import { TimeSpanComponent } from './components/time-span/time-span.component';
 import { SeoService } from './services/seo.service';
 import { MempoolGraphComponent } from './components/mempool-graph/mempool-graph.component';
+import { PoolRankingComponent } from './components/pool-ranking/pool-ranking.component';
 import { LbtcPegsGraphComponent } from './components/lbtc-pegs-graph/lbtc-pegs-graph.component';
 import { AssetComponent } from './components/asset/asset.component';
 import { AssetsComponent } from './assets/assets.component';
@@ -91,6 +92,7 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
     FeeDistributionGraphComponent,
     IncomingTransactionsGraphComponent,
     MempoolGraphComponent,
+    PoolRankingComponent,
     LbtcPegsGraphComponent,
     AssetComponent,
     AssetsComponent,
diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.html b/frontend/src/app/components/pool-ranking/pool-ranking.component.html
new file mode 100644
index 000000000..9d38ced93
--- /dev/null
+++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.html
@@ -0,0 +1,68 @@
+<div class="container-xl">
+  <div class="card-header">
+    <i class="fa fa-area-chart"></i> <span i18n="mining.pools-by-vBytes">Pools</span>
+    <form [formGroup]="radioGroupForm" class="formRadioGroup" (click)="savePoolsPreference()">
+      <div class="btn-group btn-group-toggle" ngbRadioGroup name="radioBasic" formControlName="dateSpan">
+        <label ngbButtonLabel class="btn-primary btn-sm">
+          <input ngbButton type="radio" [value]="'1d'" [routerLink]="['/pools' | relativeUrl]" fragment="1d"> 1D
+        </label>
+        <label ngbButtonLabel class="btn-primary btn-sm">
+          <input ngbButton type="radio" [value]="'3d'" [routerLink]="['/pools' | relativeUrl]" fragment="3d"> 3D
+        </label>
+        <label ngbButtonLabel class="btn-primary btn-sm">
+          <input ngbButton type="radio" [value]="'1w'" [routerLink]="['/pools' | relativeUrl]" fragment="1w"> 1W
+        </label>
+        <label ngbButtonLabel class="btn-primary btn-sm">
+          <input ngbButton type="radio" [value]="'1m'" [routerLink]="['/pools' | relativeUrl]" fragment="1m"> 1M
+        </label>
+        <label ngbButtonLabel class="btn-primary btn-sm">
+          <input ngbButton type="radio" [value]="'3m'" [routerLink]="['/pools' | relativeUrl]" fragment="3m"> 3M
+        </label>
+        <label ngbButtonLabel class="btn-primary btn-sm">
+          <input ngbButton type="radio" [value]="'6m'" [routerLink]="['/pools' | relativeUrl]" fragment="6m"> 6M
+        </label>
+        <label ngbButtonLabel class="btn-primary btn-sm">
+          <input ngbButton type="radio" [value]="'1y'" [routerLink]="['/pools' | relativeUrl]" fragment="1y"> 1Y
+        </label>
+        <label ngbButtonLabel class="btn-primary btn-sm">
+          <input ngbButton type="radio" [value]="'2y'" [routerLink]="['/pools' | relativeUrl]" fragment="2y"> 2Y
+        </label>
+        <label ngbButtonLabel class="btn-primary btn-sm">
+          <input ngbButton type="radio" [value]="'3y'" [routerLink]="['/pools' | relativeUrl]" fragment="3y"> 3Y
+        </label>
+        <label ngbButtonLabel class="btn-primary btn-sm">
+          <input ngbButton type="radio" [value]="'all'" [routerLink]="['/pools' | relativeUrl]" fragment="all"> ALL
+        </label>
+      </div>
+    </form>
+  </div>
+
+  <table class="table table-borderless" [alwaysCallback]="true" infiniteScroll [infiniteScrollDistance]="1.5" [infiniteScrollUpDistance]="1.5" [infiniteScrollThrottle]="50">
+    <thead>
+      <th i18n="latest-blocks.height">Rank</th>
+      <th class="d-none d-md-block"i18n="latest-blocks.timestamp">Name</th>
+      <th i18n="latest-blocks.timestamp">Hashrate</th>
+      <th class="d-none d-md-block" i18n="latest-blocks.mined">Block Count (share)</th>
+      <th i18n="latest-blocks.transactions">Empty Blocks (ratio)</th>
+    </thead>
+    <tbody *ngIf="pools$ | async as pools">
+      <tr>
+        <td>-</td>
+        <td>All miners</td>
+        <td>{{ pools["lastEstimatedHashrate"]}} PH/s</td>
+        <td>{{ pools["blockCount"] }}</td>
+        <td>{{ pools["totalEmptyBlock"] }} ({{ pools["totalEmptyBlockRatio"] }}%)</td>
+      </tr>
+      <ng-template ngFor let-pool [ngForOf]="pools['poolsStats']">
+        <tr>
+          <td>{{ pool.rank }}</td>
+          <td><a href="{{ pool.link }}">{{ pool.name }}</a></td>
+          <td>{{ pool.lastEstimatedHashrate }} PH/s</td>
+          <td>{{ pool.blockCount }} ({{ pool.share }}%)</td>
+          <td>{{ pool.emptyBlocks }} ({{ pool.emptyBlockRatio }}%)</td>
+        </tr>
+      </ng-template>
+    </tbody>
+  </table>
+
+</div>
diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
new file mode 100644
index 000000000..b1841e867
--- /dev/null
+++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
@@ -0,0 +1,103 @@
+import { Component, OnInit, ChangeDetectionStrategy } from '@angular/core';
+import { FormBuilder, FormGroup } from '@angular/forms';
+import { ActivatedRoute } from '@angular/router';
+import { merge, Observable, ObservableInput, of } from 'rxjs';
+import { map, share, switchMap, tap } from 'rxjs/operators';
+import { PoolsStats } from 'src/app/interfaces/node-api.interface';
+import { StorageService } from 'src/app/services/storage.service';
+import { ApiService } from '../../services/api.service';
+
+@Component({
+  selector: 'app-pool-ranking',
+  templateUrl: './pool-ranking.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class PoolRankingComponent implements OnInit {
+  pools$: Observable<object>
+
+  radioGroupForm: FormGroup;
+  poolsWindowPreference: string;
+
+  constructor(
+    private formBuilder: FormBuilder,
+    private route: ActivatedRoute,
+    private apiService: ApiService,
+    private storageService: StorageService,
+  ) { }
+
+  ngOnInit(): void {
+    this.poolsWindowPreference = this.storageService.getValue('poolsWindowPreference') ? this.storageService.getValue('poolsWindowPreference').trim() : '2h';
+    this.radioGroupForm = this.formBuilder.group({
+      dateSpan: this.poolsWindowPreference
+    });
+
+    // Setup datespan triggers
+    this.route.fragment.subscribe((fragment) => {
+      if (['1d', '3d', '1w', '1m', '3m', '6m', '1y', '2y', '3y', 'all'].indexOf(fragment) > -1) {
+        this.radioGroupForm.controls.dateSpan.setValue(fragment, { emitEvent: false });
+      }
+    });
+    merge(of(''), this.radioGroupForm.controls.dateSpan.valueChanges)
+      .pipe(switchMap(() => this.onDateSpanChanged()))
+      .subscribe((pools: any) => {
+        console.log(pools);
+      });
+
+    // Fetch initial mining pool data
+    this.onDateSpanChanged();
+  }
+
+  ngOnChanges() {
+  }
+
+  rendered() {
+  }
+
+  savePoolsPreference() {
+    this.storageService.setValue('poolsWindowPreference', this.radioGroupForm.controls.dateSpan.value);
+    this.poolsWindowPreference = this.radioGroupForm.controls.dateSpan.value;
+  }
+
+  onDateSpanChanged(): ObservableInput<any> {
+    let interval: string;
+    console.log(this.poolsWindowPreference);
+    switch (this.poolsWindowPreference) {
+      case '1d': interval = '1 DAY'; break;
+      case '3d': interval = '3 DAY'; break;
+      case '1w': interval = '1 WEEK'; break;
+      case '1m': interval = '1 MONTH'; break;
+      case '3m': interval = '3 MONTH'; break;
+      case '6m': interval = '6 MONTH'; break;
+      case '1y': interval = '1 YEAR'; break;
+      case '2y': interval = '2 YEAR'; break;
+      case '3y': interval = '3 YEAR'; break;
+      case 'all': interval = '1000 YEAR'; break;
+    }
+    this.pools$ = this.apiService.listPools$(interval).pipe(map(res => this.computeMiningStats(res)));
+    return this.pools$;
+  }
+
+  computeMiningStats(stats: PoolsStats) {
+    const totalEmptyBlock = Object.values(stats.poolsStats).reduce((prev, cur) => {
+      return prev + cur.emptyBlocks;
+    }, 0);
+    const totalEmptyBlockRatio = (totalEmptyBlock / stats.blockCount * 100).toFixed(2);
+    const poolsStats = stats.poolsStats.map((poolStat) => {
+      return {
+        share: (poolStat.blockCount / stats.blockCount * 100).toFixed(2),
+        lastEstimatedHashrate: (poolStat.blockCount / stats.blockCount * stats.lastEstimatedHashrate / Math.pow(10, 15)).toFixed(2),
+        emptyBlockRatio: (poolStat.emptyBlocks / poolStat.blockCount * 100).toFixed(2),
+        ...poolStat
+      }
+    });
+
+    return {
+      lastEstimatedHashrate: (stats.lastEstimatedHashrate / Math.pow(10, 15)).toFixed(2),
+      blockCount: stats.blockCount,
+      totalEmptyBlock: totalEmptyBlock,
+      totalEmptyBlockRatio: totalEmptyBlockRatio,
+      poolsStats: poolsStats,
+    }
+  }
+}
+
diff --git a/frontend/src/app/interfaces/node-api.interface.ts b/frontend/src/app/interfaces/node-api.interface.ts
index fa0ddeb77..669c8d251 100644
--- a/frontend/src/app/interfaces/node-api.interface.ts
+++ b/frontend/src/app/interfaces/node-api.interface.ts
@@ -51,3 +51,16 @@ export interface LiquidPegs {
 }
 
 export interface ITranslators { [language: string]: string; }
+
+export interface PoolsStats {
+  poolsStats: {
+    pooldId: number,
+    name: string,
+    link: string,
+    blockCount: number,
+    emptyBlocks: number,
+    rank: number,
+  }[],
+  blockCount: number,
+  lastEstimatedHashrate: number,
+}
diff --git a/frontend/src/app/services/api.service.ts b/frontend/src/app/services/api.service.ts
index 05c6f074e..f17f32032 100644
--- a/frontend/src/app/services/api.service.ts
+++ b/frontend/src/app/services/api.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { HttpClient, HttpParams } from '@angular/common/http';
-import { CpfpInfo, OptimizedMempoolStats, DifficultyAdjustment, AddressInformation, LiquidPegs, ITranslators } from '../interfaces/node-api.interface';
+import { CpfpInfo, OptimizedMempoolStats, DifficultyAdjustment, AddressInformation, LiquidPegs, ITranslators, PoolsStats } from '../interfaces/node-api.interface';
 import { Observable } from 'rxjs';
 import { StateService } from './state.service';
 import { WebsocketResponse } from '../interfaces/websocket.interface';
@@ -120,4 +120,9 @@ export class ApiService {
   postTransaction$(hexPayload: string): Observable<any> {
     return this.httpClient.post<any>(this.apiBaseUrl + this.apiBasePath + '/api/tx', hexPayload, { responseType: 'text' as 'json'});
   }
+
+  listPools$(interval: string) : Observable<PoolsStats> {
+    const params = new HttpParams().set('interval', interval);
+    return this.httpClient.get<PoolsStats>(this.apiBaseUrl + this.apiBasePath + '/api/v1/pools', {params});
+  }
 }
diff --git a/frontend/src/app/services/storage.service.ts b/frontend/src/app/services/storage.service.ts
index 7494784f6..6eff9d391 100644
--- a/frontend/src/app/services/storage.service.ts
+++ b/frontend/src/app/services/storage.service.ts
@@ -6,18 +6,23 @@ import { Router, ActivatedRoute } from '@angular/router';
 })
 export class StorageService {
   constructor(private router: Router, private route: ActivatedRoute) {
-    let graphWindowPreference: string = this.getValue('graphWindowPreference');
+    this.setDefaultValueIfNeeded('graphWindowPreference', '2h');
+    this.setDefaultValueIfNeeded('poolsWindowPreference', '1d');
+  }
+
+  setDefaultValueIfNeeded(key: string, defaultValue: string) {
+    let graphWindowPreference: string = this.getValue(key);
     if (graphWindowPreference === null) { // First visit to mempool.space
-      if (this.router.url.includes("graphs")) {
-        this.setValue('graphWindowPreference', this.route.snapshot.fragment ? this.route.snapshot.fragment : "2h");
+      if (this.router.url.includes("graphs") || this.router.url.includes("pools")) {
+        this.setValue(key, this.route.snapshot.fragment ? this.route.snapshot.fragment : defaultValue);
       } else {
-        this.setValue('graphWindowPreference', "2h");
+        this.setValue(key, defaultValue);
       }
-    } else if (this.router.url.includes("graphs")) { // Visit a different graphs#fragment from last visit
-        if (this.route.snapshot.fragment !== null && graphWindowPreference !== this.route.snapshot.fragment) {
-          this.setValue('graphWindowPreference', this.route.snapshot.fragment);
-        }
+    } else if (this.router.url.includes("graphs") || this.router.url.includes("pools")) { // Visit a different graphs#fragment from last visit
+      if (this.route.snapshot.fragment !== null && graphWindowPreference !== this.route.snapshot.fragment) {
+        this.setValue(key, this.route.snapshot.fragment);
       }
+    }
   }
 
   getValue(key: string): string {

From 18a63933fa9cc49deea39f532cc6af452a7c888d Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Thu, 13 Jan 2022 12:18:39 +0900
Subject: [PATCH 23/47] Increment migration schema version to 3 and re-add
 `pools` and `blocks` table creation queries

---
 backend/src/api/database-migration.ts | 32 +++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/backend/src/api/database-migration.ts b/backend/src/api/database-migration.ts
index efdf6755c..69807b414 100644
--- a/backend/src/api/database-migration.ts
+++ b/backend/src/api/database-migration.ts
@@ -85,6 +85,7 @@ class DatabaseMigration {
       }
       if (databaseSchemaVersion < 3) {
         await this.$executeQuery(connection, this.getCreatePoolsTableQuery(), await this.$checkIfTableExists('pools'));
+        await this.$executeQuery(connection, this.getCreateBlocksTableQuery(), await this.$checkIfTableExists('blocks'));
       }
       connection.release();
     } catch (e) {
@@ -348,6 +349,37 @@ class DatabaseMigration {
       PRIMARY KEY (id)
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;`;
   }
+
+  private getCreatePoolsTableQuery(): string {
+    return `CREATE TABLE IF NOT EXISTS pools (
+      id int(11) NOT NULL AUTO_INCREMENT,
+      name varchar(50) NOT NULL,
+      link varchar(255) NOT NULL,
+      addresses text NOT NULL,
+      regexes text NOT NULL,
+      PRIMARY KEY (id)
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;`;
+  }
+
+  private getCreateBlocksTableQuery(): string {
+    return `CREATE TABLE IF NOT EXISTS blocks (
+      height int(11) unsigned NOT NULL,
+      hash varchar(65) NOT NULL,
+      blockTimestamp timestamp NOT NULL,
+      size int(11) unsigned NOT NULL,
+      weight int(11) unsigned NOT NULL,
+      tx_count int(11) unsigned NOT NULL,
+      coinbase_raw text,
+      difficulty bigint(20) unsigned NOT NULL,
+      pool_id int(11) DEFAULT -1,
+      fees double unsigned NOT NULL,
+      fee_span json NOT NULL,
+      median_fee double unsigned NOT NULL,
+      PRIMARY KEY (height),
+      INDEX (pool_id),
+      FOREIGN KEY (pool_id) REFERENCES pools (id)
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;`;
+  }
 }
 
 export default new DatabaseMigration();

From 0a267affafbbb79cb53cf7734077bd823b8af87e Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Fri, 14 Jan 2022 18:09:40 +0900
Subject: [PATCH 24/47] Add pie chart and rewrite the pool ranking component

---
 backend/src/api/mining.ts                     |   2 +-
 frontend/src/app/app.module.ts                |   3 +-
 .../master-page/master-page.component.html    |   4 +-
 .../pool-ranking/pool-ranking.component.html  |  36 +--
 .../pool-ranking/pool-ranking.component.ts    | 214 ++++++++++++------
 .../src/app/interfaces/node-api.interface.ts  |  30 ++-
 frontend/src/app/services/mining.service.ts   |  44 ++++
 7 files changed, 231 insertions(+), 102 deletions(-)
 create mode 100644 frontend/src/app/services/mining.service.ts

diff --git a/backend/src/api/mining.ts b/backend/src/api/mining.ts
index d22a29d5b..94d6c29a4 100644
--- a/backend/src/api/mining.ts
+++ b/backend/src/api/mining.ts
@@ -43,8 +43,8 @@ class Mining {
     })
 
     poolsStatistics["blockCount"] = blockCount;
-    poolsStatistics["poolsStats"] = poolsStats;
     poolsStatistics["lastEstimatedHashrate"] = lastBlockHashrate;
+    poolsStatistics["pools"] = poolsStats;
 
     return poolsStatistics;
   }
diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
index b16c5bdea..f9eae0666 100644
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -49,7 +49,7 @@ import { FeesBoxComponent } from './components/fees-box/fees-box.component';
 import { DashboardComponent } from './dashboard/dashboard.component';
 import { DifficultyComponent } from './components/difficulty/difficulty.component';
 import { FontAwesomeModule, FaIconLibrary } from '@fortawesome/angular-fontawesome';
-import { faFilter, faAngleDown, faAngleUp, faAngleRight, faAngleLeft, faBolt, faChartArea, faCogs, faCubes, faDatabase, faExchangeAlt, faInfoCircle,
+import { faFilter, faAngleDown, faAngleUp, faAngleRight, faAngleLeft, faBolt, faChartArea, faCogs, faCubes, faHammer, faDatabase, faExchangeAlt, faInfoCircle,
   faLink, faList, faSearch, faCaretUp, faCaretDown, faTachometerAlt, faThList, faTint, faTv, faAngleDoubleDown, faSortUp, faAngleDoubleUp, faChevronDown, faFileAlt, faRedoAlt, faArrowAltCircleRight, faExternalLinkAlt, faBook, faListUl } from '@fortawesome/free-solid-svg-icons';
 import { ApiDocsComponent } from './components/docs/api-docs.component';
 import { DocsComponent } from './components/docs/docs.component';
@@ -145,6 +145,7 @@ export class AppModule {
     library.addIcons(faTv);
     library.addIcons(faTachometerAlt);
     library.addIcons(faCubes);
+    library.addIcons(faHammer);
     library.addIcons(faCogs);
     library.addIcons(faThList);
     library.addIcons(faList);
diff --git a/frontend/src/app/components/master-page/master-page.component.html b/frontend/src/app/components/master-page/master-page.component.html
index f05b297c7..479f324c2 100644
--- a/frontend/src/app/components/master-page/master-page.component.html
+++ b/frontend/src/app/components/master-page/master-page.component.html
@@ -31,8 +31,8 @@
       <li class="nav-item" routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}" id="btn-home">
         <a class="nav-link" [routerLink]="['/' | relativeUrl]" (click)="collapse()"><fa-icon [icon]="['fas', 'tachometer-alt']" [fixedWidth]="true" i18n-title="master-page.dashboard" title="Dashboard"></fa-icon></a>
       </li>
-      <li class="nav-item" routerLinkActive="active" id="btn-blocks">
-        <a class="nav-link" [routerLink]="['/blocks' | relativeUrl]" (click)="collapse()"><fa-icon [icon]="['fas', 'cubes']" [fixedWidth]="true" i18n-title="master-page.blocks" title="Blocks"></fa-icon></a>
+      <li class="nav-item" routerLinkActive="active" id="btn-pools">
+        <a class="nav-link" [routerLink]="['/mining/pools' | relativeUrl]" (click)="collapse()"><fa-icon [icon]="['fas', 'hammer']" [fixedWidth]="true" i18n-title="master-page.pools" title="Pools"></fa-icon></a>
       </li>
       <li class="nav-item" routerLinkActive="active" id="btn-graphs">
         <a class="nav-link" [routerLink]="['/graphs' | relativeUrl]" (click)="collapse()"><fa-icon [icon]="['fas', 'chart-area']" [fixedWidth]="true" i18n-title="master-page.graphs" title="Graphs"></fa-icon></a>
diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.html b/frontend/src/app/components/pool-ranking/pool-ranking.component.html
index 9d38ced93..cd47a8002 100644
--- a/frontend/src/app/components/pool-ranking/pool-ranking.component.html
+++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.html
@@ -1,8 +1,9 @@
 <div class="container-xl">
   <div class="card-header">
-    <i class="fa fa-area-chart"></i> <span i18n="mining.pools-by-vBytes">Pools</span>
-    <form [formGroup]="radioGroupForm" class="formRadioGroup" (click)="savePoolsPreference()">
-      <div class="btn-group btn-group-toggle" ngbRadioGroup name="radioBasic" formControlName="dateSpan">
+    <!-- <i class="fa fa-area-chart"></i> <span i18n="mining.pools-by-vBytes">Pools</span> -->
+    <form [formGroup]="radioGroupForm" class="formRadioGroup">
+      <div class="btn-group btn-group-toggle" ngbRadioGroup name="radioBasic" formControlName="dateSpan"
+        (change)="onChangeWindowPreference($event)">
         <label ngbButtonLabel class="btn-primary btn-sm">
           <input ngbButton type="radio" [value]="'1d'" [routerLink]="['/pools' | relativeUrl]" fragment="1d"> 1D
         </label>
@@ -37,6 +38,11 @@
     </form>
   </div>
 
+  <div style="height: 500px;" echarts [initOpts]="chartInitOptions" [options]="chartOptions"></div>
+  <div class="text-center loadingGraphs" *ngIf="isLoading">
+    <div class="spinner-border text-light"></div>
+  </div>
+
   <table class="table table-borderless" [alwaysCallback]="true" infiniteScroll [infiniteScrollDistance]="1.5" [infiniteScrollUpDistance]="1.5" [infiniteScrollThrottle]="50">
     <thead>
       <th i18n="latest-blocks.height">Rank</th>
@@ -45,23 +51,21 @@
       <th class="d-none d-md-block" i18n="latest-blocks.mined">Block Count (share)</th>
       <th i18n="latest-blocks.transactions">Empty Blocks (ratio)</th>
     </thead>
-    <tbody *ngIf="pools$ | async as pools">
+    <tbody *ngIf="(miningStatsEmitter$ | async) as miningStats">
       <tr>
         <td>-</td>
         <td>All miners</td>
-        <td>{{ pools["lastEstimatedHashrate"]}} PH/s</td>
-        <td>{{ pools["blockCount"] }}</td>
-        <td>{{ pools["totalEmptyBlock"] }} ({{ pools["totalEmptyBlockRatio"] }}%)</td>
+        <td>{{ miningStats.lastEstimatedHashrate}} PH/s</td>
+        <td>{{ miningStats.blockCount }}</td>
+        <td>{{ miningStats.totalEmptyBlock }} ({{ miningStats.totalEmptyBlockRatio }}%)</td>
+      </tr>
+      <tr *ngFor="let pool of miningStats.pools">
+        <td>{{ pool.rank }}</td>
+        <td><a href="{{ pool.link }}">{{ pool.name }}</a></td>
+        <td>{{ pool.lastEstimatedHashrate }} PH/s</td>
+        <td>{{ pool.blockCount }} ({{ pool.share }}%)</td>
+        <td>{{ pool.emptyBlocks }} ({{ pool.emptyBlockRatio }}%)</td>
       </tr>
-      <ng-template ngFor let-pool [ngForOf]="pools['poolsStats']">
-        <tr>
-          <td>{{ pool.rank }}</td>
-          <td><a href="{{ pool.link }}">{{ pool.name }}</a></td>
-          <td>{{ pool.lastEstimatedHashrate }} PH/s</td>
-          <td>{{ pool.blockCount }} ({{ pool.share }}%)</td>
-          <td>{{ pool.emptyBlocks }} ({{ pool.emptyBlockRatio }}%)</td>
-        </tr>
-      </ng-template>
     </tbody>
   </table>
 
diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
index b1841e867..a4208aaf4 100644
--- a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
+++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
@@ -1,103 +1,169 @@
-import { Component, OnInit, ChangeDetectionStrategy } from '@angular/core';
-import { FormBuilder, FormGroup } from '@angular/forms';
-import { ActivatedRoute } from '@angular/router';
-import { merge, Observable, ObservableInput, of } from 'rxjs';
-import { map, share, switchMap, tap } from 'rxjs/operators';
-import { PoolsStats } from 'src/app/interfaces/node-api.interface';
+import { Component, OnInit, ChangeDetectionStrategy, OnChanges } from '@angular/core';
+import { FormBuilder, FormControl, FormGroup } from '@angular/forms';
+import { EChartsOption } from 'echarts';
+import { BehaviorSubject, merge, of } from 'rxjs';
+import { skip } from 'rxjs/operators';
+import { MiningStats } from 'src/app/interfaces/node-api.interface';
 import { StorageService } from 'src/app/services/storage.service';
-import { ApiService } from '../../services/api.service';
+import { MiningService } from '../../services/mining.service';
 
 @Component({
   selector: 'app-pool-ranking',
   templateUrl: './pool-ranking.component.html',
+  styles: [`
+    .loadingGraphs {
+      position: absolute;
+      top: 52%;
+      left: calc(50% - 16px);
+      z-index: 100;
+    }
+  `],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class PoolRankingComponent implements OnInit {
-  pools$: Observable<object>
-
-  radioGroupForm: FormGroup;
+export class PoolRankingComponent implements OnInit, OnChanges {
   poolsWindowPreference: string;
+  radioGroupForm: FormGroup;
+
+  miningStats!: MiningStats;
+  miningStatsEmitter$ = new BehaviorSubject<MiningStats>(this.miningStats);
+
+  isLoading = true;
+  chartOptions: EChartsOption = {};
+  chartInitOptions = {
+    renderer: 'svg'
+  };
 
   constructor(
-    private formBuilder: FormBuilder,
-    private route: ActivatedRoute,
-    private apiService: ApiService,
     private storageService: StorageService,
-  ) { }
-
-  ngOnInit(): void {
+    private formBuilder: FormBuilder,
+    private miningService: MiningService,
+  ) {
     this.poolsWindowPreference = this.storageService.getValue('poolsWindowPreference') ? this.storageService.getValue('poolsWindowPreference').trim() : '2h';
-    this.radioGroupForm = this.formBuilder.group({
-      dateSpan: this.poolsWindowPreference
-    });
 
-    // Setup datespan triggers
-    this.route.fragment.subscribe((fragment) => {
-      if (['1d', '3d', '1w', '1m', '3m', '6m', '1y', '2y', '3y', 'all'].indexOf(fragment) > -1) {
-        this.radioGroupForm.controls.dateSpan.setValue(fragment, { emitEvent: false });
-      }
-    });
-    merge(of(''), this.radioGroupForm.controls.dateSpan.valueChanges)
-      .pipe(switchMap(() => this.onDateSpanChanged()))
-      .subscribe((pools: any) => {
-        console.log(pools);
+    this.radioGroupForm = this.formBuilder.group({ dateSpan: this.poolsWindowPreference });
+    this.radioGroupForm.controls.dateSpan.setValue(this.poolsWindowPreference);
+
+    this.refreshMiningStats();
+}
+
+  ngOnInit() {
+  }
+
+  sleep = (ms: number) => new Promise(res => setTimeout(res, ms));
+
+  refreshMiningStats() {
+    return this.miningService.getMiningStats(this.getSQLInterval(this.poolsWindowPreference))
+      .subscribe(async data => {
+        this.miningStats = data;
+        this.miningStatsEmitter$.next(this.miningStats);
+        this.prepareChartOptions();
+        this.isLoading = false;
       });
-
-    // Fetch initial mining pool data
-    this.onDateSpanChanged();
   }
 
   ngOnChanges() {
   }
 
-  rendered() {
+  onChangeWindowPreference(e) {
+    this.poolsWindowPreference = e.target.value;
+    this.isLoading = true;
+    this.refreshMiningStats();
   }
 
-  savePoolsPreference() {
-    this.storageService.setValue('poolsWindowPreference', this.radioGroupForm.controls.dateSpan.value);
-    this.poolsWindowPreference = this.radioGroupForm.controls.dateSpan.value;
-  }
+  generatePoolsChartSerieData() {
+    const poolShareThreshold = 0.5; // Do not draw pools which hashrate share is lower than that
+    const data: object[] = [];
 
-  onDateSpanChanged(): ObservableInput<any> {
-    let interval: string;
-    console.log(this.poolsWindowPreference);
-    switch (this.poolsWindowPreference) {
-      case '1d': interval = '1 DAY'; break;
-      case '3d': interval = '3 DAY'; break;
-      case '1w': interval = '1 WEEK'; break;
-      case '1m': interval = '1 MONTH'; break;
-      case '3m': interval = '3 MONTH'; break;
-      case '6m': interval = '6 MONTH'; break;
-      case '1y': interval = '1 YEAR'; break;
-      case '2y': interval = '2 YEAR'; break;
-      case '3y': interval = '3 YEAR'; break;
-      case 'all': interval = '1000 YEAR'; break;
-    }
-    this.pools$ = this.apiService.listPools$(interval).pipe(map(res => this.computeMiningStats(res)));
-    return this.pools$;
-  }
-
-  computeMiningStats(stats: PoolsStats) {
-    const totalEmptyBlock = Object.values(stats.poolsStats).reduce((prev, cur) => {
-      return prev + cur.emptyBlocks;
-    }, 0);
-    const totalEmptyBlockRatio = (totalEmptyBlock / stats.blockCount * 100).toFixed(2);
-    const poolsStats = stats.poolsStats.map((poolStat) => {
-      return {
-        share: (poolStat.blockCount / stats.blockCount * 100).toFixed(2),
-        lastEstimatedHashrate: (poolStat.blockCount / stats.blockCount * stats.lastEstimatedHashrate / Math.pow(10, 15)).toFixed(2),
-        emptyBlockRatio: (poolStat.emptyBlocks / poolStat.blockCount * 100).toFixed(2),
-        ...poolStat
+    this.miningStats.pools.forEach((pool) => {
+      if (parseFloat(pool.share) < poolShareThreshold) {
+        return;
       }
+      data.push({
+        value: pool.lastEstimatedHashrate,
+        name: pool.name,
+        label: { color: '#FFFFFF' },
+        tooltip: {
+          formatter: () => {
+            return `<u><b>${pool.name}</b></u><br>` +
+              pool.lastEstimatedHashrate.toString() + ' PH/s (' + pool.share + `%)
+              <br>(` + pool.blockCount.toString() + ` blocks)`;
+          }
+        }
+      });
     });
+    return data;
+  }
 
-    return {
-      lastEstimatedHashrate: (stats.lastEstimatedHashrate / Math.pow(10, 15)).toFixed(2),
-      blockCount: stats.blockCount,
-      totalEmptyBlock: totalEmptyBlock,
-      totalEmptyBlockRatio: totalEmptyBlockRatio,
-      poolsStats: poolsStats,
+  prepareChartOptions() {
+    this.chartOptions = {
+      title: {
+        text: 'Hashrate distribution',
+        subtext: 'Estimated from the # of blocks mined',
+        left: 'center',
+        textStyle: {
+          color: '#FFFFFF',
+        },
+        subtextStyle: {
+          color: '#CCCCCC',
+          fontStyle: 'italic',
+        }
+      },
+      tooltip: {
+        trigger: 'item'
+      },
+      series: [
+        {
+          name: 'Mining pool',
+          type: 'pie',
+          radius: ['30%', '70%'],
+          data: this.generatePoolsChartSerieData(),
+          labelLine: {
+            lineStyle: {
+              width: 2,
+            },
+          },
+          label: {
+            fontSize: 14,
+          },
+          itemStyle: {
+            borderRadius: 5,
+            borderWidth: 2,
+            borderColor: '#000',
+          },
+          emphasis: {
+            itemStyle: {
+              borderWidth: 5,
+              borderColor: '#000',
+              borderRadius: 20,
+              shadowBlur: 40,
+              shadowOffsetX: 0,
+              shadowColor: 'rgba(0, 0, 0, 0.75)'
+            },
+            labelLine: {
+              lineStyle: {
+                width: 3,
+              }
+            }
+          }
+        }
+      ]
+    };
+  }
+
+  getSQLInterval(uiInterval: string) {
+    switch (uiInterval) {
+      case '1d': return '1 DAY';
+      case '3d': return '3 DAY';
+      case '1w': return '1 WEEK';
+      case '1m': return '1 MONTH';
+      case '3m': return '3 MONTH';
+      case '6m': return '6 MONTH';
+      case '1y': return '1 YEAR';
+      case '2y': return '2 YEAR';
+      case '3y': return '3 YEAR';
+      default: return '1000 YEAR';
     }
   }
+
 }
 
diff --git a/frontend/src/app/interfaces/node-api.interface.ts b/frontend/src/app/interfaces/node-api.interface.ts
index 669c8d251..044d2f411 100644
--- a/frontend/src/app/interfaces/node-api.interface.ts
+++ b/frontend/src/app/interfaces/node-api.interface.ts
@@ -52,15 +52,29 @@ export interface LiquidPegs {
 
 export interface ITranslators { [language: string]: string; }
 
+export interface SinglePoolStats {
+  pooldId: number,
+  name: string,
+  link: string,
+  blockCount: number,
+  emptyBlocks: number,
+  rank: number,
+  share: string,
+  lastEstimatedHashrate: string,
+  emptyBlockRatio: string,
+}
+
 export interface PoolsStats {
-  poolsStats: {
-    pooldId: number,
-    name: string,
-    link: string,
-    blockCount: number,
-    emptyBlocks: number,
-    rank: number,
-  }[],
   blockCount: number,
   lastEstimatedHashrate: number,
+  pools: SinglePoolStats[],
 }
+
+export interface MiningStats {
+  lastEstimatedHashrate: string,
+  blockCount: number,
+  totalEmptyBlock: number,
+  totalEmptyBlockRatio: string,
+  pools: SinglePoolStats[],
+}
+
diff --git a/frontend/src/app/services/mining.service.ts b/frontend/src/app/services/mining.service.ts
new file mode 100644
index 000000000..0989495c8
--- /dev/null
+++ b/frontend/src/app/services/mining.service.ts
@@ -0,0 +1,44 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { MiningStats, PoolsStats } from '../interfaces/node-api.interface';
+import { ApiService } from '../services/api.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class MiningService {
+
+  constructor(
+    private apiService: ApiService,
+  ) { }
+
+  public getMiningStats(interval: string): Observable<MiningStats> {
+    return this.apiService.listPools$(interval).pipe(
+      map(pools => this.generateMiningStats(pools))
+    );
+  }
+
+  private generateMiningStats(stats: PoolsStats) : MiningStats {
+    const totalEmptyBlock = Object.values(stats.pools).reduce((prev, cur) => {
+      return prev + cur.emptyBlocks;
+    }, 0);
+    const totalEmptyBlockRatio = (totalEmptyBlock / stats.blockCount * 100).toFixed(2);
+    const poolsStats = stats.pools.map((poolStat) => {
+      return {
+        share: (poolStat.blockCount / stats.blockCount * 100).toFixed(2),
+        lastEstimatedHashrate: (poolStat.blockCount / stats.blockCount * stats.lastEstimatedHashrate / Math.pow(10, 15)).toFixed(2),
+        emptyBlockRatio: (poolStat.emptyBlocks / poolStat.blockCount * 100).toFixed(2),
+        ...poolStat
+      }
+    });
+
+    return {
+      lastEstimatedHashrate: (stats.lastEstimatedHashrate / Math.pow(10, 15)).toFixed(2),
+      blockCount: stats.blockCount,
+      totalEmptyBlock: totalEmptyBlock,
+      totalEmptyBlockRatio: totalEmptyBlockRatio,
+      pools: poolsStats,
+    };
+  }
+}

From 091027cc790a53f9dd414a85cd5165c409c2fec8 Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Mon, 17 Jan 2022 12:54:56 +0900
Subject: [PATCH 25/47] When a new blocks is mined, refresh the mining stats

---
 .../pool-ranking/pool-ranking.component.ts    | 54 ++++++++++++-------
 1 file changed, 34 insertions(+), 20 deletions(-)

diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
index a4208aaf4..a272a069f 100644
--- a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
+++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
@@ -1,9 +1,9 @@
-import { Component, OnInit, ChangeDetectionStrategy, OnChanges } from '@angular/core';
-import { FormBuilder, FormControl, FormGroup } from '@angular/forms';
+import { Component, OnDestroy, OnInit } from '@angular/core';
+import { FormBuilder, FormGroup } from '@angular/forms';
 import { EChartsOption } from 'echarts';
-import { BehaviorSubject, merge, of } from 'rxjs';
-import { skip } from 'rxjs/operators';
+import { BehaviorSubject, Subscription } from 'rxjs';
 import { MiningStats } from 'src/app/interfaces/node-api.interface';
+import { StateService } from 'src/app/services/state.service';
 import { StorageService } from 'src/app/services/storage.service';
 import { MiningService } from '../../services/mining.service';
 
@@ -18,14 +18,15 @@ import { MiningService } from '../../services/mining.service';
       z-index: 100;
     }
   `],
-  changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class PoolRankingComponent implements OnInit, OnChanges {
+export class PoolRankingComponent implements OnInit, OnDestroy {
   poolsWindowPreference: string;
   radioGroupForm: FormGroup;
 
   miningStats!: MiningStats;
   miningStatsEmitter$ = new BehaviorSubject<MiningStats>(this.miningStats);
+  blocksSubscription: Subscription;
+  miningSubscription: Subscription;
 
   isLoading = true;
   chartOptions: EChartsOption = {};
@@ -34,6 +35,7 @@ export class PoolRankingComponent implements OnInit, OnChanges {
   };
 
   constructor(
+    private stateService: StateService,
     private storageService: StorageService,
     private formBuilder: FormBuilder,
     private miningService: MiningService,
@@ -42,26 +44,38 @@ export class PoolRankingComponent implements OnInit, OnChanges {
 
     this.radioGroupForm = this.formBuilder.group({ dateSpan: this.poolsWindowPreference });
     this.radioGroupForm.controls.dateSpan.setValue(this.poolsWindowPreference);
-
-    this.refreshMiningStats();
-}
-
-  ngOnInit() {
   }
 
-  sleep = (ms: number) => new Promise(res => setTimeout(res, ms));
+  ngOnInit(): void {
+    this.refreshMiningStats();
+    this.watchBlocks();
+  }
+
+  ngOnDestroy(): void {
+    this.blocksSubscription.unsubscribe();
+    this.miningSubscription.unsubscribe();      
+  }
 
   refreshMiningStats() {
-    return this.miningService.getMiningStats(this.getSQLInterval(this.poolsWindowPreference))
-      .subscribe(async data => {
-        this.miningStats = data;
-        this.miningStatsEmitter$.next(this.miningStats);
-        this.prepareChartOptions();
-        this.isLoading = false;
-      });
+    this.miningSubscription = this.miningService.getMiningStats(this.getSQLInterval(this.poolsWindowPreference))
+    .subscribe(async data => {
+      this.miningStats = data;
+      this.miningStatsEmitter$.next(this.miningStats);
+      this.prepareChartOptions();
+      this.isLoading = false;
+    });
+
+    return this.miningSubscription;
   }
 
-  ngOnChanges() {
+  watchBlocks() {
+    this.blocksSubscription = this.stateService.blocks$
+      .subscribe(([block]) => {
+        if (!this.miningStats) {
+          return;
+        }
+        this.refreshMiningStats();
+      });
   }
 
   onChangeWindowPreference(e) {

From b9a047b22dc2f1a64fc336665f2a198639962d73 Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Mon, 17 Jan 2022 15:34:34 +0900
Subject: [PATCH 26/47] Add difficulty adjustment in mining page + Fix pools
 table on mobile

---
 backend/src/api/mining.ts                     |  3 +-
 frontend/cypress/fixtures/pools.json          |  4 +--
 .../difficulty/difficulty.component.html      | 11 +++++-
 .../difficulty/difficulty.component.ts        | 10 ++++++
 .../pool-ranking/pool-ranking.component.html  | 35 +++++++++++--------
 .../pool-ranking/pool-ranking.component.ts    | 11 +++++-
 .../src/app/interfaces/node-api.interface.ts  |  1 +
 frontend/src/app/services/mining.service.ts   |  1 +
 .../src/resources/mining-pools/unknown.svg    |  7 ++++
 9 files changed, 63 insertions(+), 20 deletions(-)
 create mode 100644 frontend/src/resources/mining-pools/unknown.svg

diff --git a/backend/src/api/mining.ts b/backend/src/api/mining.ts
index 94d6c29a4..6582221a5 100644
--- a/backend/src/api/mining.ts
+++ b/backend/src/api/mining.ts
@@ -17,7 +17,8 @@ class Mining {
   public async $getPoolsStats(interval: string = "100 YEAR") : Promise<object> {
     let poolsStatistics = {};
 
-    const lastBlockHashrate = await this.bitcoinApi.$getEstimatedHashrate(717960);
+    const blockHeightTip = await this.bitcoinApi.$getBlockHeightTip();
+    const lastBlockHashrate = await this.bitcoinApi.$getEstimatedHashrate(blockHeightTip);
     const poolsInfo: PoolInfo[] = await PoolsRepository.$getPoolsInfo(interval);
     const blockCount: number = await BlocksRepository.$blockCount(interval);
     const emptyBlocks: EmptyBlocks[] = await BlocksRepository.$countEmptyBlocks(interval);
diff --git a/frontend/cypress/fixtures/pools.json b/frontend/cypress/fixtures/pools.json
index 55c91a99a..1a69517e8 100644
--- a/frontend/cypress/fixtures/pools.json
+++ b/frontend/cypress/fixtures/pools.json
@@ -421,7 +421,7 @@
             "link" : "http://www.dpool.top/"
         },
         "/Rawpool.com/": {
-            "name" : "Rawpool.com",
+            "name" : "Rawpool",
             "link" : "https://www.rawpool.com/"
         },
         "/haominer/": {
@@ -947,7 +947,7 @@
             "link" : "http://www.dpool.top/"
         },
         "1FbBbv5oYqFKwiPm4CAqvAy8345n8AQ74b" : {
-            "name" : "Rawpool.com",
+            "name" : "Rawpool",
             "link" : "https://www.rawpool.com/"
         },
         "1LsFmhnne74EmU4q4aobfxfrWY4wfMVd8w" : {
diff --git a/frontend/src/app/components/difficulty/difficulty.component.html b/frontend/src/app/components/difficulty/difficulty.component.html
index 5064c1c08..fc3030286 100644
--- a/frontend/src/app/components/difficulty/difficulty.component.html
+++ b/frontend/src/app/components/difficulty/difficulty.component.html
@@ -39,13 +39,22 @@
               {{ epochData.previousRetarget | absolute | number: '1.2-2' }} </span> %
           </div>
         </div>
-        <div class="item">
+        <div class="item" *ngIf="showProgress">
           <h5 class="card-title" i18n="difficulty-box.current-period">Current Period</h5>
           <div class="card-text">{{ epochData.progress | number: '1.2-2' }} <span class="symbol">%</span></div>
           <div class="progress small-bar">
             <div class="progress-bar" role="progressbar" style="width: 15%; background-color: #105fb0" [ngStyle]="{'width': epochData.base}">&nbsp;</div>
           </div>
         </div>
+        <div class="item" *ngIf="showHalving">
+          <h5 class="card-title" i18n="difficulty-box.next-halving">Next halving</h5>
+          <div class="card-text">
+            <ng-container *ngTemplateOutlet="epochData.blocksUntilHalving === 1 ? blocksSingular : blocksPlural; context: {$implicit: epochData.blocksUntilHalving }"></ng-container>
+            <ng-template #blocksPlural let-i i18n="shared.blocks">{{ i }} <span class="shared-block">blocks</span></ng-template>
+            <ng-template #blocksSingular let-i i18n="shared.block">{{ i }} <span class="shared-block">block</span></ng-template>
+          </div>
+          <div class="symbol"><app-time-until [time]="epochData.timeUntilHalving" [fastRender]="true"></app-time-until></div>
+        </div>
       </div>
     </div>
   </div>
diff --git a/frontend/src/app/components/difficulty/difficulty.component.ts b/frontend/src/app/components/difficulty/difficulty.component.ts
index 312c1b2d0..ff44e5aeb 100644
--- a/frontend/src/app/components/difficulty/difficulty.component.ts
+++ b/frontend/src/app/components/difficulty/difficulty.component.ts
@@ -14,6 +14,8 @@ interface EpochProgress {
   timeAvg: string;
   remainingTime: number;
   previousRetarget: number;
+  blocksUntilHalving: number;
+  timeUntilHalving: number;
 }
 
 @Component({
@@ -26,6 +28,9 @@ export class DifficultyComponent implements OnInit {
   isLoadingWebSocket$: Observable<boolean>;
   difficultyEpoch$: Observable<EpochProgress>;
 
+  @Input() showProgress: boolean = true;
+  @Input() showHalving: boolean = false;
+
   constructor(
     public stateService: StateService,
   ) { }
@@ -92,6 +97,9 @@ export class DifficultyComponent implements OnInit {
             colorPreviousAdjustments = '#ffffff66';
           }
 
+          const blocksUntilHalving = block.height % 210000;
+          const timeUntilHalving = (blocksUntilHalving * timeAvgMins * 60 * 1000) + (now * 1000);
+
           return {
             base: `${progress}%`,
             change,
@@ -104,6 +112,8 @@ export class DifficultyComponent implements OnInit {
             newDifficultyHeight,
             remainingTime,
             previousRetarget,
+            blocksUntilHalving,
+            timeUntilHalving,
           };
         })
       );
diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.html b/frontend/src/app/components/pool-ranking/pool-ranking.component.html
index cd47a8002..195f4b6f6 100644
--- a/frontend/src/app/components/pool-ranking/pool-ranking.component.html
+++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.html
@@ -1,6 +1,13 @@
 <div class="container-xl">
+
+  <app-difficulty [showProgress]=false [showHalving]=true></app-difficulty>
+
+  <div style="height: 500px; margin-top: 30px;" echarts [initOpts]="chartInitOptions" [options]="chartOptions"></div>
+  <div class="text-center loadingGraphs" *ngIf="isLoading">
+    <div class="spinner-border text-light"></div>
+  </div>
+
   <div class="card-header">
-    <!-- <i class="fa fa-area-chart"></i> <span i18n="mining.pools-by-vBytes">Pools</span> -->
     <form [formGroup]="radioGroupForm" class="formRadioGroup">
       <div class="btn-group btn-group-toggle" ngbRadioGroup name="radioBasic" formControlName="dateSpan"
         (change)="onChangeWindowPreference($event)">
@@ -38,33 +45,31 @@
     </form>
   </div>
 
-  <div style="height: 500px;" echarts [initOpts]="chartInitOptions" [options]="chartOptions"></div>
-  <div class="text-center loadingGraphs" *ngIf="isLoading">
-    <div class="spinner-border text-light"></div>
-  </div>
-
   <table class="table table-borderless" [alwaysCallback]="true" infiniteScroll [infiniteScrollDistance]="1.5" [infiniteScrollUpDistance]="1.5" [infiniteScrollThrottle]="50">
     <thead>
-      <th i18n="latest-blocks.height">Rank</th>
-      <th class="d-none d-md-block"i18n="latest-blocks.timestamp">Name</th>
+      <th class="d-none d-md-block" i18n="latest-blocks.height">Rank</th>
+      <th><!-- LOGO --></th>
+      <th i18n="latest-blocks.timestamp">Name</th>
       <th i18n="latest-blocks.timestamp">Hashrate</th>
-      <th class="d-none d-md-block" i18n="latest-blocks.mined">Block Count (share)</th>
-      <th i18n="latest-blocks.transactions">Empty Blocks (ratio)</th>
+      <th i18n="latest-blocks.mined">Block Count (%)</th>
+      <th class="d-none d-md-block" i18n="latest-blocks.transactions">Empty Blocks (%)</th>
     </thead>
     <tbody *ngIf="(miningStatsEmitter$ | async) as miningStats">
       <tr>
-        <td>-</td>
+        <td class="d-none d-md-block">-</td>
+        <td><!-- LOGO --></td>
         <td>All miners</td>
         <td>{{ miningStats.lastEstimatedHashrate}} PH/s</td>
         <td>{{ miningStats.blockCount }}</td>
-        <td>{{ miningStats.totalEmptyBlock }} ({{ miningStats.totalEmptyBlockRatio }}%)</td>
+        <td class="d-none d-md-block">{{ miningStats.totalEmptyBlock }} ({{ miningStats.totalEmptyBlockRatio }}%)</td>
       </tr>
       <tr *ngFor="let pool of miningStats.pools">
-        <td>{{ pool.rank }}</td>
-        <td><a href="{{ pool.link }}">{{ pool.name }}</a></td>
+        <td class="d-none d-md-block">{{ pool.rank }}</td>
+        <td><img width="25" height="25" src="{{ pool.logo }}"></td>
+        <td><a target="#" href="{{ pool.link }}">{{ pool.name }}</a></td>
         <td>{{ pool.lastEstimatedHashrate }} PH/s</td>
         <td>{{ pool.blockCount }} ({{ pool.share }}%)</td>
-        <td>{{ pool.emptyBlocks }} ({{ pool.emptyBlockRatio }}%)</td>
+        <td class="d-none d-md-block">{{ pool.emptyBlocks }} ({{ pool.emptyBlockRatio }}%)</td>
       </tr>
     </tbody>
   </table>
diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
index a272a069f..8dc1ab0fc 100644
--- a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
+++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
@@ -93,7 +93,7 @@ export class PoolRankingComponent implements OnInit, OnDestroy {
         return;
       }
       data.push({
-        value: pool.lastEstimatedHashrate,
+        value: pool.share,
         name: pool.name,
         label: { color: '#FFFFFF' },
         tooltip: {
@@ -125,8 +125,16 @@ export class PoolRankingComponent implements OnInit, OnDestroy {
       tooltip: {
         trigger: 'item'
       },
+      legend: (window.innerWidth <= 767.98) ? {
+        bottom: '0%',
+        left: 'center',
+        textStyle: {
+          color: '#FFF'
+        }
+      } : null,
       series: [
         {
+          top: '5%',
           name: 'Mining pool',
           type: 'pie',
           radius: ['30%', '70%'],
@@ -137,6 +145,7 @@ export class PoolRankingComponent implements OnInit, OnDestroy {
             },
           },
           label: {
+            show: (window.innerWidth > 767.98),
             fontSize: 14,
           },
           itemStyle: {
diff --git a/frontend/src/app/interfaces/node-api.interface.ts b/frontend/src/app/interfaces/node-api.interface.ts
index 044d2f411..265ad59d9 100644
--- a/frontend/src/app/interfaces/node-api.interface.ts
+++ b/frontend/src/app/interfaces/node-api.interface.ts
@@ -62,6 +62,7 @@ export interface SinglePoolStats {
   share: string,
   lastEstimatedHashrate: string,
   emptyBlockRatio: string,
+  logo: string,
 }
 
 export interface PoolsStats {
diff --git a/frontend/src/app/services/mining.service.ts b/frontend/src/app/services/mining.service.ts
index 0989495c8..f388975a8 100644
--- a/frontend/src/app/services/mining.service.ts
+++ b/frontend/src/app/services/mining.service.ts
@@ -29,6 +29,7 @@ export class MiningService {
         share: (poolStat.blockCount / stats.blockCount * 100).toFixed(2),
         lastEstimatedHashrate: (poolStat.blockCount / stats.blockCount * stats.lastEstimatedHashrate / Math.pow(10, 15)).toFixed(2),
         emptyBlockRatio: (poolStat.emptyBlocks / poolStat.blockCount * 100).toFixed(2),
+        logo: `./resources/mining-pools/` + poolStat.name.toLowerCase().replace(' ', '').replace('.', '') + '.svg',
         ...poolStat
       }
     });
diff --git a/frontend/src/resources/mining-pools/unknown.svg b/frontend/src/resources/mining-pools/unknown.svg
new file mode 100644
index 000000000..d6661188a
--- /dev/null
+++ b/frontend/src/resources/mining-pools/unknown.svg
@@ -0,0 +1,7 @@
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="64.001" width="64.001" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<g transform="translate(-289.60744,-317.50471)">
+<path d="m352.64,357.25c-4.274,17.143-21.637,27.576-38.782,23.301-17.138-4.274-27.571-21.638-23.295-38.78,4.272-17.145,21.635-27.579,38.775-23.305,17.144,4.274,27.576,21.64,23.302,38.784z" fill="#f7931a"/>
+<path d="m335.71,344.95c0.637-4.258-2.605-6.547-7.038-8.074l1.438-5.768-3.511-0.875-1.4,5.616c-0.923-0.23-1.871-0.447-2.813-0.662l1.41-5.653-3.509-0.875-1.439,5.766c-0.764-0.174-1.514-0.346-2.242-0.527l0.004-0.018-4.842-1.209-0.934,3.75s2.605,0.597,2.55,0.634c1.422,0.355,1.679,1.296,1.636,2.042l-1.638,6.571c0.098,0.025,0.225,0.061,0.365,0.117-0.117-0.029-0.242-0.061-0.371-0.092l-2.296,9.205c-0.174,0.432-0.615,1.08-1.609,0.834,0.035,0.051-2.552-0.637-2.552-0.637l-1.743,4.019,4.569,1.139c0.85,0.213,1.683,0.436,2.503,0.646l-1.453,5.834,3.507,0.875,1.439-5.772c0.958,0.26,1.888,0.5,2.798,0.726l-1.434,5.745,3.511,0.875,1.453-5.823c5.987,1.133,10.489,0.676,12.384-4.739,1.527-4.36-0.076-6.875-3.226-8.515,2.294-0.529,4.022-2.038,4.483-5.155zm-8.022,11.249c-1.085,4.36-8.426,2.003-10.806,1.412l1.928-7.729c2.38,0.594,10.012,1.77,8.878,6.317zm1.086-11.312c-0.99,3.966-7.1,1.951-9.082,1.457l1.748-7.01c1.982,0.494,8.365,1.416,7.334,5.553z" fill="#FFF"/>
+</g>
+</svg>

From 4b9bfd6ca07654a5af01954f1a4f65bc60382238 Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Tue, 18 Jan 2022 17:37:04 +0900
Subject: [PATCH 27/47] Basic block indexing WIP - Default mining pool icon -
 Only show mining hashrate on 1d scale

---
 backend/src/api/blocks.ts                     | 47 +++++++++----
 backend/src/api/database-migration.ts         |  4 +-
 backend/src/api/mining.ts                     | 33 ++++-----
 backend/src/index.ts                          |  8 ++-
 backend/src/repositories/BlocksRepository.ts  | 49 +++++++++----
 backend/src/repositories/PoolsRepository.ts   |  2 +-
 .../pool-ranking/pool-ranking.component.html  |  8 +--
 .../pool-ranking/pool-ranking.component.ts    | 20 +++---
 .../src/app/interfaces/node-api.interface.ts  |  2 +
 frontend/src/app/services/mining.service.ts   | 53 +++++++++++++-
 .../src/resources/mining-pools/default.svg    | 69 +++++++++++++++++++
 .../src/resources/mining-pools/unknown.svg    |  7 --
 12 files changed, 230 insertions(+), 72 deletions(-)
 create mode 100644 frontend/src/resources/mining-pools/default.svg
 delete mode 100644 frontend/src/resources/mining-pools/unknown.svg

diff --git a/backend/src/api/blocks.ts b/backend/src/api/blocks.ts
index 4f1e17101..eda348ad8 100644
--- a/backend/src/api/blocks.ts
+++ b/backend/src/api/blocks.ts
@@ -7,10 +7,10 @@ import { Common } from './common';
 import diskCache from './disk-cache';
 import transactionUtils from './transaction-utils';
 import bitcoinClient from './bitcoin/bitcoin-client';
-import { DB } from '../database';
 import { IEsploraApi } from './bitcoin/esplora-api.interface';
 import poolsRepository from '../repositories/PoolsRepository';
 import blocksRepository from '../repositories/BlocksRepository';
+import BitcoinApi from './bitcoin/bitcoin-api';
 
 class Blocks {
   private blocks: BlockExtended[] = [];
@@ -146,22 +146,41 @@ class Blocks {
    * Index all blocks metadata for the mining dashboard
    */
   public async $generateBlockDatabase() {
-    let currentBlockHeight = await bitcoinApi.$getBlockHeightTip();
-    let maxBlocks = 1008*2; // tmp
+    let currentBlockHeight = await bitcoinClient.getBlockCount();
+    const indexedBlockCount = await blocksRepository.$blockCount();
 
-    while (currentBlockHeight-- > 0 && maxBlocks-- > 0) {
-      if (await blocksRepository.$isBlockAlreadyIndexed(currentBlockHeight)) {
-        // logger.debug(`Block #${currentBlockHeight} already indexed, skipping`);
+    logger.info(`Starting block indexing. Current tip at block #${currentBlockHeight}`);
+    logger.info(`Need to index ${currentBlockHeight - indexedBlockCount} blocks. Working on it!`);
+
+    const chunkSize = 10000;
+    while (currentBlockHeight >= 0) {
+      const endBlock = Math.max(0, currentBlockHeight - chunkSize + 1);
+      const missingBlockHeights: number[] = await blocksRepository.$getMissingBlocksBetweenHeights(
+        currentBlockHeight, endBlock);
+      if (missingBlockHeights.length <= 0) {
+        logger.debug(`No missing blocks between #${currentBlockHeight} to #${endBlock}, moving on`);
+        currentBlockHeight -= chunkSize;
         continue;
       }
-      logger.debug(`Indexing block #${currentBlockHeight}`);
-      const blockHash = await bitcoinApi.$getBlockHash(currentBlockHeight);
-      const block = await bitcoinApi.$getBlock(blockHash);
-      const transactions = await this.$getTransactionsExtended(blockHash, block.height, true);
-      const blockExtended = this.getBlockExtended(block, transactions);
-      const miner = await this.$findBlockMiner(blockExtended.coinbaseTx);
-      const coinbase: IEsploraApi.Transaction = await bitcoinApi.$getRawTransaction(transactions[0].txid, true);
-      await blocksRepository.$saveBlockInDatabase(blockExtended, blockHash, coinbase.hex, miner);
+
+      logger.info(`Indexing ${chunkSize} blocks from #${currentBlockHeight} to #${endBlock}`);
+
+      for (const blockHeight of missingBlockHeights) {
+        try {
+          logger.debug(`Indexing block #${blockHeight}`);
+          const blockHash = await bitcoinApi.$getBlockHash(blockHeight);
+          const block = await bitcoinApi.$getBlock(blockHash);
+          const transactions = await this.$getTransactionsExtended(blockHash, block.height, true);
+          const blockExtended = this.getBlockExtended(block, transactions);
+          const miner = await this.$findBlockMiner(blockExtended.coinbaseTx);
+          const coinbase: IEsploraApi.Transaction = await bitcoinApi.$getRawTransaction(transactions[0].txid, true);
+          await blocksRepository.$saveBlockInDatabase(blockExtended, blockHash, coinbase.hex, miner);
+        } catch (e) {
+          logger.err(`Something went wrong while indexing blocks.` + e);
+        }
+      }
+
+      currentBlockHeight -= chunkSize;
     }
   }
 
diff --git a/backend/src/api/database-migration.ts b/backend/src/api/database-migration.ts
index 69807b414..c08b36ce1 100644
--- a/backend/src/api/database-migration.ts
+++ b/backend/src/api/database-migration.ts
@@ -6,7 +6,7 @@ import logger from '../logger';
 const sleep = (ms: number) => new Promise(res => setTimeout(res, ms));
 
 class DatabaseMigration {
-  private static currentVersion = 3;
+  private static currentVersion = 4;
   private queryTimeout = 120000;
   private statisticsAddedIndexed = false;
 
@@ -85,6 +85,8 @@ class DatabaseMigration {
       }
       if (databaseSchemaVersion < 3) {
         await this.$executeQuery(connection, this.getCreatePoolsTableQuery(), await this.$checkIfTableExists('pools'));
+      }
+      if (databaseSchemaVersion < 4) {
         await this.$executeQuery(connection, this.getCreateBlocksTableQuery(), await this.$checkIfTableExists('blocks'));
       }
       connection.release();
diff --git a/backend/src/api/mining.ts b/backend/src/api/mining.ts
index 6582221a5..b6d3d8750 100644
--- a/backend/src/api/mining.ts
+++ b/backend/src/api/mining.ts
@@ -1,33 +1,30 @@
-import { PoolInfo, PoolStats } from "../mempool.interfaces";
-import BlocksRepository, { EmptyBlocks } from "../repositories/BlocksRepository";
-import PoolsRepository from "../repositories/PoolsRepository";
-import bitcoinClient from "./bitcoin/bitcoin-client";
-import BitcoinApi from "./bitcoin/bitcoin-api";
+import { PoolInfo, PoolStats } from '../mempool.interfaces';
+import BlocksRepository, { EmptyBlocks } from '../repositories/BlocksRepository';
+import PoolsRepository from '../repositories/PoolsRepository';
+import bitcoinClient from './bitcoin/bitcoin-client';
+import BitcoinApi from './bitcoin/bitcoin-api';
 
 class Mining {
-  private bitcoinApi: BitcoinApi;
-
   constructor() {
-    this.bitcoinApi = new BitcoinApi(bitcoinClient);
   }
 
   /**
    * Generate high level overview of the pool ranks and general stats
    */
-  public async $getPoolsStats(interval: string = "100 YEAR") : Promise<object> {
-    let poolsStatistics = {};
+  public async $getPoolsStats(interval: string = '100 YEAR') : Promise<object> {
+    const poolsStatistics = {};
 
-    const blockHeightTip = await this.bitcoinApi.$getBlockHeightTip();
-    const lastBlockHashrate = await this.bitcoinApi.$getEstimatedHashrate(blockHeightTip);
+    const blockHeightTip = await bitcoinClient.getBlockCount();
+    const lastBlockHashrate = await bitcoinClient.getNetworkHashPs(120, blockHeightTip);
     const poolsInfo: PoolInfo[] = await PoolsRepository.$getPoolsInfo(interval);
     const blockCount: number = await BlocksRepository.$blockCount(interval);
     const emptyBlocks: EmptyBlocks[] = await BlocksRepository.$countEmptyBlocks(interval);
 
-    let poolsStats: PoolStats[] = [];
+    const poolsStats: PoolStats[] = [];
     let rank = 1;
 
     poolsInfo.forEach((poolInfo: PoolInfo) => {
-      let poolStat: PoolStats = {
+      const poolStat: PoolStats = {
         poolId: poolInfo.poolId, // mysql row id
         name: poolInfo.name,
         link: poolInfo.link,
@@ -41,11 +38,11 @@ class Mining {
         }
       }
       poolsStats.push(poolStat);
-    })
+    });
 
-    poolsStatistics["blockCount"] = blockCount;
-    poolsStatistics["lastEstimatedHashrate"] = lastBlockHashrate;
-    poolsStatistics["pools"] = poolsStats;
+    poolsStatistics['blockCount'] = blockCount;
+    poolsStatistics['lastEstimatedHashrate'] = lastBlockHashrate;
+    poolsStatistics['pools'] = poolsStats;
 
     return poolsStatistics;
   }
diff --git a/backend/src/index.ts b/backend/src/index.ts
index bf3abf01f..4839322d4 100644
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -26,6 +26,7 @@ import poolsParser from './api/pools-parser';
 import syncAssets from './sync-assets';
 import icons from './api/liquid/icons';
 import { Common } from './api/common';
+import bitcoinClient from './api/bitcoin/bitcoin-client';
 
 class Server {
   private wss: WebSocket.Server | undefined;
@@ -139,10 +140,13 @@ class Server {
       await blocks.$updateBlocks();
       await memPool.$updateMempool();
 
-      if (this.blockIndexingStarted === false/* && memPool.isInSync()*/) {
+      const blockchainInfo = await bitcoinClient.getBlockchainInfo();
+      if (this.blockIndexingStarted === false
+        && memPool.isInSync()
+        && blockchainInfo.blocks === blockchainInfo.headers
+      ) {
         blocks.$generateBlockDatabase();
         this.blockIndexingStarted = true;
-        logger.info("START OLDER BLOCK INDEXING");
       }
 
       setTimeout(this.runMainUpdateLoop.bind(this), config.MEMPOOL.POLL_RATE_MS);
diff --git a/backend/src/repositories/BlocksRepository.ts b/backend/src/repositories/BlocksRepository.ts
index 9802a0a74..bbc701215 100644
--- a/backend/src/repositories/BlocksRepository.ts
+++ b/backend/src/repositories/BlocksRepository.ts
@@ -1,10 +1,10 @@
-import { BlockExtended, PoolTag } from "../mempool.interfaces";
-import { DB } from "../database";
-import logger from "../logger";
+import { BlockExtended, PoolTag } from '../mempool.interfaces';
+import { DB } from '../database';
+import logger from '../logger';
 
 export interface EmptyBlocks {
-  emptyBlocks: number,
-  poolId: number,
+  emptyBlocks: number;
+  poolId: number;
 }
 
 class BlocksRepository {
@@ -21,9 +21,9 @@ class BlocksRepository {
 
     try {
       const query = `INSERT INTO blocks(
-        height,  hash,     timestamp,    size,
-        weight,  tx_count, coinbase_raw, difficulty,
-        pool_id, fees,     fee_span,     median_fee
+        height,  hash,     blockTimestamp, size,
+        weight,  tx_count, coinbase_raw,   difficulty,
+        pool_id, fees,     fee_span,       median_fee
       ) VALUE (
         ?, ?, FROM_UNIXTIME(?), ?,
         ?, ?, ?, ?,
@@ -32,8 +32,8 @@ class BlocksRepository {
 
       const params: any[] = [
         block.height, blockHash, block.timestamp, block.size,
-        block.weight, block.tx_count, coinbaseHex ? coinbaseHex : "", block.difficulty,
-        poolTag.id, 0, "[]", block.medianFee,
+        block.weight, block.tx_count, coinbaseHex ? coinbaseHex : '', block.difficulty,
+        poolTag.id, 0, '[]', block.medianFee,
       ];
 
       await connection.query(query, params);
@@ -61,15 +61,36 @@ class BlocksRepository {
     return exists;
   }
 
+  /**
+   * Get all block height that have not been indexed between [startHeight, endHeight]
+   */
+  public async $getMissingBlocksBetweenHeights(startHeight: number, endHeight: number): Promise<number[]> {
+    const connection = await DB.pool.getConnection();
+    const [rows] : any[] = await connection.query(`
+      SELECT height
+      FROM blocks
+      WHERE height <= ${startHeight} AND height >= ${endHeight}
+      ORDER BY height DESC;
+    `);
+    connection.release();
+
+    const indexedBlockHeights: number[] = [];
+    rows.forEach((row: any) => { indexedBlockHeights.push(row.height); });
+    const seekedBlocks: number[] = Array.from(Array(startHeight - endHeight + 1).keys(), n => n + endHeight).reverse();
+    const missingBlocksHeights =  seekedBlocks.filter(x => indexedBlockHeights.indexOf(x) === -1);
+
+    return missingBlocksHeights;
+  }
+
   /**
    * Count empty blocks for all pools
    */
-  public async $countEmptyBlocks(interval: string = "100 YEAR") : Promise<EmptyBlocks[]> {
+  public async $countEmptyBlocks(interval: string = '100 YEAR'): Promise<EmptyBlocks[]> {
     const connection = await DB.pool.getConnection();
     const [rows] = await connection.query(`
       SELECT pool_id as poolId
       FROM blocks
-      WHERE timestamp BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()
+      WHERE blockTimestamp BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()
       AND tx_count = 1;
     `);
     connection.release();
@@ -80,12 +101,12 @@ class BlocksRepository {
   /**
    * Get blocks count for a period
    */
-   public async $blockCount(interval: string = "100 YEAR") : Promise<number> {
+   public async $blockCount(interval: string = '100 YEAR'): Promise<number> {
     const connection = await DB.pool.getConnection();
     const [rows] = await connection.query(`
       SELECT count(height) as blockCount
       FROM blocks
-      WHERE timestamp BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW();
+      WHERE blockTimestamp BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW();
     `);
     connection.release();
 
diff --git a/backend/src/repositories/PoolsRepository.ts b/backend/src/repositories/PoolsRepository.ts
index bf3ee18e0..b2a61dc19 100644
--- a/backend/src/repositories/PoolsRepository.ts
+++ b/backend/src/repositories/PoolsRepository.ts
@@ -31,7 +31,7 @@ class PoolsRepository {
       SELECT COUNT(height) as blockCount, pool_id as poolId, pools.name as name, pools.link as link
       FROM blocks
       JOIN pools on pools.id = pool_id
-      WHERE timestamp BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()
+      WHERE blocks.blockTimestamp BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()
       GROUP BY pool_id
       ORDER BY COUNT(height) DESC;
     `);
diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.html b/frontend/src/app/components/pool-ranking/pool-ranking.component.html
index 195f4b6f6..2a48b045b 100644
--- a/frontend/src/app/components/pool-ranking/pool-ranking.component.html
+++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.html
@@ -50,7 +50,7 @@
       <th class="d-none d-md-block" i18n="latest-blocks.height">Rank</th>
       <th><!-- LOGO --></th>
       <th i18n="latest-blocks.timestamp">Name</th>
-      <th i18n="latest-blocks.timestamp">Hashrate</th>
+      <th *ngIf="this.poolsWindowPreference === '1d'" i18n="latest-blocks.timestamp">Hashrate</th>
       <th i18n="latest-blocks.mined">Block Count (%)</th>
       <th class="d-none d-md-block" i18n="latest-blocks.transactions">Empty Blocks (%)</th>
     </thead>
@@ -59,15 +59,15 @@
         <td class="d-none d-md-block">-</td>
         <td><!-- LOGO --></td>
         <td>All miners</td>
-        <td>{{ miningStats.lastEstimatedHashrate}} PH/s</td>
+        <td *ngIf="this.poolsWindowPreference === '1d'">{{ miningStats.lastEstimatedHashrate}} {{ miningStats.miningUnits.hashrateUnit }}</td>
         <td>{{ miningStats.blockCount }}</td>
         <td class="d-none d-md-block">{{ miningStats.totalEmptyBlock }} ({{ miningStats.totalEmptyBlockRatio }}%)</td>
       </tr>
       <tr *ngFor="let pool of miningStats.pools">
         <td class="d-none d-md-block">{{ pool.rank }}</td>
-        <td><img width="25" height="25" src="{{ pool.logo }}"></td>
+        <td><img width="25" height="25" src="{{ pool.logo }}" onError="this.src = './resources/mining-pools/default.svg'"></td>
         <td><a target="#" href="{{ pool.link }}">{{ pool.name }}</a></td>
-        <td>{{ pool.lastEstimatedHashrate }} PH/s</td>
+        <td *ngIf="this.poolsWindowPreference === '1d'">{{ pool.lastEstimatedHashrate }} {{ miningStats.miningUnits.hashrateUnit }}</td>
         <td>{{ pool.blockCount }} ({{ pool.share }}%)</td>
         <td class="d-none d-md-block">{{ pool.emptyBlocks }} ({{ pool.emptyBlockRatio }}%)</td>
       </tr>
diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
index 8dc1ab0fc..b193c5690 100644
--- a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
+++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
@@ -2,10 +2,9 @@ import { Component, OnDestroy, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { EChartsOption } from 'echarts';
 import { BehaviorSubject, Subscription } from 'rxjs';
-import { MiningStats } from 'src/app/interfaces/node-api.interface';
 import { StateService } from 'src/app/services/state.service';
 import { StorageService } from 'src/app/services/storage.service';
-import { MiningService } from '../../services/mining.service';
+import { MiningService, MiningStats } from '../../services/mining.service';
 
 @Component({
   selector: 'app-pool-ranking',
@@ -70,7 +69,7 @@ export class PoolRankingComponent implements OnInit, OnDestroy {
 
   watchBlocks() {
     this.blocksSubscription = this.stateService.blocks$
-      .subscribe(([block]) => {
+      .subscribe(() => {
         if (!this.miningStats) {
           return;
         }
@@ -98,9 +97,14 @@ export class PoolRankingComponent implements OnInit, OnDestroy {
         label: { color: '#FFFFFF' },
         tooltip: {
           formatter: () => {
-            return `<u><b>${pool.name}</b></u><br>` +
-              pool.lastEstimatedHashrate.toString() + ' PH/s (' + pool.share + `%)
-              <br>(` + pool.blockCount.toString() + ` blocks)`;
+            if (this.poolsWindowPreference === '1d') {
+              return `<u><b>${pool.name}</b></u><br>` +
+                pool.lastEstimatedHashrate.toString() + ' PH/s (' + pool.share + `%)
+                <br>(` + pool.blockCount.toString() + ` blocks)`;
+            } else {
+              return `<u><b>${pool.name}</b></u><br>` +
+                pool.blockCount.toString() + ` blocks`;
+            }
           }
         }
       });
@@ -111,8 +115,8 @@ export class PoolRankingComponent implements OnInit, OnDestroy {
   prepareChartOptions() {
     this.chartOptions = {
       title: {
-        text: 'Hashrate distribution',
-        subtext: 'Estimated from the # of blocks mined',
+        text: (this.poolsWindowPreference === '1d') ? 'Hashrate distribution' : 'Block distribution',
+        subtext: (this.poolsWindowPreference === '1d') ? 'Estimated from the # of blocks mined' : null,
         left: 'center',
         textStyle: {
           color: '#FFFFFF',
diff --git a/frontend/src/app/interfaces/node-api.interface.ts b/frontend/src/app/interfaces/node-api.interface.ts
index 265ad59d9..ba0adc77f 100644
--- a/frontend/src/app/interfaces/node-api.interface.ts
+++ b/frontend/src/app/interfaces/node-api.interface.ts
@@ -71,6 +71,8 @@ export interface PoolsStats {
   pools: SinglePoolStats[],
 }
 
+export interface ITranslators { [language: string]: string; }
+
 export interface MiningStats {
   lastEstimatedHashrate: string,
   blockCount: number,
diff --git a/frontend/src/app/services/mining.service.ts b/frontend/src/app/services/mining.service.ts
index f388975a8..00cffbca1 100644
--- a/frontend/src/app/services/mining.service.ts
+++ b/frontend/src/app/services/mining.service.ts
@@ -1,8 +1,23 @@
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { MiningStats, PoolsStats } from '../interfaces/node-api.interface';
+import { PoolsStats, SinglePoolStats } from '../interfaces/node-api.interface';
 import { ApiService } from '../services/api.service';
+import { StateService } from './state.service';
+
+export interface MiningUnits {
+  hashrateDivider: number,
+  hashrateUnit: string,
+}
+
+export interface MiningStats {
+  lastEstimatedHashrate: string,
+  blockCount: number,
+  totalEmptyBlock: number,
+  totalEmptyBlockRatio: string,
+  pools: SinglePoolStats[],
+  miningUnits: MiningUnits,
+}
 
 @Injectable({
   providedIn: 'root'
@@ -10,6 +25,7 @@ import { ApiService } from '../services/api.service';
 export class MiningService {
 
   constructor(
+    private stateService: StateService,
     private apiService: ApiService,
   ) { }
 
@@ -19,7 +35,37 @@ export class MiningService {
     );
   }
 
+  /**
+   * Set the hashrate power of ten we want to display
+   */
+  public getMiningUnits() : MiningUnits {
+    const powerTable = {
+      0: "H/s",
+      3: "kH/s",
+      6: "MH/s",
+      9: "GH/s",
+      12: "TH/s",
+      15: "PH/s",
+      18: "EH/s",
+    };
+
+    // I think it's fine to hardcode this since we don't have x1000 hashrate jump everyday
+    // If we want to support the mining dashboard for testnet, we can hardcode it too
+    let selectedPower = 15;
+    if (this.stateService.network === 'testnet') {
+      selectedPower = 12;
+    }
+
+    return {
+      hashrateDivider: Math.pow(10, selectedPower),
+      hashrateUnit: powerTable[selectedPower],
+    };
+  }
+
   private generateMiningStats(stats: PoolsStats) : MiningStats {
+    const miningUnits = this.getMiningUnits();
+    const hashrateDivider = miningUnits.hashrateDivider;
+
     const totalEmptyBlock = Object.values(stats.pools).reduce((prev, cur) => {
       return prev + cur.emptyBlocks;
     }, 0);
@@ -27,7 +73,7 @@ export class MiningService {
     const poolsStats = stats.pools.map((poolStat) => {
       return {
         share: (poolStat.blockCount / stats.blockCount * 100).toFixed(2),
-        lastEstimatedHashrate: (poolStat.blockCount / stats.blockCount * stats.lastEstimatedHashrate / Math.pow(10, 15)).toFixed(2),
+        lastEstimatedHashrate: (poolStat.blockCount / stats.blockCount * stats.lastEstimatedHashrate / hashrateDivider).toFixed(2),
         emptyBlockRatio: (poolStat.emptyBlocks / poolStat.blockCount * 100).toFixed(2),
         logo: `./resources/mining-pools/` + poolStat.name.toLowerCase().replace(' ', '').replace('.', '') + '.svg',
         ...poolStat
@@ -35,11 +81,12 @@ export class MiningService {
     });
 
     return {
-      lastEstimatedHashrate: (stats.lastEstimatedHashrate / Math.pow(10, 15)).toFixed(2),
+      lastEstimatedHashrate: (stats.lastEstimatedHashrate / hashrateDivider).toFixed(2),
       blockCount: stats.blockCount,
       totalEmptyBlock: totalEmptyBlock,
       totalEmptyBlockRatio: totalEmptyBlockRatio,
       pools: poolsStats,
+      miningUnits: miningUnits,
     };
   }
 }
diff --git a/frontend/src/resources/mining-pools/default.svg b/frontend/src/resources/mining-pools/default.svg
new file mode 100644
index 000000000..84496f899
--- /dev/null
+++ b/frontend/src/resources/mining-pools/default.svg
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.2" width="135.73mm" height="135.73mm" viewBox="0 0 13573 13573" preserveAspectRatio="xMidYMid" fill-rule="evenodd" stroke-width="28.222" stroke-linejoin="round" xmlns="http://www.w3.org/2000/svg" xmlns:ooo="http://xml.openoffice.org/svg/export" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:presentation="http://sun.com/xmlns/staroffice/presentation" xmlns:smil="http://www.w3.org/2001/SMIL20/" xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" xml:space="preserve">
+ <defs class="ClipPathGroup">
+  <clipPath id="presentation_clip_path" clipPathUnits="userSpaceOnUse">
+   <rect x="0" y="0" width="13573" height="13573"/>
+  </clipPath>
+  <clipPath id="presentation_clip_path_shrink" clipPathUnits="userSpaceOnUse">
+   <rect x="13" y="13" width="13546" height="13546"/>
+  </clipPath>
+ </defs>
+ <defs class="TextShapeIndex">
+  <g ooo:slide="id1" ooo:id-list="id3"/>
+ </defs>
+ <defs class="EmbeddedBulletChars">
+  <g id="bullet-char-template-57356" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 580,1141 L 1163,571 580,0 -4,571 580,1141 Z"/>
+  </g>
+  <g id="bullet-char-template-57354" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 8,1128 L 1137,1128 1137,0 8,0 8,1128 Z"/>
+  </g>
+  <g id="bullet-char-template-10146" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 174,0 L 602,739 174,1481 1456,739 174,0 Z M 1358,739 L 309,1346 659,739 1358,739 Z"/>
+  </g>
+  <g id="bullet-char-template-10132" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 2015,739 L 1276,0 717,0 1260,543 174,543 174,936 1260,936 717,1481 1274,1481 2015,739 Z"/>
+  </g>
+  <g id="bullet-char-template-10007" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 0,-2 C -7,14 -16,27 -25,37 L 356,567 C 262,823 215,952 215,954 215,979 228,992 255,992 264,992 276,990 289,987 310,991 331,999 354,1012 L 381,999 492,748 772,1049 836,1024 860,1049 C 881,1039 901,1025 922,1006 886,937 835,863 770,784 769,783 710,716 594,584 L 774,223 C 774,196 753,168 711,139 L 727,119 C 717,90 699,76 672,76 641,76 570,178 457,381 L 164,-76 C 142,-110 111,-127 72,-127 30,-127 9,-110 8,-76 1,-67 -2,-52 -2,-32 -2,-23 -1,-13 0,-2 Z"/>
+  </g>
+  <g id="bullet-char-template-10004" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 285,-33 C 182,-33 111,30 74,156 52,228 41,333 41,471 41,549 55,616 82,672 116,743 169,778 240,778 293,778 328,747 346,684 L 369,508 C 377,444 397,411 428,410 L 1163,1116 C 1174,1127 1196,1133 1229,1133 1271,1133 1292,1118 1292,1087 L 1292,965 C 1292,929 1282,901 1262,881 L 442,47 C 390,-6 338,-33 285,-33 Z"/>
+  </g>
+  <g id="bullet-char-template-9679" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 223,773 276,916 383,1023 489,1130 632,1184 813,1184 992,1184 1136,1130 1245,1023 1353,916 1407,772 1407,592 1407,412 1353,268 1245,161 1136,54 992,0 813,0 Z"/>
+  </g>
+  <g id="bullet-char-template-8226" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 346,457 C 273,457 209,483 155,535 101,586 74,649 74,723 74,796 101,859 155,911 209,963 273,989 346,989 419,989 480,963 531,910 582,859 608,796 608,723 608,648 583,586 532,535 482,483 420,457 346,457 Z"/>
+  </g>
+  <g id="bullet-char-template-8211" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M -4,459 L 1135,459 1135,606 -4,606 -4,459 Z"/>
+  </g>
+  <g id="bullet-char-template-61548" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 173,740 C 173,903 231,1043 346,1159 462,1274 601,1332 765,1332 928,1332 1067,1274 1183,1159 1299,1043 1357,903 1357,740 1357,577 1299,437 1183,322 1067,206 928,148 765,148 601,148 462,206 346,322 231,437 173,577 173,740 Z"/>
+  </g>
+ </defs>
+ <g>
+  <g id="id2" class="Master_Slide">
+   <g id="bg-id2" class="Background"/>
+   <g id="bo-id2" class="BackgroundObjects"/>
+  </g>
+ </g>
+ <g class="SlideGroup">
+  <g>
+   <g id="container-id1">
+    <g id="id1" class="Slide" clip-path="url(#presentation_clip_path)">
+     <g class="Page">
+      <g class="com.sun.star.drawing.ClosedBezierShape">
+       <g id="id3">
+        <rect class="BoundingBox" stroke="none" fill="none" x="681" y="481" width="12413" height="12571"/>
+        <path fill="rgb(178,178,178)" stroke="none" d="M 3025,482 C 2802,483 2580,504 2361,546 5189,2249 7300,4524 8967,7155 9034,5734 8462,4269 7551,3076 7178,3216 6719,3095 6402,2778 6085,2461 5964,2001 6103,1629 5158,916 4079,477 3025,482 Z M 11216,3076 L 12011,6397 10553,6630 10040,8762 11984,9797 10893,11277 11678,12442 9329,11711 9765,10551 7737,9655 8084,7418 5138,8956 5027,11026 2058,10295 1178,13050 13092,13050 13092,1022 11216,3076 Z M 6921,1567 C 6911,1567 6901,1567 6891,1568 6794,1577 6710,1613 6649,1674 6486,1837 6497,2174 6751,2428 7005,2683 7342,2693 7504,2531 7667,2368 7656,2031 7402,1777 7253,1628 7075,1562 6921,1567 Z M 5212,3389 L 682,7919 C 795,8235 974,8476 1350,8597 L 5886,4061 C 5679,3826 5454,3602 5212,3389 Z M 9412,3696 L 9658,5937 10384,3696 9412,3696 Z M 5920,5680 L 5386,6631 7837,6825 5920,5680 Z"/>
+       </g>
+      </g>
+     </g>
+    </g>
+   </g>
+  </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/frontend/src/resources/mining-pools/unknown.svg b/frontend/src/resources/mining-pools/unknown.svg
deleted file mode 100644
index d6661188a..000000000
--- a/frontend/src/resources/mining-pools/unknown.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="64.001" width="64.001" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
-<g transform="translate(-289.60744,-317.50471)">
-<path d="m352.64,357.25c-4.274,17.143-21.637,27.576-38.782,23.301-17.138-4.274-27.571-21.638-23.295-38.78,4.272-17.145,21.635-27.579,38.775-23.305,17.144,4.274,27.576,21.64,23.302,38.784z" fill="#f7931a"/>
-<path d="m335.71,344.95c0.637-4.258-2.605-6.547-7.038-8.074l1.438-5.768-3.511-0.875-1.4,5.616c-0.923-0.23-1.871-0.447-2.813-0.662l1.41-5.653-3.509-0.875-1.439,5.766c-0.764-0.174-1.514-0.346-2.242-0.527l0.004-0.018-4.842-1.209-0.934,3.75s2.605,0.597,2.55,0.634c1.422,0.355,1.679,1.296,1.636,2.042l-1.638,6.571c0.098,0.025,0.225,0.061,0.365,0.117-0.117-0.029-0.242-0.061-0.371-0.092l-2.296,9.205c-0.174,0.432-0.615,1.08-1.609,0.834,0.035,0.051-2.552-0.637-2.552-0.637l-1.743,4.019,4.569,1.139c0.85,0.213,1.683,0.436,2.503,0.646l-1.453,5.834,3.507,0.875,1.439-5.772c0.958,0.26,1.888,0.5,2.798,0.726l-1.434,5.745,3.511,0.875,1.453-5.823c5.987,1.133,10.489,0.676,12.384-4.739,1.527-4.36-0.076-6.875-3.226-8.515,2.294-0.529,4.022-2.038,4.483-5.155zm-8.022,11.249c-1.085,4.36-8.426,2.003-10.806,1.412l1.928-7.729c2.38,0.594,10.012,1.77,8.878,6.317zm1.086-11.312c-0.99,3.966-7.1,1.951-9.082,1.457l1.748-7.01c1.982,0.494,8.365,1.416,7.334,5.553z" fill="#FFF"/>
-</g>
-</svg>

From b8410f00d96f0924a2e94c0ad471bdcc6daf397e Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Wed, 19 Jan 2022 13:03:43 +0900
Subject: [PATCH 28/47] Fix xxxWindowPreference management

---
 backend/README.md                             | 35 +++++++------------
 backend/src/repositories/BlocksRepository.ts  | 17 ---------
 .../pool-ranking/pool-ranking.component.ts    |  1 +
 frontend/src/app/services/storage.service.ts  |  9 +++--
 4 files changed, 20 insertions(+), 42 deletions(-)

diff --git a/backend/README.md b/backend/README.md
index a6d0fb60f..1441319b9 100644
--- a/backend/README.md
+++ b/backend/README.md
@@ -2,32 +2,21 @@
 
 The backend is static. Typescript scripts are compiled into the `dist` folder and served through a node web server.
 
-You can avoid the manual shutdown/recompile/restart command line cycle by setting up watchers.
+You can avoid the manual shutdown/recompile/restart command line cycle by using a watcher.
 
 Make sure you are in the `backend` directory `cd backend`.
 
-1. Install nodemon 
+1. Install nodemon and ts-node
+
 ```
-sudo npm install -g nodemon
-```
-2. [Optional] Add the following configuration into `tsconfig.json`. You can find watch options here https://www.typescriptlang.org/docs/handbook/configuring-watch.html
-```
-    "watchOptions": {
-      "watchFile": "useFsEvents",
-      "watchDirectory": "useFsEvents",
-      "fallbackPolling": "dynamicPriority",
-      "synchronousWatchDirectory": true,
-      "excludeDirectories": ["**/node_modules", "_build"],
-      "excludeFiles": ["build/fileWhichChangesOften.ts"]
-    }
-```
-3. In one terminal, watch typescript scripts
-```
-./node_modules/typescript/bin/tsc --watch
-```
-4. In another terminal, watch compiled javascript
-```
-nodemon --max-old-space-size=2048 dist/index.js
+sudo npm install -g ts-node nodemon
+```
+
+2. Run the watcher
+
+> Note: You can find your npm global binary folder using `npm -g bin`, where nodemon will be installed.
+
+```
+nodemon src/index.ts --ignore cache/
 ```
 
-Everytime you save a backend `.ts` file, `tsc` will recompile it and genereate a new static `.js` file in the `dist` folder. `nodemon` will detect this new file and restart the node web server automatically.
diff --git a/backend/src/repositories/BlocksRepository.ts b/backend/src/repositories/BlocksRepository.ts
index bbc701215..9ae41f536 100644
--- a/backend/src/repositories/BlocksRepository.ts
+++ b/backend/src/repositories/BlocksRepository.ts
@@ -38,29 +38,12 @@ class BlocksRepository {
 
       await connection.query(query, params);
     } catch (e) {
-      console.log(e);
       logger.err('$updateBlocksDatabase() error' + (e instanceof Error ? e.message : e));
     }
 
     connection.release();
   }
 
-  /**
-   * Check if a block has already been indexed in the database. Query the databse directly.
-   * This can be cached/optimized if required later on to avoid too many db queries.
-   */
-  public async $isBlockAlreadyIndexed(blockHeight: number) {
-    const connection = await DB.pool.getConnection();
-    let exists = false;
-
-    const query = `SELECT height from blocks where blocks.height = ${blockHeight}`;
-    const [rows]: any[] = await connection.query(query);
-    exists = rows.length === 1;
-    connection.release();
-
-    return exists;
-  }
-
   /**
    * Get all block height that have not been indexed between [startHeight, endHeight]
    */
diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
index b193c5690..ee2a597e3 100644
--- a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
+++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
@@ -78,6 +78,7 @@ export class PoolRankingComponent implements OnInit, OnDestroy {
   }
 
   onChangeWindowPreference(e) {
+    this.storageService.setValue('poolsWindowPreference', e.target.value);
     this.poolsWindowPreference = e.target.value;
     this.isLoading = true;
     this.refreshMiningStats();
diff --git a/frontend/src/app/services/storage.service.ts b/frontend/src/app/services/storage.service.ts
index 6eff9d391..d4a24e790 100644
--- a/frontend/src/app/services/storage.service.ts
+++ b/frontend/src/app/services/storage.service.ts
@@ -13,12 +13,17 @@ export class StorageService {
   setDefaultValueIfNeeded(key: string, defaultValue: string) {
     let graphWindowPreference: string = this.getValue(key);
     if (graphWindowPreference === null) { // First visit to mempool.space
-      if (this.router.url.includes("graphs") || this.router.url.includes("pools")) {
+      if (this.router.url.includes('graphs') && key === 'graphWindowPreference' ||
+        this.router.url.includes('pools') && key === 'poolsWindowPreference'
+      ) {
         this.setValue(key, this.route.snapshot.fragment ? this.route.snapshot.fragment : defaultValue);
       } else {
         this.setValue(key, defaultValue);
       }
-    } else if (this.router.url.includes("graphs") || this.router.url.includes("pools")) { // Visit a different graphs#fragment from last visit
+    } else if (this.router.url.includes('graphs') && key === 'graphWindowPreference' ||
+      this.router.url.includes('pools') && key === 'poolsWindowPreference'
+    ) {
+      // Visit a different graphs#fragment from last visit
       if (this.route.snapshot.fragment !== null && graphWindowPreference !== this.route.snapshot.fragment) {
         this.setValue(key, this.route.snapshot.fragment);
       }

From aa457e316be585858e34d32e61306444bbbcb999 Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Thu, 20 Jan 2022 17:20:02 +0900
Subject: [PATCH 29/47] Drop legacy `blocks` table during migration - Fix
 linter issues

---
 backend/README.md                            |  2 +-
 backend/src/api/blocks.ts                    | 12 ++++++------
 backend/src/api/database-migration.ts        |  1 +
 backend/src/repositories/BlocksRepository.ts |  2 +-
 backend/src/repositories/PoolsRepository.ts  | 12 ++++++------
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/backend/README.md b/backend/README.md
index 1441319b9..e65205d67 100644
--- a/backend/README.md
+++ b/backend/README.md
@@ -17,6 +17,6 @@ sudo npm install -g ts-node nodemon
 > Note: You can find your npm global binary folder using `npm -g bin`, where nodemon will be installed.
 
 ```
-nodemon src/index.ts --ignore cache/
+nodemon src/index.ts --ignore cache/ --ignore pools.json
 ```
 
diff --git a/backend/src/api/blocks.ts b/backend/src/api/blocks.ts
index eda348ad8..aac74584b 100644
--- a/backend/src/api/blocks.ts
+++ b/backend/src/api/blocks.ts
@@ -41,7 +41,7 @@ class Blocks {
    * @param onlyCoinbase - Set to true if you only need the coinbase transaction
    * @returns Promise<TransactionExtended[]>
    */
-  private async $getTransactionsExtended(blockHash: string, blockHeight: number, onlyCoinbase: boolean) : Promise<TransactionExtended[]> {
+  private async $getTransactionsExtended(blockHash: string, blockHeight: number, onlyCoinbase: boolean): Promise<TransactionExtended[]> {
     const transactions: TransactionExtended[] = [];
     const txIds: string[] = await bitcoinApi.$getTxIdsForBlock(blockHash);
 
@@ -94,7 +94,7 @@ class Blocks {
    * @param transactions
    * @returns BlockExtended
    */
-  private getBlockExtended(block: IEsploraApi.Block, transactions: TransactionExtended[]) : BlockExtended {
+  private getBlockExtended(block: IEsploraApi.Block, transactions: TransactionExtended[]): BlockExtended {
     const blockExtended: BlockExtended = Object.assign({}, block);
     blockExtended.reward = transactions[0].vout.reduce((acc, curr) => acc + curr.value, 0);
     blockExtended.coinbaseTx = transactionUtils.stripCoinbaseTransaction(transactions[0]);
@@ -113,7 +113,7 @@ class Blocks {
    * @param txMinerInfo
    * @returns
    */
-  private async $findBlockMiner(txMinerInfo: TransactionMinerInfo | undefined) : Promise<PoolTag> {
+  private async $findBlockMiner(txMinerInfo: TransactionMinerInfo | undefined): Promise<PoolTag> {
     if (txMinerInfo === undefined) {
       return await poolsRepository.$getUnknownPool();
     }
@@ -124,15 +124,15 @@ class Blocks {
     const pools: PoolTag[] = await poolsRepository.$getPools();
     for (let i = 0; i < pools.length; ++i) {
       if (address !== undefined) {
-        let addresses: string[] = JSON.parse(pools[i].addresses);
+        const addresses: string[] = JSON.parse(pools[i].addresses);
         if (addresses.indexOf(address) !== -1) {
           return pools[i];
         }
       }
 
-      let regexes: string[] = JSON.parse(pools[i].regexes);
+      const regexes: string[] = JSON.parse(pools[i].regexes);
       for (let y = 0; y < regexes.length; ++y) {
-        let match = asciiScriptSig.match(regexes[y]);
+        const match = asciiScriptSig.match(regexes[y]);
         if (match !== null) {
           return pools[i];
         }
diff --git a/backend/src/api/database-migration.ts b/backend/src/api/database-migration.ts
index c08b36ce1..50aa3a7f6 100644
--- a/backend/src/api/database-migration.ts
+++ b/backend/src/api/database-migration.ts
@@ -87,6 +87,7 @@ class DatabaseMigration {
         await this.$executeQuery(connection, this.getCreatePoolsTableQuery(), await this.$checkIfTableExists('pools'));
       }
       if (databaseSchemaVersion < 4) {
+        await this.$executeQuery(connection, 'DROP table blocks;');
         await this.$executeQuery(connection, this.getCreateBlocksTableQuery(), await this.$checkIfTableExists('blocks'));
       }
       connection.release();
diff --git a/backend/src/repositories/BlocksRepository.ts b/backend/src/repositories/BlocksRepository.ts
index 9ae41f536..8d36d8410 100644
--- a/backend/src/repositories/BlocksRepository.ts
+++ b/backend/src/repositories/BlocksRepository.ts
@@ -38,7 +38,7 @@ class BlocksRepository {
 
       await connection.query(query, params);
     } catch (e) {
-      logger.err('$updateBlocksDatabase() error' + (e instanceof Error ? e.message : e));
+      logger.err('$saveBlockInDatabase() error' + (e instanceof Error ? e.message : e));
     }
 
     connection.release();
diff --git a/backend/src/repositories/PoolsRepository.ts b/backend/src/repositories/PoolsRepository.ts
index b2a61dc19..060418bf8 100644
--- a/backend/src/repositories/PoolsRepository.ts
+++ b/backend/src/repositories/PoolsRepository.ts
@@ -1,5 +1,5 @@
-import { DB } from "../database";
-import { PoolInfo, PoolTag } from "../mempool.interfaces"
+import { DB } from '../database';
+import { PoolInfo, PoolTag } from '../mempool.interfaces';
 
 class PoolsRepository {
   /**
@@ -7,7 +7,7 @@ class PoolsRepository {
    */
   public async $getPools(): Promise<PoolTag[]> {
     const connection = await DB.pool.getConnection();
-    const [rows] = await connection.query("SELECT * FROM pools;");
+    const [rows] = await connection.query('SELECT * FROM pools;');
     connection.release();
     return <PoolTag[]>rows;
   }
@@ -17,7 +17,7 @@ class PoolsRepository {
    */
   public async $getUnknownPool(): Promise<PoolTag> {
     const connection = await DB.pool.getConnection();
-    const [rows] = await connection.query("SELECT * FROM pools where name = 'Unknown'");
+    const [rows] = await connection.query('SELECT * FROM pools where name = "Unknown"');
     connection.release();
     return <PoolTag>rows[0];
   }
@@ -25,7 +25,7 @@ class PoolsRepository {
   /**
    * Get basic pool info and block count
    */
-  public async $getPoolsInfo(interval: string = "100 YEARS"): Promise<PoolInfo[]> {
+  public async $getPoolsInfo(interval: string = '100 YEARS'): Promise<PoolInfo[]> {
     const connection = await DB.pool.getConnection();
     const [rows] = await connection.query(`
       SELECT COUNT(height) as blockCount, pool_id as poolId, pools.name as name, pools.link as link
@@ -40,4 +40,4 @@ class PoolsRepository {
   }
 }
 
-export default new PoolsRepository();
\ No newline at end of file
+export default new PoolsRepository();

From f982f6b4b602207fce29c3776ba9d7781e026349 Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Thu, 20 Jan 2022 23:54:42 +0900
Subject: [PATCH 30/47] Hide epoch data from the mining page

---
 .../src/app/components/pool-ranking/pool-ranking.component.html | 2 +-
 .../src/app/components/pool-ranking/pool-ranking.component.ts   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.html b/frontend/src/app/components/pool-ranking/pool-ranking.component.html
index 2a48b045b..6aa0f972b 100644
--- a/frontend/src/app/components/pool-ranking/pool-ranking.component.html
+++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.html
@@ -1,6 +1,6 @@
 <div class="container-xl">
 
-  <app-difficulty [showProgress]=false [showHalving]=true></app-difficulty>
+  <app-difficulty style="display: none;" [showProgress]=false [showHalving]=true></app-difficulty>
 
   <div style="height: 500px; margin-top: 30px;" echarts [initOpts]="chartInitOptions" [options]="chartOptions"></div>
   <div class="text-center loadingGraphs" *ngIf="isLoading">
diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
index ee2a597e3..465981fe3 100644
--- a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
+++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
@@ -12,7 +12,7 @@ import { MiningService, MiningStats } from '../../services/mining.service';
   styles: [`
     .loadingGraphs {
       position: absolute;
-      top: 52%;
+      top: 50%;
       left: calc(50% - 16px);
       z-index: 100;
     }

From 5b32ab6dde8e678c8bdb27cefa4a5c6882383992 Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Fri, 21 Jan 2022 00:08:51 +0900
Subject: [PATCH 31/47] DROP -> DROP IF EXISTS

---
 backend/src/api/blocks.ts             | 9 ++++++++-
 backend/src/api/database-migration.ts | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/backend/src/api/blocks.ts b/backend/src/api/blocks.ts
index aac74584b..28877a6d7 100644
--- a/backend/src/api/blocks.ts
+++ b/backend/src/api/blocks.ts
@@ -146,6 +146,10 @@ class Blocks {
    * Index all blocks metadata for the mining dashboard
    */
   public async $generateBlockDatabase() {
+    if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false) {
+      return;
+    }
+
     let currentBlockHeight = await bitcoinClient.getBlockCount();
     const indexedBlockCount = await blocksRepository.$blockCount();
 
@@ -231,7 +235,10 @@ class Blocks {
       const blockExtended: BlockExtended = this.getBlockExtended(block, transactions);
       const miner = await this.$findBlockMiner(blockExtended.coinbaseTx);
       const coinbase: IEsploraApi.Transaction = await bitcoinApi.$getRawTransaction(transactions[0].txid, true);
-      await blocksRepository.$saveBlockInDatabase(blockExtended, blockHash, coinbase.hex, miner);
+
+      if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === true) {
+        await blocksRepository.$saveBlockInDatabase(blockExtended, blockHash, coinbase.hex, miner);
+      }
 
       if (block.height % 2016 === 0) {
         this.previousDifficultyRetarget = (block.difficulty - this.currentDifficulty) / this.currentDifficulty * 100;
diff --git a/backend/src/api/database-migration.ts b/backend/src/api/database-migration.ts
index 50aa3a7f6..baa518598 100644
--- a/backend/src/api/database-migration.ts
+++ b/backend/src/api/database-migration.ts
@@ -87,7 +87,7 @@ class DatabaseMigration {
         await this.$executeQuery(connection, this.getCreatePoolsTableQuery(), await this.$checkIfTableExists('pools'));
       }
       if (databaseSchemaVersion < 4) {
-        await this.$executeQuery(connection, 'DROP table blocks;');
+        await this.$executeQuery(connection, 'DROP table IF EXISTS blocks;');
         await this.$executeQuery(connection, this.getCreateBlocksTableQuery(), await this.$checkIfTableExists('blocks'));
       }
       connection.release();

From 8eaa9b3c7bdbee39376517353b73573451cb1b73 Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Fri, 21 Jan 2022 11:17:36 +0900
Subject: [PATCH 32/47] Add share % in pie chart label

---
 .../pool-ranking/pool-ranking.component.html  |   5 +-
 .../pool-ranking/pool-ranking.component.ts    | 108 ++++++++++--------
 .../src/app/interfaces/node-api.interface.ts  |  26 ++---
 frontend/src/app/services/mining.service.ts   |  36 +++---
 4 files changed, 93 insertions(+), 82 deletions(-)

diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.html b/frontend/src/app/components/pool-ranking/pool-ranking.component.html
index 6aa0f972b..78b6a45ba 100644
--- a/frontend/src/app/components/pool-ranking/pool-ranking.component.html
+++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.html
@@ -9,8 +9,7 @@
 
   <div class="card-header">
     <form [formGroup]="radioGroupForm" class="formRadioGroup">
-      <div class="btn-group btn-group-toggle" ngbRadioGroup name="radioBasic" formControlName="dateSpan"
-        (change)="onChangeWindowPreference($event)">
+      <div class="btn-group btn-group-toggle" ngbRadioGroup name="radioBasic" formControlName="dateSpan">
         <label ngbButtonLabel class="btn-primary btn-sm">
           <input ngbButton type="radio" [value]="'1d'" [routerLink]="['/pools' | relativeUrl]" fragment="1d"> 1D
         </label>
@@ -54,7 +53,7 @@
       <th i18n="latest-blocks.mined">Block Count (%)</th>
       <th class="d-none d-md-block" i18n="latest-blocks.transactions">Empty Blocks (%)</th>
     </thead>
-    <tbody *ngIf="(miningStatsEmitter$ | async) as miningStats">
+    <tbody *ngIf="(miningStatsObservable$ | async) as miningStats">
       <tr>
         <td class="d-none d-md-block">-</td>
         <td><!-- LOGO --></td>
diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
index 465981fe3..8ce0ef7ab 100644
--- a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
+++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
@@ -1,10 +1,11 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { EChartsOption } from 'echarts';
-import { BehaviorSubject, Subscription } from 'rxjs';
-import { StateService } from 'src/app/services/state.service';
-import { StorageService } from 'src/app/services/storage.service';
+import { combineLatest, Observable, of } from 'rxjs';
+import { catchError, skip, startWith, switchMap, tap } from 'rxjs/operators';
+import { StorageService } from '../..//services/storage.service';
 import { MiningService, MiningStats } from '../../services/mining.service';
+import { StateService } from '../../services/state.service';
 
 @Component({
   selector: 'app-pool-ranking',
@@ -22,79 +23,74 @@ export class PoolRankingComponent implements OnInit, OnDestroy {
   poolsWindowPreference: string;
   radioGroupForm: FormGroup;
 
-  miningStats!: MiningStats;
-  miningStatsEmitter$ = new BehaviorSubject<MiningStats>(this.miningStats);
-  blocksSubscription: Subscription;
-  miningSubscription: Subscription;
-
   isLoading = true;
   chartOptions: EChartsOption = {};
   chartInitOptions = {
     renderer: 'svg'
   };
 
+  miningStatsObservable$: Observable<MiningStats>;
+
   constructor(
     private stateService: StateService,
     private storageService: StorageService,
     private formBuilder: FormBuilder,
     private miningService: MiningService,
   ) {
-    this.poolsWindowPreference = this.storageService.getValue('poolsWindowPreference') ? this.storageService.getValue('poolsWindowPreference').trim() : '2h';
-
+    this.poolsWindowPreference = this.storageService.getValue('poolsWindowPreference') ? this.storageService.getValue('poolsWindowPreference') : '1d';
     this.radioGroupForm = this.formBuilder.group({ dateSpan: this.poolsWindowPreference });
     this.radioGroupForm.controls.dateSpan.setValue(this.poolsWindowPreference);
   }
 
   ngOnInit(): void {
-    this.refreshMiningStats();
-    this.watchBlocks();
+    // When...
+    this.miningStatsObservable$ = combineLatest([
+      // ...a new block is mined
+      this.stateService.blocks$
+        .pipe(
+          // (we always receives some blocks at start so only trigger for the last one)
+          skip(this.stateService.env.MEMPOOL_BLOCKS_AMOUNT - 1),
+        ),
+      // ...or we change the timespan
+      this.radioGroupForm.get('dateSpan').valueChanges
+        .pipe(
+          startWith(this.poolsWindowPreference), // (trigger when the page loads)
+          tap((value) => {
+            this.storageService.setValue('poolsWindowPreference', value);
+            this.poolsWindowPreference = value;
+          })
+        )
+    ])
+      // ...then refresh the mining stats
+      .pipe(
+        switchMap(() => {
+          this.isLoading = true;
+          return this.miningService.getMiningStats(this.getSQLInterval(this.poolsWindowPreference))
+            .pipe(
+              catchError((e) => of(this.getEmptyMiningStat()))
+            );
+        }),
+        tap(data => {
+          this.isLoading = false;
+          this.prepareChartOptions(data);
+        })
+      );
   }
 
   ngOnDestroy(): void {
-    this.blocksSubscription.unsubscribe();
-    this.miningSubscription.unsubscribe();      
   }
 
-  refreshMiningStats() {
-    this.miningSubscription = this.miningService.getMiningStats(this.getSQLInterval(this.poolsWindowPreference))
-    .subscribe(async data => {
-      this.miningStats = data;
-      this.miningStatsEmitter$.next(this.miningStats);
-      this.prepareChartOptions();
-      this.isLoading = false;
-    });
-
-    return this.miningSubscription;
-  }
-
-  watchBlocks() {
-    this.blocksSubscription = this.stateService.blocks$
-      .subscribe(() => {
-        if (!this.miningStats) {
-          return;
-        }
-        this.refreshMiningStats();
-      });
-  }
-
-  onChangeWindowPreference(e) {
-    this.storageService.setValue('poolsWindowPreference', e.target.value);
-    this.poolsWindowPreference = e.target.value;
-    this.isLoading = true;
-    this.refreshMiningStats();
-  }
-
-  generatePoolsChartSerieData() {
+  generatePoolsChartSerieData(miningStats) {
     const poolShareThreshold = 0.5; // Do not draw pools which hashrate share is lower than that
     const data: object[] = [];
 
-    this.miningStats.pools.forEach((pool) => {
+    miningStats.pools.forEach((pool) => {
       if (parseFloat(pool.share) < poolShareThreshold) {
         return;
       }
       data.push({
         value: pool.share,
-        name: pool.name,
+        name: pool.name + ` (${pool.share}%)`,
         label: { color: '#FFFFFF' },
         tooltip: {
           formatter: () => {
@@ -113,7 +109,7 @@ export class PoolRankingComponent implements OnInit, OnDestroy {
     return data;
   }
 
-  prepareChartOptions() {
+  prepareChartOptions(miningStats) {
     this.chartOptions = {
       title: {
         text: (this.poolsWindowPreference === '1d') ? 'Hashrate distribution' : 'Block distribution',
@@ -143,7 +139,7 @@ export class PoolRankingComponent implements OnInit, OnDestroy {
           name: 'Mining pool',
           type: 'pie',
           radius: ['30%', '70%'],
-          data: this.generatePoolsChartSerieData(),
+          data: this.generatePoolsChartSerieData(miningStats),
           labelLine: {
             lineStyle: {
               width: 2,
@@ -193,5 +189,21 @@ export class PoolRankingComponent implements OnInit, OnDestroy {
     }
   }
 
+  /**
+   * Default mining stats if something goes wrong
+   */
+  getEmptyMiningStat() {
+    return {
+      lastEstimatedHashrate: 'Error',
+      blockCount: 0,
+      totalEmptyBlock: 0,
+      totalEmptyBlockRatio: '',
+      pools: [],
+      miningUnits: {
+        hashrateDivider: 1,
+        hashrateUnit: '',
+      },
+    };
+  }
 }
 
diff --git a/frontend/src/app/interfaces/node-api.interface.ts b/frontend/src/app/interfaces/node-api.interface.ts
index ba0adc77f..82b990cb0 100644
--- a/frontend/src/app/interfaces/node-api.interface.ts
+++ b/frontend/src/app/interfaces/node-api.interface.ts
@@ -53,22 +53,22 @@ export interface LiquidPegs {
 export interface ITranslators { [language: string]: string; }
 
 export interface SinglePoolStats {
-  pooldId: number,
-  name: string,
-  link: string,
-  blockCount: number,
-  emptyBlocks: number,
-  rank: number,
-  share: string,
-  lastEstimatedHashrate: string,
-  emptyBlockRatio: string,
-  logo: string,
+  pooldId: number;
+  name: string;
+  link: string;
+  blockCount: number;
+  emptyBlocks: number;
+  rank: number;
+  share: string;
+  lastEstimatedHashrate: string;
+  emptyBlockRatio: string;
+  logo: string;
 }
 
 export interface PoolsStats {
-  blockCount: number,
-  lastEstimatedHashrate: number,
-  pools: SinglePoolStats[],
+  blockCount: number;
+  lastEstimatedHashrate: number;
+  pools: SinglePoolStats[];
 }
 
 export interface ITranslators { [language: string]: string; }
diff --git a/frontend/src/app/services/mining.service.ts b/frontend/src/app/services/mining.service.ts
index 00cffbca1..9145b555f 100644
--- a/frontend/src/app/services/mining.service.ts
+++ b/frontend/src/app/services/mining.service.ts
@@ -6,17 +6,17 @@ import { ApiService } from '../services/api.service';
 import { StateService } from './state.service';
 
 export interface MiningUnits {
-  hashrateDivider: number,
-  hashrateUnit: string,
+  hashrateDivider: number;
+  hashrateUnit: string;
 }
 
 export interface MiningStats {
-  lastEstimatedHashrate: string,
-  blockCount: number,
-  totalEmptyBlock: number,
-  totalEmptyBlockRatio: string,
-  pools: SinglePoolStats[],
-  miningUnits: MiningUnits,
+  lastEstimatedHashrate: string;
+  blockCount: number;
+  totalEmptyBlock: number;
+  totalEmptyBlockRatio: string;
+  pools: SinglePoolStats[];
+  miningUnits: MiningUnits;
 }
 
 @Injectable({
@@ -38,15 +38,15 @@ export class MiningService {
   /**
    * Set the hashrate power of ten we want to display
    */
-  public getMiningUnits() : MiningUnits {
+  public getMiningUnits(): MiningUnits {
     const powerTable = {
-      0: "H/s",
-      3: "kH/s",
-      6: "MH/s",
-      9: "GH/s",
-      12: "TH/s",
-      15: "PH/s",
-      18: "EH/s",
+      0: 'H/s',
+      3: 'kH/s',
+      6: 'MH/s',
+      9: 'GH/s',
+      12: 'TH/s',
+      15: 'PH/s',
+      18: 'EH/s',
     };
 
     // I think it's fine to hardcode this since we don't have x1000 hashrate jump everyday
@@ -62,7 +62,7 @@ export class MiningService {
     };
   }
 
-  private generateMiningStats(stats: PoolsStats) : MiningStats {
+  private generateMiningStats(stats: PoolsStats): MiningStats {
     const miningUnits = this.getMiningUnits();
     const hashrateDivider = miningUnits.hashrateDivider;
 
@@ -77,7 +77,7 @@ export class MiningService {
         emptyBlockRatio: (poolStat.emptyBlocks / poolStat.blockCount * 100).toFixed(2),
         logo: `./resources/mining-pools/` + poolStat.name.toLowerCase().replace(' ', '').replace('.', '') + '.svg',
         ...poolStat
-      }
+      };
     });
 
     return {

From df960ab9ba93035daad5c58f9557d5f52fc53382 Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Fri, 21 Jan 2022 16:45:11 +0900
Subject: [PATCH 33/47] Import pools file for testnet and signet as well -
 Added missing express routes

---
 backend/src/api/pools-parser.ts | 2 +-
 frontend/server.ts              | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/backend/src/api/pools-parser.ts b/backend/src/api/pools-parser.ts
index b81bf9d15..194ce0dd9 100644
--- a/backend/src/api/pools-parser.ts
+++ b/backend/src/api/pools-parser.ts
@@ -15,7 +15,7 @@ class PoolsParser {
    * Parse the pools.json file, consolidate the data and dump it into the database
    */
   public async migratePoolsJson() {
-    if (config.MEMPOOL.NETWORK !== 'mainnet') {
+    if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false) {
       return;
     }
 
diff --git a/frontend/server.ts b/frontend/server.ts
index 059522a05..2be6458b5 100644
--- a/frontend/server.ts
+++ b/frontend/server.ts
@@ -86,6 +86,7 @@ export function app(locale: string): express.Express {
   server.get('/testnet/mempool-block/*', getLocalizedSSR(indexHtml));
   server.get('/testnet/address/*', getLocalizedSSR(indexHtml));
   server.get('/testnet/blocks', getLocalizedSSR(indexHtml));
+  server.get('/testnet/pools', getLocalizedSSR(indexHtml));
   server.get('/testnet/graphs', getLocalizedSSR(indexHtml));
   server.get('/testnet/api', getLocalizedSSR(indexHtml));
   server.get('/testnet/tv', getLocalizedSSR(indexHtml));
@@ -97,6 +98,7 @@ export function app(locale: string): express.Express {
   server.get('/signet/mempool-block/*', getLocalizedSSR(indexHtml));
   server.get('/signet/address/*', getLocalizedSSR(indexHtml));
   server.get('/signet/blocks', getLocalizedSSR(indexHtml));
+  server.get('/signet/pools', getLocalizedSSR(indexHtml));
   server.get('/signet/graphs', getLocalizedSSR(indexHtml));
   server.get('/signet/api', getLocalizedSSR(indexHtml));
   server.get('/signet/tv', getLocalizedSSR(indexHtml));

From 40e529ece781d9b59988b0f60bdcd63dcbdcac7d Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Fri, 21 Jan 2022 18:14:42 +0900
Subject: [PATCH 34/47] Don't try to identify the mining pool on liquid/bisq

---
 backend/src/api/blocks.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/api/blocks.ts b/backend/src/api/blocks.ts
index 28877a6d7..abaeaf6a1 100644
--- a/backend/src/api/blocks.ts
+++ b/backend/src/api/blocks.ts
@@ -233,10 +233,10 @@ class Blocks {
       const txIds: string[] = await bitcoinApi.$getTxIdsForBlock(blockHash);
       const transactions = await this.$getTransactionsExtended(blockHash, block.height, false);
       const blockExtended: BlockExtended = this.getBlockExtended(block, transactions);
-      const miner = await this.$findBlockMiner(blockExtended.coinbaseTx);
       const coinbase: IEsploraApi.Transaction = await bitcoinApi.$getRawTransaction(transactions[0].txid, true);
 
       if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === true) {
+        const miner = await this.$findBlockMiner(blockExtended.coinbaseTx);
         await blocksRepository.$saveBlockInDatabase(blockExtended, blockHash, coinbase.hex, miner);
       }
 

From f8f9108ae1b41d98ec12a5ce0d27e0bcb03f0eb9 Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Fri, 21 Jan 2022 21:50:57 +0900
Subject: [PATCH 35/47] Polish mining page UI

Make sure to wait for all mining pools queries before continuing
---
 backend/src/index.ts                          |  2 +-
 backend/src/routes.ts                         |  5 +-
 .../pool-ranking/pool-ranking.component.html  | 39 +++++-----
 .../pool-ranking/pool-ranking.component.scss  | 32 +++++++++
 .../pool-ranking/pool-ranking.component.ts    | 71 +++++++++++--------
 5 files changed, 99 insertions(+), 50 deletions(-)
 create mode 100644 frontend/src/app/components/pool-ranking/pool-ranking.component.scss

diff --git a/backend/src/index.ts b/backend/src/index.ts
index 4839322d4..84be16fbc 100644
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -265,7 +265,7 @@ class Server {
         .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/1y', routes.$getStatisticsByTime.bind(routes, '1y'))
         .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/2y', routes.$getStatisticsByTime.bind(routes, '2y'))
         .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/3y', routes.$getStatisticsByTime.bind(routes, '3y'))
-        .get(config.MEMPOOL.API_URL_PREFIX + 'pools', routes.getPools)
+        .get(config.MEMPOOL.API_URL_PREFIX + 'pools', routes.$getPools)
         ;
     }
 
diff --git a/backend/src/routes.ts b/backend/src/routes.ts
index b7956cd64..00e2ceee0 100644
--- a/backend/src/routes.ts
+++ b/backend/src/routes.ts
@@ -532,9 +532,12 @@ class Routes {
     }
   }
 
-  public async getPools(req: Request, res: Response) {
+  public async $getPools(req: Request, res: Response) {
     try {
       let stats = await miningStats.$getPoolsStats(req.query.interval as string);
+      // res.header('Pragma', 'public');
+      // res.header('Cache-control', 'public');
+      // res.setHeader('Expires', new Date(Date.now() + 1000 * 300).toUTCString());
       res.json(stats);
     } catch (e) {
       res.status(500).send(e instanceof Error ? e.message : e);
diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.html b/frontend/src/app/components/pool-ranking/pool-ranking.component.html
index 78b6a45ba..757e11385 100644
--- a/frontend/src/app/components/pool-ranking/pool-ranking.component.html
+++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.html
@@ -1,13 +1,12 @@
 <div class="container-xl">
+  <!-- <app-difficulty [showProgress]=false [showHalving]=true></app-difficulty>  -->
 
-  <app-difficulty style="display: none;" [showProgress]=false [showHalving]=true></app-difficulty>
-
-  <div style="height: 500px; margin-top: 30px;" echarts [initOpts]="chartInitOptions" [options]="chartOptions"></div>
+  <div class="hashrate-pie" echarts [initOpts]="chartInitOptions" [options]="chartOptions"></div>
   <div class="text-center loadingGraphs" *ngIf="isLoading">
     <div class="spinner-border text-light"></div>
   </div>
 
-  <div class="card-header">
+  <div class="card-header mb-0 mb-lg-4">
     <form [formGroup]="radioGroupForm" class="formRadioGroup">
       <div class="btn-group btn-group-toggle" ngbRadioGroup name="radioBasic" formControlName="dateSpan">
         <label ngbButtonLabel class="btn-primary btn-sm">
@@ -44,30 +43,32 @@
     </form>
   </div>
 
-  <table class="table table-borderless" [alwaysCallback]="true" infiniteScroll [infiniteScrollDistance]="1.5" [infiniteScrollUpDistance]="1.5" [infiniteScrollThrottle]="50">
+  <table class="table table-borderless text-center pools-table" [alwaysCallback]="true" infiniteScroll [infiniteScrollDistance]="1.5" [infiniteScrollUpDistance]="1.5" [infiniteScrollThrottle]="50">
     <thead>
-      <th class="d-none d-md-block" i18n="latest-blocks.height">Rank</th>
-      <th><!-- LOGO --></th>
-      <th i18n="latest-blocks.timestamp">Name</th>
-      <th *ngIf="this.poolsWindowPreference === '1d'" i18n="latest-blocks.timestamp">Hashrate</th>
-      <th i18n="latest-blocks.mined">Block Count (%)</th>
-      <th class="d-none d-md-block" i18n="latest-blocks.transactions">Empty Blocks (%)</th>
+      <tr>
+        <th class="d-none d-md-block" i18n="latest-blocks.height">Rank</th>
+        <th class=""></th>
+        <th class="" i18n="latest-blocks.poolName">Name</th>
+        <th class="" *ngIf="this.poolsWindowPreference === '1d'" i18n="latest-blocks.timestamp">Hashrate</th>
+        <th class="" i18n="latest-blocks.mined">Blocks</th>
+        <th class="d-none d-md-block" i18n="latest-blocks.transactions">Empty Blocks</th>
+      </tr>
     </thead>
     <tbody *ngIf="(miningStatsObservable$ | async) as miningStats">
       <tr>
         <td class="d-none d-md-block">-</td>
-        <td><!-- LOGO --></td>
-        <td>All miners</td>
-        <td *ngIf="this.poolsWindowPreference === '1d'">{{ miningStats.lastEstimatedHashrate}} {{ miningStats.miningUnits.hashrateUnit }}</td>
-        <td>{{ miningStats.blockCount }}</td>
+        <td class="text-right"><img width="25" height="25" src="./resources/mining-pools/default.svg"></td>
+        <td class="">All miners</td>
+        <td class="" *ngIf="this.poolsWindowPreference === '1d'">{{ miningStats.lastEstimatedHashrate}} {{ miningStats.miningUnits.hashrateUnit }}</td>
+        <td class="">{{ miningStats.blockCount }}</td>
         <td class="d-none d-md-block">{{ miningStats.totalEmptyBlock }} ({{ miningStats.totalEmptyBlockRatio }}%)</td>
       </tr>
       <tr *ngFor="let pool of miningStats.pools">
         <td class="d-none d-md-block">{{ pool.rank }}</td>
-        <td><img width="25" height="25" src="{{ pool.logo }}" onError="this.src = './resources/mining-pools/default.svg'"></td>
-        <td><a target="#" href="{{ pool.link }}">{{ pool.name }}</a></td>
-        <td *ngIf="this.poolsWindowPreference === '1d'">{{ pool.lastEstimatedHashrate }} {{ miningStats.miningUnits.hashrateUnit }}</td>
-        <td>{{ pool.blockCount }} ({{ pool.share }}%)</td>
+        <td class="text-right"><img width="25" height="25" src="{{ pool.logo }}" onError="this.src = './resources/mining-pools/default.svg'"></td>
+        <td class=""><a target="#" href="{{ pool.link }}">{{ pool.name }}</a></td>
+        <td class="" *ngIf="this.poolsWindowPreference === '1d'">{{ pool.lastEstimatedHashrate }} {{ miningStats.miningUnits.hashrateUnit }}</td>
+        <td class="">{{ pool['blockText'] }}</td>
         <td class="d-none d-md-block">{{ pool.emptyBlocks }} ({{ pool.emptyBlockRatio }}%)</td>
       </tr>
     </tbody>
diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.scss b/frontend/src/app/components/pool-ranking/pool-ranking.component.scss
new file mode 100644
index 000000000..3cf52b6ce
--- /dev/null
+++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.scss
@@ -0,0 +1,32 @@
+.hashrate-pie {
+  height: 100%;
+  min-height: 400px;
+  @media (max-width: 767.98px) {
+    min-height: 300px;
+  }
+}
+
+.formRadioGroup {
+  margin-top: 6px;
+  display: flex;
+  flex-direction: column;
+  @media (min-width: 830px) {
+    margin-left: 2%;
+    flex-direction: row;
+    float: left;
+    margin-top: 0px;
+  }
+  .btn-sm {
+    font-size: 9px;
+    @media (min-width: 830px) {
+      font-size: 14px;
+    }
+  }
+}
+
+@media (max-width: 767.98px) { 
+  .pools-table th,
+  .pools-table td {
+      padding: .3em !important;
+   }
+ }
diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
index 8ce0ef7ab..b5fbfb75f 100644
--- a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
+++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
@@ -2,7 +2,8 @@ import { Component, OnDestroy, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { EChartsOption } from 'echarts';
 import { combineLatest, Observable, of } from 'rxjs';
-import { catchError, skip, startWith, switchMap, tap } from 'rxjs/operators';
+import { catchError, map, skip, startWith, switchMap, tap } from 'rxjs/operators';
+import { SinglePoolStats } from 'src/app/interfaces/node-api.interface';
 import { StorageService } from '../..//services/storage.service';
 import { MiningService, MiningStats } from '../../services/mining.service';
 import { StateService } from '../../services/state.service';
@@ -10,11 +11,12 @@ import { StateService } from '../../services/state.service';
 @Component({
   selector: 'app-pool-ranking',
   templateUrl: './pool-ranking.component.html',
+  styleUrls: ['./pool-ranking.component.scss'],
   styles: [`
     .loadingGraphs {
       position: absolute;
-      top: 50%;
-      left: calc(50% - 16px);
+      top: 38%;
+      left: calc(50% - 15px);
       z-index: 100;
     }
   `],
@@ -70,6 +72,10 @@ export class PoolRankingComponent implements OnInit, OnDestroy {
               catchError((e) => of(this.getEmptyMiningStat()))
             );
         }),
+        map(data => {
+          data.pools = data.pools.map((pool: SinglePoolStats) => this.formatPoolUI(pool));
+          return data;
+        }),
         tap(data => {
           this.isLoading = false;
           this.prepareChartOptions(data);
@@ -80,8 +86,17 @@ export class PoolRankingComponent implements OnInit, OnDestroy {
   ngOnDestroy(): void {
   }
 
+  formatPoolUI(pool: SinglePoolStats) {
+    pool['blockText'] = pool.blockCount.toString() + ` (${pool.share}%)`;
+    return pool;
+  }
+
+  isMobile() {
+    return (window.innerWidth <= 767.98);
+  }
+
   generatePoolsChartSerieData(miningStats) {
-    const poolShareThreshold = 0.5; // Do not draw pools which hashrate share is lower than that
+    const poolShareThreshold = this.isMobile() ? 1 : 0.5; // Do not draw pools which hashrate share is lower than that
     const data: object[] = [];
 
     miningStats.pools.forEach((pool) => {
@@ -90,16 +105,23 @@ export class PoolRankingComponent implements OnInit, OnDestroy {
       }
       data.push({
         value: pool.share,
-        name: pool.name + ` (${pool.share}%)`,
-        label: { color: '#FFFFFF' },
+        name: pool.name + (this.isMobile() ? `` : ` (${pool.share}%)`),
+        label: {
+          color: '#FFFFFF',
+          overflow: 'break',
+        },
         tooltip: {
+          backgroundColor: "#282d47",
+          textStyle: {
+            color: "#FFFFFF",
+          },
           formatter: () => {
             if (this.poolsWindowPreference === '1d') {
-              return `<u><b>${pool.name}</b></u><br>` +
-                pool.lastEstimatedHashrate.toString() + ' PH/s (' + pool.share + `%)
-                <br>(` + pool.blockCount.toString() + ` blocks)`;
+              return `<u><b>${pool.name} (${pool.share}%)</b></u><br>` +
+                pool.lastEstimatedHashrate.toString() + ' PH/s' +
+                `<br>` + pool.blockCount.toString() + ` blocks`;
             } else {
-              return `<u><b>${pool.name}</b></u><br>` +
+              return `<u><b>${pool.name} (${pool.share}%)</b></u><br>` +
                 pool.blockCount.toString() + ` blocks`;
             }
           }
@@ -116,29 +138,22 @@ export class PoolRankingComponent implements OnInit, OnDestroy {
         subtext: (this.poolsWindowPreference === '1d') ? 'Estimated from the # of blocks mined' : null,
         left: 'center',
         textStyle: {
-          color: '#FFFFFF',
+          color: '#FFF',
         },
         subtextStyle: {
-          color: '#CCCCCC',
+          color: '#CCC',
           fontStyle: 'italic',
         }
       },
       tooltip: {
         trigger: 'item'
       },
-      legend: (window.innerWidth <= 767.98) ? {
-        bottom: '0%',
-        left: 'center',
-        textStyle: {
-          color: '#FFF'
-        }
-      } : null,
       series: [
         {
-          top: '5%',
+          top: this.isMobile() ? '5%' : '20%',
           name: 'Mining pool',
           type: 'pie',
-          radius: ['30%', '70%'],
+          radius: this.isMobile() ? ['10%', '50%'] : ['20%', '80%'],
           data: this.generatePoolsChartSerieData(miningStats),
           labelLine: {
             lineStyle: {
@@ -146,22 +161,20 @@ export class PoolRankingComponent implements OnInit, OnDestroy {
             },
           },
           label: {
-            show: (window.innerWidth > 767.98),
             fontSize: 14,
           },
           itemStyle: {
-            borderRadius: 5,
+            borderRadius: 2,
             borderWidth: 2,
             borderColor: '#000',
           },
           emphasis: {
             itemStyle: {
-              borderWidth: 5,
-              borderColor: '#000',
-              borderRadius: 20,
-              shadowBlur: 40,
-              shadowOffsetX: 0,
-              shadowColor: 'rgba(0, 0, 0, 0.75)'
+              borderWidth: 2,
+              borderColor: '#FFF',
+              borderRadius: 2,
+              shadowBlur: 80,
+              shadowColor: 'rgba(255, 255, 255, 0.75)',
             },
             labelLine: {
               lineStyle: {

From a271c39ba8d5da5f5b2091d74522b43f9ad0431c Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Mon, 24 Jan 2022 15:36:30 +0900
Subject: [PATCH 36/47] Wrap block indexing into a try/catch since we don't use
 async when calling that function

---
 backend/src/api/blocks.ts | 66 +++++++++++++++++++++------------------
 1 file changed, 35 insertions(+), 31 deletions(-)

diff --git a/backend/src/api/blocks.ts b/backend/src/api/blocks.ts
index abaeaf6a1..7569001e2 100644
--- a/backend/src/api/blocks.ts
+++ b/backend/src/api/blocks.ts
@@ -150,41 +150,45 @@ class Blocks {
       return;
     }
 
-    let currentBlockHeight = await bitcoinClient.getBlockCount();
-    const indexedBlockCount = await blocksRepository.$blockCount();
+    try {
+      let currentBlockHeight = await bitcoinClient.getBlockCount();
+      const indexedBlockCount = await blocksRepository.$blockCount();
 
-    logger.info(`Starting block indexing. Current tip at block #${currentBlockHeight}`);
-    logger.info(`Need to index ${currentBlockHeight - indexedBlockCount} blocks. Working on it!`);
+      logger.info(`Starting block indexing. Current tip at block #${currentBlockHeight}`);
+      logger.info(`Need to index ${currentBlockHeight - indexedBlockCount} blocks. Working on it!`);
 
-    const chunkSize = 10000;
-    while (currentBlockHeight >= 0) {
-      const endBlock = Math.max(0, currentBlockHeight - chunkSize + 1);
-      const missingBlockHeights: number[] = await blocksRepository.$getMissingBlocksBetweenHeights(
-        currentBlockHeight, endBlock);
-      if (missingBlockHeights.length <= 0) {
-        logger.debug(`No missing blocks between #${currentBlockHeight} to #${endBlock}, moving on`);
-        currentBlockHeight -= chunkSize;
-        continue;
-      }
-
-      logger.info(`Indexing ${chunkSize} blocks from #${currentBlockHeight} to #${endBlock}`);
-
-      for (const blockHeight of missingBlockHeights) {
-        try {
-          logger.debug(`Indexing block #${blockHeight}`);
-          const blockHash = await bitcoinApi.$getBlockHash(blockHeight);
-          const block = await bitcoinApi.$getBlock(blockHash);
-          const transactions = await this.$getTransactionsExtended(blockHash, block.height, true);
-          const blockExtended = this.getBlockExtended(block, transactions);
-          const miner = await this.$findBlockMiner(blockExtended.coinbaseTx);
-          const coinbase: IEsploraApi.Transaction = await bitcoinApi.$getRawTransaction(transactions[0].txid, true);
-          await blocksRepository.$saveBlockInDatabase(blockExtended, blockHash, coinbase.hex, miner);
-        } catch (e) {
-          logger.err(`Something went wrong while indexing blocks.` + e);
+      const chunkSize = 10000;
+      while (currentBlockHeight >= 0) {
+        const endBlock = Math.max(0, currentBlockHeight - chunkSize + 1);
+        const missingBlockHeights: number[] = await blocksRepository.$getMissingBlocksBetweenHeights(
+          currentBlockHeight, endBlock);
+        if (missingBlockHeights.length <= 0) {
+          logger.debug(`No missing blocks between #${currentBlockHeight} to #${endBlock}, moving on`);
+          currentBlockHeight -= chunkSize;
+          continue;
         }
-      }
 
-      currentBlockHeight -= chunkSize;
+        logger.info(`Indexing ${chunkSize} blocks from #${currentBlockHeight} to #${endBlock}`);
+
+        for (const blockHeight of missingBlockHeights) {
+          try {
+            logger.debug(`Indexing block #${blockHeight}`);
+            const blockHash = await bitcoinApi.$getBlockHash(blockHeight);
+            const block = await bitcoinApi.$getBlock(blockHash);
+            const transactions = await this.$getTransactionsExtended(blockHash, block.height, true);
+            const blockExtended = this.getBlockExtended(block, transactions);
+            const miner = await this.$findBlockMiner(blockExtended.coinbaseTx);
+            const coinbase: IEsploraApi.Transaction = await bitcoinApi.$getRawTransaction(transactions[0].txid, true);
+            await blocksRepository.$saveBlockInDatabase(blockExtended, blockHash, coinbase.hex, miner);
+          } catch (e) {
+            logger.err(`Something went wrong while indexing blocks.` + e);
+          }
+        }
+
+        currentBlockHeight -= chunkSize;
+      }
+    } catch (e) {
+      logger.err('An error occured in $generateBlockDatabase(). Skipping block indexing. ' + e);
     }
   }
 

From 647f12ffaab15069cc59a32a2198d30c0eeb0f58 Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Mon, 24 Jan 2022 17:43:11 +0900
Subject: [PATCH 37/47] Added MEMPOOL.INDEXING_BLOCKS_AMOUNT in the config
 (default 432 blocks)

---
 backend/src/api/blocks.ts                    | 22 +++++++++++++-------
 backend/src/config.ts                        |  2 ++
 backend/src/repositories/BlocksRepository.ts |  4 ++++
 docker/backend/start.sh                      |  2 ++
 frontend/mempool-frontend-config.sample.json |  2 +-
 5 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/backend/src/api/blocks.ts b/backend/src/api/blocks.ts
index 7569001e2..49c080896 100644
--- a/backend/src/api/blocks.ts
+++ b/backend/src/api/blocks.ts
@@ -146,31 +146,35 @@ class Blocks {
    * Index all blocks metadata for the mining dashboard
    */
   public async $generateBlockDatabase() {
-    if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false) {
+    if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false ||
+      config.MEMPOOL.INDEXING_BLOCKS_AMOUNT <= 0) {
       return;
     }
 
     try {
       let currentBlockHeight = await bitcoinClient.getBlockCount();
-      const indexedBlockCount = await blocksRepository.$blockCount();
+      const lastBlockToIndex = currentBlockHeight - config.MEMPOOL.INDEXING_BLOCKS_AMOUNT + 1;
 
-      logger.info(`Starting block indexing. Current tip at block #${currentBlockHeight}`);
-      logger.info(`Need to index ${currentBlockHeight - indexedBlockCount} blocks. Working on it!`);
+      logger.info(`Indexing blocks from #${currentBlockHeight} to #${lastBlockToIndex}`);
 
       const chunkSize = 10000;
-      while (currentBlockHeight >= 0) {
-        const endBlock = Math.max(0, currentBlockHeight - chunkSize + 1);
+      while (currentBlockHeight >= lastBlockToIndex) {
+        const endBlock = Math.max(0, lastBlockToIndex, currentBlockHeight - chunkSize + 1);
+
         const missingBlockHeights: number[] = await blocksRepository.$getMissingBlocksBetweenHeights(
           currentBlockHeight, endBlock);
         if (missingBlockHeights.length <= 0) {
-          logger.debug(`No missing blocks between #${currentBlockHeight} to #${endBlock}, moving on`);
+          logger.debug(`No missing blocks between #${currentBlockHeight} to #${endBlock}`);
           currentBlockHeight -= chunkSize;
           continue;
         }
 
-        logger.info(`Indexing ${chunkSize} blocks from #${currentBlockHeight} to #${endBlock}`);
+        logger.debug(`Indexing ${missingBlockHeights.length} blocks from #${currentBlockHeight} to #${endBlock}`);
 
         for (const blockHeight of missingBlockHeights) {
+          if (blockHeight < lastBlockToIndex) {
+            break;
+          }
           try {
             logger.debug(`Indexing block #${blockHeight}`);
             const blockHash = await bitcoinApi.$getBlockHash(blockHeight);
@@ -187,8 +191,10 @@ class Blocks {
 
         currentBlockHeight -= chunkSize;
       }
+      logger.info('Block indexing completed');
     } catch (e) {
       logger.err('An error occured in $generateBlockDatabase(). Skipping block indexing. ' + e);
+      console.log(e);
     }
   }
 
diff --git a/backend/src/config.ts b/backend/src/config.ts
index 3cc928327..7cd789934 100644
--- a/backend/src/config.ts
+++ b/backend/src/config.ts
@@ -14,6 +14,7 @@ interface IConfig {
     BLOCK_WEIGHT_UNITS: number;
     INITIAL_BLOCKS_AMOUNT: number;
     MEMPOOL_BLOCKS_AMOUNT: number;
+    INDEXING_BLOCKS_AMOUNT: number;
     PRICE_FEED_UPDATE_INTERVAL: number;
     USE_SECOND_NODE_FOR_MINFEE: boolean;
     EXTERNAL_ASSETS: string[];
@@ -77,6 +78,7 @@ const defaults: IConfig = {
     'BLOCK_WEIGHT_UNITS': 4000000,
     'INITIAL_BLOCKS_AMOUNT': 8,
     'MEMPOOL_BLOCKS_AMOUNT': 8,
+    'INDEXING_BLOCKS_AMOUNT': 432, // ~3 days at 10 minutes / block. Set to 0 to disable indexing
     'PRICE_FEED_UPDATE_INTERVAL': 3600,
     'USE_SECOND_NODE_FOR_MINFEE': false,
     'EXTERNAL_ASSETS': [
diff --git a/backend/src/repositories/BlocksRepository.ts b/backend/src/repositories/BlocksRepository.ts
index 8d36d8410..413d4a226 100644
--- a/backend/src/repositories/BlocksRepository.ts
+++ b/backend/src/repositories/BlocksRepository.ts
@@ -48,6 +48,10 @@ class BlocksRepository {
    * Get all block height that have not been indexed between [startHeight, endHeight]
    */
   public async $getMissingBlocksBetweenHeights(startHeight: number, endHeight: number): Promise<number[]> {
+    if (startHeight < endHeight) {
+      return [];
+    }
+
     const connection = await DB.pool.getConnection();
     const [rows] : any[] = await connection.query(`
       SELECT height
diff --git a/docker/backend/start.sh b/docker/backend/start.sh
index f982a18e5..f9c784641 100644
--- a/docker/backend/start.sh
+++ b/docker/backend/start.sh
@@ -13,6 +13,7 @@ __MEMPOOL_RECOMMENDED_FEE_PERCENTILE__=${MEMPOOL_RECOMMENDED_FEE_PERCENTILE:=50}
 __MEMPOOL_BLOCK_WEIGHT_UNITS__=${MEMPOOL_BLOCK_WEIGHT_UNITS:=4000000}
 __MEMPOOL_INITIAL_BLOCKS_AMOUNT__=${MEMPOOL_INITIAL_BLOCKS_AMOUNT:=8}
 __MEMPOOL_MEMPOOL_BLOCKS_AMOUNT__=${MEMPOOL_MEMPOOL_BLOCKS_AMOUNT:=8}
+__MEMPOOL_INDEXING_BLOCKS_AMOUNT__=${MEMPOOL_INDEXING_BLOCKS_AMOUNT:=432}
 __MEMPOOL_PRICE_FEED_UPDATE_INTERVAL__=${MEMPOOL_PRICE_FEED_UPDATE_INTERVAL:=3600}
 __MEMPOOL_USE_SECOND_NODE_FOR_MINFEE__=${MEMPOOL_USE_SECOND_NODE_FOR_MINFEE:=false}
 __MEMPOOL_EXTERNAL_ASSETS__=${MEMPOOL_EXTERNAL_ASSETS:=[]}
@@ -74,6 +75,7 @@ sed -i "s/__MEMPOOL_RECOMMENDED_FEE_PERCENTILE__/${__MEMPOOL_RECOMMENDED_FEE_PER
 sed -i "s/__MEMPOOL_BLOCK_WEIGHT_UNITS__/${__MEMPOOL_BLOCK_WEIGHT_UNITS__}/g" mempool-config.json
 sed -i "s/__MEMPOOL_INITIAL_BLOCKS_AMOUNT__/${__MEMPOOL_INITIAL_BLOCKS_AMOUNT__}/g" mempool-config.json
 sed -i "s/__MEMPOOL_MEMPOOL_BLOCKS_AMOUNT__/${__MEMPOOL_MEMPOOL_BLOCKS_AMOUNT__}/g" mempool-config.json
+sed -i "s/__MEMPOOL_INDEXING_BLOCKS_AMOUNT__/${__MEMPOOL_INDEXING_BLOCKS_AMOUNT__}/g" mempool-config.json
 sed -i "s/__MEMPOOL_PRICE_FEED_UPDATE_INTERVAL__/${__MEMPOOL_PRICE_FEED_UPDATE_INTERVAL__}/g" mempool-config.json
 sed -i "s/__MEMPOOL_USE_SECOND_NODE_FOR_MINFEE__/${__MEMPOOL_USE_SECOND_NODE_FOR_MINFEE__}/g" mempool-config.json
 sed -i "s/__MEMPOOL_EXTERNAL_ASSETS__/${__MEMPOOL_EXTERNAL_ASSETS__}/g" mempool-config.json
diff --git a/frontend/mempool-frontend-config.sample.json b/frontend/mempool-frontend-config.sample.json
index 0715cb0bd..5cb296537 100644
--- a/frontend/mempool-frontend-config.sample.json
+++ b/frontend/mempool-frontend-config.sample.json
@@ -10,8 +10,8 @@
   "NGINX_PROTOCOL": "http",
   "NGINX_HOSTNAME": "127.0.0.1",
   "NGINX_PORT": "80",
-  "BLOCK_WEIGHT_UNITS": 4000000,
   "MEMPOOL_BLOCKS_AMOUNT": 8,
+  "INDEXING_BLOCKS_AMOUNT": 432,
   "BASE_MODULE": "mempool",
   "MEMPOOL_WEBSITE_URL": "https://mempool.space",
   "LIQUID_WEBSITE_URL": "https://liquid.network",

From 73019b485fefda0be8e5b6e0fc0e0569721879b5 Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Mon, 24 Jan 2022 18:26:36 +0900
Subject: [PATCH 38/47] Update tests - Replace button click blocks -> pools

---
 .../integration/mainnet/mainnet.spec.ts       | 96 +++++++++++++++++++
 .../cypress/integration/signet/signet.spec.ts |  4 +-
 .../integration/testnet/testnet.spec.ts       |  4 +-
 3 files changed, 100 insertions(+), 4 deletions(-)

diff --git a/frontend/cypress/integration/mainnet/mainnet.spec.ts b/frontend/cypress/integration/mainnet/mainnet.spec.ts
index 1c6907db0..d04f4d287 100644
--- a/frontend/cypress/integration/mainnet/mainnet.spec.ts
+++ b/frontend/cypress/integration/mainnet/mainnet.spec.ts
@@ -274,6 +274,102 @@ describe('Mainnet', () => {
             });
           });
         });
+      });
+    });
+
+
+    it('loads skeleton when changes between networks', () => {
+      cy.visit('/');
+      cy.waitForSkeletonGone();
+
+      cy.changeNetwork("testnet");
+      cy.changeNetwork("signet");
+      cy.changeNetwork("mainnet");
+    });
+
+    it.skip('loads the dashboard with the skeleton blocks', () => {
+      cy.mockMempoolSocket();
+      cy.visit("/");
+      cy.get(':nth-child(1) > #bitcoin-block-0').should('be.visible');
+      cy.get(':nth-child(2) > #bitcoin-block-0').should('be.visible');
+      cy.get(':nth-child(3) > #bitcoin-block-0').should('be.visible');
+      cy.get('#mempool-block-0').should('be.visible');
+      cy.get('#mempool-block-1').should('be.visible');
+      cy.get('#mempool-block-2').should('be.visible');
+
+      emitMempoolInfo({
+        'params': {
+          command: 'init'
+        }
+      });
+
+      cy.get(':nth-child(1) > #bitcoin-block-0').should('not.exist');
+      cy.get(':nth-child(2) > #bitcoin-block-0').should('not.exist');
+      cy.get(':nth-child(3) > #bitcoin-block-0').should('not.exist');
+    });
+
+    it('loads the pools screen', () => {
+      cy.visit('/');
+      cy.waitForSkeletonGone();
+      cy.get('#btn-pools').click().then(() => {
+        cy.waitForPageIdle();
+      });
+    });
+
+    it('loads the graphs screen', () => {
+      cy.visit('/');
+      cy.waitForSkeletonGone();
+      cy.get('#btn-graphs').click().then(() => {
+        cy.wait(1000);
+      });
+    });
+
+    describe('graphs page', () => {
+      it('check buttons - mobile', () => {
+        cy.viewport('iphone-6');
+        cy.visit('/graphs');
+        cy.waitForSkeletonGone();
+        cy.get('.small-buttons > :nth-child(2)').should('be.visible');
+        cy.get('#dropdownFees').should('be.visible');
+        cy.get('.btn-group').should('be.visible');
+      });
+      it('check buttons - tablet', () => {
+        cy.viewport('ipad-2');
+        cy.visit('/graphs');
+        cy.waitForSkeletonGone();
+        cy.get('.small-buttons > :nth-child(2)').should('be.visible');
+        cy.get('#dropdownFees').should('be.visible');
+        cy.get('.btn-group').should('be.visible');
+      });
+      it('check buttons - desktop', () => {
+        cy.viewport('macbook-16');
+        cy.visit('/graphs');
+        cy.waitForSkeletonGone();
+        cy.get('.small-buttons > :nth-child(2)').should('be.visible');
+        cy.get('#dropdownFees').should('be.visible');
+        cy.get('.btn-group').should('be.visible');
+      });
+    });
+
+    it('loads the tv screen - desktop', () => {
+      cy.viewport('macbook-16');
+      cy.visit('/');
+      cy.waitForSkeletonGone();
+      cy.get('#btn-tv').click().then(() => {
+        cy.viewport('macbook-16');
+        cy.get('.chart-holder');
+        cy.get('.blockchain-wrapper').should('be.visible');
+        cy.get('#mempool-block-0').should('be.visible');
+      });
+    });
+
+    it('loads the tv screen - mobile', () => {
+      cy.viewport('iphone-6');
+      cy.visit('/tv');
+      cy.waitForSkeletonGone();
+      cy.get('.chart-holder');
+      cy.get('.blockchain-wrapper').should('not.visible');
+    });
 
         it('loads genesis block and click on the arrow left', () => {
           cy.viewport('macbook-16');
diff --git a/frontend/cypress/integration/signet/signet.spec.ts b/frontend/cypress/integration/signet/signet.spec.ts
index 9ebf67b81..d2bbd1196 100644
--- a/frontend/cypress/integration/signet/signet.spec.ts
+++ b/frontend/cypress/integration/signet/signet.spec.ts
@@ -44,10 +44,10 @@ describe('Signet', () => {
       cy.get(':nth-child(3) > #bitcoin-block-0').should('not.exist');
     });
 
-    it('loads the blocks screen', () => {
+    it('loads the pools screen', () => {
       cy.visit('/signet');
       cy.waitForSkeletonGone();
-      cy.get('#btn-blocks').click().then(() => {
+      cy.get('#btn-pools').click().then(() => {
         cy.wait(1000);
       });
     });
diff --git a/frontend/cypress/integration/testnet/testnet.spec.ts b/frontend/cypress/integration/testnet/testnet.spec.ts
index 6f3264244..c0c07aa74 100644
--- a/frontend/cypress/integration/testnet/testnet.spec.ts
+++ b/frontend/cypress/integration/testnet/testnet.spec.ts
@@ -44,10 +44,10 @@ describe('Testnet', () => {
       cy.get(':nth-child(3) > #bitcoin-block-0').should('not.exist');
     });
 
-    it('loads the blocks screen', () => {
+    it('loads the pools screen', () => {
       cy.visit('/testnet');
       cy.waitForSkeletonGone();
-      cy.get('#btn-blocks').click().then(() => {
+      cy.get('#btn-pools').click().then(() => {
         cy.wait(1000);
       });
     });

From d66bc57165a11dd8a82f41f08eab4f5594130c19 Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Mon, 24 Jan 2022 19:57:54 +0900
Subject: [PATCH 39/47] Move block indexing start logic in blocks.ts

---
 backend/src/api/blocks.ts | 20 +++++++++++++++-----
 backend/src/index.ts      | 12 +-----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/backend/src/api/blocks.ts b/backend/src/api/blocks.ts
index 49c080896..5613abfa1 100644
--- a/backend/src/api/blocks.ts
+++ b/backend/src/api/blocks.ts
@@ -10,7 +10,6 @@ import bitcoinClient from './bitcoin/bitcoin-client';
 import { IEsploraApi } from './bitcoin/esplora-api.interface';
 import poolsRepository from '../repositories/PoolsRepository';
 import blocksRepository from '../repositories/BlocksRepository';
-import BitcoinApi from './bitcoin/bitcoin-api';
 
 class Blocks {
   private blocks: BlockExtended[] = [];
@@ -19,6 +18,7 @@ class Blocks {
   private lastDifficultyAdjustmentTime = 0;
   private previousDifficultyRetarget = 0;
   private newBlockCallbacks: ((block: BlockExtended, txIds: string[], transactions: TransactionExtended[]) => void)[] = [];
+  private blockIndexingStarted = false;
 
   constructor() { }
 
@@ -146,14 +146,24 @@ class Blocks {
    * Index all blocks metadata for the mining dashboard
    */
   public async $generateBlockDatabase() {
-    if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false ||
-      config.MEMPOOL.INDEXING_BLOCKS_AMOUNT <= 0) {
+    if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false || // Bitcoin only
+      config.MEMPOOL.INDEXING_BLOCKS_AMOUNT <= 0 || // Indexing must be enabled
+      this.blockIndexingStarted === true ||  // Indexing must not already be in progress
+      !memPool.isInSync() // We sync the mempool first
+    ) {
       return;
     }
 
+    const blockchainInfo = await bitcoinClient.getBlockchainInfo();
+    if (blockchainInfo.blocks !== blockchainInfo.headers) {
+      return;
+    }
+
+    this.blockIndexingStarted = true;
+
     try {
-      let currentBlockHeight = await bitcoinClient.getBlockCount();
-      const lastBlockToIndex = currentBlockHeight - config.MEMPOOL.INDEXING_BLOCKS_AMOUNT + 1;
+      let currentBlockHeight = blockchainInfo.blocks;
+      const lastBlockToIndex = Math.max(0, currentBlockHeight - config.MEMPOOL.INDEXING_BLOCKS_AMOUNT + 1);
 
       logger.info(`Indexing blocks from #${currentBlockHeight} to #${lastBlockToIndex}`);
 
diff --git a/backend/src/index.ts b/backend/src/index.ts
index 84be16fbc..7b4c8ae08 100644
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -26,14 +26,12 @@ import poolsParser from './api/pools-parser';
 import syncAssets from './sync-assets';
 import icons from './api/liquid/icons';
 import { Common } from './api/common';
-import bitcoinClient from './api/bitcoin/bitcoin-client';
 
 class Server {
   private wss: WebSocket.Server | undefined;
   private server: http.Server | undefined;
   private app: Express;
   private currentBackendRetryInterval = 5;
-  private blockIndexingStarted = false;
 
   constructor() {
     this.app = express();
@@ -139,15 +137,7 @@ class Server {
       }
       await blocks.$updateBlocks();
       await memPool.$updateMempool();
-
-      const blockchainInfo = await bitcoinClient.getBlockchainInfo();
-      if (this.blockIndexingStarted === false
-        && memPool.isInSync()
-        && blockchainInfo.blocks === blockchainInfo.headers
-      ) {
-        blocks.$generateBlockDatabase();
-        this.blockIndexingStarted = true;
-      }
+      blocks.$generateBlockDatabase();
 
       setTimeout(this.runMainUpdateLoop.bind(this), config.MEMPOOL.POLL_RATE_MS);
       this.currentBackendRetryInterval = 5;

From 6ebbc5667d4eb2b136c540d6bb609f6d229707b0 Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Tue, 25 Jan 2022 18:33:46 +0900
Subject: [PATCH 40/47] Small improvements on the mining page UX -
 INDEXING_BLOCKS_AMOUNT = 0 disable indexing, INDEXING_BLOCKS_AMOUNT = -1
 indexes everything - Show only available timespan in the mining page
 according to available datas - Change default INDEXING_BLOCKS_AMOUNT to 1100

Don't use unfiltered mysql user input

Enable http cache header for mining pools (1 min)
---
 backend/mempool-config.sample.json            |  1 +
 backend/src/api/blocks.ts                     | 16 ++--
 backend/src/api/mempool.ts                    | 10 +--
 backend/src/api/mining.ts                     | 38 +++++---
 backend/src/config.ts                         |  2 +-
 backend/src/index.ts                          |  2 +-
 backend/src/repositories/BlocksRepository.ts  | 48 ++++++++---
 backend/src/repositories/PoolsRepository.ts   | 19 ++--
 backend/src/routes.ts                         |  6 +-
 docker/backend/start.sh                       |  2 +-
 frontend/mempool-frontend-config.sample.json  |  1 -
 frontend/server.ts                            |  6 +-
 frontend/src/app/app-routing.module.ts        | 10 ++-
 .../master-page/master-page.component.html    |  2 +-
 .../pool-ranking/pool-ranking.component.html  | 86 +++++++++----------
 .../pool-ranking/pool-ranking.component.ts    | 37 ++++----
 .../src/app/interfaces/node-api.interface.ts  |  1 +
 frontend/src/app/services/api.service.ts      |  9 +-
 frontend/src/app/services/mining.service.ts   |  6 ++
 frontend/src/app/services/storage.service.ts  |  2 +-
 20 files changed, 183 insertions(+), 121 deletions(-)

diff --git a/backend/mempool-config.sample.json b/backend/mempool-config.sample.json
index 1b55f38f4..8a9295b3a 100644
--- a/backend/mempool-config.sample.json
+++ b/backend/mempool-config.sample.json
@@ -12,6 +12,7 @@
     "BLOCK_WEIGHT_UNITS": 4000000,
     "INITIAL_BLOCKS_AMOUNT": 8,
     "MEMPOOL_BLOCKS_AMOUNT": 8,
+    "INDEXING_BLOCKS_AMOUNT": 1100,
     "PRICE_FEED_UPDATE_INTERVAL": 3600,
     "USE_SECOND_NODE_FOR_MINFEE": false,
     "EXTERNAL_ASSETS": [
diff --git a/backend/src/api/blocks.ts b/backend/src/api/blocks.ts
index 5613abfa1..22bea2480 100644
--- a/backend/src/api/blocks.ts
+++ b/backend/src/api/blocks.ts
@@ -114,7 +114,7 @@ class Blocks {
    * @returns
    */
   private async $findBlockMiner(txMinerInfo: TransactionMinerInfo | undefined): Promise<PoolTag> {
-    if (txMinerInfo === undefined) {
+    if (txMinerInfo === undefined || txMinerInfo.vout.length < 1) {
       return await poolsRepository.$getUnknownPool();
     }
 
@@ -147,9 +147,9 @@ class Blocks {
    */
   public async $generateBlockDatabase() {
     if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false || // Bitcoin only
-      config.MEMPOOL.INDEXING_BLOCKS_AMOUNT <= 0 || // Indexing must be enabled
-      this.blockIndexingStarted === true ||  // Indexing must not already be in progress
-      !memPool.isInSync() // We sync the mempool first
+      config.MEMPOOL.INDEXING_BLOCKS_AMOUNT === 0 || // Indexing must be enabled
+      !memPool.isInSync() || // We sync the mempool first
+      this.blockIndexingStarted === true // Indexing must not already be in progress
     ) {
       return;
     }
@@ -163,7 +163,13 @@ class Blocks {
 
     try {
       let currentBlockHeight = blockchainInfo.blocks;
-      const lastBlockToIndex = Math.max(0, currentBlockHeight - config.MEMPOOL.INDEXING_BLOCKS_AMOUNT + 1);
+
+      let indexingBlockAmount = config.MEMPOOL.INDEXING_BLOCKS_AMOUNT;
+      if (indexingBlockAmount <= -1) {
+        indexingBlockAmount = currentBlockHeight + 1;
+      }
+
+      const lastBlockToIndex = Math.max(0, currentBlockHeight - indexingBlockAmount + 1);
 
       logger.info(`Indexing blocks from #${currentBlockHeight} to #${lastBlockToIndex}`);
 
diff --git a/backend/src/api/mempool.ts b/backend/src/api/mempool.ts
index 859912f6c..4d6c35860 100644
--- a/backend/src/api/mempool.ts
+++ b/backend/src/api/mempool.ts
@@ -118,11 +118,11 @@ class Mempool {
             });
           }
           hasChange = true;
-          // if (diff > 0) {
-          //   logger.debug('Fetched transaction ' + txCount + ' / ' + diff);
-          // } else {
-          //   logger.debug('Fetched transaction ' + txCount);
-          // }
+          if (diff > 0) {
+            logger.debug('Fetched transaction ' + txCount + ' / ' + diff);
+          } else {
+            logger.debug('Fetched transaction ' + txCount);
+          }
           newTransactions.push(transaction);
         } catch (e) {
           logger.debug('Error finding transaction in mempool: ' + (e instanceof Error ? e.message : e));
diff --git a/backend/src/api/mining.ts b/backend/src/api/mining.ts
index b6d3d8750..c89ea9324 100644
--- a/backend/src/api/mining.ts
+++ b/backend/src/api/mining.ts
@@ -2,7 +2,6 @@ import { PoolInfo, PoolStats } from '../mempool.interfaces';
 import BlocksRepository, { EmptyBlocks } from '../repositories/BlocksRepository';
 import PoolsRepository from '../repositories/PoolsRepository';
 import bitcoinClient from './bitcoin/bitcoin-client';
-import BitcoinApi from './bitcoin/bitcoin-api';
 
 class Mining {
   constructor() {
@@ -11,14 +10,25 @@ class Mining {
   /**
    * Generate high level overview of the pool ranks and general stats
    */
-  public async $getPoolsStats(interval: string = '100 YEAR') : Promise<object> {
+  public async $getPoolsStats(interval: string | null) : Promise<object> {
+    let sqlInterval: string | null = null;
+    switch (interval) {
+      case '24h': sqlInterval = '1 DAY'; break;
+      case '3d': sqlInterval = '3 DAY'; break;
+      case '1w': sqlInterval = '1 WEEK'; break;
+      case '1m': sqlInterval = '1 MONTH'; break;
+      case '3m': sqlInterval = '3 MONTH'; break;
+      case '6m': sqlInterval = '6 MONTH'; break;
+      case '1y': sqlInterval = '1 YEAR'; break;
+      case '2y': sqlInterval = '2 YEAR'; break;
+      case '3y': sqlInterval = '3 YEAR'; break;
+      default: sqlInterval = null; break;
+    }
+
     const poolsStatistics = {};
 
-    const blockHeightTip = await bitcoinClient.getBlockCount();
-    const lastBlockHashrate = await bitcoinClient.getNetworkHashPs(120, blockHeightTip);
-    const poolsInfo: PoolInfo[] = await PoolsRepository.$getPoolsInfo(interval);
-    const blockCount: number = await BlocksRepository.$blockCount(interval);
-    const emptyBlocks: EmptyBlocks[] = await BlocksRepository.$countEmptyBlocks(interval);
+    const poolsInfo: PoolInfo[] = await PoolsRepository.$getPoolsInfo(sqlInterval);
+    const emptyBlocks: EmptyBlocks[] = await BlocksRepository.$countEmptyBlocks(sqlInterval);
 
     const poolsStats: PoolStats[] = [];
     let rank = 1;
@@ -40,12 +50,20 @@ class Mining {
       poolsStats.push(poolStat);
     });
 
-    poolsStatistics['blockCount'] = blockCount;
-    poolsStatistics['lastEstimatedHashrate'] = lastBlockHashrate;
     poolsStatistics['pools'] = poolsStats;
 
+    const oldestBlock = new Date(await BlocksRepository.$oldestBlockTimestamp());
+    poolsStatistics['oldestIndexedBlockTimestamp'] = oldestBlock.getTime();
+
+    const blockCount: number = await BlocksRepository.$blockCount(sqlInterval);
+    poolsStatistics['blockCount'] = blockCount;
+
+    const blockHeightTip = await bitcoinClient.getBlockCount();
+    const lastBlockHashrate = await bitcoinClient.getNetworkHashPs(120, blockHeightTip);
+    poolsStatistics['lastEstimatedHashrate'] = lastBlockHashrate;
+
     return poolsStatistics;
   }
 }
 
-export default new Mining();
\ No newline at end of file
+export default new Mining();
diff --git a/backend/src/config.ts b/backend/src/config.ts
index 7cd789934..085d538c4 100644
--- a/backend/src/config.ts
+++ b/backend/src/config.ts
@@ -78,7 +78,7 @@ const defaults: IConfig = {
     'BLOCK_WEIGHT_UNITS': 4000000,
     'INITIAL_BLOCKS_AMOUNT': 8,
     'MEMPOOL_BLOCKS_AMOUNT': 8,
-    'INDEXING_BLOCKS_AMOUNT': 432, // ~3 days at 10 minutes / block. Set to 0 to disable indexing
+    'INDEXING_BLOCKS_AMOUNT': 1100, // 0 = disable indexing, -1 = index all blocks
     'PRICE_FEED_UPDATE_INTERVAL': 3600,
     'USE_SECOND_NODE_FOR_MINFEE': false,
     'EXTERNAL_ASSETS': [
diff --git a/backend/src/index.ts b/backend/src/index.ts
index 7b4c8ae08..5b3cdc9c2 100644
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -255,7 +255,7 @@ class Server {
         .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/1y', routes.$getStatisticsByTime.bind(routes, '1y'))
         .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/2y', routes.$getStatisticsByTime.bind(routes, '2y'))
         .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/3y', routes.$getStatisticsByTime.bind(routes, '3y'))
-        .get(config.MEMPOOL.API_URL_PREFIX + 'pools', routes.$getPools)
+        .get(config.MEMPOOL.API_URL_PREFIX + 'mining/pools', routes.$getPools)
         ;
     }
 
diff --git a/backend/src/repositories/BlocksRepository.ts b/backend/src/repositories/BlocksRepository.ts
index 413d4a226..947403e88 100644
--- a/backend/src/repositories/BlocksRepository.ts
+++ b/backend/src/repositories/BlocksRepository.ts
@@ -72,14 +72,16 @@ class BlocksRepository {
   /**
    * Count empty blocks for all pools
    */
-  public async $countEmptyBlocks(interval: string = '100 YEAR'): Promise<EmptyBlocks[]> {
-    const connection = await DB.pool.getConnection();
-    const [rows] = await connection.query(`
+  public async $countEmptyBlocks(interval: string | null): Promise<EmptyBlocks[]> {
+    const query = `
       SELECT pool_id as poolId
       FROM blocks
-      WHERE blockTimestamp BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()
-      AND tx_count = 1;
-    `);
+      WHERE tx_count = 1` +
+      (interval != null ? ` AND blockTimestamp BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()` : ``)
+    ;
+
+    const connection = await DB.pool.getConnection();
+    const [rows] = await connection.query(query);
     connection.release();
 
     return <EmptyBlocks[]>rows;
@@ -88,17 +90,39 @@ class BlocksRepository {
   /**
    * Get blocks count for a period
    */
-   public async $blockCount(interval: string = '100 YEAR'): Promise<number> {
-    const connection = await DB.pool.getConnection();
-    const [rows] = await connection.query(`
+   public async $blockCount(interval: string | null): Promise<number> {
+    const query = `
       SELECT count(height) as blockCount
-      FROM blocks
-      WHERE blockTimestamp BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW();
-    `);
+      FROM blocks` +
+      (interval != null ? ` WHERE blockTimestamp BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()` : ``)
+    ;
+
+    const connection = await DB.pool.getConnection();
+    const [rows] = await connection.query(query);
     connection.release();
 
     return <number>rows[0].blockCount;
   }
+
+  /**
+   * Get the oldest indexed block
+   */
+  public async $oldestBlockTimestamp(): Promise<number> {
+    const connection = await DB.pool.getConnection();
+    const [rows]: any[] = await connection.query(`
+      SELECT blockTimestamp
+      FROM blocks
+      ORDER BY height
+      LIMIT 1;
+    `);
+    connection.release();
+
+    if (rows.length <= 0) {
+      return -1;
+    }
+
+    return <number>rows[0].blockTimestamp;
+  }
 }
 
 export default new BlocksRepository();
\ No newline at end of file
diff --git a/backend/src/repositories/PoolsRepository.ts b/backend/src/repositories/PoolsRepository.ts
index 060418bf8..d1fb0da9a 100644
--- a/backend/src/repositories/PoolsRepository.ts
+++ b/backend/src/repositories/PoolsRepository.ts
@@ -25,17 +25,20 @@ class PoolsRepository {
   /**
    * Get basic pool info and block count
    */
-  public async $getPoolsInfo(interval: string = '100 YEARS'): Promise<PoolInfo[]> {
-    const connection = await DB.pool.getConnection();
-    const [rows] = await connection.query(`
+  public async $getPoolsInfo(interval: string | null): Promise<PoolInfo[]> {
+    const query = `
       SELECT COUNT(height) as blockCount, pool_id as poolId, pools.name as name, pools.link as link
       FROM blocks
-      JOIN pools on pools.id = pool_id
-      WHERE blocks.blockTimestamp BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()
-      GROUP BY pool_id
-      ORDER BY COUNT(height) DESC;
-    `);
+      JOIN pools on pools.id = pool_id` +
+      (interval != null ? ` WHERE blocks.blockTimestamp BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()` : ``) +
+      ` GROUP BY pool_id
+      ORDER BY COUNT(height) DESC
+    `;
+
+    const connection = await DB.pool.getConnection();
+    const [rows] = await connection.query(query);
     connection.release();
+
     return <PoolInfo[]>rows;
   }
 }
diff --git a/backend/src/routes.ts b/backend/src/routes.ts
index 00e2ceee0..a273fd95d 100644
--- a/backend/src/routes.ts
+++ b/backend/src/routes.ts
@@ -535,9 +535,9 @@ class Routes {
   public async $getPools(req: Request, res: Response) {
     try {
       let stats = await miningStats.$getPoolsStats(req.query.interval as string);
-      // res.header('Pragma', 'public');
-      // res.header('Cache-control', 'public');
-      // res.setHeader('Expires', new Date(Date.now() + 1000 * 300).toUTCString());
+      res.header('Pragma', 'public');
+      res.header('Cache-control', 'public');
+      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
       res.json(stats);
     } catch (e) {
       res.status(500).send(e instanceof Error ? e.message : e);
diff --git a/docker/backend/start.sh b/docker/backend/start.sh
index f9c784641..372be346e 100644
--- a/docker/backend/start.sh
+++ b/docker/backend/start.sh
@@ -13,7 +13,7 @@ __MEMPOOL_RECOMMENDED_FEE_PERCENTILE__=${MEMPOOL_RECOMMENDED_FEE_PERCENTILE:=50}
 __MEMPOOL_BLOCK_WEIGHT_UNITS__=${MEMPOOL_BLOCK_WEIGHT_UNITS:=4000000}
 __MEMPOOL_INITIAL_BLOCKS_AMOUNT__=${MEMPOOL_INITIAL_BLOCKS_AMOUNT:=8}
 __MEMPOOL_MEMPOOL_BLOCKS_AMOUNT__=${MEMPOOL_MEMPOOL_BLOCKS_AMOUNT:=8}
-__MEMPOOL_INDEXING_BLOCKS_AMOUNT__=${MEMPOOL_INDEXING_BLOCKS_AMOUNT:=432}
+__MEMPOOL_INDEXING_BLOCKS_AMOUNT__=${MEMPOOL_INDEXING_BLOCKS_AMOUNT:=1100}
 __MEMPOOL_PRICE_FEED_UPDATE_INTERVAL__=${MEMPOOL_PRICE_FEED_UPDATE_INTERVAL:=3600}
 __MEMPOOL_USE_SECOND_NODE_FOR_MINFEE__=${MEMPOOL_USE_SECOND_NODE_FOR_MINFEE:=false}
 __MEMPOOL_EXTERNAL_ASSETS__=${MEMPOOL_EXTERNAL_ASSETS:=[]}
diff --git a/frontend/mempool-frontend-config.sample.json b/frontend/mempool-frontend-config.sample.json
index 5cb296537..139c55962 100644
--- a/frontend/mempool-frontend-config.sample.json
+++ b/frontend/mempool-frontend-config.sample.json
@@ -11,7 +11,6 @@
   "NGINX_HOSTNAME": "127.0.0.1",
   "NGINX_PORT": "80",
   "MEMPOOL_BLOCKS_AMOUNT": 8,
-  "INDEXING_BLOCKS_AMOUNT": 432,
   "BASE_MODULE": "mempool",
   "MEMPOOL_WEBSITE_URL": "https://mempool.space",
   "LIQUID_WEBSITE_URL": "https://liquid.network",
diff --git a/frontend/server.ts b/frontend/server.ts
index 2be6458b5..df4ab1294 100644
--- a/frontend/server.ts
+++ b/frontend/server.ts
@@ -65,7 +65,7 @@ export function app(locale: string): express.Express {
   server.get('/mempool-block/*', getLocalizedSSR(indexHtml));
   server.get('/address/*', getLocalizedSSR(indexHtml));
   server.get('/blocks', getLocalizedSSR(indexHtml));
-  server.get('/pools', getLocalizedSSR(indexHtml));
+  server.get('/mining/pools', getLocalizedSSR(indexHtml));
   server.get('/graphs', getLocalizedSSR(indexHtml));
   server.get('/liquid', getLocalizedSSR(indexHtml));
   server.get('/liquid/tx/*', getLocalizedSSR(indexHtml));
@@ -86,7 +86,7 @@ export function app(locale: string): express.Express {
   server.get('/testnet/mempool-block/*', getLocalizedSSR(indexHtml));
   server.get('/testnet/address/*', getLocalizedSSR(indexHtml));
   server.get('/testnet/blocks', getLocalizedSSR(indexHtml));
-  server.get('/testnet/pools', getLocalizedSSR(indexHtml));
+  server.get('/testnet/mining/pools', getLocalizedSSR(indexHtml));
   server.get('/testnet/graphs', getLocalizedSSR(indexHtml));
   server.get('/testnet/api', getLocalizedSSR(indexHtml));
   server.get('/testnet/tv', getLocalizedSSR(indexHtml));
@@ -98,7 +98,7 @@ export function app(locale: string): express.Express {
   server.get('/signet/mempool-block/*', getLocalizedSSR(indexHtml));
   server.get('/signet/address/*', getLocalizedSSR(indexHtml));
   server.get('/signet/blocks', getLocalizedSSR(indexHtml));
-  server.get('/signet/pools', getLocalizedSSR(indexHtml));
+  server.get('/signet/mining/pools', getLocalizedSSR(indexHtml));
   server.get('/signet/graphs', getLocalizedSSR(indexHtml));
   server.get('/signet/api', getLocalizedSSR(indexHtml));
   server.get('/signet/tv', getLocalizedSSR(indexHtml));
diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts
index 19e4ee7ab..36a53781f 100644
--- a/frontend/src/app/app-routing.module.ts
+++ b/frontend/src/app/app-routing.module.ts
@@ -60,7 +60,7 @@ let routes: Routes = [
         component: LatestBlocksComponent,
       },
       {
-        path: 'pools',
+        path: 'mining/pools',
         component: PoolRankingComponent,
       },
       {
@@ -147,6 +147,10 @@ let routes: Routes = [
             path: 'blocks',
             component: LatestBlocksComponent,
           },
+          {
+            path: 'mining/pools',
+            component: PoolRankingComponent,
+          },
           {
             path: 'graphs',
             component: StatisticsComponent,
@@ -225,6 +229,10 @@ let routes: Routes = [
             path: 'blocks',
             component: LatestBlocksComponent,
           },
+          {
+            path: 'mining/pools',
+            component: PoolRankingComponent,
+          },
           {
             path: 'graphs',
             component: StatisticsComponent,
diff --git a/frontend/src/app/components/master-page/master-page.component.html b/frontend/src/app/components/master-page/master-page.component.html
index 479f324c2..4624340d3 100644
--- a/frontend/src/app/components/master-page/master-page.component.html
+++ b/frontend/src/app/components/master-page/master-page.component.html
@@ -32,7 +32,7 @@
         <a class="nav-link" [routerLink]="['/' | relativeUrl]" (click)="collapse()"><fa-icon [icon]="['fas', 'tachometer-alt']" [fixedWidth]="true" i18n-title="master-page.dashboard" title="Dashboard"></fa-icon></a>
       </li>
       <li class="nav-item" routerLinkActive="active" id="btn-pools">
-        <a class="nav-link" [routerLink]="['/mining/pools' | relativeUrl]" (click)="collapse()"><fa-icon [icon]="['fas', 'hammer']" [fixedWidth]="true" i18n-title="master-page.pools" title="Pools"></fa-icon></a>
+        <a class="nav-link" [routerLink]="['/mining/pools' | relativeUrl]" (click)="collapse()"><fa-icon [icon]="['fas', 'hammer']" [fixedWidth]="true" i18n-title="master-page.mining-pools" title="Mining Pools"></fa-icon></a>
       </li>
       <li class="nav-item" routerLinkActive="active" id="btn-graphs">
         <a class="nav-link" [routerLink]="['/graphs' | relativeUrl]" (click)="collapse()"><fa-icon [icon]="['fas', 'chart-area']" [fixedWidth]="true" i18n-title="master-page.graphs" title="Graphs"></fa-icon></a>
diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.html b/frontend/src/app/components/pool-ranking/pool-ranking.component.html
index 757e11385..f9a1127ba 100644
--- a/frontend/src/app/components/pool-ranking/pool-ranking.component.html
+++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.html
@@ -7,37 +7,37 @@
   </div>
 
   <div class="card-header mb-0 mb-lg-4">
-    <form [formGroup]="radioGroupForm" class="formRadioGroup">
+    <form [formGroup]="radioGroupForm" class="formRadioGroup" *ngIf="(miningStatsObservable$ | async) as miningStats">
       <div class="btn-group btn-group-toggle" ngbRadioGroup name="radioBasic" formControlName="dateSpan">
-        <label ngbButtonLabel class="btn-primary btn-sm">
-          <input ngbButton type="radio" [value]="'1d'" [routerLink]="['/pools' | relativeUrl]" fragment="1d"> 1D
+        <label ngbButtonLabel class="btn-primary btn-sm" *ngIf="miningStats.availableTimespanDay >= 1">
+          <input ngbButton type="radio" [value]="'24h'" [routerLink]="['/mining/pools' | relativeUrl]" fragment="24h"> 24h
+        </label>
+        <label ngbButtonLabel class="btn-primary btn-sm" *ngIf="miningStats.availableTimespanDay >= 3">
+          <input ngbButton type="radio" [value]="'3d'" [routerLink]="['/mining/pools' | relativeUrl]" fragment="3d"> 3D
+        </label>
+        <label ngbButtonLabel class="btn-primary btn-sm" *ngIf="miningStats.availableTimespanDay >= 7">
+          <input ngbButton type="radio" [value]="'1w'" [routerLink]="['/mining/pools' | relativeUrl]" fragment="1w"> 1W
+        </label>
+        <label ngbButtonLabel class="btn-primary btn-sm" *ngIf="miningStats.availableTimespanDay >= 30">
+          <input ngbButton type="radio" [value]="'1m'" [routerLink]="['/mining/pools' | relativeUrl]" fragment="1m"> 1M
+        </label>
+        <label ngbButtonLabel class="btn-primary btn-sm" *ngIf="miningStats.availableTimespanDay >= 90">
+          <input ngbButton type="radio" [value]="'3m'" [routerLink]="['/mining/pools' | relativeUrl]" fragment="3m"> 3M
+        </label>
+        <label ngbButtonLabel class="btn-primary btn-sm" *ngIf="miningStats.availableTimespanDay >= 180">
+          <input ngbButton type="radio" [value]="'6m'" [routerLink]="['/mining/pools' | relativeUrl]" fragment="6m"> 6M
+        </label>
+        <label ngbButtonLabel class="btn-primary btn-sm" *ngIf="miningStats.availableTimespanDay >= 365">
+          <input ngbButton type="radio" [value]="'1y'" [routerLink]="['/mining/pools' | relativeUrl]" fragment="1y"> 1Y
+        </label>
+        <label ngbButtonLabel class="btn-primary btn-sm" *ngIf="miningStats.availableTimespanDay >= 730">
+          <input ngbButton type="radio" [value]="'2y'" [routerLink]="['/mining/pools' | relativeUrl]" fragment="2y"> 2Y
+        </label>
+        <label ngbButtonLabel class="btn-primary btn-sm" *ngIf="miningStats.availableTimespanDay >= 1095">
+          <input ngbButton type="radio" [value]="'3y'" [routerLink]="['/mining/pools' | relativeUrl]" fragment="3y"> 3Y
         </label>
         <label ngbButtonLabel class="btn-primary btn-sm">
-          <input ngbButton type="radio" [value]="'3d'" [routerLink]="['/pools' | relativeUrl]" fragment="3d"> 3D
-        </label>
-        <label ngbButtonLabel class="btn-primary btn-sm">
-          <input ngbButton type="radio" [value]="'1w'" [routerLink]="['/pools' | relativeUrl]" fragment="1w"> 1W
-        </label>
-        <label ngbButtonLabel class="btn-primary btn-sm">
-          <input ngbButton type="radio" [value]="'1m'" [routerLink]="['/pools' | relativeUrl]" fragment="1m"> 1M
-        </label>
-        <label ngbButtonLabel class="btn-primary btn-sm">
-          <input ngbButton type="radio" [value]="'3m'" [routerLink]="['/pools' | relativeUrl]" fragment="3m"> 3M
-        </label>
-        <label ngbButtonLabel class="btn-primary btn-sm">
-          <input ngbButton type="radio" [value]="'6m'" [routerLink]="['/pools' | relativeUrl]" fragment="6m"> 6M
-        </label>
-        <label ngbButtonLabel class="btn-primary btn-sm">
-          <input ngbButton type="radio" [value]="'1y'" [routerLink]="['/pools' | relativeUrl]" fragment="1y"> 1Y
-        </label>
-        <label ngbButtonLabel class="btn-primary btn-sm">
-          <input ngbButton type="radio" [value]="'2y'" [routerLink]="['/pools' | relativeUrl]" fragment="2y"> 2Y
-        </label>
-        <label ngbButtonLabel class="btn-primary btn-sm">
-          <input ngbButton type="radio" [value]="'3y'" [routerLink]="['/pools' | relativeUrl]" fragment="3y"> 3Y
-        </label>
-        <label ngbButtonLabel class="btn-primary btn-sm">
-          <input ngbButton type="radio" [value]="'all'" [routerLink]="['/pools' | relativeUrl]" fragment="all"> ALL
+          <input ngbButton type="radio" [value]="'all'" [routerLink]="['/mining/pools' | relativeUrl]" fragment="all"> ALL
         </label>
       </div>
     </form>
@@ -46,31 +46,31 @@
   <table class="table table-borderless text-center pools-table" [alwaysCallback]="true" infiniteScroll [infiniteScrollDistance]="1.5" [infiniteScrollUpDistance]="1.5" [infiniteScrollThrottle]="50">
     <thead>
       <tr>
-        <th class="d-none d-md-block" i18n="latest-blocks.height">Rank</th>
+        <th class="d-none d-md-block" i18n="mining.rank">Rank</th>
         <th class=""></th>
-        <th class="" i18n="latest-blocks.poolName">Name</th>
-        <th class="" *ngIf="this.poolsWindowPreference === '1d'" i18n="latest-blocks.timestamp">Hashrate</th>
-        <th class="" i18n="latest-blocks.mined">Blocks</th>
-        <th class="d-none d-md-block" i18n="latest-blocks.transactions">Empty Blocks</th>
+        <th class="" i18n="mining.pool-name">Name</th>
+        <th class="" *ngIf="this.poolsWindowPreference === '24h'" i18n="mining.hashrate">Hashrate</th>
+        <th class="" i18n="master-page.blocks">Blocks</th>
+        <th class="d-none d-md-block" i18n="mining.empty-blocks">Empty Blocks</th>
       </tr>
     </thead>
     <tbody *ngIf="(miningStatsObservable$ | async) as miningStats">
-      <tr>
-        <td class="d-none d-md-block">-</td>
-        <td class="text-right"><img width="25" height="25" src="./resources/mining-pools/default.svg"></td>
-        <td class="">All miners</td>
-        <td class="" *ngIf="this.poolsWindowPreference === '1d'">{{ miningStats.lastEstimatedHashrate}} {{ miningStats.miningUnits.hashrateUnit }}</td>
-        <td class="">{{ miningStats.blockCount }}</td>
-        <td class="d-none d-md-block">{{ miningStats.totalEmptyBlock }} ({{ miningStats.totalEmptyBlockRatio }}%)</td>
-      </tr>
       <tr *ngFor="let pool of miningStats.pools">
         <td class="d-none d-md-block">{{ pool.rank }}</td>
         <td class="text-right"><img width="25" height="25" src="{{ pool.logo }}" onError="this.src = './resources/mining-pools/default.svg'"></td>
-        <td class=""><a target="#" href="{{ pool.link }}">{{ pool.name }}</a></td>
-        <td class="" *ngIf="this.poolsWindowPreference === '1d'">{{ pool.lastEstimatedHashrate }} {{ miningStats.miningUnits.hashrateUnit }}</td>
+        <td class="">{{ pool.name }}</td>
+        <td class="" *ngIf="this.poolsWindowPreference === '24h'">{{ pool.lastEstimatedHashrate }} {{ miningStats.miningUnits.hashrateUnit }}</td>
         <td class="">{{ pool['blockText'] }}</td>
         <td class="d-none d-md-block">{{ pool.emptyBlocks }} ({{ pool.emptyBlockRatio }}%)</td>
       </tr>
+      <tr style="border-top: 1px solid #555">
+        <td class="d-none d-md-block">-</td>
+        <td class="text-right"><img width="25" height="25" src="./resources/mining-pools/default.svg"></td>
+        <td class="" i18n="mining.all-miners"><b>All miners</b></td>
+        <td class="" *ngIf="this.poolsWindowPreference === '24h'"><b>{{ miningStats.lastEstimatedHashrate}} {{ miningStats.miningUnits.hashrateUnit }}</b></td>
+        <td class=""><b>{{ miningStats.blockCount }}</b></td>
+        <td class="d-none d-md-block"><b>{{ miningStats.totalEmptyBlock }} ({{ miningStats.totalEmptyBlockRatio }}%)</b></td>
+      </tr>
     </tbody>
   </table>
 
diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
index b5fbfb75f..1569e8151 100644
--- a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
+++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
@@ -2,7 +2,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { EChartsOption } from 'echarts';
 import { combineLatest, Observable, of } from 'rxjs';
-import { catchError, map, skip, startWith, switchMap, tap } from 'rxjs/operators';
+import { catchError, map, share, skip, startWith, switchMap, tap } from 'rxjs/operators';
 import { SinglePoolStats } from 'src/app/interfaces/node-api.interface';
 import { StorageService } from '../..//services/storage.service';
 import { MiningService, MiningStats } from '../../services/mining.service';
@@ -39,7 +39,7 @@ export class PoolRankingComponent implements OnInit, OnDestroy {
     private formBuilder: FormBuilder,
     private miningService: MiningService,
   ) {
-    this.poolsWindowPreference = this.storageService.getValue('poolsWindowPreference') ? this.storageService.getValue('poolsWindowPreference') : '1d';
+    this.poolsWindowPreference = this.storageService.getValue('poolsWindowPreference') ? this.storageService.getValue('poolsWindowPreference') : '24h';
     this.radioGroupForm = this.formBuilder.group({ dateSpan: this.poolsWindowPreference });
     this.radioGroupForm.controls.dateSpan.setValue(this.poolsWindowPreference);
   }
@@ -67,7 +67,7 @@ export class PoolRankingComponent implements OnInit, OnDestroy {
       .pipe(
         switchMap(() => {
           this.isLoading = true;
-          return this.miningService.getMiningStats(this.getSQLInterval(this.poolsWindowPreference))
+          return this.miningService.getMiningStats(this.poolsWindowPreference)
             .pipe(
               catchError((e) => of(this.getEmptyMiningStat()))
             );
@@ -79,7 +79,8 @@ export class PoolRankingComponent implements OnInit, OnDestroy {
         tap(data => {
           this.isLoading = false;
           this.prepareChartOptions(data);
-        })
+        }),
+        share()
       );
   }
 
@@ -116,7 +117,7 @@ export class PoolRankingComponent implements OnInit, OnDestroy {
             color: "#FFFFFF",
           },
           formatter: () => {
-            if (this.poolsWindowPreference === '1d') {
+            if (this.poolsWindowPreference === '24h') {
               return `<u><b>${pool.name} (${pool.share}%)</b></u><br>` +
                 pool.lastEstimatedHashrate.toString() + ' PH/s' +
                 `<br>` + pool.blockCount.toString() + ` blocks`;
@@ -132,10 +133,16 @@ export class PoolRankingComponent implements OnInit, OnDestroy {
   }
 
   prepareChartOptions(miningStats) {
+    let network = this.stateService.network;
+    if (network === '') {
+      network = 'bitcoin';
+    }
+    network = network.charAt(0).toUpperCase() + network.slice(1);
+
     this.chartOptions = {
       title: {
-        text: (this.poolsWindowPreference === '1d') ? 'Hashrate distribution' : 'Block distribution',
-        subtext: (this.poolsWindowPreference === '1d') ? 'Estimated from the # of blocks mined' : null,
+        text: $localize`:@@mining.pool-chart-title:${network}:NETWORK: mining pools share`,
+        subtext: $localize`:@@mining.pool-chart-sub-title:Estimated from the # of blocks mined`,
         left: 'center',
         textStyle: {
           color: '#FFF',
@@ -187,21 +194,6 @@ export class PoolRankingComponent implements OnInit, OnDestroy {
     };
   }
 
-  getSQLInterval(uiInterval: string) {
-    switch (uiInterval) {
-      case '1d': return '1 DAY';
-      case '3d': return '3 DAY';
-      case '1w': return '1 WEEK';
-      case '1m': return '1 MONTH';
-      case '3m': return '3 MONTH';
-      case '6m': return '6 MONTH';
-      case '1y': return '1 YEAR';
-      case '2y': return '2 YEAR';
-      case '3y': return '3 YEAR';
-      default: return '1000 YEAR';
-    }
-  }
-
   /**
    * Default mining stats if something goes wrong
    */
@@ -212,6 +204,7 @@ export class PoolRankingComponent implements OnInit, OnDestroy {
       totalEmptyBlock: 0,
       totalEmptyBlockRatio: '',
       pools: [],
+      availableTimespanDay: 0,
       miningUnits: {
         hashrateDivider: 1,
         hashrateUnit: '',
diff --git a/frontend/src/app/interfaces/node-api.interface.ts b/frontend/src/app/interfaces/node-api.interface.ts
index 82b990cb0..4b56d4319 100644
--- a/frontend/src/app/interfaces/node-api.interface.ts
+++ b/frontend/src/app/interfaces/node-api.interface.ts
@@ -68,6 +68,7 @@ export interface SinglePoolStats {
 export interface PoolsStats {
   blockCount: number;
   lastEstimatedHashrate: number;
+  oldestIndexedBlockTimestamp: number;
   pools: SinglePoolStats[];
 }
 
diff --git a/frontend/src/app/services/api.service.ts b/frontend/src/app/services/api.service.ts
index f17f32032..267be7202 100644
--- a/frontend/src/app/services/api.service.ts
+++ b/frontend/src/app/services/api.service.ts
@@ -121,8 +121,11 @@ export class ApiService {
     return this.httpClient.post<any>(this.apiBaseUrl + this.apiBasePath + '/api/tx', hexPayload, { responseType: 'text' as 'json'});
   }
 
-  listPools$(interval: string) : Observable<PoolsStats> {
-    const params = new HttpParams().set('interval', interval);
-    return this.httpClient.get<PoolsStats>(this.apiBaseUrl + this.apiBasePath + '/api/v1/pools', {params});
+  listPools$(interval: string | null) : Observable<PoolsStats> {
+    let params = {};
+    if (interval) {
+      params = new HttpParams().set('interval', interval);
+    }
+    return this.httpClient.get<PoolsStats>(this.apiBaseUrl + this.apiBasePath + '/api/v1/mining/pools', {params});
   }
 }
diff --git a/frontend/src/app/services/mining.service.ts b/frontend/src/app/services/mining.service.ts
index 9145b555f..20056354b 100644
--- a/frontend/src/app/services/mining.service.ts
+++ b/frontend/src/app/services/mining.service.ts
@@ -17,6 +17,7 @@ export interface MiningStats {
   totalEmptyBlockRatio: string;
   pools: SinglePoolStats[];
   miningUnits: MiningUnits;
+  availableTimespanDay: number;
 }
 
 @Injectable({
@@ -80,6 +81,10 @@ export class MiningService {
       };
     });
 
+    const availableTimespanDay = (
+      (new Date().getTime() / 1000) - (stats.oldestIndexedBlockTimestamp / 1000)
+    ) / 3600 / 24;
+
     return {
       lastEstimatedHashrate: (stats.lastEstimatedHashrate / hashrateDivider).toFixed(2),
       blockCount: stats.blockCount,
@@ -87,6 +92,7 @@ export class MiningService {
       totalEmptyBlockRatio: totalEmptyBlockRatio,
       pools: poolsStats,
       miningUnits: miningUnits,
+      availableTimespanDay: availableTimespanDay,
     };
   }
 }
diff --git a/frontend/src/app/services/storage.service.ts b/frontend/src/app/services/storage.service.ts
index d4a24e790..aa848a21c 100644
--- a/frontend/src/app/services/storage.service.ts
+++ b/frontend/src/app/services/storage.service.ts
@@ -7,7 +7,7 @@ import { Router, ActivatedRoute } from '@angular/router';
 export class StorageService {
   constructor(private router: Router, private route: ActivatedRoute) {
     this.setDefaultValueIfNeeded('graphWindowPreference', '2h');
-    this.setDefaultValueIfNeeded('poolsWindowPreference', '1d');
+    this.setDefaultValueIfNeeded('poolsWindowPreference', '1w');
   }
 
   setDefaultValueIfNeeded(key: string, defaultValue: string) {

From 9df490373b515f9c16b76a2e52a24796169154a0 Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Fri, 28 Jan 2022 14:31:33 +0900
Subject: [PATCH 41/47] Fixes post rebase

---
 backend/package.json                          |  3 +-
 backend/src/api/database-migration.ts         | 11 -------
 backend/src/index.ts                          |  1 +
 .../integration/mainnet/mainnet.spec.ts       | 29 +++++++++----------
 frontend/mempool-frontend-config.sample.json  |  1 +
 .../src/app/interfaces/node-api.interface.ts  |  2 --
 6 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 594e25427..a5c9a32ff 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -25,8 +25,7 @@
     "build": "npm run tsc",
     "start": "node --max-old-space-size=2048 dist/index.js",
     "start-production": "node --max-old-space-size=4096 dist/index.js",
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "migrate-pools": "npm run tsc ; node dist/api/pools-parser.js"
+    "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
     "@mempool/bitcoin": "^3.0.3",
diff --git a/backend/src/api/database-migration.ts b/backend/src/api/database-migration.ts
index baa518598..24ecc03cf 100644
--- a/backend/src/api/database-migration.ts
+++ b/backend/src/api/database-migration.ts
@@ -353,17 +353,6 @@ class DatabaseMigration {
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;`;
   }
 
-  private getCreatePoolsTableQuery(): string {
-    return `CREATE TABLE IF NOT EXISTS pools (
-      id int(11) NOT NULL AUTO_INCREMENT,
-      name varchar(50) NOT NULL,
-      link varchar(255) NOT NULL,
-      addresses text NOT NULL,
-      regexes text NOT NULL,
-      PRIMARY KEY (id)
-    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;`;
-  }
-
   private getCreateBlocksTableQuery(): string {
     return `CREATE TABLE IF NOT EXISTS blocks (
       height int(11) unsigned NOT NULL,
diff --git a/backend/src/index.ts b/backend/src/index.ts
index 5b3cdc9c2..ec7e96162 100644
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -89,6 +89,7 @@ class Server {
       await checkDbConnection();
       try {
         await databaseMigration.$initializeOrMigrateDatabase();
+        await poolsParser.migratePoolsJson();
       } catch (e) {
         throw new Error(e instanceof Error ? e.message : 'Error');
       }
diff --git a/frontend/cypress/integration/mainnet/mainnet.spec.ts b/frontend/cypress/integration/mainnet/mainnet.spec.ts
index d04f4d287..752617092 100644
--- a/frontend/cypress/integration/mainnet/mainnet.spec.ts
+++ b/frontend/cypress/integration/mainnet/mainnet.spec.ts
@@ -371,22 +371,19 @@ describe('Mainnet', () => {
       cy.get('.blockchain-wrapper').should('not.visible');
     });
 
-        it('loads genesis block and click on the arrow left', () => {
-          cy.viewport('macbook-16');
-          cy.visit('/block/0');
-          cy.waitForSkeletonGone();
-          cy.waitForPageIdle();
-          cy.get('[ngbtooltip="Next Block"] > .ng-fa-icon > .svg-inline--fa').should('be.visible');
-          cy.get('[ngbtooltip="Previous Block"] > .ng-fa-icon > .svg-inline--fa').should('not.exist');
-          cy.get('[ngbtooltip="Next Block"] > .ng-fa-icon > .svg-inline--fa').click().then(() => {
-            cy.get('[ngbtooltip="Next Block"] > .ng-fa-icon > .svg-inline--fa').should('be.visible');
-            cy.get('[ngbtooltip="Previous Block"] > .ng-fa-icon > .svg-inline--fa').should('be.visible');
-          });
-        });
+    it('loads genesis block and click on the arrow left', () => {
+      cy.viewport('macbook-16');
+      cy.visit('/block/0');
+      cy.waitForSkeletonGone();
+      cy.waitForPageIdle();
+      cy.get('[ngbtooltip="Next Block"] > .ng-fa-icon > .svg-inline--fa').should('be.visible');
+      cy.get('[ngbtooltip="Previous Block"] > .ng-fa-icon > .svg-inline--fa').should('not.exist');
+      cy.get('[ngbtooltip="Next Block"] > .ng-fa-icon > .svg-inline--fa').click().then(() => {
+        cy.get('[ngbtooltip="Next Block"] > .ng-fa-icon > .svg-inline--fa').should('be.visible');
+        cy.get('[ngbtooltip="Previous Block"] > .ng-fa-icon > .svg-inline--fa').should('be.visible');
       });
     });
 
-
     it('loads skeleton when changes between networks', () => {
       cy.visit('/');
       cy.waitForSkeletonGone();
@@ -417,11 +414,11 @@ describe('Mainnet', () => {
       cy.get(':nth-child(3) > #bitcoin-block-0').should('not.exist');
     });
 
-    it('loads the blocks screen', () => {
+    it('loads the pools screen', () => {
       cy.visit('/');
       cy.waitForSkeletonGone();
-      cy.get('#btn-blocks').click().then(() => {
-        cy.waitForPageIdle();
+      cy.get('#btn-pools').click().then(() => {
+        cy.wait(1000);
       });
     });
 
diff --git a/frontend/mempool-frontend-config.sample.json b/frontend/mempool-frontend-config.sample.json
index 139c55962..0715cb0bd 100644
--- a/frontend/mempool-frontend-config.sample.json
+++ b/frontend/mempool-frontend-config.sample.json
@@ -10,6 +10,7 @@
   "NGINX_PROTOCOL": "http",
   "NGINX_HOSTNAME": "127.0.0.1",
   "NGINX_PORT": "80",
+  "BLOCK_WEIGHT_UNITS": 4000000,
   "MEMPOOL_BLOCKS_AMOUNT": 8,
   "BASE_MODULE": "mempool",
   "MEMPOOL_WEBSITE_URL": "https://mempool.space",
diff --git a/frontend/src/app/interfaces/node-api.interface.ts b/frontend/src/app/interfaces/node-api.interface.ts
index 4b56d4319..6d87f648d 100644
--- a/frontend/src/app/interfaces/node-api.interface.ts
+++ b/frontend/src/app/interfaces/node-api.interface.ts
@@ -72,8 +72,6 @@ export interface PoolsStats {
   pools: SinglePoolStats[];
 }
 
-export interface ITranslators { [language: string]: string; }
-
 export interface MiningStats {
   lastEstimatedHashrate: string,
   blockCount: number,

From 620a7f07187630381254cdcaf678f0dd87a4b1bf Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Fri, 28 Jan 2022 18:49:06 +0900
Subject: [PATCH 42/47] Fix mining pools wrong default timespan value

---
 .../src/app/components/pool-ranking/pool-ranking.component.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
index 1569e8151..b9257cd7f 100644
--- a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
+++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
@@ -39,7 +39,7 @@ export class PoolRankingComponent implements OnInit, OnDestroy {
     private formBuilder: FormBuilder,
     private miningService: MiningService,
   ) {
-    this.poolsWindowPreference = this.storageService.getValue('poolsWindowPreference') ? this.storageService.getValue('poolsWindowPreference') : '24h';
+    this.poolsWindowPreference = this.storageService.getValue('poolsWindowPreference') ? this.storageService.getValue('poolsWindowPreference') : '1w';
     this.radioGroupForm = this.formBuilder.group({ dateSpan: this.poolsWindowPreference });
     this.radioGroupForm.controls.dateSpan.setValue(this.poolsWindowPreference);
   }

From 55652130a801bd23bdf1fb13148c1dd7cb6841c1 Mon Sep 17 00:00:00 2001
From: wiz <j@wiz.biz>
Date: Fri, 28 Jan 2022 13:32:03 +0000
Subject: [PATCH 43/47] Enable nginx warm cache for mining pools API data

---
 production/nginx-cache-warmer      | 30 ++++++++++++++++++++----------
 production/nginx/location-api.conf |  3 +++
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/production/nginx-cache-warmer b/production/nginx-cache-warmer
index b84ece171..39855fac3 100755
--- a/production/nginx-cache-warmer
+++ b/production/nginx-cache-warmer
@@ -1,16 +1,26 @@
 #!/usr/bin/env zsh
 hostname=$(hostname)
 while true
-do for url in	/api/v1/statistics/2h \
-		/api/v1/statistics/24h \
-		/api/v1/statistics/1w \
-		/api/v1/statistics/1m \
-		/api/v1/statistics/3m \
-		/api/v1/statistics/6m \
-		/api/v1/statistics/1y \
-		/api/v1/statistics/2y \
-		/api/v1/statistics/3y \
-		/
+do for url in / \
+	'/api/v1/statistics/2h' \
+	'/api/v1/statistics/24h' \
+	'/api/v1/statistics/1w' \
+	'/api/v1/statistics/1m' \
+	'/api/v1/statistics/3m' \
+	'/api/v1/statistics/6m' \
+	'/api/v1/statistics/1y' \
+	'/api/v1/statistics/2y' \
+	'/api/v1/statistics/3y' \
+	'/api/v1/mining/pools?interval=24h' \
+	'/api/v1/mining/pools?interval=3d' \
+	'/api/v1/mining/pools?interval=1w' \
+	'/api/v1/mining/pools?interval=1m' \
+	'/api/v1/mining/pools?interval=3m' \
+	'/api/v1/mining/pools?interval=6m' \
+	'/api/v1/mining/pools?interval=1y' \
+	'/api/v1/mining/pools?interval=2y' \
+	'/api/v1/mining/pools?interval=3y' \
+
 	do
 		curl -s "https://${hostname}${url}" >/dev/null
 	done
diff --git a/production/nginx/location-api.conf b/production/nginx/location-api.conf
index 67b77a714..376818a82 100644
--- a/production/nginx/location-api.conf
+++ b/production/nginx/location-api.conf
@@ -1,6 +1,9 @@
 location /api/v1/statistics {
 	try_files /dev/null @mempool-api-v1-warmcache;
 }
+location /api/v1/mining/pools {
+	try_files /dev/null @mempool-api-v1-warmcache;
+}
 location /api/v1 {
 	try_files /dev/null @mempool-api-v1-coldcache;
 }

From f8423166368c1683192efed65a5fc01d099a0c24 Mon Sep 17 00:00:00 2001
From: wiz <j@wiz.biz>
Date: Fri, 28 Jan 2022 13:59:04 +0000
Subject: [PATCH 44/47] Let backend set its own HTTP cache time headers for
 APIs

---
 production/nginx/location-api.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/production/nginx/location-api.conf b/production/nginx/location-api.conf
index 376818a82..0a40ddc36 100644
--- a/production/nginx/location-api.conf
+++ b/production/nginx/location-api.conf
@@ -29,7 +29,6 @@ location @mempool-api-v1-warmcache {
 	proxy_cache api;
 	proxy_cache_valid 200 10s;
 	proxy_redirect off;
-	expires 10s;
 }
 
 location @mempool-api-v1-coldcache {

From 19dda17d50f2baed86a8ab3087473d1733f29d47 Mon Sep 17 00:00:00 2001
From: wiz <j@wiz.biz>
Date: Sat, 29 Jan 2022 07:48:58 +0000
Subject: [PATCH 45/47] Add staff contributor/{username}.txt files for CLA bot

---
 contributors/emzy.txt           | 1 +
 contributors/hunicus.txt        | 1 +
 contributors/knorrium.txt       | 1 +
 contributors/miguelmedeiros.txt | 1 +
 contributors/nymkappa.txt       | 1 +
 5 files changed, 5 insertions(+)
 create mode 100644 contributors/emzy.txt
 create mode 100644 contributors/hunicus.txt
 create mode 100644 contributors/knorrium.txt
 create mode 100644 contributors/miguelmedeiros.txt
 create mode 100644 contributors/nymkappa.txt

diff --git a/contributors/emzy.txt b/contributors/emzy.txt
new file mode 100644
index 000000000..7d0a9409e
--- /dev/null
+++ b/contributors/emzy.txt
@@ -0,0 +1 @@
+Mempool Space K.K. has a signed CLA or other agreement on file with @emzy as of January 25, 2022
diff --git a/contributors/hunicus.txt b/contributors/hunicus.txt
new file mode 100644
index 000000000..bf8f3ed15
--- /dev/null
+++ b/contributors/hunicus.txt
@@ -0,0 +1 @@
+Mempool Space K.K. has a signed CLA or other agreement on file with @hunicus as of January 25, 2022
diff --git a/contributors/knorrium.txt b/contributors/knorrium.txt
new file mode 100644
index 000000000..144a966a4
--- /dev/null
+++ b/contributors/knorrium.txt
@@ -0,0 +1 @@
+Mempool Space K.K. has a signed CLA or other agreement on file with @knorrium as of January 25, 2022
diff --git a/contributors/miguelmedeiros.txt b/contributors/miguelmedeiros.txt
new file mode 100644
index 000000000..3a7a2baab
--- /dev/null
+++ b/contributors/miguelmedeiros.txt
@@ -0,0 +1 @@
+Mempool Space K.K. has a signed CLA or other agreement on file with @miguelmedeiros as of January 25, 2022
diff --git a/contributors/nymkappa.txt b/contributors/nymkappa.txt
new file mode 100644
index 000000000..4e86a6f38
--- /dev/null
+++ b/contributors/nymkappa.txt
@@ -0,0 +1 @@
+Mempool Space K.K. has a signed CLA or other agreement on file with @nymkappa as of January 25, 2022

From ae9afe2f81fa59f44dff64061b05abb5b78146ef Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Wed, 2 Feb 2022 18:46:06 +0900
Subject: [PATCH 46/47] Set proper mining pool page title - Rename "Name" to
 "Pool"

---
 .../app/components/pool-ranking/pool-ranking.component.html    | 2 +-
 .../src/app/components/pool-ranking/pool-ranking.component.ts  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.html b/frontend/src/app/components/pool-ranking/pool-ranking.component.html
index f9a1127ba..8deb8597a 100644
--- a/frontend/src/app/components/pool-ranking/pool-ranking.component.html
+++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.html
@@ -48,7 +48,7 @@
       <tr>
         <th class="d-none d-md-block" i18n="mining.rank">Rank</th>
         <th class=""></th>
-        <th class="" i18n="mining.pool-name">Name</th>
+        <th class="" i18n="mining.pool-name">Pool</th>
         <th class="" *ngIf="this.poolsWindowPreference === '24h'" i18n="mining.hashrate">Hashrate</th>
         <th class="" i18n="master-page.blocks">Blocks</th>
         <th class="d-none d-md-block" i18n="mining.empty-blocks">Empty Blocks</th>
diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
index b9257cd7f..27515d503 100644
--- a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
+++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
@@ -4,6 +4,7 @@ import { EChartsOption } from 'echarts';
 import { combineLatest, Observable, of } from 'rxjs';
 import { catchError, map, share, skip, startWith, switchMap, tap } from 'rxjs/operators';
 import { SinglePoolStats } from 'src/app/interfaces/node-api.interface';
+import { SeoService } from 'src/app/services/seo.service';
 import { StorageService } from '../..//services/storage.service';
 import { MiningService, MiningStats } from '../../services/mining.service';
 import { StateService } from '../../services/state.service';
@@ -38,7 +39,9 @@ export class PoolRankingComponent implements OnInit, OnDestroy {
     private storageService: StorageService,
     private formBuilder: FormBuilder,
     private miningService: MiningService,
+    private seoService: SeoService,
   ) {
+    this.seoService.setTitle($localize`:@@mining.mining-pools:Mining Pools`);
     this.poolsWindowPreference = this.storageService.getValue('poolsWindowPreference') ? this.storageService.getValue('poolsWindowPreference') : '1w';
     this.radioGroupForm = this.formBuilder.group({ dateSpan: this.poolsWindowPreference });
     this.radioGroupForm.controls.dateSpan.setValue(this.poolsWindowPreference);

From e48a2f73e4e0009e954bfcca89d65237f836ac4b Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Wed, 2 Feb 2022 19:03:07 +0900
Subject: [PATCH 47/47] Replaced /mining/pools?interval=X by /mining/pools/X

---
 backend/src/index.ts                     | 11 ++++++++++-
 backend/src/routes.ts                    |  4 ++--
 frontend/src/app/services/api.service.ts |  6 +-----
 production/nginx-cache-warmer            | 19 ++++++++++---------
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/backend/src/index.ts b/backend/src/index.ts
index ec7e96162..f78c5922b 100644
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -256,7 +256,16 @@ class Server {
         .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/1y', routes.$getStatisticsByTime.bind(routes, '1y'))
         .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/2y', routes.$getStatisticsByTime.bind(routes, '2y'))
         .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/3y', routes.$getStatisticsByTime.bind(routes, '3y'))
-        .get(config.MEMPOOL.API_URL_PREFIX + 'mining/pools', routes.$getPools)
+        .get(config.MEMPOOL.API_URL_PREFIX + 'mining/pools/24h', routes.$getPools.bind(routes, '24h'))
+        .get(config.MEMPOOL.API_URL_PREFIX + 'mining/pools/3d', routes.$getPools.bind(routes, '3d'))
+        .get(config.MEMPOOL.API_URL_PREFIX + 'mining/pools/1w', routes.$getPools.bind(routes, '1w'))
+        .get(config.MEMPOOL.API_URL_PREFIX + 'mining/pools/1m', routes.$getPools.bind(routes, '1m'))
+        .get(config.MEMPOOL.API_URL_PREFIX + 'mining/pools/3m', routes.$getPools.bind(routes, '3m'))
+        .get(config.MEMPOOL.API_URL_PREFIX + 'mining/pools/6m', routes.$getPools.bind(routes, '6m'))
+        .get(config.MEMPOOL.API_URL_PREFIX + 'mining/pools/1y', routes.$getPools.bind(routes, '1y'))
+        .get(config.MEMPOOL.API_URL_PREFIX + 'mining/pools/2y', routes.$getPools.bind(routes, '2y'))
+        .get(config.MEMPOOL.API_URL_PREFIX + 'mining/pools/3y', routes.$getPools.bind(routes, '3y'))
+        .get(config.MEMPOOL.API_URL_PREFIX + 'mining/pools/all', routes.$getPools.bind(routes, 'all'))
         ;
     }
 
diff --git a/backend/src/routes.ts b/backend/src/routes.ts
index a273fd95d..044f9a3ac 100644
--- a/backend/src/routes.ts
+++ b/backend/src/routes.ts
@@ -532,9 +532,9 @@ class Routes {
     }
   }
 
-  public async $getPools(req: Request, res: Response) {
+  public async $getPools(interval: string, req: Request, res: Response) {
     try {
-      let stats = await miningStats.$getPoolsStats(req.query.interval as string);
+      let stats = await miningStats.$getPoolsStats(interval);
       res.header('Pragma', 'public');
       res.header('Cache-control', 'public');
       res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
diff --git a/frontend/src/app/services/api.service.ts b/frontend/src/app/services/api.service.ts
index 267be7202..03200c64c 100644
--- a/frontend/src/app/services/api.service.ts
+++ b/frontend/src/app/services/api.service.ts
@@ -122,10 +122,6 @@ export class ApiService {
   }
 
   listPools$(interval: string | null) : Observable<PoolsStats> {
-    let params = {};
-    if (interval) {
-      params = new HttpParams().set('interval', interval);
-    }
-    return this.httpClient.get<PoolsStats>(this.apiBaseUrl + this.apiBasePath + '/api/v1/mining/pools', {params});
+    return this.httpClient.get<PoolsStats>(this.apiBaseUrl + this.apiBasePath + `/api/v1/mining/pools/${interval}`);
   }
 }
diff --git a/production/nginx-cache-warmer b/production/nginx-cache-warmer
index 39855fac3..e3ecf6c91 100755
--- a/production/nginx-cache-warmer
+++ b/production/nginx-cache-warmer
@@ -11,15 +11,16 @@ do for url in / \
 	'/api/v1/statistics/1y' \
 	'/api/v1/statistics/2y' \
 	'/api/v1/statistics/3y' \
-	'/api/v1/mining/pools?interval=24h' \
-	'/api/v1/mining/pools?interval=3d' \
-	'/api/v1/mining/pools?interval=1w' \
-	'/api/v1/mining/pools?interval=1m' \
-	'/api/v1/mining/pools?interval=3m' \
-	'/api/v1/mining/pools?interval=6m' \
-	'/api/v1/mining/pools?interval=1y' \
-	'/api/v1/mining/pools?interval=2y' \
-	'/api/v1/mining/pools?interval=3y' \
+	'/api/v1/mining/pools/24h' \
+	'/api/v1/mining/pools/3d' \
+	'/api/v1/mining/pools/1w' \
+	'/api/v1/mining/pools/1m' \
+	'/api/v1/mining/pools/3m' \
+	'/api/v1/mining/pools/6m' \
+	'/api/v1/mining/pools/1y' \
+	'/api/v1/mining/pools/2y' \
+	'/api/v1/mining/pools/3y' \
+	'/api/v1/mining/pools/all' \
 
 	do
 		curl -s "https://${hostname}${url}" >/dev/null