Merge branch 'master' into nymkappa/bugfix/asn-mapping

This commit is contained in:
wiz 2022-08-30 19:45:31 +02:00 committed by GitHub
commit 51d35ec7d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 13 additions and 8 deletions

View File

@ -510,7 +510,12 @@ class BitcoinRoutes {
private getDifficultyChange(req: Request, res: Response) { private getDifficultyChange(req: Request, res: Response) {
try { try {
res.json(difficultyAdjustment.getDifficultyAdjustment()); const da = difficultyAdjustment.getDifficultyAdjustment();
if (da) {
res.json(da);
} else {
res.status(503).send(`Service Temporarily Unavailable`);
}
} catch (e) { } catch (e) {
res.status(500).send(e instanceof Error ? e.message : e); res.status(500).send(e instanceof Error ? e.message : e);
} }

View File

@ -81,14 +81,15 @@ export function calcDifficultyAdjustment(
} }
class DifficultyAdjustmentApi { class DifficultyAdjustmentApi {
constructor() { } public getDifficultyAdjustment(): IDifficultyAdjustment | null {
public getDifficultyAdjustment(): IDifficultyAdjustment {
const DATime = blocks.getLastDifficultyAdjustmentTime(); const DATime = blocks.getLastDifficultyAdjustmentTime();
const previousRetarget = blocks.getPreviousDifficultyRetarget(); const previousRetarget = blocks.getPreviousDifficultyRetarget();
const blockHeight = blocks.getCurrentBlockHeight(); const blockHeight = blocks.getCurrentBlockHeight();
const blocksCache = blocks.getBlocks(); const blocksCache = blocks.getBlocks();
const latestBlock = blocksCache[blocksCache.length - 1]; const latestBlock = blocksCache[blocksCache.length - 1];
if (!latestBlock) {
return null;
}
const nowSeconds = Math.floor(new Date().getTime() / 1000); const nowSeconds = Math.floor(new Date().getTime() / 1000);
return calcDifficultyAdjustment( return calcDifficultyAdjustment(

View File

@ -130,10 +130,6 @@ export class NodeChannels implements OnChanges {
} }
onChartInit(ec: ECharts): void { onChartInit(ec: ECharts): void {
if (this.chartInstance !== undefined) {
return;
}
this.chartInstance = ec; this.chartInstance = ec;
this.chartInstance.on('click', (e) => { this.chartInstance.on('click', (e) => {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 57 KiB

After

Width:  |  Height:  |  Size: 94 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 96 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 726 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 288 KiB

After

Width:  |  Height:  |  Size: 1.8 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 112 KiB

After

Width:  |  Height:  |  Size: 607 KiB

View File

@ -48,6 +48,9 @@ add_header Vary Cookie;
# for exact / requests, redirect based on $lang # for exact / requests, redirect based on $lang
# cache redirect for 5 minutes # cache redirect for 5 minutes
location = / { location = / {
if ($unfurlbot) {
proxy_pass $mempoolSpaceUnfurler;
}
if ($lang != '') { if ($lang != '') {
return 302 $scheme://$host/$lang/; return 302 $scheme://$host/$lang/;
} }