[indexing] initialize currentSha before hiting github

[indexing] make blocks.definition_hash nullable
[indexing] exit early when we're unable to index pools definition sha
2025-01-28 13:49:50 +01:00 · 2025-01-28 11:37:06 +01:00 · 2025-01-28 06:45:03 +01:00 · 2025-01-27 12:52:55 +09:00 · 2025-01-27 03:37:01 +00:00 · 2025-01-26 11:29:45 +09:00
46 changed files with 624 additions and 181 deletions
--- a/backend/src/api/bitcoin/bitcoin.routes.ts
+++ b/backend/src/api/bitcoin/bitcoin.routes.ts
@@ -21,6 +21,7 @@ import transactionRepository from '../../repositories/TransactionRepository';
 import rbfCache from '../rbf-cache';
 import { calculateMempoolTxCpfp } from '../cpfp';
 import { handleError } from '../../utils/api';
+import poolsUpdater from '../../tasks/pools-updater';

 const TXID_REGEX = /^[a-f0-9]{64}$/i;
 const BLOCK_HASH_REGEX = /^[a-f0-9]{64}$/i;
@@ -56,6 +57,10 @@ class BitcoinRoutes {
      .get(config.MEMPOOL.API_URL_PREFIX + 'blocks-bulk/:from/:to', this.getBlocksByBulk.bind(this))
      // Temporarily add txs/package endpoint for all backends until esplora supports it
      .post(config.MEMPOOL.API_URL_PREFIX + 'txs/package', this.$submitPackage)
+      // Internal routes
+      .get(config.MEMPOOL.API_URL_PREFIX + 'internal/blocks/definition/list', this.getBlockDefinitionHashes)
+      .get(config.MEMPOOL.API_URL_PREFIX + 'internal/blocks/definition/current', this.getCurrentBlockDefinitionHash)
+      .get(config.MEMPOOL.API_URL_PREFIX + 'internal/blocks/:definitionHash', this.getBlocksByDefinitionHash)
      ;

      if (config.MEMPOOL.BACKEND !== 'esplora') {
@@ -739,6 +744,52 @@ class BitcoinRoutes {
    }
  }

+  private async getBlockDefinitionHashes(req: Request, res: Response): Promise<void> {
+    try {
+      const result = await blocks.$getBlockDefinitionHashes();
+      if (!result) {
+        handleError(req, res, 503, `Service Temporarily Unavailable`);
+        return;
+      }
+      res.setHeader('content-type', 'application/json');
+      res.send(result);
+    } catch (e) {
+      handleError(req, res, 500, e instanceof Error ? e.message : e);
+    }
+  }
+
+  private async getCurrentBlockDefinitionHash(req: Request, res: Response): Promise<void> {
+    try {
+      const currentSha = await poolsUpdater.getShaFromDb();
+      if (!currentSha) {
+        handleError(req, res, 503, `Service Temporarily Unavailable`);
+        return;
+      }
+      res.setHeader('content-type', 'text/plain');
+      res.send(currentSha);
+    } catch (e) {
+      handleError(req, res, 500, e instanceof Error ? e.message : e);
+    }
+  }
+
+  private async getBlocksByDefinitionHash(req: Request, res: Response): Promise<void> {
+    try {
+      if (typeof(req.params.definitionHash) !== 'string') {
+        res.status(400).send('Parameter "hash" must be a valid string');
+        return;
+      }
+      const blocksHash = await blocks.$getBlocksByDefinitionHash(req.params.definitionHash as string);
+      if (!blocksHash) {
+        handleError(req, res, 503, `Service Temporarily Unavailable`);
+        return;
+      }
+      res.setHeader('content-type', 'application/json');
+      res.send(blocksHash);
+    } catch (e) {
+      handleError(req, res, 500, e instanceof Error ? e.message : e);
+    }
+  }
+
  private getBlockTipHeight(req: Request, res: Response) {
    try {
      const result = blocks.getCurrentBlockHeight();
--- a/backend/src/api/blocks.ts
+++ b/backend/src/api/blocks.ts
@@ -33,8 +33,8 @@ import AccelerationRepository from '../repositories/AccelerationRepository';
 import { calculateFastBlockCpfp, calculateGoodBlockCpfp } from './cpfp';
 import mempool from './mempool';
 import CpfpRepository from '../repositories/CpfpRepository';
-import accelerationApi from './services/acceleration';
 import { parseDATUMTemplateCreator } from '../utils/bitcoin-script';
+import database from '../database';

 class Blocks {
  private blocks: BlockExtended[] = [];
@@ -1462,6 +1462,36 @@ class Blocks {
      // not a fatal error, we'll try again next time the indexer runs
    }
  }
+
+  public async $getBlockDefinitionHashes(): Promise<string[] | null> {
+    try {
+      const [rows]: any = await database.query(`SELECT DISTINCT(definition_hash) FROM blocks`);
+      if (rows && Array.isArray(rows)) {
+        return rows.map(r => r.definition_hash);
+      } else {
+        logger.debug(`Unable to retreive list of blocks.definition_hash from db (no result)`);
+        return null;
+      }
+    } catch (e) {
+      logger.debug(`Unable to retreive list of blocks.definition_hash from db (exception: ${e})`);
+      return null;
+    }
+  }
+
+  public async $getBlocksByDefinitionHash(definitionHash: string): Promise<string[] | null> {
+    try {
+      const [rows]: any = await database.query(`SELECT hash FROM blocks WHERE definition_hash = ?`, [definitionHash]);
+      if (rows && Array.isArray(rows)) {
+        return rows.map(r => r.hash);
+      } else {
+        logger.debug(`Unable to retreive list of blocks for definition hash ${definitionHash} from db (no result)`);
+        return null;
+      }
+    } catch (e) {
+      logger.debug(`Unable to retreive list of blocks for definition hash ${definitionHash} from db (exception: ${e})`);
+      return null;
+    }
+  }
 }

 export default new Blocks();
--- a/backend/src/api/database-migration.ts
+++ b/backend/src/api/database-migration.ts
@@ -7,7 +7,7 @@ import cpfpRepository from '../repositories/CpfpRepository';
 import { RowDataPacket } from 'mysql2';

 class DatabaseMigration {
-  private static currentVersion = 94;
+  private static currentVersion = 96;
  private queryTimeout = 3600_000;
  private statisticsAddedIndexed = false;
  private uniqueLogs: string[] = [];
@@ -1118,6 +1118,29 @@ class DatabaseMigration {
      }
      await this.updateToSchemaVersion(94);
    }
+
+    // blocks pools-v2.json hash
+    if (databaseSchemaVersion < 95) {
+      let poolJsonSha = 'f737d86571d190cf1a1a3cf5fd86b33ba9624254'; // https://github.com/mempool/mining-pools/commit/f737d86571d190cf1a1a3cf5fd86b33ba9624254
+      const [poolJsonShaDb]: any[] = await DB.query(`SELECT string FROM state WHERE name = 'pools_json_sha'`);
+      if (poolJsonShaDb?.length > 0) {
+        poolJsonSha = poolJsonShaDb[0].string;
+      }
+      await this.$executeQuery(`ALTER TABLE blocks ADD definition_hash varchar(255) NOT NULL DEFAULT "${poolJsonSha}"`);
+      await this.$executeQuery('ALTER TABLE blocks ADD INDEX `definition_hash` (`definition_hash`)');
+      await this.updateToSchemaVersion(95);
+    }
+
+    // Make definition_hash nullable
+    if (databaseSchemaVersion < 96) {
+      let poolJsonSha = '0138019f39e0f6033db576be15a4880a216c1dd0'; // https://github.com/mempool/mining-pools/commit/0138019f39e0f6033db576be15a4880a216c1dd0
+      const [poolJsonShaDb]: any[] = await DB.query(`SELECT string FROM state WHERE name = 'pools_json_sha'`);
+      if (poolJsonShaDb?.length > 0) {
+        poolJsonSha = poolJsonShaDb[0].string;
+      }
+      await this.$executeQuery(`ALTER TABLE blocks MODIFY COLUMN definition_hash varchar(255) NULL DEFAULT "${poolJsonSha}"`);
+      await this.updateToSchemaVersion(96);
+    }
  }

  /**
--- a/backend/src/api/pools-parser.ts
+++ b/backend/src/api/pools-parser.ts
@@ -19,15 +19,6 @@ class PoolsParser {
    'addresses': '[]',
    'slug': 'unknown'
  };
-  private uniqueLogs: string[] = [];
-
-  private uniqueLog(loggerFunction: any, msg: string): void {
-    if (this.uniqueLogs.includes(msg)) {
-      return;
-    }
-    this.uniqueLogs.push(msg);
-    loggerFunction(msg);
-  }

  public setMiningPools(pools): void {
    for (const pool of pools) {
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -152,6 +152,11 @@ class Server {
    this.setUpWebsocketHandling();

    await poolsUpdater.updatePoolsJson(); // Needs to be done before loading the disk cache because we sometimes wipe it
+    if (config.DATABASE.ENABLED === true && config.MEMPOOL.ENABLED && ['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) && !poolsUpdater.currentSha) {
+      logger.err(`Failed to retreive pools-v2.json sha, cannot run block indexing. Please make sure you've set valid urls in your mempool-config.json::MEMPOOL::POOLS_JSON_URL and mempool-config.json::MEMPOOL::POOLS_JSON_TREE_UR, aborting now`);
+      return process.exit(1);
+    }
+
    await syncAssets.syncAssets$();
    await mempoolBlocks.updatePools$();
    if (config.MEMPOOL.ENABLED) {
--- a/backend/src/mempool.interfaces.ts
+++ b/backend/src/mempool.interfaces.ts
@@ -325,6 +325,8 @@ export interface BlockExtension {
  // Requires coinstatsindex, will be set to NULL otherwise
  utxoSetSize: number | null;
  totalInputAmt: number | null;
+  // pools-v2.json git hash
+  definitionHash: string | undefined;
 }

 /**
--- a/backend/src/repositories/BlocksRepository.ts
+++ b/backend/src/repositories/BlocksRepository.ts
@@ -15,6 +15,7 @@ import blocks from '../api/blocks';
 import BlocksAuditsRepository from './BlocksAuditsRepository';
 import transactionUtils from '../api/transaction-utils';
 import { parseDATUMTemplateCreator } from '../utils/bitcoin-script';
+import poolsUpdater from '../tasks/pools-updater';

 interface DatabaseBlock {
  id: string;
@@ -114,16 +115,16 @@ class BlocksRepository {

    try {
      const query = `INSERT INTO blocks(
-        height,             hash,                blockTimestamp,    size,
-        weight,             tx_count,            coinbase_raw,      difficulty,
-        pool_id,            fees,                fee_span,          median_fee,
-        reward,             version,             bits,              nonce,
-        merkle_root,        previous_block_hash, avg_fee,           avg_fee_rate,
-        median_timestamp,   header,              coinbase_address,  coinbase_addresses,
-        coinbase_signature, utxoset_size,        utxoset_change,    avg_tx_size,
-        total_inputs,       total_outputs,       total_input_amt,   total_output_amt,
-        fee_percentiles,    segwit_total_txs,    segwit_total_size, segwit_total_weight,
-        median_fee_amt,     coinbase_signature_ascii
+        height,             hash,                     blockTimestamp,    size,
+        weight,             tx_count,                 coinbase_raw,      difficulty,
+        pool_id,            fees,                     fee_span,          median_fee,
+        reward,             version,                  bits,              nonce,
+        merkle_root,        previous_block_hash,      avg_fee,           avg_fee_rate,
+        median_timestamp,   header,                   coinbase_address,  coinbase_addresses,
+        coinbase_signature, utxoset_size,             utxoset_change,    avg_tx_size,
+        total_inputs,       total_outputs,            total_input_amt,   total_output_amt,
+        fee_percentiles,    segwit_total_txs,         segwit_total_size, segwit_total_weight,
+        median_fee_amt,     coinbase_signature_ascii, definition_hash
      ) VALUE (
        ?, ?, FROM_UNIXTIME(?), ?,
        ?, ?, ?, ?,
@@ -134,7 +135,7 @@ class BlocksRepository {
        ?, ?, ?, ?,
        ?, ?, ?, ?,
        ?, ?, ?, ?,
-        ?, ?
+        ?, ?, ?
      )`;

      const poolDbId = await PoolsRepository.$getPoolByUniqueId(block.extras.pool.id);
@@ -181,6 +182,7 @@ class BlocksRepository {
        block.extras.segwitTotalWeight,
        block.extras.medianFeeAmt,
        truncatedCoinbaseSignatureAscii,
+        poolsUpdater.currentSha
      ];

      await DB.query(query, params);
@@ -1013,9 +1015,9 @@ class BlocksRepository {
  public async $savePool(id: string, poolId: number): Promise<void> {
    try {
      await DB.query(`
-        UPDATE blocks SET pool_id = ?
+        UPDATE blocks SET pool_id = ?, definition_hash = ?
        WHERE hash = ?`,
-        [poolId, id]
+        [poolId, poolsUpdater.currentSha, id]
      );
    } catch (e) {
      logger.err(`Cannot update block pool. Reason: ` + (e instanceof Error ? e.message : e));
--- a/backend/src/tasks/pools-updater.ts
+++ b/backend/src/tasks/pools-updater.ts
@@ -45,15 +45,15 @@ class PoolsUpdater {
    this.lastRun = now;

    try {
+      if (config.DATABASE.ENABLED === true) {
+        this.currentSha = await this.getShaFromDb();
+      }
+
      const githubSha = await this.fetchPoolsSha(); // Fetch pools-v2.json sha from github
      if (githubSha === null) {
        return;
      }

-      if (config.DATABASE.ENABLED === true) {
-        this.currentSha = await this.getShaFromDb();
-      }
-
      logger.debug(`pools-v2.json sha | Current: ${this.currentSha} | Github: ${githubSha}`, this.tag);
      if (this.currentSha !== null && this.currentSha === githubSha) {
        return;
@@ -88,8 +88,8 @@ class PoolsUpdater {

      try {
        await DB.query('START TRANSACTION;');
-        await poolsParser.migratePoolsJson();
        await this.updateDBSha(githubSha);
+        await poolsParser.migratePoolsJson();
        await DB.query('COMMIT;');
      } catch (e) {
        logger.err(`Could not migrate mining pools, rolling back. Exception: ${JSON.stringify(e)}`, this.tag);
@@ -121,7 +121,7 @@ class PoolsUpdater {
  /**
   * Fetch our latest pools-v2.json sha from the db
   */
-  private async getShaFromDb(): Promise<string | null> {
+  public async getShaFromDb(): Promise<string | null> {
    try {
      const [rows]: any[] = await DB.query('SELECT string FROM state WHERE name="pools_json_sha"');
      return (rows.length > 0 ? rows[0].string : null);
--- a/docker/frontend/entrypoint.sh
+++ b/docker/frontend/entrypoint.sh
@@ -45,6 +45,7 @@ __SERVICES_API__=${SERVICES_API:=https://mempool.space/api/v1/services}
 __PUBLIC_ACCELERATIONS__=${PUBLIC_ACCELERATIONS:=false}
 __HISTORICAL_PRICE__=${HISTORICAL_PRICE:=true}
 __ADDITIONAL_CURRENCIES__=${ADDITIONAL_CURRENCIES:=false}
+__STRATUM_ENABLED__=${STRATUM_ENABLED:=false}

 # Export as environment variables to be used by envsubst
 export __MAINNET_ENABLED__
@@ -76,6 +77,7 @@ export __SERVICES_API__
 export __PUBLIC_ACCELERATIONS__
 export __HISTORICAL_PRICE__
 export __ADDITIONAL_CURRENCIES__
+export __STRATUM_ENABLED__

 folder=$(find /var/www/mempool -name "config.js" | xargs dirname)
 echo ${folder}
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -365,9 +365,9 @@
          <app-active-acceleration-box [miningStats]="miningStats" [pools]="estimate.pools" [chartOnly]="true" class="ml-2"></app-active-acceleration-box>
        </div>
      </div>
-      <div class="payment-area mt-2 p-2" style="font-size: 14px;">
+      <div class="payment-area" style="font-size: 14px;">
        <div class="row text-center justify-content-center mx-2">
-          <p i18n="accelerator.payment-to-mempool-space">Payment to mempool.space for acceleration of txid <a [routerLink]="'/tx/' + tx.txid" target="_blank">{{ tx.txid.substr(0, 10) }}..{{ tx.txid.substr(-10) }}</a></p>
+          <span i18n="accelerator.payment-to-mempool-space">Payment to mempool.space for acceleration of txid <a [routerLink]="'/tx/' + tx.txid" target="_blank">{{ tx.txid.substr(0, 10) }}..{{ tx.txid.substr(-10) }}</a></span>
        </div>
        @if (canPayWithBalance || !(canPayWithBitcoin || canPayWithCashapp || canPayWithApplePay || canPayWithGooglePay)) {
          <div class="row">
@@ -386,9 +386,12 @@
                  <p><ng-container i18n="transaction.pay|Pay button label">Pay</ng-container>&nbsp;<span><small style="font-family: monospace;">{{ ((invoice.btcDue * 100_000_000) || cost) | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></span></p>
                  <app-bitcoin-invoice style="width: 100%;" [invoice]="invoice" [minimal]="true" (completed)="bitcoinPaymentCompleted()"></app-bitcoin-invoice>
                } @else if (btcpayInvoiceFailed) {
-                  <p i18n="accelerator.failed-to-load-invoice">Failed to load invoice</p>
-                  <div class="d-flex flex-column align-items-center justify-content-center" style="width: 100%; height: 292px;">
-                    <fa-icon style="font-size: 24px; color: var(--red)" [icon]="['fas', 'circle-xmark']"></fa-icon>
+                  <div class="btcpay-invoice">
+                    <fa-icon style="font-size: 20px; color: var(--red)" [icon]="['fas', 'circle-xmark']"></fa-icon>
+                    <span i18n="accelerator.failed-to-load-invoice">Failed to load invoice</span>
+                    @if (!loadingBtcpayInvoice) {
+                      <button class="btn btn-sm btn-secondary mt-0 mt-md-1" (click)="requestBTCPayInvoice()">Retry ↻</button>
+                    }
                  </div>
                } @else {
                  <p i18n="accelerator.loading-invoice">Loading invoice...</p>
@@ -397,13 +400,13 @@
                  </div>
                }
              </div>
-              @if (canPayWithCashapp || canPayWithApplePay || canPayWithGooglePay) {
+              @if (canPayWithCashapp || canPayWithApplePay || canPayWithGooglePay || canPayWithCardOnFile) {
                <div class="col-sm text-center flex-grow-0  d-flex flex-column justify-content-center align-items-center">
-                  <p class="text-nowrap">&mdash;<span i18n="or">OR</span>&mdash;</p>
+                  <p class="text-nowrap">&mdash;&mdash;<span i18n="or"> OR </span>&mdash;&mdash;</p>
                </div>
              }
            }
-            @if (canPayWithCashapp || canPayWithApplePay || canPayWithGooglePay) {
+            @if (canPayWithCashapp || canPayWithApplePay || canPayWithGooglePay || canPayWithCardOnFile) {
              <div class="col-sm text-center d-flex flex-column justify-content-center align-items-center">
                <p><ng-container i18n="transaction.pay|Pay button label">Pay</ng-container>&nbsp;<app-fiat [value]="cost"></app-fiat> with</p>
                @if (canPayWithCashapp) {
@@ -421,6 +424,17 @@
                    <img src="/resources/google-pay.png" height=37>
                  </div>
                }
+                @if (canPayWithCardOnFile) {
+                  @if (canPayWithCashapp || canPayWithApplePay || canPayWithGooglePay) { <span class="mt-1 mb-1"></span> }
+                  <div class="paymentMethod mx-2 d-flex justify-content-center align-items-center" style="width: 200px; height: 55px" (click)="moveToStep('cardonfile')">
+                    @if (['VISA', 'MASTERCARD', 'JCB', 'DISCOVER', 'DISCOVER_DINERS', 'AMERICAN_EXPRESS'].includes(estimate?.availablePaymentMethods?.cardOnFile?.card?.brand)) {
+                      <app-svg-images [name]="estimate?.availablePaymentMethods?.cardOnFile?.card?.brand" height="33" class="mr-2"></app-svg-images>
+                    } @else {
+                      <app-svg-images name="OTHER_BRAND" height="33" class="mr-2"></app-svg-images>
+                    }
+                    <span style="font-size: 22px; padding-bottom: 3px">{{ estimate?.availablePaymentMethods?.cardOnFile?.card?.last_4 }}</span>
+                  </div>
+                }
              </div>
            }
          </div>
@@ -443,7 +457,7 @@
        <button type="button" class="mt-1 btn btn-secondary btn-sm rounded-pill align-self-center" style="width: 200px" (click)="moveToStep('summary')" i18n="go-back">Go back</button>
      </div>
    </div>
-  } @else if (step === 'cashapp' || step === 'applepay' || step === 'googlepay') {
+  } @else if (step === 'cashapp' || step === 'applepay' || step === 'googlepay' || step === 'cardonfile') {
    <!-- Show checkout page -->
    <div class="row mb-md-1 text-center" id="confirm-title">
      <div class="col-sm" id="confirm-payment-title">
@@ -459,7 +473,7 @@
      </div>
    </div>

-    @if (step === 'cashapp' && !loadingCashapp || step === 'applepay' && !loadingApplePay || step === 'googlepay' && !loadingGooglePay) {
+    @if (step === 'cashapp' && !loadingCashapp || step === 'applepay' && !loadingApplePay || step === 'googlepay' && !loadingGooglePay || step === 'cardonfile' && !loadingCardOnFile) {
      <div class="row text-center mt-1">
        <div class="col-sm">
          <div class="form-group w-100">
@@ -484,8 +498,13 @@
            <div id="cash-app-pay" class="d-inline-block" style="height: 50px" [style]="loadingCashapp ? 'opacity: 0; width: 0px; height: 0px; pointer-events: none;' : ''"></div>
          } @else if (step === 'googlepay') {
            <div id="google-pay-button" class="d-inline-block" style="height: 50px" [style]="loadingGooglePay ? 'opacity: 0; width: 0px; height: 0px; pointer-events: none;' : ''"></div>
+          } @else if (step === 'cardonfile') {
+            <div class="paymentMethod mx-2 d-flex justify-content-center align-items-center ml-auto mr-auto" style="width: 200px; height: 55px" (click)="requestCardOnFilePayment()" [style]="loadingCardOnFile ? 'opacity: 0; width: 0px; height: 0px; pointer-events: none;' : ''">
+              <fa-icon style="font-size: 24px; color: white" [icon]="['fas', 'credit-card']"></fa-icon>
+              <span class="ml-2" style="font-size: 22px">{{ estimate?.availablePaymentMethods?.cardOnFile?.card?.brand }} {{ estimate?.availablePaymentMethods?.cardOnFile?.card?.last_4 }}</span>
+            </div>
          }
-          @if (loadingCashapp || loadingApplePay || loadingGooglePay) {
+          @if (loadingCashapp || loadingApplePay || loadingGooglePay || loadingCardOnFile) {
          <div display="d-flex flex-row justify-content-center">
            <span i18n="accelerator.loading-payment-method">Loading payment method...</span>
            <div class="ml-2 spinner-border text-light" style="width: 25px; height: 25px"></div>
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.scss
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.scss
@@ -153,6 +153,11 @@

 .payment-area {
  background: var(--bg);
+  margin-top: 0.5rem;
+  padding: 0.5rem;
+  @media (max-width: 575px) {
+    padding-bottom: 1.25rem;
+  }
 }

 .col.pie {
@@ -219,4 +224,17 @@
 }
 .apple-pay-button-white-with-line {
    -apple-pay-button-style: white-outline;
+}
+
+.btcpay-invoice {
+  display: flex;
+  height: 292px;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  @media (max-width: 575px) {
+    height: 75px;
+    flex-direction: row;
+    gap: 5px;
+  }
 }
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
@@ -13,7 +13,7 @@ import { EnterpriseService } from '@app/services/enterprise.service';
 import { ApiService } from '@app/services/api.service';
 import { isDevMode } from '@angular/core';

-export type PaymentMethod = 'balance' | 'bitcoin' | 'cashapp' | 'applePay' | 'googlePay';
+export type PaymentMethod = 'balance' | 'bitcoin' | 'cashapp' | 'applePay' | 'googlePay' | 'cardOnFile';

 export type AccelerationEstimate = {
  hasAccess: boolean;
@@ -26,7 +26,7 @@ export type AccelerationEstimate = {
  mempoolBaseFee: number;
  vsizeFee: number;
  pools: number[];
-  availablePaymentMethods: Record<PaymentMethod, {min: number, max: number}>;
+  availablePaymentMethods: Record<PaymentMethod, {min: number, max: number, card?: {card_id: string, last_4: string, brand: string, name: string, billing: any}}>;
  unavailable?: boolean;
  options: { // recommended bid options
    fee: number; // recommended userBid in sats
@@ -49,7 +49,7 @@ export const MIN_BID_RATIO = 1;
 export const DEFAULT_BID_RATIO = 2;
 export const MAX_BID_RATIO = 4;

-type CheckoutStep = 'quote' | 'summary' | 'checkout' | 'cashapp' | 'applepay' | 'googlepay' | 'processing' | 'paid' | 'success';
+type CheckoutStep = 'quote' | 'summary' | 'checkout' | 'cashapp' | 'applepay' | 'googlepay' | 'cardonfile' | 'processing' | 'paid' | 'success';

@Component({
  selector: 'app-accelerate-checkout',
@@ -62,9 +62,9 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
  @Input() miningStats: MiningStats;
  @Input() eta: ETA;
  @Input() scrollEvent: boolean;
-  @Input() cashappEnabled: boolean = true;
  @Input() applePayEnabled: boolean = false;
  @Input() googlePayEnabled: boolean = true;
+  @Input() cardOnFileEnabled: boolean = true;
  @Input() advancedEnabled: boolean = false;
  @Input() forceMobile: boolean = false;
  @Input() showDetails: boolean = false;
@@ -117,6 +117,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
  loadingCashapp = false;
  loadingApplePay = false;
  loadingGooglePay = false;
+  loadingCardOnFile = false;
  payments: any;
  cashAppPay: any;
  applePay: any;
@@ -219,10 +220,9 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
    }
    if (this._step === 'checkout' && this.canPayWithBitcoin) {
      this.btcpayInvoiceFailed = false;
-      this.loadingBtcpayInvoice = true;
      this.invoice = null;
      this.requestBTCPayInvoice();
-    } else if (this._step === 'cashapp' && this.cashappEnabled) {
+    } else if (this._step === 'cashapp') {
      this.loadingCashapp = true;
      this.setupSquare();
      this.scrollToElementWithTimeout('confirm-title', 'center', 100);
@@ -234,6 +234,10 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
      this.loadingGooglePay = true;
      this.setupSquare();
      this.scrollToElementWithTimeout('confirm-title', 'center', 100);
+    } else if (this._step === 'cardonfile' && this.cardOnFileEnabled) {
+      this.loadingCardOnFile = true;
+      this.setupSquare();
+      this.scrollToElementWithTimeout('confirm-title', 'center', 100);
    } else if (this._step === 'paid') {
      this.timePaid = Date.now();
      this.timeoutTimer = setTimeout(() => {
@@ -328,7 +332,6 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
          }

          if (this.step === 'checkout' && this.canPayWithBitcoin && !this.loadingBtcpayInvoice) {
-            this.loadingBtcpayInvoice = true;
            this.requestBTCPayInvoice();
          }

@@ -454,6 +457,8 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
            await this.requestApplePayPayment();
          } else if (this._step === 'googlepay') {
            await this.requestGooglePayPayment();
+          } else if (this._step === 'cardonfile') {
+            this.loadingCardOnFile = false;
          }
        },
        error: () => {
@@ -710,6 +715,109 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
    );
  }

+  /**
+   * Card On File
+   */
+  async requestCardOnFilePayment(): Promise<void> {
+    if (this.processing) {
+      return;
+    }
+    if (this.conversionsSubscription) {
+      this.conversionsSubscription.unsubscribe();
+    }
+    
+    this.processing = true;
+    this.conversionsSubscription = this.stateService.conversions$.subscribe(
+      async (conversions) => {
+        this.conversions = conversions;
+
+        const costUSD = this.cost / 100_000_000 * conversions.USD;
+        if (this.isCheckoutLocked > 0) {
+          return;
+        }
+        const cardOnFile = this.estimate?.availablePaymentMethods?.cardOnFile;
+        if (!cardOnFile?.card) {
+          this.accelerateError = 'card_on_file_not_found';
+          return;
+        }
+        this.loadingCardOnFile = false;
+        
+        try {
+          this.isCheckoutLocked += 2;
+          this.isTokenizing += 2;
+          
+          const nameParts = cardOnFile.card.name.split(' ');
+          const assumedGivenName = nameParts[0];
+          const assumedFamilyName = nameParts.length > 1 ? nameParts[1] : undefined;
+          const verificationDetails = {
+            card: {
+              billing: {
+                givenName: assumedGivenName,
+                familyName: assumedFamilyName,
+                addressLines: [cardOnFile.card.billing.addressLine1 ?? ''],
+                city: cardOnFile.card.billing.locality ?? '',
+                state: cardOnFile.card.billing.administrativeDistrictLevel1 ?? '',
+                countyCode: cardOnFile.card.billing.country,
+              }
+            }
+          };
+          const verificationToken = await this.$verifyBuyer(this.payments, cardOnFile.card.card_id, verificationDetails, costUSD.toFixed(2));
+          if (!verificationToken || !verificationToken.token) {
+            console.error(`SCA verification failed`);
+            this.accelerateError = 'SCA Verification Failed. Payment Declined.';
+            this.processing = false;
+            return;
+          }
+
+          this.servicesApiService.accelerateWithCardOnFile$(
+            this.tx.txid,
+            cardOnFile.card.card_id,
+            verificationToken.token,
+            `accelerator-${this.tx.txid.substring(0, 15)}-${Math.round(new Date().getTime() / 1000)}`,
+            costUSD,
+            verificationToken.userChallenged
+          ).subscribe({
+            next: () => {
+              this.processing = false;
+              this.apiService.logAccelerationRequest$(this.tx.txid).subscribe();
+              this.audioService.playSound('ascend-chime-cartoon');
+              setTimeout(() => {
+                this.isCheckoutLocked--;
+                this.isTokenizing--;
+                this.moveToStep('paid', true);
+              }, 1000);
+            },
+            error: (response) => {
+              this.processing = false;
+              this.accelerateError = response.error;
+              this.isCheckoutLocked--;
+              this.isTokenizing--;
+              if (!(response.status === 403 && response.error === 'not_available')) {
+                setTimeout(() => {
+                  // Reset everything by reloading the page :D, can be improved
+                  const urlParams = new URLSearchParams(window.location.search);
+                  window.location.assign(window.location.toString().replace(`?cash_request_id=${urlParams.get('cash_request_id')}`, ``));
+                }, 3000);
+              }
+            }
+          });
+
+        } catch (e) {
+          console.log(e);
+          this.isCheckoutLocked--;
+          this.isTokenizing--;
+          this.processing = false;
+          this.accelerateError = e.message;
+
+        } finally {
+          // always unlock the checkout once we're finished
+          this.isCheckoutLocked--;
+          this.isTokenizing--;
+        }
+      }
+    );
+  }
+
  /**
   * CASHAPP
   */
@@ -825,16 +933,19 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
   * BTCPay
   */
  async requestBTCPayInvoice(): Promise<void> {
+    this.loadingBtcpayInvoice = true;
    this.servicesApiService.generateBTCPayAcceleratorInvoice$(this.tx.txid, this.userBid).pipe(
      switchMap(response => {
        return this.servicesApiService.retreiveInvoice$(response.btcpayInvoiceId);
      }),
      catchError(error => {
        console.log(error);
+        this.loadingBtcpayInvoice = false;
        this.btcpayInvoiceFailed = true;
        return of(null);
      })
    ).subscribe((invoice) => {
+        this.loadingBtcpayInvoice = false;
        this.invoice = invoice;
        this.cd.markForCheck();
    });
@@ -871,9 +982,6 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
  }

  get couldPayWithCashapp(): boolean {
-    if (!this.cashappEnabled) {
-      return false;
-    }
    return !!this.estimate?.availablePaymentMethods?.cashapp;
  }

@@ -908,7 +1016,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
  }

  get canPayWithCashapp(): boolean {
-    if (!this.cashappEnabled || !this.conversions || (!this.isProdDomain && !isDevMode())) {
+    if (!this.conversions || (!this.isProdDomain && !isDevMode())) {
      return false;
    }

@@ -955,6 +1063,22 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
    return false;
  }

+  get canPayWithCardOnFile(): boolean {
+    if (!this.cardOnFileEnabled || !this.conversions || (!this.isProdDomain && !isDevMode())) {
+      return false;
+    }
+
+    const paymentMethod = this.estimate?.availablePaymentMethods?.cardOnFile;
+    if (paymentMethod) {
+      const costUSD = (this.cost / 100_000_000 * this.conversions.USD);
+      if (costUSD >= paymentMethod.min && costUSD <= paymentMethod.max) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
  get canPayWithBalance(): boolean {
    if (!this.hasAccessToBalanceMode) {
      return false;
--- a/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.html
+++ b/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.html
@@ -14,7 +14,7 @@
          <th class="time text-right" i18n="accelerator.requested">Requested</th>
        </ng-container>
        <ng-container *ngIf="!pending">
-          <th class="fee text-right" i18n="transaction.bid-boost|Bid Boost">Bid Boost</th>
+          <th class="fee text-right text-truncate" i18n="transaction.bid-boost|Bid Boost">Bid Boost</th>
          <th class="block text-right" i18n="shared.block-title">Block</th>
          <th class="pool text-right" i18n="mining.pool-name" *ngIf="!this.widget">Pool</th>
          <th class="status text-right" i18n="transaction.status|Transaction Status">Status</th>
@@ -64,7 +64,8 @@
              <span *ngIf="acceleration.status === 'accelerating'" class="badge badge-warning" i18n="accelerator.pending">Pending</span>
              <span *ngIf="acceleration.status.includes('completed') && acceleration.minedByPoolUniqueId && pools[acceleration.minedByPoolUniqueId]" class="badge badge-success"><ng-container i18n="accelerator.completed">Completed</ng-container><span *ngIf="acceleration.status === 'completed_provisional'">&nbsp;⌛</span></span>
              <span *ngIf="acceleration.status.includes('completed') && (!acceleration.minedByPoolUniqueId || !pools[acceleration.minedByPoolUniqueId])" class="badge badge-success"><ng-container i18n="transaction.rbf.mined">Mined</ng-container><span *ngIf="acceleration.status === 'completed_provisional'">&nbsp;⌛</span></span>
-              <span *ngIf="acceleration.status.includes('failed')" class="badge badge-danger"><ng-container i18n="accelerator.canceled">Canceled</ng-container><span *ngIf="acceleration.status === 'failed_provisional'">&nbsp;⌛</span></span>
+              <span *ngIf="acceleration.status.includes('failed') && acceleration.canceled" class="badge badge-danger"><ng-container i18n="accelerator.canceled">Canceled</ng-container><span *ngIf="acceleration.status === 'failed_provisional'">&nbsp;⌛</span></span>
+              <span *ngIf="acceleration.status.includes('failed') && !acceleration.canceled" class="badge badge-danger"><ng-container i18n="accelerator.canceled">Failed</ng-container><span *ngIf="acceleration.status === 'failed_provisional'">&nbsp;⌛</span></span>
            </td>
            <td class="date text-right" *ngIf="!this.widget">
              <app-time kind="since" [time]="acceleration.added" [fastRender]="true" [showTooltip]="true"></app-time>
--- a/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.html
+++ b/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.html
@@ -10,6 +10,10 @@
    </span>
  }

+  <div class="d-flex justify-content-center">
+    <app-mempool-error *ngIf="paymentErrorMessage" [error]="paymentErrorMessage"></app-mempool-error>
+  </div>
+
  <div *ngIf="paymentStatus === 2">
    
    <form [formGroup]="paymentForm">
--- a/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.ts
+++ b/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.ts
@@ -1,9 +1,8 @@
 import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges } from '@angular/core';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { DomSanitizer, SafeUrl } from '@angular/platform-browser';
-import { ActivatedRoute } from '@angular/router';
-import { Subscription, of, timer } from 'rxjs';
-import { filter, repeat, retry, switchMap, take, tap } from 'rxjs/operators';
+import { Subscription, of, catchError } from 'rxjs';
+import { retry, tap } from 'rxjs/operators';
 import { ServicesApiServices } from '@app/services/services-api.service';

@Component({
@@ -18,30 +17,17 @@ export class BitcoinInvoiceComponent implements OnInit, OnChanges, OnDestroy {
  @Output() completed = new EventEmitter();

  paymentForm: FormGroup;
-  requestSubscription: Subscription | undefined;
  paymentStatusSubscription: Subscription | undefined;
  paymentStatus = 1; // 1 - Waiting for invoice | 2 - Pending payment | 3 - Payment completed
-  paramMapSubscription: Subscription | undefined;
-  invoiceSubscription: Subscription | undefined;
-  invoiceTimeout; // Wait for angular to load all the things before making a request
+  paymentErrorMessage: string = '';

  constructor(
    private formBuilder: FormBuilder,
    private apiService: ServicesApiServices,
-    private sanitizer: DomSanitizer,
-    private activatedRoute: ActivatedRoute
+    private sanitizer: DomSanitizer
  ) { }

  ngOnDestroy() {
-    if (this.requestSubscription) {
-      this.requestSubscription.unsubscribe();
-    }
-    if (this.paramMapSubscription) {
-      this.paramMapSubscription.unsubscribe();
-    }
-    if (this.invoiceSubscription) {
-      this.invoiceSubscription.unsubscribe();
-    }
    if (this.paymentStatusSubscription) {
      this.paymentStatusSubscription.unsubscribe();
    }
@@ -72,15 +58,39 @@ export class BitcoinInvoiceComponent implements OnInit, OnChanges, OnDestroy {
    } else {
      this.paymentStatus = 4;
    }
+
+    this.monitorPendingInvoice();
+  }
+
+  monitorPendingInvoice(): void {
+    if (!this.invoice) {
+      return;
+    }
+    if (this.paymentStatusSubscription) {
+      this.paymentStatusSubscription.unsubscribe();
+    }
    this.paymentStatusSubscription = this.apiService.getPaymentStatus$(this.invoice.btcpayInvoiceId).pipe(
-      retry({ delay: () => timer(2000)}),
-      repeat({delay: 2000}),
-      filter((response) => response.status !== 204 && response.status !== 404),
-      take(1),
-    ).subscribe(() => {
-      this.paymentStatus = 3;
-      this.completed.emit();
-    });
+      tap(result => {
+        if (result.status === 204) { // Manually trigger an error in that case so we can retry
+          throw result;
+        } else if (result.status === 200) { // Invoice settled
+          this.paymentStatus = 3;
+          this.completed.emit();
+        }
+      }),
+      catchError(err => {
+        if (err.status === 204 || err.status === 504) {
+          throw err; // Will trigger the retry
+        } else if (err.status === 400) {
+          this.paymentErrorMessage = 'Invoice has expired';
+        } else if (err.status === 404) {
+          this.paymentErrorMessage = 'Invoice is no longer valid';
+        }
+        this.paymentStatus = -1;
+        return of(null);
+      }),
+      retry({ delay: 1000 }),
+    ).subscribe();
  }

  get availableMethods(): string[] {
--- a/frontend/src/app/components/faucet/faucet.component.html
+++ b/frontend/src/app/components/faucet/faucet.component.html
@@ -19,12 +19,10 @@
    } @else if (!user) {
      <!-- User not logged in -->
      <div class="alert alert-mempool d-block text-center w-100">
-        <div class="d-inline align-middle">
-          <span>To use the faucet, please&nbsp;</span>
-          <a routerLink="/login" [queryParams]="{'redirectTo': '/testnet4/faucet'}">login</a>
-          <span class="mr-2">&nbsp;or</span>
+        <div class="d-inline align-middle pr-2">
+          <span>To use the faucet, please</span>
        </div>
-        <app-twitter-login customClass="btn btn-sm" width="220px" redirectTo="/testnet4/faucet" buttonString="Sign up with Twitter"></app-twitter-login>
+        <app-github-login customClass="btn btn-sm" width="150px" redirectTo="/testnet4/faucet" buttonString="Sign up with"></app-github-login>
      </div>
    }
    @else if (user && user.status === 'pending' && !user.email && user.snsId) {
@@ -36,18 +34,18 @@
      </div>
    }
    @else if (error === 'not_available') {
-      <!-- User logged in but not a paid user or did not link its Twitter account -->
+      <!-- User logged in but not a paid user or did not link its Github account -->
      <div class="alert alert-mempool d-block text-center w-100">
        <div class="d-inline align-middle">
          <span class="mb-2 mr-2">To use the faucet, please</span>
        </div>
-        <app-twitter-login customClass="btn btn-sm" width="180px" redirectTo="/testnet4/faucet" buttonString="Link your Twitter"></app-twitter-login>
+        <app-github-login customClass="btn btn-sm" width="180px" redirectTo="/testnet4/faucet" buttonString="Link your"></app-github-login>
      </div>
    }
    @else if (error === 'account_limited') {
      <div class="alert alert-mempool d-block text-center w-100">
        <div class="d-inline align-middle">
-          <span class="mb-2 mr-2">Your Twitter account does not allow you to access the faucet</span>
+          <span class="mb-2 mr-2">Your account does not allow you to access the faucet</span>
        </div>
      </div>
    }
--- a/frontend/src/app/components/faucet/faucet.component.ts
+++ b/frontend/src/app/components/faucet/faucet.component.ts
@@ -24,7 +24,7 @@ export class FaucetComponent implements OnInit, OnDestroy {
    min: number; // minimum amount to request at once (in sats)
    max: number; // maximum amount to request at once
    address?: string; // faucet address
-    code: 'ok' | 'faucet_not_available' | 'faucet_maximum_reached' | 'faucet_too_soon';
+    code: 'ok' | 'faucet_not_available' | 'faucet_maximum_reached' | 'faucet_too_soon' | 'faucet_not_available_no_utxo';
  } | null = null;
  faucetForm: FormGroup;

--- a/frontend/src/app/components/github-login.component/github-login.component.html
+++ b/frontend/src/app/components/github-login.component/github-login.component.html
@@ -0,0 +1,6 @@
+<a href="#" (click)="githubLogin()" [class]="(disabled ? 'disabled': '') + (customClass ? customClass : 'w-100 btn mt-1 d-flex justify-content-center align-items-center')" style="background-color: rgb(31, 35, 40)" [style]="width ? 'width: ' + width : ''">
+  <span class="ml-2 text-light align-middle">{{ buttonString }}</span>
+  <svg height="32" viewBox="0 0 18 16" width="32" style="fill: white; padding-left: 5px">
+    <path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0016 8c0-4.42-3.58-8-8-8z"/>
+  </svg>
+</a>
--- a/frontend/src/app/components/github-login.component/github-login.component.ts
+++ b/frontend/src/app/components/github-login.component/github-login.component.ts
@@ -0,0 +1,25 @@
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+@Component({
+  selector: 'app-github-login',
+  templateUrl: './github-login.component.html',
+})
+export class GithubLogin {
+  @Input() width: string | null = null;
+  @Input() customClass: string | null = null;
+  @Input() buttonString: string= 'unset';
+  @Input() redirectTo: string | null = null;
+  @Output() clicked = new EventEmitter<boolean>();
+  @Input() disabled: boolean = false;
+
+  constructor() {}
+
+  githubLogin() {
+    this.clicked.emit(true);
+    if (this.redirectTo) {
+      location.replace(`/api/v1/services/auth/login/github?redirectTo=${encodeURIComponent(this.redirectTo)}`);
+    } else {
+      location.replace(`/api/v1/services/auth/login/github?redirectTo=${location.href}`);
+    }
+    return false;
+  }
+}
--- a/frontend/src/app/components/pool/pool.component.html
+++ b/frontend/src/app/components/pool/pool.component.html
@@ -267,7 +267,13 @@
                    <tbody>
                      <tr>
                        @for (branch of job.merkleBranches; track $index) {
-                          <td class="merkle" [style.background-color]="branch ? '#' + branch.slice(0, 6) : ''"></td>
+                          <td class="merkle" [style.background-color]="branch ? '#' + branch.slice(0, 6) : ''">
+                            @if ($index === 0 && branch) {
+                              <a [routerLink]="['/tx' | relativeUrl, reverseHash(branch)]" class="cell-link">
+                                <fa-icon [icon]="['fas', 'external-link-alt']" [fixedWidth]="true" style="vertical-align: text-top; font-size: 14px; color: white"></fa-icon>
+                              </a>
+                            }
+                          </td>
                        }
                        @for (_ of [].constructor(Math.max(0, 12 - job.merkleBranches.length)); track $index) {
                          <td class="merkle empty-branch"></td>
--- a/frontend/src/app/components/pool/pool.component.scss
+++ b/frontend/src/app/components/pool/pool.component.scss
@@ -220,6 +220,7 @@ div.scrollable {

  .merkle {
    width: 100px;
+    text-align: center;
  }

  .empty-branch {
@@ -240,6 +241,19 @@ div.scrollable {
  td {
    position: relative;
    height: 2em;
+
+    .cell-link {
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 100%;
+      color: inherit;
+      text-decoration: none;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
  }
 }

--- a/frontend/src/app/components/pool/pool.component.ts
+++ b/frontend/src/app/components/pool/pool.component.ts
@@ -361,6 +361,10 @@ export class PoolComponent implements OnInit {
    return block.height;
  }

+  reverseHash(hash: string) {
+    return hash.match(/../g).reverse().join('');
+  }
+
  ngOnDestroy(): void {
    this.slugSubscription.unsubscribe();
  }
--- a/frontend/src/app/components/server-health/server-health.component.ts
+++ b/frontend/src/app/components/server-health/server-health.component.ts
@@ -82,6 +82,10 @@ export class ServerHealthComponent implements OnInit {
      return '🇺🇸';
    } else if (host.includes('.va1.')) {
      return '🇺🇸';
+    } else if (host.includes('.sg1.')) {
+      return '🇸🇬';
+    } else if (host.includes('.hnl.')) {
+      return '🤙';
    } else {
      return '';
    }
--- a/frontend/src/app/components/stratum/stratum-list/stratum-list.component.html
+++ b/frontend/src/app/components/stratum/stratum-list/stratum-list.component.html
@@ -7,30 +7,27 @@
    <table *ngIf="poolsReady && (rows$ | async) as rows;" class="stratum-table">
      <thead>
        <tr>
-          <td class="height">Height</td>
-          <td class="reward">Reward</td>
-          <td class="tag">Coinbase Tag</td>
          <td class="merkle" [attr.colspan]="rows[0]?.merkleCells?.length || 4">
            Merkle Branches
          </td>
          <td class="pool">Pool</td>
+          <td class="tag">Coinbase Tag</td>
+          <td class="reward">Reward</td>
+          <td class="height">Height</td>
        </tr>
      </thead>
      <tbody>
        @for (row of rows; track row.job.pool) {
          <tr>
-            <td class="height">
-              {{ row.job.height }}
-            </td>
-            <td class="reward">
-              <app-amount [satoshis]="row.job.reward"></app-amount>
-            </td>
-            <td class="tag">
-              {{ row.job.tag }}
-            </td>
            @for (cell of row.merkleCells; track $index) {
              <td class="merkle" [style.background-color]="cell.hash ? '#' + cell.hash.slice(0, 6) : ''">
-                <div class="pipe-segment" [class]="pipeToClass(cell.type)"></div>
+                @if ($index === 0 && cell.hash) {
+                  <a [routerLink]="['/tx' | relativeUrl, reverseHash(cell.hash)]" class="cell-link">
+                    <div class="pipe-segment" [class]="pipeToClass(cell.type)"></div>
+                  </a>
+                } @else {
+                  <div class="pipe-segment" [class]="pipeToClass(cell.type)"></div>
+                }
              </td>
            }
            <td class="pool">
@@ -41,6 +38,15 @@
                </a>
              }
            </td>
+            <td class="tag">
+              {{ row.job.tag }}
+            </td>
+            <td class="reward">
+              <app-amount [satoshis]="row.job.reward"></app-amount>
+            </td>
+            <td class="height">
+              {{ row.job.height }}
+            </td>
          </tr>
        }
      </tbody>
--- a/frontend/src/app/components/stratum/stratum-list/stratum-list.component.scss
+++ b/frontend/src/app/components/stratum/stratum-list/stratum-list.component.scss
@@ -92,6 +92,36 @@ td {
      }
    }
  }
+
+  .cell-link {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    color: inherit;
+    text-decoration: none;
+  }
+}
+
+@media (max-width: 800px) {
+  .stratum-table {
+    td {
+      &.tag {
+        display: none;
+      }
+    }
+  }
+}
+
+@media (max-width: 650px) {
+  .stratum-table {
+    td {
+      &.reward {
+        display: none;
+      }
+    }
+  }
 }

 .badge {
--- a/frontend/src/app/components/stratum/stratum-list/stratum-list.component.ts
+++ b/frontend/src/app/components/stratum/stratum-list/stratum-list.component.ts
@@ -48,14 +48,16 @@ function parseTag(scriptSig: string): string {
  return (ascii.match(/\/.*\//)?.[0] || ascii).trim();
 }

-function getMerkleBranchIds(merkleBranches: string[], numBranches: number): string[] {
+function getMerkleBranchIds(merkleBranches: string[], numBranches: number, poolId: number): string[] {
  let lastHash = '';
  const ids: string[] = [];
  for (let i = 0; i < numBranches; i++) {
    if (merkleBranches[i]) {
      lastHash = merkleBranches[i];
+      ids.push(`${i}-${lastHash}`);
+    } else {
+      ids.push(`${i}-${lastHash}-${poolId}`);
    }
-    ids.push(`${i}-${lastHash}`);
  }
  return ids;
 }
@@ -98,7 +100,7 @@ export class StratumList implements OnInit, OnDestroy {
    const numBranches = Math.max(...Object.values(rawJobs).map(job => job.merkleBranches.length));
    const jobs: Record<string, TaggedStratumJob> = {};
    for (const [id, job] of Object.entries(rawJobs)) {
-      jobs[id] = { ...job, tag: parseTag(job.scriptsig), merkleBranchIds: getMerkleBranchIds(job.merkleBranches, numBranches) };
+      jobs[id] = { ...job, tag: parseTag(job.scriptsig), merkleBranchIds: getMerkleBranchIds(job.merkleBranches, numBranches, job.pool) };
    }
    if (Object.keys(jobs).length === 0) {
      return [];
@@ -196,6 +198,10 @@ export class StratumList implements OnInit, OnDestroy {
    }[type];
  }

+  reverseHash(hash: string) {
+    return hash.match(/../g).reverse().join('');
+  }
+
  ngOnDestroy(): void {
    this.websocketService.stopTrackStratum();
  }
--- a/frontend/src/app/components/svg-images/svg-images.component.html
+++ b/frontend/src/app/components/svg-images/svg-images.component.html
@@ -1,4 +1,47 @@
 <ng-container [ngSwitch]="name">
+  <ng-container *ngSwitchCase="'VISA'">
+    <svg xmlns="http://www.w3.org/2000/svg" [attr.width]="width" [attr.height]="height" viewBox="0 0 576 512" fill="white" xmlns="http://www.w3.org/2000/svg">
+      <!--!Font Awesome Free 6.7.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.-->
+      <path d="M470.1 231.3s7.6 37.2 9.3 45H446c3.3-8.9 16-43.5 16-43.5-.2 .3 3.3-9.1 5.3-14.9l2.8 13.4zM576 80v352c0 26.5-21.5 48-48 48H48c-26.5 0-48-21.5-48-48V80c0-26.5 21.5-48 48-48h480c26.5 0 48 21.5 48 48zM152.5 331.2L215.7 176h-42.5l-39.3 106-4.3-21.5-14-71.4c-2.3-9.9-9.4-12.7-18.2-13.1H32.7l-.7 3.1c15.8 4 29.9 9.8 42.2 17.1l35.8 135h42.5zm94.4 .2L272.1 176h-40.2l-25.1 155.4h40.1zm139.9-50.8c.2-17.7-10.6-31.2-33.7-42.3-14.1-7.1-22.7-11.9-22.7-19.2 .2-6.6 7.3-13.4 23.1-13.4 13.1-.3 22.7 2.8 29.9 5.9l3.6 1.7 5.5-33.6c-7.9-3.1-20.5-6.6-36-6.6-39.7 0-67.6 21.2-67.8 51.4-.3 22.3 20 34.7 35.2 42.2 15.5 7.6 20.8 12.6 20.8 19.3-.2 10.4-12.6 15.2-24.1 15.2-16 0-24.6-2.5-37.7-8.3l-5.3-2.5-5.6 34.9c9.4 4.3 26.8 8.1 44.8 8.3 42.2 .1 69.7-20.8 70-53zM528 331.4L495.6 176h-31.1c-9.6 0-16.9 2.8-21 12.9l-59.7 142.5H426s6.9-19.2 8.4-23.3H486c1.2 5.5 4.8 23.3 4.8 23.3H528z"/>
+    </svg>
+  </ng-container>
+
+  <ng-container *ngSwitchCase="'MASTERCARD'">
+    <svg xmlns="http://www.w3.org/2000/svg" [attr.width]="width" [attr.height]="height" viewBox="0 0 576 512" fill="white" xmlns="http://www.w3.org/2000/svg">
+      <!--!Font Awesome Free 6.7.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.--><path d="M482.9 410.3c0 6.8-4.6 11.7-11.2 11.7-6.8 0-11.2-5.2-11.2-11.7 0-6.5 4.4-11.7 11.2-11.7 6.6 0 11.2 5.2 11.2 11.7zm-310.8-11.7c-7.1 0-11.2 5.2-11.2 11.7 0 6.5 4.1 11.7 11.2 11.7 6.5 0 10.9-4.9 10.9-11.7-.1-6.5-4.4-11.7-10.9-11.7zm117.5-.3c-5.4 0-8.7 3.5-9.5 8.7h19.1c-.9-5.7-4.4-8.7-9.6-8.7zm107.8 .3c-6.8 0-10.9 5.2-10.9 11.7 0 6.5 4.1 11.7 10.9 11.7 6.8 0 11.2-4.9 11.2-11.7 0-6.5-4.4-11.7-11.2-11.7zm105.9 26.1c0 .3 .3 .5 .3 1.1 0 .3-.3 .5-.3 1.1-.3 .3-.3 .5-.5 .8-.3 .3-.5 .5-1.1 .5-.3 .3-.5 .3-1.1 .3-.3 0-.5 0-1.1-.3-.3 0-.5-.3-.8-.5-.3-.3-.5-.5-.5-.8-.3-.5-.3-.8-.3-1.1 0-.5 0-.8 .3-1.1 0-.5 .3-.8 .5-1.1 .3-.3 .5-.3 .8-.5 .5-.3 .8-.3 1.1-.3 .5 0 .8 0 1.1 .3 .5 .3 .8 .3 1.1 .5s.2 .6 .5 1.1zm-2.2 1.4c.5 0 .5-.3 .8-.3 .3-.3 .3-.5 .3-.8 0-.3 0-.5-.3-.8-.3 0-.5-.3-1.1-.3h-1.6v3.5h.8V426h.3l1.1 1.4h.8l-1.1-1.3zM576 81v352c0 26.5-21.5 48-48 48H48c-26.5 0-48-21.5-48-48V81c0-26.5 21.5-48 48-48h480c26.5 0 48 21.5 48 48zM64 220.6c0 76.5 62.1 138.5 138.5 138.5 27.2 0 53.9-8.2 76.5-23.1-72.9-59.3-72.4-171.2 0-230.5-22.6-15-49.3-23.1-76.5-23.1-76.4-.1-138.5 62-138.5 138.2zm224 108.8c70.5-55 70.2-162.2 0-217.5-70.2 55.3-70.5 162.6 0 217.5zm-142.3 76.3c0-8.7-5.7-14.4-14.7-14.7-4.6 0-9.5 1.4-12.8 6.5-2.4-4.1-6.5-6.5-12.2-6.5-3.8 0-7.6 1.4-10.6 5.4V392h-8.2v36.7h8.2c0-18.9-2.5-30.2 9-30.2 10.2 0 8.2 10.2 8.2 30.2h7.9c0-18.3-2.5-30.2 9-30.2 10.2 0 8.2 10 8.2 30.2h8.2v-23zm44.9-13.7h-7.9v4.4c-2.7-3.3-6.5-5.4-11.7-5.4-10.3 0-18.2 8.2-18.2 19.3 0 11.2 7.9 19.3 18.2 19.3 5.2 0 9-1.9 11.7-5.4v4.6h7.9V392zm40.5 25.6c0-15-22.9-8.2-22.9-15.2 0-5.7 11.9-4.8 18.5-1.1l3.3-6.5c-9.4-6.1-30.2-6-30.2 8.2 0 14.3 22.9 8.3 22.9 15 0 6.3-13.5 5.8-20.7 .8l-3.5 6.3c11.2 7.6 32.6 6 32.6-7.5zm35.4 9.3l-2.2-6.8c-3.8 2.1-12.2 4.4-12.2-4.1v-16.6h13.1V392h-13.1v-11.2h-8.2V392h-7.6v7.3h7.6V416c0 17.6 17.3 14.4 22.6 10.9zm13.3-13.4h27.5c0-16.2-7.4-22.6-17.4-22.6-10.6 0-18.2 7.9-18.2 19.3 0 20.5 22.6 23.9 33.8 14.2l-3.8-6c-7.8 6.4-19.6 5.8-21.9-4.9zm59.1-21.5c-4.6-2-11.6-1.8-15.2 4.4V392h-8.2v36.7h8.2V408c0-11.6 9.5-10.1 12.8-8.4l2.4-7.6zm10.6 18.3c0-11.4 11.6-15.1 20.7-8.4l3.8-6.5c-11.6-9.1-32.7-4.1-32.7 15 0 19.8 22.4 23.8 32.7 15l-3.8-6.5c-9.2 6.5-20.7 2.6-20.7-8.6zm66.7-18.3H408v4.4c-8.3-11-29.9-4.8-29.9 13.9 0 19.2 22.4 24.7 29.9 13.9v4.6h8.2V392zm33.7 0c-2.4-1.2-11-2.9-15.2 4.4V392h-7.9v36.7h7.9V408c0-11 9-10.3 12.8-8.4l2.4-7.6zm40.3-14.9h-7.9v19.3c-8.2-10.9-29.9-5.1-29.9 13.9 0 19.4 22.5 24.6 29.9 13.9v4.6h7.9v-51.7zm7.6-75.1v4.6h.8V302h1.9v-.8h-4.6v.8h1.9zm6.6 123.8c0-.5 0-1.1-.3-1.6-.3-.3-.5-.8-.8-1.1-.3-.3-.8-.5-1.1-.8-.5 0-1.1-.3-1.6-.3-.3 0-.8 .3-1.4 .3-.5 .3-.8 .5-1.1 .8-.5 .3-.8 .8-.8 1.1-.3 .5-.3 1.1-.3 1.6 0 .3 0 .8 .3 1.4 0 .3 .3 .8 .8 1.1 .3 .3 .5 .5 1.1 .8 .5 .3 1.1 .3 1.4 .3 .5 0 1.1 0 1.6-.3 .3-.3 .8-.5 1.1-.8 .3-.3 .5-.8 .8-1.1 .3-.6 .3-1.1 .3-1.4zm3.2-124.7h-1.4l-1.6 3.5-1.6-3.5h-1.4v5.4h.8v-4.1l1.6 3.5h1.1l1.4-3.5v4.1h1.1v-5.4zm4.4-80.5c0-76.2-62.1-138.3-138.5-138.3-27.2 0-53.9 8.2-76.5 23.1 72.1 59.3 73.2 171.5 0 230.5 22.6 15 49.5 23.1 76.5 23.1 76.4 .1 138.5-61.9 138.5-138.4z"/>
+    </svg>
+  </ng-container>
+
+  <ng-container *ngSwitchCase="'JCB'">
+    <svg xmlns="http://www.w3.org/2000/svg" [attr.width]="width" [attr.height]="height" viewBox="0 0 576 512" fill="white" xmlns="http://www.w3.org/2000/svg">
+      <!--!Font Awesome Free 6.7.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.--><path d="M431.5 244.3V212c41.2 0 38.5 .2 38.5 .2 7.3 1.3 13.3 7.3 13.3 16 0 8.8-6 14.5-13.3 15.8-1.2 .4-3.3 .3-38.5 .3zm42.8 20.2c-2.8-.7-3.3-.5-42.8-.5v35c39.6 0 40 .2 42.8-.5 7.5-1.5 13.5-8 13.5-17 0-8.7-6-15.5-13.5-17zM576 80v352c0 26.5-21.5 48-48 48H48c-26.5 0-48-21.5-48-48V80c0-26.5 21.5-48 48-48h480c26.5 0 48 21.5 48 48zM182 192.3h-57c0 67.1 10.7 109.7-35.8 109.7-19.5 0-38.8-5.7-57.2-14.8v28c30 8.3 68 8.3 68 8.3 97.9 0 82-47.7 82-131.2zm178.5 4.5c-63.4-16-165-14.9-165 59.3 0 77.1 108.2 73.6 165 59.2V287C312.9 311.7 253 309 253 256s59.8-55.6 107.5-31.2v-28zM544 286.5c0-18.5-16.5-30.5-38-32v-.8c19.5-2.7 30.3-15.5 30.3-30.2 0-19-15.7-30-37-31 0 0 6.3-.3-120.3-.3v127.5h122.7c24.3 .1 42.3-12.9 42.3-33.2z"/>
+    </svg>
+  </ng-container>
+
+  <ng-container *ngSwitchCase="'DISCOVER'">
+    <svg xmlns="http://www.w3.org/2000/svg" [attr.width]="width" [attr.height]="height" viewBox="0 0 576 512" fill="white" xmlns="http://www.w3.org/2000/svg">
+      <!--!Font Awesome Free 6.7.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.--><path d="M520.4 196.1c0-7.9-5.5-12.1-15.6-12.1h-4.9v24.9h4.7c10.3 0 15.8-4.4 15.8-12.8zM528 32H48C21.5 32 0 53.5 0 80v352c0 26.5 21.5 48 48 48h480c26.5 0 48-21.5 48-48V80c0-26.5-21.5-48-48-48zm-44.1 138.9c22.6 0 52.9-4.1 52.9 24.4 0 12.6-6.6 20.7-18.7 23.2l25.8 34.4h-19.6l-22.2-32.8h-2.2v32.8h-16zm-55.9 .1h45.3v14H444v18.2h28.3V217H444v22.2h29.3V253H428zm-68.7 0l21.9 55.2 22.2-55.2h17.5l-35.5 84.2h-8.6l-35-84.2zm-55.9-3c24.7 0 44.6 20 44.6 44.6 0 24.7-20 44.6-44.6 44.6-24.7 0-44.6-20-44.6-44.6 0-24.7 20-44.6 44.6-44.6zm-49.3 6.1v19c-20.1-20.1-46.8-4.7-46.8 19 0 25 27.5 38.5 46.8 19.2v19c-29.7 14.3-63.3-5.7-63.3-38.2 0-31.2 33.1-53 63.3-38zm-97.2 66.3c11.4 0 22.4-15.3-3.3-24.4-15-5.5-20.2-11.4-20.2-22.7 0-23.2 30.6-31.4 49.7-14.3l-8.4 10.8c-10.4-11.6-24.9-6.2-24.9 2.5 0 4.4 2.7 6.9 12.3 10.3 18.2 6.6 23.6 12.5 23.6 25.6 0 29.5-38.8 37.4-56.6 11.3l10.3-9.9c3.7 7.1 9.9 10.8 17.5 10.8zM55.4 253H32v-82h23.4c26.1 0 44.1 17 44.1 41.1 0 18.5-13.2 40.9-44.1 40.9zm67.5 0h-16v-82h16zM544 433c0 8.2-6.8 15-15 15H128c189.6-35.6 382.7-139.2 416-160zM74.1 191.6c-5.2-4.9-11.6-6.6-21.9-6.6H48v54.2h4.2c10.3 0 17-2 21.9-6.4 5.7-5.2 8.9-12.8 8.9-20.7s-3.2-15.5-8.9-20.5z"/>
+    </svg>
+  </ng-container>
+
+  <ng-container *ngSwitchCase="'DISCOVER_DINERS'">
+    <svg xmlns="http://www.w3.org/2000/svg" [attr.width]="width" [attr.height]="height" viewBox="0 0 576 512" fill="white" xmlns="http://www.w3.org/2000/svg">
+      <!--!Font Awesome Free 6.7.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.--><path d="M239.7 79.9c-96.9 0-175.8 78.6-175.8 175.8 0 96.9 78.9 175.8 175.8 175.8 97.2 0 175.8-78.9 175.8-175.8 0-97.2-78.6-175.8-175.8-175.8zm-39.9 279.6c-41.7-15.9-71.4-56.4-71.4-103.8s29.7-87.9 71.4-104.1v207.9zm79.8 .3V151.6c41.7 16.2 71.4 56.7 71.4 104.1s-29.7 87.9-71.4 104.1zM528 32H48C21.5 32 0 53.5 0 80v352c0 26.5 21.5 48 48 48h480c26.5 0 48-21.5 48-48V80c0-26.5-21.5-48-48-48zM329.7 448h-90.3c-106.2 0-193.8-85.5-193.8-190.2C45.6 143.2 133.2 64 239.4 64h90.3c105 0 200.7 79.2 200.7 193.8 0 104.7-95.7 190.2-200.7 190.2z"/>
+    </svg>
+  </ng-container>
+
+  <ng-container *ngSwitchCase="'AMERICAN_EXPRESS'">
+    <svg xmlns="http://www.w3.org/2000/svg" [attr.width]="width" [attr.height]="height" viewBox="0 0 576 512" fill="white" xmlns="http://www.w3.org/2000/svg">
+      <!--!Font Awesome Free 6.7.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.--><path d="M0 432c0 26.5 21.5 48 48 48H528c26.5 0 48-21.5 48-48v-1.1H514.3l-31.9-35.1-31.9 35.1H246.8V267.1H181L262.7 82.4h78.6l28.1 63.2V82.4h97.2L483.5 130l17-47.6H576V80c0-26.5-21.5-48-48-48H48C21.5 32 0 53.5 0 80V432zm440.4-21.7L482.6 364l42 46.3H576l-68-72.1 68-72.1H525.4l-42 46.7-41.5-46.7H390.5L458 338.6l-67.4 71.6V377.1h-83V354.9h80.9V322.6H307.6V300.2h83V267.1h-122V410.3H440.4zm96.3-72L576 380.2V296.9l-39.3 41.4zm-36.3-92l36.9-100.6V246.3H576V103H515.8l-32.2 89.3L451.7 103H390.5V246.1L327.3 103H276.1L213.7 246.3h43l11.9-28.7h65.9l12 28.7h82.7V146L466 246.3h34.4zM282 185.4l19.5-46.9 19.4 46.9H282z"/>
+    </svg>
+  </ng-container>
+
+  <ng-container *ngSwitchCase="'OTHER_BRAND'">
+    <svg xmlns="http://www.w3.org/2000/svg" [attr.width]="width" [attr.height]="height" viewBox="0 0 576 512" fill="white" xmlns="http://www.w3.org/2000/svg">
+      <!--!Font Awesome Free 6.7.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.--><path d="M512 80c8.8 0 16 7.2 16 16l0 32L48 128l0-32c0-8.8 7.2-16 16-16l448 0zm16 144l0 192c0 8.8-7.2 16-16 16L64 432c-8.8 0-16-7.2-16-16l0-192 480 0zM64 32C28.7 32 0 60.7 0 96L0 416c0 35.3 28.7 64 64 64l448 0c35.3 0 64-28.7 64-64l0-320c0-35.3-28.7-64-64-64L64 32zm56 304c-13.3 0-24 10.7-24 24s10.7 24 24 24l48 0c13.3 0 24-10.7 24-24s-10.7-24-24-24l-48 0zm128 0c-13.3 0-24 10.7-24 24s10.7 24 24 24l112 0c13.3 0 24-10.7 24-24s-10.7-24-24-24l-112 0z"/>
+    </svg>
+  </ng-container>
+
  <ng-container *ngSwitchCase="'officialMempoolSpace'">
    <svg [class]="class" [style]="style" [attr.width]="width" [attr.height]="height" [attr.viewBox]="viewBox" fill="none" xmlns="http://www.w3.org/2000/svg">
      <path d="M163.658 113.263C161.089 113.263 158.992 111.146 158.992 108.535C158.992 105.966 161.048 103.951 163.658 103.951C166.269 103.951 168.325 105.966 168.325 108.535C168.325 111.125 166.228 113.263 163.658 113.263Z" fill="#9857FF"/>
--- a/frontend/src/app/components/tracker/tracker.component.html
+++ b/frontend/src/app/components/tracker/tracker.component.html
@@ -124,7 +124,6 @@
          <ng-container *ngIf="(ETA$ | async) as eta;">
            <app-accelerate-checkout
              *ngIf="(da$ | async) as da;"
-              [cashappEnabled]="cashappEligible"
              [advancedEnabled]="false"
              [forceMobile]="true"
              [tx]="tx"
--- a/frontend/src/app/components/tracker/tracker.component.ts
+++ b/frontend/src/app/components/tracker/tracker.component.ts
@@ -756,10 +756,6 @@ export class TrackerComponent implements OnInit, OnDestroy {
    }
  }

-  get cashappEligible(): boolean {
-    return this.mempoolPosition?.block > 0 && this.tx.weight < 4000;
-  }
-
  get showAccelerationSummary(): boolean {
    return (
      this.tx
--- a/frontend/src/app/components/transaction/transaction.component.html
+++ b/frontend/src/app/components/transaction/transaction.component.html
@@ -139,7 +139,6 @@

      <app-accelerate-checkout
        *ngIf="(da$ | async) as da;"
-        [cashappEnabled]="cashappEligible"
        [advancedEnabled]="true"
        [tx]="tx"
        [accelerating]="isAcceleration"
--- a/frontend/src/app/components/transaction/transaction.component.ts
+++ b/frontend/src/app/components/transaction/transaction.component.ts
@@ -156,7 +156,6 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
  showAccelerationDetails = false;
  hasAccelerationDetails = false;
  scrollIntoAccelPreview = false;
-  cashappEligible = false;
  auditEnabled: boolean = this.stateService.env.AUDIT && this.stateService.env.BASE_MODULE === 'mempool' && this.stateService.env.MINING_DASHBOARD === true;
  isMempoolSpaceBuild = this.stateService.isMempoolSpaceBuild;

@@ -528,9 +527,6 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
                  this.miningStats = stats;
                });
              }
-              if (txPosition.position?.block > 0 && this.tx.weight < 4000) {
-                this.cashappEligible = true;
-              }
              if (!this.gotInitialPosition && txPosition.position?.block === 0 && txPosition.position?.vsize < 750_000) {
                this.accelerationFlowCompleted = true;
              }
@@ -1036,7 +1032,6 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
    this.showAccelerationDetails = false;
    this.accelerationFlowCompleted = false;
    this.accelerationInfo = null;
-    this.cashappEligible = false;
    this.txInBlockIndex = null;
    this.mempoolPosition = null;
    this.pool = null;
--- a/frontend/src/app/components/twitter-login/twitter-login.component.html
+++ b/frontend/src/app/components/twitter-login/twitter-login.component.html
@@ -1,6 +1,6 @@
 <a href="#" (click)="twitterLogin()"
  [class]="(disabled ? 'disabled': '') + (customClass ? customClass : 'w-100 btn mt-1 d-flex justify-content-center align-items-center')"
-  style="background-color: #1DA1F2" [style]="width ? 'width: ' + width : ''">
-  <img src="./resources/twitter.svg" height="25" style="padding: 2px" [alt]="buttonString + ' with Twitter'" />
+  style="background-color: rgb(31, 35, 40)" [style]="width ? 'width: ' + width : ''">
  <span class="ml-2 text-light align-middle">{{ buttonString }}</span>
+  <img src="./resources/x.svg" height="25" style="padding: 2px; padding-left: 5px" [alt]="buttonString + ' with Twitter'" />
 </a>
--- a/frontend/src/app/interfaces/node-api.interface.ts
+++ b/frontend/src/app/interfaces/node-api.interface.ts
@@ -412,13 +412,13 @@ export interface Acceleration {
  feeDelta: number;
  blockHash: string;
  blockHeight: number;
-
  acceleratedFeeRate?: number;
  boost?: number;
  bidBoost?: number;
  boostCost?: number;
  boostRate?: number;
  minedByPoolUniqueId?: number;
+  canceled?: number;
 }

 export interface AccelerationHistoryParams {
--- a/frontend/src/app/services/auth.service.ts
+++ b/frontend/src/app/services/auth.service.ts
@@ -58,6 +58,7 @@ export class AuthServiceMempool {
  setAuth(auth: any) {
    if (!auth) {
      localStorage.removeItem('auth');
+      localStorage.removeItem('authenticatorStatus');
    } else {
      localStorage.setItem('auth', JSON.stringify(auth));
    }
--- a/frontend/src/app/services/services-api.service.ts
+++ b/frontend/src/app/services/services-api.service.ts
@@ -146,6 +146,10 @@ export class ServicesApiServices {
    return this.httpClient.post<any>(`${this.stateService.env.SERVICES_API}/accelerator/accelerate/googlePay`, { txInput: txInput, cardTag: cardTag, token: token, verificationToken: verificationToken, referenceId: referenceId, userApprovedUSD: userApprovedUSD, userChallenged: userChallenged });
  }

+  accelerateWithCardOnFile$(txInput: string, token: string, verificationToken: string, referenceId: string, userApprovedUSD: number, userChallenged: boolean) {
+    return this.httpClient.post<any>(`${this.stateService.env.SERVICES_API}/accelerator/accelerate/cardOnFile`, { txInput: txInput, token: token, verificationToken: verificationToken, referenceId: referenceId, userApprovedUSD: userApprovedUSD, userChallenged: userChallenged });
+  }
+
  getAccelerations$(): Observable<Acceleration[]> {
    return this.httpClient.get<Acceleration[]>(`${this.stateService.env.SERVICES_API}/accelerator/accelerations`);
  }
--- a/frontend/src/app/shared/components/mempool-error/mempool-error.component.ts
+++ b/frontend/src/app/shared/components/mempool-error/mempool-error.component.ts
@@ -26,6 +26,7 @@ export const MempoolErrors = {
  'unauthorized': `You are not authorized to do this`,
  'faucet_too_soon': `You cannot request any more coins right now. Try again later.`,
  'faucet_not_available': `The faucet is not available right now. Try again later.`,
+  'faucet_not_available_no_utxo': `The faucet is not available right now. Please try again once a new block has been mined.`,
  'faucet_maximum_reached': `You are not allowed to request more coins`,
  'faucet_address_not_allowed': `You cannot use this address`,
  'faucet_below_minimum': `Requested amount is too small`,
--- a/frontend/src/app/shared/shared.module.ts
+++ b/frontend/src/app/shared/shared.module.ts
@@ -7,7 +7,7 @@ import { faFilter, faAngleDown, faAngleUp, faAngleRight, faAngleLeft, faBolt, fa
  faFileAlt, faRedoAlt, faArrowAltCircleRight, faExternalLinkAlt, faBook, faListUl, faDownload, faQrcode, faArrowRightArrowLeft, faArrowsRotate, faCircleLeft,
  faFastForward, faWallet, faUserClock, faWrench, faUserFriends, faQuestionCircle, faHistory, faSignOutAlt, faKey, faSuitcase, faIdCardAlt, faNetworkWired, faUserCheck,
  faCircleCheck, faUserCircle, faCheck, faRocket, faScaleBalanced, faHourglassStart, faHourglassHalf, faHourglassEnd, faWandMagicSparkles, faFaucetDrip, faTimeline,
-  faCircleXmark, faCalendarCheck, faMoneyBillTrendUp, faRobot, faShareNodes } from '@fortawesome/free-solid-svg-icons';
+  faCircleXmark, faCalendarCheck, faMoneyBillTrendUp, faRobot, faShareNodes, faCreditCard } from '@fortawesome/free-solid-svg-icons';
 import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 import { MenuComponent } from '@components/menu/menu.component';
 import { PreviewTitleComponent } from '@components/master-page-preview/preview-title.component';
@@ -125,6 +125,7 @@ import { TwitterLogin } from '@components/twitter-login/twitter-login.component'
 import { BitcoinInvoiceComponent } from '@components/bitcoin-invoice/bitcoin-invoice.component';

 import { OnlyVsizeDirective, OnlyWeightDirective } from '@app/shared/components/weight-directives/weight-directives';
+import { GithubLogin } from '../components/github-login.component/github-login.component';

@NgModule({
  declarations: [
@@ -242,6 +243,7 @@ import { OnlyVsizeDirective, OnlyWeightDirective } from '@app/shared/components/
    TwitterWidgetComponent,
    FaucetComponent,
    TwitterLogin,
+    GithubLogin,
    BitcoinInvoiceComponent,
  ],
  imports: [
@@ -376,6 +378,7 @@ import { OnlyVsizeDirective, OnlyWeightDirective } from '@app/shared/components/
    HttpErrorComponent,
    TwitterWidgetComponent,
    TwitterLogin,
+    GithubLogin,
    BitcoinInvoiceComponent,
    BitcoinsatoshisPipe,

@@ -460,5 +463,6 @@ export class SharedModule {
    library.addIcons(faMoneyBillTrendUp);
    library.addIcons(faRobot);
    library.addIcons(faShareNodes);
+    library.addIcons(faCreditCard);
  }
 }
--- a/production/mempool-config.liquid.json
+++ b/production/mempool-config.liquid.json
@@ -26,12 +26,14 @@
  "ESPLORA": {
    "UNIX_SOCKET_PATH": "/elements/socket/esplora-elements-liquid",
    "FALLBACK": [
-      "http://node201.fmt.mempool.space:3001",
-      "http://node202.fmt.mempool.space:3001",
-      "http://node203.fmt.mempool.space:3001",
-      "http://node204.fmt.mempool.space:3001",
-      "http://node205.fmt.mempool.space:3001",
-      "http://node206.fmt.mempool.space:3001",
+      "http://node201.hnl.mempool.space:3001",
+      "http://node202.hnl.mempool.space:3001",
+      "http://node203.hnl.mempool.space:3001",
+      "http://node204.hnl.mempool.space:3001",
+      "http://node201.sg1.mempool.space:3001",
+      "http://node202.sg1.mempool.space:3001",
+      "http://node203.sg1.mempool.space:3001",
+      "http://node204.sg1.mempool.space:3001",
      "http://node201.va1.mempool.space:3001",
      "http://node202.va1.mempool.space:3001",
      "http://node203.va1.mempool.space:3001",
--- a/production/mempool-config.liquidtestnet.json
+++ b/production/mempool-config.liquidtestnet.json
@@ -26,12 +26,14 @@
  "ESPLORA": {
    "UNIX_SOCKET_PATH": "/elements/socket/esplora-elements-liquidtestnet",
    "FALLBACK": [
-      "http://node201.fmt.mempool.space:3004",
-      "http://node202.fmt.mempool.space:3004",
-      "http://node203.fmt.mempool.space:3004",
-      "http://node204.fmt.mempool.space:3004",
-      "http://node205.fmt.mempool.space:3004",
-      "http://node206.fmt.mempool.space:3004",
+      "http://node201.hnl.mempool.space:3004",
+      "http://node202.hnl.mempool.space:3004",
+      "http://node203.hnl.mempool.space:3004",
+      "http://node204.hnl.mempool.space:3004",
+      "http://node201.sg1.mempool.space:3004",
+      "http://node202.sg1.mempool.space:3004",
+      "http://node203.sg1.mempool.space:3004",
+      "http://node204.sg1.mempool.space:3004",
      "http://node201.va1.mempool.space:3004",
      "http://node202.va1.mempool.space:3004",
      "http://node203.va1.mempool.space:3004",
--- a/production/mempool-config.mainnet-lightning.json
+++ b/production/mempool-config.mainnet-lightning.json
@@ -19,12 +19,14 @@
  "ESPLORA": {
    "UNIX_SOCKET_PATH": "/bitcoin/socket/esplora-bitcoin-mainnet",
    "FALLBACK": [
-      "http://node201.fmt.mempool.space:3000",
-      "http://node202.fmt.mempool.space:3000",
-      "http://node203.fmt.mempool.space:3000",
-      "http://node204.fmt.mempool.space:3000",
-      "http://node205.fmt.mempool.space:3000",
-      "http://node206.fmt.mempool.space:3000",
+      "http://node201.hnl.mempool.space:3000",
+      "http://node202.hnl.mempool.space:3000",
+      "http://node203.hnl.mempool.space:3000",
+      "http://node204.hnl.mempool.space:3000",
+      "http://node201.sg1.mempool.space:3000",
+      "http://node202.sg1.mempool.space:3000",
+      "http://node203.sg1.mempool.space:3000",
+      "http://node204.sg1.mempool.space:3000",
      "http://node201.va1.mempool.space:3000",
      "http://node202.va1.mempool.space:3000",
      "http://node203.va1.mempool.space:3000",
--- a/production/mempool-config.mainnet.json
+++ b/production/mempool-config.mainnet.json
@@ -40,12 +40,14 @@
  "ESPLORA": {
    "UNIX_SOCKET_PATH": "/bitcoin/socket/esplora-bitcoin-mainnet",
    "FALLBACK": [
-      "http://node201.fmt.mempool.space:3000",
-      "http://node202.fmt.mempool.space:3000",
-      "http://node203.fmt.mempool.space:3000",
-      "http://node204.fmt.mempool.space:3000",
-      "http://node205.fmt.mempool.space:3000",
-      "http://node206.fmt.mempool.space:3000",
+      "http://node201.hnl.mempool.space:3000",
+      "http://node202.hnl.mempool.space:3000",
+      "http://node203.hnl.mempool.space:3000",
+      "http://node204.hnl.mempool.space:3000",
+      "http://node201.sg1.mempool.space:3000",
+      "http://node202.sg1.mempool.space:3000",
+      "http://node203.sg1.mempool.space:3000",
+      "http://node204.sg1.mempool.space:3000",
      "http://node201.va1.mempool.space:3000",
      "http://node202.va1.mempool.space:3000",
      "http://node203.va1.mempool.space:3000",
@@ -101,12 +103,14 @@
    "STATISTICS": true,
    "STATISTICS_START_TIME": "24h",
    "SERVERS": [
-      "node201.fmt.mempool.space",
-      "node202.fmt.mempool.space",
-      "node203.fmt.mempool.space",
-      "node204.fmt.mempool.space",
-      "node205.fmt.mempool.space",
-      "node206.fmt.mempool.space",
+      "node201.hnl.mempool.space",
+      "node202.hnl.mempool.space",
+      "node203.hnl.mempool.space",
+      "node204.hnl.mempool.space",
+      "node201.sg1.mempool.space",
+      "node202.sg1.mempool.space",
+      "node203.sg1.mempool.space",
+      "node204.sg1.mempool.space",
      "node201.va1.mempool.space",
      "node202.va1.mempool.space",
      "node203.va1.mempool.space",
--- a/production/mempool-config.signet-lightning.json
+++ b/production/mempool-config.signet-lightning.json
@@ -19,12 +19,14 @@
  "ESPLORA": {
    "UNIX_SOCKET_PATH": "/bitcoin/socket/esplora-bitcoin-signet",
    "FALLBACK": [
-      "http://node201.fmt.mempool.space:3003",
-      "http://node202.fmt.mempool.space:3003",
-      "http://node203.fmt.mempool.space:3003",
-      "http://node204.fmt.mempool.space:3003",
-      "http://node205.fmt.mempool.space:3003",
-      "http://node206.fmt.mempool.space:3003",
+      "http://node201.hnl.mempool.space:3003",
+      "http://node202.hnl.mempool.space:3003",
+      "http://node203.hnl.mempool.space:3003",
+      "http://node204.hnl.mempool.space:3003",
+      "http://node201.sg1.mempool.space:3003",
+      "http://node202.sg1.mempool.space:3003",
+      "http://node203.sg1.mempool.space:3003",
+      "http://node204.sg1.mempool.space:3003",
      "http://node201.va1.mempool.space:3003",
      "http://node202.va1.mempool.space:3003",
      "http://node203.va1.mempool.space:3003",
--- a/production/mempool-config.signet.json
+++ b/production/mempool-config.signet.json
@@ -28,12 +28,14 @@
  "ESPLORA": {
    "UNIX_SOCKET_PATH": "/bitcoin/socket/esplora-bitcoin-signet",
    "FALLBACK": [
-      "http://node201.fmt.mempool.space:3003",
-      "http://node202.fmt.mempool.space:3003",
-      "http://node203.fmt.mempool.space:3003",
-      "http://node204.fmt.mempool.space:3003",
-      "http://node205.fmt.mempool.space:3003",
-      "http://node206.fmt.mempool.space:3003",
+      "http://node201.hnl.mempool.space:3003",
+      "http://node202.hnl.mempool.space:3003",
+      "http://node203.hnl.mempool.space:3003",
+      "http://node204.hnl.mempool.space:3003",
+      "http://node201.sg1.mempool.space:3003",
+      "http://node202.sg1.mempool.space:3003",
+      "http://node203.sg1.mempool.space:3003",
+      "http://node204.sg1.mempool.space:3003",
      "http://node201.va1.mempool.space:3003",
      "http://node202.va1.mempool.space:3003",
      "http://node203.va1.mempool.space:3003",
--- a/production/mempool-config.testnet-lightning.json
+++ b/production/mempool-config.testnet-lightning.json
@@ -19,12 +19,14 @@
  "ESPLORA": {
    "UNIX_SOCKET_PATH": "/bitcoin/socket/esplora-bitcoin-testnet",
    "FALLBACK": [
-      "http://node201.fmt.mempool.space:3002",
-      "http://node202.fmt.mempool.space:3002",
-      "http://node203.fmt.mempool.space:3002",
-      "http://node204.fmt.mempool.space:3002",
-      "http://node205.fmt.mempool.space:3002",
-      "http://node206.fmt.mempool.space:3002",
+      "http://node201.hnl.mempool.space:3002",
+      "http://node202.hnl.mempool.space:3002",
+      "http://node203.hnl.mempool.space:3002",
+      "http://node204.hnl.mempool.space:3002",
+      "http://node201.sg1.mempool.space:3002",
+      "http://node202.sg1.mempool.space:3002",
+      "http://node203.sg1.mempool.space:3002",
+      "http://node204.sg1.mempool.space:3002",
      "http://node201.va1.mempool.space:3002",
      "http://node202.va1.mempool.space:3002",
      "http://node203.va1.mempool.space:3002",
--- a/production/mempool-config.testnet.json
+++ b/production/mempool-config.testnet.json
@@ -28,12 +28,14 @@
  "ESPLORA": {
    "UNIX_SOCKET_PATH": "/bitcoin/socket/esplora-bitcoin-testnet",
    "FALLBACK": [
-      "http://node201.fmt.mempool.space:3002",
-      "http://node202.fmt.mempool.space:3002",
-      "http://node203.fmt.mempool.space:3002",
-      "http://node204.fmt.mempool.space:3002",
-      "http://node205.fmt.mempool.space:3002",
-      "http://node206.fmt.mempool.space:3002",
+      "http://node201.hnl.mempool.space:3002",
+      "http://node202.hnl.mempool.space:3002",
+      "http://node203.hnl.mempool.space:3002",
+      "http://node204.hnl.mempool.space:3002",
+      "http://node201.sg1.mempool.space:3002",
+      "http://node202.sg1.mempool.space:3002",
+      "http://node203.sg1.mempool.space:3002",
+      "http://node204.sg1.mempool.space:3002",
      "http://node201.va1.mempool.space:3002",
      "http://node202.va1.mempool.space:3002",
      "http://node203.va1.mempool.space:3002",
--- a/production/mempool-config.testnet4.json
+++ b/production/mempool-config.testnet4.json
@@ -28,12 +28,14 @@
  "ESPLORA": {
    "UNIX_SOCKET_PATH": "/bitcoin/socket/esplora-bitcoin-testnet4",
    "FALLBACK": [
-      "http://node201.fmt.mempool.space:3005",
-      "http://node202.fmt.mempool.space:3005",
-      "http://node203.fmt.mempool.space:3005",
-      "http://node204.fmt.mempool.space:3005",
-      "http://node205.fmt.mempool.space:3005",
-      "http://node206.fmt.mempool.space:3005",
+      "http://node201.hnl.mempool.space:3005",
+      "http://node202.hnl.mempool.space:3005",
+      "http://node203.hnl.mempool.space:3005",
+      "http://node204.hnl.mempool.space:3005",
+      "http://node201.sg1.mempool.space:3005",
+      "http://node202.sg1.mempool.space:3005",
+      "http://node203.sg1.mempool.space:3005",
+      "http://node204.sg1.mempool.space:3005",
      "http://node201.va1.mempool.space:3005",
      "http://node202.va1.mempool.space:3005",
      "http://node203.va1.mempool.space:3005",
Author	SHA1	Message	Date
nymkappa	2b79fd438d	[indexing] initialize `currentSha` before hiting github	2025-01-28 13:49:50 +01:00
nymkappa	b5d5231bc1	[indexing] make blocks.definition_hash nullable	2025-01-28 11:37:06 +01:00
nymkappa	79339c0589	[indexing] exit early when we're unable to index pools definition sha	2025-01-28 06:45:03 +01:00
wiz	85c78a448d	Merge pull request #5755 from mempool/mononaut/hnl	2025-01-27 12:52:55 +09:00
Mononaut	60d548df46	add missing sg1 hnl emojis	2025-01-27 03:37:01 +00:00
wiz	fc6c97172b	Merge pull request #5754 from mempool/nymkappa/cc-icons [accelerator] add credit card provider fa icons	2025-01-26 11:29:45 +09:00
nymkappa	a074c4b2c3	[accelerator] add credit card provider fa icons	2025-01-26 11:26:27 +09:00
wiz	7b581b2ac3	Merge pull request #5691 from mempool/ops/remove-fmt-add-hnl-sg1 ops: Remove fmt, add hnl + sg1	2025-01-25 17:59:11 +09:00
wiz	1a62c867de	Merge branch 'master' into ops/remove-fmt-add-hnl-sg1	2025-01-25 17:57:28 +09:00
wiz	470a6a7534	Merge pull request #5752 from mempool/nymkappa/rename-twitter-x [services] twitter -> X	2025-01-25 17:50:53 +09:00
wiz	8bd7849b9d	Merge pull request #5721 from mempool/nymkappa/retry-btcpay-invoice [accelerator] add btcpay invoice retry button and polish checkout UI	2025-01-25 16:57:39 +09:00
wiz	43393f7227	Merge pull request #5705 from mempool/nymkappa/503-faucet-utxo-chain [faucet] add new error message when no utxo available	2025-01-25 16:54:43 +09:00
wiz	f67f946723	Merge pull request #5626 from mempool/nymkappa/remove-tx-restrictions-cashapp [accelerator] remove tx restriction for cashapp payments	2025-01-25 16:54:23 +09:00
wiz	a0d0ee230e	Merge pull request #5665 from mempool/nymkappa/block-pools-json-hash [blocks] fetch list of block hash filtered by pools-v2.json sha	2025-01-25 16:51:36 +09:00
wiz	edf7798587	Merge pull request #5436 from mempool/nymkappa/fix-bitcoin-payment [btcpay] better handling for invoice expiration	2025-01-25 16:37:04 +09:00
nymkappa	b826227b36	[services] twitter -> X	2025-01-25 15:46:21 +09:00
wiz	0924f6184b	Merge pull request #5751 from mempool/mononaut/fix-merkle-row-layout	2025-01-24 12:52:20 +09:00
Mononaut	24d0ed4ced	fix next block merkle row layout	2025-01-24 01:56:15 +00:00
nymkappa	9eb85200e0	Merge branch 'master' into nymkappa/fix-bitcoin-payment	2025-01-24 10:53:29 +09:00
wiz	a79c165b30	Merge pull request #5749 from mempool/nymkappa/fido	2025-01-23 22:44:00 +09:00
wiz	7f07c5cbab	Merge branch 'master' into nymkappa/fido	2025-01-23 21:14:35 +09:00
wiz	c021a15d0b	Merge pull request #5750 from mempool/nymkappa/fix-sca-card-on-file	2025-01-23 21:14:24 +09:00
Felipe Knorr Kuhn	a2009aa322	Merge branch 'master' into nymkappa/fido	2025-01-23 01:08:25 -08:00
nymkappa	e6965dac80	[accelerator] fix sca card on file	2025-01-23 18:00:50 +09:00
wiz	c4a7a2e781	Merge pull request #5732 from mempool/nymkappa/accelerator-card-on-file [accelerator] add support for card on file acceleration	2025-01-23 16:43:14 +09:00
wiz	03bea14f89	Merge pull request #5747 from mempool/nymkappa/overflow [accelerator] truncate dashboard title	2025-01-23 16:42:44 +09:00
wiz	834f9a9f6d	Merge pull request #5748 from mempool/knorrium/fix_docker_frontend_stratum_config Fix the missing frontend Stratum config for Docker builds	2025-01-23 16:42:23 +09:00
nymkappa	518297494f	Merge branch 'master' into nymkappa/accelerator-card-on-file	2025-01-23 16:18:40 +09:00
nymkappa	15e67bc77f	Merge branch 'master' into nymkappa/fido	2025-01-23 15:30:26 +09:00
wiz	ff383f9c58	Merge pull request #5742 from mempool/nymkappa/faucet-twitter-to-github [auth] add login/signup with github support	2025-01-23 15:21:34 +09:00
Felipe Knorr Kuhn	ed44e27991	Merge branch 'master' into knorrium/fix_docker_frontend_stratum_config	2025-01-22 22:01:53 -08:00
wiz	a869ea5ec4	Merge pull request #5746 from mempool/nymkappa/failed-canceled-accel [accelerator] differentiate failed/canceled accelerations	2025-01-23 14:59:23 +09:00
Felipe Knorr Kuhn	fc4a0f7461	Fix the missing frontend Stratum config for Docker builds	2025-01-22 21:59:15 -08:00
nymkappa	b3f21a10b9	[accelerator] truncate dashboard title	2025-01-23 14:55:31 +09:00
wiz	4290e00376	Merge pull request #5745 from mempool/mononaut/stratum-tweaks	2025-01-22 21:11:33 +09:00
nymkappa	3b91a1437a	[accelerator] differentiate failed/canceled accelerations	2025-01-22 18:58:54 +09:00
Mononaut	363fa3d877	improve stratum table layout on mobile	2025-01-22 09:16:25 +00:00
Mononaut	2e44ea3f01	reorder stratum job table	2025-01-22 09:13:44 +00:00
Mononaut	cac62765a1	fix stratum tree branch level	2025-01-22 09:10:22 +00:00
Mononaut	23713a11c2	link to merkle branch first tx	2025-01-22 05:06:02 +00:00
nymkappa	ff4aca8370	[blocks] update sha in memory/db before re-indexing blocks	2025-01-22 11:26:34 +09:00
nymkappa	b42431f14a	[auth] add login/signup with github support	2025-01-21 17:39:50 +09:00
nymkappa	817076fcbd	Merge branch 'master' into nymkappa/accelerator-card-on-file	2025-01-20 17:36:36 +09:00
nymkappa	778837322d	Merge branch 'master' into nymkappa/accelerator-card-on-file	2025-01-20 17:05:55 +09:00
nymkappa	58e6a78579	[accelerator] add support for card on file acceleration	2025-01-19 17:56:19 +09:00
nymkappa	3325db4883	[accelerator] add btcpay invoice retry button and polish checkout UI	2025-01-13 11:06:21 +09:00
nymkappa	faa83866fd	[blocks] fix block pools-v2 hash migration	2025-01-12 12:04:19 +09:00
nymkappa	54058b64ad	Merge branch 'master' into nymkappa/block-pools-json-hash	2025-01-12 11:47:55 +09:00
nymkappa	21cdb7e3a1	[accelerator] remove tx restriction for cashapp payments	2025-01-11 18:31:45 +09:00
nymkappa	ff235760b2	[fido] logout localstorage update	2024-12-27 15:37:36 +08:00
nymkappa	c9b9485313	[faucet] add new error message when no utxo available	2024-12-22 22:40:35 +08:00
wiz	8670897a50	ops: Remove fmt, add hnl + sg1	2024-12-14 21:01:37 +09:00
nymkappa	4ff2aad94a	[blocks] return list of block hash filtered by definition hash	2024-11-29 17:55:06 +01:00
nymkappa	ac997f3d9e	[blocks] add 2 endpoints to retreive pools-v2.json hashes	2024-11-29 17:13:28 +01:00
nymkappa	c8e967cc0c	[blocks] save pools-v2.json hash in blocks table	2024-11-29 16:04:54 +01:00
nymkappa	cbce49a8bf	Merge branch 'master' into nymkappa/fix-bitcoin-payment	2024-10-25 15:45:16 +09:00
nymkappa	f2e7cf7441	[btcpay] better handling for invoice expiration	2024-10-18 21:49:35 +09:00