From 1479039fb5be04ce2f8b2ceac1f147aa52566324 Mon Sep 17 00:00:00 2001 From: softsimon Date: Wed, 22 Jun 2022 23:34:44 +0200 Subject: [PATCH 1/2] Batch outspends requests fixes #1902 --- .../bitcoin/bitcoin-api-abstract-factory.ts | 1 + backend/src/api/bitcoin/bitcoin-api.ts | 9 +++++++ backend/src/api/bitcoin/esplora-api.ts | 14 ++++++++-- backend/src/index.ts | 1 + backend/src/routes.ts | 24 +++++++++++++++++ .../transactions-list.component.ts | 27 ++++++++----------- frontend/src/app/services/api.service.ts | 9 +++++++ 7 files changed, 67 insertions(+), 18 deletions(-) diff --git a/backend/src/api/bitcoin/bitcoin-api-abstract-factory.ts b/backend/src/api/bitcoin/bitcoin-api-abstract-factory.ts index 71269da31..1956e5756 100644 --- a/backend/src/api/bitcoin/bitcoin-api-abstract-factory.ts +++ b/backend/src/api/bitcoin/bitcoin-api-abstract-factory.ts @@ -13,6 +13,7 @@ export interface AbstractBitcoinApi { $getAddressPrefix(prefix: string): string[]; $sendRawTransaction(rawTransaction: string): Promise; $getOutspends(txId: string): Promise; + $getBatchedOutspends(txId: string[]): Promise; } export interface BitcoinRpcCredentials { host: string; diff --git a/backend/src/api/bitcoin/bitcoin-api.ts b/backend/src/api/bitcoin/bitcoin-api.ts index 41671ede1..a30295c2f 100644 --- a/backend/src/api/bitcoin/bitcoin-api.ts +++ b/backend/src/api/bitcoin/bitcoin-api.ts @@ -141,6 +141,15 @@ class BitcoinApi implements AbstractBitcoinApi { return outSpends; } + async $getBatchedOutspends(txId: string[]): Promise { + const outspends: IEsploraApi.Outspend[][] = []; + for (const tx of txId) { + const outspend = await this.$getOutspends(tx); + outspends.push(outspend); + } + return outspends; + } + $getEstimatedHashrate(blockHeight: number): Promise { // 120 is the default block span in Core return this.bitcoindClient.getNetworkHashPs(120, blockHeight); diff --git a/backend/src/api/bitcoin/esplora-api.ts b/backend/src/api/bitcoin/esplora-api.ts index d92bba1bf..a2e9ba4f1 100644 --- a/backend/src/api/bitcoin/esplora-api.ts +++ b/backend/src/api/bitcoin/esplora-api.ts @@ -61,8 +61,18 @@ class ElectrsApi implements AbstractBitcoinApi { throw new Error('Method not implemented.'); } - $getOutspends(): Promise { - throw new Error('Method not implemented.'); + $getOutspends(txId: string): Promise { + return axios.get(config.ESPLORA.REST_API_URL + '/tx/' + txId, this.axiosConfig) + .then((response) => response.data); + } + + async $getBatchedOutspends(txId: string[]): Promise { + const outspends: IEsploraApi.Outspend[][] = []; + for (const tx of txId) { + const outspend = await this.$getOutspends(tx); + outspends.push(outspend); + } + return outspends; } } diff --git a/backend/src/index.ts b/backend/src/index.ts index 6bd8de841..2d1438842 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -195,6 +195,7 @@ class Server { setUpHttpApiRoutes() { this.app .get(config.MEMPOOL.API_URL_PREFIX + 'transaction-times', routes.getTransactionTimes) + .get(config.MEMPOOL.API_URL_PREFIX + 'outspends', routes.$getBatchedOutspends) .get(config.MEMPOOL.API_URL_PREFIX + 'cpfp/:txId', routes.getCpfpInfo) .get(config.MEMPOOL.API_URL_PREFIX + 'difficulty-adjustment', routes.getDifficultyChange) .get(config.MEMPOOL.API_URL_PREFIX + 'fees/recommended', routes.getRecommendedFees) diff --git a/backend/src/routes.ts b/backend/src/routes.ts index e63549d09..b86187e4c 100644 --- a/backend/src/routes.ts +++ b/backend/src/routes.ts @@ -120,6 +120,30 @@ class Routes { res.json(times); } + public async $getBatchedOutspends(req: Request, res: Response) { + if (!Array.isArray(req.query.txId)) { + res.status(500).send('Not an array'); + return; + } + if (req.query.txId.length > 50) { + res.status(400).send('Too many txids requested'); + return; + } + const txIds: string[] = []; + for (const _txId in req.query.txId) { + if (typeof req.query.txId[_txId] === 'string') { + txIds.push(req.query.txId[_txId].toString()); + } + } + + try { + const batchedOutspends = await bitcoinApi.$getBatchedOutspends(txIds); + res.json(batchedOutspends); + } catch (e) { + res.status(500).send(e instanceof Error ? e.message : e); + } + } + public getCpfpInfo(req: Request, res: Response) { if (!/^[a-fA-F0-9]{64}$/.test(req.params.txId)) { res.status(501).send(`Invalid transaction ID.`); diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.ts b/frontend/src/app/components/transactions-list/transactions-list.component.ts index ba8ba60ba..d5ec36151 100644 --- a/frontend/src/app/components/transactions-list/transactions-list.component.ts +++ b/frontend/src/app/components/transactions-list/transactions-list.component.ts @@ -5,8 +5,9 @@ import { Outspend, Transaction, Vin, Vout } from '../../interfaces/electrs.inter import { ElectrsApiService } from '../../services/electrs-api.service'; import { environment } from 'src/environments/environment'; import { AssetsService } from 'src/app/services/assets.service'; -import { map, switchMap } from 'rxjs/operators'; +import { map, tap, switchMap } from 'rxjs/operators'; import { BlockExtended } from 'src/app/interfaces/node-api.interface'; +import { ApiService } from 'src/app/services/api.service'; @Component({ selector: 'app-transactions-list', @@ -30,7 +31,7 @@ export class TransactionsListComponent implements OnInit, OnChanges { latestBlock$: Observable; outspendsSubscription: Subscription; - refreshOutspends$: ReplaySubject<{ [str: string]: Observable}> = new ReplaySubject(); + refreshOutspends$: ReplaySubject = new ReplaySubject(); showDetails$ = new BehaviorSubject(false); outspends: Outspend[][] = []; assetsMinimal: any; @@ -38,6 +39,7 @@ export class TransactionsListComponent implements OnInit, OnChanges { constructor( public stateService: StateService, private electrsApiService: ElectrsApiService, + private apiService: ApiService, private assetsService: AssetsService, private ref: ChangeDetectorRef, ) { } @@ -55,20 +57,14 @@ export class TransactionsListComponent implements OnInit, OnChanges { this.outspendsSubscription = merge( this.refreshOutspends$ .pipe( - switchMap((observableObject) => forkJoin(observableObject)), - map((outspends: any) => { - const newOutspends: Outspend[] = []; - for (const i in outspends) { - if (outspends.hasOwnProperty(i)) { - newOutspends.push(outspends[i]); - } - } - this.outspends = this.outspends.concat(newOutspends); + switchMap((txIds) => this.apiService.getOutspendsBatched$(txIds)), + tap((outspends: Outspend[][]) => { + this.outspends = this.outspends.concat(outspends); }), ), this.stateService.utxoSpent$ .pipe( - map((utxoSpent) => { + tap((utxoSpent) => { for (const i in utxoSpent) { this.outspends[0][i] = { spent: true, @@ -96,7 +92,7 @@ export class TransactionsListComponent implements OnInit, OnChanges { } }, 10); } - const observableObject = {}; + this.transactions.forEach((tx, i) => { tx['@voutLimit'] = true; tx['@vinLimit'] = true; @@ -117,10 +113,9 @@ export class TransactionsListComponent implements OnInit, OnChanges { tx['addressValue'] = addressIn - addressOut; } - - observableObject[i] = this.electrsApiService.getOutspends$(tx.txid); }); - this.refreshOutspends$.next(observableObject); + + this.refreshOutspends$.next(this.transactions.map((tx) => tx.txid)); } onScroll() { diff --git a/frontend/src/app/services/api.service.ts b/frontend/src/app/services/api.service.ts index 42c942dad..bd32685fd 100644 --- a/frontend/src/app/services/api.service.ts +++ b/frontend/src/app/services/api.service.ts @@ -5,6 +5,7 @@ import { CpfpInfo, OptimizedMempoolStats, AddressInformation, LiquidPegs, ITrans import { Observable } from 'rxjs'; import { StateService } from './state.service'; import { WebsocketResponse } from '../interfaces/websocket.interface'; +import { Outspend } from '../interfaces/electrs.interface'; @Injectable({ providedIn: 'root' @@ -74,6 +75,14 @@ export class ApiService { return this.httpClient.get(this.apiBaseUrl + this.apiBasePath + '/api/v1/transaction-times', { params }); } + getOutspendsBatched$(txIds: string[]): Observable { + let params = new HttpParams(); + txIds.forEach((txId: string) => { + params = params.append('txId[]', txId); + }); + return this.httpClient.get(this.apiBaseUrl + this.apiBasePath + '/api/v1/outspends', { params }); + } + requestDonation$(amount: number, orderId: string): Observable { const params = { amount: amount, From 960513c370b96d465118a9e35b1e89ae724b29ab Mon Sep 17 00:00:00 2001 From: softsimon Date: Thu, 23 Jun 2022 11:55:56 +0200 Subject: [PATCH 2/2] Fix for outspends when using esplora --- backend/src/api/bitcoin/esplora-api.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/api/bitcoin/esplora-api.ts b/backend/src/api/bitcoin/esplora-api.ts index a2e9ba4f1..f882180b1 100644 --- a/backend/src/api/bitcoin/esplora-api.ts +++ b/backend/src/api/bitcoin/esplora-api.ts @@ -62,7 +62,7 @@ class ElectrsApi implements AbstractBitcoinApi { } $getOutspends(txId: string): Promise { - return axios.get(config.ESPLORA.REST_API_URL + '/tx/' + txId, this.axiosConfig) + return axios.get(config.ESPLORA.REST_API_URL + '/tx/' + txId + '/outspends', this.axiosConfig) .then((response) => response.data); }