From 7344c518d3c5b7118f4774da0bee543fbf1a01be Mon Sep 17 00:00:00 2001 From: Simon Lindh Date: Fri, 1 Nov 2019 18:04:18 +0800 Subject: [PATCH] Use calculated block subsidy instead of static. --- .../block-modal/block-modal.component.html | 2 +- .../blockchain-blocks/block-modal/block-modal.component.ts | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/frontend/src/app/blockchain-blocks/block-modal/block-modal.component.html b/frontend/src/app/blockchain-blocks/block-modal/block-modal.component.html index 146e67605..7050174d6 100644 --- a/frontend/src/app/blockchain-blocks/block-modal/block-modal.component.html +++ b/frontend/src/app/blockchain-blocks/block-modal/block-modal.component.html @@ -21,7 +21,7 @@ Total fees: - {{ (block.fees - 12.5) | number: '1.2-2' }} BTC ({{ conversions.USD * (block.fees - 12.5) | currency:'USD':'symbol':'1.0-0' }}) + {{ (block.fees - blockSubsidy) | number: '1.2-2' }} BTC ({{ conversions.USD * (block.fees - blockSubsidy) | currency:'USD':'symbol':'1.0-0' }}) Block reward + fees: {{ block.fees | number: '1.2-2' }} BTC ({{ conversions.USD * block.fees | currency:'USD':'symbol':'1.0-0' }}) diff --git a/frontend/src/app/blockchain-blocks/block-modal/block-modal.component.ts b/frontend/src/app/blockchain-blocks/block-modal/block-modal.component.ts index 48c7c9a1e..196c0eee4 100644 --- a/frontend/src/app/blockchain-blocks/block-modal/block-modal.component.ts +++ b/frontend/src/app/blockchain-blocks/block-modal/block-modal.component.ts @@ -10,6 +10,7 @@ import { MemPoolService } from '../../services/mem-pool.service'; }) export class BlockModalComponent implements OnInit { @Input() block: IBlock; + blockSubsidy = 50; conversions: any; @@ -23,5 +24,11 @@ export class BlockModalComponent implements OnInit { .subscribe((conversions) => { this.conversions = conversions; }); + + let halvenings = Math.floor(this.block.height / 210000); + while (halvenings > 0) { + this.blockSubsidy = this.blockSubsidy / 2; + halvenings--; + } } }