diff --git a/backend/src/routes.ts b/backend/src/routes.ts index 288e537c4..d27fab683 100644 --- a/backend/src/routes.ts +++ b/backend/src/routes.ts @@ -630,7 +630,8 @@ class Routes { res.json({ hashrates: hashrates, difficulty: difficulty, - currentHashrate: await bitcoinClient.getNetworkHashPs() + currentHashrate: await bitcoinClient.getNetworkHashPs(), + currentDifficulty: await bitcoinClient.getDifficulty(), }); } catch (e) { res.status(500).send(e instanceof Error ? e.message : e); diff --git a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts index af6c75765..e2c2e1db0 100644 --- a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts +++ b/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, - currentHashrate: data.currentHashrate + currentDifficulty: data.currentDifficulty, + currentHashrate: data.currentHashrate, }; }), - retryWhen((errors) => errors.pipe( - delay(60000) - )) ); }), share()