Bump dtolnay/rust-toolchain

Bumps [dtolnay/rust-toolchain](https://github.com/dtolnay/rust-toolchain) from d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a to a54c7afa936fefeb4456b2dd8068152669aa8203.
- [Release notes](https://github.com/dtolnay/rust-toolchain/releases)
- [Commits](d8352f6b1d...a54c7afa93)

---
updated-dependencies:
- dependency-name: dtolnay/rust-toolchain
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

.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@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a
+        uses: dtolnay/rust-toolchain@a54c7afa936fefeb4456b2dd8068152669aa8203
         with:
           toolchain: ${{ steps.gettoolchain.outputs.toolchain }}
 

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

@@ -1,12 +1,12 @@
 import config from '../../config';
-import axios, { AxiosResponse, isAxiosError } from 'axios';
+import axios, { 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,6 +20,13 @@ interface FailoverHost {
   preferred?: boolean,
   checked: boolean,
   lastChecked?: number,
+  publicDomain: string,
+  hashes: {
+    frontend?: string,
+    backend?: string,
+    electrs?: string,
+    lastUpdated: number,
+  }
 }
 
 class FailoverRouter {
@@ -29,14 +36,21 @@ class FailoverRouter {
   maxHeight: number = 0;
   hosts: FailoverHost[];
   multihost: boolean;
-  pollInterval: number = 60000;
+  gitHashInterval: number = 600000; // 10 minutes
+  pollInterval: number = 60000; // 1 minute
   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 {
@@ -45,6 +59,10 @@ class FailoverRouter {
         rtts: [],
         rtt: Infinity,
         failures: 0,
+        publicDomain: 'https://' + this.extractPublicDomain(domain),
+        hashes: {
+          lastUpdated: 0,
+        },
       };
     });
     this.activeHost = {
@@ -55,6 +73,10 @@ 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);
@@ -106,6 +128,24 @@ 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;
@@ -202,6 +242,47 @@ 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;
@@ -381,6 +462,7 @@ 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 = 93;
+  private static currentVersion = 94;
   private queryTimeout = 3600_000;
   private statisticsAddedIndexed = false;
   private uniqueLogs: string[] = [];
@@ -801,6 +801,323 @@ 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);
+    }
   }
 
   /**

backend/src/api/prices/prices.routes.ts

@@ -1,10 +1,15 @@
 import { Application, Request, Response } from 'express';
 import config from '../../config';
 import pricesUpdater from '../../tasks/price-updater';
+import logger from '../../logger';
+import PricesRepository from '../../repositories/PricesRepository';
 
 class PricesRoutes {
   public initRoutes(app: Application): void {
-    app.get(config.MEMPOOL.API_URL_PREFIX + 'prices', this.$getCurrentPrices.bind(this));
+    app
+      .get(config.MEMPOOL.API_URL_PREFIX + 'prices', this.$getCurrentPrices.bind(this))
+      .get(config.MEMPOOL.API_URL_PREFIX + 'internal/usd-price-history', this.$getAllPrices.bind(this))
+    ;
   }
 
   private $getCurrentPrices(req: Request, res: Response): void {
@@ -14,6 +19,23 @@ class PricesRoutes {
 
     res.json(pricesUpdater.getLatestPrices());
   }
+
+  private async $getAllPrices(req: Request, res: Response): Promise<void> {
+    res.header('Pragma', 'public');
+    res.header('Cache-control', 'public');
+    res.setHeader('Expires', new Date(Date.now() + 360_0000 / config.MEMPOOL.PRICE_UPDATES_PER_HOUR).toUTCString());
+
+    try {
+      const usdPriceHistory = await PricesRepository.$getPricesTimesAndId();
+      const responseData = usdPriceHistory.map(p => {
+        return { time: p.time, USD: p.USD };
+      });
+      res.status(200).json(responseData);
+    } catch (e: any) {
+      logger.err(`Exception ${e} in PricesRoutes::$getAllPrices. Code: ${e.code}. Message: ${e.message}`);
+      res.status(403).send();
+    }
+  }
 }
 
 export default new PricesRoutes();

frontend/src/app/components/acceleration-timeline/acceleration-timeline.component.html

@@ -1,6 +1,6 @@
 <div class="acceleration-timeline box" [class.lower-padding]="!tx.status.confirmed">
   <div class="timeline-wrapper">
-    @if (!tx.status.confirmed) {
+    @if (!tx.status.confirmed || canceled) {
     <div class="timeline">
       <div class="intervals">
         <div class="node-spacer"></div>
@@ -8,7 +8,7 @@
         <div class="node-spacer"></div>
         <div class="interval">
           <div class="interval-time">
-            @if (eta) {
+            @if (eta && !canceled) {
               ~<app-time [time]="eta?.wait / 1000"></app-time>
               }
           </div>
@@ -19,16 +19,20 @@
         <div class="node-spacer"></div>
         <div class="interval-spacer"></div>
         <div class="node">
-          <div class="acc-to-confirmed right go-faster"></div>
+          <div class="acc-to-confirmed right go-faster" [class.no-animation]="canceled"></div>
         </div>
         <div class="interval-spacer">
         </div>
         <div class="node" [id]="'confirmed'">
-          <div class="acc-to-confirmed left go-faster"></div>
+          <div class="acc-to-confirmed left go-faster" [class.no-animation]="canceled"></div>
           <div class="shape-border waiting">
             <div class="shape"></div>
           </div>
-          <div class="status"><span class="badge badge-waiting" i18n="transaction.rbf.mined">Mined</span></div>
+          @if (canceled) {
+          <div class="status"><span class="badge badge-danger" i18n="accelerator.canceled">Canceled</span></div>
+          } @else {
+            <div class="status"><span class="badge badge-waiting" i18n="transaction.rbf.mined">Mined</span></div>
+          }
         </div>
       </div>
     </div>
@@ -45,9 +49,9 @@
         <div class="interval">
           <div class="interval-time">
             @if (tx.status.confirmed) {
-              <div class="interval-time">
-                <app-time [time]="acceleratedToMined"></app-time>
-              </div>
+              <app-time [time]="acceleratedToMined"></app-time>
+            } @else if (eta && canceled) {
+              ~<app-time [time]="eta?.wait / 1000"></app-time>
             }
           </div>
         </div>
@@ -71,42 +75,42 @@
         <div class="interval-spacer">
           <div class="seen-to-acc"></div>
         </div>
-        <div class="node" [class.accelerated]="!tx.status.confirmed" [id]="'accelerated'">
+        <div class="node" [class.accelerated]="!tx.status.confirmed && !canceled" [id]="'accelerated'">
           <div class="seen-to-acc left"></div>
-          @if (tx.status.confirmed) {
+          @if (tx.status.confirmed && !canceled) {
             <div class="acc-to-confirmed right"></div>
           } @else {
           <div class="seen-to-acc right"></div>
           }
           <div  class="shape-border hovering" (pointerover)="onHover($event, 'accelerated');" (pointerout)="onBlur($event);">
             <div class="shape"></div>
-            @if (!tx.status.confirmed) {
-            <div class="connector down loading"></div>
+            @if (!tx.status.confirmed || canceled) {
+            <div class="connector down" [class.loading]="!canceled"></div>
             }
           </div>
-          @if (tx.status.confirmed) {
+          @if (tx.status.confirmed && !canceled) {
             <div class="status"><span class="badge badge-accelerated" i18n="transaction.audit.accelerated">Accelerated</span></div>
           }
-          <div class="time" [class.no-margin]="!tx.status.confirmed" [class.offset-left]="!tx.status.confirmed">
+          <div class="time" [class.no-margin]="!tx.status.confirmed || canceled" [class.offset-left]="!tx.status.confirmed || canceled">
             @if (!tx.status.confirmed) {
             <span i18n="transaction.audit.accelerated">Accelerated</span>{{ "" }} 
             }
             @if (useAbsoluteTime) {
             <span>{{ acceleratedAt * 1000 | date }}</span>
             } @else {
-            <app-time kind="since" [time]="acceleratedAt" [lowercaseStart]="!tx.status.confirmed"></app-time>
+            <app-time kind="since" [time]="acceleratedAt" [lowercaseStart]="!tx.status.confirmed || canceled"></app-time>
             }
           </div>
         </div>
         <div class="interval-spacer">
-          @if (tx.status.confirmed) {
+          @if (tx.status.confirmed && !canceled) {
           <div class="acc-to-confirmed"></div>
           } @else {
           <div class="seen-to-acc"></div>
           }
         </div>
         <div class="node" [class.selected]="tx.status.confirmed" [id]="'confirmed'">
-          @if (tx.status.confirmed) {
+          @if (tx.status.confirmed && !canceled) {
           <div class="acc-to-confirmed left"></div>
           } @else {
           <div class="seen-to-acc left"></div>

frontend/src/app/components/acceleration-timeline/acceleration-timeline.component.scss

@@ -129,6 +129,9 @@
           margin-left: calc(-4em + 5px);
           animation: goFasterLeft 0.8s infinite linear;
         }
+        &.no-animation {
+          animation: none;
+        }
       }
 
       &.left {

frontend/src/app/components/acceleration-timeline/acceleration-timeline.component.ts

@@ -15,6 +15,7 @@ export class AccelerationTimelineComponent implements OnInit, OnChanges {
   @Input() tx: Transaction;
   @Input() accelerationInfo: Acceleration;
   @Input() eta: ETA;
+  @Input() canceled: boolean;
 
   now: number;
   accelerateRatio: number;

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

@@ -44,14 +44,18 @@ export class AddressGraphComponent implements OnChanges, OnDestroy {
   @Input() right: number | string = 10;
   @Input() left: number | string = 70;
   @Input() widget: boolean = false;
+  @Input() defaultFiat: boolean = false;
+  @Input() showLegend: boolean = true;
+  @Input() showYAxis: boolean = true;
 
+  adjustedLeft: number;
+  adjustedRight: number;
   data: any[] = [];
   fiatData: any[] = [];
   hoverData: any[] = [];
   conversions: any;
   allowZoom: boolean = false;
-  initialRight = this.right;
-  initialLeft = this.left;
+
   selected = { [$localize`:@@7e69426bd97a606d8ae6026762858e6e7c86a1fd:Balance`]: true, 'Fiat': false };
 
   subscription: Subscription;
@@ -84,6 +88,9 @@ export class AddressGraphComponent implements OnChanges, OnDestroy {
     if (!this.addressSummary$ && (!this.address || !this.stats)) {
       return;
     }
+    if (changes.defaultFiat) {
+      this.selected['Fiat'] = !!this.defaultFiat;
+    }
     if (changes.address || changes.isPubkey || changes.addressSummary$ || changes.stats) {
       if (this.subscription) {
         this.subscription.unsubscribe();
@@ -116,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 };
                   });
                 }
               }),
@@ -145,7 +152,7 @@ export class AddressGraphComponent implements OnChanges, OnDestroy {
     if (!summary) {
       return;
     }
-    
+
     const total = this.stats ? (this.stats.funded_txo_sum - this.stats.spent_txo_sum) : summary.reduce((acc, tx) => acc + tx.value, 0);
     let runningTotal = total;
     const processData = summary.map(d => {
@@ -159,7 +166,7 @@ export class AddressGraphComponent implements OnChanges, OnDestroy {
             d
         };
     }).reverse();
-    
+
     this.data = processData.filter(({ d }) => d.txid !== undefined).map(({ time, balance, d }) => [time, balance, d]);
     this.fiatData = processData.map(({ time, fiatBalance, balance, d }) => [time, fiatBalance, d, balance]);
 
@@ -177,6 +184,9 @@ export class AddressGraphComponent implements OnChanges, OnDestroy {
     const maxValue = this.data.reduce((acc, d) => Math.max(acc, Math.abs(d[1] ?? d.value[1])), 0);
     const minValue = this.data.reduce((acc, d) => Math.min(acc, Math.abs(d[1] ?? d.value[1])), maxValue);
 
+    this.adjustedRight = this.selected['Fiat'] ? +this.right + 40 : +this.right;
+    this.adjustedLeft = this.selected[$localize`:@@7e69426bd97a606d8ae6026762858e6e7c86a1fd:Balance`] ? +this.left : +this.left - 40;
+
     this.chartOptions = {
       color: [
         new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -192,10 +202,10 @@ export class AddressGraphComponent implements OnChanges, OnDestroy {
       grid: {
         top: 20,
         bottom: this.allowZoom ? 65 : 20,
-        right: this.right,
-        left: this.left,
+        right: this.adjustedRight,
+        left: this.adjustedLeft,
       },
-      legend: !this.stateService.isAnyTestnet() ? {
+      legend: (this.showLegend && !this.stateService.isAnyTestnet()) ? {
         data: [
           {
             name: $localize`:@@7e69426bd97a606d8ae6026762858e6e7c86a1fd:Balance`,
@@ -244,7 +254,7 @@ export class AddressGraphComponent implements OnChanges, OnDestroy {
 
           const hasTx = data[0].data[2].txid;
           const date = new Date(data[0].data[0]).toLocaleTimeString(this.locale, { year: 'numeric', month: 'short', day: 'numeric' });
-          
+
           tooltip += `<div>
             <div style="text-align: right;">
             <div><b>${date}</b></div>`;
@@ -255,10 +265,10 @@ export class AddressGraphComponent implements OnChanges, OnDestroy {
             : `${data.length} transactions`;
             tooltip += `<div><b>${header}</b></div>`;
           }
-          
+
           const formatBTC = (val, decimal) => (val / 100_000_000).toFixed(decimal);
           const formatFiat = (val) => this.fiatCurrencyPipe.transform(val, null, 'USD');
-          
+
           const btcVal = btcData.reduce((total, d) => total + d.data[2].value, 0);
           const fiatVal = fiatData.reduce((total, d) => total + d.data[2].value * d.data[2].price / 100_000_000, 0);
           const btcColor = btcVal === 0 ? '' : (btcVal > 0 ? 'var(--green)' : 'var(--red)');
@@ -306,6 +316,7 @@ export class AddressGraphComponent implements OnChanges, OnDestroy {
           type: 'value',
           position: 'left',
           axisLabel: {
+            show: this.showYAxis,
             color: 'rgb(110, 112, 121)',
             formatter: (val): string => {
               let valSpan = maxValue - (this.period === 'all' ? 0 : minValue);
@@ -336,9 +347,10 @@ export class AddressGraphComponent implements OnChanges, OnDestroy {
         {
           type: 'value',
           axisLabel: {
+            show: this.showYAxis,
             color: 'rgb(110, 112, 121)',
             formatter: function(val) {
-              return `$${this.amountShortenerPipe.transform(val, 0, undefined, true)}`;
+              return `$${this.amountShortenerPipe.transform(val, 3, undefined, true, true)}`;
             }.bind(this)
           },
           splitLine: {
@@ -392,8 +404,8 @@ export class AddressGraphComponent implements OnChanges, OnDestroy {
         type: 'slider',
         brushSelect: false,
         realtime: true,
-        left: this.left,
-        right: this.right,
+        left: this.adjustedLeft,
+        right: this.adjustedRight,
         selectedDataBackground: {
           lineStyle: {
             color: '#fff',
@@ -406,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);
@@ -423,26 +435,26 @@ export class AddressGraphComponent implements OnChanges, OnDestroy {
 
   onLegendSelectChanged(e) {
     this.selected = e.selected;
-    this.right = this.selected['Fiat'] ? +this.initialRight + 40 : this.initialRight;
-    this.left = this.selected[$localize`:@@7e69426bd97a606d8ae6026762858e6e7c86a1fd:Balance`] ? this.initialLeft : +this.initialLeft - 40;
+    this.adjustedRight = this.selected['Fiat'] ? +this.right + 40 : +this.right;
+    this.adjustedLeft = this.selected[$localize`:@@7e69426bd97a606d8ae6026762858e6e7c86a1fd:Balance`] ? +this.left : +this.left - 40;
 
     this.chartOptions = {
       grid: {
-        right: this.right,
-        left: this.left,
+        right: this.adjustedRight,
+        left: this.adjustedLeft,
       },
       legend: {
         selected: this.selected,
       },
       dataZoom: this.allowZoom ? [{
-        left: this.left,
-        right: this.right,
+        left: this.adjustedLeft,
+        right: this.adjustedRight,
       }, {
-        left: this.left,
-        right: this.right,
+        left: this.adjustedLeft,
+        right: this.adjustedRight,
       }] : undefined
     };
-    
+
     if (this.chartInstance) {
       this.chartInstance.setOption(this.chartOptions);
     }
@@ -471,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++) {
@@ -484,7 +496,7 @@ export class AddressGraphComponent implements OnChanges, OnDestroy {
         i += hours - 1;
       }
     }
-  
+
     return extendedSummary.reverse();
   }
 }

frontend/src/app/components/custom-dashboard/custom-dashboard.component.html

@@ -238,7 +238,7 @@
                   <span>&nbsp;</span>
                   <fa-icon [icon]="['fas', 'external-link-alt']" [fixedWidth]="true" style="vertical-align: text-top; font-size: 13px; color: var(--title-fg)"></fa-icon>
                 </a>
-                <app-address-graph [address]="widget.props.address" [addressSummary$]="addressSummary$" [period]="widget.props.period || 'all'" [stats]="address ? address.chain_stats : null" [widget]="true" [height]="graphHeight"></app-address-graph>
+                <app-address-graph [address]="widget.props.address" [addressSummary$]="addressSummary$" [period]="widget.props.period || 'all'" [stats]="address ? address.chain_stats : null" [widget]="true" [defaultFiat]="true" [height]="graphHeight"></app-address-graph>
               </div>
             </div>
           </div>

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

@@ -0,0 +1,34 @@
+.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,6 +19,9 @@
             <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>
@@ -28,6 +31,15 @@
             <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: 720px;
+    max-width: 1000px;
     margin: auto;
     padding: 1em;
     background: var(--box-bg);

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

@@ -247,7 +247,7 @@
 
 <ng-template #effectiveRateRow>
   @if (!isLoadingTx) {
-    @if ((cpfpInfo && hasEffectiveFeeRate) || accelerationInfo) {
+    @if ((cpfpInfo && hasEffectiveFeeRate) || (accelerationInfo && isAcceleration)) {
       <tr>
         @if (isAcceleration) {
           <td i18n="transaction.accelerated-fee-rate|Accelerated transaction fee rate">Accelerated fee rate</td>

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

@@ -165,12 +165,12 @@
       <br>
     </ng-container>
 
-    <ng-container *ngIf="transactionTime > 0 && tx.acceleratedAt > 0 && isAcceleration">
+    <ng-container *ngIf="transactionTime > 0 && tx.acceleratedAt > 0 && (isAcceleration || accelerationCanceled)">
       <div class="title float-left">
         <h2 id="acceleration-timeline" i18n="transaction.acceleration-timeline|Acceleration Timeline">Acceleration Timeline</h2>
       </div>
       <div class="clearfix"></div>
-      <app-acceleration-timeline [transactionTime]="transactionTime" [acceleratedAt]="tx.acceleratedAt" [tx]="tx" [accelerationInfo]="accelerationInfo" [eta]="(ETA$ | async)"></app-acceleration-timeline>
+      <app-acceleration-timeline [transactionTime]="transactionTime" [acceleratedAt]="tx.acceleratedAt" [tx]="tx" [accelerationInfo]="accelerationInfo" [eta]="(ETA$ | async)" [canceled]="accelerationCanceled"></app-acceleration-timeline>
       <br>
     </ng-container>
 

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

@@ -107,6 +107,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
   pool: Pool | null;
   auditStatus: TxAuditStatus | null;
   isAcceleration: boolean = false;
+  accelerationCanceled: boolean = false;
   filters: Filter[] = [];
   showCpfpDetails = false;
   miningStats: MiningStats;
@@ -360,16 +361,17 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
     ).subscribe((accelerationHistory) => {
       for (const acceleration of accelerationHistory) {
         if (acceleration.txid === this.txId) {
-          if (acceleration.status === 'completed' || acceleration.status === 'completed_provisional') {
-            if (acceleration.pools.includes(acceleration.minedByPoolUniqueId)) {
-              const boostCost = acceleration.boostCost || acceleration.bidBoost;
-              acceleration.acceleratedFeeRate = Math.max(acceleration.effectiveFee, acceleration.effectiveFee + boostCost) / acceleration.effectiveVsize;
-              acceleration.boost = boostCost;
-              this.tx.acceleratedAt = acceleration.added;
-              this.accelerationInfo = acceleration;  
-            } else {
-              this.tx.feeDelta = undefined;
-            }
+          if ((acceleration.status === 'completed' || acceleration.status === 'completed_provisional') && acceleration.pools.includes(acceleration.minedByPoolUniqueId)) {
+            const boostCost = acceleration.boostCost || acceleration.bidBoost;
+            acceleration.acceleratedFeeRate = Math.max(acceleration.effectiveFee, acceleration.effectiveFee + boostCost) / acceleration.effectiveVsize;
+            acceleration.boost = boostCost;
+            this.tx.acceleratedAt = acceleration.added;
+            this.accelerationInfo = acceleration;  
+          }
+          if (acceleration.status === 'failed' || acceleration.status === 'failed_provisional') {
+            this.accelerationCanceled = true;
+            this.tx.acceleratedAt = acceleration.added;
+            this.accelerationInfo = acceleration;
           }
           this.waitingForAccelerationInfo = false;
           this.setIsAccelerated();
@@ -878,9 +880,13 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
       this.tx.acceleratedBy = cpfpInfo.acceleratedBy;
       this.tx.acceleratedAt = cpfpInfo.acceleratedAt;
       this.tx.feeDelta = cpfpInfo.feeDelta;
+      this.accelerationCanceled = false;
       this.setIsAccelerated(firstCpfp);
-    } else if (this.tx.acceleration) { // Acceleration was cancelled while on the tx page, reset acceleration state
-      this.tx.acceleration = false;
+    } else if (cpfpInfo.acceleratedAt) { // Acceleration was cancelled: reset acceleration state
+      this.tx.acceleratedBy = cpfpInfo.acceleratedBy;
+      this.tx.acceleratedAt = cpfpInfo.acceleratedAt;
+      this.tx.feeDelta = cpfpInfo.feeDelta;
+      this.accelerationCanceled = true;
       this.setIsAccelerated(firstCpfp);
     }
     
@@ -904,7 +910,12 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   setIsAccelerated(initialState: boolean = false) {
-    this.isAcceleration = ((this.tx.acceleration && (!this.tx.status.confirmed || this.waitingForAccelerationInfo)) || (this.accelerationInfo && this.pool && this.accelerationInfo.pools.some(pool => (pool === this.pool.id))));
+    this.isAcceleration = 
+      (
+        (this.tx.acceleration && (!this.tx.status.confirmed || this.waitingForAccelerationInfo)) || 
+        (this.accelerationInfo && this.pool && this.accelerationInfo.pools.some(pool => (pool === this.pool.id)))
+      ) && 
+      !this.accelerationCanceled;
     if (this.isAcceleration) {
       if (initialState) {
         this.accelerationFlowCompleted = true;

frontend/src/app/components/wallet/wallet-preview.component.html

@@ -0,0 +1,31 @@
+<div class="box preview-box" *ngIf="(walletAddresses$ | async) as walletAddresses">
+  <app-preview-title>
+    <span i18n="shared.wallet">Wallet</span>
+  </app-preview-title>
+  <div>
+    <div class="table-col">
+      <table class="table table-borderless dual-col-striped table-fixed wallet-table" *ngIf="(walletStats$ | async) as walletStats">
+        <tbody>
+          <tr>
+            <td i18n="address.number-addresses">Addresses</td>
+            <td class="wrap-cell">{{ addressStrings.length }}</td>
+            <td class="spacer"></td>
+            <td i18n="address.utxos">UTXOs</td>
+            <td class="wrap-cell">{{ walletStats.utxos }}</td>
+          </tr>
+          <tr>
+            <td i18n="wallet.balance-btc">Balance (BTC)</td>
+            <td class="wrap-cell"><app-amount [satoshis]="walletStats.balance" [noFiat]="true" [digitsInfo]="walletStats.balance > 1_000_000_000 ? '1.4-4' : '1.8-8'"></app-amount></td>
+            <td class="spacer"></td>
+            <td i18n="wallet.balance-usd">Balance (USD)</td>
+            <td class="wrap-cell"><span class="fiat"><app-fiat [value]="walletStats.balance"></app-fiat></span></td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <div class="w-100 d-block d-md-none"></div>
+    <div class="col-md graph-col">
+      <app-address-graph [addressSummary$]="walletSummary$" period="all" [widget]="true" [defaultFiat]="true" [height]="330" [left]="-40" [right]="-40" [showLegend]="false" [showYAxis]="false"/>
+    </div>
+  </div>
+</div>

frontend/src/app/components/wallet/wallet-preview.component.scss

@@ -0,0 +1,31 @@
+.title-wrapper {
+  padding: 0 15px;
+}
+
+.graph-col {
+  height: 350px;
+  text-align: center;
+  padding: 0;
+  margin-left: 2px;
+  margin-right: 15px;
+}
+
+.table-col {
+  overflow: hidden;
+}
+
+.table {
+  font-size: 32px;
+
+  ::ng-deep .symbol {
+    font-size: 24px;
+  }
+
+  .spacer {
+    background: none;
+  }
+}
+
+.fiat {
+  display: block;
+}

frontend/src/app/components/wallet/wallet-preview.component.ts

@@ -0,0 +1,245 @@
+import { Component, OnInit, OnDestroy } from '@angular/core';
+import { ActivatedRoute, ParamMap } from '@angular/router';
+import { switchMap, catchError, map, tap, shareReplay, startWith, scan } from 'rxjs/operators';
+import { Address, AddressTxSummary, ChainStats, Transaction } from '@interfaces/electrs.interface';
+import { StateService } from '@app/services/state.service';
+import { ApiService } from '@app/services/api.service';
+import { of, Observable, Subscription } from 'rxjs';
+import { SeoService } from '@app/services/seo.service';
+import { seoDescriptionNetwork } from '@app/shared/common.utils';
+import { WalletAddress } from '@interfaces/node-api.interface';
+import { OpenGraphService } from '../../services/opengraph.service';
+import { WebsocketService } from '../../services/websocket.service';
+
+class WalletStats implements ChainStats {
+  addresses: string[];
+  funded_txo_count: number;
+  funded_txo_sum: number;
+  spent_txo_count: number;
+  spent_txo_sum: number;
+  tx_count: number;
+
+  constructor (stats: ChainStats[], addresses: string[]) {
+    Object.assign(this, stats.reduce((acc, stat) => {
+        acc.funded_txo_count += stat.funded_txo_count;
+        acc.funded_txo_sum += stat.funded_txo_sum;
+        acc.spent_txo_count += stat.spent_txo_count;
+        acc.spent_txo_sum += stat.spent_txo_sum;
+        return acc;
+      }, {
+        funded_txo_count: 0,
+        funded_txo_sum: 0,
+        spent_txo_count: 0,
+        spent_txo_sum: 0,
+        tx_count: 0,
+      })
+    );
+    this.addresses = addresses;
+  }
+
+  public addTx(tx: Transaction): void {
+    for (const vin of tx.vin) {
+      if (this.addresses.includes(vin.prevout?.scriptpubkey_address)) {
+        this.spendTxo(vin.prevout.value);
+      }
+    }
+    for (const vout of tx.vout) {
+      if (this.addresses.includes(vout.scriptpubkey_address)) {
+        this.fundTxo(vout.value);
+      }
+    }
+    this.tx_count++;
+  }
+
+  public removeTx(tx: Transaction): void {
+    for (const vin of tx.vin) {
+      if (this.addresses.includes(vin.prevout?.scriptpubkey_address)) {
+        this.unspendTxo(vin.prevout.value);
+      }
+    }
+    for (const vout of tx.vout) {
+      if (this.addresses.includes(vout.scriptpubkey_address)) {
+        this.unfundTxo(vout.value);
+      }
+    }
+    this.tx_count--;
+  }
+
+  private fundTxo(value: number): void {
+    this.funded_txo_sum += value;
+    this.funded_txo_count++;
+  }
+
+  private unfundTxo(value: number): void {
+    this.funded_txo_sum -= value;
+    this.funded_txo_count--;
+  }
+
+  private spendTxo(value: number): void {
+    this.spent_txo_sum += value;
+    this.spent_txo_count++;
+  }
+
+  private unspendTxo(value: number): void {
+    this.spent_txo_sum -= value;
+    this.spent_txo_count--;
+  }
+
+  get balance(): number {
+    return this.funded_txo_sum - this.spent_txo_sum;
+  }
+
+  get totalReceived(): number {
+    return this.funded_txo_sum;
+  }
+
+  get utxos(): number {
+    return this.funded_txo_count - this.spent_txo_count;
+  }
+}
+
+@Component({
+  selector: 'app-wallet-preview',
+  templateUrl: './wallet-preview.component.html',
+  styleUrls: ['./wallet-preview.component.scss']
+})
+export class WalletPreviewComponent implements OnInit, OnDestroy {
+  network = '';
+
+  addresses: Address[] = [];
+  addressStrings: string[] = [];
+  walletName: string;
+  isLoadingWallet = true;
+  wallet$: Observable<Record<string, WalletAddress>>;
+  walletAddresses$: Observable<Record<string, Address>>;
+  walletSummary$: Observable<AddressTxSummary[]>;
+  walletStats$: Observable<WalletStats>;
+  error: any;
+  walletSubscription: Subscription;
+
+  collapseAddresses: boolean = true;
+
+  fullyLoaded = false;
+  txCount = 0;
+  received = 0;
+  sent = 0;
+  chainBalance = 0;
+
+  constructor(
+    private route: ActivatedRoute,
+    private stateService: StateService,
+    private apiService: ApiService,
+    private seoService: SeoService,
+    private websocketService: WebsocketService,
+    private openGraphService: OpenGraphService,
+  ) { }
+
+  ngOnInit(): void {
+    this.websocketService.want(['blocks', 'stats']);
+    this.stateService.networkChanged$.subscribe((network) => this.network = network);
+    this.wallet$ = this.route.paramMap.pipe(
+      map((params: ParamMap) => params.get('wallet') as string),
+      tap((walletName: string) => {
+        this.walletName = walletName;
+        this.openGraphService.waitFor('wallet-addresses-' + this.walletName);
+        this.openGraphService.waitFor('wallet-data-' + this.walletName);
+        this.openGraphService.waitFor('wallet-txs-' + this.walletName);
+        this.seoService.setTitle($localize`:@@wallet.component.browser-title:Wallet: ${walletName}:INTERPOLATION:`);
+        this.seoService.setDescription($localize`:@@meta.description.bitcoin.wallet:See mempool transactions, confirmed transactions, balance, and more for ${this.stateService.network==='liquid'||this.stateService.network==='liquidtestnet'?'Liquid':'Bitcoin'}${seoDescriptionNetwork(this.stateService.network)} wallet ${walletName}:INTERPOLATION:.`);
+      }),
+      switchMap((walletName: string) => this.apiService.getWallet$(walletName).pipe(
+        catchError((err) => {
+          this.error = err;
+          this.seoService.logSoft404();
+          console.log(err);
+          this.openGraphService.fail('wallet-addresses-' + this.walletName);
+          this.openGraphService.fail('wallet-data-' + this.walletName);
+          this.openGraphService.fail('wallet-txs-' + this.walletName);
+          return of({});
+        })
+      )),
+      shareReplay(1),
+    );
+
+    this.walletAddresses$ = this.wallet$.pipe(
+      map(wallet => {
+        const walletInfo: Record<string, Address> = {};
+        for (const address of Object.keys(wallet)) {
+          walletInfo[address] = {
+            address,
+            chain_stats: wallet[address].stats,
+            mempool_stats: {
+              funded_txo_count: 0,
+              funded_txo_sum: 0,
+              spent_txo_count: 0, spent_txo_sum: 0, tx_count: 0
+            },
+          };
+        }
+        return walletInfo;
+      }),
+      tap(() => {
+        this.isLoadingWallet = false;
+      })
+    );
+
+    this.walletSubscription = this.walletAddresses$.subscribe(wallet => {
+      this.addressStrings = Object.keys(wallet);
+      this.addresses = Object.values(wallet);
+      this.openGraphService.waitOver('wallet-addresses-' + this.walletName);
+    });
+
+    this.walletSummary$ = this.wallet$.pipe(
+      map(wallet => this.deduplicateWalletTransactions(Object.values(wallet).flatMap(address => address.transactions))),
+      tap(() => {
+        this.openGraphService.waitOver('wallet-txs-' + this.walletName);
+      })
+    );
+
+    this.walletStats$ = this.wallet$.pipe(
+      switchMap(wallet => {
+        const walletStats = new WalletStats(Object.values(wallet).map(w => w.stats), Object.keys(wallet));
+        return this.stateService.walletTransactions$.pipe(
+          startWith([]),
+          scan((stats, newTransactions) => {
+            for (const tx of newTransactions) {
+              stats.addTx(tx);
+            }
+            return stats;
+          }, walletStats),
+        );
+      }),
+      tap(() => {
+        this.openGraphService.waitOver('wallet-data-' + this.walletName);
+      })
+    );
+  }
+
+  deduplicateWalletTransactions(walletTransactions: AddressTxSummary[]): AddressTxSummary[] {
+    const transactions = new Map<string, AddressTxSummary>();
+    for (const tx of walletTransactions) {
+      if (transactions.has(tx.txid)) {
+        transactions.get(tx.txid).value += tx.value;
+      } else {
+        transactions.set(tx.txid, tx);
+      }
+    }
+    return Array.from(transactions.values()).sort((a, b) => {
+      if (a.height === b.height) {
+        return b.tx_position - a.tx_position;
+      }
+      return b.height - a.height;
+    });
+  }
+
+  normalizeAddress(address: string): string {
+    if (/^[A-Z]{2,5}1[AC-HJ-NP-Z02-9]{8,100}|04[a-fA-F0-9]{128}|(02|03)[a-fA-F0-9]{64}$/.test(address)) {
+      return address.toLowerCase();
+    } else {
+      return address;
+    }
+  }
+
+  ngOnDestroy(): void {
+    this.walletSubscription.unsubscribe();
+  }
+}

frontend/src/app/graphs/graphs.module.ts

@@ -36,6 +36,7 @@ import { HashrateChartPoolsComponent } from '@components/hashrates-chart-pools/h
 import { BlockHealthGraphComponent } from '@components/block-health-graph/block-health-graph.component';
 import { AddressComponent } from '@components/address/address.component';
 import { WalletComponent } from '@components/wallet/wallet.component';
+import { WalletPreviewComponent } from '@components/wallet/wallet-preview.component';
 import { AddressGraphComponent } from '@components/address-graph/address-graph.component';
 import { UtxoGraphComponent } from '@components/utxo-graph/utxo-graph.component';
 import { ActiveAccelerationBox } from '@components/acceleration/active-acceleration-box/active-acceleration-box.component';
@@ -49,6 +50,7 @@ import { CommonModule } from '@angular/common';
     MempoolBlockComponent,
     AddressComponent,
     WalletComponent,
+    WalletPreviewComponent,
 
     MiningDashboardComponent,
     AcceleratorDashboardComponent,

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

@@ -144,4 +144,9 @@ 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: 'nodes',
+    path: 'monitoring',
     data: { networks: ['bitcoin', 'liquid'] },
     component: ServerHealthComponent
   });
   routes[0].children.push({
-    path: 'network',
+    path: 'nodes',
     data: { networks: ['bitcoin', 'liquid'] },
     component: ServerStatusComponent
   });

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

@@ -3,6 +3,7 @@ import { RouterModule, Routes } from '@angular/router';
 import { TransactionPreviewComponent } from '@components/transaction/transaction-preview.component';
 import { BlockPreviewComponent } from '@components/block/block-preview.component';
 import { AddressPreviewComponent } from '@components/address/address-preview.component';
+import { WalletPreviewComponent } from '@components/wallet/wallet-preview.component';
 import { PoolPreviewComponent } from '@components/pool/pool-preview.component';
 import { MasterPagePreviewComponent } from '@components/master-page-preview/master-page-preview.component';
 
@@ -20,6 +21,11 @@ const routes: Routes = [
         children: [],
         component: AddressPreviewComponent
       },
+      {
+        path: 'wallet/:wallet',
+        children: [],
+        component: WalletPreviewComponent
+      },
       {
         path: 'tx/:id',
         children: [],

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

@@ -5,7 +5,7 @@
       <div class="col-md-12 branding mt-2">
         <div class="main-logo" [class]="{'services': isServicesPage}">
           @if (enterpriseInfo?.footer_img) {
-            <img [src]="enterpriseInfo?.footer_img" [alt]="enterpriseInfo.title" height="60px" class="mr-3">
+            <img [src]="enterpriseInfo?.footer_img" [alt]="enterpriseInfo.title" height="60px" class="enterprise-logo">
           } @else {
             <app-svg-images *ngIf="officialMempoolSpace" name="officialMempoolSpace" viewBox="0 0 500 126"></app-svg-images>
             <app-svg-images *ngIf="!officialMempoolSpace" name="mempoolSpace" viewBox="0 0 500 126"></app-svg-images>

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

@@ -303,6 +303,10 @@ footer .nowrap {
     margin: 0 auto;
   }
 
+  .enterprise-logo {
+    max-width: 100%;
+  }
+
   footer .site-options {
     float: none;
     margin-top: 15px;

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

@@ -8,8 +8,12 @@ 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);
     }
 
@@ -25,10 +29,15 @@ export class AmountShortenerPipe implements PipeTransform {
     const rx = /\.0+$|(\.[0-9]*[1-9])0+$/;
     const item = lookup.slice().reverse().find((item) => num >= item.value);
 
-    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';
+    if (!item) {
+      return '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-build-all

@@ -131,8 +131,8 @@ export NVM_DIR="${HOME}/.nvm"
 source "${NVM_DIR}/nvm.sh"
 
 # what to look for
-frontends=(mainnet liquid onbtc)
-backends=(mainnet testnet testnet4 signet liquid liquidtestnet onbtc)
+frontends=(mainnet liquid onbtc bitb meta)
+backends=(mainnet testnet testnet4 signet liquid liquidtestnet onbtc bitb)
 frontend_repos=()
 backend_repos=()
 
@@ -148,7 +148,7 @@ for repo in $backends;do
 done
 
 # update all repos
-for repo in $backend_repos;do
+for repo in $frontend_repos $backend_repos;do
     update_repo "${repo}"
 done
 

production/mempool-frontend-config.meta.json

@@ -0,0 +1,19 @@
+{
+  "OFFICIAL_MEMPOOL_SPACE": true,
+  "TESTNET_ENABLED": true,
+  "TESTNET4_ENABLED": true,
+  "LIQUID_ENABLED": true,
+  "LIQUID_TESTNET_ENABLED": true,
+  "BISQ_ENABLED": true,
+  "BISQ_SEPARATE_BACKEND": true,
+  "SIGNET_ENABLED": true,
+  "MEMPOOL_WEBSITE_URL": "https://mempool.space",
+  "LIQUID_WEBSITE_URL": "https://liquid.network",
+  "BISQ_WEBSITE_URL": "https://bisq.markets",
+  "ITEMS_PER_PAGE": 25,
+  "LIGHTNING": true,
+  "ACCELERATOR": true,
+  "PUBLIC_ACCELERATIONS": true,
+  "AUDIT": true,
+  "CUSTOMIZATION": "custom-meta-config.json"
+}

production/mempool-start-all

@@ -5,6 +5,7 @@ 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'
@@ -15,7 +16,7 @@ screen -dmS x startx
 sleep 3
 
 # start unfurlers for each frontend
-for site in mainnet liquid onbtc;do
+for site in mainnet liquid onbtc bitb meta;do
     cd "$HOME/${site}/unfurler" && \
     echo "starting mempool unfurler: ${site}" && \
     screen -dmS "unfurler-${site}" sh -c 'while true;do npm run unfurler;sleep 2;done'

production/unfurler-config.bitb.json

@@ -0,0 +1,17 @@
+{
+  "SERVER": {
+    "HOST": "https://bitb.tk7.mempool.space",
+    "HTTP_PORT": 8006
+  },
+  "MEMPOOL": {
+    "HTTP_HOST": "http://127.0.0.1",
+    "HTTP_PORT": 86,
+    "NETWORK": "bitb"
+  },
+  "PUPPETEER": {
+    "CLUSTER_SIZE": 8,
+    "EXEC_PATH": "/usr/local/bin/chrome",
+    "MAX_PAGE_AGE": 86400,
+    "RENDER_TIMEOUT": 3000
+  }
+}

production/unfurler-config.meta.json

@@ -0,0 +1,17 @@
+{
+  "SERVER": {
+    "HOST": "https://metaplanet.mempool.space",
+    "HTTP_PORT": 8005
+  },
+  "MEMPOOL": {
+    "HTTP_HOST": "http://127.0.0.1",
+    "HTTP_PORT": 85,
+    "NETWORK": "meta"
+  },
+  "PUPPETEER": {
+    "CLUSTER_SIZE": 8,
+    "EXEC_PATH": "/usr/local/bin/chrome",
+    "MAX_PAGE_AGE": 86400,
+    "RENDER_TIMEOUT": 3000
+  }
+}

unfurler/src/index.ts

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

unfurler/src/routes.ts

@@ -85,6 +85,13 @@ const routes = {
       return `Address: ${path[0]}`;
     }
   },
+  wallet: {
+    render: true,
+    params: 1,
+    getTitle(path) {
+      return `Wallet: ${path[0]}`;
+    }
+  },
   blocks: {
     title: "Blocks",
     fallbackImg: '/resources/previews/blocks.jpg',
@@ -263,6 +270,7 @@ 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',
@@ -281,6 +289,50 @@ export const networks = {
         routes: routes.lightning.routes,
       }
     }
+  },
+  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',
+    routes: { // only dynamic routes supported
+      block: routes.block,
+      address: routes.address,
+      wallet: routes.wallet,
+      tx: routes.tx,
+      mining: {
+        title: "Mining",
+        routes: {
+          pool: routes.mining.routes.pool,
+        }
+      },
+      lightning: {
+        title: "Lightning",
+        routes: routes.lightning.routes,
+      }
+    }
+  },
+  meta: {
+    networkName: 'Metaplanet',
+    title: 'Metaplanet Inc.',
+    description: 'Secure the Future with Bitcoin',
+    fallbackImg: '/resources/meta/meta-preview.png',
+    routes: { // only dynamic routes supported
+      block: routes.block,
+      address: routes.address,
+      wallet: routes.wallet,
+      tx: routes.tx,
+      mining: {
+        title: "Mining",
+        routes: {
+          pool: routes.mining.routes.pool,
+        }
+      },
+      lightning: {
+        title: "Lightning",
+        routes: routes.lightning.routes,
+      }
+    }
   }
 };