Merge branch 'master' into rtlFixes3

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

@@ -130,7 +130,7 @@
       <span i18n="address.error.loading-address-data">Error loading address data.</span>
       <br>
       <ng-template #displayServerError><i class="small">({{ error.error }})</i></ng-template>
-      <ng-template [ngIf]="error.status === 413 || error.status === 405" [ngIfElse]="displayServerError">
+      <ng-template [ngIf]="error.status === 413 || error.status === 405 || error.status === 504" [ngIfElse]="displayServerError">
         <ng-container i18n="Electrum server limit exceeded error">
           <i>There many transactions on this address, more than your backend can handle. See more on <a href="/docs/faq#address-lookup-issues">setting up a stronger backend</a>.</i>
           <br><br>

frontend/src/app/components/block-fee-rates-graph/block-fee-rates-graph.component.html

@@ -35,7 +35,7 @@
         <label ngbButtonLabel class="btn-primary btn-sm" *ngIf="stats.blockCount >= 157680">
           <input ngbButton type="radio" [value]="'3y'" fragment="3y" [routerLink]="['/graphs/mining/block-fee-rates' | relativeUrl]"> 3Y
         </label>
-        <label ngbButtonLabel class="btn-primary btn-sm" *ngIf="stats.blockCount > 157680">
+        <label ngbButtonLabel class="btn-primary btn-sm">
           <input ngbButton type="radio" [value]="'all'" fragment="all" [routerLink]="['/graphs/mining/block-fee-rates' | relativeUrl]"> ALL
         </label>
       </div>

frontend/src/app/components/block-fees-graph/block-fees-graph.component.html

@@ -35,7 +35,7 @@
         <label ngbButtonLabel class="btn-primary btn-sm" *ngIf="stats.blockCount >= 157680">
           <input ngbButton type="radio" [value]="'3y'" fragment="3y" [routerLink]="['/graphs/mining/block-fees' | relativeUrl]"> 3Y
         </label>
-        <label ngbButtonLabel class="btn-primary btn-sm" *ngIf="stats.blockCount > 157680">
+        <label ngbButtonLabel class="btn-primary btn-sm">
           <input ngbButton type="radio" [value]="'all'" fragment="all" [routerLink]="['/graphs/mining/block-fees' | relativeUrl]"> ALL
         </label>
       </div>

frontend/src/app/components/block-rewards-graph/block-rewards-graph.component.html

@@ -36,7 +36,7 @@
         <label ngbButtonLabel class="btn-primary btn-sm" *ngIf="stats.blockCount >= 157680">
           <input ngbButton type="radio" [value]="'3y'" fragment="3y" [routerLink]="['/graphs/mining/block-rewards' | relativeUrl]"> 3Y
         </label>
-        <label ngbButtonLabel class="btn-primary btn-sm" *ngIf="stats.blockCount > 157680">
+        <label ngbButtonLabel class="btn-primary btn-sm">
           <input ngbButton type="radio" [value]="'all'" fragment="all" [routerLink]="['/graphs/mining/block-rewards' | relativeUrl]"> ALL
         </label>
       </div>

frontend/src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.html

@@ -35,7 +35,7 @@
         <label ngbButtonLabel class="btn-primary btn-sm" *ngIf="stats.blockCount >= 157680">
           <input ngbButton type="radio" [value]="'3y'" fragment="3y" [routerLink]="['/graphs/mining/block-sizes-weights' | relativeUrl]"> 3Y
         </label>
-        <label ngbButtonLabel class="btn-primary btn-sm" *ngIf="stats.blockCount > 157680">
+        <label ngbButtonLabel class="btn-primary btn-sm">
           <input ngbButton type="radio" [value]="'all'" fragment="all" [routerLink]="['/graphs/mining/block-sizes-weights' | relativeUrl]"> ALL
         </label>
       </div>

frontend/src/app/components/difficulty-adjustments-table/difficulty-adjustments-table.component.html

@@ -9,7 +9,7 @@
       </tr>
     </thead>
     <tbody *ngIf="(hashrateObservable$ | async) as data">
-      <tr *ngFor="let diffChange of data.difficulty">
+      <tr *ngFor="let diffChange of data">
         <td class="d-none d-md-block"><a [routerLink]="['/block' | relativeUrl, diffChange.height]">{{ diffChange.height
             }}</a></td>
         <td class="text-left">
@@ -17,7 +17,7 @@
         </td>
         <td class="text-right">{{ diffChange.difficultyShorten }}</td>
         <td class="text-right" [style]="diffChange.change >= 0 ? 'color: #42B747' : 'color: #B74242'">
-          {{ diffChange.change >= 0 ? '+' : '' }}{{ diffChange.change | amountShortener }}%
+          {{ diffChange.change >= 0 ? '+' : '' }}{{ diffChange.change | amountShortener: 2 }}%
         </td>
       </tr>
     </tbody>

frontend/src/app/components/difficulty-adjustments-table/difficulty-adjustments-table.components.ts

@@ -30,27 +30,24 @@ export class DifficultyAdjustmentsTable implements OnInit {
   }
 
   ngOnInit(): void {
-    this.hashrateObservable$ = this.apiService.getHistoricalHashrate$('1y')
+    this.hashrateObservable$ = this.apiService.getDifficultyAdjustments$('3m')
       .pipe(
         map((response) => {
           const data = response.body;
           const tableData = [];
-          for (let i = data.difficulty.length - 1; i > 0; --i) {
-            const selectedPowerOfTen: any = selectPowerOfTen(data.difficulty[i].difficulty);
-            const change = (data.difficulty[i].difficulty / data.difficulty[i - 1].difficulty - 1) * 100;
-
-            tableData.push(Object.assign(data.difficulty[i], {
-              change: Math.round(change * 100) / 100,
+          for (const adjustment of data) {
+            const selectedPowerOfTen: any = selectPowerOfTen(adjustment[2]);
+            tableData.push({
+              height: adjustment[1],
+              timestamp: adjustment[0],
+              change: (adjustment[3] - 1) * 100,
               difficultyShorten: formatNumber(
-                data.difficulty[i].difficulty / selectedPowerOfTen.divider,
+                adjustment[2] / selectedPowerOfTen.divider,
                 this.locale, '1.2-2') + selectedPowerOfTen.unit
-            }));
+            });
           }
           this.isLoading = false;
-
-          return {
-            difficulty: tableData.slice(0, 6),
-          };
+          return tableData.slice(0, 6);
         }),
       );
   }

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

@@ -42,7 +42,7 @@
         <label ngbButtonLabel class="btn-primary btn-sm" *ngIf="stats.blockCount >= 157680">
           <input ngbButton type="radio" [value]="'3y'" fragment="3y" [routerLink]="['/graphs/mining/hashrate-difficulty' | relativeUrl]"> 3Y
         </label>
-        <label ngbButtonLabel class="btn-primary btn-sm" *ngIf="stats.blockCount > 157680">
+        <label ngbButtonLabel class="btn-primary btn-sm">
           <input ngbButton type="radio" [value]="'all'" fragment="all" [routerLink]="['/graphs/mining/hashrate-difficulty' | relativeUrl]"> ALL
         </label>
       </div>

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

@@ -95,6 +95,7 @@ export class HashrateChartComponent implements OnInit {
             .pipe(
               tap((response) => {
                 const data = response.body;
+
                 // We generate duplicated data point so the tooltip works nicely
                 const diffFixed = [];
                 let diffIndex = 1;
@@ -112,7 +113,7 @@ export class HashrateChartComponent implements OnInit {
                   }
 
                   while (hashIndex < data.hashrates.length && diffIndex < data.difficulty.length &&
-                    data.hashrates[hashIndex].timestamp <= data.difficulty[diffIndex].timestamp
+                    data.hashrates[hashIndex].timestamp <= data.difficulty[diffIndex].time
                   ) {
                     diffFixed.push({
                       timestamp: data.hashrates[hashIndex].timestamp,

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

@@ -21,7 +21,7 @@
         <label ngbButtonLabel class="btn-primary btn-sm" *ngIf="stats.blockCount >= 157680">
           <input ngbButton type="radio" [value]="'3y'" fragment="3y" [routerLink]="['/graphs/mining/pools-dominance' | relativeUrl]"> 3Y
         </label>
-        <label ngbButtonLabel class="btn-primary btn-sm" *ngIf="stats.blockCount > 157680">
+        <label ngbButtonLabel class="btn-primary btn-sm">
           <input ngbButton type="radio" [value]="'all'" fragment="all" [routerLink]="['/graphs/mining/pools-dominance' | relativeUrl]"> ALL
         </label>
       </div>

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

@@ -66,7 +66,7 @@
         <label ngbButtonLabel class="btn-primary btn-sm" *ngIf="stats.totalBlockCount >= 157680">
           <input ngbButton type="radio" [value]="'3y'" fragment="3y" [routerLink]="['/graphs/mining/pools' | relativeUrl]"> 3Y
         </label>
-        <label ngbButtonLabel class="btn-primary btn-sm" *ngIf="stats.totalBlockCount > 157680">
+        <label ngbButtonLabel class="btn-primary btn-sm">
           <input ngbButton type="radio" [value]="'all'" fragment="all" [routerLink]="['/graphs/mining/pools' | relativeUrl]"><span i18n>All</span>
         </label>
       </div>

frontend/src/app/services/api.service.ts

@@ -140,7 +140,7 @@ export class ApiService {
       this.apiBaseUrl + this.apiBasePath + `/api/v1/mining/pools` +
       (interval !== undefined ? `/${interval}` : ''), { observe: 'response' }
     );
-  }
+  }  
 
   getPoolStats$(slug: string): Observable<PoolStat> {
     return this.httpClient.get<PoolStat>(this.apiBaseUrl + this.apiBasePath + `/api/v1/mining/pool/${slug}`);
@@ -172,6 +172,13 @@ export class ApiService {
     return this.httpClient.get<TransactionStripped[]>(this.apiBaseUrl + this.apiBasePath + '/api/v1/block/' + hash + '/summary');
   }
 
+  getDifficultyAdjustments$(interval: string | undefined): Observable<any> {
+    return this.httpClient.get<any[]>(
+        this.apiBaseUrl + this.apiBasePath + `/api/v1/mining/difficulty-adjustments` +
+        (interval !== undefined ? `/${interval}` : ''), { observe: 'response' }
+      );
+  }
+
   getHistoricalHashrate$(interval: string | undefined): Observable<any> {
     return this.httpClient.get<any[]>(
         this.apiBaseUrl + this.apiBasePath + `/api/v1/mining/hashrate` +