Merge pull request #5432 from mempool/simon/match-any-onion

match any onion

backend/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "mempool-backend",
-  "version": "3.0.0-dev",
+  "version": "3.0.0-beta",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "mempool-backend",
-      "version": "3.0.0-dev",
+      "version": "3.0.0-beta",
       "hasInstallScript": true,
       "license": "GNU Affero General Public License v3.0",
       "dependencies": {

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mempool-backend",
-  "version": "3.0.0-dev",
+  "version": "3.0.0-beta",
   "description": "Bitcoin mempool visualizer and blockchain explorer backend",
   "license": "GNU Affero General Public License v3.0",
   "homepage": "https://mempool.space",

backend/src/api/database-migration.ts

@@ -653,9 +653,11 @@ class DatabaseMigration {
       await this.$executeQuery('ALTER TABLE `prices` ADD `TRY` float DEFAULT "-1"');
       await this.$executeQuery('ALTER TABLE `prices` ADD `ZAR` float DEFAULT "-1"');
 
+      if (isBitcoin === true) {
         await this.$executeQuery('TRUNCATE hashrates');
         await this.$executeQuery('TRUNCATE difficulty_adjustments');
         await this.$executeQuery(`UPDATE state SET string = NULL WHERE name = 'pools_json_sha'`);
+      }
 
       await this.updateToSchemaVersion(75);
     }
@@ -692,7 +694,7 @@ class DatabaseMigration {
       await this.updateToSchemaVersion(80);
     }
 
-    if (databaseSchemaVersion < 81) {
+    if (databaseSchemaVersion < 81 && isBitcoin === true) {
       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 "[]"');

backend/src/api/mining/mining-routes.ts

@@ -470,7 +470,7 @@ class MiningRoutes {
     res.setHeader('expires', -1);
     try {
       accelerationApi.accelerationRequested(req.params.txid);
-      res.status(200).send('ok');
+      res.status(200).send();
     } catch (e) {
       res.status(500).send(e instanceof Error ? e.message : e);
     }

frontend/cypress/fixtures/mainnet_mempoolInfo.json

@@ -750,7 +750,7 @@
     },
     "backendInfo": {
       "hostname": "node205.tk7.mempool.space",
-      "version": "3.0.0-dev",
+      "version": "3.0.0-beta",
       "gitCommit": "abbc8a134",
       "lightning": false
     },

frontend/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "mempool-frontend",
-  "version": "3.0.0-dev",
+  "version": "3.0.0-beta",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "mempool-frontend",
-      "version": "3.0.0-dev",
+      "version": "3.0.0-beta",
       "license": "GNU Affero General Public License v3.0",
       "dependencies": {
         "@angular-devkit/build-angular": "^17.3.1",

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mempool-frontend",
-  "version": "3.0.0-dev",
+  "version": "3.0.0-beta",
   "description": "Bitcoin mempool visualizer and blockchain explorer backend",
   "license": "GNU Affero General Public License v3.0",
   "homepage": "https://mempool.space",

frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html

@@ -403,14 +403,14 @@
                 }
                 @if (canPayWithApplePay) {
                   @if (canPayWithCashapp) { <span class="mt-1 mb-1"></span> }
-                  <div class="paymentMethod mx-2" style="width: 200px; height: 55px">
+                  <div class="paymentMethod mx-2" style="width: 200px; height: 55px" (click)="moveToStep('applepay')">
-                  <img src="/resources/apple-pay.png" height=37 (click)="moveToStep('applepay')">
+                    <img src="/resources/apple-pay.png" height=37>
                   </div>
                 }
                 @if (canPayWithGooglePay) {
                   @if (canPayWithCashapp || canPayWithApplePay) { <span class="mt-1 mb-1"></span> }
-                  <div class="paymentMethod mx-2" style="width: 200px; height: 55px">
+                  <div class="paymentMethod mx-2" style="width: 200px; height: 55px" (click)="moveToStep('googlepay')">
-                    <img src="/resources/google-pay.png" height=37 (click)="moveToStep('googlepay')">
+                    <img src="/resources/google-pay.png" height=37>
                   </div>
                 }
               </div>

frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts

@@ -11,6 +11,7 @@ import { MiningStats } from '../../services/mining.service';
 import { IAuth, AuthServiceMempool } from '../../services/auth.service';
 import { EnterpriseService } from '../../services/enterprise.service';
 import { ApiService } from '../../services/api.service';
+import { isDevMode } from '@angular/core';
 
 export type PaymentMethod = 'balance' | 'bitcoin' | 'cashapp' | 'applePay' | 'googlePay';
 
@@ -82,6 +83,13 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
   timePaid: number = 0; // time acceleration requested
   math = Math;
   isMobile: boolean = window.innerWidth <= 767.98;
+  isProdDomain = ['mempool.space',
+    'mempool-staging.va1.mempool.space',
+    'mempool-staging.fmt.mempool.space',
+    'mempool-staging.fra.mempool.space',
+    'mempool-staging.tk7.mempool.space',
+    'mempool-staging.sg1.mempool.space'
+   ].indexOf(document.location.hostname) > -1;
 
   private _step: CheckoutStep = 'summary';
   simpleMode: boolean = true;
@@ -398,15 +406,14 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
    * Square
    */
   insertSquare(): void {
+    if (!this.isProdDomain && !isDevMode()) {
+      return;
+    }
     if (window['Square']) {
       return;
     }
     let statsUrl = 'https://sandbox.web.squarecdn.com/v1/square.js';
-    if (document.location.hostname === 'mempool-staging.fmt.mempool.space' ||
+    if (this.isProdDomain) {
-        document.location.hostname === 'mempool-staging.va1.mempool.space' ||
-        document.location.hostname === 'mempool-staging.fra.mempool.space' ||
-        document.location.hostname === 'mempool-staging.tk7.mempool.space' ||
-        document.location.hostname === 'mempool.space') {
       statsUrl = '/square/v1/square.js';
     }
 
@@ -416,6 +423,9 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
     })();
   }
   setupSquare(): void {
+    if (!this.isProdDomain && !isDevMode()) {
+      return;
+    }
     const init = (): void => {
       this.initSquare();
     };
@@ -654,11 +664,11 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
             amount: costUSD.toFixed(2),
             label: 'Total',
             pending: true,
-            productUrl: `${redirectHostname}/tracker/${this.tx.txid}`,
+            productUrl: `${redirectHostname}/tx/${this.tx.txid}`,
           }
         });
         this.cashAppPay = await this.payments.cashAppPay(paymentRequest, {
-          redirectURL: `${redirectHostname}/tracker/${this.tx.txid}`,
+          redirectURL: `${redirectHostname}/tx/${this.tx.txid}`,
           referenceId: `accelerator-${this.tx.txid.substring(0, 15)}-${Math.round(new Date().getTime() / 1000)}`
         });
 
@@ -795,7 +805,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
   }
 
   get canPayWithCashapp(): boolean {
-    if (!this.cashappEnabled || !this.conversions) {
+    if (!this.cashappEnabled || !this.conversions || (!this.isProdDomain && !isDevMode())) {
       return false;
     }
 
@@ -811,7 +821,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
   }
 
   get canPayWithApplePay(): boolean {
-    if (!this.applePayEnabled || !this.conversions) {
+    if (!this.applePayEnabled || !this.conversions || (!this.isProdDomain && !isDevMode())) {
       return false;
     }
 
@@ -827,7 +837,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
   }
 
   get canPayWithGooglePay(): boolean {
-    if (!this.googlePayEnabled || !this.conversions) {
+    if (!this.googlePayEnabled || !this.conversions || (!this.isProdDomain && !isDevMode())) {
       return false;
     }
 

frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.html

@@ -11,9 +11,9 @@
       <td class="field-value" [class]="chartPositionLeft ? 'chart-left' : ''">
         <div class="effective-fee-container">
           @if (accelerationInfo?.acceleratedFeeRate && (!tx.effectiveFeePerVsize || accelerationInfo.acceleratedFeeRate >= tx.effectiveFeePerVsize)) {
-            <app-fee-rate [fee]="accelerationInfo.acceleratedFeeRate"></app-fee-rate>
+            <app-fee-rate class="oobFees" [fee]="accelerationInfo.acceleratedFeeRate"></app-fee-rate>
           } @else {
-            <app-fee-rate [fee]="tx.effectiveFeePerVsize"></app-fee-rate>
+            <app-fee-rate class="oobFees" [fee]="tx.effectiveFeePerVsize"></app-fee-rate>
           }
         </div>
       </td>

frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.scss

@@ -62,3 +62,7 @@
     overflow: visible !important;
   }
 }
+
+.oobFees {
+  color: #905cf4;
+}

frontend/src/app/components/block-overview-graph/block-overview-graph.component.html

@@ -2,10 +2,12 @@
 <div class="graph-alignment" [class.grid-align]="!autofit" [style.gridTemplateColumns]="'repeat(auto-fit, ' + resolution + 'px)'">
   <div class="block-overview-graph">
     <canvas *browserOnly class="block-overview-canvas" [class.clickable]="!!hoverTx" #blockCanvas></canvas>
-    <div class="loader-wrapper" [class.hidden]="(!isLoading || disableSpinner) && !unavailable">
+    @if (!disableSpinner) {
+      <div class="loader-wrapper" [class.hidden]="!isLoading && !unavailable">
         <div *ngIf="!unavailable" class="spinner-border ml-3 loading" role="status"></div>
         <div *ngIf="!isLoading && unavailable" class="ml-3" i18n="block.not-available">not available</div>
       </div>
+    }
     <app-block-overview-tooltip
       [tx]="selectedTx || hoverTx"
       [cursorPosition]="tooltipPosition"

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

@@ -46,7 +46,7 @@
       @if (replaced) {
         <div class="alert-replaced" role="alert">
           <span i18n="transaction.rbf.replacement|RBF replacement">This transaction has been replaced by:</span>
-          <app-truncate [text]="latestReplacement" [lastChars]="12" [link]="['/tracker/' | relativeUrl, latestReplacement]"></app-truncate>
+          <app-truncate [text]="latestReplacement" [lastChars]="12" [link]="['/tx/' | relativeUrl, latestReplacement]" [queryParams]="{mode: 'status'}"></app-truncate>
         </div>
       } @else {
         <div class="tracker-bar">
@@ -118,7 +118,7 @@
         </div>
         <span class="explainer">&nbsp;</span>
       } @else {
-        @if (!tx.status?.confirmed && showAccelerationSummary) {
+        @if (tx && !tx.status?.confirmed && showAccelerationSummary) {
           <ng-container *ngIf="(ETA$ | async) as eta;">
             <app-accelerate-checkout
               *ngIf="(da$ | async) as da;"
@@ -135,7 +135,7 @@
             ></app-accelerate-checkout>
           </ng-container>
         }
-        <div class="status-panel d-flex flex-column h-100 w-100 justify-content-center align-items-center" [class.small-status]="!tx.status?.confirmed && showAccelerationSummary">
+        <div class="status-panel d-flex flex-column h-100 w-100 justify-content-center align-items-center" [class.small-status]="tx && !tx.status?.confirmed && showAccelerationSummary">
           @if (tx?.acceleration && !tx.status?.confirmed) {
             <div class="progress-icon">
               <fa-icon [icon]="['fas', 'wand-magic-sparkles']" [fixedWidth]="true"></fa-icon>
@@ -186,7 +186,7 @@
     </div>
 
     <div class="footer-link"
-      [routerLink]="['/tx' | relativeUrl, tx?.txid]"
+      [routerLink]="['/tx' | relativeUrl, tx?.txid || txId]"
       [queryParams]="{ mode: 'details' }"
       queryParamsHandling="merge"
     >

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

@@ -606,7 +606,14 @@
   @if (!isLoadingTx) {
     <tr>
       <td class="td-width" i18n="transaction.fee|Transaction fee">Fee</td>
-      <td>{{ tx.fee | number }} <span class="symbol" i18n="shared.sat|sat">sat</span> <span class="fiat"><app-fiat [blockConversion]="tx.price" [value]="tx.fee"></app-fiat></span></td>
+      <td class="text-wrap">{{ tx.fee | number }} <span class="symbol" i18n="shared.sat|sat">sat</span> 
+        @if (accelerationInfo?.bidBoost) {
+          <span class="oobFees" i18n-ngbTooltip="Acceleration Fees" ngbTooltip="Acceleration fees paid out-of-band"> +{{ accelerationInfo.bidBoost | number }} </span><span class="symbol" i18n="shared.sat|sat">sat</span>
+        } @else if (tx.feeDelta) {
+          <span class="oobFees" i18n-ngbTooltip="Acceleration Fees" ngbTooltip="Acceleration fees paid out-of-band"> +{{ tx.feeDelta | number }} </span><span class="symbol" i18n="shared.sat|sat">sat</span>
+        }
+        <span class="fiat"><app-fiat [blockConversion]="tx.price" [value]="tx.fee + (accelerationInfo?.bidBoost || tx.feeDelta || 0)"></app-fiat></span>
+      </td>
     </tr>
   } @else {
     <ng-container *ngTemplateOutlet="skeletonDetailsRow"></ng-container>
@@ -642,9 +649,9 @@
         <td>
           <div class="effective-fee-container">
             @if (accelerationInfo?.acceleratedFeeRate && (!tx.effectiveFeePerVsize || accelerationInfo.acceleratedFeeRate >= tx.effectiveFeePerVsize || tx.acceleration)) {
-              <app-fee-rate [fee]="accelerationInfo.acceleratedFeeRate"></app-fee-rate>
+              <app-fee-rate [class.oobFees]="isAcceleration" [fee]="accelerationInfo.acceleratedFeeRate"></app-fee-rate>
             } @else {
-              <app-fee-rate [fee]="tx.effectiveFeePerVsize"></app-fee-rate>
+              <app-fee-rate [class.oobFees]="isAcceleration" [fee]="tx.effectiveFeePerVsize"></app-fee-rate>
             }
 
             @if (tx?.status?.confirmed && !tx.acceleration && !accelerationInfo && tx.fee && tx.effectiveFeePerVsize) {

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

@@ -332,3 +332,7 @@
   top: -1px;
   margin-right: 2px;
 }
+
+.oobFees {
+  color: #905cf4;
+}

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

@@ -462,10 +462,24 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
             if (txPosition.position.acceleratedBy) {
               txPosition.cpfp.acceleratedBy = txPosition.position.acceleratedBy;
             }
+            if (txPosition.position.acceleratedAt) {
+              txPosition.cpfp.acceleratedAt = txPosition.position.acceleratedAt;
+            }
+            if (txPosition.position.feeDelta) {
+              txPosition.cpfp.feeDelta = txPosition.position.feeDelta;
+            }
             this.setCpfpInfo(txPosition.cpfp);
-          } else if ((this.tx?.acceleration && txPosition.position.acceleratedBy)) {
+          } else if ((this.tx?.acceleration)) {
+            if (txPosition.position.acceleratedBy) {
               this.tx.acceleratedBy = txPosition.position.acceleratedBy;
             }
+            if (txPosition.position.acceleratedAt) {
+              this.tx.acceleratedAt = txPosition.position.acceleratedAt;
+            }
+            if (txPosition.position.feeDelta) {
+              this.tx.feeDelta = txPosition.position.feeDelta;
+            }
+          }
 
           if (this.stateService.network === '') {
             if (!this.mempoolPosition.accelerated) {

frontend/src/app/interfaces/node-api.interface.ts

@@ -253,6 +253,8 @@ export interface MempoolPosition {
   vsize: number,
   accelerated?: boolean,
   acceleratedBy?: number[],
+  acceleratedAt?: number,
+  feeDelta?: number,
 }
 
 export interface AccelerationPosition extends MempoolPosition {

frontend/src/app/route-guards.ts

@@ -13,7 +13,7 @@ class GuardService {
 
   trackerGuard(route: Route, segments: UrlSegment[]): boolean {
     const preferredRoute = this.router.getCurrentNavigation()?.extractedUrl.queryParams?.mode;
-    return preferredRoute !== 'details' && this.navigationService.isInitialLoad() && window.innerWidth <= 767.98;
+    return (preferredRoute === 'status' || (preferredRoute !== 'details' && this.navigationService.isInitialLoad())) && window.innerWidth <= 767.98;
   }
 }
 

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

@@ -30,7 +30,6 @@ export class EnterpriseService {
       this.fetchSubdomainInfo();
       this.disableSubnetworks();
       this.stateService.env.ACCELERATOR = false;
-      this.stateService.env.ACCELERATOR_BUTTON = false;
     } else {
       this.insertMatomo();
     }

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

@@ -37,7 +37,11 @@ export class MiningService {
     private stateService: StateService,
     private apiService: ApiService,
     private storageService: StorageService,
-  ) { }
+  ) {
+    this.stateService.networkChanged$.subscribe((network) => {
+      this.clearCache();
+    });
+   }
 
   /**
    * Generate pool ranking stats
@@ -141,4 +145,9 @@ export class MiningService {
       totalBlockCount: parseInt(response.headers.get('x-total-count'), 10),
     };
   }
+
+  private clearCache(): void {
+    this.cache = {};
+    this.poolsData = [];
+  }
 }

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

@@ -210,6 +210,10 @@ export class StateService {
       this.env.MINING_DASHBOARD = false;
     }
 
+    if (document.location.hostname.endsWith('.onion')) {
+      this.env.SERVICES_API = 'http://mempoolhqx4isw62xs7abwphsq7ldayuidyx2v2oethdhhj6mlo2r6ad.onion/api/v1/services';
+    }
+
     if (this.isBrowser) {
       this.setNetworkBasedonUrl(window.location.pathname);
       this.setLightningBasedonUrl(window.location.pathname);
@@ -227,10 +231,6 @@ export class StateService {
       }
     });
 
-    if (this.referrer === 'https://cash.app/' && window.innerWidth < 850 && window.location.pathname.startsWith('/tx/')) {
-      this.router.navigate(['/tracker/' + window.location.pathname.slice(4)]);
-    }
-
     this.liveMempoolBlockTransactions$ = this.mempoolBlockUpdate$.pipe(scan((transactions: { [txid: string]: TransactionStripped }, change: MempoolBlockUpdate): { [txid: string]: TransactionStripped } => {
       if (isMempoolState(change)) {
         const txMap = {};

frontend/src/app/shared/components/testnet-alert/testnet-alert.component.html

@@ -5,9 +5,6 @@
       @if (stateService.network === 'testnet') {
         <span i18n="testnet3-deprecated">Testnet3 is deprecated, and will soon be replaced by <a href="/testnet4">Testnet4</a></span>
       }
-      @if (stateService.network === 'testnet4') {
-        <span i18n="testnet4-not-finalized">Testnet4 is not yet finalized, and may be reset at anytime.</span>
-      }
     </div>
     <button type="button" class="close" (click)="dismissWarning()">
       <span aria-hidden="true">&times;</span>

frontend/src/app/shared/components/truncate/truncate.component.html

@@ -1,6 +1,6 @@
 <span class="truncate" [style.max-width]="maxWidth ? maxWidth + 'px' : null" [style.justify-content]="textAlign" [class.inline]="inline">
     <ng-container *ngIf="link">
-      <a [routerLink]="link" class="truncate-link" [target]="external ? '_blank' : ''">
+      <a [routerLink]="link" [queryParams]="queryParams" class="truncate-link" [target]="external ? '_blank' : '_self'">
         <ng-container *ngIf="rtl; then rtlTruncated; else ltrTruncated;"></ng-container>
       </a>
     </ng-container>

frontend/src/app/shared/components/truncate/truncate.component.ts

@@ -10,6 +10,7 @@ export class TruncateComponent {
   @Input() text: string;
   @Input() link: any = null;
   @Input() external: boolean = false;
+  @Input() queryParams: any = undefined;
   @Input() lastChars: number = 4;
   @Input() maxWidth: number = null;
   @Input() inline: boolean = false;

frontend/src/locale/messages.nb.xlf

@@ -1792,6 +1792,7 @@
       </trans-unit>
       <trans-unit id="a7c328c4773db932ff14a1954e15e43dca58e7b7" datatype="html">
         <source>Completed</source>
+        <target>Fullført</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/acceleration/accelerations-list/accelerations-list.component.html</context>
           <context context-type="linenumber">65</context>
@@ -1800,6 +1801,7 @@
       </trans-unit>
       <trans-unit id="64b582e0d8e3a28331a14d2a1017fa5d6ffb8d93" datatype="html">
         <source>Failed</source>
+        <target>Mislyktes</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/acceleration/accelerations-list/accelerations-list.component.html</context>
           <context context-type="linenumber">67</context>

frontend/src/locale/messages.pl.xlf

@@ -1393,6 +1393,7 @@
       </trans-unit>
       <trans-unit id="c3aaae1073e33c932a5c98f98c3520645c0e3a93" datatype="html">
         <source>Out-of-band fees</source>
+        <target>Opłaty poza mempoolem</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/acceleration-timeline/acceleration-timeline-tooltip.component.html</context>
           <context context-type="linenumber">27</context>
@@ -1792,6 +1793,7 @@
       </trans-unit>
       <trans-unit id="a7c328c4773db932ff14a1954e15e43dca58e7b7" datatype="html">
         <source>Completed</source>
+        <target>Ukończone</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/acceleration/accelerations-list/accelerations-list.component.html</context>
           <context context-type="linenumber">65</context>
@@ -1800,6 +1802,7 @@
       </trans-unit>
       <trans-unit id="64b582e0d8e3a28331a14d2a1017fa5d6ffb8d93" datatype="html">
         <source>Failed</source>
+        <target>Nieudane</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/acceleration/accelerations-list/accelerations-list.component.html</context>
           <context context-type="linenumber">67</context>

unfurler/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "mempool-unfurl",
-  "version": "3.0.0-dev",
+  "version": "3.0.0-beta",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "mempool-unfurl",
-      "version": "3.0.0-dev",
+      "version": "3.0.0-beta",
       "dependencies": {
         "@types/node": "^16.11.41",
         "ejs": "^3.1.10",

unfurler/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mempool-unfurl",
-  "version": "3.0.0-dev",
+  "version": "3.0.0-beta",
   "description": "Renderer for mempool open graph link preview images",
   "repository": {
     "type": "git",