Merge branch 'master' into simon/dropdown-button-links-fix

backend/package-lock.json

@@ -17,8 +17,8 @@
         "mysql2": "2.3.3",
         "node-worker-threads-pool": "^1.5.1",
         "socks-proxy-agent": "^6.2.0",
-        "typescript": "~4.6.3",
+        "typescript": "~4.7.2",
-        "ws": "~8.6.0"
+        "ws": "~8.7.0"
       },
       "devDependencies": {
         "@types/compression": "^1.7.2",
@@ -1469,9 +1469,9 @@
       "integrity": "sha512-7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g=="
     },
     "node_modules/typescript": {
-      "version": "4.6.4",
+      "version": "4.7.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.2.tgz",
-      "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==",
+      "integrity": "sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A==",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -1532,9 +1532,9 @@
       "dev": true
     },
     "node_modules/ws": {
-      "version": "8.6.0",
+      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.7.0.tgz",
-      "integrity": "sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==",
+      "integrity": "sha512-c2gsP0PRwcLFzUiA8Mkr37/MI7ilIlHQxaEAtd0uNMbVMoy8puJyafRlm0bV9MbGSabUPeLrRRaqIBcFcA2Pqg==",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -2708,9 +2708,9 @@
       "integrity": "sha512-7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g=="
     },
     "typescript": {
-      "version": "4.6.4",
+      "version": "4.7.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.2.tgz",
-      "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg=="
+      "integrity": "sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A=="
     },
     "unpipe": {
       "version": "1.0.0",
@@ -2755,9 +2755,9 @@
       "dev": true
     },
     "ws": {
-      "version": "8.6.0",
+      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.7.0.tgz",
-      "integrity": "sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==",
+      "integrity": "sha512-c2gsP0PRwcLFzUiA8Mkr37/MI7ilIlHQxaEAtd0uNMbVMoy8puJyafRlm0bV9MbGSabUPeLrRRaqIBcFcA2Pqg==",
       "requires": {}
     },
     "yallist": {

backend/package.json

@@ -36,8 +36,8 @@
     "mysql2": "2.3.3",
     "node-worker-threads-pool": "^1.5.1",
     "socks-proxy-agent": "^6.2.0",
-    "typescript": "~4.6.3",
+    "typescript": "~4.7.2",
-    "ws": "~8.6.0"
+    "ws": "~8.7.0"
   },
   "devDependencies": {
     "@types/compression": "^1.7.2",

backend/src/api/blocks.ts

@@ -426,25 +426,32 @@ class Blocks {
         return returnBlocks;
       }
 
+      if (currentHeight === 0 && Common.indexingEnabled()) {
+        currentHeight = await blocksRepository.$mostRecentBlockHeight();
+      }
+
       // Check if block height exist in local cache to skip the hash lookup
       const blockByHeight = this.getBlocks().find((b) => b.height === currentHeight);
       let startFromHash: string | null = null;
       if (blockByHeight) {
         startFromHash = blockByHeight.id;
-      } else {
+      } else if (!Common.indexingEnabled()) {
         startFromHash = await bitcoinApi.$getBlockHash(currentHeight);
       }
 
       let nextHash = startFromHash;
       for (let i = 0; i < limit && currentHeight >= 0; i++) {
         let block = this.getBlocks().find((b) => b.height === currentHeight);
-        if (!block && Common.indexingEnabled()) {
+        if (block) {
-          block = await this.$indexBlock(currentHeight);
-        } else if (!block) {
-          block = prepareBlock(await bitcoinApi.$getBlock(nextHash));
-        }
           returnBlocks.push(block);
+        } else if (Common.indexingEnabled()) {
+          block = await this.$indexBlock(currentHeight);
+          returnBlocks.push(block);
+        } else if (nextHash != null) {
+          block = prepareBlock(await bitcoinApi.$getBlock(nextHash));
           nextHash = block.previousblockhash;
+          returnBlocks.push(block);
+        }
         currentHeight--;
       }
 

backend/src/api/fee-api.ts

@@ -1,4 +1,3 @@
-import config from '../config';
 import { MempoolBlock } from '../mempool.interfaces';
 import { Common } from './common';
 import mempool from './mempool';
@@ -19,6 +18,7 @@ class FeeApi {
         'fastestFee': this.defaultFee,
         'halfHourFee': this.defaultFee,
         'hourFee': this.defaultFee,
+        'economyFee': minimumFee,
         'minimumFee': minimumFee,
       };
     }
@@ -31,6 +31,7 @@ class FeeApi {
       'fastestFee': firstMedianFee,
       'halfHourFee': secondMedianFee,
       'hourFee': thirdMedianFee,
+      'economyFee': Math.min(2 * minimumFee, thirdMedianFee),
       'minimumFee': minimumFee,
     };
   }

backend/src/api/mining.ts

@@ -94,8 +94,13 @@ class Mining {
     poolsStatistics['blockCount'] = blockCount;
 
     const totalBlock24h: number = await BlocksRepository.$blockCount(null, '24h');
-    const lastBlockHashrate = await bitcoinClient.getNetworkHashPs(totalBlock24h);
+
-    poolsStatistics['lastEstimatedHashrate'] = lastBlockHashrate;
+    try {
+      poolsStatistics['lastEstimatedHashrate'] = await bitcoinClient.getNetworkHashPs(totalBlock24h);
+    } catch (e) {
+      poolsStatistics['lastEstimatedHashrate'] = 0;
+      logger.debug('Bitcoin Core is not available, using zeroed value for current hashrate');
+    }
 
     return poolsStatistics;
   }
@@ -118,7 +123,12 @@ class Mining {
     const blockCount1w: number = await BlocksRepository.$blockCount(pool.id, '1w');
     const totalBlock1w: number = await BlocksRepository.$blockCount(null, '1w');
 
-    const currentEstimatedkHashrate = await bitcoinClient.getNetworkHashPs(totalBlock24h);
+    let currentEstimatedHashrate = 0;
+    try {
+      currentEstimatedHashrate = await bitcoinClient.getNetworkHashPs(totalBlock24h);
+    } catch (e) {
+      logger.debug('Bitcoin Core is not available, using zeroed value for current hashrate');
+    }
 
     return {
       pool: pool,
@@ -132,7 +142,7 @@ class Mining {
         '24h': blockCount24h / totalBlock24h,
         '1w': blockCount1w / totalBlock1w,
       },
-      estimatedHashrate: currentEstimatedkHashrate * (blockCount24h / totalBlock24h),
+      estimatedHashrate: currentEstimatedHashrate * (blockCount24h / totalBlock24h),
       reportedHashrate: null,
     };
   }

backend/src/index.ts

@@ -25,8 +25,6 @@ import databaseMigration from './api/database-migration';
 import syncAssets from './sync-assets';
 import icons from './api/liquid/icons';
 import { Common } from './api/common';
-import mining from './api/mining';
-import HashratesRepository from './repositories/HashratesRepository';
 import poolsUpdater from './tasks/pools-updater';
 import indexer from './indexer';
 

backend/src/repositories/BlocksRepository.ts

@@ -121,6 +121,19 @@ class BlocksRepository {
     }
   }
 
+  /**
+   * Return most recent block height
+   */
+  public async $mostRecentBlockHeight(): Promise<number> {
+    try {
+      const [row] = await DB.query('SELECT MAX(height) as maxHeight from blocks');
+      return row[0]['maxHeight'];
+    } catch (e) {
+      logger.err(`Cannot count blocks for this pool (using offset). Reason: ` + (e instanceof Error ? e.message : e));
+      throw e;
+    }
+  }
+
   /**
    * Get blocks count for a period
    */
@@ -240,8 +253,26 @@ class BlocksRepository {
     }
 
     const params: any[] = [];
-    let query = ` SELECT *, UNIX_TIMESTAMP(blocks.blockTimestamp) as blockTimestamp,
+    let query = ` SELECT
-      previous_block_hash as previousblockhash
+      height,
+      hash as id,
+      UNIX_TIMESTAMP(blocks.blockTimestamp) as blockTimestamp,
+      size,
+      weight,
+      tx_count,
+      coinbase_raw,
+      difficulty,
+      fees,
+      fee_span,
+      median_fee,
+      reward,
+      version,
+      bits,
+      nonce,
+      merkle_root,
+      previous_block_hash as previousblockhash,
+      avg_fee,
+      avg_fee_rate
       FROM blocks
       WHERE pool_id = ?`;
     params.push(pool.id);
@@ -274,11 +305,32 @@ class BlocksRepository {
    */
   public async $getBlockByHeight(height: number): Promise<object | null> {
     try {
-      const [rows]: any[] = await DB.query(`
+      const [rows]: any[] = await DB.query(`SELECT
-        SELECT *, UNIX_TIMESTAMP(blocks.blockTimestamp) as blockTimestamp,
+        height,
-        pools.id as pool_id, pools.name as pool_name, pools.link as pool_link, pools.slug as pool_slug,
+        hash as id,
-        pools.addresses as pool_addresses, pools.regexes as pool_regexes,
+        UNIX_TIMESTAMP(blocks.blockTimestamp) as blockTimestamp,
-        previous_block_hash as previousblockhash
+        size,
+        weight,
+        tx_count,
+        coinbase_raw,
+        difficulty,
+        pools.id as pool_id,
+        pools.name as pool_name,
+        pools.link as pool_link,
+        pools.slug as pool_slug,
+        pools.addresses as pool_addresses,
+        pools.regexes as pool_regexes,
+        fees,
+        fee_span,
+        median_fee,
+        reward,
+        version,
+        bits,
+        nonce,
+        merkle_root,
+        previous_block_hash as previousblockhash,
+        avg_fee,
+        avg_fee_rate
         FROM blocks
         JOIN pools ON blocks.pool_id = pools.id
         WHERE height = ${height};

backend/src/routes.ts

@@ -619,6 +619,14 @@ class Routes {
   }
 
   public async $getHistoricalHashrate(req: Request, res: Response) {
+    let currentHashrate = 0, currentDifficulty = 0;
+    try {
+      currentHashrate = await bitcoinClient.getNetworkHashPs();
+      currentDifficulty = await bitcoinClient.getDifficulty();
+    } catch (e) {
+      logger.debug('Bitcoin Core is not available, using zeroed value for current hashrate and difficulty');
+    }
+
     try {
       const hashrates = await HashratesRepository.$getNetworkDailyHashrate(req.params.interval);
       const difficulty = await BlocksRepository.$getBlocksDifficulty(req.params.interval);
@@ -630,8 +638,8 @@ class Routes {
       res.json({
         hashrates: hashrates,
         difficulty: difficulty,
-        currentHashrate: await bitcoinClient.getNetworkHashPs(),
+        currentHashrate: currentHashrate,
-        currentDifficulty: await bitcoinClient.getDifficulty(),
+        currentDifficulty: currentDifficulty,
       });
     } catch (e) {
       res.status(500).send(e instanceof Error ? e.message : e);

backend/src/tasks/pools-updater.ts

@@ -16,7 +16,7 @@ class PoolsUpdater {
   }
 
   public async updatePoolsJson() {
-    if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false) {
+    if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false || config.DATABASE.ENABLED === false) {
       return;
     }
 

frontend/package.json

@@ -73,10 +73,10 @@
     "@angular/platform-browser-dynamic": "~13.3.10",
     "@angular/platform-server": "~13.3.10",
     "@angular/router": "~13.3.10",
-    "@fortawesome/angular-fontawesome": "~0.10.1",
+    "@fortawesome/angular-fontawesome": "~0.10.2",
-    "@fortawesome/fontawesome-common-types": "~0.3.0",
+    "@fortawesome/fontawesome-common-types": "~6.1.1",
-    "@fortawesome/fontawesome-svg-core": "~1.3.0",
+    "@fortawesome/fontawesome-svg-core": "~6.1.1",
-    "@fortawesome/free-solid-svg-icons": "~6.0.0",
+    "@fortawesome/free-solid-svg-icons": "~6.1.1",
     "@juggle/resize-observer": "^3.3.1",
     "@mempool/mempool.js": "2.3.0",
     "@ng-bootstrap/ng-bootstrap": "^11.0.0",
@@ -93,24 +93,24 @@
     "ngx-echarts": "8.0.1",
     "ngx-infinite-scroll": "^10.0.1",
     "qrcode": "1.5.0",
-    "rxjs": "^6.6.7",
+    "rxjs": "~7.5.5",
     "tinyify": "^3.0.0",
     "tlite": "^0.1.9",
-    "tslib": "^2.2.0",
+    "tslib": "~2.4.0",
-    "zone.js": "~0.11.4"
+    "zone.js": "~0.11.5"
   },
   "devDependencies": {
     "@angular/compiler-cli": "~13.3.10",
     "@angular/language-service": "~13.3.10",
-    "@nguniversal/builders": "~13.1.0",
+    "@nguniversal/builders": "~13.1.1",
     "@types/express": "^4.17.0",
-    "@types/jasmine": "~3.6.0",
+    "@types/jasmine": "~4.0.3",
-    "@types/jasminewd2": "~2.0.3",
+    "@types/jasminewd2": "~2.0.10",
     "@types/node": "^12.11.1",
-    "codelyzer": "^6.0.1",
+    "codelyzer": "~6.0.2",
     "http-proxy-middleware": "^1.0.5",
-    "jasmine-core": "~3.6.0",
+    "jasmine-core": "~4.1.0",
-    "jasmine-spec-reporter": "~5.0.0",
+    "jasmine-spec-reporter": "~7.0.0",
     "karma": "~6.3.19",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage": "~2.0.3",
@@ -118,7 +118,7 @@
     "karma-jasmine-html-reporter": "^1.5.0",
     "ts-node": "~8.3.0",
     "tslint": "~6.1.0",
-    "typescript": "~4.4.4"
+    "typescript": "~4.6.4"
   },
   "optionalDependencies": {
     "@cypress/schematic": "^1.3.0",

frontend/src/app/components/blocks-list/blocks-list.component.html

@@ -22,7 +22,7 @@
       <tbody *ngIf="blocks$ | async as blocks; else skeleton" [style]="isLoading ? 'opacity: 0.75' : ''">
         <tr *ngFor="let block of blocks; let i= index; trackBy: trackByBlock">
           <td class="text-left" [class]="widget ? 'widget' : ''">
-            <a [routerLink]="['/block' | relativeUrl, block.height]">{{ block.height }}</a>
+            <a [routerLink]="['/block' | relativeUrl, block.id]" [state]="{ data: { block: block } }">{{ block.height }}</a>
           </td>
           <td  *ngIf="indexingAvailable" class="pool text-left" [ngClass]="{'widget': widget, 'legacy': !indexingAvailable}">
             <div class="tooltip-custom">

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

@@ -221,8 +221,7 @@
       <tbody [style]="isLoading ? 'opacity: 0.75' : ''">
         <tr *ngFor="let block of blocks; let i= index; trackBy: trackByBlock">
           <td class="height">
-            <a [routerLink]="['/block' | relativeUrl, block.height]">{{ block.height
+            <a [routerLink]="['/block' | relativeUrl, block.id]">{{ block.height }}</a>
-              }}</a>
           </td>
           <td class="timestamp">
             &lrm;{{ block.timestamp * 1000 | date:'yyyy-MM-dd HH:mm' }}

frontend/src/app/components/transactions-list/transactions-list.component.ts

@@ -30,7 +30,7 @@ export class TransactionsListComponent implements OnInit, OnChanges {
 
   latestBlock$: Observable<BlockExtended>;
   outspendsSubscription: Subscription;
-  refreshOutspends$: ReplaySubject<object> = new ReplaySubject();
+  refreshOutspends$: ReplaySubject<{ [str: string]: Observable<Outspend[]>}> = new ReplaySubject();
   showDetails$ = new BehaviorSubject<boolean>(false);
   outspends: Outspend[][] = [];
   assetsMinimal: any;

frontend/src/app/docs/api-docs/api-docs-data.ts

@@ -4470,6 +4470,7 @@ export const restApiDocsData = [
   fastestFee: 1,
   halfHourFee: 1,
   hourFee: 1,
+  economyFee: 1,
   minimumFee: 1
 }`
         },
@@ -4481,6 +4482,7 @@ export const restApiDocsData = [
   fastestFee: 1,
   halfHourFee: 1,
   hourFee: 1,
+  economyFee: 1,
   minimumFee: 1
 }`
         },
@@ -4492,6 +4494,7 @@ export const restApiDocsData = [
   fastestFee: 1,
   halfHourFee: 1,
   hourFee: 1,
+  economyFee: 1,
   minimumFee: 1
 }`
         },
@@ -4503,7 +4506,8 @@ export const restApiDocsData = [
   fastestFee: 0.1,
   halfHourFee: 0.1,
   hourFee: 0.1,
-  minimumFee: 1
+  economyFee: 0.1,
+  minimumFee: 0.1
 }`
         },
         codeSampleLiquidTestnet: {
@@ -4514,7 +4518,8 @@ export const restApiDocsData = [
   fastestFee: 0.1,
   halfHourFee: 0.1,
   hourFee: 0.1,
-  minimumFee: 1
+  economyFee: 0.1,
+  minimumFee: 0.1
 }`
         },
         codeSampleBisq: emptyCodeSample,

frontend/src/app/docs/api-docs/api-docs.component.ts

@@ -1,7 +1,6 @@
 import { Component, OnInit, Input, ViewChild, ElementRef } from '@angular/core';
 import { Env, StateService } from '../../services/state.service';
 import { Observable, merge, of } from 'rxjs';
-import { SeoService } from '../../services/seo.service';
 import { tap } from 'rxjs/operators';
 import { ActivatedRoute } from "@angular/router";
 import { faqData, restApiDocsData, wsApiDocsData } from './api-docs-data';
@@ -27,7 +26,6 @@ export class ApiDocsComponent implements OnInit {
 
   constructor(
     private stateService: StateService,
-    private seoService: SeoService,
     private route: ActivatedRoute,
   ) { }
 
@@ -45,7 +43,6 @@ export class ApiDocsComponent implements OnInit {
 
   ngOnInit(): void {
     this.env = this.stateService.env;
-    this.seoService.setTitle($localize`:@@e351b40b3869a5c7d19c3d4918cb1ac7aaab95c4:API`);
     this.network$ = merge(of(''), this.stateService.networkChanged$).pipe(
       tap((network: string) => {
         if (this.env.BASE_MODULE === 'mempool' && network !== '') {

frontend/src/app/docs/docs/docs.component.ts

@@ -2,6 +2,7 @@ import { Component, OnInit, HostBinding } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Env, StateService } from '../../services/state.service';
 import { WebsocketService } from '../../services/websocket.service';
+import { SeoService } from '../../services/seo.service';
 
 @Component({
   selector: 'app-docs',
@@ -21,6 +22,7 @@ export class DocsComponent implements OnInit {
     private route: ActivatedRoute,
     private stateService: StateService,
     private websocket: WebsocketService,
+    private seoService: SeoService,
   ) { }
 
   ngOnInit(): void {
@@ -28,10 +30,13 @@ export class DocsComponent implements OnInit {
     const url = this.route.snapshot.url;
     if (url[0].path === "faq" ) {
         this.activeTab = 0;
+        this.seoService.setTitle($localize`:@@docs.faq.button-title:FAQ`);
     } else if( url[1].path === "rest" ) {
         this.activeTab = 1;
+        this.seoService.setTitle($localize`:@@e351b40b3869a5c7d19c3d4918cb1ac7aaab95c4:API`);
     } else {
         this.activeTab = 2;
+        this.seoService.setTitle($localize`:@@e351b40b3869a5c7d19c3d4918cb1ac7aaab95c4:API`);
     }
 
     this.env = this.stateService.env;

frontend/src/locale/messages.xlf

@@ -3934,13 +3934,6 @@
         </context-group>
         <note priority="1" from="description">api-docs.websocket.websocket</note>
       </trans-unit>
-      <trans-unit id="e351b40b3869a5c7d19c3d4918cb1ac7aaab95c4" datatype="html">
-        <source>API</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/docs/api-docs/api-docs.component.ts</context>
-          <context context-type="linenumber">48</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="0a668c1c2a17e557a18fc06619998e002f50df1e" datatype="html">
         <source>Code Example</source>
         <context-group purpose="location">
@@ -3973,6 +3966,24 @@
         </context-group>
         <note priority="1" from="description">API Docs API response</note>
       </trans-unit>
+      <trans-unit id="docs.faq.button-title" datatype="html">
+        <source>FAQ</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/docs/docs/docs.component.ts</context>
+          <context context-type="linenumber">33</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="e351b40b3869a5c7d19c3d4918cb1ac7aaab95c4" datatype="html">
+        <source>API</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/docs/docs/docs.component.ts</context>
+          <context context-type="linenumber">36</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/docs/docs/docs.component.ts</context>
+          <context context-type="linenumber">39</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="date-base.year" datatype="html">
         <source><x id="DATE" equiv-text="counter"/> year</source>
         <context-group purpose="location">