mirrors/mempool
1
0
Fork 0
mirror of https://github.com/mempool/mempool.git synced 2025-02-24 22:58:30 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into nymkappa/feature/historical-price

Browse source
This commit is contained in:
wiz 2023-02-22 08:23:36 +09:00 • committed by GitHub
commit 70d96583fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html
View file

@ -14,20 +14,26 @@
}}</a> }}</a>
</div> </div>
<div class="block-body"> <div class="block-body">
<div [attr.data-cy]="'bitcoin-block-offset=' + offset + '-index-' + i + '-fees'" class="fees"> <div *ngIf="block?.extras; else emptyfees" [attr.data-cy]="'bitcoin-block-offset=' + offset + '-index-' + i + '-fees'" class="fees">
~{{ block?.extras?.medianFee | number:feeRounding }} <ng-container ~{{ block?.extras?.medianFee | number:feeRounding }} <ng-container
i18n="shared.sat-vbyte|sat/vB">sat/vB</ng-container> i18n="shared.sat-vbyte|sat/vB">sat/vB</ng-container>
</div> </div>
<ng-template #emptyfees>
<div [attr.data-cy]="'bitcoin-block-offset=' + offset + '-index-' + i + '-fees'" class="fees">
&nbsp;
</div>
</ng-template>
<div [attr.data-cy]="'bitcoin-block-' + offset + '-index-' + i + '-fee-span'" class="fee-span" <div [attr.data-cy]="'bitcoin-block-' + offset + '-index-' + i + '-fee-span'" class="fee-span"
*ngIf="block?.extras?.feeRange"> *ngIf="block?.extras?.feeRange; else emptyfeespan">
{{ block?.extras?.feeRange?.[1] | number:feeRounding }} - {{ {{ block?.extras?.feeRange?.[1] | number:feeRounding }} - {{
block?.extras?.feeRange[block?.extras?.feeRange?.length - 1] | number:feeRounding }} <ng-container block?.extras?.feeRange[block?.extras?.feeRange?.length - 1] | number:feeRounding }} <ng-container
i18n="shared.sat-vbyte|sat/vB">sat/vB</ng-container> i18n="shared.sat-vbyte|sat/vB">sat/vB</ng-container>
</div> </div>
<div [attr.data-cy]="'bitcoin-block-' + offset + '-index-' + i + '-fee-span'" class="fee-span" <ng-template #emptyfeespan>
*ngIf="!block?.extras?.feeRange"> <div [attr.data-cy]="'bitcoin-block-offset=' + offset + '-index-' + i + '-fees'" class="fee-span">
&nbsp; &nbsp;
</div> </div>
</ng-template>
<div [attr.data-cy]="'bitcoin-block-' + offset + '-index-' + i + '-total-fees'" *ngIf="showMiningInfo" <div [attr.data-cy]="'bitcoin-block-' + offset + '-index-' + i + '-total-fees'" *ngIf="showMiningInfo"
class="block-size"> class="block-size">
<app-amount [satoshis]="block.extras?.totalFees ?? 0" digitsInfo="1.2-3" [noFiat]="true"></app-amount> <app-amount [satoshis]="block.extras?.totalFees ?? 0" digitsInfo="1.2-3" [noFiat]="true"></app-amount>

3
frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts
View file

@ -5,7 +5,7 @@ import { delay, map, retryWhen, share, startWith, switchMap, tap } from 'rxjs/op
import { ApiService } from '../../services/api.service'; import { ApiService } from '../../services/api.service';
import { SeoService } from '../../services/seo.service'; import { SeoService } from '../../services/seo.service';
import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
import { poolsColor } from '../../app.constants'; import { chartColors, poolsColor } from '../../app.constants';
import { StorageService } from '../../services/storage.service'; import { StorageService } from '../../services/storage.service';
import { MiningService } from '../../services/mining.service'; import { MiningService } from '../../services/mining.service';
import { download } from '../../shared/graphs.utils'; import { download } from '../../shared/graphs.utils';
@ -173,6 +173,7 @@ export class HashrateChartPoolsComponent implements OnInit {
this.chartOptions = { this.chartOptions = {
title: title, title: title,
animation: false, animation: false,
color: chartColors,
grid: { grid: {
right: this.right, right: this.right,
left: this.left, left: this.left,

6
production/nginx-cache-warmer
View file

@ -120,14 +120,16 @@ do for url in / \
do do
warm "https://${hostname}${url}" warm "https://${hostname}${url}"
sleep 0.25 # wait 250ms between queries to not DoS mariadb
done done
for slug in $slugs for slug in $slugs
do do
warm "https://${hostname}/api/v1/mining/pool/${slug}" warm "https://${hostname}/api/v1/mining/pool/${slug}"
sleep 0.25 # wait 250ms between queries to not DoS mariadb
warm "https://${hostname}/api/v1/mining/pool/${slug}/hashrate" warm "https://${hostname}/api/v1/mining/pool/${slug}/hashrate"
sleep 0.25 # wait 250ms between queries to not DoS mariadb
warm "https://${hostname}/api/v1/mining/pool/${slug}/blocks" warm "https://${hostname}/api/v1/mining/pool/${slug}/blocks"
sleep 0.25 # wait 250ms between queries to not DoS mariadb
done done
sleep 10
done done