Analytic form for ETA algorithm

Consider incoming transactions flow into ETA calculation
statistics: class incoming transactions by fee rate
2024-09-09 16:03:40 +02:00 · 2024-09-07 23:07:16 +02:00 · 2024-09-07 17:49:21 +02:00
30 changed files with 853 additions and 476 deletions
--- a/backend/package-lock.json
+++ b/backend/package-lock.json
@@ -13,7 +13,7 @@
        "@babel/core": "^7.25.2",
        "@mempool/electrum-client": "1.1.9",
        "@types/node": "^18.15.3",
-        "axios": "1.7.2",
+        "axios": "~1.7.4",
        "bitcoinjs-lib": "~6.1.3",
        "crypto-js": "~4.2.0",
        "express": "~4.19.2",
@@ -2278,10 +2278,9 @@
      }
    },
    "node_modules/axios": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz",
-      "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==",
-      "license": "MIT",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz",
+      "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
      "dependencies": {
        "follow-redirects": "^1.15.6",
        "form-data": "^4.0.0",
@@ -9440,9 +9439,9 @@
      "integrity": "sha512-+H+kuK34PfMaI9PNU/NSjBKL5hh/KDM9J72kwYeYEm0A8B1AC4fuCy3qsjnA7lxklgyXsB68yn8Z2xoZEjgwCQ=="
    },
    "axios": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz",
-      "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz",
+      "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
      "requires": {
        "follow-redirects": "^1.15.6",
        "form-data": "^4.0.0",
--- a/backend/package.json
+++ b/backend/package.json
@@ -42,7 +42,7 @@
    "@babel/core": "^7.25.2",
    "@mempool/electrum-client": "1.1.9",
    "@types/node": "^18.15.3",
-    "axios": "1.7.2",
+    "axios": "~1.7.4",
    "bitcoinjs-lib": "~6.1.3",
    "crypto-js": "~4.2.0",
    "express": "~4.19.2",
--- a/backend/src/api/bitcoin/bitcoin.routes.ts
+++ b/backend/src/api/bitcoin/bitcoin.routes.ts
@@ -20,7 +20,6 @@ import difficultyAdjustment from '../difficulty-adjustment';
 import transactionRepository from '../../repositories/TransactionRepository';
 import rbfCache from '../rbf-cache';
 import { calculateMempoolTxCpfp } from '../cpfp';
-import { handleError } from '../../utils/api';

 class BitcoinRoutes {
  public initRoutes(app: Application) {
@@ -87,7 +86,7 @@ class BitcoinRoutes {
      res.set('Content-Type', 'application/json');
      res.send(result);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -106,13 +105,13 @@ class BitcoinRoutes {
      const result = mempoolBlocks.getMempoolBlocks();
      res.json(result);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

  private getTransactionTimes(req: Request, res: Response) {
    if (!Array.isArray(req.query.txId)) {
-      handleError(req, res, 500, 'Not an array');
+      res.status(500).send('Not an array');
      return;
    }
    const txIds: string[] = [];
@@ -129,12 +128,12 @@ class BitcoinRoutes {
  private async $getBatchedOutspends(req: Request, res: Response): Promise<IEsploraApi.Outspend[][] | void> {
    const txids_csv = req.query.txids;
    if (!txids_csv || typeof txids_csv !== 'string') {
-      handleError(req, res, 500, 'Invalid txids format');
+      res.status(500).send('Invalid txids format');
      return;
    }
    const txids = txids_csv.split(',');
    if (txids.length > 50) {
-      handleError(req, res, 400, 'Too many txids requested');
+      res.status(400).send('Too many txids requested');
      return;
    }

@@ -142,13 +141,13 @@ class BitcoinRoutes {
      const batchedOutspends = await bitcoinApi.$getBatchedOutspends(txids);
      res.json(batchedOutspends);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

  private async $getCpfpInfo(req: Request, res: Response) {
    if (!/^[a-fA-F0-9]{64}$/.test(req.params.txId)) {
-      handleError(req, res, 501, `Invalid transaction ID.`);
+      res.status(501).send(`Invalid transaction ID.`);
      return;
    }

@@ -181,7 +180,7 @@ class BitcoinRoutes {
        try {
          cpfpInfo = await transactionRepository.$getCpfpInfo(req.params.txId);
        } catch (e) {
-          handleError(req, res, 500, 'failed to get CPFP info');
+          res.status(500).send('failed to get CPFP info');
          return;
        }
      }
@@ -210,7 +209,7 @@ class BitcoinRoutes {
      if (e instanceof Error && e instanceof Error && e.message && e.message.indexOf('No such mempool or blockchain transaction') > -1) {
        statusCode = 404;
      }
-      handleError(req, res, statusCode, e instanceof Error ? e.message : e);
+      res.status(statusCode).send(e instanceof Error ? e.message : e);
    }
  }

@@ -224,7 +223,7 @@ class BitcoinRoutes {
      if (e instanceof Error && e.message && e.message.indexOf('No such mempool or blockchain transaction') > -1) {
        statusCode = 404;
      }
-      handleError(req, res, statusCode, e instanceof Error ? e.message : e);
+      res.status(statusCode).send(e instanceof Error ? e.message : e);
    }
  }

@@ -285,13 +284,13 @@ class BitcoinRoutes {
        // Not modified
        // 422 Unprocessable Entity
        // https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/422
-        handleError(req, res, 422, `Psbt had no missing nonWitnessUtxos.`);
+        res.status(422).send(`Psbt had no missing nonWitnessUtxos.`);
      }
    } catch (e: any) {
      if (e instanceof Error && new RegExp(notFoundError).test(e.message)) {
-        handleError(req, res, 404, e.message);
+        res.status(404).send(e.message);
      } else {
-        handleError(req, res, 500, e instanceof Error ? e.message : e);
+        res.status(500).send(e instanceof Error ? e.message : e);
      }
    }
  }
@@ -305,7 +304,7 @@ class BitcoinRoutes {
      if (e instanceof Error && e.message && e.message.indexOf('No such mempool or blockchain transaction') > -1) {
        statusCode = 404;
      }
-      handleError(req, res, statusCode, e instanceof Error ? e.message : e);
+      res.status(statusCode).send(e instanceof Error ? e.message : e);
    }
  }

@@ -315,7 +314,7 @@ class BitcoinRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 3600 * 24 * 30).toUTCString());
      res.json(transactions);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -337,7 +336,7 @@ class BitcoinRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * cacheDuration).toUTCString());
      res.json(block);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -347,7 +346,7 @@ class BitcoinRoutes {
      res.setHeader('content-type', 'text/plain');
      res.send(blockHeader);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -358,11 +357,10 @@ class BitcoinRoutes {
        res.setHeader('Expires', new Date(Date.now() + 1000 * 3600 * 24 * 30).toUTCString());
        res.json(auditSummary);
      } else {
-        handleError(req, res, 404, `audit not available`);
-        return;
+        return res.status(404).send(`audit not available`);
      }
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -373,8 +371,7 @@ class BitcoinRoutes {
        res.setHeader('Expires', new Date(Date.now() + 1000 * 3600 * 24 * 30).toUTCString());
        res.json(auditSummary);
      } else {
-        handleError(req, res, 404, `transaction audit not available`);
-        return;
+        return res.status(404).send(`transaction audit not available`);
      }
    } catch (e) {
      res.status(500).send(e instanceof Error ? e.message : e);
@@ -391,49 +388,42 @@ class BitcoinRoutes {
        return await this.getLegacyBlocks(req, res);
      }
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

  private async getBlocksByBulk(req: Request, res: Response) {
    try {
      if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false) { // Liquid - Not implemented
-        handleError(req, res, 404, `This API is only available for Bitcoin networks`);
-        return;
+        return res.status(404).send(`This API is only available for Bitcoin networks`);
      }
      if (config.MEMPOOL.MAX_BLOCKS_BULK_QUERY <= 0) {
-        handleError(req, res, 404, `This API is disabled. Set config.MEMPOOL.MAX_BLOCKS_BULK_QUERY to a positive number to enable it.`);
-        return;
+        return res.status(404).send(`This API is disabled. Set config.MEMPOOL.MAX_BLOCKS_BULK_QUERY to a positive number to enable it.`);
      }
      if (!Common.indexingEnabled()) {
-        handleError(req, res, 404, `Indexing is required for this API`);
-        return;
+        return res.status(404).send(`Indexing is required for this API`);
      }

      const from = parseInt(req.params.from, 10);
      if (!req.params.from || from < 0) {
-        handleError(req, res, 400, `Parameter 'from' must be a block height (integer)`);
-        return;
+        return res.status(400).send(`Parameter 'from' must be a block height (integer)`);
      }
      const to = req.params.to === undefined ? await bitcoinApi.$getBlockHeightTip() : parseInt(req.params.to, 10);
      if (to < 0) {
-        handleError(req, res, 400, `Parameter 'to' must be a block height (integer)`);
-        return;
+        return res.status(400).send(`Parameter 'to' must be a block height (integer)`);
      }
      if (from > to) {
-        handleError(req, res, 400, `Parameter 'to' must be a higher block height than 'from'`);
-        return;
+        return res.status(400).send(`Parameter 'to' must be a higher block height than 'from'`);
      }
      if ((to - from + 1) > config.MEMPOOL.MAX_BLOCKS_BULK_QUERY) {
-        handleError(req, res, 400, `You can only query ${config.MEMPOOL.MAX_BLOCKS_BULK_QUERY} blocks at once.`);
-        return;
+        return res.status(400).send(`You can only query ${config.MEMPOOL.MAX_BLOCKS_BULK_QUERY} blocks at once.`);
      }

      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
      res.json(await blocks.$getBlocksBetweenHeight(from, to));

    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -468,10 +458,10 @@ class BitcoinRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
      res.json(returnBlocks);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }
-
+  
  private async getBlockTransactions(req: Request, res: Response) {
    try {
      loadingIndicators.setProgress('blocktxs-' + req.params.hash, 0);
@@ -493,7 +483,7 @@ class BitcoinRoutes {
      res.json(transactions);
    } catch (e) {
      loadingIndicators.setProgress('blocktxs-' + req.params.hash, 100);
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -502,13 +492,13 @@ class BitcoinRoutes {
      const blockHash = await bitcoinApi.$getBlockHash(parseInt(req.params.height, 10));
      res.send(blockHash);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

  private async getAddress(req: Request, res: Response) {
    if (config.MEMPOOL.BACKEND === 'none') {
-      handleError(req, res, 405, 'Address lookups cannot be used with bitcoind as backend.');
+      res.status(405).send('Address lookups cannot be used with bitcoind as backend.');
      return;
    }

@@ -517,16 +507,15 @@ class BitcoinRoutes {
      res.json(addressData);
    } catch (e) {
      if (e instanceof Error && e.message && (e.message.indexOf('too long') > 0 || e.message.indexOf('confirmed status') > 0)) {
-        handleError(req, res, 413, e instanceof Error ? e.message : e);
-        return;
+        return res.status(413).send(e instanceof Error ? e.message : e);
      }
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

  private async getAddressTransactions(req: Request, res: Response): Promise<void> {
    if (config.MEMPOOL.BACKEND === 'none') {
-      handleError(req, res, 405, 'Address lookups cannot be used with bitcoind as backend.');
+      res.status(405).send('Address lookups cannot be used with bitcoind as backend.');
      return;
    }

@@ -539,23 +528,23 @@ class BitcoinRoutes {
      res.json(transactions);
    } catch (e) {
      if (e instanceof Error && e.message && (e.message.indexOf('too long') > 0 || e.message.indexOf('confirmed status') > 0)) {
-        handleError(req, res, 413, e instanceof Error ? e.message : e);
+        res.status(413).send(e instanceof Error ? e.message : e);
        return;
      }
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

  private async getAddressTransactionSummary(req: Request, res: Response): Promise<void> {
    if (config.MEMPOOL.BACKEND !== 'esplora') {
-      handleError(req, res, 405, 'Address summary lookups require mempool/electrs backend.');
+      res.status(405).send('Address summary lookups require mempool/electrs backend.');
      return;
    }
  }

  private async getScriptHash(req: Request, res: Response) {
    if (config.MEMPOOL.BACKEND === 'none') {
-      handleError(req, res, 405, 'Address lookups cannot be used with bitcoind as backend.');
+      res.status(405).send('Address lookups cannot be used with bitcoind as backend.');
      return;
    }

@@ -566,16 +555,15 @@ class BitcoinRoutes {
      res.json(addressData);
    } catch (e) {
      if (e instanceof Error && e.message && (e.message.indexOf('too long') > 0 || e.message.indexOf('confirmed status') > 0)) {
-        handleError(req, res, 413, e instanceof Error ? e.message : e);
-        return;
+        return res.status(413).send(e instanceof Error ? e.message : e);
      }
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

  private async getScriptHashTransactions(req: Request, res: Response): Promise<void> {
    if (config.MEMPOOL.BACKEND === 'none') {
-      handleError(req, res, 405, 'Address lookups cannot be used with bitcoind as backend.');
+      res.status(405).send('Address lookups cannot be used with bitcoind as backend.');
      return;
    }

@@ -590,16 +578,16 @@ class BitcoinRoutes {
      res.json(transactions);
    } catch (e) {
      if (e instanceof Error && e.message && (e.message.indexOf('too long') > 0 || e.message.indexOf('confirmed status') > 0)) {
-        handleError(req, res, 413, e instanceof Error ? e.message : e);
+        res.status(413).send(e instanceof Error ? e.message : e);
        return;
      }
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

  private async getScriptHashTransactionSummary(req: Request, res: Response): Promise<void> {
    if (config.MEMPOOL.BACKEND !== 'esplora') {
-      handleError(req, res, 405, 'Scripthash summary lookups require mempool/electrs backend.');
+      res.status(405).send('Scripthash summary lookups require mempool/electrs backend.');
      return;
    }
  }
@@ -609,7 +597,7 @@ class BitcoinRoutes {
      const blockHash = await bitcoinApi.$getAddressPrefix(req.params.prefix);
      res.send(blockHash);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -636,7 +624,7 @@ class BitcoinRoutes {
      const rawMempool = await bitcoinApi.$getRawMempool();
      res.send(rawMempool);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -644,13 +632,12 @@ class BitcoinRoutes {
    try {
      const result = blocks.getCurrentBlockHeight();
      if (!result) {
-        handleError(req, res, 503, `Service Temporarily Unavailable`);
-        return;
+        return res.status(503).send(`Service Temporarily Unavailable`);
      }
      res.setHeader('content-type', 'text/plain');
      res.send(result.toString());
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -660,7 +647,7 @@ class BitcoinRoutes {
      res.setHeader('content-type', 'text/plain');
      res.send(result);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -670,7 +657,7 @@ class BitcoinRoutes {
      res.setHeader('content-type', 'application/octet-stream');
      res.send(result);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -679,7 +666,7 @@ class BitcoinRoutes {
      const result = await bitcoinApi.$getTxIdsForBlock(req.params.hash);
      res.json(result);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -688,7 +675,7 @@ class BitcoinRoutes {
      const result = await bitcoinClient.validateAddress(req.params.address);
      res.json(result);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -701,7 +688,7 @@ class BitcoinRoutes {
        replaces
      });
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -710,7 +697,7 @@ class BitcoinRoutes {
      const result = rbfCache.getRbfTrees(false);
      res.json(result);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -719,7 +706,7 @@ class BitcoinRoutes {
      const result = rbfCache.getRbfTrees(true);
      res.json(result);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -732,7 +719,7 @@ class BitcoinRoutes {
        res.status(204).send();
      }
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -741,7 +728,7 @@ class BitcoinRoutes {
      const result = await bitcoinApi.$getOutspends(req.params.txId);
      res.json(result);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -751,10 +738,10 @@ class BitcoinRoutes {
      if (da) {
        res.json(da);
      } else {
-        handleError(req, res, 503, `Service Temporarily Unavailable`);
+        res.status(503).send(`Service Temporarily Unavailable`);
      }
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -765,7 +752,7 @@ class BitcoinRoutes {
      const txIdResult = await bitcoinApi.$sendRawTransaction(rawTx);
      res.send(txIdResult);
    } catch (e: any) {
-      handleError(req, res, 400, e.message && e.code ? 'sendrawtransaction RPC error: ' + JSON.stringify({ code: e.code, message: e.message })
+      res.status(400).send(e.message && e.code ? 'sendrawtransaction RPC error: ' + JSON.stringify({ code: e.code, message: e.message })
        : (e.message || 'Error'));
    }
  }
@@ -777,7 +764,7 @@ class BitcoinRoutes {
      const txIdResult = await bitcoinClient.sendRawTransaction(txHex);
      res.send(txIdResult);
    } catch (e: any) {
-      handleError(req, res, 400, e.message && e.code ? 'sendrawtransaction RPC error: ' + JSON.stringify({ code: e.code, message: e.message })
+      res.status(400).send(e.message && e.code ? 'sendrawtransaction RPC error: ' + JSON.stringify({ code: e.code, message: e.message })
        : (e.message || 'Error'));
    }
  }
@@ -789,7 +776,8 @@ class BitcoinRoutes {
      const result = await bitcoinApi.$testMempoolAccept(rawTxs, maxfeerate);
      res.send(result);
    } catch (e: any) {
-      handleError(req, res, 400, e.message && e.code ? 'testmempoolaccept RPC error: ' + JSON.stringify({ code: e.code, message: e.message })
+      res.setHeader('content-type', 'text/plain');
+      res.status(400).send(e.message && e.code ? 'testmempoolaccept RPC error: ' + JSON.stringify({ code: e.code, message: e.message })
        : (e.message || 'Error'));
    }
  }
--- 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 = 82;
+  private static currentVersion = 83;
  private queryTimeout = 3600_000;
  private statisticsAddedIndexed = false;
  private uniqueLogs: string[] = [];
@@ -705,6 +705,11 @@ class DatabaseMigration {
      await this.$fixBadV1AuditBlocks();
      await this.updateToSchemaVersion(82);
    }
+
+    if (databaseSchemaVersion < 83) {
+      await this.$addPerSecondVsizeToStatistics();
+      await this.updateToSchemaVersion(83);
+    }
  }

  /**
@@ -1341,6 +1346,47 @@ class DatabaseMigration {
      }
    }
  }
+
+  private async $addPerSecondVsizeToStatistics(): Promise<void> {
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_1` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_2` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_3` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_4` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_5` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_6` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_8` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_10` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_12` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_15` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_20` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_30` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_40` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_50` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_60` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_70` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_80` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_90` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_100` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_125` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_150` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_175` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_200` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_250` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_300` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_350` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_400` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_500` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_600` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_700` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_800` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_900` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_1000` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_1200` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_1400` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_1600` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_1800` int(11) NOT NULL DEFAULT 0');
+    await this.$executeQuery('ALTER TABLE `statistics` ADD `vsize_ps_2000` int(11) NOT NULL DEFAULT 0');
+  }
 }

 export default new DatabaseMigration();
--- a/backend/src/api/explorer/channels.routes.ts
+++ b/backend/src/api/explorer/channels.routes.ts
@@ -1,7 +1,6 @@
 import config from '../../config';
 import { Application, Request, Response } from 'express';
 import channelsApi from './channels.api';
-import { handleError } from '../../utils/api';

 class ChannelsRoutes {
  constructor() { }
@@ -23,7 +22,7 @@ class ChannelsRoutes {
      const channels = await channelsApi.$searchChannelsById(req.params.search);
      res.json(channels);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -39,7 +38,7 @@ class ChannelsRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
      res.json(channel);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -54,11 +53,11 @@ class ChannelsRoutes {
      const status: string = typeof req.query.status === 'string' ? req.query.status : '';

      if (index < -1) {
-        handleError(req, res, 400, 'Invalid index');
+        res.status(400).send('Invalid index');
        return;
      }
      if (['open', 'active', 'closed'].includes(status) === false) {
-        handleError(req, res, 400, 'Invalid status');
+        res.status(400).send('Invalid status');
        return;
      }

@@ -70,14 +69,14 @@ class ChannelsRoutes {
      res.header('X-Total-Count', channelsCount.toString());
      res.json(channels);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

  private async $getChannelsByTransactionIds(req: Request, res: Response): Promise<void> {
    try {
      if (!Array.isArray(req.query.txId)) {
-        handleError(req, res, 400, 'Not an array');
+        res.status(400).send('Not an array');
        return;
      }
      const txIds: string[] = [];
@@ -108,7 +107,7 @@ class ChannelsRoutes {

      res.json(result);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -120,7 +119,7 @@ class ChannelsRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
      res.json(channels);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -133,7 +132,7 @@ class ChannelsRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
      res.json(channels);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

--- a/backend/src/api/explorer/general.routes.ts
+++ b/backend/src/api/explorer/general.routes.ts
@@ -3,8 +3,6 @@ import { Application, Request, Response } from 'express';
 import nodesApi from './nodes.api';
 import channelsApi from './channels.api';
 import statisticsApi from './statistics.api';
-import { handleError } from '../../utils/api';
-
 class GeneralLightningRoutes {
  constructor() { }

@@ -29,7 +27,7 @@ class GeneralLightningRoutes {
        channels: channels,
      });
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -43,7 +41,7 @@ class GeneralLightningRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
      res.json(statistics);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -52,7 +50,7 @@ class GeneralLightningRoutes {
      const statistics = await statisticsApi.$getLatestStatistics();
      res.json(statistics);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }
 }
--- a/backend/src/api/explorer/nodes.routes.ts
+++ b/backend/src/api/explorer/nodes.routes.ts
@@ -3,7 +3,6 @@ import { Application, Request, Response } from 'express';
 import nodesApi from './nodes.api';
 import DB from '../../database';
 import { INodesRanking } from '../../mempool.interfaces';
-import { handleError } from '../../utils/api';

 class NodesRoutes {
  constructor() { }
@@ -32,7 +31,7 @@ class NodesRoutes {
      const nodes = await nodesApi.$searchNodeByPublicKeyOrAlias(req.params.search);
      res.json(nodes);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -182,13 +181,13 @@ class NodesRoutes {
          }
        } catch (e) {}
      }
-
+      
      res.header('Pragma', 'public');
      res.header('Cache-control', 'public');
      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
      res.json(nodes);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -196,7 +195,7 @@ class NodesRoutes {
    try {
      const node = await nodesApi.$getNode(req.params.public_key);
      if (!node) {
-        handleError(req, res, 404, 'Node not found');
+        res.status(404).send('Node not found');
        return;
      }
      res.header('Pragma', 'public');
@@ -204,7 +203,7 @@ class NodesRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
      res.json(node);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -216,7 +215,7 @@ class NodesRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
      res.json(statistics);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -224,7 +223,7 @@ class NodesRoutes {
    try {
      const node = await nodesApi.$getFeeHistogram(req.params.public_key);
      if (!node) {
-        handleError(req, res, 404, 'Node not found');
+        res.status(404).send('Node not found');
        return;
      }
      res.header('Pragma', 'public');
@@ -232,7 +231,7 @@ class NodesRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
      res.json(node);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -248,7 +247,7 @@ class NodesRoutes {
        topByChannels: topChannelsNodes,
      });
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -260,7 +259,7 @@ class NodesRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
      res.json(topCapacityNodes);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -272,7 +271,7 @@ class NodesRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
      res.json(topCapacityNodes);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -284,7 +283,7 @@ class NodesRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
      res.json(topCapacityNodes);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -296,7 +295,7 @@ class NodesRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 600).toUTCString());
      res.json(nodesPerAs);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -308,7 +307,7 @@ class NodesRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 600).toUTCString());
      res.json(worldNodes);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -323,7 +322,7 @@ class NodesRoutes {
      );

      if (country.length === 0) {
-        handleError(req, res, 404, `This country does not exist or does not host any lightning nodes on clearnet`);
+        res.status(404).send(`This country does not exist or does not host any lightning nodes on clearnet`);
        return;
      }

@@ -336,7 +335,7 @@ class NodesRoutes {
        nodes: nodes,
      });
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -350,7 +349,7 @@ class NodesRoutes {
      );

      if (isp.length === 0) {
-        handleError(req, res, 404, `This ISP does not exist or does not host any lightning nodes on clearnet`);
+        res.status(404).send(`This ISP does not exist or does not host any lightning nodes on clearnet`);
        return;
      }

@@ -363,7 +362,7 @@ class NodesRoutes {
        nodes: nodes,
      });
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -375,7 +374,7 @@ class NodesRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 600).toUTCString());
      res.json(nodesPerAs);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }
 }
--- a/backend/src/api/liquid/liquid.routes.ts
+++ b/backend/src/api/liquid/liquid.routes.ts
@@ -3,7 +3,6 @@ import { Application, Request, Response } from 'express';
 import config from '../../config';
 import elementsParser from './elements-parser';
 import icons from './icons';
-import { handleError } from '../../utils/api';

 class LiquidRoutes {
  public initRoutes(app: Application) {
@@ -43,7 +42,7 @@ class LiquidRoutes {
      res.setHeader('content-length', result.length);
      res.send(result);
    } else {
-      handleError(req, res, 404, 'Asset icon not found');
+      res.status(404).send('Asset icon not found');
    }
  }

@@ -52,7 +51,7 @@ class LiquidRoutes {
    if (result) {
      res.json(result);
    } else {
-      handleError(req, res, 404, 'Asset icons not found');
+      res.status(404).send('Asset icons not found');
    }
  }

@@ -83,7 +82,7 @@ class LiquidRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 60 * 60).toUTCString());
      res.json(pegs);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -95,7 +94,7 @@ class LiquidRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 60 * 60).toUTCString());
      res.json(reserves);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -107,7 +106,7 @@ class LiquidRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 30).toUTCString());
      res.json(currentSupply);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -119,7 +118,7 @@ class LiquidRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 30).toUTCString());
      res.json(currentReserves);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -131,7 +130,7 @@ class LiquidRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 30).toUTCString());
      res.json(auditStatus);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -143,7 +142,7 @@ class LiquidRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 30).toUTCString());
      res.json(federationAddresses);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -155,7 +154,7 @@ class LiquidRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 30).toUTCString());
      res.json(federationAddresses);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -167,7 +166,7 @@ class LiquidRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 30).toUTCString());
      res.json(federationUtxos);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -179,7 +178,7 @@ class LiquidRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 30).toUTCString());
      res.json(expiredUtxos);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -191,7 +190,7 @@ class LiquidRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 30).toUTCString());
      res.json(federationUtxos);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -203,7 +202,7 @@ class LiquidRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 30).toUTCString());
      res.json(emergencySpentUtxos);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -215,7 +214,7 @@ class LiquidRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 30).toUTCString());
      res.json(emergencySpentUtxos);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -227,7 +226,7 @@ class LiquidRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 30).toUTCString());
      res.json(recentPegs);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -239,7 +238,7 @@ class LiquidRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 30).toUTCString());
      res.json(pegsVolume);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -251,7 +250,7 @@ class LiquidRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 30).toUTCString());
      res.json(pegsCount);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

--- a/backend/src/api/mempool.ts
+++ b/backend/src/api/mempool.ts
@@ -12,6 +12,7 @@ import rbfCache from './rbf-cache';
 import { Acceleration } from './services/acceleration';
 import redisCache from './redis-cache';
 import blocks from './blocks';
+import { logFees } from './statistics/statistics';

 class Mempool {
  private inSync: boolean = false;
@@ -34,6 +35,7 @@ class Mempool {

  private vBytesPerSecondArray: VbytesPerSecond[] = [];
  private vBytesPerSecond: number = 0;
+  private vBytesPerSecondByFeeRate: { [feePerWU: number]: number } = {};
  private mempoolProtection = 0;
  private latestTransactions: any[] = [];

@@ -193,6 +195,10 @@ class Mempool {
    return this.vBytesPerSecond;
  }

+  public getVBytesPerSecondByFeeRate(): { [feePerWU: number]: number } {
+    return this.vBytesPerSecondByFeeRate;
+  }
+
  public getFirstSeenForTransactions(txIds: string[]): number[] {
    const txTimes: number[] = [];
    txIds.forEach((txId: string) => {
@@ -270,6 +276,7 @@ class Mempool {
            this.vBytesPerSecondArray.push({
              unixTime: new Date().getTime(),
              vSize: transaction.vsize,
+              effectiveFeePerVsize: transaction.effectiveFeePerVsize
            });
          }
          hasChange = true;
@@ -588,6 +595,21 @@ class Mempool {
      this.vBytesPerSecond = Math.round(
        this.vBytesPerSecondArray.map((data) => data.vSize).reduce((a, b) => a + b) / config.STATISTICS.TX_PER_SECOND_SAMPLE_PERIOD
      );
+
+      if (!Common.isLiquid()) {
+        this.vBytesPerSecondByFeeRate = {};
+        for (const tx of this.vBytesPerSecondArray) {
+          for (let i = 0; i < logFees.length; i++) {
+            if (tx.effectiveFeePerVsize < logFees[i + 1] || i === logFees.length - 1) {
+              this.vBytesPerSecondByFeeRate[logFees[i]] = (this.vBytesPerSecondByFeeRate[logFees[i]] || 0) + tx.vSize;
+              break;
+            }
+          }
+        }
+        for (const feeRate of Object.keys(this.vBytesPerSecondByFeeRate)) {
+          this.vBytesPerSecondByFeeRate[feeRate] = Math.round(this.vBytesPerSecondByFeeRate[feeRate] / config.STATISTICS.TX_PER_SECOND_SAMPLE_PERIOD);
+        }
+      }
    }
  }

--- a/backend/src/api/mining/mining-routes.ts
+++ b/backend/src/api/mining/mining-routes.ts
@@ -10,7 +10,6 @@ import mining from "./mining";
 import PricesRepository from '../../repositories/PricesRepository';
 import AccelerationRepository from '../../repositories/AccelerationRepository';
 import accelerationApi from '../services/acceleration';
-import { handleError } from '../../utils/api';

 class MiningRoutes {
  public initRoutes(app: Application) {
@@ -54,12 +53,12 @@ class MiningRoutes {
      res.header('Cache-control', 'public');
      res.setHeader('Expires', new Date(Date.now() + 1000 * 300).toUTCString());
      if (['testnet', 'signet', 'liquidtestnet'].includes(config.MEMPOOL.NETWORK)) {
-        handleError(req, res, 400, 'Prices are not available on testnets.');
+        res.status(400).send('Prices are not available on testnets.');
        return;
      }
      const timestamp = parseInt(req.query.timestamp as string, 10) || 0;
      const currency = req.query.currency as string;
-
+      
      let response;
      if (timestamp && currency) {
        response = await PricesRepository.$getNearestHistoricalPrice(timestamp, currency);
@@ -72,7 +71,7 @@ class MiningRoutes {
      }
      res.status(200).send(response);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -85,9 +84,9 @@ class MiningRoutes {
      res.json(stats);
    } catch (e) {
      if (e instanceof Error && e.message.indexOf('This mining pool does not exist') > -1) {
-        handleError(req, res, 404, e.message);
+        res.status(404).send(e.message);
      } else {
-        handleError(req, res, 500, e instanceof Error ? e.message : e);
+        res.status(500).send(e instanceof Error ? e.message : e);
      }
    }
  }
@@ -104,9 +103,9 @@ class MiningRoutes {
      res.json(poolBlocks);
    } catch (e) {
      if (e instanceof Error && e.message.indexOf('This mining pool does not exist') > -1) {
-        handleError(req, res, 404, e.message);
+        res.status(404).send(e.message);
      } else {
-        handleError(req, res, 500, e instanceof Error ? e.message : e);
+        res.status(500).send(e instanceof Error ? e.message : e);
      }
    }
  }
@@ -130,7 +129,7 @@ class MiningRoutes {
        res.json(pools);
      }
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -144,7 +143,7 @@ class MiningRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
      res.json(stats);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -158,7 +157,7 @@ class MiningRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 300).toUTCString());
      res.json(hashrates);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -173,9 +172,9 @@ class MiningRoutes {
      res.json(hashrates);
    } catch (e) {
      if (e instanceof Error && e.message.indexOf('This mining pool does not exist') > -1) {
-        handleError(req, res, 404, e.message);
+        res.status(404).send(e.message);
      } else {
-        handleError(req, res, 500, e instanceof Error ? e.message : e);
+        res.status(500).send(e instanceof Error ? e.message : e);
      }
    }
  }
@@ -204,7 +203,7 @@ class MiningRoutes {
        currentDifficulty: currentDifficulty,
      });
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -218,7 +217,7 @@ class MiningRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
      res.json(blockFees);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -236,7 +235,7 @@ class MiningRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
      res.json(blockFees);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -250,7 +249,7 @@ class MiningRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
      res.json(blockRewards);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -264,7 +263,7 @@ class MiningRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
      res.json(blockFeeRates);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -282,7 +281,7 @@ class MiningRoutes {
        weights: blockWeights
      });
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -294,7 +293,7 @@ class MiningRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 300).toUTCString());
      res.json(difficulty.map(adj => [adj.time, adj.height, adj.difficulty, adj.adjustment]));
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -318,7 +317,7 @@ class MiningRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
      res.json(blocksHealth.map(health => [health.time, health.height, health.match_rate]));
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -327,7 +326,7 @@ class MiningRoutes {
      const audit = await BlocksAuditsRepository.$getBlockAudit(req.params.hash);

      if (!audit) {
-        handleError(req, res, 204, `This block has not been audited.`);
+        res.status(204).send(`This block has not been audited.`);
        return;
      }

@@ -336,7 +335,7 @@ class MiningRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 3600 * 24).toUTCString());
      res.json(audit);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -359,7 +358,7 @@ class MiningRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 300).toUTCString());
      res.json(result);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -372,7 +371,7 @@ class MiningRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
      res.json(await BlocksAuditsRepository.$getBlockAuditScores(height, height - 15));
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -385,7 +384,7 @@ class MiningRoutes {
      res.setHeader('Expires', new Date(Date.now() + 1000 * 3600 * 24).toUTCString());
      res.json(audit || 'null');
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -395,12 +394,12 @@ class MiningRoutes {
      res.header('Cache-control', 'public');
      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
      if (!config.MEMPOOL_SERVICES.ACCELERATIONS || ['testnet', 'signet', 'liquidtestnet', 'liquid'].includes(config.MEMPOOL.NETWORK)) {
-        handleError(req, res, 400, 'Acceleration data is not available.');
+        res.status(400).send('Acceleration data is not available.');
        return;
      }
      res.status(200).send(await AccelerationRepository.$getAccelerationInfo(req.params.slug));
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -410,13 +409,13 @@ class MiningRoutes {
      res.header('Cache-control', 'public');
      res.setHeader('Expires', new Date(Date.now() + 1000 * 3600 * 24).toUTCString());
      if (!config.MEMPOOL_SERVICES.ACCELERATIONS || ['testnet', 'signet', 'liquidtestnet', 'liquid'].includes(config.MEMPOOL.NETWORK)) {
-        handleError(req, res, 400, 'Acceleration data is not available.');
+        res.status(400).send('Acceleration data is not available.');
        return;
      }
      const height = req.params.height === undefined ? undefined : parseInt(req.params.height, 10);
      res.status(200).send(await AccelerationRepository.$getAccelerationInfo(null, height));
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -426,12 +425,12 @@ class MiningRoutes {
      res.header('Cache-control', 'public');
      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
      if (!config.MEMPOOL_SERVICES.ACCELERATIONS || ['testnet', 'signet', 'liquidtestnet', 'liquid'].includes(config.MEMPOOL.NETWORK)) {
-        handleError(req, res, 400, 'Acceleration data is not available.');
+        res.status(400).send('Acceleration data is not available.');
        return;
      }
      res.status(200).send(await AccelerationRepository.$getAccelerationInfo(null, null, req.params.interval));
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -441,12 +440,12 @@ class MiningRoutes {
      res.header('Cache-control', 'public');
      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
      if (!config.MEMPOOL_SERVICES.ACCELERATIONS || ['testnet', 'signet', 'liquidtestnet', 'liquid'].includes(config.MEMPOOL.NETWORK)) {
-        handleError(req, res, 400, 'Acceleration data is not available.');
+        res.status(400).send('Acceleration data is not available.');
        return;
      }
      res.status(200).send(await AccelerationRepository.$getAccelerationTotals(<string>req.query.pool, <string>req.query.interval));
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -456,12 +455,12 @@ class MiningRoutes {
      res.header('Cache-control', 'public');
      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
      if (!config.MEMPOOL_SERVICES.ACCELERATIONS || ['testnet', 'signet', 'liquidtestnet', 'liquid'].includes(config.MEMPOOL.NETWORK)) {
-        handleError(req, res, 400, 'Acceleration data is not available.');
+        res.status(400).send('Acceleration data is not available.');
        return;
      }
      res.status(200).send(accelerationApi.accelerations || []);
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }

@@ -473,7 +472,7 @@ class MiningRoutes {
      accelerationApi.accelerationRequested(req.params.txid);
      res.status(200).send();
    } catch (e) {
-      handleError(req, res, 500, e instanceof Error ? e.message : e);
+      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }
 }
--- a/backend/src/api/statistics/statistics-api.ts
+++ b/backend/src/api/statistics/statistics-api.ts
@@ -53,7 +53,45 @@ class StatisticsApi {
              vsize_1400,
              vsize_1600,
              vsize_1800,
-              vsize_2000
+              vsize_2000,
+              vsize_ps_1,
+              vsize_ps_2,
+              vsize_ps_3,
+              vsize_ps_4,
+              vsize_ps_5,
+              vsize_ps_6,
+              vsize_ps_8,
+              vsize_ps_10,
+              vsize_ps_12,
+              vsize_ps_15,
+              vsize_ps_20,
+              vsize_ps_30,
+              vsize_ps_40,
+              vsize_ps_50,
+              vsize_ps_60,
+              vsize_ps_70,
+              vsize_ps_80,
+              vsize_ps_90,
+              vsize_ps_100,
+              vsize_ps_125,
+              vsize_ps_150,
+              vsize_ps_175,
+              vsize_ps_200,
+              vsize_ps_250,
+              vsize_ps_300,
+              vsize_ps_350,
+              vsize_ps_400,
+              vsize_ps_500,
+              vsize_ps_600,
+              vsize_ps_700,
+              vsize_ps_800,
+              vsize_ps_900,
+              vsize_ps_1000,
+              vsize_ps_1200,
+              vsize_ps_1400,
+              vsize_ps_1600,
+              vsize_ps_1800,
+              vsize_ps_2000
            )
            VALUES (NOW(), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
               0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)`;
@@ -67,56 +105,94 @@ class StatisticsApi {
  public async $create(statistics: Statistic, convertToDatetime = false): Promise<number | undefined> {
    try {
      const query = `INSERT INTO statistics(
-              added,
-              unconfirmed_transactions,
-              tx_per_second,
-              vbytes_per_second,
-              mempool_byte_weight,
-              fee_data,
-              total_fee,
-              min_fee,
-              vsize_1,
-              vsize_2,
-              vsize_3,
-              vsize_4,
-              vsize_5,
-              vsize_6,
-              vsize_8,
-              vsize_10,
-              vsize_12,
-              vsize_15,
-              vsize_20,
-              vsize_30,
-              vsize_40,
-              vsize_50,
-              vsize_60,
-              vsize_70,
-              vsize_80,
-              vsize_90,
-              vsize_100,
-              vsize_125,
-              vsize_150,
-              vsize_175,
-              vsize_200,
-              vsize_250,
-              vsize_300,
-              vsize_350,
-              vsize_400,
-              vsize_500,
-              vsize_600,
-              vsize_700,
-              vsize_800,
-              vsize_900,
-              vsize_1000,
-              vsize_1200,
-              vsize_1400,
-              vsize_1600,
-              vsize_1800,
-              vsize_2000
-            )
-            VALUES (${convertToDatetime ? `FROM_UNIXTIME(${statistics.added})` : statistics.added}, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
-               ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`;
-
+        added,
+        unconfirmed_transactions,
+        tx_per_second,
+        vbytes_per_second,
+        mempool_byte_weight,
+        fee_data,
+        total_fee,
+        min_fee,
+        vsize_1,
+        vsize_2,
+        vsize_3,
+        vsize_4,
+        vsize_5,
+        vsize_6,
+        vsize_8,
+        vsize_10,
+        vsize_12,
+        vsize_15,
+        vsize_20,
+        vsize_30,
+        vsize_40,
+        vsize_50,
+        vsize_60,
+        vsize_70,
+        vsize_80,
+        vsize_90,
+        vsize_100,
+        vsize_125,
+        vsize_150,
+        vsize_175,
+        vsize_200,
+        vsize_250,
+        vsize_300,
+        vsize_350,
+        vsize_400,
+        vsize_500,
+        vsize_600,
+        vsize_700,
+        vsize_800,
+        vsize_900,
+        vsize_1000,
+        vsize_1200,
+        vsize_1400,
+        vsize_1600,
+        vsize_1800,
+        vsize_2000,
+        vsize_ps_1,
+        vsize_ps_2,
+        vsize_ps_3,
+        vsize_ps_4,
+        vsize_ps_5,
+        vsize_ps_6,
+        vsize_ps_8,
+        vsize_ps_10,
+        vsize_ps_12,
+        vsize_ps_15,
+        vsize_ps_20,
+        vsize_ps_30,
+        vsize_ps_40,
+        vsize_ps_50,
+        vsize_ps_60,
+        vsize_ps_70,
+        vsize_ps_80,
+        vsize_ps_90,
+        vsize_ps_100,
+        vsize_ps_125,
+        vsize_ps_150,
+        vsize_ps_175,
+        vsize_ps_200,
+        vsize_ps_250,
+        vsize_ps_300,
+        vsize_ps_350,
+        vsize_ps_400,
+        vsize_ps_500,
+        vsize_ps_600,
+        vsize_ps_700,
+        vsize_ps_800,
+        vsize_ps_900,
+        vsize_ps_1000,
+        vsize_ps_1200,
+        vsize_ps_1400,
+        vsize_ps_1600,
+        vsize_ps_1800,
+        vsize_ps_2000
+      )
+      VALUES (${convertToDatetime ? `FROM_UNIXTIME(${statistics.added})` : statistics.added}, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 
+          ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`;
+      
      const params: (string | number)[] = [
        statistics.unconfirmed_transactions,
        statistics.tx_per_second,
@@ -163,6 +239,44 @@ class StatisticsApi {
        statistics.vsize_1600,
        statistics.vsize_1800,
        statistics.vsize_2000,
+        statistics.vsize_ps_1,
+        statistics.vsize_ps_2,
+        statistics.vsize_ps_3,
+        statistics.vsize_ps_4,
+        statistics.vsize_ps_5,
+        statistics.vsize_ps_6,
+        statistics.vsize_ps_8,
+        statistics.vsize_ps_10,
+        statistics.vsize_ps_12,
+        statistics.vsize_ps_15,
+        statistics.vsize_ps_20,
+        statistics.vsize_ps_30,
+        statistics.vsize_ps_40,
+        statistics.vsize_ps_50,
+        statistics.vsize_ps_60,
+        statistics.vsize_ps_70,
+        statistics.vsize_ps_80,
+        statistics.vsize_ps_90,
+        statistics.vsize_ps_100,
+        statistics.vsize_ps_125,
+        statistics.vsize_ps_150,
+        statistics.vsize_ps_175,
+        statistics.vsize_ps_200,
+        statistics.vsize_ps_250,
+        statistics.vsize_ps_300,
+        statistics.vsize_ps_350,
+        statistics.vsize_ps_400,
+        statistics.vsize_ps_500,
+        statistics.vsize_ps_600,
+        statistics.vsize_ps_700,
+        statistics.vsize_ps_800,
+        statistics.vsize_ps_900,
+        statistics.vsize_ps_1000,
+        statistics.vsize_ps_1200,
+        statistics.vsize_ps_1400,
+        statistics.vsize_ps_1600,
+        statistics.vsize_ps_1800,
+        statistics.vsize_ps_2000,
      ];
      const [result]: any = await DB.query(query, params);
      return result.insertId;
@@ -214,7 +328,45 @@ class StatisticsApi {
      CAST(avg(vsize_1400) as DOUBLE) as vsize_1400,
      CAST(avg(vsize_1600) as DOUBLE) as vsize_1600,
      CAST(avg(vsize_1800) as DOUBLE) as vsize_1800,
-      CAST(avg(vsize_2000) as DOUBLE) as vsize_2000 \
+      CAST(avg(vsize_2000) as DOUBLE) as vsize_2000,
+      CAST(avg(vsize_ps_1) as DOUBLE) as vsize_ps_1,
+      CAST(avg(vsize_ps_2) as DOUBLE) as vsize_ps_2,
+      CAST(avg(vsize_ps_3) as DOUBLE) as vsize_ps_3,
+      CAST(avg(vsize_ps_4) as DOUBLE) as vsize_ps_4,
+      CAST(avg(vsize_ps_5) as DOUBLE) as vsize_ps_5,
+      CAST(avg(vsize_ps_6) as DOUBLE) as vsize_ps_6,
+      CAST(avg(vsize_ps_8) as DOUBLE) as vsize_ps_8,
+      CAST(avg(vsize_ps_10) as DOUBLE) as vsize_ps_10,
+      CAST(avg(vsize_ps_12) as DOUBLE) as vsize_ps_12,
+      CAST(avg(vsize_ps_15) as DOUBLE) as vsize_ps_15,
+      CAST(avg(vsize_ps_20) as DOUBLE) as vsize_ps_20,
+      CAST(avg(vsize_ps_30) as DOUBLE) as vsize_ps_30,
+      CAST(avg(vsize_ps_40) as DOUBLE) as vsize_ps_40,
+      CAST(avg(vsize_ps_50) as DOUBLE) as vsize_ps_50,
+      CAST(avg(vsize_ps_60) as DOUBLE) as vsize_ps_60,
+      CAST(avg(vsize_ps_70) as DOUBLE) as vsize_ps_70,
+      CAST(avg(vsize_ps_80) as DOUBLE) as vsize_ps_80,
+      CAST(avg(vsize_ps_90) as DOUBLE) as vsize_ps_90,
+      CAST(avg(vsize_ps_100) as DOUBLE) as vsize_ps_100,
+      CAST(avg(vsize_ps_125) as DOUBLE) as vsize_ps_125,
+      CAST(avg(vsize_ps_150) as DOUBLE) as vsize_ps_150,
+      CAST(avg(vsize_ps_175) as DOUBLE) as vsize_ps_175,
+      CAST(avg(vsize_ps_200) as DOUBLE) as vsize_ps_200,
+      CAST(avg(vsize_ps_250) as DOUBLE) as vsize_ps_250,
+      CAST(avg(vsize_ps_300) as DOUBLE) as vsize_ps_300,
+      CAST(avg(vsize_ps_350) as DOUBLE) as vsize_ps_350,
+      CAST(avg(vsize_ps_400) as DOUBLE) as vsize_ps_400,
+      CAST(avg(vsize_ps_500) as DOUBLE) as vsize_ps_500,
+      CAST(avg(vsize_ps_600) as DOUBLE) as vsize_ps_600,
+      CAST(avg(vsize_ps_700) as DOUBLE) as vsize_ps_700,
+      CAST(avg(vsize_ps_800) as DOUBLE) as vsize_ps_800,
+      CAST(avg(vsize_ps_900) as DOUBLE) as vsize_ps_900,
+      CAST(avg(vsize_ps_1000) as DOUBLE) as vsize_ps_1000,
+      CAST(avg(vsize_ps_1200) as DOUBLE) as vsize_ps_1200,
+      CAST(avg(vsize_ps_1400) as DOUBLE) as vsize_ps_1400,
+      CAST(avg(vsize_ps_1600) as DOUBLE) as vsize_ps_1600,
+      CAST(avg(vsize_ps_1800) as DOUBLE) as vsize_ps_1800,
+      CAST(avg(vsize_ps_2000) as DOUBLE) as vsize_ps_2000 \
      FROM statistics \
      ${interval === 'all' ? '' : `WHERE added BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()`} \
      GROUP BY UNIX_TIMESTAMP(added) DIV ${div} \
@@ -264,7 +416,45 @@ class StatisticsApi {
      vsize_1400,
      vsize_1600,
      vsize_1800,
-      vsize_2000 \
+      vsize_2000,
+      vsize_ps_1,
+      vsize_ps_2,
+      vsize_ps_3,
+      vsize_ps_4,
+      vsize_ps_5,
+      vsize_ps_6,
+      vsize_ps_8,
+      vsize_ps_10,
+      vsize_ps_12,
+      vsize_ps_15,
+      vsize_ps_20,
+      vsize_ps_30,
+      vsize_ps_40,
+      vsize_ps_50,
+      vsize_ps_60,
+      vsize_ps_70,
+      vsize_ps_80,
+      vsize_ps_90,
+      vsize_ps_100,
+      vsize_ps_125,
+      vsize_ps_150,
+      vsize_ps_175,
+      vsize_ps_200,
+      vsize_ps_250,
+      vsize_ps_300,
+      vsize_ps_350,
+      vsize_ps_400,
+      vsize_ps_500,
+      vsize_ps_600,
+      vsize_ps_700,
+      vsize_ps_800,
+      vsize_ps_900,
+      vsize_ps_1000,
+      vsize_ps_1200,
+      vsize_ps_1400,
+      vsize_ps_1600,
+      vsize_ps_1800,
+      vsize_ps_2000 \
      FROM statistics \
      ${interval === 'all' ? '' : `WHERE added BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()`} \
      GROUP BY UNIX_TIMESTAMP(added) DIV ${div} \
@@ -452,7 +642,47 @@ class StatisticsApi {
          s.vsize_1600,
          s.vsize_1800,
          s.vsize_2000,
-        ]
+        ],
+        vsizes_ps: [
+          s.vsize_ps_1,
+          s.vsize_ps_2,
+          s.vsize_ps_3,
+          s.vsize_ps_4,
+          s.vsize_ps_5,
+          s.vsize_ps_6,
+          s.vsize_ps_8,
+          s.vsize_ps_10,
+          s.vsize_ps_12,
+          s.vsize_ps_15,
+          s.vsize_ps_20,
+          s.vsize_ps_30,
+          s.vsize_ps_40,
+          s.vsize_ps_50,
+          s.vsize_ps_60,
+          s.vsize_ps_70,
+          s.vsize_ps_80,
+          s.vsize_ps_90,
+          s.vsize_ps_100,
+          s.vsize_ps_125,
+          s.vsize_ps_150,
+          s.vsize_ps_175,
+          s.vsize_ps_200,
+          s.vsize_ps_250,
+          s.vsize_ps_300,
+          s.vsize_ps_350,
+          s.vsize_ps_400,
+          s.vsize_ps_500,
+          s.vsize_ps_600,
+          s.vsize_ps_700,
+          s.vsize_ps_800,
+          s.vsize_ps_900,
+          s.vsize_ps_1000,
+          s.vsize_ps_1200,
+          s.vsize_ps_1400,
+          s.vsize_ps_1600,
+          s.vsize_ps_1800,
+          s.vsize_ps_2000,
+        ],
      };
    });
  }
@@ -506,6 +736,44 @@ class StatisticsApi {
        vsize_1600: s.vsizes[35],
        vsize_1800: s.vsizes[36],
        vsize_2000: s.vsizes[37],
+        vsize_ps_1: s.vsizes_ps?.[0] || 0,
+        vsize_ps_2: s.vsizes_ps?.[1] || 0,
+        vsize_ps_3: s.vsizes_ps?.[2] || 0,
+        vsize_ps_4: s.vsizes_ps?.[3] || 0,
+        vsize_ps_5: s.vsizes_ps?.[4] || 0,
+        vsize_ps_6: s.vsizes_ps?.[5] || 0,
+        vsize_ps_8: s.vsizes_ps?.[6] || 0,
+        vsize_ps_10: s.vsizes_ps?.[7] || 0,
+        vsize_ps_12: s.vsizes_ps?.[8] || 0,
+        vsize_ps_15: s.vsizes_ps?.[9] || 0,
+        vsize_ps_20: s.vsizes_ps?.[10] || 0,
+        vsize_ps_30: s.vsizes_ps?.[11] || 0,
+        vsize_ps_40: s.vsizes_ps?.[12] || 0,
+        vsize_ps_50: s.vsizes_ps?.[13] || 0,
+        vsize_ps_60: s.vsizes_ps?.[14] || 0,
+        vsize_ps_70: s.vsizes_ps?.[15] || 0,
+        vsize_ps_80: s.vsizes_ps?.[16] || 0,
+        vsize_ps_90: s.vsizes_ps?.[17] || 0,
+        vsize_ps_100: s.vsizes_ps?.[18] || 0,
+        vsize_ps_125: s.vsizes_ps?.[19] || 0,
+        vsize_ps_150: s.vsizes_ps?.[20] || 0,
+        vsize_ps_175: s.vsizes_ps?.[21] || 0,
+        vsize_ps_200: s.vsizes_ps?.[22] || 0,
+        vsize_ps_250: s.vsizes_ps?.[23] || 0,
+        vsize_ps_300: s.vsizes_ps?.[24] || 0,
+        vsize_ps_350: s.vsizes_ps?.[25] || 0,
+        vsize_ps_400: s.vsizes_ps?.[26] || 0,
+        vsize_ps_500: s.vsizes_ps?.[27] || 0,
+        vsize_ps_600: s.vsizes_ps?.[28] || 0,
+        vsize_ps_700: s.vsizes_ps?.[29] || 0,
+        vsize_ps_800: s.vsizes_ps?.[30] || 0,
+        vsize_ps_900: s.vsizes_ps?.[31] || 0,
+        vsize_ps_1000: s.vsizes_ps?.[32] || 0,
+        vsize_ps_1200: s.vsizes_ps?.[33] || 0,
+        vsize_ps_1400: s.vsizes_ps?.[34] || 0,
+        vsize_ps_1600: s.vsizes_ps?.[35] || 0,
+        vsize_ps_1800: s.vsizes_ps?.[36] || 0,
+        vsize_ps_2000: s.vsizes_ps?.[37] || 0,
      }
    });
  }
--- a/backend/src/api/statistics/statistics.ts
+++ b/backend/src/api/statistics/statistics.ts
@@ -4,6 +4,9 @@ import { TransactionExtended, OptimizedStatistic } from '../../mempool.interface
 import { Common } from '../common';
 import statisticsApi from './statistics-api';

+export const logFees = [1, 2, 3, 4, 5, 6, 8, 10, 12, 15, 20, 30, 40, 50, 60, 70, 80, 90, 100, 125, 150, 175, 200,
+  250, 300, 350, 400, 500, 600, 700, 800, 900, 1000, 1200, 1400, 1600, 1800, 2000];
+
 class Statistics {
  protected intervalTimer: NodeJS.Timer | undefined;
  protected lastRun: number = 0;
@@ -42,6 +45,7 @@ class Statistics {
    const currentMempool = memPool.getMempool();
    const txPerSecond = memPool.getTxPerSecond();
    const vBytesPerSecond = memPool.getVBytesPerSecond();
+    const vBytesPerSecondByFeeRate = memPool.getVBytesPerSecondByFeeRate();

    logger.debug('Running statistics');

@@ -73,9 +77,6 @@ class Statistics {
    const totalWeight = memPoolArray.map((tx) => tx.vsize).reduce((acc, curr) => acc + curr) * 4;
    const totalFee = memPoolArray.map((tx) => tx.fee).reduce((acc, curr) => acc + curr);

-    const logFees = [1, 2, 3, 4, 5, 6, 8, 10, 12, 15, 20, 30, 40, 50, 60, 70, 80, 90, 100, 125, 150, 175, 200,
-      250, 300, 350, 400, 500, 600, 700, 800, 900, 1000, 1200, 1400, 1600, 1800, 2000];
-
    const weightVsizeFees: { [feePerWU: number]: number } = {};
    const lastItem = logFees.length - 1;

@@ -147,6 +148,44 @@ class Statistics {
        vsize_1600: weightVsizeFees['1600'] || 0,
        vsize_1800: weightVsizeFees['1800'] || 0,
        vsize_2000: weightVsizeFees['2000'] || 0,
+        vsize_ps_1: vBytesPerSecondByFeeRate['1'] || 0,
+        vsize_ps_2: vBytesPerSecondByFeeRate['2'] || 0,
+        vsize_ps_3: vBytesPerSecondByFeeRate['3'] || 0,
+        vsize_ps_4: vBytesPerSecondByFeeRate['4'] || 0,
+        vsize_ps_5: vBytesPerSecondByFeeRate['5'] || 0,
+        vsize_ps_6: vBytesPerSecondByFeeRate['6'] || 0,
+        vsize_ps_8: vBytesPerSecondByFeeRate['8'] || 0,
+        vsize_ps_10: vBytesPerSecondByFeeRate['10'] || 0,
+        vsize_ps_12: vBytesPerSecondByFeeRate['12'] || 0,
+        vsize_ps_15: vBytesPerSecondByFeeRate['15'] || 0,
+        vsize_ps_20: vBytesPerSecondByFeeRate['20'] || 0,
+        vsize_ps_30: vBytesPerSecondByFeeRate['30'] || 0,
+        vsize_ps_40: vBytesPerSecondByFeeRate['40'] || 0,
+        vsize_ps_50: vBytesPerSecondByFeeRate['50'] || 0,
+        vsize_ps_60: vBytesPerSecondByFeeRate['60'] || 0,
+        vsize_ps_70: vBytesPerSecondByFeeRate['70'] || 0,
+        vsize_ps_80: vBytesPerSecondByFeeRate['80'] || 0,
+        vsize_ps_90: vBytesPerSecondByFeeRate['90'] || 0,
+        vsize_ps_100: vBytesPerSecondByFeeRate['100'] || 0,
+        vsize_ps_125: vBytesPerSecondByFeeRate['125'] || 0,
+        vsize_ps_150: vBytesPerSecondByFeeRate['150'] || 0,
+        vsize_ps_175: vBytesPerSecondByFeeRate['175'] || 0,
+        vsize_ps_200: vBytesPerSecondByFeeRate['200'] || 0,
+        vsize_ps_250: vBytesPerSecondByFeeRate['250'] || 0,
+        vsize_ps_300: vBytesPerSecondByFeeRate['300'] || 0,
+        vsize_ps_350: vBytesPerSecondByFeeRate['350'] || 0,
+        vsize_ps_400: vBytesPerSecondByFeeRate['400'] || 0,
+        vsize_ps_500: vBytesPerSecondByFeeRate['500'] || 0,
+        vsize_ps_600: vBytesPerSecondByFeeRate['600'] || 0,
+        vsize_ps_700: vBytesPerSecondByFeeRate['700'] || 0,
+        vsize_ps_800: vBytesPerSecondByFeeRate['800'] || 0,
+        vsize_ps_900: vBytesPerSecondByFeeRate['900'] || 0,
+        vsize_ps_1000: vBytesPerSecondByFeeRate['1000'] || 0,
+        vsize_ps_1200: vBytesPerSecondByFeeRate['1200'] || 0,
+        vsize_ps_1400: vBytesPerSecondByFeeRate['1400'] || 0,
+        vsize_ps_1600: vBytesPerSecondByFeeRate['1600'] || 0,
+        vsize_ps_1800: vBytesPerSecondByFeeRate['1800'] || 0,
+        vsize_ps_2000: vBytesPerSecondByFeeRate['2000'] || 0,
      });

      if (this.newStatisticsEntryCallback && insertId) {
--- a/backend/src/mempool.interfaces.ts
+++ b/backend/src/mempool.interfaces.ts
@@ -439,6 +439,46 @@ export interface Statistic {
  vsize_1600: number;
  vsize_1800: number;
  vsize_2000: number;
+
+  vsize_ps_1: number;
+  vsize_ps_2: number;
+  vsize_ps_3: number;
+  vsize_ps_4: number;
+  vsize_ps_5: number;
+  vsize_ps_6: number;
+  vsize_ps_8: number;
+  vsize_ps_10: number;
+  vsize_ps_12: number;
+  vsize_ps_15: number;
+  vsize_ps_20: number;
+  vsize_ps_30: number;
+  vsize_ps_40: number;
+  vsize_ps_50: number;
+  vsize_ps_60: number;
+  vsize_ps_70: number;
+  vsize_ps_80: number;
+  vsize_ps_90: number;
+  vsize_ps_100: number;
+  vsize_ps_125: number;
+  vsize_ps_150: number;
+  vsize_ps_175: number;
+  vsize_ps_200: number;
+  vsize_ps_250: number;
+  vsize_ps_300: number;
+  vsize_ps_350: number;
+  vsize_ps_400: number;
+  vsize_ps_500: number;
+  vsize_ps_600: number;
+  vsize_ps_700: number;
+  vsize_ps_800: number;
+  vsize_ps_900: number;
+  vsize_ps_1000: number;
+  vsize_ps_1200: number;
+  vsize_ps_1400: number;
+  vsize_ps_1600: number;
+  vsize_ps_1800: number;
+  vsize_ps_2000: number;
+  
 }

 export interface OptimizedStatistic {
@@ -449,6 +489,7 @@ export interface OptimizedStatistic {
  mempool_byte_weight: number;
  min_fee: number;
  vsizes: number[];
+  vsizes_ps: number[];
 }

 export interface TxTrackingInfo {
@@ -481,6 +522,7 @@ export interface WebsocketResponse {
 export interface VbytesPerSecond {
  unixTime: number;
  vSize: number;
+  effectiveFeePerVsize: number;
 }

 export interface RequiredSpec { [name: string]: RequiredParams; }
--- a/backend/src/utils/api.ts
+++ b/backend/src/utils/api.ts
@@ -1,9 +0,0 @@
-import { Request, Response } from 'express';
-
-export function handleError(req: Request, res: Response, statusCode: number, errorMessage: string | unknown): void {
-  if (req.accepts('json')) {
-    res.status(statusCode).json({ error: errorMessage });
-  } else {
-    res.status(statusCode).send(errorMessage);
-  }
-}
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -32,6 +32,7 @@
        "bootstrap": "~4.6.2",
        "browserify": "^17.0.0",
        "clipboard": "^2.0.11",
+        "cypress": "^13.14.0",
        "domino": "^2.1.6",
        "echarts": "~5.5.0",
        "esbuild": "^0.23.0",
@@ -12693,12 +12694,12 @@
      }
    },
    "node_modules/micromatch": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
      "dependencies": {
-        "braces": "^3.0.3",
-        "picomatch": "^2.3.1"
+        "braces": "^3.0.1",
+        "picomatch": "^2.2.3"
      },
      "engines": {
        "node": ">=8.6"
@@ -27621,12 +27622,12 @@
      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="
    },
    "micromatch": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
      "requires": {
-        "braces": "^3.0.3",
-        "picomatch": "^2.3.1"
+        "braces": "^3.0.1",
+        "picomatch": "^2.2.3"
      }
    },
    "miller-rabin": {
--- a/frontend/src/app/components/amount-selector/amount-selector.component.html
+++ b/frontend/src/app/components/amount-selector/amount-selector.component.html
@@ -1,7 +0,0 @@
-<div [formGroup]="amountForm" class="text-small text-center">
-    <select formControlName="mode" class="custom-select custom-select-sm form-control-secondary form-control mx-auto" style="width: 70px;" (change)="changeMode()">
-        <option value="btc" i18n="shared.btc|BTC">BTC</option>
-        <option value="sats" i18n="shared.sat|sat">sat</option>
-        <option value="fiat" i18n="shared.fiat|Fiat">Fiat</option>
-    </select>
-</div>
--- a/frontend/src/app/components/amount-selector/amount-selector.component.scss
+++ b/frontend/src/app/components/amount-selector/amount-selector.component.scss
--- a/frontend/src/app/components/amount-selector/amount-selector.component.ts
+++ b/frontend/src/app/components/amount-selector/amount-selector.component.ts
@@ -1,36 +0,0 @@
-import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
-import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
-import { StorageService } from '../../services/storage.service';
-import { StateService } from '../../services/state.service';
-
-@Component({
-  selector: 'app-amount-selector',
-  templateUrl: './amount-selector.component.html',
-  styleUrls: ['./amount-selector.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush
-})
-export class AmountSelectorComponent implements OnInit {
-  amountForm: UntypedFormGroup;
-  modes = ['btc', 'sats', 'fiat'];
-
-  constructor(
-    private formBuilder: UntypedFormBuilder,
-    private stateService: StateService,
-    private storageService: StorageService,
-  ) { }
-
-  ngOnInit() {
-    this.amountForm = this.formBuilder.group({
-      mode: ['btc']
-    });
-    this.stateService.viewAmountMode$.subscribe((mode) => {
-      this.amountForm.get('mode')?.setValue(mode);
-    });
-  }
-
-  changeMode() {
-    const newMode = this.amountForm.get('mode')?.value;
-    this.storageService.setValue('view-amount-mode', newMode);
-    this.stateService.viewAmountMode$.next(newMode);
-  }
-}
--- a/frontend/src/app/components/transaction/transaction.component.html
+++ b/frontend/src/app/components/transaction/transaction.component.html
@@ -551,24 +551,24 @@
        <td class="td-width align-items-center align-middle" i18n="transaction.eta|Transaction ETA">ETA</td>
        <td>
          <ng-container *ngIf="(ETA$ | async) as eta; else etaSkeleton">
-            @if (network === 'liquid' || network === 'liquidtestnet') {
+            @if (eta.blocks >= 7) {
+              <span [class]="(!tx?.acceleration && acceleratorAvailable && accelerateCtaType === 'button' && !showAccelerationSummary && eligibleForAcceleration) ? 'etaDeepMempool justify-content-end align-items-center' : ''">
+                <span i18n="transaction.eta.not-any-time-soon|Transaction ETA mot any time soon">Not any time soon</span>
+                @if (!tx?.acceleration && acceleratorAvailable && accelerateCtaType === 'button' && !showAccelerationSummary && eligibleForAcceleration) {
+                  <a class="btn btn-sm accelerateDeepMempool btn-small-height float-right" i18n="transaction.accelerate|Accelerate button label" (click)="onAccelerateClicked()">Accelerate</a>
+                }
+              </span>
+            } @else if (network === 'liquid' || network === 'liquidtestnet') {
              <app-time kind="until" [time]="eta.time" [fastRender]="false" [fixedRender]="true"></app-time>
            } @else {
-              <span [class]="(!tx?.acceleration && acceleratorAvailable && accelerateCtaType === 'button' && !showAccelerationSummary) ? 'etaDeepMempool d-flex justify-content-between' : ''">
-                @if (eta.blocks >= 7) {
-                  <span i18n="transaction.eta.not-any-time-soon|Transaction ETA mot any time soon">Not any time soon</span>
-                } @else {
-                  <app-time kind="until" [time]="eta.time" [fastRender]="false" [fixedRender]="true"></app-time>
-                }
-                @if (!tx?.acceleration && acceleratorAvailable && accelerateCtaType === 'button' && !showAccelerationSummary) {
-                  <div class="d-flex accelerate">
-                    <a class="btn btn-sm accelerateDeepMempool btn-small-height" [class.disabled]="!eligibleForAcceleration" i18n="transaction.accelerate|Accelerate button label" (click)="onAccelerateClicked()">Accelerate</a>
-                    <a *ngIf="!eligibleForAcceleration" href="https://mempool.space/accelerator#why-cant-accelerate" target="_blank" class="info-badges ml-1" i18n-ngbTooltip="Mempool Accelerator&trade; tooltip" ngbTooltip="This transaction cannot be accelerated">
-                        <fa-icon [icon]="['fas', 'info-circle']" [fixedWidth]="true"></fa-icon>
-                    </a>
-                  </div>
+              <span [class]="(!tx?.acceleration && acceleratorAvailable && accelerateCtaType === 'button' && !showAccelerationSummary && eligibleForAcceleration) ? 'etaDeepMempool justify-content-end align-items-center' : ''">
+                <app-time kind="until" [time]="eta.time" [fastRender]="false" [fixedRender]="true"></app-time>
+                @if (!tx?.acceleration && acceleratorAvailable && accelerateCtaType === 'button' && !showAccelerationSummary && eligibleForAcceleration) {
+                  <a class="btn btn-sm accelerateDeepMempool btn-small-height float-right" i18n="transaction.accelerate|Accelerate button label" (click)="onAccelerateClicked()">Accelerate</a>
                }
              </span>
+              <span class="eta justify-content-end">
+              </span>
            }
          </ng-container>
          <ng-template #etaSkeleton>
--- a/frontend/src/app/components/transaction/transaction.component.scss
+++ b/frontend/src/app/components/transaction/transaction.component.scss
@@ -287,21 +287,37 @@
 }

 .accelerate {
-  @media (min-width: 850px) {
-    margin-left: auto;
-  }  
+  display: flex !important;
+  align-self: auto;
+  margin-left: auto;
+  background-color: var(--tertiary);
+  @media (max-width: 849px) {
+    margin-left: 5px;
+  }
 }

 .etaDeepMempool {
+  justify-content: flex-end;
  flex-wrap: wrap;
+  align-content: center;
+  @media (max-width: 995px) {
+    justify-content: left !important;
+  }
  @media (max-width: 849px) {
    justify-content: right !important;
  }
 }

 .accelerateDeepMempool {
+  align-self: auto;
+  margin-left: auto;
  background-color: var(--tertiary);
-  margin-left: 5px;
+  @media (max-width: 995px) {
+    margin-left: 0px;
+  }
+  @media (max-width: 849px) {
+    margin-left: 5px;
+  }
 }

 .goggles-icon {
@@ -319,9 +335,4 @@

 .oobFees {
  color: #905cf4;
-}
-
-.disabled {
-  opacity: 0.5;
-  pointer-events: none;
 }
--- a/frontend/src/app/components/transaction/transaction.component.ts
+++ b/frontend/src/app/components/transaction/transaction.component.ts
@@ -27,7 +27,7 @@ import { StorageService } from '../../services/storage.service';
 import { seoDescriptionNetwork } from '../../shared/common.utils';
 import { getTransactionFlags, getUnacceleratedFeeRate } from '../../shared/transaction.utils';
 import { Filter, TransactionFlags, toFilters } from '../../shared/filters.utils';
-import { BlockExtended, CpfpInfo, RbfTree, MempoolPosition, DifficultyAdjustment, Acceleration, AccelerationPosition } from '../../interfaces/node-api.interface';
+import { BlockExtended, CpfpInfo, RbfTree, MempoolPosition, DifficultyAdjustment, Acceleration, AccelerationPosition, OptimizedMempoolStats } from '../../interfaces/node-api.interface';
 import { LiquidUnblinding } from './liquid-ublinding';
 import { RelativeUrlPipe } from '../../shared/pipes/relative-url/relative-url.pipe';
 import { PriceService } from '../../services/price.service';
@@ -139,6 +139,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
  firstLoad = true;
  waitingForAccelerationInfo: boolean = false;
  isLoadingFirstSeen = false;
+  mempoolStats: OptimizedMempoolStats[] = null;

  featuresEnabled: boolean;
  segwitEnabled: boolean;
@@ -196,7 +197,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
      });
    }

-    this.websocketService.want(['blocks', 'mempool-blocks']);
+    this.websocketService.want(['blocks', 'mempool-blocks', 'live-2h-chart']);
    this.stateService.networkChanged$.subscribe(
      (network) => {
        this.network = network;
@@ -769,8 +770,20 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
      this.stateService.difficultyAdjustment$.pipe(startWith(null)),
      this.isAccelerated$,
      this.txChanged$,
+      this.apiService.list2HStatistics$(),
+      this.stateService.live2Chart$.pipe(startWith(null)),
    ]).pipe(
-      map(([position, mempoolBlocks, da, isAccelerated]) => {
+      map(([position, mempoolBlocks, da, isAccelerated, _, mempoolStats, mempoolStat]) => {
+
+        if (this.mempoolStats === null) {
+          this.mempoolStats = mempoolStats;
+        }
+
+        if (this.mempoolStats.length && mempoolStat && this.mempoolStats[0].added !== mempoolStat.added) {
+          this.mempoolStats.pop();
+          this.mempoolStats.unshift(mempoolStat);
+        }
+
        return this.etaService.calculateETA(
          this.network,
          this.tx,
@@ -780,6 +793,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
          this.miningStats,
          isAccelerated,
          this.accelerationPositions,
+          this.mempoolStats,
        );
      })
    );
@@ -977,6 +991,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
    this.isAcceleration = false;
    this.isAccelerated$.next(this.isAcceleration);
    this.eligibleForAcceleration = false;
+    this.mempoolStats = null;
    this.leaveTransaction();
  }

--- a/frontend/src/app/interfaces/node-api.interface.ts
+++ b/frontend/src/app/interfaces/node-api.interface.ts
@@ -7,6 +7,7 @@ export interface OptimizedMempoolStats {
  total_fee: number;
  mempool_byte_weight: number;
  vsizes: number[];
+  vsizes_ps: number[];
 }

 interface Ancestor {
--- a/frontend/src/app/services/eta.service.ts
+++ b/frontend/src/app/services/eta.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { AccelerationPosition, CpfpInfo, DifficultyAdjustment, MempoolPosition, SinglePoolStats } from '../interfaces/node-api.interface';
+import { AccelerationPosition, CpfpInfo, DifficultyAdjustment, MempoolPosition, OptimizedMempoolStats, SinglePoolStats } from '../interfaces/node-api.interface';
 import { StateService } from './state.service';
 import { MempoolBlock } from '../interfaces/websocket.interface';
 import { Transaction } from '../interfaces/electrs.interface';
@@ -7,6 +7,7 @@ import { MiningService, MiningStats } from './mining.service';
 import { getUnacceleratedFeeRate } from '../shared/transaction.utils';
 import { AccelerationEstimate } from '../components/accelerate-checkout/accelerate-checkout.component';
 import { Observable, combineLatest, map, of, share, shareReplay, tap } from 'rxjs';
+import { feeLevels } from '../app.constants';

 export interface ETA {
  now: number, // time at which calculation performed
@@ -113,6 +114,7 @@ export class EtaService {
    miningStats: MiningStats,
    isAccelerated: boolean,
    accelerationPositions: AccelerationPosition[],
+    mempoolStats: OptimizedMempoolStats[] = [],
  ): ETA | null {
    // return this.calculateETA(tx, this.accelerationPositions, position, mempoolBlocks, da, isAccelerated)
    if (!tx || !mempoolBlocks) {
@@ -143,7 +145,17 @@ export class EtaService {

    if (!isAccelerated) {
      const blocks = mempoolPosition.block + 1;
-      const wait = da.adjustedTimeAvg * (mempoolPosition.block + 1);
+
+      const vsizeAhead = mempoolPosition.vsize + this.stateService.blockVSize * mempoolPosition.block;
+      const incomingVsizePerBlock = this.estimateVsizePerSecond(tx, mempoolStats) * da.adjustedTimeAvg / 1000;
+      const vsizeConsumedPerBlock = Math.max(
+        this.stateService.blockVSize - incomingVsizePerBlock,
+        0.05 * this.stateService.blockVSize // So that we don't return infinite ETA
+      )
+
+      const blocksUntilMined = Math.ceil(vsizeAhead / vsizeConsumedPerBlock);
+      const wait = blocksUntilMined * da.adjustedTimeAvg;
+
      return {
        now,
        time: wait + now + da.timeOffset,
@@ -279,4 +291,46 @@ export class EtaService {
    return tx.fee / (tx.weight / 4);

  }
+
+  estimateVsizePerSecond(tx: Transaction, mempoolStats: OptimizedMempoolStats[], timeWindow: number = 15 * 60 * 1000): number {
+    const nowMinusTimeSpan = (new Date().getTime() - timeWindow) / 1000;
+    const vsizeAboveTransaction = mempoolStats
+      // Remove datapoints older than now - timeWindow
+      .filter(stat => stat.added > nowMinusTimeSpan)
+      // Remove datapoints less than 45 seconds apart from the previous one
+      .filter((el, i, arr) => {
+        if (i === 0) {
+          return true;
+        }
+        return arr[i - 1].added - el.added > 45;
+      })
+      // For each datapoint, compute the total vsize of transactions with higher fee rate
+      .map(stat => {
+        let vsizeAbove = 0;
+        for (let i = feeLevels.length - 1; i >= 0; i--) {
+          if (feeLevels[i] > tx.effectiveFeePerVsize) {
+            vsizeAbove += stat.vsizes_ps[i];
+          } else {
+            break;
+          }
+        }
+        return vsizeAbove;
+      });
+    
+    // vsizeAboveTransaction is a temporal series of past vsize values above the transaction's fee rate
+    // From this array we need to estimate the future vsize per second
+    // Naive first approach: take the median of the series
+    if (!vsizeAboveTransaction.length) {
+      return 0;
+    }
+
+    const sorted = Array.from(vsizeAboveTransaction).sort((a, b) => a - b);
+    const middle = Math.floor(sorted.length / 2);
+
+    if (sorted.length % 2 === 0) {
+        return (sorted[middle - 1] + sorted[middle]) / 2;
+    }
+
+    return sorted[middle];
+  }
 }
--- a/frontend/src/app/shared/components/global-footer/global-footer.component.html
+++ b/frontend/src/app/shared/components/global-footer/global-footer.component.html
@@ -27,27 +27,23 @@
          <div class="selector">
            <app-rate-unit-selector></app-rate-unit-selector>
          </div>
-          <div class="selector d-none" [ngClass]="isServicesPage ? 'd-lg-flex' : 'd-md-flex'">
-            <app-amount-selector></app-amount-selector>
-          </div>
          @if (!env.customize?.theme) {
-            <div class="selector d-none" [ngClass]="isServicesPage ? 'd-lg-flex' : 'd-md-flex'">
+            <div class="selector d-none d-sm-flex">
              <app-theme-selector></app-theme-selector>
            </div>
          }
-          <a *ngIf="stateService.isMempoolSpaceBuild" class="btn btn-purple sponsor d-none justify-content-center" [ngClass]="isServicesPage ? 'd-lg-flex' : 'd-md-flex'" [routerLink]="['/login']">
+          <a *ngIf="stateService.isMempoolSpaceBuild" class="btn btn-purple sponsor d-none d-sm-flex justify-content-center" [routerLink]="['/login']">
            <span *ngIf="user" i18n="shared.my-account" class="nowrap">My Account</span>
            <span *ngIf="!user" i18n="shared.sign-in" class="nowrap">Sign In</span>
          </a>
        </div>
        @if (!env.customize?.theme) {
-          <div class="selector d-flex justify-content-center ml-auto mr-auto mt-0" [ngClass]="isServicesPage ? 'd-lg-none' : 'd-md-none'">
-            <app-amount-selector class="add-margin"></app-amount-selector>
-            <app-theme-selector class="add-margin"></app-theme-selector>
+          <div class="selector d-flex d-sm-none justify-content-center ml-auto mr-auto mt-0">
+            <app-theme-selector></app-theme-selector>
          </div>
        }
        @if (!enterpriseInfo?.footer_img) {
-          <a *ngIf="stateService.isMempoolSpaceBuild" class="btn btn-purple sponsor d-flex justify-content-center ml-auto mr-auto mt-0 mb-2" [ngClass]="isServicesPage ? 'd-lg-none' : 'd-md-none'" [routerLink]="['/login']">
+          <a *ngIf="stateService.isMempoolSpaceBuild" class="btn btn-purple sponsor d-flex d-sm-none justify-content-center ml-auto mr-auto mt-0 mb-2" [routerLink]="['/login']">
            <span *ngIf="user" i18n="shared.my-account" class="nowrap">My Account</span>
            <span *ngIf="!user" i18n="shared.sign-in" class="nowrap">Sign In</span>
          </a>
--- a/frontend/src/app/shared/components/global-footer/global-footer.component.scss
+++ b/frontend/src/app/shared/components/global-footer/global-footer.component.scss
@@ -76,11 +76,6 @@ footer .selector {
  display: inline-block;
 }

-footer .add-margin {
-  margin-left: 5px;
-  margin-right: 5px;
-}
-
 footer .row.link-tree {
  max-width: 1140px;
  margin: 0 auto;
@@ -159,7 +154,7 @@ footer .nowrap {
  display: block;
 }

-@media (min-width: 1020px) {
+@media (min-width: 951px) {
  :host-context(.ltr-layout) .language-selector {
    float: right !important;
  }
@@ -177,24 +172,7 @@ footer .nowrap {
 }

 .services {
-  @media (min-width: 1300px) {
-    :host-context(.ltr-layout) .language-selector {
-      float: right !important;
-    }
-    :host-context(.rtl-layout) .language-selector {
-      float: left !important;
-    }
-  
-    .explore-tagline-desktop {
-      display: block;
-    }
-  
-    .explore-tagline-mobile {
-      display: none;
-    }
-  }
-
-  @media (max-width: 1300px) {
+  @media (min-width: 951px) and (max-width: 1147px) {
    :host-context(.ltr-layout) .services .language-selector {
      float: none !important;
    }
@@ -270,7 +248,7 @@ footer .nowrap {

 }

-@media (max-width: 1019px) {
+@media (max-width: 950px) {

  .main-logo {
    width: 220px;
@@ -309,7 +287,7 @@ footer .nowrap {
  }
 }

-@media (max-width: 1300px) {
+@media (max-width: 1147px) {

  .services.main-logo {
    width: 220px;
--- a/frontend/src/app/shared/shared.module.ts
+++ b/frontend/src/app/shared/shared.module.ts
@@ -35,7 +35,6 @@ import { LanguageSelectorComponent } from '../components/language-selector/langu
 import { FiatSelectorComponent } from '../components/fiat-selector/fiat-selector.component';
 import { RateUnitSelectorComponent } from '../components/rate-unit-selector/rate-unit-selector.component';
 import { ThemeSelectorComponent } from '../components/theme-selector/theme-selector.component';
-import { AmountSelectorComponent } from '../components/amount-selector/amount-selector.component';
 import { BrowserOnlyDirective } from './directives/browser-only.directive';
 import { ServerOnlyDirective } from './directives/server-only.directive';
 import { ColoredPriceDirective } from './directives/colored-price.directive';
@@ -132,7 +131,6 @@ import { OnlyVsizeDirective, OnlyWeightDirective } from './components/weight-dir
    FiatSelectorComponent,
    ThemeSelectorComponent,
    RateUnitSelectorComponent,
-    AmountSelectorComponent,
    ScriptpubkeyTypePipe,
    RelativeUrlPipe,
    NoSanitizePipe,
@@ -280,7 +278,6 @@ import { OnlyVsizeDirective, OnlyWeightDirective } from './components/weight-dir
    FiatSelectorComponent,
    RateUnitSelectorComponent,
    ThemeSelectorComponent,
-    AmountSelectorComponent,
    ScriptpubkeyTypePipe,
    RelativeUrlPipe,
    Hex2asciiPipe,
--- a/production/bitcoin.conf
+++ b/production/bitcoin.conf
@@ -15,7 +15,6 @@ rpcpassword=__BITCOIN_RPC_PASS__
 whitelist=127.0.0.1
 whitelist=103.99.168.0/22
 whitelist=2401:b140::/32
-blocksxor=0
 #uacomment=@wiz

 [main]
--- a/production/mempool-reset-all
+++ b/production/mempool-reset-all
@@ -1,5 +1,3 @@
 #!/usr/bin/env zsh
-rm -f $HOME/*/backend/mempool-config.json
-rm -f $HOME/*/frontend/mempool-frontend-config.json
-rm -f $HOME/*/frontend/projects/mempool/mempool-frontend-config.json
-exit 0
+rm $HOME/*/backend/mempool-config.json
+rm $HOME/*/frontend/mempool-frontend-config.json
--- a/unfurler/package-lock.json
+++ b/unfurler/package-lock.json
@@ -6,11 +6,11 @@
  "packages": {
    "": {
      "name": "mempool-unfurl",
-      "version": "3.1.0-dev",
+      "version": "3.0.0",
      "dependencies": {
        "@types/node": "^16.11.41",
        "ejs": "^3.1.10",
-        "express": "^4.21.0",
+        "express": "^4.19.2",
        "node-fetch-commonjs": "^3.3.1",
        "puppeteer": "^15.3.2",
        "puppeteer-cluster": "^0.23.0",
@@ -446,9 +446,9 @@
      }
    },
    "node_modules/body-parser": {
-      "version": "1.20.3",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
-      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
+      "version": "1.20.2",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
+      "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
      "dependencies": {
        "bytes": "3.1.2",
        "content-type": "~1.0.5",
@@ -458,7 +458,7 @@
        "http-errors": "2.0.0",
        "iconv-lite": "0.4.24",
        "on-finished": "2.4.1",
-        "qs": "6.13.0",
+        "qs": "6.11.0",
        "raw-body": "2.5.2",
        "type-is": "~1.6.18",
        "unpipe": "1.0.0"
@@ -786,9 +786,9 @@
      }
    },
    "node_modules/encodeurl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
-      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
      "engines": {
        "node": ">= 0.8"
      }
@@ -1055,36 +1055,36 @@
      }
    },
    "node_modules/express": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz",
-      "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==",
+      "version": "4.19.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
+      "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
      "dependencies": {
        "accepts": "~1.3.8",
        "array-flatten": "1.1.1",
-        "body-parser": "1.20.3",
+        "body-parser": "1.20.2",
        "content-disposition": "0.5.4",
        "content-type": "~1.0.4",
        "cookie": "0.6.0",
        "cookie-signature": "1.0.6",
        "debug": "2.6.9",
        "depd": "2.0.0",
-        "encodeurl": "~2.0.0",
+        "encodeurl": "~1.0.2",
        "escape-html": "~1.0.3",
        "etag": "~1.8.1",
-        "finalhandler": "1.3.1",
+        "finalhandler": "1.2.0",
        "fresh": "0.5.2",
        "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.3",
+        "merge-descriptors": "1.0.1",
        "methods": "~1.1.2",
        "on-finished": "2.4.1",
        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.10",
+        "path-to-regexp": "0.1.7",
        "proxy-addr": "~2.0.7",
-        "qs": "6.13.0",
+        "qs": "6.11.0",
        "range-parser": "~1.2.1",
        "safe-buffer": "5.2.1",
-        "send": "0.19.0",
-        "serve-static": "1.16.2",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
        "setprototypeof": "1.2.0",
        "statuses": "2.0.1",
        "type-is": "~1.6.18",
@@ -1264,12 +1264,12 @@
      }
    },
    "node_modules/finalhandler": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
-      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
      "dependencies": {
        "debug": "2.6.9",
-        "encodeurl": "~2.0.0",
+        "encodeurl": "~1.0.2",
        "escape-html": "~1.0.3",
        "on-finished": "2.4.1",
        "parseurl": "~1.3.3",
@@ -1777,12 +1777,9 @@
      }
    },
    "node_modules/merge-descriptors": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
-      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
    },
    "node_modules/merge2": {
      "version": "1.4.1",
@@ -1914,12 +1911,9 @@
      }
    },
    "node_modules/object-inspect": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
-      "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
-      "engines": {
-        "node": ">= 0.4"
-      },
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
      }
@@ -2039,9 +2033,9 @@
      }
    },
    "node_modules/path-to-regexp": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
-      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
    },
    "node_modules/path-type": {
      "version": "4.0.0",
@@ -2182,11 +2176,11 @@
      }
    },
    "node_modules/qs": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
-      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
      "dependencies": {
-        "side-channel": "^1.0.6"
+        "side-channel": "^1.0.4"
      },
      "engines": {
        "node": ">=0.6"
@@ -2358,9 +2352,9 @@
      }
    },
    "node_modules/send": {
-      "version": "0.19.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
-      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
      "dependencies": {
        "debug": "2.6.9",
        "depd": "2.0.0",
@@ -2393,28 +2387,20 @@
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
    },
-    "node_modules/send/node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
    "node_modules/send/node_modules/ms": {
      "version": "2.1.3",
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
    },
    "node_modules/serve-static": {
-      "version": "1.16.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
-      "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
      "dependencies": {
-        "encodeurl": "~2.0.0",
+        "encodeurl": "~1.0.2",
        "escape-html": "~1.0.3",
        "parseurl": "~1.3.3",
-        "send": "0.19.0"
+        "send": "0.18.0"
      },
      "engines": {
        "node": ">= 0.8.0"
@@ -3085,9 +3071,9 @@
      }
    },
    "body-parser": {
-      "version": "1.20.3",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
-      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
+      "version": "1.20.2",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
+      "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
      "requires": {
        "bytes": "3.1.2",
        "content-type": "~1.0.5",
@@ -3097,7 +3083,7 @@
        "http-errors": "2.0.0",
        "iconv-lite": "0.4.24",
        "on-finished": "2.4.1",
-        "qs": "6.13.0",
+        "qs": "6.11.0",
        "raw-body": "2.5.2",
        "type-is": "~1.6.18",
        "unpipe": "1.0.0"
@@ -3328,9 +3314,9 @@
      }
    },
    "encodeurl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
-      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg=="
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
    },
    "end-of-stream": {
      "version": "1.4.4",
@@ -3528,36 +3514,36 @@
      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
    },
    "express": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz",
-      "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==",
+      "version": "4.19.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
+      "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
      "requires": {
        "accepts": "~1.3.8",
        "array-flatten": "1.1.1",
-        "body-parser": "1.20.3",
+        "body-parser": "1.20.2",
        "content-disposition": "0.5.4",
        "content-type": "~1.0.4",
        "cookie": "0.6.0",
        "cookie-signature": "1.0.6",
        "debug": "2.6.9",
        "depd": "2.0.0",
-        "encodeurl": "~2.0.0",
+        "encodeurl": "~1.0.2",
        "escape-html": "~1.0.3",
        "etag": "~1.8.1",
-        "finalhandler": "1.3.1",
+        "finalhandler": "1.2.0",
        "fresh": "0.5.2",
        "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.3",
+        "merge-descriptors": "1.0.1",
        "methods": "~1.1.2",
        "on-finished": "2.4.1",
        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.10",
+        "path-to-regexp": "0.1.7",
        "proxy-addr": "~2.0.7",
-        "qs": "6.13.0",
+        "qs": "6.11.0",
        "range-parser": "~1.2.1",
        "safe-buffer": "5.2.1",
-        "send": "0.19.0",
-        "serve-static": "1.16.2",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
        "setprototypeof": "1.2.0",
        "statuses": "2.0.1",
        "type-is": "~1.6.18",
@@ -3704,12 +3690,12 @@
      }
    },
    "finalhandler": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
-      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
      "requires": {
        "debug": "2.6.9",
-        "encodeurl": "~2.0.0",
+        "encodeurl": "~1.0.2",
        "escape-html": "~1.0.3",
        "on-finished": "2.4.1",
        "parseurl": "~1.3.3",
@@ -4073,9 +4059,9 @@
      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
    },
    "merge-descriptors": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
-      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ=="
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
    },
    "merge2": {
      "version": "1.4.1",
@@ -4160,9 +4146,9 @@
      }
    },
    "object-inspect": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
-      "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g=="
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ=="
    },
    "on-finished": {
      "version": "2.4.1",
@@ -4246,9 +4232,9 @@
      "dev": true
    },
    "path-to-regexp": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
-      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
    },
    "path-type": {
      "version": "4.0.0",
@@ -4349,11 +4335,11 @@
      }
    },
    "qs": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
-      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
      "requires": {
-        "side-channel": "^1.0.6"
+        "side-channel": "^1.0.4"
      }
    },
    "queue-microtask": {
@@ -4443,9 +4429,9 @@
      }
    },
    "send": {
-      "version": "0.19.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
-      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
      "requires": {
        "debug": "2.6.9",
        "depd": "2.0.0",
@@ -4477,11 +4463,6 @@
            }
          }
        },
-        "encodeurl": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-          "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
-        },
        "ms": {
          "version": "2.1.3",
          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -4490,14 +4471,14 @@
      }
    },
    "serve-static": {
-      "version": "1.16.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
-      "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
      "requires": {
-        "encodeurl": "~2.0.0",
+        "encodeurl": "~1.0.2",
        "escape-html": "~1.0.3",
        "parseurl": "~1.3.3",
-        "send": "0.19.0"
+        "send": "0.18.0"
      }
    },
    "set-function-length": {
--- a/unfurler/package.json
+++ b/unfurler/package.json
@@ -18,7 +18,7 @@
  },
  "dependencies": {
    "@types/node": "^16.11.41",
-    "express": "^4.21.0",
+    "express": "^4.19.2",
    "ejs": "^3.1.10",
    "node-fetch-commonjs": "^3.3.1",
    "puppeteer": "^15.3.2",
Author	SHA1	Message	Date
natsoni	428cc9eacd	Analytic form for ETA algorithm	2024-09-09 16:03:40 +02:00
natsoni	638acffbad	Consider incoming transactions flow into ETA calculation	2024-09-07 23:07:16 +02:00
natsoni	ae9125d316	statistics: class incoming transactions by fee rate	2024-09-07 17:49:21 +02:00