;
+ isLoading = true;
+ formatNumber = formatNumber;
+ endBlock = '';
+ blockCount = 0;
+ chartInstance: any = undefined;
+ showFiat = false;
+ dropdownOptions = [];
+ step = 20000;
+ includeAccelerations = false;
+
+ constructor(
+ @Inject(LOCALE_ID) public locale: string,
+ private seoService: SeoService,
+ private apiService: ApiService,
+ private formBuilder: UntypedFormBuilder,
+ public stateService: StateService,
+ private route: ActivatedRoute,
+ private router: Router,
+ private fiatShortenerPipe: FiatShortenerPipe,
+ private fiatCurrencyPipe: FiatCurrencyPipe,
+ ) {
+ this.radioGroupForm = this.formBuilder.group({ endBlock: '' });
+ this.radioGroupForm.controls.endBlock.setValue('');
+ }
+
+ ngOnInit(): void {
+ 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.route.queryParams.subscribe((params) => {
+ if (/^(0|[1-9]\d{0,9})$/.test(params['height'])) {
+ this.radioGroupForm.controls.endBlock.setValue(params['height'], { emitEvent: false });
+ }
+ });
+
+ this.includeAccelerations = this.stateService.env.ACCELERATOR;
+
+ this.statsObservable$ = this.radioGroupForm.get('endBlock').valueChanges
+ .pipe(
+ startWith(this.radioGroupForm.controls.endBlock.value),
+ switchMap((endBlock) => {
+ this.isLoading = true;
+ this.endBlock = endBlock;
+ return this.apiService.getHistoricalExactBlockFees$(endBlock === '' ? undefined : endBlock)
+ .pipe(
+ tap((response) => {
+ let blockReward = 50 * 100_000_000;
+ const subsidies = {};
+ for (let i = 0; i <= 33; i++) {
+ subsidies[i] = blockReward;
+ 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 = {
+ blockHeight: response.body.map(val => val.height),
+ blockSubsidy: response.body.map(val => val?.missing ? 0 : subsidies[Math.floor(Math.min(val.height / 210000, 33))] / 100_000_000),
+ 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.fees / 100_000_000),
+ blockFeesFiat: response.body.map(val => val.fees / 100_000_000 * val.USD),
+ }
+
+ let accelerationData = {};
+ 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;
+ }),
+ map((response) => {
+ this.blockCount = parseInt(response.headers.get('x-total-count'), 10);
+ if (this.radioGroupForm.controls.endBlock.value === '') this.radioGroupForm.controls.endBlock.setValue((this.blockCount - 1).toString(), { emitEvent: false });
+ this.dropdownOptions = [(this.blockCount - 1).toString()];
+ if (this.blockCount) {
+ let i = this.blockCount - 1 - this.step;
+ while (i >= 0) {
+ this.dropdownOptions.push(i.toString());
+ i -= this.step;
+ }
+ }
+ return {
+ blockCount: this.blockCount,
+ };
+ }),
+ );
+ }),
+ share()
+ );
+ }
+
+ prepareChartOptions(data, accelerationData) {
+ let title: object;
+ if (data.blockFees.length === 0) {
+ title = {
+ textStyle: {
+ color: 'grey',
+ fontSize: 15
+ },
+ text: $localize`:@@23555386d8af1ff73f297e89dd4af3f4689fb9dd:Indexing blocks`,
+ left: 'center',
+ top: 'center'
+ };
+ }
+
+ this.chartOptions = {
+ title: title,
+ color: [
+ 'var(--orange)',
+ 'var(--success)',
+ 'var(--tertiary)'
+ ],
+ animation: false,
+ grid: {
+ top: 80,
+ bottom: 80,
+ right: this.right,
+ left: this.left,
+ },
+ tooltip: {
+ show: !this.isMobile(),
+ trigger: 'axis',
+ axisPointer: {
+ type: 'line'
+ },
+ backgroundColor: 'color-mix(in srgb, var(--active-bg) 95%, transparent)',
+ borderRadius: 4,
+ shadowColor: 'color-mix(in srgb, var(--active-bg) 95%, transparent)',
+ textStyle: {
+ color: 'var(--tooltip-grey)',
+ align: 'left',
+ },
+ borderColor: 'var(--active-bg)',
+ formatter: function (data) {
+ if (data.length <= 0) {
+ return '';
+ }
+
+ let tooltip = `Block ${data[0].axisValue}
`;
+ for (let i = data.length - 1; i >= 0; 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
`;
+ else tooltip += `${tick.marker} ${tick.seriesName}: ${this.fiatCurrencyPipe.transform(tick.data, null, 'USD') }
`;
+ }
+ if (!this.showFiat) tooltip += `${formatNumber(data.reduce((acc, val) => acc + val.data, 0), this.locale, '1.0-3')} BTC
`;
+ else tooltip += `${this.fiatCurrencyPipe.transform(data.reduce((acc, val) => acc + val.data, 0), null, 'USD')}
`;
+ return tooltip;
+ }.bind(this)
+ },
+ xAxis: data.blockFees.length === 0 ? undefined :
+ {
+ type: 'category',
+ data: data.blockHeight,
+ axisLabel: {
+ hideOverlap: true,
+ color: 'var(--grey)',
+ }
+ },
+ legend: data.blockFees.length === 0 ? undefined : {
+ data: [
+ {
+ name: 'Subsidy',
+ inactiveColor: 'var(--grey)',
+ textStyle: {
+ color: 'white',
+ },
+ icon: 'roundRect',
+ },
+ {
+ name: 'Fees',
+ inactiveColor: 'var(--grey)',
+ textStyle: {
+ color: 'white',
+ },
+ icon: 'roundRect',
+ },
+ this.includeAccelerations ? {
+ name: 'Accelerations',
+ inactiveColor: 'var(--grey)',
+ textStyle: {
+ color: 'white',
+ },
+ icon: 'roundRect',
+ } : null,
+ {
+ name: 'Subsidy (USD)',
+ inactiveColor: 'var(--grey)',
+ textStyle: {
+ color: 'white',
+ },
+ icon: 'roundRect',
+ },
+ {
+ name: 'Fees (USD)',
+ inactiveColor: 'var(--grey)',
+ textStyle: {
+ color: 'white',
+ },
+ icon: 'roundRect',
+ },
+ this.includeAccelerations ? {
+ name: 'Accelerations (USD)',
+ inactiveColor: 'var(--grey)',
+ textStyle: {
+ color: 'white',
+ },
+ icon: 'roundRect',
+ } : null
+ ].filter(legend => legend !== null),
+ selected: {
+ 'Subsidy (USD)': this.showFiat,
+ 'Fees (USD)': this.showFiat,
+ 'Accelerations (USD)': this.showFiat,
+ 'Subsidy': !this.showFiat,
+ 'Fees': !this.showFiat,
+ 'Accelerations': !this.showFiat,
+ },
+ },
+ yAxis: data.blockFees.length === 0 ? undefined : [
+ {
+ type: 'value',
+ axisLabel: {
+ color: 'var(--grey)',
+ formatter: (val) => {
+ return `${val} BTC`;
+ }
+ },
+ min: 0,
+ splitLine: {
+ lineStyle: {
+ type: 'dotted',
+ color: 'var(--transparent-fg)',
+ opacity: 0.25,
+ }
+ },
+ },
+ {
+ type: 'value',
+ position: 'right',
+ axisLabel: {
+ color: 'var(--grey)',
+ formatter: function(val) {
+ return this.fiatShortenerPipe.transform(val, null, 'USD');
+ }.bind(this)
+ },
+ splitLine: {
+ show: false,
+ },
+ },
+ ],
+ series: data.blockFees.length === 0 ? undefined : [
+ {
+ name: 'Subsidy',
+ yAxisIndex: 0,
+ type: 'bar',
+ stack: 'total',
+ data: data.blockSubsidy,
+ },
+ {
+ name: 'Fees',
+ yAxisIndex: 0,
+ type: 'bar',
+ stack: 'total',
+ data: data.blockFees,
+ },
+ {
+ name: 'Accelerations',
+ yAxisIndex: 0,
+ type: 'bar',
+ stack: 'total',
+ data: accelerationData.blockAccelerations,
+ },
+ {
+ name: 'Subsidy (USD)',
+ yAxisIndex: 1,
+ type: 'bar',
+ stack: 'total',
+ data: data.blockSubsidyFiat,
+ },
+ {
+ name: 'Fees (USD)',
+ yAxisIndex: 1,
+ type: 'bar',
+ stack: 'total',
+ data: data.blockFeesFiat,
+ },
+ {
+ name: 'Accelerations (USD)',
+ yAxisIndex: 1,
+ type: 'bar',
+ stack: 'total',
+ data: accelerationData.blockAccelerationsFiat,
+ },
+ ],
+ dataZoom: data.blockFees.length === 0 ? undefined : [{
+ type: 'inside',
+ realtime: true,
+ zoomLock: true,
+ maxSpan: 100,
+ minSpan: 1,
+ moveOnMouseMove: false,
+ }, {
+ showDetail: false,
+ show: true,
+ type: 'slider',
+ brushSelect: false,
+ realtime: true,
+ left: 20,
+ right: 15,
+ selectedDataBackground: {
+ lineStyle: {
+ color: '#fff',
+ opacity: 0.45,
+ },
+ },
+ }],
+ };
+ }
+
+ onChartInit(ec) {
+ this.chartInstance = ec;
+
+ this.chartInstance.on('legendselectchanged', (params) => {
+ const isFiat = params.name.includes('USD');
+ if (isFiat === this.showFiat) return;
+
+ const isActivation = params.selected[params.name];
+ if (isFiat === isActivation) {
+ this.showFiat = true;
+ this.chartInstance.dispatchAction({ type: 'legendUnSelect', name: 'Subsidy' });
+ 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: 'Fees (USD)' });
+ this.chartInstance.dispatchAction({ type: 'legendSelect', name: 'Accelerations (USD)' });
+ } else {
+ this.showFiat = false;
+ this.chartInstance.dispatchAction({ type: 'legendSelect', name: 'Subsidy' });
+ 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: 'Fees (USD)' });
+ this.chartInstance.dispatchAction({ type: 'legendUnSelect', name: 'Accelerations (USD)' });
+ }
+ });
+ }
+
+ isMobile() {
+ return (window.innerWidth <= 767.98);
+ }
+
+ onSaveChart() {
+ // @ts-ignore
+ const prevBottom = this.chartOptions.grid.bottom;
+ const now = new Date();
+ // @ts-ignore
+ this.chartOptions.grid.bottom = 40;
+ this.chartOptions.backgroundColor = 'var(--active-bg)';
+ this.chartInstance.setOption(this.chartOptions);
+ download(this.chartInstance.getDataURL({
+ pixelRatio: 2,
+ excludeComponents: ['dataZoom'],
+ }), `block-fees-subsidy-${this.endBlock}-${Math.round(now.getTime() / 1000)}.svg`);
+ // @ts-ignore
+ this.chartOptions.grid.bottom = prevBottom;
+ this.chartOptions.backgroundColor = 'none';
+ 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 {
+ if (parseInt(value, 10) > this.blockCount) value = (this.blockCount).toString();
+ return `Blocks ${Math.max(0, parseInt(value, 10) - this.step)} - ` + value;
+ }
+}
diff --git a/frontend/src/app/components/graphs/graphs.component.html b/frontend/src/app/components/graphs/graphs.component.html
index 073aa02dc..c72aa8eb8 100644
--- a/frontend/src/app/components/graphs/graphs.component.html
+++ b/frontend/src/app/components/graphs/graphs.component.html
@@ -17,6 +17,8 @@
i18n="mining.block-fee-rates">Block Fee Rates
Block Fees
+ Block Fees Vs Subsidy
Block Rewards
{
+ return this.httpClient.get(
+ this.apiBaseUrl + this.apiBasePath + `/api/v1/mining/blocks/exact-fees` +
+ (height !== undefined ? `/${height}` : ''), { observe: 'response' }
+ );
+ }
+
getHistoricalBlockRewards$(interval: string | undefined) : Observable {
return this.httpClient.get(
this.apiBaseUrl + this.apiBasePath + `/api/v1/mining/blocks/rewards` +
From 1c3e0bdd6a03ead2749840fb462a201f5c244bed Mon Sep 17 00:00:00 2001
From: natsoni
Date: Fri, 3 May 2024 14:45:09 +0200
Subject: [PATCH 04/32] Prevent address page to load more txs unnecessarily
---
frontend/src/app/components/address/address.component.ts | 1 +
1 file changed, 1 insertion(+)
diff --git a/frontend/src/app/components/address/address.component.ts b/frontend/src/app/components/address/address.component.ts
index 95abe4ac1..0a65a70b3 100644
--- a/frontend/src/app/components/address/address.component.ts
+++ b/frontend/src/app/components/address/address.component.ts
@@ -173,6 +173,7 @@ export class AddressComponent implements OnInit, OnDestroy {
});
this.transactions = this.tempTransactions;
+ if (this.transactions.length === this.txCount) this.fullyLoaded = true;
this.isLoadingTransactions = false;
},
(error) => {
From 6d595dcdb63cbddb0fd01622ed07e44640fda577 Mon Sep 17 00:00:00 2001
From: natsoni
Date: Sat, 4 May 2024 16:56:02 +0200
Subject: [PATCH 05/32] Fix graph menu styling
---
.../src/app/components/graphs/graphs.component.html | 11 +++++------
.../src/app/components/graphs/graphs.component.scss | 4 ++--
.../src/app/components/graphs/graphs.component.ts | 6 +++---
.../components/statistics/statistics.component.scss | 2 +-
4 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/frontend/src/app/components/graphs/graphs.component.html b/frontend/src/app/components/graphs/graphs.component.html
index c72aa8eb8..53d18bbc2 100644
--- a/frontend/src/app/components/graphs/graphs.component.html
+++ b/frontend/src/app/components/graphs/graphs.component.html
@@ -1,9 +1,9 @@
-
+
+ 
diff --git a/frontend/src/app/components/about/about.component.scss b/frontend/src/app/components/about/about.component.scss
index 81fcfbbd8..d1c15f838 100644
--- a/frontend/src/app/components/about/about.component.scss
+++ b/frontend/src/app/components/about/about.component.scss
@@ -129,8 +129,9 @@
position: relative;
width: 300px;
}
- .bisq {
- top: 3px;
+ .sv {
+ height: 85px;
+ width: auto;
position: relative;
}
}
diff --git a/frontend/src/resources/profile/onbtc-full.svg b/frontend/src/resources/profile/onbtc-full.svg
new file mode 100644
index 000000000..1c189ea6d
--- /dev/null
+++ b/frontend/src/resources/profile/onbtc-full.svg
@@ -0,0 +1,334 @@
+
+
\ No newline at end of file
From 1b25a71d9f5a0fd56df1e8e2012ae65115c9d7cc Mon Sep 17 00:00:00 2001
From: natsoni