Merge branch 'master' into nymkappa/unix-socket

backend/src/api/acceleration/acceleration.routes.ts

@@ -1,12 +1,14 @@
-import { Application, Request, Response } from "express";
-import config from "../../config";
-import axios from "axios";
-import logger from "../../logger";
+import { Application, Request, Response } from 'express';
+import config from '../../config';
+import axios from 'axios';
+import logger from '../../logger';
+import mempool from '../mempool';
+import AccelerationRepository from '../../repositories/AccelerationRepository';
 
 class AccelerationRoutes {
   private tag = 'Accelerator';
 
-  public initRoutes(app: Application) {
+  public initRoutes(app: Application): void {
     app
       .get(config.MEMPOOL.API_URL_PREFIX + 'services/accelerator/accelerations', this.$getAcceleratorAccelerations.bind(this))
       .get(config.MEMPOOL.API_URL_PREFIX + 'services/accelerator/accelerations/history', this.$getAcceleratorAccelerationsHistory.bind(this))
@@ -15,41 +17,33 @@ class AccelerationRoutes {
     ;
   }
 
-  private async $getAcceleratorAccelerations(req: Request, res: Response) {
-    const url = `${config.MEMPOOL_SERVICES.API}/${req.originalUrl.replace('/api/v1/services/', '')}`;
-    try {
-      const response = await axios.get(url, { responseType: 'stream', timeout: 10000 });
-      for (const key in response.headers) {
-        res.setHeader(key, response.headers[key]); 
-      }      
-      response.data.pipe(res);
-    } catch (e) {
-      logger.err(`Unable to get current accelerations from ${url} in $getAcceleratorAccelerations(), ${e}`, this.tag);
-      res.status(500).end();
-    }
+  private async $getAcceleratorAccelerations(req: Request, res: Response): Promise<void> {
+    const accelerations = mempool.getAccelerations();
+    res.status(200).send(Object.values(accelerations));
   }
 
-  private async $getAcceleratorAccelerationsHistory(req: Request, res: Response) {
-    const url = `${config.MEMPOOL_SERVICES.API}/${req.originalUrl.replace('/api/v1/services/', '')}`;
-    try {
-      const response = await axios.get(url, { responseType: 'stream', timeout: 10000 });
-      for (const key in response.headers) {
-        res.setHeader(key, response.headers[key]); 
-      }      
-      response.data.pipe(res);
-    } catch (e) {
-      logger.err(`Unable to get acceleration history from ${url} in $getAcceleratorAccelerationsHistory(), ${e}`, this.tag);
-      res.status(500).end();
-    }
+  private async $getAcceleratorAccelerationsHistory(req: Request, res: Response): Promise<void> {
+    const history = await AccelerationRepository.$getAccelerationInfo(null, req.query.blockHeight ? parseInt(req.query.blockHeight as string, 10) : null);
+    res.status(200).send(history.map(accel => ({
+      txid: accel.txid,
+      added: accel.added,
+      status: 'completed',
+      effectiveFee: accel.effective_fee,
+      effectiveVsize: accel.effective_vsize,
+      boostRate: accel.boost_rate,
+      boostCost: accel.boost_cost,
+      blockHeight: accel.height,
+      pools: [accel.pool],
+    })));
   }
 
-  private async $getAcceleratorAccelerationsHistoryAggregated(req: Request, res: Response) {
+  private async $getAcceleratorAccelerationsHistoryAggregated(req: Request, res: Response): Promise<void> {
     const url = `${config.MEMPOOL_SERVICES.API}/${req.originalUrl.replace('/api/v1/services/', '')}`;
     try {
       const response = await axios.get(url, { responseType: 'stream', timeout: 10000 });
       for (const key in response.headers) {
-        res.setHeader(key, response.headers[key]); 
-      }      
+        res.setHeader(key, response.headers[key]);
+      }
       response.data.pipe(res);
     } catch (e) {
       logger.err(`Unable to get aggregated acceleration history from ${url} in $getAcceleratorAccelerationsHistoryAggregated(), ${e}`, this.tag);
@@ -57,13 +51,13 @@ class AccelerationRoutes {
     }
   }
 
-  private async $getAcceleratorAccelerationsStats(req: Request, res: Response) {
+  private async $getAcceleratorAccelerationsStats(req: Request, res: Response): Promise<void> {
     const url = `${config.MEMPOOL_SERVICES.API}/${req.originalUrl.replace('/api/v1/services/', '')}`;
     try {
       const response = await axios.get(url, { responseType: 'stream', timeout: 10000 });
       for (const key in response.headers) {
-        res.setHeader(key, response.headers[key]); 
-      }      
+        res.setHeader(key, response.headers[key]);
+      }
       response.data.pipe(res);
     } catch (e) {
       logger.err(`Unable to get acceleration stats from ${url} in $getAcceleratorAccelerationsStats(), ${e}`, this.tag);

backend/src/api/blocks.ts

@@ -29,6 +29,7 @@ import websocketHandler from './websocket-handler';
 import redisCache from './redis-cache';
 import rbfCache from './rbf-cache';
 import { calcBitsDifference } from './difficulty-adjustment';
+import AccelerationRepository from '../repositories/AccelerationRepository';
 
 class Blocks {
   private blocks: BlockExtended[] = [];
@@ -872,6 +873,7 @@ class Blocks {
             await BlocksRepository.$deleteBlocksFrom(lastBlock.height - 10);
             await HashratesRepository.$deleteLastEntries();
             await cpfpRepository.$deleteClustersFrom(lastBlock.height - 10);
+            await AccelerationRepository.$deleteAccelerationsFrom(lastBlock.height - 10);
             this.blocks = this.blocks.slice(0, -10);
             this.updateTimerProgress(timer, `rolled back chain divergence from ${this.currentBlockHeight}`);
             for (let i = 10; i >= 0; --i) {
@@ -974,6 +976,9 @@ class Blocks {
       if (this.blocks.length > config.MEMPOOL.INITIAL_BLOCKS_AMOUNT * 4) {
         this.blocks = this.blocks.slice(-config.MEMPOOL.INITIAL_BLOCKS_AMOUNT * 4);
       }
+      blockSummary.transactions.forEach(tx => {
+        delete tx.acc;
+      });
       this.blockSummaries.push(blockSummary);
       if (this.blockSummaries.length > config.MEMPOOL.INITIAL_BLOCKS_AMOUNT * 4) {
         this.blockSummaries = this.blockSummaries.slice(-config.MEMPOOL.INITIAL_BLOCKS_AMOUNT * 4);
@@ -1117,6 +1122,7 @@ class Blocks {
           }
           return {
             txid: tx.txid,
+            time: tx.firstSeen,
             fee: tx.fee || 0,
             vsize: tx.vsize,
             value: Math.round(tx.vout.reduce((acc, vout) => acc + (vout.value ? vout.value : 0), 0)),

backend/src/api/database-migration.ts

@@ -7,7 +7,7 @@ import cpfpRepository from '../repositories/CpfpRepository';
 import { RowDataPacket } from 'mysql2';
 
 class DatabaseMigration {
-  private static currentVersion = 76;
+  private static currentVersion = 77;
   private queryTimeout = 3600_000;
   private statisticsAddedIndexed = false;
   private uniqueLogs: string[] = [];
@@ -664,6 +664,11 @@ class DatabaseMigration {
       await this.$executeQuery('ALTER TABLE `blocks_audits` ADD prioritized_txs JSON DEFAULT "[]"');
       await this.updateToSchemaVersion(76);
     }
+
+    if (databaseSchemaVersion < 77 && config.MEMPOOL.NETWORK === 'mainnet') {
+      await this.$executeQuery('ALTER TABLE `accelerations` ADD requested datetime DEFAULT NULL');
+      await this.updateToSchemaVersion(77);
+    }
   }
 
   /**

backend/src/api/services/acceleration.ts

@@ -5,6 +5,9 @@ import axios from 'axios';
 
 export interface Acceleration {
   txid: string,
+  added: number,
+  effectiveVsize: number,
+  effectiveFee: number,
   feeDelta: number,
   pools: number[],
 };