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

Merge pull request #4981 from mempool/natsoni/fix-tx-details-loading

Browse Source 
Fix miner data loading in transaction details
This commit is contained in:
softsimon 2024-04-26 12:06:03 +07:00 committed by GitHub
commit 836c1e002e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 46 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,6 +81,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
mempoolBlocksSubscription: Subscription; mempoolBlocksSubscription: Subscription;
blocksSubscription: Subscription; blocksSubscription: Subscription;
miningSubscription: Subscription; miningSubscription: Subscription;
auditSubscription: Subscription;
currencyChangeSubscription: Subscription; currencyChangeSubscription: Subscription;
fragmentParams: URLSearchParams; fragmentParams: URLSearchParams;
rbfTransaction: undefined | Transaction; rbfTransaction: undefined | Transaction;
@ -308,51 +309,57 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
filter((target) => target.txid === this.txId), filter((target) => target.txid === this.txId),
tap(() => { tap(() => {
this.pool = null; this.pool = null;
this.auditStatus = null;
}), }),
switchMap(({ hash, height, txid }) => { switchMap(({ hash, height }) => {
const foundBlock = this.cacheService.getCachedBlock(height) || null; const foundBlock = this.cacheService.getCachedBlock(height) || null;
const auditAvailable = this.isAuditAvailable(height); return foundBlock ? of(foundBlock.extras.pool) : this.apiService.getBlock$(hash).pipe(
const isCoinbase = this.tx.vin.some(v => v.is_coinbase); map(block => block.extras.pool),
const fetchAudit = auditAvailable && !isCoinbase; retry({ count: 3, delay: 2000 }),
return combineLatest([ catchError(() => of(null))
foundBlock ? of(foundBlock.extras.pool) : this.apiService.getBlock$(hash).pipe( );
map(block => {
return block.extras.pool;
}),
retry({ count: 3, delay: 2000 }),
catchError(() => {
return of(null);
})
),
fetchAudit ? this.apiService.getBlockAudit$(hash).pipe(
map(audit => {
const isAdded = audit.addedTxs.includes(txid);
const isPrioritized = audit.prioritizedTxs.includes(txid);
const isAccelerated = audit.acceleratedTxs.includes(txid);
const isConflict = audit.fullrbfTxs.includes(txid);
const isExpected = audit.template.some(tx => tx.txid === txid);
return {
seen: isExpected || isPrioritized || isAccelerated,
expected: isExpected,
added: isAdded,
prioritized: isPrioritized,
conflict: isConflict,
accelerated: isAccelerated,
};
}),
retry({ count: 3, delay: 2000 }),
catchError(() => {
return of(null);
})
) : of(isCoinbase ? { coinbase: true } : null)
]);
}), }),
catchError((e) => { catchError((e) => {
return of(null); return of(null);
}) })
).subscribe(([pool, auditStatus]) => { ).subscribe(pool => {
this.pool = pool; this.pool = pool;
});
this.auditSubscription = this.fetchMiningInfo$.pipe(
filter((target) => target.txid === this.txId),
tap(() => {
this.auditStatus = null;
}),
switchMap(({ hash, height, txid }) => {
const auditAvailable = this.isAuditAvailable(height);
const isCoinbase = this.tx.vin.some(v => v.is_coinbase);
const fetchAudit = auditAvailable && !isCoinbase;
return fetchAudit ? this.apiService.getBlockAudit$(hash).pipe(
map(audit => {
const isAdded = audit.addedTxs.includes(txid);
const isPrioritized = audit.prioritizedTxs.includes(txid);
const isAccelerated = audit.acceleratedTxs.includes(txid);
const isConflict = audit.fullrbfTxs.includes(txid);
const isExpected = audit.template.some(tx => tx.txid === txid);
return {
seen: isExpected || isPrioritized || isAccelerated,
expected: isExpected,
added: isAdded,
prioritized: isPrioritized,
conflict: isConflict,
accelerated: isAccelerated,
};
}),
retry({ count: 3, delay: 2000 }),
catchError(() => {
return of(null);
})
) : of(isCoinbase ? { coinbase: true } : null);
}),
catchError((e) => {
return of(null);
})
).subscribe(auditStatus => {
this.auditStatus = auditStatus; this.auditStatus = auditStatus;
this.setIsAccelerated(); this.setIsAccelerated();
@ -858,6 +865,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
this.mempoolBlocksSubscription.unsubscribe(); this.mempoolBlocksSubscription.unsubscribe();
this.blocksSubscription.unsubscribe(); this.blocksSubscription.unsubscribe();
this.miningSubscription?.unsubscribe(); this.miningSubscription?.unsubscribe();
this.auditSubscription?.unsubscribe();
this.currencyChangeSubscription?.unsubscribe(); this.currencyChangeSubscription?.unsubscribe();
this.leaveTransaction(); this.leaveTransaction();
} }