Add changes following request

.github/workflows/ci.yml

@@ -35,7 +35,7 @@ jobs:
       - name: Install ${{ steps.gettoolchain.outputs.toolchain }} Rust toolchain
         # Latest version available on this commit is 1.71.1
         # Commit date is Aug 3, 2023
-        uses: dtolnay/rust-toolchain@a54c7afa936fefeb4456b2dd8068152669aa8203
+        uses: dtolnay/rust-toolchain@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a
         with:
           toolchain: ${{ steps.gettoolchain.outputs.toolchain }}
 

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

@@ -1,12 +1,12 @@
 import config from '../../config';
-import axios, { isAxiosError } from 'axios';
+import axios, { AxiosResponse, isAxiosError } from 'axios';
 import http from 'http';
 import { AbstractBitcoinApi, HealthCheckHost } from './bitcoin-api-abstract-factory';
 import { IEsploraApi } from './esplora-api.interface';
 import logger from '../../logger';
 import { Common } from '../common';
 import { SubmitPackageResult, TestMempoolAcceptResult } from './bitcoin-api.interface';
-import os from 'os';
+
 interface FailoverHost {
   host: string,
   rtts: number[],
@@ -20,13 +20,6 @@ interface FailoverHost {
   preferred?: boolean,
   checked: boolean,
   lastChecked?: number,
-  publicDomain: string,
-  hashes: {
-    frontend?: string,
-    backend?: string,
-    electrs?: string,
-    lastUpdated: number,
-  }
 }
 
 class FailoverRouter {
@@ -36,21 +29,14 @@ class FailoverRouter {
   maxHeight: number = 0;
   hosts: FailoverHost[];
   multihost: boolean;
-  gitHashInterval: number = 600000; // 10 minutes
-  pollInterval: number = 60000; // 1 minute
+  pollInterval: number = 60000;
   pollTimer: NodeJS.Timeout | null = null;
   pollConnection = axios.create();
-  localHostname: string = 'localhost';
   requestConnection = axios.create({
     httpAgent: new http.Agent({ keepAlive: true })
   });
 
   constructor() {
-    try {
-      this.localHostname = os.hostname();
-    } catch (e) {
-      logger.warn('Failed to set local hostname, using "localhost"');
-    }
     // setup list of hosts
     this.hosts = (config.ESPLORA.FALLBACK || []).map(domain => {
       return {
@@ -59,10 +45,6 @@ class FailoverRouter {
         rtts: [],
         rtt: Infinity,
         failures: 0,
-        publicDomain: 'https://' + this.extractPublicDomain(domain),
-        hashes: {
-          lastUpdated: 0,
-        },
       };
     });
     this.activeHost = {
@@ -73,10 +55,6 @@ class FailoverRouter {
       socket: !!config.ESPLORA.UNIX_SOCKET_PATH,
       preferred: true,
       checked: false,
-      publicDomain: `http://${this.localHostname}`,
-      hashes: {
-        lastUpdated: 0,
-      },
     };
     this.fallbackHost = this.activeHost;
     this.hosts.unshift(this.activeHost);
@@ -128,24 +106,6 @@ class FailoverRouter {
             host.outOfSync = false;
           }
           host.unreachable = false;
-
-          // update esplora git hash using the x-powered-by header from the height check
-          const poweredBy = result.headers['x-powered-by'];
-          if (poweredBy) {
-            const match = poweredBy.match(/([a-fA-F0-9]{5,40})/);
-            if (match && match[1]?.length) {
-              host.hashes.electrs = match[1];
-            }
-          }
-
-          // Check front and backend git hashes less often
-          if (Date.now() - host.hashes.lastUpdated > this.gitHashInterval) {
-            await Promise.all([
-              this.$updateFrontendGitHash(host),
-              this.$updateBackendGitHash(host)
-            ]);
-            host.hashes.lastUpdated = Date.now();
-          }
         } else {
           host.outOfSync = true;
           host.unreachable = true;
@@ -242,47 +202,6 @@ class FailoverRouter {
     }
   }
 
-  // methods for retrieving git hashes by host
-  private async $updateFrontendGitHash(host: FailoverHost): Promise<void> {
-    try {
-      const url = `${host.publicDomain}/resources/config.js`;
-      const response = await this.pollConnection.get<string>(url, { timeout: config.ESPLORA.FALLBACK_TIMEOUT });
-      const match = response.data.match(/GIT_COMMIT_HASH\s*=\s*['"](.*?)['"]/);
-      if (match && match[1]?.length) {
-        host.hashes.frontend = match[1];
-      }
-    } catch (e) {
-      // failed to get frontend build hash - do nothing
-    }
-  }
-
-  private async $updateBackendGitHash(host: FailoverHost): Promise<void> {
-    try {
-      const url = `${host.publicDomain}/api/v1/backend-info`;
-      const response = await this.pollConnection.get<any>(url, { timeout: config.ESPLORA.FALLBACK_TIMEOUT });
-      if (response.data?.gitCommit) {
-        host.hashes.backend = response.data.gitCommit;
-      }
-    } catch (e) {
-      // failed to get backend build hash - do nothing
-    }
-  }
-
-  // returns the public mempool domain corresponding to an esplora server url
-  // (a bit of a hack to avoid manually specifying frontend & backend URLs for each esplora server)
-  private extractPublicDomain(url: string): string {
-    // force the url to start with a valid protocol
-    const urlWithProtocol = url.startsWith('http') ? url : `https://${url}`;
-    // parse as URL and extract the hostname
-    try {
-      const parsed = new URL(urlWithProtocol);
-      return parsed.hostname;
-    } catch (e) {
-      // fallback to the original url
-      return url;
-    }
-  }
-
   private async $query<T>(method: 'get'| 'post', path, data: any, responseType = 'json', host = this.activeHost, retry: boolean = true): Promise<T> {
     let axiosConfig;
     let url;
@@ -462,7 +381,6 @@ class ElectrsApi implements AbstractBitcoinApi {
         unreachable: !!host.unreachable,
         checked: !!host.checked,
         lastChecked: host.lastChecked || 0,
-        hashes: host.hashes,
       }));
     } else {
       return [];

backend/src/api/database-migration.ts

@@ -7,7 +7,7 @@ import cpfpRepository from '../repositories/CpfpRepository';
 import { RowDataPacket } from 'mysql2';
 
 class DatabaseMigration {
-  private static currentVersion = 94;
+  private static currentVersion = 93;
   private queryTimeout = 3600_000;
   private statisticsAddedIndexed = false;
   private uniqueLogs: string[] = [];
@@ -801,323 +801,6 @@ class DatabaseMigration {
       `);
       await this.updateToSchemaVersion(93);
     }
-
-    // Unify database schema for all mempool netwoks
-    // versions above 94 should not use network-specific flags
-    if (databaseSchemaVersion < 94) {
-
-      if (!isBitcoin) {
-        // Apply all the bitcoin specific migrations to non-bitcoin networks: liquid, liquidtestnet and testnet4 (!)
-        // Version 5
-        await this.$executeQuery('ALTER TABLE blocks ADD `reward` double unsigned NOT NULL DEFAULT "0"');
-
-        // Version 6
-        await this.$executeQuery('ALTER TABLE blocks MODIFY `height` integer unsigned NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE blocks MODIFY `tx_count` smallint unsigned NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE blocks MODIFY `size` integer unsigned NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE blocks MODIFY `weight` integer unsigned NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE blocks MODIFY `difficulty` double NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE blocks DROP FOREIGN KEY IF EXISTS `blocks_ibfk_1`');
-        await this.$executeQuery('ALTER TABLE pools MODIFY `id` smallint unsigned AUTO_INCREMENT');
-        await this.$executeQuery('ALTER TABLE blocks MODIFY `pool_id` smallint unsigned NULL');
-        await this.$executeQuery('ALTER TABLE blocks ADD FOREIGN KEY (`pool_id`) REFERENCES `pools` (`id`)');
-        await this.$executeQuery('ALTER TABLE blocks ADD `version` integer unsigned NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE blocks ADD `bits` integer unsigned NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE blocks ADD `nonce` bigint unsigned NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE blocks ADD `merkle_root` varchar(65) NOT NULL DEFAULT ""');
-        await this.$executeQuery('ALTER TABLE blocks ADD `previous_block_hash` varchar(65) NULL');
-
-        // Version 7
-        await this.$executeQuery('DROP table IF EXISTS hashrates;');
-        await this.$executeQuery(this.getCreateDailyStatsTableQuery(), await this.$checkIfTableExists('hashrates'));
-
-        // Version 8
-        await this.$executeQuery('ALTER TABLE `hashrates` DROP INDEX `PRIMARY`');
-        await this.$executeQuery('ALTER TABLE `hashrates` ADD `id` int NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST');
-        await this.$executeQuery('ALTER TABLE `hashrates` ADD `share` float NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE `hashrates` ADD `type` enum("daily", "weekly") DEFAULT "daily"');
-
-        // Version 9
-        await this.$executeQuery('ALTER TABLE `state` CHANGE `name` `name` varchar(100)');
-        await this.$executeQuery('ALTER TABLE `hashrates` ADD UNIQUE `hashrate_timestamp_pool_id` (`hashrate_timestamp`, `pool_id`)');
-
-        // Version 10
-        await this.$executeQuery('ALTER TABLE `blocks` ADD INDEX `blockTimestamp` (`blockTimestamp`)');
-
-        // Version 11
-        await this.$executeQuery(`ALTER TABLE blocks
-          ADD avg_fee INT UNSIGNED NULL,
-          ADD avg_fee_rate INT UNSIGNED NULL
-        `);
-        await this.$executeQuery('ALTER TABLE blocks MODIFY `reward` BIGINT UNSIGNED NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE blocks MODIFY `median_fee` INT UNSIGNED NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE blocks MODIFY `fees` INT UNSIGNED NOT NULL DEFAULT "0"');
-
-        // Version 12
-        await this.$executeQuery('ALTER TABLE blocks MODIFY `fees` BIGINT UNSIGNED NOT NULL DEFAULT "0"');
-
-        // Version 13
-        await this.$executeQuery('ALTER TABLE blocks MODIFY `difficulty` DOUBLE UNSIGNED NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE blocks MODIFY `median_fee` BIGINT UNSIGNED NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE blocks MODIFY `avg_fee` BIGINT UNSIGNED NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE blocks MODIFY `avg_fee_rate` BIGINT UNSIGNED NOT NULL DEFAULT "0"');
-
-        // Version 14
-        await this.$executeQuery('ALTER TABLE `hashrates` DROP FOREIGN KEY `hashrates_ibfk_1`');
-        await this.$executeQuery('ALTER TABLE `hashrates` MODIFY `pool_id` SMALLINT UNSIGNED NOT NULL DEFAULT "0"');
-
-        // Version 17
-        await this.$executeQuery('ALTER TABLE `pools` ADD `slug` CHAR(50) NULL');
-
-        // Version 18
-        await this.$executeQuery('ALTER TABLE `blocks` ADD INDEX `hash` (`hash`);');
-
-        // Version 20
-        await this.$executeQuery(this.getCreateBlocksSummariesTableQuery(), await this.$checkIfTableExists('blocks_summaries'));
-
-        // Version 22
-        await this.$executeQuery('DROP TABLE IF EXISTS `difficulty_adjustments`');
-        await this.$executeQuery(this.getCreateDifficultyAdjustmentsTableQuery(), await this.$checkIfTableExists('difficulty_adjustments'));
-
-        // Version 24
-        await this.$executeQuery('DROP TABLE IF EXISTS `blocks_audits`');
-        await this.$executeQuery(this.getCreateBlocksAuditsTableQuery(), await this.$checkIfTableExists('blocks_audits'));
-
-        // Version 25
-        await this.$executeQuery(this.getCreateLightningStatisticsQuery(), await this.$checkIfTableExists('lightning_stats'));
-        await this.$executeQuery(this.getCreateNodesQuery(), await this.$checkIfTableExists('nodes'));
-        await this.$executeQuery(this.getCreateChannelsQuery(), await this.$checkIfTableExists('channels'));
-        await this.$executeQuery(this.getCreateNodesStatsQuery(), await this.$checkIfTableExists('node_stats'));
-
-        // Version 26
-        await this.$executeQuery('ALTER TABLE `lightning_stats` ADD tor_nodes int(11) NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE `lightning_stats` ADD clearnet_nodes int(11) NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE `lightning_stats` ADD unannounced_nodes int(11) NOT NULL DEFAULT "0"');
-
-        // Version 27
-        await this.$executeQuery('ALTER TABLE `lightning_stats` ADD avg_capacity bigint(20) unsigned NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE `lightning_stats` ADD avg_fee_rate int(11) unsigned NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE `lightning_stats` ADD avg_base_fee_mtokens bigint(20) unsigned NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE `lightning_stats` ADD med_capacity bigint(20) unsigned NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE `lightning_stats` ADD med_fee_rate int(11) unsigned NOT NULL DEFAULT "0"');
-        await this.$executeQuery('ALTER TABLE `lightning_stats` ADD med_base_fee_mtokens bigint(20) unsigned NOT NULL DEFAULT "0"');
-
-        // Version 28
-        await this.$executeQuery(`ALTER TABLE lightning_stats MODIFY added DATE`);
-
-        // Version 29
-        await this.$executeQuery(this.getCreateGeoNamesTableQuery(), await this.$checkIfTableExists('geo_names'));
-        await this.$executeQuery('ALTER TABLE `nodes` ADD as_number int(11) unsigned NULL DEFAULT NULL');
-        await this.$executeQuery('ALTER TABLE `nodes` ADD city_id int(11) unsigned NULL DEFAULT NULL');
-        await this.$executeQuery('ALTER TABLE `nodes` ADD country_id int(11) unsigned NULL DEFAULT NULL');
-        await this.$executeQuery('ALTER TABLE `nodes` ADD accuracy_radius int(11) unsigned NULL DEFAULT NULL');
-        await this.$executeQuery('ALTER TABLE `nodes` ADD subdivision_id int(11) unsigned NULL DEFAULT NULL');
-        await this.$executeQuery('ALTER TABLE `nodes` ADD longitude double NULL DEFAULT NULL');
-        await this.$executeQuery('ALTER TABLE `nodes` ADD latitude double NULL DEFAULT NULL');
-
-        // Version 30
-        await this.$executeQuery('ALTER TABLE `geo_names` CHANGE `type` `type` enum("city","country","division","continent","as_organization") NOT NULL');
-
-        // Version 31
-        await this.$executeQuery('ALTER TABLE `prices` ADD `id` int NULL AUTO_INCREMENT UNIQUE');
-        await this.$executeQuery('DROP TABLE IF EXISTS `blocks_prices`');
-        await this.$executeQuery(this.getCreateBlocksPricesTableQuery(), await this.$checkIfTableExists('blocks_prices'));
-
-        // Version 32
-        await this.$executeQuery('ALTER TABLE `blocks_summaries` ADD `template` JSON DEFAULT "[]"');
-
-        // Version 33
-        await this.$executeQuery('ALTER TABLE `geo_names` CHANGE `type` `type` enum("city","country","division","continent","as_organization", "country_iso_code") NOT NULL');
-
-        // Version 34
-        await this.$executeQuery('ALTER TABLE `lightning_stats` ADD clearnet_tor_nodes int(11) NOT NULL DEFAULT "0"');
-    
-        // Version 35
-        await this.$executeQuery('DELETE from `lightning_stats` WHERE added > "2021-09-19"');
-        await this.$executeQuery('ALTER TABLE `lightning_stats` ADD CONSTRAINT added_unique UNIQUE (added);');
-
-        // Version 36
-        await this.$executeQuery('ALTER TABLE `nodes` ADD status TINYINT NOT NULL DEFAULT "1"');
-    
-        // Version 37
-        await this.$executeQuery(this.getCreateLNNodesSocketsTableQuery(), await this.$checkIfTableExists('nodes_sockets'));
-        
-        // Version 38
-        await this.$executeQuery(`TRUNCATE lightning_stats`);
-        await this.$executeQuery(`TRUNCATE node_stats`);
-        await this.$executeQuery('ALTER TABLE `lightning_stats` CHANGE `added` `added` timestamp NULL');
-        await this.$executeQuery('ALTER TABLE `node_stats` CHANGE `added` `added` timestamp NULL');
-        await this.updateToSchemaVersion(38);
-      
-        // Version 39
-        await this.$executeQuery('ALTER TABLE `nodes` ADD alias_search TEXT NULL DEFAULT NULL AFTER `alias`');
-        await this.$executeQuery('ALTER TABLE nodes ADD FULLTEXT(alias_search)');
-
-        // Version 40
-        await this.$executeQuery('ALTER TABLE `nodes` ADD capacity bigint(20) unsigned DEFAULT NULL');
-        await this.$executeQuery('ALTER TABLE `nodes` ADD channels int(11) unsigned DEFAULT NULL');
-        await this.$executeQuery('ALTER TABLE `nodes` ADD INDEX `capacity` (`capacity`);');
-
-        // Version 41
-        await this.$executeQuery('UPDATE channels SET closing_reason = NULL WHERE closing_reason = 1');
-
-        // Version 42
-        await this.$executeQuery('ALTER TABLE `channels` ADD closing_resolved tinyint(1) DEFAULT 0');
-      
-        // Version 43
-        await this.$executeQuery(this.getCreateLNNodeRecordsTableQuery(), await this.$checkIfTableExists('nodes_records'));
-
-        // Version 44
-        await this.$executeQuery('UPDATE blocks_summaries SET template = NULL');
-
-        // Version 45
-        await this.$executeQuery('ALTER TABLE `blocks_audits` ADD fresh_txs JSON DEFAULT "[]"');
-    
-        // Version 48
-        await this.$executeQuery('ALTER TABLE `channels` ADD source_checked tinyint(1) DEFAULT 0');
-        await this.$executeQuery('ALTER TABLE `channels` ADD closing_fee bigint(20) unsigned DEFAULT 0');
-        await this.$executeQuery('ALTER TABLE `channels` ADD node1_funding_balance bigint(20) unsigned DEFAULT 0');
-        await this.$executeQuery('ALTER TABLE `channels` ADD node2_funding_balance bigint(20) unsigned DEFAULT 0');
-        await this.$executeQuery('ALTER TABLE `channels` ADD node1_closing_balance bigint(20) unsigned DEFAULT 0');
-        await this.$executeQuery('ALTER TABLE `channels` ADD node2_closing_balance bigint(20) unsigned DEFAULT 0');
-        await this.$executeQuery('ALTER TABLE `channels` ADD funding_ratio float unsigned DEFAULT NULL');
-        await this.$executeQuery('ALTER TABLE `channels` ADD closed_by varchar(66) DEFAULT NULL');
-        await this.$executeQuery('ALTER TABLE `channels` ADD single_funded tinyint(1) DEFAULT 0');
-        await this.$executeQuery('ALTER TABLE `channels` ADD outputs JSON DEFAULT "[]"');
-
-        // Version 57
-        await this.$executeQuery(`ALTER TABLE nodes MODIFY updated_at datetime NULL`);
-
-        // Version 60
-        await this.$executeQuery('ALTER TABLE `blocks_audits` ADD sigop_txs JSON DEFAULT "[]"');
-
-        // Version 61
-        if (! await this.$checkIfTableExists('blocks_templates')) {
-          await this.$executeQuery('CREATE TABLE blocks_templates AS SELECT id, template FROM blocks_summaries WHERE template != "[]"');
-        }
-        await this.$executeQuery('ALTER TABLE blocks_templates MODIFY template JSON DEFAULT "[]"');
-        await this.$executeQuery('ALTER TABLE blocks_templates ADD PRIMARY KEY (id)');
-        await this.$executeQuery('ALTER TABLE blocks_summaries DROP COLUMN template');
-
-        // Version 62
-        await this.$executeQuery('ALTER TABLE `blocks_audits` ADD expected_fees BIGINT UNSIGNED DEFAULT NULL');
-        await this.$executeQuery('ALTER TABLE `blocks_audits` ADD expected_weight BIGINT UNSIGNED DEFAULT NULL');
-      
-        // Version 63
-        await this.$executeQuery('ALTER TABLE `blocks_audits` ADD fullrbf_txs JSON DEFAULT "[]"');
-    
-        // Version 64
-        await this.$executeQuery('ALTER TABLE `nodes` ADD features text NULL');
-    
-        // Version 65
-        await this.$executeQuery('ALTER TABLE `blocks_audits` ADD accelerated_txs JSON DEFAULT "[]"');
-
-        // Version 67
-        await this.$executeQuery('ALTER TABLE `blocks_summaries` ADD version INT NOT NULL DEFAULT 0');
-        await this.$executeQuery('ALTER TABLE `blocks_summaries` ADD INDEX `version` (`version`)');
-        await this.$executeQuery('ALTER TABLE `blocks_templates` ADD version INT NOT NULL DEFAULT 0');
-        await this.$executeQuery('ALTER TABLE `blocks_templates` ADD INDEX `version` (`version`)');
-
-        // Version 76
-        await this.$executeQuery('ALTER TABLE `blocks_audits` ADD prioritized_txs JSON DEFAULT "[]"');
-
-        // Version 81
-        await this.$executeQuery('ALTER TABLE `blocks_audits` ADD version INT NOT NULL DEFAULT 0');
-        await this.$executeQuery('ALTER TABLE `blocks_audits` ADD INDEX `version` (`version`)');
-        await this.$executeQuery('ALTER TABLE `blocks_audits` ADD unseen_txs JSON DEFAULT "[]"');
-
-        // Version 83
-        await this.$executeQuery('ALTER TABLE `blocks` ADD first_seen datetime(6) DEFAULT NULL');
-
-        // Version 84
-        await this.$executeQuery(`
-          ALTER TABLE \`pools\`
-            ADD INDEX \`slug\` (\`slug\`),
-            ADD INDEX \`unique_id\` (\`unique_id\`)
-        `);
-
-        // Version 85
-        await this.$executeQuery(`
-          ALTER TABLE \`channels\`
-            ADD INDEX \`created\` (\`created\`),
-            ADD INDEX \`capacity\` (\`capacity\`),
-            ADD INDEX \`closing_reason\` (\`closing_reason\`),
-            ADD INDEX \`closing_resolved\` (\`closing_resolved\`)
-        `);
-        
-        // Version 86        
-        await this.$executeQuery(`
-          ALTER TABLE \`nodes\`
-            ADD INDEX \`status\` (\`status\`),
-            ADD INDEX \`channels\` (\`channels\`),
-            ADD INDEX \`country_id\` (\`country_id\`),
-            ADD INDEX \`as_number\` (\`as_number\`),
-            ADD INDEX \`first_seen\` (\`first_seen\`)
-        `);
-
-        // Version 87
-        await this.$executeQuery('ALTER TABLE `nodes_sockets` ADD INDEX `type` (`type`)');
-        await this.updateToSchemaVersion(87);
-        
-        // Version 88
-        await this.$executeQuery('ALTER TABLE `lightning_stats` ADD INDEX `added` (`added`)');
-    
-        // Version 89
-        await this.$executeQuery('ALTER TABLE `geo_names` ADD INDEX `names` (`names`)');
-    
-        // Version 90
-        await this.$executeQuery('ALTER TABLE `hashrates` ADD INDEX `type` (`type`)');
-
-        // Version 91
-        await this.$executeQuery('ALTER TABLE `blocks_audits` ADD INDEX `time` (`time`)');
-      }
-      
-      if (config.MEMPOOL.NETWORK !== 'liquid') {
-        // Apply all the liquid specific migrations to all other networks
-        // Version 68
-        await this.$executeQuery('ALTER TABLE elements_pegs ADD PRIMARY KEY (txid, txindex);');
-        await this.$executeQuery(this.getCreateFederationAddressesTableQuery(), await this.$checkIfTableExists('federation_addresses'));
-        await this.$executeQuery(this.getCreateFederationTxosTableQuery(), await this.$checkIfTableExists('federation_txos'));
-
-        // Version 71
-        await this.$executeQuery('ALTER TABLE `federation_txos` ADD timelock INT NOT NULL DEFAULT 0');
-        await this.$executeQuery('ALTER TABLE `federation_txos` ADD expiredAt INT NOT NULL DEFAULT 0');
-        await this.$executeQuery('ALTER TABLE `federation_txos` ADD emergencyKey TINYINT NOT NULL DEFAULT 0');
-
-        // Version 92
-        await this.$executeQuery(`
-          ALTER TABLE \`elements_pegs\`
-            ADD INDEX \`block\` (\`block\`),
-            ADD INDEX \`datetime\` (\`datetime\`),
-            ADD INDEX \`amount\` (\`amount\`),
-            ADD INDEX \`bitcoinaddress\` (\`bitcoinaddress\`),
-            ADD INDEX \`bitcointxid\` (\`bitcointxid\`)
-        `);
-    
-        // Version 93
-        await this.$executeQuery(`
-          ALTER TABLE \`federation_txos\`
-            ADD INDEX \`unspent\` (\`unspent\`),
-            ADD INDEX \`lastblockupdate\` (\`lastblockupdate\`),
-            ADD INDEX \`blocktime\` (\`blocktime\`),
-            ADD INDEX \`emergencyKey\` (\`emergencyKey\`),
-            ADD INDEX \`expiredAt\` (\`expiredAt\`)
-        `);
-      }
-
-      if (config.MEMPOOL.NETWORK !== 'mainnet') {
-        // Apply all the mainnet specific migrations to all other networks
-        // Version 69
-        await this.$executeQuery(this.getCreateAccelerationsTableQuery(), await this.$checkIfTableExists('accelerations'));
-
-        // Version 70
-        await this.$executeQuery('ALTER TABLE accelerations MODIFY COLUMN added DATETIME;');
-
-        // Version 77
-        await this.$executeQuery('ALTER TABLE `accelerations` ADD requested datetime DEFAULT NULL');
-      }
-      await this.updateToSchemaVersion(94);
-    }
   }
 
   /**

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

@@ -123,7 +123,7 @@ export class AddressGraphComponent implements OnChanges, OnDestroy {
                     } else if (this.conversions && this.conversions['USD']) {
                       price = this.conversions['USD'];
                     }
-                    return { ...item, price: price };
+                    return { ...item, price: price }
                   });
                 }
               }),
@@ -350,7 +350,7 @@ export class AddressGraphComponent implements OnChanges, OnDestroy {
             show: this.showYAxis,
             color: 'rgb(110, 112, 121)',
             formatter: function(val) {
-              return `$${this.amountShortenerPipe.transform(val, 3, undefined, true, true)}`;
+              return `$${this.amountShortenerPipe.transform(val, 0, undefined, true)}`;
             }.bind(this)
           },
           splitLine: {
@@ -418,7 +418,7 @@ export class AddressGraphComponent implements OnChanges, OnDestroy {
 
   onChartClick(e) {
     if (this.hoverData?.length && this.hoverData[0]?.[2]?.txid) {
-      this.zone.run(() => {
+      this.zone.run(() => { 
         const url = this.relativeUrlPipe.transform(`/tx/${this.hoverData[0][2].txid}`);
         if (e.event.event.shiftKey || e.event.event.ctrlKey || e.event.event.metaKey) {
           window.open(url);
@@ -483,7 +483,7 @@ export class AddressGraphComponent implements OnChanges, OnDestroy {
     // Add a point at today's date to make the graph end at the current time
     extendedSummary.unshift({ time: Date.now() / 1000, value: 0 });
     extendedSummary.reverse();
-
+    
     let oneHour = 60 * 60;
     // Fill gaps longer than interval
     for (let i = 0; i < extendedSummary.length - 1; i++) {
@@ -496,7 +496,7 @@ export class AddressGraphComponent implements OnChanges, OnDestroy {
         i += hours - 1;
       }
     }
-
+  
     return extendedSummary.reverse();
   }
 }

frontend/src/app/components/push-transaction/push-transaction.component.scss

@@ -1,34 +0,0 @@
-.accept-results {
-  td, th {
-    &.allowed {
-      width: 10%;
-      text-align: center;
-    }
-    &.txid {
-      width: 50%;
-    }
-    &.rate {
-      width: 20%;
-      text-align: right;
-      white-space: wrap;
-    }
-    &.reason {
-      width: 20%;
-      text-align: right;
-      white-space: wrap;
-    }
-  }
-
-  @media (max-width: 950px) {
-    table-layout: auto;
-
-    td, th {
-      &.allowed {
-        width: 100px;
-      }
-      &.txid {
-        max-width: 200px;
-      }
-    }
-  }
-}

frontend/src/app/components/server-health/server-health.component.html

@@ -19,9 +19,6 @@
             <th class="rtt only-small">RTT</th>
             <th class="rtt only-large">RTT</th>
             <th class="height">Height</th>
-            <th class="frontend only-large">Front</th>
-            <th class="backend only-large">Back</th>
-            <th class="electrs only-large">Electrs</th>
           </tr>
           <tr *ngFor="let host of hosts; let i = index; trackBy: trackByFn">
             <td class="rank">{{ i + 1 }}</td>
@@ -31,15 +28,6 @@
             <td class="rtt only-small">{{ (host.rtt / 1000) | number : '1.1-1' }} {{ host.rtt == null ? '' : 's'}} {{ !host.checked ? '⏳' : (host.unreachable ? '🔥' : '✅') }}</td>
             <td class="rtt only-large">{{ host.rtt | number : '1.0-0' }} {{ host.rtt == null ? '' : 'ms'}} {{ !host.checked ? '⏳' : (host.unreachable ? '🔥' : '✅') }}</td>
             <td class="height">{{ host.latestHeight }} {{ !host.checked ? '⏳' : (host.outOfSync ? '🚫' : (host.latestHeight && host.latestHeight < maxHeight ? '🟧' : '✅')) }}</td>
-            <ng-container *ngFor="let type of ['frontend', 'backend', 'electrs']">
-              <td class="{{type}} only-large" [style.background-color]="host.hashes?.[type] ? '#' + host.hashes[type].slice(0, 6) : ''">
-                @if (host.hashes?.[type]) {
-                  <a [style.color]="'white'" href="https://github.com/mempool/{{type === 'electrs' ? 'electrs' : 'mempool'}}/commit/{{ host.hashes[type] }}" target="_blank">{{ host.hashes[type].slice(0, 8) || '?' }}</a>
-                } @else {
-                  <span>?</span>
-                }
-              </td>
-            </ng-container>
           </tr>
         </tbody>
       </table>

frontend/src/app/components/server-health/server-health.component.scss

@@ -9,7 +9,7 @@
   }
 
   .status-panel {
-    max-width: 1000px;
+    max-width: 720px;
     margin: auto;
     padding: 1em;
     background: var(--box-bg);

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

@@ -130,6 +130,16 @@
             <p>The mempool Blocks 3 | 2 Logo</p>
             <br><br>
 
+            <img src="/resources/memepool-logo.png" style="width: 500px; max-width: 80%">
+            <br><br>
+            <p>The memepool Logo</p>
+            <br><br>
+
+            <img src="/resources/mempoo-logo.png" style="width: 500px; max-width: 80%">
+            <br><br>
+            <p>The mempoo Logo</p>
+            <br><br>
+
           </div>
 
           <br>

frontend/src/app/interfaces/websocket.interface.ts

@@ -144,9 +144,4 @@ export interface HealthCheckHost {
   link?: string;
   statusPage?: SafeResourceUrl;
   flag?: string;
-  hashes?: {
-    frontend?: string;
-    backend?: string;
-    electrs?: string;
-  }
 }

frontend/src/app/liquid/liquid-master-page.module.ts

@@ -142,12 +142,12 @@ const routes: Routes = [
 
 if (window['__env']?.OFFICIAL_MEMPOOL_SPACE) {
   routes[0].children.push({
-    path: 'monitoring',
+    path: 'nodes',
     data: { networks: ['bitcoin', 'liquid'] },
     component: ServerHealthComponent
   });
   routes[0].children.push({
-    path: 'nodes',
+    path: 'network',
     data: { networks: ['bitcoin', 'liquid'] },
     component: ServerStatusComponent
   });

frontend/src/app/shared/pipes/amount-shortener.pipe.ts

@@ -8,12 +8,8 @@ export class AmountShortenerPipe implements PipeTransform {
     const digits = args[0] ?? 1;
     const unit = args[1] || undefined;
     const isMoney = args[2] || false;
-    const sigfigs = args[3] || false; // if true, "digits" is the number of significant digits, not the number of decimal places
 
     if (num < 1000) {
-      if (sigfigs) {
-        return Number(num.toPrecision(digits));
-      }
       return num.toFixed(digits);
     }
 
@@ -29,15 +25,10 @@ export class AmountShortenerPipe implements PipeTransform {
     const rx = /\.0+$|(\.[0-9]*[1-9])0+$/;
     const item = lookup.slice().reverse().find((item) => num >= item.value);
 
-    if (!item) {
-      return '0';
+    if (unit !== undefined) {
+      return item ? (num / item.value).toFixed(digits).replace(rx, '$1') + ' ' + item.symbol + unit : '0';
+    } else {
+      return item ? (num / item.value).toFixed(digits).replace(rx, '$1') + item.symbol : '0';
     }
-
-    const scaledNum = num / item.value;
-    const formattedNum = Number(sigfigs ? scaledNum.toPrecision(digits) : scaledNum.toFixed(digits)).toString();
-
-    return unit !== undefined
-      ? formattedNum + ' ' + item.symbol + unit
-      : formattedNum + item.symbol;
   }
 }

production/mempool-start-all

@@ -5,7 +5,6 @@ nvm use v20.12.0
 
 # start all mempool backends that exist
 for site in mainnet mainnet-lightning testnet testnet-lightning testnet4 signet signet-lightning liquid liquidtestnet;do
-    [ ! -e "${HOME}/${site}/backend/" ] && continue
     cd "${HOME}/${site}/backend/" && \
     echo "starting mempool backend: ${site}" && \
     screen -dmS "${site}" sh -c 'while true;do npm run start-production;sleep 1;done'

unfurler/src/index.ts

@@ -30,7 +30,6 @@ class Server {
   secureHost = true;
   secureMempoolHost = true;
   canonicalHost: string;
-  networkName: string;
 
   seoQueueLength: number = 0;
   unfurlQueueLength: number = 0;
@@ -42,7 +41,6 @@ class Server {
     this.secureHost = config.SERVER.HOST.startsWith('https');
     this.secureMempoolHost = config.MEMPOOL.HTTP_HOST.startsWith('https');
     this.network = config.MEMPOOL.NETWORK || 'bitcoin';
-    this.networkName = networks[this.network].networkName || capitalize(this.network);
 
     let canonical;
     switch(config.MEMPOOL.NETWORK) {
@@ -341,7 +339,7 @@ class Server {
 
     if (matchedRoute.render) {
       ogImageUrl = `${config.SERVER.HOST}/render/${lang || 'en'}/preview${path}`;
-      ogTitle = `${this.networkName} ${matchedRoute.networkMode !== 'mainnet' ? capitalize(matchedRoute.networkMode) + ' ' : ''}${matchedRoute.title}`;
+      ogTitle = `${this.network ? capitalize(this.network) + ' ' : ''}${matchedRoute.networkMode !== 'mainnet' ? capitalize(matchedRoute.networkMode) + ' ' : ''}${matchedRoute.title}`;
     } else {
       ogTitle = networks[this.network].title;
     }
@@ -396,7 +394,7 @@ class Server {
 
     if (matchedRoute.render) {
       ogImageUrl = `${config.SERVER.HOST}/render/${lang || 'en'}/preview${path}`;
-      ogTitle = `${this.networkName} ${matchedRoute.networkMode !== 'mainnet' ? capitalize(matchedRoute.networkMode) + ' ' : ''}${matchedRoute.title}`;
+      ogTitle = `${this.network ? capitalize(this.network) + ' ' : ''}${matchedRoute.networkMode !== 'mainnet' ? capitalize(matchedRoute.networkMode) + ' ' : ''}${matchedRoute.title}`;
     }
 
     if (matchedRoute.sip) {

unfurler/src/routes.ts

@@ -270,7 +270,6 @@ export const networks = {
     routes: {} // no routes supported
   },
   onbtc: {
-    networkName: 'ONBTC',
     title: 'National Bitcoin Office of El Salvador',
     description: 'The National Bitcoin Office (ONBTC) of El Salvador under President @nayibbukele',
     fallbackImg: '/resources/onbtc/onbtc-preview.jpg',
@@ -291,7 +290,6 @@ export const networks = {
     }
   },
   bitb: {
-    networkName: 'BITB',
     title: 'BITB | Bitwise Bitcoin ETF',
     description: 'BITB provides low-cost access to bitcoin through a professionally managed fund',
     fallbackImg: '/resources/bitb/bitb-preview.jpg',
@@ -313,7 +311,6 @@ export const networks = {
     }
   },
   meta: {
-    networkName: 'Metaplanet',
     title: 'Metaplanet Inc.',
     description: 'Secure the Future with Bitcoin',
     fallbackImg: '/resources/meta/meta-preview.png',