- | ETA |
+ ETA |
-
- In several hours (or more)
- Accelerate
+
+ In several hours (or more)
+
@@ -109,9 +144,11 @@
-
-
- Accelerate
+
+
+
diff --git a/frontend/src/app/components/transaction/transaction.component.scss b/frontend/src/app/components/transaction/transaction.component.scss
index 5bef401d7..45357471a 100644
--- a/frontend/src/app/components/transaction/transaction.component.scss
+++ b/frontend/src/app/components/transaction/transaction.component.scss
@@ -228,11 +228,15 @@
}
}
+.link.accelerator {
+ cursor: pointer;
+}
+
.accelerate {
align-self: auto;
margin-top: 3px;
+ margin-left: 10px;
@media (min-width: 850px) {
justify-self: start;
- margin-left: 0px;
}
}
\ No newline at end of file
diff --git a/frontend/src/app/components/transaction/transaction.component.ts b/frontend/src/app/components/transaction/transaction.component.ts
index f1f3850e4..db200e9b1 100644
--- a/frontend/src/app/components/transaction/transaction.component.ts
+++ b/frontend/src/app/components/transaction/transaction.component.ts
@@ -19,6 +19,7 @@ import { WebsocketService } from '../../services/websocket.service';
import { AudioService } from '../../services/audio.service';
import { ApiService } from '../../services/api.service';
import { SeoService } from '../../services/seo.service';
+import { StorageService } from '../../services/storage.service';
import { BlockExtended, CpfpInfo, RbfTree, MempoolPosition, DifficultyAdjustment } from '../../interfaces/node-api.interface';
import { LiquidUnblinding } from './liquid-ublinding';
import { RelativeUrlPipe } from '../../shared/pipes/relative-url/relative-url.pipe';
@@ -88,6 +89,9 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
rbfEnabled: boolean;
taprootEnabled: boolean;
hasEffectiveFeeRate: boolean;
+ accelerateCtaType: 'alert' | 'button' = 'alert';
+ acceleratorAvailable: boolean = this.stateService.env.OFFICIAL_MEMPOOL_SPACE && this.stateService.env.ACCELERATOR && this.stateService.network === '';
+ showAccelerationSummary = false;
@ViewChild('graphContainer')
graphContainer: ElementRef;
@@ -104,14 +108,20 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
private apiService: ApiService,
private seoService: SeoService,
private priceService: PriceService,
+ private storageService: StorageService
) {}
ngOnInit() {
this.websocketService.want(['blocks', 'mempool-blocks']);
this.stateService.networkChanged$.subscribe(
- (network) => (this.network = network)
+ (network) => {
+ this.network = network;
+ this.acceleratorAvailable = this.stateService.env.OFFICIAL_MEMPOOL_SPACE && this.stateService.env.ACCELERATOR && this.stateService.network === '';
+ }
);
+ this.accelerateCtaType = (this.storageService.getValue('accel-cta-type') as 'alert' | 'button') ?? 'alert';
+
this.setFlowEnabled();
this.flowPrefSubscription = this.stateService.hideFlow.subscribe((hide) => {
this.hideFlow = !!hide;
@@ -486,6 +496,19 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
this.setGraphSize();
}
+ dismissAccelAlert(): void {
+ this.storageService.setValue('accel-cta-type', 'button');
+ this.accelerateCtaType = 'button';
+ }
+
+ onAccelerateClicked(): void {
+ if (!this.txId) {
+ return;
+ }
+
+ this.showAccelerationSummary = true && this.acceleratorAvailable;
+ }
+
handleLoadElectrsTransactionError(error: any): Observable {
if (error.status === 404 && /^[a-fA-F0-9]{64}$/.test(this.txId)) {
this.websocketService.startMultiTrackTransaction(this.txId);
diff --git a/frontend/src/app/services/api.service.ts b/frontend/src/app/services/api.service.ts
index cd1109da1..2d9077a97 100644
--- a/frontend/src/app/services/api.service.ts
+++ b/frontend/src/app/services/api.service.ts
@@ -388,4 +388,8 @@ export class ApiService {
getServicesBackendInfo$(): Observable {
return this.httpClient.get(`${SERVICES_API_PREFIX}/version`);
}
+
+ estimate$(txInput: string) {
+ return this.httpClient.post(`${SERVICES_API_PREFIX}/accelerator/estimate`, { txInput: txInput }, { observe: 'response' });
+ }
}
diff --git a/frontend/src/app/shared/components/confirmations/confirmations.component.html b/frontend/src/app/shared/components/confirmations/confirmations.component.html
index db3f1f38a..4ad3cb33a 100644
--- a/frontend/src/app/shared/components/confirmations/confirmations.component.html
+++ b/frontend/src/app/shared/components/confirmations/confirmations.component.html
@@ -1,19 +1,19 @@
-
-
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/frontend/src/app/shared/components/confirmations/confirmations.component.scss b/frontend/src/app/shared/components/confirmations/confirmations.component.scss
index e69de29bb..c8af7dd76 100644
--- a/frontend/src/app/shared/components/confirmations/confirmations.component.scss
+++ b/frontend/src/app/shared/components/confirmations/confirmations.component.scss
@@ -0,0 +1,4 @@
+.no-cursor {
+ cursor: default !important;
+ pointer-events: none;
+}
\ No newline at end of file
From fcecbe49677144328c743ba86b6d3fbd95305cc8 Mon Sep 17 00:00:00 2001
From: nymkappa <1612910616@pm.me>
Date: Sat, 26 Aug 2023 09:52:55 +0200
Subject: [PATCH 36/62] [tx] integrated accelerator
---
.../accelerate-preview.component.html | 231 ++++++++++++++++++
.../accelerate-preview.component.scss | 20 ++
.../accelerate-preview.component.ts | 163 +++++++++++-
.../transaction/transaction.component.html | 32 +--
.../transaction/transaction.component.scss | 59 +++--
.../transaction/transaction.component.ts | 7 +-
frontend/src/app/services/api.service.ts | 4 +
.../mempool-error.component.html | 2 +
.../mempool-error/mempool-error.component.ts | 47 ++++
frontend/src/app/shared/shared.module.ts | 8 +-
10 files changed, 519 insertions(+), 54 deletions(-)
create mode 100644 frontend/src/app/shared/components/mempool-error/mempool-error.component.html
create mode 100644 frontend/src/app/shared/components/mempool-error/mempool-error.component.ts
diff --git a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.html b/frontend/src/app/components/accelerate-preview/accelerate-preview.component.html
index e69de29bb..e2c6e3c22 100644
--- a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.html
+++ b/frontend/src/app/components/accelerate-preview/accelerate-preview.component.html
@@ -0,0 +1,231 @@
+
+
+
+ Transaction has now been submitted to mining pools for acceleration. You can track the progress here.
+
+
+
+
+
+ This transactions is part of a CPFP tree. Fee rates (in sats/vb) are provided for your information. Change in the CPFP tree will lead to different fee rates values.
+
+
+
+
+
+
+
+
+
+ |
+ Next block market price
+ |
+
+ {{ estimate.targetFeeRate | number : '1.0-0' }} sat/vB
+ |
+
+
+ |
+ Currently estimated fee to get into next block
+ |
+
+
+ {{ estimate.nextBlockFee| number }} sats
+
+
+ |
+
+
+
+
+ |
+ Fees paid in-band
+ |
+
+ ~{{ (estimate.txSummary.effectiveFee / estimate.txSummary.effectiveVsize) | number : '1.0-0' }} sat/vB
+ |
+
+
+ |
+ What you already paid when you made the transaction
+ |
+
+
+ {{ estimate.txSummary.effectiveFee | number }} sats
+
+
+ |
+
+
+
+
+ |
+ Extra fee required
+ |
+
+ {{ math.max(0, estimate.nextBlockFee - estimate.txSummary.effectiveFee) | number }} sats
+
+ |
+
+
+ |
+ Difference between the next block fee and your tx fee
+ |
+
+
+
+
+
+
+ How much more are you willing to pay at most to get into the next block?
+
+
+
+ The maximum extra transaction fee you're willing to pay to get into the next block. If the next block market price becomes too expensive for you, we will automatically cancel your acceleration request. Final charged fee may be smaller based on the fee market.
+
+
+
+
+
+ Acceleration summary
+
+
+
+
+
+
+ |
+ Your maximum tx fees
+ |
+
+ ~{{ ((estimate.txSummary.effectiveFee + userBid) / estimate.txSummary.effectiveVsize) | number : '1.0-0' }} sat/vB
+ |
+
+
+ |
+ The maximum extra transaction fee you're willing to pay
+ |
+
+
+ {{ userBid | number }} sats
+
+
+ |
+
+
+
+
+ |
+ Mempool Accelerator™ fee
+ |
+
+ +{{ estimate.mempoolBaseFee + estimate.vsizeFee | number }} sats
+
+ |
+
+
+ |
+ mempool.space fee
+ |
+
+
+ {{ estimate.mempoolBaseFee | number }} sats
+
+
+ |
+
+
+ |
+ Transaction vsize fee
+ |
+
+
+ {{ estimate.vsizeFee | number }} sats
+
+
+ |
+
+
+
+
+ |
+ Estimated acceleration cost
+ |
+
+
+ {{ estimate.cost + estimate.mempoolBaseFee + estimate.vsizeFee | number }} satss
+
+
+ |
+
+
+ |
+ Cost if your tx is accelerated using {{ estimate.targetFeeRate | number : '1.0-0' }} sat/vB
+ |
+
+
+
+
+ |
+ Maximum acceleration cost
+ |
+
+ {{ maxCost | number }} satss
+
+
+
+ |
+
+
+ |
+ Cost if your tx is accelerated using ~{{ ((estimate.txSummary.effectiveFee + userBid) / estimate.txSummary.effectiveVsize) | number : '1.0-0' }} sat/vB
+ |
+
+
+
+
+ |
+ Available balance
+ |
+
+ {{ estimate.userBalance | number }} satss
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+
Accelerate this transaction using the Mempool Accelerator ™
|