Bump path-to-regexp and express in /frontend

Bumps [path-to-regexp](https://github.com/pillarjs/path-to-regexp) and [express](https://github.com/expressjs/express). These dependencies needed to be updated together.

Updates `path-to-regexp` from 0.1.10 to 0.1.12
- [Release notes](https://github.com/pillarjs/path-to-regexp/releases)
- [Changelog](https://github.com/pillarjs/path-to-regexp/blob/master/History.md)
- [Commits](https://github.com/pillarjs/path-to-regexp/compare/v0.1.10...v0.1.12)

Updates `express` from 4.21.1 to 4.21.2
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/4.21.2/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.21.1...4.21.2)

---
updated-dependencies:
- dependency-name: path-to-regexp
  dependency-type: indirect
- dependency-name: express
  dependency-type: indirect
...

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

backend/src/api/mempool-blocks.ts

@@ -382,7 +382,7 @@ class MempoolBlocks {
 
     const ancestors: Ancestor[] = [];
     const descendants: Ancestor[] = [];
-    let ancestor: MempoolTransactionExtended;
+    let ancestor: MempoolTransactionExtended
     for (const cluster of clusters) {
       for (const memberTxid of cluster) {
         const mempoolTx = mempool[memberTxid];
@@ -462,7 +462,7 @@ class MempoolBlocks {
 
       for (let i = 0; i < block.length; i++) {
         const txid = block[i];
-        if (txid in mempool) {
+        if (txid) {
           mempoolTx = mempool[txid];
           // save position in projected blocks
           mempoolTx.position = {
@@ -481,9 +481,6 @@ class MempoolBlocks {
               mempoolTx.acceleratedAt = acceleration?.added;
               mempoolTx.feeDelta = acceleration?.feeDelta;
               for (const ancestor of mempoolTx.ancestors || []) {
-                if (!(ancestor.txid in mempool)) {
-                  continue;
-                }
                 if (!mempool[ancestor.txid].acceleration) {
                   mempool[ancestor.txid].cpfpDirty = true;
                 }
@@ -691,7 +688,7 @@ class MempoolBlocks {
       [pool: string]: { name: string, block: number, vsize: number, accelerations: string[], complete: boolean };
     } = {};
     // prepare a list of accelerations in ascending order (we'll pop items off the end of the list)
-    const accQueue: { acceleration: Acceleration, rate: number, vsize: number }[] = Object.values(accelerations).filter(acc => acc.txid in mempoolCache).map(acc => {
+    const accQueue: { acceleration: Acceleration, rate: number, vsize: number }[] = Object.values(accelerations).map(acc => {
       let vsize = mempoolCache[acc.txid].vsize;
       for (const ancestor of mempoolCache[acc.txid].ancestors || []) {
         vsize += (ancestor.weight / 4);

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

@@ -1,15 +1,10 @@
 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))
-      .get(config.MEMPOOL.API_URL_PREFIX + 'internal/usd-price-history', this.$getAllPrices.bind(this))
-    ;
+    app.get(config.MEMPOOL.API_URL_PREFIX + 'prices', this.$getCurrentPrices.bind(this));
   }
 
   private $getCurrentPrices(req: Request, res: Response): void {
@@ -19,23 +14,6 @@ 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/custom-meta-config.json

@@ -1,51 +0,0 @@
-{
-  "theme": "contrast",
-  "enterprise": "meta",
-  "branding": {
-    "name": "metaplanet",
-    "title": "Metaplanet",
-    "site_id": 21,
-    "header_img": "/resources/metalogo.svg",
-    "footer_img": "/resources/metalogo.svg"
-  },
-  "dashboard": {
-    "widgets": [
-      {
-        "component": "fees",
-        "mobileOrder": 4
-      },
-      {
-        "component": "walletBalance",
-        "mobileOrder": 1,
-        "props": {
-          "wallet": "3350"
-        }
-      },
-      {
-        "component": "twitter",
-        "mobileOrder": 5,
-        "props": {
-          "handle": "Metaplanet_JP"
-        }
-      },
-      {
-        "component": "wallet",
-        "mobileOrder": 2,
-        "props": {
-          "wallet": "3350",
-          "period": "all"
-        }
-      },
-      {
-        "component": "blocks"
-      },
-      {
-        "component": "walletTransactions",
-        "mobileOrder": 3,
-        "props": {
-          "wallet": "3350"
-        }
-      }
-    ]
-  }
-}

frontend/package-lock.json

@@ -9732,9 +9732,9 @@
       "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw=="
     },
     "node_modules/express": {
-      "version": "4.21.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz",
-      "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
@@ -9755,7 +9755,7 @@
         "methods": "~1.1.2",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.10",
+        "path-to-regexp": "0.1.12",
         "proxy-addr": "~2.0.7",
         "qs": "6.13.0",
         "range-parser": "~1.2.1",
@@ -9770,6 +9770,10 @@
       },
       "engines": {
         "node": ">= 0.10.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/express/node_modules/debug": {
@@ -14055,9 +14059,9 @@
       }
     },
     "node_modules/path-to-regexp": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
-      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ=="
     },
     "node_modules/path-type": {
       "version": "4.0.0",
@@ -25287,9 +25291,9 @@
       "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw=="
     },
     "express": {
-      "version": "4.21.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz",
-      "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
       "requires": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
@@ -25310,7 +25314,7 @@
         "methods": "~1.1.2",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.10",
+        "path-to-regexp": "0.1.12",
         "proxy-addr": "~2.0.7",
         "qs": "6.13.0",
         "range-parser": "~1.2.1",
@@ -28489,9 +28493,9 @@
       }
     },
     "path-to-regexp": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
-      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ=="
     },
     "path-type": {
       "version": "4.0.0",

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 || canceled) {
+    @if (!tx.status.confirmed) {
     <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 && !canceled) {
+            @if (eta) {
               ~<app-time [time]="eta?.wait / 1000"></app-time>
               }
           </div>
@@ -19,20 +19,16 @@
         <div class="node-spacer"></div>
         <div class="interval-spacer"></div>
         <div class="node">
-          <div class="acc-to-confirmed right go-faster" [class.no-animation]="canceled"></div>
+          <div class="acc-to-confirmed right go-faster"></div>
         </div>
         <div class="interval-spacer">
         </div>
         <div class="node" [id]="'confirmed'">
-          <div class="acc-to-confirmed left go-faster" [class.no-animation]="canceled"></div>
+          <div class="acc-to-confirmed left go-faster"></div>
           <div class="shape-border waiting">
             <div class="shape"></div>
           </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 class="status"><span class="badge badge-waiting" i18n="transaction.rbf.mined">Mined</span></div>
         </div>
       </div>
     </div>
@@ -49,9 +45,9 @@
         <div class="interval">
           <div class="interval-time">
             @if (tx.status.confirmed) {
-              <app-time [time]="acceleratedToMined"></app-time>
-            } @else if (eta && canceled) {
-              ~<app-time [time]="eta?.wait / 1000"></app-time>
+              <div class="interval-time">
+                <app-time [time]="acceleratedToMined"></app-time>
+              </div>
             }
           </div>
         </div>
@@ -75,42 +71,42 @@
         <div class="interval-spacer">
           <div class="seen-to-acc"></div>
         </div>
-        <div class="node" [class.accelerated]="!tx.status.confirmed && !canceled" [id]="'accelerated'">
+        <div class="node" [class.accelerated]="!tx.status.confirmed" [id]="'accelerated'">
           <div class="seen-to-acc left"></div>
-          @if (tx.status.confirmed && !canceled) {
+          @if (tx.status.confirmed) {
             <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 || canceled) {
-            <div class="connector down" [class.loading]="!canceled"></div>
+            @if (!tx.status.confirmed) {
+            <div class="connector down loading"></div>
             }
           </div>
-          @if (tx.status.confirmed && !canceled) {
+          @if (tx.status.confirmed) {
             <div class="status"><span class="badge badge-accelerated" i18n="transaction.audit.accelerated">Accelerated</span></div>
           }
-          <div class="time" [class.no-margin]="!tx.status.confirmed || canceled" [class.offset-left]="!tx.status.confirmed || canceled">
+          <div class="time" [class.no-margin]="!tx.status.confirmed" [class.offset-left]="!tx.status.confirmed">
             @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 || canceled"></app-time>
+            <app-time kind="since" [time]="acceleratedAt" [lowercaseStart]="!tx.status.confirmed"></app-time>
             }
           </div>
         </div>
         <div class="interval-spacer">
-          @if (tx.status.confirmed && !canceled) {
+          @if (tx.status.confirmed) {
           <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 && !canceled) {
+          @if (tx.status.confirmed) {
           <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,9 +129,6 @@
           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,7 +15,6 @@ 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

@@ -10,6 +10,7 @@ import { RelativeUrlPipe } from '@app/shared/pipes/relative-url/relative-url.pip
 import { StateService } from '@app/services/state.service';
 import { PriceService } from '@app/services/price.service';
 import { FiatCurrencyPipe } from '@app/shared/pipes/fiat-currency.pipe';
+import { FiatShortenerPipe } from '@app/shared/pipes/fiat-shortener.pipe';
 
 const periodSeconds = {
   '1d': (60 * 60 * 24),
@@ -44,18 +45,14 @@ 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;
@@ -80,6 +77,7 @@ export class AddressGraphComponent implements OnChanges, OnDestroy {
     private relativeUrlPipe: RelativeUrlPipe,
     private priceService: PriceService,
     private fiatCurrencyPipe: FiatCurrencyPipe,
+    private fiatShortenerPipe: FiatShortenerPipe,
     private zone: NgZone,
   ) {}
 
@@ -88,9 +86,6 @@ 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();
@@ -152,7 +147,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 => {
@@ -166,7 +161,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]);
 
@@ -184,9 +179,6 @@ 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, [
@@ -202,10 +194,10 @@ export class AddressGraphComponent implements OnChanges, OnDestroy {
       grid: {
         top: 20,
         bottom: this.allowZoom ? 65 : 20,
-        right: this.adjustedRight,
-        left: this.adjustedLeft,
+        right: this.right,
+        left: this.left,
       },
-      legend: (this.showLegend && !this.stateService.isAnyTestnet()) ? {
+      legend: !this.stateService.isAnyTestnet() ? {
         data: [
           {
             name: $localize`:@@7e69426bd97a606d8ae6026762858e6e7c86a1fd:Balance`,
@@ -253,22 +245,21 @@ export class AddressGraphComponent implements OnChanges, OnDestroy {
           let tooltip = '<div>';
 
           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>`;
-
           if (hasTx) {
             const header = data.length === 1
             ? `${data[0].data[2].txid.slice(0, 6)}...${data[0].data[2].txid.slice(-6)}`
             : `${data.length} transactions`;
-            tooltip += `<div><b>${header}</b></div>`;
+            tooltip += `<span><b>${header}</b></span>`;
           }
-
+          
+          const date = new Date(data[0].data[0]).toLocaleTimeString(this.locale, { year: 'numeric', month: 'short', day: 'numeric' });
+          
+          tooltip += `<div>
+            <div style="text-align: right;">`;
+          
           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)');
@@ -300,7 +291,7 @@ export class AddressGraphComponent implements OnChanges, OnDestroy {
             }
           }
 
-          tooltip += `</div></div>`;
+          tooltip += `</div><span>${date}</span></div>`;
           return tooltip;
         }.bind(this)
       },
@@ -316,26 +307,22 @@ 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);
               if (valSpan > 100_000_000_000) {
-                return `${this.amountShortenerPipe.transform(Math.round(val / 100_000_000), 0, undefined, true)} BTC`;
+                return `${this.amountShortenerPipe.transform(Math.round(val / 100_000_000), 0)} BTC`;
               }
               else if (valSpan > 1_000_000_000) {
-                return `${this.amountShortenerPipe.transform(Math.round(val / 100_000_000), 2, undefined, true)} BTC`;
+                return `${this.amountShortenerPipe.transform(Math.round(val / 100_000_000), 2)} BTC`;
               } else if (valSpan > 100_000_000) {
                 return `${(val / 100_000_000).toFixed(1)} BTC`;
               } else if (valSpan > 10_000_000) {
                 return `${(val / 100_000_000).toFixed(2)} BTC`;
               } else if (valSpan > 1_000_000) {
-                if (maxValue > 100_000_000_000) {
-                  return `${this.amountShortenerPipe.transform(Math.round(val / 100_000_000), 3, undefined, true)} BTC`;
-                }
                 return `${(val / 100_000_000).toFixed(3)} BTC`;
               } else {
-                return `${this.amountShortenerPipe.transform(val, 0, undefined, true)} sats`;
+                return `${this.amountShortenerPipe.transform(val, 0)} sats`;
               }
             }
           },
@@ -347,10 +334,9 @@ 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.fiatShortenerPipe.transform(val, null, 'USD');
             }.bind(this)
           },
           splitLine: {
@@ -404,8 +390,8 @@ export class AddressGraphComponent implements OnChanges, OnDestroy {
         type: 'slider',
         brushSelect: false,
         realtime: true,
-        left: this.adjustedLeft,
-        right: this.adjustedRight,
+        left: this.left,
+        right: this.right,
         selectedDataBackground: {
           lineStyle: {
             color: '#fff',
@@ -435,26 +421,26 @@ export class AddressGraphComponent implements OnChanges, OnDestroy {
 
   onLegendSelectChanged(e) {
     this.selected = e.selected;
-    this.adjustedRight = this.selected['Fiat'] ? +this.right + 40 : +this.right;
-    this.adjustedLeft = this.selected[$localize`:@@7e69426bd97a606d8ae6026762858e6e7c86a1fd:Balance`] ? +this.left : +this.left - 40;
+    this.right = this.selected['Fiat'] ? +this.initialRight + 40 : this.initialRight;
+    this.left = this.selected[$localize`:@@7e69426bd97a606d8ae6026762858e6e7c86a1fd:Balance`] ? this.initialLeft : +this.initialLeft - 40;
 
     this.chartOptions = {
       grid: {
-        right: this.adjustedRight,
-        left: this.adjustedLeft,
+        right: this.right,
+        left: this.left,
       },
       legend: {
         selected: this.selected,
       },
       dataZoom: this.allowZoom ? [{
-        left: this.adjustedLeft,
-        right: this.adjustedRight,
+        left: this.left,
+        right: this.right,
       }, {
-        left: this.adjustedLeft,
-        right: this.adjustedRight,
+        left: this.left,
+        right: this.right,
       }] : undefined
     };
-
+    
     if (this.chartInstance) {
       this.chartInstance.setOption(this.chartOptions);
     }

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

@@ -1,17 +1,15 @@
 <ng-template [ngIf]="button" [ngIfElse]="btnLink">
-  <button [class]="class" type="button" [disabled]="text === ''" style="box-shadow: none;" (click)="copyText()">
-    <span style="position: relative;top: -2px;left: 1px;">
+  <button #btn [attr.data-clipboard-text]="text" [class]="class" type="button" [disabled]="text === ''">
+    <span #buttonWrapper [attr.data-tlite]="copiedMessage" style="position: relative;top: -2px;left: 1px;">
       <app-svg-images name="clippy" [width]="widths[size]" viewBox="0 0 1000 1000"></app-svg-images>
-      <span *ngIf="showMessage" class="copied-message" style="top: 29px; left: -23.5px;">{{ copiedMessage }}</span>
     </span>
   </button>
 </ng-template>
 
 <ng-template #btnLink>
-  <span style="position: relative;">
-    <button class="btn btn-sm btn-link pt-0 {{ leftPadding ? 'padding' : '' }}" style="box-shadow: none;" (click)="copyText()">
+  <span #buttonWrapper [attr.data-tlite]="copiedMessage" style="position: relative;">
+    <button #btn class="btn btn-sm btn-link pt-0 {{ leftPadding ? 'padding' : '' }}" [attr.data-clipboard-text]="text"> 
       <app-svg-images name="clippy" [width]="widths[size]" viewBox="0 0 1000 1000"></app-svg-images>
     </button>
-    <span *ngIf="showMessage" class="copied-message" style="top: 29px; left: -23.5px;">{{ copiedMessage }}</span>
   </span>
 </ng-template>

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

@@ -7,19 +7,7 @@
   padding-left: 0.4rem;
 }
 
-.copied-message {
-  background: color-mix(in srgb, var(--active-bg) 95%, transparent);
-  color: var(--fg);
-  font-family: sans-serif;
-  font-size: .8rem;
-  font-weight: 400;
-  text-decoration: none;
-  text-align: left;
-  padding: .6em .75rem;
-  border-radius: 4px;
-  position: absolute;
-  white-space: nowrap;
-  box-shadow: 0 .5rem 1rem -.5rem #000;
-  z-index: 1000;
-  opacity: .9;
-}
+img {
+  position: relative;
+  left: -3px;
+}

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

@@ -1,4 +1,6 @@
-import { Component, Input, ChangeDetectionStrategy, ChangeDetectorRef } from '@angular/core';
+import { Component, ViewChild, ElementRef, AfterViewInit, Input, ChangeDetectionStrategy } from '@angular/core';
+import * as ClipboardJS from 'clipboard';
+import * as tlite from 'tlite';
 
 @Component({
   selector: 'app-clipboard',
@@ -6,14 +8,15 @@ import { Component, Input, ChangeDetectionStrategy, ChangeDetectorRef } from '@a
   styleUrls: ['./clipboard.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class ClipboardComponent {
+export class ClipboardComponent implements AfterViewInit {
+  @ViewChild('btn') btn: ElementRef;
+  @ViewChild('buttonWrapper') buttonWrapper: ElementRef;
   @Input() button = false;
   @Input() class = 'btn btn-secondary ml-1';
   @Input() size: 'small' | 'normal' | 'large' = 'normal';
   @Input() text: string;
   @Input() leftPadding = true;
   copiedMessage: string = $localize`:@@clipboard.copied-message:Copied!`;
-  showMessage = false;
 
   widths = {
     small: '10',
@@ -21,40 +24,22 @@ export class ClipboardComponent {
     large: '18',
   };
 
-  constructor(
-    private cd: ChangeDetectorRef,
-  ) { }
+  clipboard: any;
 
-  async copyText() {
-    if (this.text && !this.showMessage) {
-      try {
-        await this.copyToClipboard(this.text);
-        this.showMessage = true;
-        this.cd.markForCheck();
-        setTimeout(() => {
-          this.showMessage = false;
-          this.cd.markForCheck();
-        }, 1000);
-      } catch (error) {
-        console.error('Clipboard copy failed:', error);
-      }
-    }
+  constructor() { }
+
+  ngAfterViewInit() {
+    this.clipboard = new ClipboardJS(this.btn.nativeElement);
+    this.clipboard.on('success', () => {
+      tlite.show(this.buttonWrapper.nativeElement);
+      setTimeout(() => {
+        tlite.hide(this.buttonWrapper.nativeElement);
+      }, 1000);
+    });
   }
 
-  async copyToClipboard(text: string) {
-    if (navigator.clipboard) {
-      await navigator.clipboard.writeText(text);
-    } else {
-      // Use the 'out of viewport hidden text area' trick on non-secure contexts
-      const textarea = document.createElement('textarea');
-      textarea.value = this.text;
-      textarea.style.opacity = '0';
-      textarea.setAttribute('readonly', 'true'); // Don't trigger keyboard on mobile
-      document.body.appendChild(textarea);
-      textarea.select();
-      document.execCommand('copy');
-      textarea.remove();
-    }
+  onDestroy() {
+    this.clipboard.destroy();
   }
 
 }

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" [defaultFiat]="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" [height]="graphHeight"></app-address-graph>
               </div>
             </div>
           </div>

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

@@ -130,16 +130,6 @@
             <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/components/transaction/transaction-details/transaction-details.component.html

@@ -217,10 +217,10 @@
     <tr>
       <td class="td-width" i18n="transaction.fee|Transaction fee">Fee</td>
       <td class="text-wrap">{{ tx.fee | number }} <span class="symbol" i18n="shared.sats">sats</span>
-        @if (isAcceleration && accelerationInfo?.bidBoost ?? tx.feeDelta > 0) {
+        @if (accelerationInfo?.bidBoost ?? tx.feeDelta > 0) {
           <span class="oobFees" i18n-ngbTooltip="Acceleration Fees" ngbTooltip="Acceleration fees paid out-of-band"> +{{ accelerationInfo?.bidBoost ?? tx.feeDelta | number }} </span><span class="symbol" i18n="shared.sats">sats</span>
         }
-        <span class="fiat"><app-fiat [blockConversion]="tx.price" [value]="tx.fee + (isAcceleration ? ((accelerationInfo?.bidBoost ?? tx.feeDelta) || 0) : 0)"></app-fiat></span>
+        <span class="fiat"><app-fiat [blockConversion]="tx.price" [value]="tx.fee + ((accelerationInfo?.bidBoost ?? tx.feeDelta) || 0)"></app-fiat></span>
       </td>
     </tr>
   } @else {
@@ -247,7 +247,7 @@
 
 <ng-template #effectiveRateRow>
   @if (!isLoadingTx) {
-    @if ((cpfpInfo && hasEffectiveFeeRate) || (accelerationInfo && isAcceleration)) {
+    @if ((cpfpInfo && hasEffectiveFeeRate) || accelerationInfo) {
       <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 || accelerationCanceled)">
+    <ng-container *ngIf="transactionTime > 0 && tx.acceleratedAt > 0 && isAcceleration">
       <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)" [canceled]="accelerationCanceled"></app-acceleration-timeline>
+      <app-acceleration-timeline [transactionTime]="transactionTime" [acceleratedAt]="tx.acceleratedAt" [tx]="tx" [accelerationInfo]="accelerationInfo" [eta]="(ETA$ | async)"></app-acceleration-timeline>
       <br>
     </ng-container>
 

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

@@ -107,7 +107,6 @@ 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;
@@ -361,17 +360,16 @@ 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') && 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;
+          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;
+            }
           }
           this.waitingForAccelerationInfo = false;
           this.setIsAccelerated();
@@ -880,13 +878,6 @@ 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 (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);
     }
     
@@ -910,12 +901,7 @@ 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.accelerationCanceled;
+    this.isAcceleration = ((this.tx.acceleration && (!this.tx.status.confirmed || this.waitingForAccelerationInfo)) || (this.accelerationInfo && this.pool && this.accelerationInfo.pools.some(pool => (pool === this.pool.id))));
     if (this.isAcceleration) {
       if (initialState) {
         this.accelerationFlowCompleted = true;

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

@@ -1,31 +0,0 @@
-<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

@@ -1,31 +0,0 @@
-.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

@@ -1,245 +0,0 @@
-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,7 +36,6 @@ 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';
@@ -50,7 +49,6 @@ import { CommonModule } from '@angular/common';
     MempoolBlockComponent,
     AddressComponent,
     WalletComponent,
-    WalletPreviewComponent,
 
     MiningDashboardComponent,
     AcceleratorDashboardComponent,

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

@@ -3,7 +3,6 @@ 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';
 
@@ -21,11 +20,6 @@ const routes: Routes = [
         children: [],
         component: AddressPreviewComponent
       },
-      {
-        path: 'wallet/:wallet',
-        children: [],
-        component: WalletPreviewComponent
-      },
       {
         path: 'tx/:id',
         children: [],

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

@@ -37,7 +37,6 @@ export class WebsocketService {
   private isTrackingWallet: boolean = false;
   private trackingWalletName: string;
   private trackingMempoolBlock: number;
-  private trackingMempoolBlockNetwork: string;
   private stoppingTrackMempoolBlock: any | null = null;
   private latestGitCommit = '';
   private onlineCheckTimeout: number;
@@ -227,11 +226,10 @@ export class WebsocketService {
       clearTimeout(this.stoppingTrackMempoolBlock);
     }
     // skip duplicate tracking requests
-    if (force || this.trackingMempoolBlock !== block || this.network !== this.trackingMempoolBlockNetwork) {
+    if (force || this.trackingMempoolBlock !== block) {
       this.websocketSubject.next({ 'track-mempool-block': block });
       this.isTrackingMempoolBlock = true;
       this.trackingMempoolBlock = block;
-      this.trackingMempoolBlockNetwork = this.network;
       return true;
     }
     return false;

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="enterprise-logo">
+            <img [src]="enterpriseInfo?.footer_img" [alt]="enterpriseInfo.title" height="60px" class="mr-3">
           } @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,10 +303,6 @@ footer .nowrap {
     margin: 0 auto;
   }
 
-  .enterprise-logo {
-    max-width: 100%;
-  }
-
   footer .site-options {
     float: none;
     margin-top: 15px;

frontend/src/index.mempool.meta.html

@@ -1,45 +0,0 @@
-<!doctype html>
-<html lang="en">
-
-<head>
-  <meta charset="utf-8">
-  <title>Metaplanet Inc</title>
-  <script src="/resources/config.js"></script>
-  <script src="/resources/customize.js"></script>
-  <base href="/">
-
-  <meta name="description" content="Secure the Future with Bitcoin." />
-  <meta property="og:image" content="https://mempool.space/resources/meta/meta-preview.jpg" />
-  <meta property="og:image:type" content="image/jpeg" />
-  <meta property="og:image:width" content="2000" />
-  <meta property="og:image:height" content="1000" />
-  <meta property="og:description" content="Secure the Future with Bitcoin." />
-  <meta name="twitter:card" content="summary_large_image">
-  <meta name="twitter:site" content="@mempool">
-  <meta name="twitter:creator" content="@mempool">
-  <meta name="twitter:title" content="Metaplanet Inc">
-  <meta name="twitter:description" content="Secure the Future with Bitcoin." />
-  <meta name="twitter:image" content="https://mempool.space/resources/meta/meta-preview.jpg" />
-  <meta name="twitter:domain" content="metaplanet.mempool.space">
-
-  <link rel="apple-touch-icon" sizes="180x180" href="/resources/meta/favicons/apple-touch-icon.png">
-  <link rel="icon" type="image/png" sizes="32x32" href="/resources/meta/favicons/favicon-32x32.png">
-  <link rel="icon" type="image/png" sizes="16x16" href="/resources/meta/favicons/favicon-16x16.png">
-  <link rel="manifest" href="/resources/meta/favicons/site.webmanifest">
-  <link rel="shortcut icon" href="/resources/meta/favicons/favicon.ico">
-  <link id="canonical" rel="canonical" href="https://metaplanet.mempool.space">
-
-  <meta name="apple-mobile-web-app-capable" content="yes">
-  <meta name="apple-mobile-web-app-status-bar-style" content="black">
-  <meta name="msapplication-TileColor" content="#000000">
-  <meta name="msapplication-config" content="/resources/favicons/browserconfig.xml">
-  <meta name="theme-color" content="#1d1f31">
-
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-</head>
-
-<body>
-  <app-root></app-root>
-</body>
-
-</html>

frontend/src/resources/meta/favicons/site.webmanifest

@@ -1 +0,0 @@
-{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}

production/bitcoin.conf

@@ -4,6 +4,7 @@ txindex=1
 coinstatsindex=1
 listen=1
 discover=1
+par=16
 dbcache=8192
 mempoolfullrbf=1
 maxconnections=100

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 bitb meta)
-backends=(mainnet testnet testnet4 signet liquid liquidtestnet onbtc bitb)
+frontends=(mainnet liquid onbtc)
+backends=(mainnet testnet testnet4 signet liquid liquidtestnet onbtc)
 frontend_repos=()
 backend_repos=()
 
@@ -148,7 +148,7 @@ for repo in $backends;do
 done
 
 # update all repos
-for repo in $frontend_repos $backend_repos;do
+for repo in $backend_repos;do
     update_repo "${repo}"
 done
 

production/mempool-config.mainnet.json

@@ -153,6 +153,6 @@
   },
   "WALLETS": {
     "ENABLED": true,
-    "WALLETS": ["BITB", "3350"]
+    "WALLETS": ["BITB"]
   }
 }

production/mempool-frontend-config.meta.json

@@ -1,19 +0,0 @@
-{
-  "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

@@ -15,7 +15,7 @@ screen -dmS x startx
 sleep 3
 
 # start unfurlers for each frontend
-for site in mainnet liquid onbtc bitb meta;do
+for site in mainnet liquid onbtc;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

@@ -1,17 +0,0 @@
-{
-  "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

@@ -1,17 +0,0 @@
-{
-  "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/routes.ts

@@ -85,13 +85,6 @@ 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',
@@ -288,48 +281,6 @@ export const networks = {
         routes: routes.lightning.routes,
       }
     }
-  },
-  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: {
-    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,
-      }
-    }
   }
 };