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

show cpfp badges on non-mempool tx previews

Browse Source
This commit is contained in:
Mononaut 2022-11-27 13:47:26 +09:00
parent fa515402bf
commit 3e7270d1c5
No known key found for this signature in database
GPG Key ID: A3F058E41374C04E
2 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,10 +8,10 @@
</div> </div>
<div *ngIf="network !== 'liquid' && network !== 'liquidtestnet'" class="features"> <div *ngIf="network !== 'liquid' && network !== 'liquidtestnet'" class="features">
<app-tx-features [tx]="tx"></app-tx-features> <app-tx-features [tx]="tx"></app-tx-features>
<span *ngIf="cpfpInfo && cpfpInfo.bestDescendant" class="badge badge-primary mr-1"> <span *ngIf="cpfpInfo && (cpfpInfo.bestDescendant || cpfpInfo.descendants.length)" class="badge badge-primary mr-1">
CPFP CPFP
</span> </span>
<span *ngIf="cpfpInfo && !cpfpInfo.bestDescendant && cpfpInfo.ancestors.length" class="badge badge-info mr-1"> <span *ngIf="cpfpInfo && !cpfpInfo.bestDescendant && !cpfpInfo.descendants.length && cpfpInfo.ancestors.length" class="badge badge-info mr-1">
CPFP CPFP
</span> </span>
</div> </div>

23
frontend/src/app/components/transaction/transaction-preview.component.ts
View File

@ -72,6 +72,9 @@ export class TransactionPreviewComponent implements OnInit, OnDestroy {
if (!this.tx) { if (!this.tx) {
return; return;
} }
if (cpfpInfo.effectiveFeePerVsize) {
this.tx.effectiveFeePerVsize = cpfpInfo.effectiveFeePerVsize;
} else {
const lowerFeeParents = cpfpInfo.ancestors.filter( const lowerFeeParents = cpfpInfo.ancestors.filter(
(parent) => parent.fee / (parent.weight / 4) < this.tx.feePerVsize (parent) => parent.fee / (parent.weight / 4) < this.tx.feePerVsize
); );
@ -82,15 +85,18 @@ export class TransactionPreviewComponent implements OnInit, OnDestroy {
this.tx.fee + this.tx.fee +
lowerFeeParents.reduce((prev, val) => prev + val.fee, 0); lowerFeeParents.reduce((prev, val) => prev + val.fee, 0);
if (cpfpInfo.bestDescendant) { if (cpfpInfo?.bestDescendant) {
totalWeight += cpfpInfo.bestDescendant.weight; totalWeight += cpfpInfo?.bestDescendant.weight;
totalFees += cpfpInfo.bestDescendant.fee; totalFees += cpfpInfo?.bestDescendant.fee;
} }
this.tx.effectiveFeePerVsize = totalFees / (totalWeight / 4); this.tx.effectiveFeePerVsize = totalFees / (totalWeight / 4);
}
if (!this.tx.status.confirmed) {
this.stateService.markBlock$.next({ this.stateService.markBlock$.next({
txFeePerVSize: this.tx.effectiveFeePerVsize, txFeePerVSize: this.tx.effectiveFeePerVsize,
}); });
}
this.cpfpInfo = cpfpInfo; this.cpfpInfo = cpfpInfo;
this.openGraphService.waitOver('cpfp-data-' + this.txId); this.openGraphService.waitOver('cpfp-data-' + this.txId);
}); });
@ -176,8 +182,17 @@ export class TransactionPreviewComponent implements OnInit, OnDestroy {
this.getTransactionTime(); this.getTransactionTime();
} }
if (!this.tx.status.confirmed) { if (this.tx.status.confirmed) {
this.stateService.markBlock$.next({
blockHeight: tx.status.block_height,
});
this.openGraphService.waitFor('cpfp-data-' + this.txId);
this.fetchCpfp$.next(this.tx.txid);
} else {
if (tx.cpfpChecked) { if (tx.cpfpChecked) {
this.stateService.markBlock$.next({
txFeePerVSize: tx.effectiveFeePerVsize,
});
this.cpfpInfo = { this.cpfpInfo = {
ancestors: tx.ancestors, ancestors: tx.ancestors,
bestDescendant: tx.bestDescendant, bestDescendant: tx.bestDescendant,