Block subsidy graph back to timespan selection mode
This commit is contained in:
		
							parent
							
								
									53a493c233
								
							
						
					
					
						commit
						0ef76f3e64
					
				| @ -24,8 +24,6 @@ class MiningRoutes { | |||||||
|       .get(config.MEMPOOL.API_URL_PREFIX + 'mining/difficulty-adjustments', this.$getDifficultyAdjustments) |       .get(config.MEMPOOL.API_URL_PREFIX + 'mining/difficulty-adjustments', this.$getDifficultyAdjustments) | ||||||
|       .get(config.MEMPOOL.API_URL_PREFIX + 'mining/reward-stats/:blockCount', this.$getRewardStats) |       .get(config.MEMPOOL.API_URL_PREFIX + 'mining/reward-stats/:blockCount', this.$getRewardStats) | ||||||
|       .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/fees/:interval', this.$getHistoricalBlockFees) |       .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/fees/:interval', this.$getHistoricalBlockFees) | ||||||
|       .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/exact-fees/:height', this.$getHistoricalExactBlockFees) |  | ||||||
|       .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/exact-fees', this.$getHistoricalExactBlockFees) |  | ||||||
|       .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/rewards/:interval', this.$getHistoricalBlockRewards) |       .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/rewards/:interval', this.$getHistoricalBlockRewards) | ||||||
|       .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/fee-rates/:interval', this.$getHistoricalBlockFeeRates) |       .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/fee-rates/:interval', this.$getHistoricalBlockFeeRates) | ||||||
|       .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/sizes-weights/:interval', this.$getHistoricalBlockSizeAndWeight) |       .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/sizes-weights/:interval', this.$getHistoricalBlockSizeAndWeight) | ||||||
| @ -219,25 +217,6 @@ class MiningRoutes { | |||||||
|     } |     } | ||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
|   private async $getHistoricalExactBlockFees(req: Request, res: Response) { |  | ||||||
|     try { |  | ||||||
|       const heightRegex = /^(0|[1-9]\d{0,9})$/; |  | ||||||
|       if (req.params.height !== undefined && !heightRegex.test(req.params.height)) { |  | ||||||
|           throw new Error('Invalid height parameter'); |  | ||||||
|       } |  | ||||||
| 
 |  | ||||||
|       const blockFees = await mining.$getHistoricalExactBlockFees(req.params.height); |  | ||||||
|       const blockCount = await BlocksRepository.$blockCount(null, null); |  | ||||||
|       res.header('Pragma', 'public'); |  | ||||||
|       res.header('Cache-control', 'public'); |  | ||||||
|       res.header('X-total-count', blockCount.toString()); |  | ||||||
|       res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString()); |  | ||||||
|       res.json(blockFees); |  | ||||||
|     } catch (e) { |  | ||||||
|       res.status(500).send(e instanceof Error ? e.message : e); |  | ||||||
|     } |  | ||||||
|   } |  | ||||||
| 
 |  | ||||||
|   private async $getHistoricalBlockRewards(req: Request, res: Response) { |   private async $getHistoricalBlockRewards(req: Request, res: Response) { | ||||||
|     try { |     try { | ||||||
|       const blockRewards = await mining.$getHistoricalBlockRewards(req.params.interval); |       const blockRewards = await mining.$getHistoricalBlockRewards(req.params.interval); | ||||||
|  | |||||||
| @ -50,13 +50,6 @@ class Mining { | |||||||
|     ); |     ); | ||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
|   /** |  | ||||||
|    * Get historical (not averaged) block total fee |  | ||||||
|    */ |  | ||||||
|   public async $getHistoricalExactBlockFees(height: string | null = null): Promise<any> { |  | ||||||
|     return await BlocksRepository.$getHistoricalExactBlockFees(height); |  | ||||||
|   } |  | ||||||
| 
 |  | ||||||
|   /** |   /** | ||||||
|    * Get historical block rewards |    * Get historical block rewards | ||||||
|    */ |    */ | ||||||
|  | |||||||
| @ -689,52 +689,6 @@ class BlocksRepository { | |||||||
|     } |     } | ||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
|   /** |  | ||||||
|    * Get the historical block fees |  | ||||||
|    */ |  | ||||||
|   public async $getHistoricalExactBlockFees(height: string | null): Promise<any> { |  | ||||||
|     try { |  | ||||||
|       let query = `SELECT
 |  | ||||||
|         blocks.height, |  | ||||||
|         fees, |  | ||||||
|         prices.USD |  | ||||||
|         FROM blocks |  | ||||||
|         JOIN blocks_prices on blocks_prices.height = blocks.height |  | ||||||
|         JOIN prices on prices.id = blocks_prices.price_id |  | ||||||
|       `;
 |  | ||||||
| 
 |  | ||||||
|       if (height !== null) { |  | ||||||
|         query += ` WHERE blocks.height <= ${height}`; |  | ||||||
|       } |  | ||||||
|       query += ` ORDER BY blocks.height DESC LIMIT 10000`; |  | ||||||
| 
 |  | ||||||
|       const [rows]: any = await DB.query(query); |  | ||||||
| 
 |  | ||||||
|       // Add accelerations data if available
 |  | ||||||
|       if (config.MEMPOOL_SERVICES.ACCELERATIONS && rows.length > 0) { |  | ||||||
| 
 |  | ||||||
|         let query = ` |  | ||||||
|           SELECT height, boost_cost FROM accelerations |  | ||||||
|           WHERE height >= ${rows[rows.length - 1].height} AND height <= ${rows[0].height} |  | ||||||
|         `;
 |  | ||||||
|         const [accelerations]: any = await DB.query(query); |  | ||||||
|          |  | ||||||
|         for (let i = 0; i < accelerations.length; ++i) { |  | ||||||
|           const idx = rows.findIndex((block) => block.height === accelerations[i].height); |  | ||||||
|           if (idx !== -1) { |  | ||||||
|             if (rows[idx].accelerations === undefined) rows[idx].accelerations = 0; |  | ||||||
|             rows[idx].accelerations += accelerations[i].boost_cost; |  | ||||||
|           } |  | ||||||
|         } |  | ||||||
|       } |  | ||||||
| 
 |  | ||||||
|       return rows; |  | ||||||
|     } catch (e) { |  | ||||||
|       logger.err('Cannot generate exact block fees history. Reason: ' + (e instanceof Error ? e.message : e)); |  | ||||||
|       throw e; |  | ||||||
|     } |  | ||||||
|   } |  | ||||||
| 
 |  | ||||||
|   /** |   /** | ||||||
|    * Get the historical averaged block rewards |    * Get the historical averaged block rewards | ||||||
|    */ |    */ | ||||||
|  | |||||||
| @ -9,18 +9,31 @@ | |||||||
|       </button> |       </button> | ||||||
|     </div>   |     </div>   | ||||||
| 
 | 
 | ||||||
|     <ng-container *ngIf="(statsObservable$ | async) as stats"> |     <form [formGroup]="radioGroupForm" class="formRadioGroup" *ngIf="(statsObservable$ | async) as stats"> | ||||||
|       <div class="formRadioGroup" ngbDropdown *ngIf="stats.indexedBlocksInterval.end !== -1"> |       <div class="btn-group btn-group-toggle" name="radioBasic" [class]="{'disabled': isLoading}"> | ||||||
|         <button class="btn btn-primary btn-sm dropdown-toggle" id="endBlockDropdown" ngbDropdownToggle> |         <label class="btn btn-primary btn-sm" *ngIf="stats.blockCount >= 4320" [class.active]="radioGroupForm.get('dateSpan').value === '1m'"> | ||||||
|           Blocks {{ lowerBound }} - {{ upperBound }} |           <input type="radio" [value]="'1m'" fragment="1m" [routerLink]="['/graphs/mining/block-fees-subsidy' | relativeUrl]" formControlName="dateSpan"> 1M | ||||||
|         </button> |         </label> | ||||||
|         <div ngbDropdownMenu class="scrollable-dropdown"> |         <label class="btn btn-primary btn-sm" *ngIf="stats.blockCount >= 12960" [class.active]="radioGroupForm.get('dateSpan').value === '3m'"> | ||||||
|           <button [ngClass]="{'selected': option === endBlock}" class="dropdown-item" *ngFor="let option of dropdownOptions" (click)="selectBlockSpan(option)"> |           <input type="radio" [value]="'3m'" fragment="3m" [routerLink]="['/graphs/mining/block-fees-subsidy' | relativeUrl]" formControlName="dateSpan"> 3M | ||||||
|             {{ endBlockToSelector(option) }} |         </label> | ||||||
|           </button> |         <label class="btn btn-primary btn-sm" *ngIf="stats.blockCount >= 25920" [class.active]="radioGroupForm.get('dateSpan').value === '6m'"> | ||||||
|         </div> |           <input type="radio" [value]="'6m'" fragment="6m" [routerLink]="['/graphs/mining/block-fees-subsidy' | relativeUrl]" formControlName="dateSpan"> 6M | ||||||
|  |         </label> | ||||||
|  |         <label class="btn btn-primary btn-sm" *ngIf="stats.blockCount >= 52560" [class.active]="radioGroupForm.get('dateSpan').value === '1y'"> | ||||||
|  |           <input type="radio" [value]="'1y'" fragment="1y" [routerLink]="['/graphs/mining/block-fees-subsidy' | relativeUrl]" formControlName="dateSpan"> 1Y | ||||||
|  |         </label> | ||||||
|  |         <label class="btn btn-primary btn-sm" *ngIf="stats.blockCount >= 105120" [class.active]="radioGroupForm.get('dateSpan').value === '2y'"> | ||||||
|  |           <input type="radio" [value]="'2y'" fragment="2y" [routerLink]="['/graphs/mining/block-fees-subsidy' | relativeUrl]" formControlName="dateSpan"> 2Y | ||||||
|  |         </label> | ||||||
|  |         <label class="btn btn-primary btn-sm" *ngIf="stats.blockCount >= 157680" [class.active]="radioGroupForm.get('dateSpan').value === '3y'"> | ||||||
|  |           <input type="radio" [value]="'3y'" fragment="3y" [routerLink]="['/graphs/mining/block-fees-subsidy' | relativeUrl]" formControlName="dateSpan"> 3Y | ||||||
|  |         </label> | ||||||
|  |         <label class="btn btn-primary btn-sm" [class.active]="radioGroupForm.get('dateSpan').value === 'all'"> | ||||||
|  |           <input type="radio" [value]="'all'" fragment="all" [routerLink]="['/graphs/mining/block-fees-subsidy' | relativeUrl]" formControlName="dateSpan"> ALL | ||||||
|  |         </label> | ||||||
|       </div> |       </div> | ||||||
|     </ng-container> |     </form> | ||||||
|   </div> |   </div> | ||||||
| 
 | 
 | ||||||
|   <div class="chart" *browserOnly echarts [initOpts]="chartInitOptions" [options]="chartOptions" |   <div class="chart" *browserOnly echarts [initOpts]="chartInitOptions" [options]="chartOptions" | ||||||
|  | |||||||
| @ -64,13 +64,3 @@ | |||||||
|   pointer-events: none; |   pointer-events: none; | ||||||
|   opacity: 0.5; |   opacity: 0.5; | ||||||
| } | } | ||||||
| 
 |  | ||||||
| .scrollable-dropdown { |  | ||||||
|   max-height: 500px;  |  | ||||||
|   overflow-y: auto; |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| .selected { |  | ||||||
|   background-color: var(--active-bg); |  | ||||||
|   color: #fff; |  | ||||||
| } |  | ||||||
| @ -7,10 +7,12 @@ import { SeoService } from '../../services/seo.service'; | |||||||
| import { formatNumber } from '@angular/common'; | import { formatNumber } from '@angular/common'; | ||||||
| import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; | import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; | ||||||
| import { download, formatterXAxis } from '../../shared/graphs.utils'; | import { download, formatterXAxis } from '../../shared/graphs.utils'; | ||||||
| import { ActivatedRoute, Router } from '@angular/router'; | import { ActivatedRoute } from '@angular/router'; | ||||||
| import { FiatShortenerPipe } from '../../shared/pipes/fiat-shortener.pipe'; | import { FiatShortenerPipe } from '../../shared/pipes/fiat-shortener.pipe'; | ||||||
| import { FiatCurrencyPipe } from '../../shared/pipes/fiat-currency.pipe'; | import { FiatCurrencyPipe } from '../../shared/pipes/fiat-currency.pipe'; | ||||||
| import { StateService } from '../../services/state.service'; | import { StateService } from '../../services/state.service'; | ||||||
|  | import { MiningService } from '../../services/mining.service'; | ||||||
|  | import { StorageService } from '../../services/storage.service'; | ||||||
| 
 | 
 | ||||||
| @Component({ | @Component({ | ||||||
|   selector: 'app-block-fees-subsidy-graph', |   selector: 'app-block-fees-subsidy-graph', | ||||||
| @ -30,6 +32,7 @@ export class BlockFeesSubsidyGraphComponent implements OnInit { | |||||||
|   @Input() right: number | string = 45; |   @Input() right: number | string = 45; | ||||||
|   @Input() left: number | string = 75; |   @Input() left: number | string = 75; | ||||||
| 
 | 
 | ||||||
|  |   miningWindowPreference: string; | ||||||
|   radioGroupForm: UntypedFormGroup; |   radioGroupForm: UntypedFormGroup; | ||||||
| 
 | 
 | ||||||
|   chartOptions: EChartsOption = {}; |   chartOptions: EChartsOption = {}; | ||||||
| @ -40,15 +43,9 @@ export class BlockFeesSubsidyGraphComponent implements OnInit { | |||||||
|   statsObservable$: Observable<any>; |   statsObservable$: Observable<any>; | ||||||
|   isLoading = true; |   isLoading = true; | ||||||
|   formatNumber = formatNumber; |   formatNumber = formatNumber; | ||||||
|   endBlock = ''; |   timespan = ''; | ||||||
|   indexedBlocksInterval = { start: 0, end: 0 }; |  | ||||||
|   lowerBound = 0; |  | ||||||
|   upperBound = 0; |  | ||||||
|   chartInstance: any = undefined; |   chartInstance: any = undefined; | ||||||
|   showFiat = false; |   showFiat = false; | ||||||
|   dropdownOptions = []; |  | ||||||
|   step = 10000; |  | ||||||
|   includeAccelerations = false; |  | ||||||
| 
 | 
 | ||||||
|   constructor( |   constructor( | ||||||
|     @Inject(LOCALE_ID) public locale: string, |     @Inject(LOCALE_ID) public locale: string, | ||||||
| @ -56,40 +53,43 @@ export class BlockFeesSubsidyGraphComponent implements OnInit { | |||||||
|     private apiService: ApiService, |     private apiService: ApiService, | ||||||
|     private formBuilder: UntypedFormBuilder, |     private formBuilder: UntypedFormBuilder, | ||||||
|     public stateService: StateService, |     public stateService: StateService, | ||||||
|  |     private storageService: StorageService, | ||||||
|  |     private miningService: MiningService, | ||||||
|     private route: ActivatedRoute, |     private route: ActivatedRoute, | ||||||
|     private router: Router, |  | ||||||
|     private fiatShortenerPipe: FiatShortenerPipe, |     private fiatShortenerPipe: FiatShortenerPipe, | ||||||
|     private fiatCurrencyPipe: FiatCurrencyPipe, |     private fiatCurrencyPipe: FiatCurrencyPipe, | ||||||
|   ) { |   ) { | ||||||
|     this.radioGroupForm = this.formBuilder.group({ endBlock: '' }); |     this.radioGroupForm = this.formBuilder.group({ dateSpan: '1y' }); | ||||||
|     this.radioGroupForm.controls.endBlock.setValue(''); |     this.radioGroupForm.controls.dateSpan.setValue('1y'); | ||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
|   ngOnInit(): void { |   ngOnInit(): void { | ||||||
|     this.seoService.setTitle($localize`:@@mining.block-fees-subsidy:Block Fees Vs Subsidy`); |     this.seoService.setTitle($localize`:@@mining.block-fees-subsidy:Block Fees Vs Subsidy`); | ||||||
|     this.seoService.setDescription($localize`:@@meta.description.bitcoin.graphs.block-fees-subsidy:See the mining fees earned per Bitcoin block compared to the Bitcoin block subsidy, visualized in BTC and USD over time.`); |     this.seoService.setDescription($localize`:@@meta.description.bitcoin.graphs.block-fees-subsidy:See the mining fees earned per Bitcoin block compared to the Bitcoin block subsidy, visualized in BTC and USD over time.`); | ||||||
| 
 | 
 | ||||||
|     this.route.queryParams.subscribe((params) => { |     this.miningWindowPreference = this.miningService.getDefaultTimespan('1m'); | ||||||
|       if (/^(0|[1-9]\d{0,9})$/.test(params['height'])) { |     this.radioGroupForm = this.formBuilder.group({ dateSpan: this.miningWindowPreference }); | ||||||
|         this.radioGroupForm.controls.endBlock.setValue(params['height'], { emitEvent: false }); |     this.radioGroupForm.controls.dateSpan.setValue(this.miningWindowPreference); | ||||||
|  | 
 | ||||||
|  |     this.route | ||||||
|  |     .fragment | ||||||
|  |     .subscribe((fragment) => { | ||||||
|  |       if (['1m', '3m', '6m', '1y', '2y', '3y', 'all'].indexOf(fragment) > -1) { | ||||||
|  |         this.radioGroupForm.controls.dateSpan.setValue(fragment, { emitEvent: false }); | ||||||
|       } |       } | ||||||
|     }); |     }); | ||||||
| 
 | 
 | ||||||
|     this.includeAccelerations = this.stateService.env.ACCELERATOR; |     this.statsObservable$ = this.radioGroupForm.get('dateSpan').valueChanges | ||||||
| 
 |  | ||||||
|     this.statsObservable$ = this.radioGroupForm.get('endBlock').valueChanges |  | ||||||
|       .pipe( |       .pipe( | ||||||
|         startWith(this.radioGroupForm.controls.endBlock.value), |         startWith(this.radioGroupForm.controls.dateSpan.value), | ||||||
|         switchMap((endBlock) => { |         switchMap((timespan) => { | ||||||
|           this.isLoading = true; |           this.isLoading = true; | ||||||
|           this.endBlock = endBlock; |           this.storageService.setValue('miningWindowPreference', timespan); | ||||||
|           return this.apiService.getHistoricalExactBlockFees$(endBlock === '' ? undefined : endBlock) |           this.timespan = timespan; | ||||||
|  |           this.isLoading = true; | ||||||
|  |           return this.apiService.getHistoricalBlockFees$(timespan) | ||||||
|             .pipe( |             .pipe( | ||||||
|               tap((response) => { |               tap((response) => { | ||||||
|                 if (response.body.length === 0) { |  | ||||||
|                   this.isLoading = false; |  | ||||||
|                   return; |  | ||||||
|                 } |  | ||||||
|                 let blockReward = 50 * 100_000_000; |                 let blockReward = 50 * 100_000_000; | ||||||
|                 const subsidies = {}; |                 const subsidies = {}; | ||||||
|                 for (let i = 0; i <= 33; i++) { |                 for (let i = 0; i <= 33; i++) { | ||||||
| @ -97,55 +97,21 @@ export class BlockFeesSubsidyGraphComponent implements OnInit { | |||||||
|                   blockReward = Math.floor(blockReward / 2); |                   blockReward = Math.floor(blockReward / 2); | ||||||
|                 } |                 } | ||||||
| 
 | 
 | ||||||
|                 const existingHeights = new Set(response.body.map(val => val.height)); |  | ||||||
| 
 |  | ||||||
|                 for (let i = response.body[0].height; i <= response.body[response.body.length - 1].height; i++) { |  | ||||||
|                   if (!existingHeights.has(i)) { |  | ||||||
|                     response.body.push({ height: i, fees: 0, missing: true }); |  | ||||||
|                   } |  | ||||||
|                 } |  | ||||||
| 
 |  | ||||||
|                 response.body.sort((a, b) => a.height - b.height); |  | ||||||
| 
 |  | ||||||
|                 const data = { |                 const data = { | ||||||
|                   blockHeight: response.body.map(val => val.height), |                   timestamp: response.body.map(val => val.timestamp * 1000), | ||||||
|                   blockSubsidy: response.body.map(val => val?.missing ? 0 : subsidies[Math.floor(Math.min(val.height / 210000, 33))] / 100_000_000), |                   blockHeight: response.body.map(val => val.avgHeight), | ||||||
|                   blockSubsidyFiat: response.body.map(val => val?.missing ? 0 : subsidies[Math.floor(Math.min(val.height / 210000, 33))] / 100_000_000 * val.USD), |                   blockFees: response.body.map(val => val.avgFees / 100_000_000), | ||||||
|                   blockFees: response.body.map(val => val.fees / 100_000_000), |                   blockFeesFiat: response.body.filter(val => val['USD'] > 0).map(val => val.avgFees / 100_000_000 * val['USD']), | ||||||
|                   blockFeesFiat: response.body.map(val => val.fees / 100_000_000 * val.USD), |                   blockSubsidy: response.body.map(val => subsidies[Math.floor(Math.min(val.avgHeight / 210000, 33))] / 100_000_000), | ||||||
|                 } |                   blockSubsidyFiat: response.body.filter(val => val['USD'] > 0).map(val => subsidies[Math.floor(Math.min(val.avgHeight / 210000, 33))] / 100_000_000 * val['USD']), | ||||||
|  |                 }; | ||||||
|                  |                  | ||||||
|                 let accelerationData = {}; |                 this.prepareChartOptions(data); | ||||||
|                 if (this.includeAccelerations) { |  | ||||||
|                   accelerationData = { |  | ||||||
|                     blockAccelerations: response.body.map(val => val?.accelerations ? val.accelerations / 100_000_000 : 0), |  | ||||||
|                     blockAccelerationsFiat: response.body.map(val => val?.accelerations ? val.accelerations / 100_000_000 * val.USD : 0), |  | ||||||
|                   } |  | ||||||
|                 } |  | ||||||
| 
 |  | ||||||
|                 this.prepareChartOptions(data, accelerationData); |  | ||||||
|                 this.isLoading = false; |                 this.isLoading = false; | ||||||
|               }), |               }), | ||||||
|               map((response) => { |               map((response) => { | ||||||
|                 const blockCount = parseInt(response.headers.get('x-total-count'), 10); |  | ||||||
|                 const chainTip = this.stateService.latestBlockHeight; |  | ||||||
| 
 |  | ||||||
|                 this.indexedBlocksInterval = { |  | ||||||
|                   start: chainTip - blockCount, |  | ||||||
|                   end: chainTip, |  | ||||||
|                 }; |  | ||||||
| 
 |  | ||||||
|                 if (this.radioGroupForm.controls.endBlock.value === '') this.radioGroupForm.controls.endBlock.setValue((this.indexedBlocksInterval.end).toString(), { emitEvent: false }); |  | ||||||
|                 this.dropdownOptions = [(this.indexedBlocksInterval.end).toString()]; |  | ||||||
|                 if (this.indexedBlocksInterval.end - this.step > this.indexedBlocksInterval.start) { |  | ||||||
|                   let newEndBlock = this.indexedBlocksInterval.end - this.step; |  | ||||||
|                   while (newEndBlock > this.indexedBlocksInterval.start) { |  | ||||||
|                     this.dropdownOptions.push(newEndBlock.toString()); |  | ||||||
|                     newEndBlock -= this.step; |  | ||||||
|                   } |  | ||||||
|                 } |  | ||||||
|                 return { |                 return { | ||||||
|                   indexedBlocksInterval: this.indexedBlocksInterval, |                   blockCount: parseInt(response.headers.get('x-total-count'), 10), | ||||||
|                 }; |                 }; | ||||||
|               }), |               }), | ||||||
|             ); |             ); | ||||||
| @ -154,7 +120,7 @@ export class BlockFeesSubsidyGraphComponent implements OnInit { | |||||||
|       ); |       ); | ||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
|   prepareChartOptions(data, accelerationData) { |   prepareChartOptions(data) { | ||||||
|     let title: object; |     let title: object; | ||||||
|     if (data.blockFees.length === 0) { |     if (data.blockFees.length === 0) { | ||||||
|       title = { |       title = { | ||||||
| @ -168,15 +134,11 @@ export class BlockFeesSubsidyGraphComponent implements OnInit { | |||||||
|       }; |       }; | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     this.lowerBound = data.blockHeight[0]; |  | ||||||
|     this.upperBound = data.blockHeight[data.blockHeight.length - 1]; |  | ||||||
| 
 |  | ||||||
|     this.chartOptions = { |     this.chartOptions = { | ||||||
|       title: title, |       title: title, | ||||||
|       color: [ |       color: [ | ||||||
|         'var(--orange)', |         'var(--orange)', | ||||||
|         'var(--success)', |         'var(--success)', | ||||||
|         'var(--tertiary)' |  | ||||||
|       ], |       ], | ||||||
|       animation: false, |       animation: false, | ||||||
|       grid: { |       grid: { | ||||||
| @ -204,10 +166,9 @@ export class BlockFeesSubsidyGraphComponent implements OnInit { | |||||||
|             return ''; |             return ''; | ||||||
|           } |           } | ||||||
| 
 | 
 | ||||||
|           let tooltip = `Block <b style="color: white; margin-left: 2px">${data[0].axisValue}</b><br>`; |           let tooltip = `Around block <b style="color: white; margin-left: 2px">${data[0].axisValue}</b><br>`; | ||||||
|           for (let i = data.length - 1; i >= 0; i--) { |           for (let i = data.length - 1; i >= 0; i--) { | ||||||
|             const tick = data[i]; |             const tick = data[i]; | ||||||
|             if (tick.seriesName.includes('Accelerations') && tick.data === 0) continue; |  | ||||||
|             if (!this.showFiat) tooltip += `${tick.marker} ${tick.seriesName}: ${formatNumber(tick.data, this.locale, '1.0-3')} BTC<br>`; |             if (!this.showFiat) tooltip += `${tick.marker} ${tick.seriesName}: ${formatNumber(tick.data, this.locale, '1.0-3')} BTC<br>`; | ||||||
|             else tooltip += `${tick.marker} ${tick.seriesName}: ${this.fiatCurrencyPipe.transform(tick.data, null, 'USD') }<br>`; |             else tooltip += `${tick.marker} ${tick.seriesName}: ${this.fiatCurrencyPipe.transform(tick.data, null, 'USD') }<br>`; | ||||||
|           } |           } | ||||||
| @ -216,15 +177,37 @@ export class BlockFeesSubsidyGraphComponent implements OnInit { | |||||||
|           return tooltip; |           return tooltip; | ||||||
|         }.bind(this) |         }.bind(this) | ||||||
|       }, |       }, | ||||||
|       xAxis: data.blockFees.length === 0 ? undefined : |       xAxis: data.blockFees.length === 0 ? undefined : [ | ||||||
|       { |         { | ||||||
|         type: 'category', |           type: 'category', | ||||||
|         data: data.blockHeight, |           data: data.blockHeight, | ||||||
|         axisLabel: { |           show: false, | ||||||
|           hideOverlap: true, |           axisLabel: { | ||||||
|           color: 'var(--grey)', |             hideOverlap: true, | ||||||
|  |           } | ||||||
|  |         }, | ||||||
|  |         { | ||||||
|  |           type: 'category', | ||||||
|  |           data: data.timestamp, | ||||||
|  |           show: true, | ||||||
|  |           position: 'bottom', | ||||||
|  |           axisLabel: { | ||||||
|  |             color: 'var(--grey)', | ||||||
|  |             formatter: (val) => { | ||||||
|  |               return formatterXAxis(this.locale, this.timespan, parseInt(val, 10)); | ||||||
|  |             } | ||||||
|  |           }, | ||||||
|  |           axisTick: { | ||||||
|  |             show: false, | ||||||
|  |           }, | ||||||
|  |           axisLine: { | ||||||
|  |             show: false, | ||||||
|  |           }, | ||||||
|  |           splitLine: { | ||||||
|  |             show: false, | ||||||
|  |           }, | ||||||
|         } |         } | ||||||
|       }, |       ], | ||||||
|       legend: data.blockFees.length === 0 ? undefined : { |       legend: data.blockFees.length === 0 ? undefined : { | ||||||
|         data: [ |         data: [ | ||||||
|           { |           { | ||||||
| @ -243,14 +226,6 @@ export class BlockFeesSubsidyGraphComponent implements OnInit { | |||||||
|             }, |             }, | ||||||
|             icon: 'roundRect', |             icon: 'roundRect', | ||||||
|           }, |           }, | ||||||
|           this.includeAccelerations ? { |  | ||||||
|             name: 'Accelerations', |  | ||||||
|             inactiveColor: 'var(--grey)', |  | ||||||
|             textStyle: { |  | ||||||
|                 color: 'white', |  | ||||||
|             }, |  | ||||||
|             icon: 'roundRect', |  | ||||||
|           } : null, |  | ||||||
|           { |           { | ||||||
|             name: 'Subsidy (USD)', |             name: 'Subsidy (USD)', | ||||||
|             inactiveColor: 'var(--grey)', |             inactiveColor: 'var(--grey)', | ||||||
| @ -267,22 +242,12 @@ export class BlockFeesSubsidyGraphComponent implements OnInit { | |||||||
|             }, |             }, | ||||||
|             icon: 'roundRect', |             icon: 'roundRect', | ||||||
|           }, |           }, | ||||||
|           this.includeAccelerations ? { |         ], | ||||||
|             name: 'Accelerations (USD)', |  | ||||||
|             inactiveColor: 'var(--grey)', |  | ||||||
|             textStyle: { |  | ||||||
|               color: 'white', |  | ||||||
|             }, |  | ||||||
|             icon: 'roundRect', |  | ||||||
|           } : null |  | ||||||
|         ].filter(legend => legend !== null), |  | ||||||
|         selected: { |         selected: { | ||||||
|           'Subsidy (USD)': this.showFiat, |           'Subsidy (USD)': this.showFiat, | ||||||
|           'Fees (USD)': this.showFiat, |           'Fees (USD)': this.showFiat, | ||||||
|           'Accelerations (USD)': this.showFiat, |  | ||||||
|           'Subsidy': !this.showFiat, |           'Subsidy': !this.showFiat, | ||||||
|           'Fees': !this.showFiat, |           'Fees': !this.showFiat, | ||||||
|           'Accelerations': !this.showFiat, |  | ||||||
|         }, |         }, | ||||||
|       }, |       }, | ||||||
|       yAxis: data.blockFees.length === 0 ? undefined : [ |       yAxis: data.blockFees.length === 0 ? undefined : [ | ||||||
| @ -332,13 +297,6 @@ export class BlockFeesSubsidyGraphComponent implements OnInit { | |||||||
|           stack: 'total', |           stack: 'total', | ||||||
|           data: data.blockFees, |           data: data.blockFees, | ||||||
|         }, |         }, | ||||||
|         { |  | ||||||
|           name: 'Accelerations', |  | ||||||
|           yAxisIndex: 0, |  | ||||||
|           type: 'bar', |  | ||||||
|           stack: 'total', |  | ||||||
|           data: accelerationData.blockAccelerations, |  | ||||||
|         }, |  | ||||||
|         { |         { | ||||||
|           name: 'Subsidy (USD)', |           name: 'Subsidy (USD)', | ||||||
|           yAxisIndex: 1, |           yAxisIndex: 1, | ||||||
| @ -353,13 +311,6 @@ export class BlockFeesSubsidyGraphComponent implements OnInit { | |||||||
|           stack: 'total', |           stack: 'total', | ||||||
|           data: data.blockFeesFiat, |           data: data.blockFeesFiat, | ||||||
|         }, |         }, | ||||||
|         { |  | ||||||
|           name: 'Accelerations (USD)', |  | ||||||
|           yAxisIndex: 1, |  | ||||||
|           type: 'bar', |  | ||||||
|           stack: 'total', |  | ||||||
|           data: accelerationData.blockAccelerationsFiat, |  | ||||||
|         }, |  | ||||||
|       ], |       ], | ||||||
|       dataZoom: data.blockFees.length === 0 ? undefined : [{ |       dataZoom: data.blockFees.length === 0 ? undefined : [{ | ||||||
|         type: 'inside', |         type: 'inside', | ||||||
| @ -398,18 +349,14 @@ export class BlockFeesSubsidyGraphComponent implements OnInit { | |||||||
|         this.showFiat = true; |         this.showFiat = true; | ||||||
|         this.chartInstance.dispatchAction({ type: 'legendUnSelect', name: 'Subsidy' }); |         this.chartInstance.dispatchAction({ type: 'legendUnSelect', name: 'Subsidy' }); | ||||||
|         this.chartInstance.dispatchAction({ type: 'legendUnSelect', name: 'Fees' }); |         this.chartInstance.dispatchAction({ type: 'legendUnSelect', name: 'Fees' }); | ||||||
|         this.chartInstance.dispatchAction({ type: 'legendUnSelect', name: 'Accelerations' });         |  | ||||||
|         this.chartInstance.dispatchAction({ type: 'legendSelect',   name: 'Subsidy (USD)' }); |         this.chartInstance.dispatchAction({ type: 'legendSelect',   name: 'Subsidy (USD)' }); | ||||||
|         this.chartInstance.dispatchAction({ type: 'legendSelect',   name: 'Fees (USD)' }); |         this.chartInstance.dispatchAction({ type: 'legendSelect',   name: 'Fees (USD)' }); | ||||||
|         this.chartInstance.dispatchAction({ type: 'legendSelect',   name: 'Accelerations (USD)' }); |  | ||||||
|       } else { |       } else { | ||||||
|         this.showFiat = false; |         this.showFiat = false; | ||||||
|         this.chartInstance.dispatchAction({ type: 'legendSelect',   name: 'Subsidy' }); |         this.chartInstance.dispatchAction({ type: 'legendSelect',   name: 'Subsidy' }); | ||||||
|         this.chartInstance.dispatchAction({ type: 'legendSelect',   name: 'Fees' }); |         this.chartInstance.dispatchAction({ type: 'legendSelect',   name: 'Fees' }); | ||||||
|         this.chartInstance.dispatchAction({ type: 'legendSelect',   name: 'Accelerations' }); |  | ||||||
|         this.chartInstance.dispatchAction({ type: 'legendUnSelect', name: 'Subsidy (USD)' }); |         this.chartInstance.dispatchAction({ type: 'legendUnSelect', name: 'Subsidy (USD)' }); | ||||||
|         this.chartInstance.dispatchAction({ type: 'legendUnSelect', name: 'Fees (USD)' }); |         this.chartInstance.dispatchAction({ type: 'legendUnSelect', name: 'Fees (USD)' }); | ||||||
|         this.chartInstance.dispatchAction({ type: 'legendUnSelect', name: 'Accelerations (USD)' }); |  | ||||||
|       } |       } | ||||||
|     }); |     }); | ||||||
|   } |   } | ||||||
| @ -429,23 +376,11 @@ export class BlockFeesSubsidyGraphComponent implements OnInit { | |||||||
|     download(this.chartInstance.getDataURL({ |     download(this.chartInstance.getDataURL({ | ||||||
|       pixelRatio: 2, |       pixelRatio: 2, | ||||||
|       excludeComponents: ['dataZoom'], |       excludeComponents: ['dataZoom'], | ||||||
|     }), `block-fees-subsidy-${this.endBlock}-${Math.round(now.getTime() / 1000)}.svg`); |     }), `block-fees-subsidy-${this.timespan}-${Math.round(now.getTime() / 1000)}.svg`); | ||||||
|     // @ts-ignore
 |     // @ts-ignore
 | ||||||
|     this.chartOptions.grid.bottom = prevBottom; |     this.chartOptions.grid.bottom = prevBottom; | ||||||
|     this.chartOptions.backgroundColor = 'none'; |     this.chartOptions.backgroundColor = 'none'; | ||||||
|     this.chartInstance.setOption(this.chartOptions); |     this.chartInstance.setOption(this.chartOptions); | ||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
|   selectBlockSpan(value: string) { |  | ||||||
|     this.radioGroupForm.controls.endBlock.setValue(value); |  | ||||||
|     this.router.navigate([], { queryParams: { height: value }, queryParamsHandling: 'merge' }); |  | ||||||
|   } |  | ||||||
| 
 |  | ||||||
|   endBlockToSelector(value: string): string { |  | ||||||
|     let upperBound = Math.min(this.indexedBlocksInterval.end, parseInt(value, 10)); |  | ||||||
|     let lowerBound = Math.max(0, parseInt(value, 10) - this.step); |  | ||||||
|     if (lowerBound < this.indexedBlocksInterval.start) lowerBound = this.indexedBlocksInterval.start + 1; |  | ||||||
|     if (lowerBound > upperBound) lowerBound = upperBound; |  | ||||||
|     return `Blocks ${lowerBound} - ${upperBound}`; |  | ||||||
|   } |  | ||||||
| } | } | ||||||
|  | |||||||
| @ -333,13 +333,6 @@ export class ApiService { | |||||||
|     ); |     ); | ||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
|   getHistoricalExactBlockFees$(height: string | undefined) : Observable<any> { |  | ||||||
|     return this.httpClient.get<any[]>( |  | ||||||
|       this.apiBaseUrl + this.apiBasePath + `/api/v1/mining/blocks/exact-fees` + |  | ||||||
|       (height !== undefined ? `/${height}` : ''), { observe: 'response' } |  | ||||||
|     ); |  | ||||||
|   } |  | ||||||
| 
 |  | ||||||
|   getHistoricalBlockRewards$(interval: string | undefined) : Observable<any> { |   getHistoricalBlockRewards$(interval: string | undefined) : Observable<any> { | ||||||
|     return this.httpClient.get<any[]>( |     return this.httpClient.get<any[]>( | ||||||
|       this.apiBaseUrl + this.apiBasePath + `/api/v1/mining/blocks/rewards` + |       this.apiBaseUrl + this.apiBasePath + `/api/v1/mining/blocks/rewards` + | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user