Merge branch 'master' into nymkappa/bugfix/initial-indexing

backend/src/api/bisq/bisq.ts

@@ -156,6 +156,7 @@ class Bisq {
   }
 
   private async loadBisqDumpFile(): Promise<void> {
+    this.allBlocks = [];
     try {
       await this.loadData();
       this.buildIndex();

backend/src/routes.ts

@@ -630,6 +630,8 @@ class Routes {
       res.json({
         hashrates: hashrates,
         difficulty: difficulty,
+        currentHashrate: await bitcoinClient.getNetworkHashPs(),
+        currentDifficulty: await bitcoinClient.getDifficulty(),
       });
     } catch (e) {
       res.status(500).send(e instanceof Error ? e.message : e);

frontend/src/app/components/hashrate-chart/hashrate-chart.component.html

@@ -5,8 +5,7 @@
       <div class="item">
         <h5 class="card-title" i18n="mining.hashrate">Hashrate</h5>
         <p class="card-text">
-          {{ hashrates.currentHashrate | amountShortener }}
+          {{ hashrates.currentHashrate | amountShortener: 1 : 'H/s' }}
-          <span class="symbol">hashes/sec</span>
         </p>
       </div>
       <div class="item">

frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts

@@ -114,23 +114,15 @@ export class HashrateChartComponent implements OnInit {
                   difficulty: diffFixed.map(val => [val.timestamp * 1000, val.difficulty]),
                 });
                 this.isLoading = false;
-
-                if (data.hashrates.length === 0) {
-                  this.cd.markForCheck();
-                  throw new Error();
-                }
               }),
               map((response) => {
                 const data = response.body;
                 return {
                   blockCount: parseInt(response.headers.get('x-total-count'), 10),
-                  currentDifficulty: Math.round(data.difficulty[data.difficulty.length - 1].difficulty * 100) / 100,
+                  currentDifficulty: data.currentDifficulty,
-                  currentHashrate: data.hashrates[data.hashrates.length - 1].avgHashrate,
+                  currentHashrate: data.currentHashrate,
                 };
               }),
-              retryWhen((errors) => errors.pipe(
-                delay(60000)
-              ))
             );
         }),
         share()

frontend/src/app/components/reward-stats/reward-stats.component.html

@@ -43,21 +43,21 @@
 <ng-template #loadingReward>
   <div class="fee-estimation-container loading-container">
     <div class="item">
-      <h5 class="card-title" i18n="fees-box.low-priority">Low priority</h5>
+      <h5 class="card-title" i18n="mining.rewards">Miners Reward</h5>
       <div class="card-text">
         <div class="skeleton-loader"></div>
         <div class="skeleton-loader"></div>
       </div>
     </div>
     <div class="item">
-      <h5 class="card-title" i18n="fees-box.medium-priority">Medium priority</h5>
+      <h5 class="card-title" i18n="mining.rewards-per-tx">Reward Per Tx</h5>
       <div class="card-text">
         <div class="skeleton-loader"></div>
         <div class="skeleton-loader"></div>
       </div>
     </div>
     <div class="item">
-      <h5 class="card-title" i18n="fees-box.high-priority">High priority</h5>
+      <h5 class="card-title" i18n="mining.average-fee">Average Fee</h5>
       <div class="card-text">
         <div class="skeleton-loader"></div>
         <div class="skeleton-loader"></div>