mirrors/mempool
1
0
Fork 0
mirror of https://github.com/mempool/mempool.git synced 2025-01-18 21:32:55 +01:00
Code Issues Projects Releases Wiki Activity

Parse TXID, hash or address strings from search bar and allow searching for TXID:OUTPUT. (#578)

Browse Source 
fixes #450
fixes #415
This commit is contained in:
softsimon 2021-07-06 19:43:18 +03:00 committed by GitHub
parent 1e9f131a2a
commit 2e2e6aa01f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
frontend/src/app/components/search-form/search-form.component.ts
View File

@ -23,9 +23,9 @@ export class SearchFormComponent implements OnInit {
searchForm: FormGroup;
@Output() searchTriggered = new EventEmitter();
regexAddress = /^([a-km-zA-HJ-NP-Z1-9]{26,35}|[a-km-zA-HJ-NP-Z1-9]{80}|[bB]?[a-z]{2,5}1[ac-hj-np-z02-9]{8,87})$/;
regexBlockhash = /^[0]{8}[a-fA-F0-9]{56}$/;
regexTransaction = /^[a-fA-F0-9]{64}$/;
regexAddress = /([a-km-zA-HJ-NP-Z1-9]{26,35}|[a-km-zA-HJ-NP-Z1-9]{80}|[bB]?[a-z]{2,5}1[ac-hj-np-z02-9]{8,87})/;
regexBlockhash = /[0]{8}[a-fA-F0-9]{56}/;
regexTransaction = /([a-fA-F0-9]{64}):?(\d+)?/;
regexBlockheight = /^[0-9]+$/;
@ViewChild('instance', {static: true}) instance: NgbTypeahead;
@ -96,21 +96,26 @@ export class SearchFormComponent implements OnInit {
if (searchText) {
this.isSearching = true;
if (this.regexAddress.test(searchText)) {
this.navigate('/address/', searchText);
} else if (this.regexBlockhash.test(searchText) || this.regexBlockheight.test(searchText)) {
const matches = this.regexAddress.exec(searchText);
this.navigate('/address/', matches[0]);
} else if (this.regexBlockhash.test(searchText)) {
const matches = this.regexBlockhash.exec(searchText);
this.navigate('/block/', matches[0]);
} else if (this.regexBlockheight.test(searchText)) {
this.navigate('/block/', searchText);
} else if (this.regexTransaction.test(searchText)) {
const matches = this.regexTransaction.exec(searchText);
if (this.network === 'liquid') {
if (this.assets[searchText]) {
this.navigate('/asset/', searchText);
if (this.assets[matches[0]]) {
this.navigate('/asset/', matches[0]);
}
this.electrsApiService.getAsset$(searchText)
this.electrsApiService.getAsset$(matches[0])
.subscribe(
() => { this.navigate('/asset/', searchText); },
() => { this.navigate('/tx/', searchText); }
() => { this.navigate('/asset/', matches[0]); },
() => { this.navigate('/tx/', matches[0]); }
);
} else {
this.navigate('/tx/', searchText);
this.navigate('/tx/', matches[0]);
}
} else {
this.isSearching = false;

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

@ -198,7 +198,7 @@
<div class="clearfix"></div>
<app-transactions-list #txList [transactions]="[tx]" [transactionPage]="true"></app-transactions-list>
<app-transactions-list #txList [transactions]="[tx]" [outputIndex]="outputIndex" [transactionPage]="true"></app-transactions-list>
<h2 class="text-left" i18n="transaction.details">Details</h2>
<div class="box">

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

@ -20,6 +20,7 @@ export class TransactionComponent implements OnInit, OnDestroy {
network = '';
tx: Transaction;
txId: string;
outputIndex: number;
txInBlockIndex: number;
isLoadingTx = true;
error: any = undefined;
@ -75,9 +76,11 @@ export class TransactionComponent implements OnInit, OnDestroy {
this.subscription = this.route.paramMap.pipe(
switchMap((params: ParamMap) => {
this.txId = params.get('id') || '';
this.seoService.setTitle($localize`:@@bisq.transaction.browser-title:Transaction: ${this.txId}:INTERPOLATION:`);
this.resetTransaction();
const urlMatch = (params.get('id') || '').split(':');
this.txId = urlMatch[0];
this.outputIndex = urlMatch[1] === undefined ? null : parseInt(urlMatch[1], 10);
this.seoService.setTitle($localize`:@@bisq.transaction.browser-title:Transaction: ${this.txId}:INTERPOLATION:`);
return merge(
of(true),
this.stateService.connectionState$.pipe(
@ -202,6 +205,7 @@ export class TransactionComponent implements OnInit, OnDestroy {
resetTransaction() {
this.error = undefined;
this.tx = null;
this.outputIndex = null;
this.waitingForTransaction = false;
this.isLoadingTx = true;
this.rbfTransaction = undefined;

2
frontend/src/app/components/transactions-list/transactions-list.component.html
View File

@ -117,7 +117,7 @@
<table class="table table-borderless smaller-text table-xs" style="margin: 0;">
<tbody>
<ng-template ngFor let-vout let-vindex="index" [ngForOf]="tx['@voutLimit'] ? tx.vout.slice(0, 10) : tx.vout" [ngForTrackBy]="trackByIndexFn">
<tr>
<tr [ngClass]="{'highlightIndex': outputIndex === vindex}">
<td>
<a *ngIf="vout.scriptpubkey_address; else scriptpubkey_type" [routerLink]="['/address/' | relativeUrl, vout.scriptpubkey_address]" title="{{ vout.scriptpubkey_address }}">
<span class="d-block d-lg-none">{{ vout.scriptpubkey_address | shortenString : 16 }}</span>

1
frontend/src/app/components/transactions-list/transactions-list.component.ts
View File

@ -19,6 +19,7 @@ export class TransactionsListComponent implements OnInit, OnChanges {
displayDetails = false;
@Input() transactions: Transaction[];
@Input() outputIndex: number;
@Input() showConfirmations = false;
@Input() transactionPage = false;