machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix frontend logic for displaying effective fee rate

Browse Source
This commit is contained in:
Mononaut 2023-05-31 12:11:56 -04:00
parent ee1ec414ed
commit 0ac76e12c4
No known key found for this signature in database
GPG Key ID: A3F058E41374C04E
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/app/components/transaction/transaction.component.html
View File

@ -485,11 +485,11 @@
{{ tx.feePerVsize | feeRounding }} <span class="symbol" i18n="shared.sat-vbyte|sat/vB">sat/vB</span> {{ tx.feePerVsize | feeRounding }} <span class="symbol" i18n="shared.sat-vbyte|sat/vB">sat/vB</span>
<ng-template [ngIf]="tx?.status?.confirmed"> <ng-template [ngIf]="tx?.status?.confirmed">
&nbsp; &nbsp;
<app-tx-fee-rating *ngIf="tx.fee && (!cpfpInfo || (!cpfpInfo.effectiveFeePerVsize && !cpfpInfo?.descendants?.length && !cpfpInfo?.bestDescendant && !cpfpInfo?.ancestors?.length))" [tx]="tx"></app-tx-fee-rating> <app-tx-fee-rating *ngIf="tx.fee && !hasEffectiveFeeRate" [tx]="tx"></app-tx-fee-rating>
</ng-template> </ng-template>
</td> </td>
</tr> </tr>
<tr *ngIf="cpfpInfo && (cpfpInfo.effectiveFeePerVsize || cpfpInfo.bestDescendant || cpfpInfo.descendants?.length || cpfpInfo.ancestors?.length)"> <tr *ngIf="cpfpInfo && hasEffectiveFeeRate">
<td i18n="transaction.effective-fee-rate|Effective transaction fee rate">Effective fee rate</td> <td i18n="transaction.effective-fee-rate|Effective transaction fee rate">Effective fee rate</td>
<td> <td>
<div class="effective-fee-container"> <div class="effective-fee-container">

9
frontend/src/app/components/transaction/transaction.component.ts
View File

@ -86,6 +86,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
segwitEnabled: boolean; segwitEnabled: boolean;
rbfEnabled: boolean; rbfEnabled: boolean;
taprootEnabled: boolean; taprootEnabled: boolean;
hasEffectiveFeeRate: boolean;
@ViewChild('graphContainer') @ViewChild('graphContainer')
graphContainer: ElementRef; graphContainer: ElementRef;
@ -157,6 +158,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
.subscribe((cpfpInfo) => { .subscribe((cpfpInfo) => {
if (!cpfpInfo || !this.tx) { if (!cpfpInfo || !this.tx) {
this.cpfpInfo = null; this.cpfpInfo = null;
this.hasEffectiveFeeRate = false;
return; return;
} }
// merge ancestors/descendants // merge ancestors/descendants
@ -164,7 +166,8 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
if (cpfpInfo.bestDescendant && !cpfpInfo.descendants?.length) { if (cpfpInfo.bestDescendant && !cpfpInfo.descendants?.length) {
relatives.push(cpfpInfo.bestDescendant); relatives.push(cpfpInfo.bestDescendant);
} }
if (!cpfpInfo.effectiveFeePerVsize) { const hasRelatives = !!relatives.length;
if (!cpfpInfo.effectiveFeePerVsize && hasRelatives) {
let totalWeight = let totalWeight =
this.tx.weight + this.tx.weight +
relatives.reduce((prev, val) => prev + val.weight, 0); relatives.reduce((prev, val) => prev + val.weight, 0);
@ -177,6 +180,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
} }
this.cpfpInfo = cpfpInfo; this.cpfpInfo = cpfpInfo;
this.hasEffectiveFeeRate = hasRelatives || (this.tx.effectiveFeePerVsize && (Math.abs(this.tx.effectiveFeePerVsize - this.tx.feePerVsize) > 0.01));
}); });
this.fetchRbfSubscription = this.fetchRbfHistory$ this.fetchRbfSubscription = this.fetchRbfHistory$
@ -362,6 +366,8 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
ancestors: tx.ancestors, ancestors: tx.ancestors,
bestDescendant: tx.bestDescendant, bestDescendant: tx.bestDescendant,
}; };
const hasRelatives = !!(tx.ancestors.length || tx.bestDescendant);
this.hasEffectiveFeeRate = hasRelatives || (tx.effectiveFeePerVsize && (Math.abs(tx.effectiveFeePerVsize - tx.feePerVsize) > 0.01));
} else { } else {
this.fetchCpfp$.next(this.tx.txid); this.fetchCpfp$.next(this.tx.txid);
} }
@ -503,6 +509,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
this.replaced = false; this.replaced = false;
this.transactionTime = -1; this.transactionTime = -1;
this.cpfpInfo = null; this.cpfpInfo = null;
this.hasEffectiveFeeRate = false;
this.rbfInfo = null; this.rbfInfo = null;
this.rbfReplaces = []; this.rbfReplaces = [];
this.showCpfpDetails = false; this.showCpfpDetails = false;