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

2022-06-01 02:44:48 +09:00
parent 6b2b10960a 4b445b1191
commit 39f33dded2
14 changed files with 616 additions and 833 deletions
--- a/backend/package-lock.json
+++ b/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",
-        "ws": "~8.6.0"
+        "typescript": "~4.7.2",
+        "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",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz",
-      "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==",
+      "version": "4.7.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.2.tgz",
+      "integrity": "sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A==",
      "bin": {
        "tsc": "bin/tsc",
        "tsserver": "bin/tsserver"
@@ -1532,9 +1532,9 @@
      "dev": true
    },
    "node_modules/ws": {
-      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz",
-      "integrity": "sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==",
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.7.0.tgz",
+      "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",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz",
-      "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg=="
+      "version": "4.7.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.2.tgz",
+      "integrity": "sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A=="
    },
    "unpipe": {
      "version": "1.0.0",
@@ -2755,9 +2755,9 @@
      "dev": true
    },
    "ws": {
-      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz",
-      "integrity": "sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==",
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.7.0.tgz",
+      "integrity": "sha512-c2gsP0PRwcLFzUiA8Mkr37/MI7ilIlHQxaEAtd0uNMbVMoy8puJyafRlm0bV9MbGSabUPeLrRRaqIBcFcA2Pqg==",
      "requires": {}
    },
    "yallist": {
--- a/backend/package.json
+++ b/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",
-    "ws": "~8.6.0"
+    "typescript": "~4.7.2",
+    "ws": "~8.7.0"
  },
  "devDependencies": {
    "@types/compression": "^1.7.2",
--- a/backend/src/api/blocks.ts
+++ b/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;
--- a/backend/src/api/database-migration.ts
+++ b/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'];

--- a/backend/src/api/fiat-conversion.ts
+++ b/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 = {
-    'USD': 0
-  };
+  private debasingFiatCurrencies = ['AED', 'AUD', 'BDT', 'BHD', 'BMD', 'BRL', 'CAD', 'CHF', 'CLP',
+    '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 = {
-        'USD': usd.price,
-      };
-
-      logger.debug(`USD Conversion Rate: ${usd.price}`);
+      this.ratesInitialized = true;
+      logger.debug(`USD Conversion Rate: ${this.conversionRates.USD}`);

      if (this.ratesChangedCallback) {
        this.ratesChangedCallback(this.conversionRates);
--- a/backend/src/index.ts
+++ b/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) => {
--- a/backend/src/repositories/RatesRepository.ts
+++ b/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();
+