Merge branch 'master' into nymkappa/feature/remove-fee-calculation-frontend

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

@@ -16,6 +16,8 @@ import { prepareBlock } from '../utils/blocks-utils';
 import BlocksRepository from '../repositories/BlocksRepository';
 import HashratesRepository from '../repositories/HashratesRepository';
 import indexer from '../indexer';
+import fiatConversion from './fiat-conversion';
+import RatesRepository from '../repositories/RatesRepository';
 
 class Blocks {
   private blocks: BlockExtended[] = [];
@@ -341,6 +343,9 @@ class Blocks {
           await blocksRepository.$saveBlockInDatabase(blockExtended);
         }
       }
+      if (fiatConversion.ratesInitialized === true) {
+        await RatesRepository.$saveRate(blockExtended.height, fiatConversion.getConversionRates());
+      }
 
       if (block.height % 2016 === 0) {
         this.previousDifficultyRetarget = (block.difficulty - this.currentDifficulty) / this.currentDifficulty * 100;

backend/src/api/database-migration.ts

@@ -4,7 +4,7 @@ import logger from '../logger';
 import { Common } from './common';
 
 class DatabaseMigration {
-  private static currentVersion = 18;
+  private static currentVersion = 19;
   private queryTimeout = 120000;
   private statisticsAddedIndexed = false;
 
@@ -184,6 +184,10 @@ class DatabaseMigration {
       if (databaseSchemaVersion < 18 && isBitcoin === true) {
         await this.$executeQuery('ALTER TABLE `blocks` ADD INDEX `hash` (`hash`);');
       }
+
+      if (databaseSchemaVersion < 19) {
+        await this.$executeQuery(this.getCreateRatesTableQuery(), await this.$checkIfTableExists('rates'));
+      }
     } catch (e) {
       throw e;
     }
@@ -466,6 +470,14 @@ class DatabaseMigration {
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8;`;
   }
 
+  private getCreateRatesTableQuery(): string {
+    return `CREATE TABLE IF NOT EXISTS rates (
+      height int(10) unsigned NOT NULL,
+      bisq_rates JSON NOT NULL,
+      PRIMARY KEY (height)
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;`;
+  }
+
   public async $truncateIndexedData(tables: string[]) {
     const allowedTables = ['blocks', 'hashrates'];
 

backend/src/api/fiat-conversion.ts

@@ -6,12 +6,19 @@ import backendInfo from './backend-info';
 import { SocksProxyAgent } from 'socks-proxy-agent';
 
 class FiatConversion {
-  private conversionRates: IConversionRates = {
+  private debasingFiatCurrencies = ['AED', 'AUD', 'BDT', 'BHD', 'BMD', 'BRL', 'CAD', 'CHF', 'CLP',
-    'USD': 0
+    'CNY', 'CZK', 'DKK', 'EUR', 'GBP', 'HKD', 'HUF', 'IDR', 'ILS', 'INR', 'JPY', 'KRW', 'KWD',
-  };
+    'LKR', 'MMK', 'MXN', 'MYR', 'NGN', 'NOK', 'NZD', 'PHP', 'PKR', 'PLN', 'RUB', 'SAR', 'SEK',
+    'SGD', 'THB', 'TRY', 'TWD', 'UAH', 'USD', 'VND', 'ZAR'];
+  private conversionRates: IConversionRates = {};
   private ratesChangedCallback: ((rates: IConversionRates) => void) | undefined;
+  public ratesInitialized = false; // If true, it means rates are ready for use
 
-  constructor() { }
+  constructor() {
+    for (const fiat of this.debasingFiatCurrencies) {
+      this.conversionRates[fiat] = 0;
+    }
+  }
 
   public setProgressChangedCallback(fn: (rates: IConversionRates) => void) {
     this.ratesChangedCallback = fn;
@@ -62,13 +69,14 @@ class FiatConversion {
         response = await axios.get(fiatConversionUrl, { headers: headers, timeout: 10000 });
       }
 
-      const usd = response.data.data.find((item: any) => item.currencyCode === 'USD');
+      for (const rate of response.data.data) {
+        if (this.debasingFiatCurrencies.includes(rate.currencyCode) && rate.provider === 'Bisq-Aggregate') {
+          this.conversionRates[rate.currencyCode] = Math.round(100 * rate.price) / 100;
+        }
+      }
 
-      this.conversionRates = {
+      this.ratesInitialized = true;
-        'USD': usd.price,
+      logger.debug(`USD Conversion Rate: ${this.conversionRates.USD}`);
-      };
-
-      logger.debug(`USD Conversion Rate: ${usd.price}`);
 
       if (this.ratesChangedCallback) {
         this.ratesChangedCallback(this.conversionRates);

backend/src/index.ts

@@ -67,7 +67,7 @@ class Server {
   }
 
   async startServer(worker = false) {
-    logger.debug(`Starting Mempool Server${worker ? ' (worker)' : ''}... (${backendInfo.getShortCommitHash()})`);
+    logger.notice(`Starting Mempool Server${worker ? ' (worker)' : ''}... (${backendInfo.getShortCommitHash()})`);
 
     this.app
       .use((req: Request, res: Response, next: NextFunction) => {

backend/src/repositories/RatesRepository.ts

@@ -0,0 +1,21 @@
+import DB from '../database';
+import logger from '../logger';
+import { IConversionRates } from '../mempool.interfaces';
+
+class RatesRepository {
+  public async $saveRate(height: number, rates: IConversionRates) {
+    try {
+      await DB.query(`INSERT INTO rates(height, bisq_rates) VALUE (?, ?)`, [height, JSON.stringify(rates)]);
+    } catch (e: any) {
+      if (e.errno === 1062) { // ER_DUP_ENTRY - This scenario is possible upon node backend restart
+        logger.debug(`Rate already exists for block ${height}, ignoring`);
+      } else {
+        logger.err(`Cannot save exchange rate into db for block ${height} Reason: ` + (e instanceof Error ? e.message : e));
+        throw e;
+      }
+    }
+  }
+}
+
+export default new RatesRepository();
+

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/bisq-master-page/bisq-master-page.component.html

@@ -19,7 +19,7 @@
       <a [href]="env.MEMPOOL_WEBSITE_URL + urlLanguage + '/signet'" ngbDropdownItem *ngIf="env.SIGNET_ENABLED" class="signet"><img src="./resources/signet-logo.png" style="width: 30px;" class="mr-1"> Signet</a>
       <a [href]="env.MEMPOOL_WEBSITE_URL + urlLanguage + '/testnet'" ngbDropdownItem *ngIf="env.TESTNET_ENABLED" class="testnet"><img src="./resources/testnet-logo.png" style="width: 30px;" class="mr-1"> Testnet</a>
       <h6 class="dropdown-header" i18n="master-page.layer2-networks-header">Layer 2 Networks</h6>
-      <button ngbDropdownItem class="mainnet active" routerLink="/"><img src="./resources/bisq-logo.png" style="width: 30px;" class="mr-1"> Bisq</button>
+      <a ngbDropdownItem class="mainnet active" routerLink="/"><img src="./resources/bisq-logo.png" style="width: 30px;" class="mr-1"> Bisq</a>
       <a [href]="env.LIQUID_WEBSITE_URL + urlLanguage" ngbDropdownItem *ngIf="env.LIQUID_ENABLED" class="liquid"><img src="./resources/liquid-logo.png" style="width: 30px;" class="mr-1"> Liquid</a>
       <a [href]="env.LIQUID_WEBSITE_URL + urlLanguage + '/testnet'" ngbDropdownItem *ngIf="env.LIQUID_TESTNET_ENABLED" class="liquidtestnet"><img src="./resources/liquidtestnet-logo.png" style="width: 30px;" class="mr-1"> Liquid Testnet</a>
     </div>

frontend/src/app/components/liquid-master-page/liquid-master-page.component.html

@@ -21,8 +21,8 @@
       <a [href]="env.MEMPOOL_WEBSITE_URL + urlLanguage + '/testnet'" ngbDropdownItem *ngIf="env.TESTNET_ENABLED" class="testnet"><img src="./resources/testnet-logo.png" style="width: 30px;" class="mr-1"> Testnet</a>
       <h6 class="dropdown-header" i18n="master-page.layer2-networks-header">Layer 2 Networks</h6>
       <a [href]="env.BISQ_WEBSITE_URL + urlLanguage" ngbDropdownItem class="mainnet"><img src="./resources/bisq-logo.png" style="width: 30px;" class="mr-1"> Bisq</a>
-      <button ngbDropdownItem class="liquid" [class.active]="network.val === 'liquid'" routerLink="/"><img src="./resources/liquid-logo.png" style="width: 30px;" class="mr-1"> Liquid</button>
+      <a ngbDropdownItem class="liquid mr-1" [class.active]="network.val === 'liquid'" routerLink="/"><img src="./resources/liquid-logo.png" style="width: 30px;"> Liquid</a>
-      <button ngbDropdownItem *ngIf="env.LIQUID_TESTNET_ENABLED" class="liquidtestnet" [class.active]="network.val === 'liquidtestnet'" routerLink="/testnet"><img src="./resources/liquidtestnet-logo.png" style="width: 30px;" class="mr-1"> Liquid Testnet</button>
+      <a ngbDropdownItem *ngIf="env.LIQUID_TESTNET_ENABLED" class="liquidtestnet" [class.active]="network.val === 'liquidtestnet'" routerLink="/testnet"><img src="./resources/liquidtestnet-logo.png" style="width: 30px;" class="mr-1"> Liquid Testnet</a>
     </div>
   </div>
 

frontend/src/app/components/master-page/master-page.component.html

@@ -16,9 +16,9 @@
       <img src="./resources/{{ network.val === '' ? 'bitcoin' : network.val }}-logo.png" style="width: 25px; height: 25px;" class="mr-1" [alt]="(network.val === '' ? 'bitcoin' : network.val) + ' logo'">
     </button>
     <div ngbDropdownMenu [ngClass]="{'dropdown-menu-right' : isMobile}">
-      <button ngbDropdownItem class="mainnet" routerLink="/"><img src="./resources/bitcoin-logo.png" style="width: 30px;" class="mr-1" alt="bitcoin logo"> Mainnet</button>
+      <a ngbDropdownItem class="mainnet" routerLink="/"><img src="./resources/bitcoin-logo.png" style="width: 30px;" class="mainnet mr-1" alt="bitcoin logo"> Mainnet</a>
-      <button ngbDropdownItem *ngIf="env.SIGNET_ENABLED" class="signet" [class.active]="network.val === 'signet'" routerLink="/signet"><img src="./resources/signet-logo.png" style="width: 30px;" class="mr-1" alt="signet logo"> Signet</button>
+      <a ngbDropdownItem *ngIf="env.SIGNET_ENABLED" class="signet" [class.active]="network.val === 'signet'" routerLink="/signet"><img src="./resources/signet-logo.png" style="width: 30px;" class="signet mr-1" alt="logo"> Signet</a>
-      <button ngbDropdownItem *ngIf="env.TESTNET_ENABLED" class="testnet" [class.active]="network.val === 'testnet'" routerLink="/testnet"><img src="./resources/testnet-logo.png" style="width: 30px;" class="mr-1" alt="testnet logo"> Testnet</button>
+      <a ngbDropdownItem *ngIf="env.TESTNET_ENABLED" class="testnet" [class.active]="network.val === 'testnet'" routerLink="/testnet"><img src="./resources/testnet-logo.png" style="width: 30px;" class="mr-1" alt="testnet logo"> Testnet</a>
       <h6 *ngIf="env.LIQUID_ENABLED || env.BISQ_ENABLED" class="dropdown-header" i18n="master-page.layer2-networks-header">Layer 2 Networks</h6>
       <a [href]="env.BISQ_WEBSITE_URL + urlLanguage" ngbDropdownItem *ngIf="env.BISQ_ENABLED" class="bisq"><img src="./resources/bisq-logo.png" style="width: 30px;" class="mr-1" alt="bisq logo"> Bisq</a>
       <a [href]="env.LIQUID_WEBSITE_URL + urlLanguage" ngbDropdownItem *ngIf="env.LIQUID_ENABLED" class="liquid" [class.active]="network.val === 'liquid'"><img src="./resources/liquid-logo.png" style="width: 30px;" class="mr-1" alt="liquid mainnet logo"> Liquid</a>

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

@@ -66,13 +66,16 @@
                         </ng-template>
                       </ng-template>
                       <ng-template #defaultAddress>
-                        <a [routerLink]="['/address/' | relativeUrl, vin.prevout.scriptpubkey_address]" title="{{ vin.prevout.scriptpubkey_address }}">
+                        <a *ngIf="vin.prevout.scriptpubkey_address; else vinScriptPubkeyType" [routerLink]="['/address/' | relativeUrl, vin.prevout.scriptpubkey_address]" title="{{ vin.prevout.scriptpubkey_address }}">
                           <span class="d-block d-lg-none">{{ vin.prevout.scriptpubkey_address | shortenString : 16 }}</span>
                           <span class="d-none d-lg-flex justify-content-start">
                             <span class="addr-left flex-grow-1" [style]="vin.prevout.scriptpubkey_address.length > 40 ? 'max-width: 235px' : ''">{{ vin.prevout.scriptpubkey_address }}</span>
                             <span *ngIf="vin.prevout.scriptpubkey_address.length > 40" class="addr-right">{{ vin.prevout.scriptpubkey_address | capAddress: 40: 10 }}</span>
                           </span>
                         </a>
+                        <ng-template #vinScriptPubkeyType>
+                          {{ vin.prevout.scriptpubkey_type?.toUpperCase() }}
+                        </ng-template>
                         <div>
                           <app-address-labels [vin]="vin"></app-address-labels>
                         </div>

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;