From c7cb7d1ac4e17c3902fdda350e08038595df7890 Mon Sep 17 00:00:00 2001 From: Mononaut Date: Sat, 23 Mar 2024 11:27:28 +0000 Subject: [PATCH 01/62] Add testmempoolaccept API endpoint --- .../bitcoin/bitcoin-api-abstract-factory.ts | 3 ++- .../src/api/bitcoin/bitcoin-api.interface.ts | 13 +++++++++++ backend/src/api/bitcoin/bitcoin-api.ts | 10 +++++++- backend/src/api/bitcoin/bitcoin.routes.ts | 14 +++++++++++ backend/src/api/bitcoin/esplora-api.ts | 5 ++++ backend/src/api/common.ts | 23 +++++++++++++++++++ .../src/app/interfaces/node-api.interface.ts | 13 +++++++++++ frontend/src/app/services/api.service.ts | 8 +++++-- 8 files changed, 85 insertions(+), 4 deletions(-) diff --git a/backend/src/api/bitcoin/bitcoin-api-abstract-factory.ts b/backend/src/api/bitcoin/bitcoin-api-abstract-factory.ts index cc0c801b5..4ec50f4b3 100644 --- a/backend/src/api/bitcoin/bitcoin-api-abstract-factory.ts +++ b/backend/src/api/bitcoin/bitcoin-api-abstract-factory.ts @@ -1,4 +1,4 @@ -import { IBitcoinApi } from './bitcoin-api.interface'; +import { IBitcoinApi, TestMempoolAcceptResult } from './bitcoin-api.interface'; import { IEsploraApi } from './esplora-api.interface'; export interface AbstractBitcoinApi { @@ -22,6 +22,7 @@ export interface AbstractBitcoinApi { $getScriptHash(scripthash: string): Promise; $getScriptHashTransactions(address: string, lastSeenTxId: string): Promise; $sendRawTransaction(rawTransaction: string): Promise; + $testMempoolAccept(rawTransactions: string[], maxfeerate?: number): Promise; $getOutspend(txId: string, vout: number): Promise; $getOutspends(txId: string): Promise; $getBatchedOutspends(txId: string[]): Promise; diff --git a/backend/src/api/bitcoin/bitcoin-api.interface.ts b/backend/src/api/bitcoin/bitcoin-api.interface.ts index e176566d7..6e8583f6f 100644 --- a/backend/src/api/bitcoin/bitcoin-api.interface.ts +++ b/backend/src/api/bitcoin/bitcoin-api.interface.ts @@ -205,3 +205,16 @@ export namespace IBitcoinApi { "utxo_size_inc": number; } } + +export interface TestMempoolAcceptResult { + txid: string, + wtxid: string, + allowed?: boolean, + vsize?: number, + fees?: { + base: number, + "effective-feerate": number, + "effective-includes": string[], + }, + ['reject-reason']?: string, +} diff --git a/backend/src/api/bitcoin/bitcoin-api.ts b/backend/src/api/bitcoin/bitcoin-api.ts index d19eb06ac..c3304b432 100644 --- a/backend/src/api/bitcoin/bitcoin-api.ts +++ b/backend/src/api/bitcoin/bitcoin-api.ts @@ -1,6 +1,6 @@ import * as bitcoinjs from 'bitcoinjs-lib'; import { AbstractBitcoinApi, HealthCheckHost } from './bitcoin-api-abstract-factory'; -import { IBitcoinApi } from './bitcoin-api.interface'; +import { IBitcoinApi, TestMempoolAcceptResult } from './bitcoin-api.interface'; import { IEsploraApi } from './esplora-api.interface'; import blocks from '../blocks'; import mempool from '../mempool'; @@ -174,6 +174,14 @@ class BitcoinApi implements AbstractBitcoinApi { return this.bitcoindClient.sendRawTransaction(rawTransaction); } + async $testMempoolAccept(rawTransactions: string[], maxfeerate?: number): Promise { + if (rawTransactions.length) { + return this.bitcoindClient.testMempoolAccept(rawTransactions, maxfeerate ?? undefined); + } else { + return []; + } + } + async $getOutspend(txId: string, vout: number): Promise { const txOut = await this.bitcoindClient.getTxOut(txId, vout, false); return { diff --git a/backend/src/api/bitcoin/bitcoin.routes.ts b/backend/src/api/bitcoin/bitcoin.routes.ts index a82cda3f0..ab5b0a73a 100644 --- a/backend/src/api/bitcoin/bitcoin.routes.ts +++ b/backend/src/api/bitcoin/bitcoin.routes.ts @@ -55,6 +55,7 @@ class BitcoinRoutes { .get(config.MEMPOOL.API_URL_PREFIX + 'mempool/recent', this.getRecentMempoolTransactions) .get(config.MEMPOOL.API_URL_PREFIX + 'tx/:txId', this.getTransaction) .post(config.MEMPOOL.API_URL_PREFIX + 'tx', this.$postTransaction) + .post(config.MEMPOOL.API_URL_PREFIX + 'txs/test', this.$testTransactions) .get(config.MEMPOOL.API_URL_PREFIX + 'tx/:txId/hex', this.getRawTransaction) .get(config.MEMPOOL.API_URL_PREFIX + 'tx/:txId/status', this.getTransactionStatus) .get(config.MEMPOOL.API_URL_PREFIX + 'tx/:txId/outspends', this.getTransactionOutspends) @@ -749,6 +750,19 @@ class BitcoinRoutes { } } + private async $testTransactions(req: Request, res: Response) { + res.setHeader('content-type', 'text/plain'); + try { + const rawTxs = Common.getTransactionsFromRequest(req); + const maxfeerate = parseFloat(req.query.maxfeerate as string); + const result = await bitcoinApi.$testMempoolAccept(rawTxs, maxfeerate); + res.send(result); + } catch (e: any) { + res.status(400).send(e.message && e.code ? 'testmempoolaccept RPC error: ' + JSON.stringify({ code: e.code, message: e.message }) + : (e.message || 'Error')); + } + } + } export default new BitcoinRoutes(); diff --git a/backend/src/api/bitcoin/esplora-api.ts b/backend/src/api/bitcoin/esplora-api.ts index a9dadf4a0..90e50d4c2 100644 --- a/backend/src/api/bitcoin/esplora-api.ts +++ b/backend/src/api/bitcoin/esplora-api.ts @@ -5,6 +5,7 @@ import { AbstractBitcoinApi, HealthCheckHost } from './bitcoin-api-abstract-fact import { IEsploraApi } from './esplora-api.interface'; import logger from '../../logger'; import { Common } from '../common'; +import { TestMempoolAcceptResult } from './bitcoin-api.interface'; interface FailoverHost { host: string, @@ -327,6 +328,10 @@ class ElectrsApi implements AbstractBitcoinApi { throw new Error('Method not implemented.'); } + $testMempoolAccept(rawTransactions: string[], maxfeerate?: number): Promise { + throw new Error('Method not implemented.'); + } + $getOutspend(txId: string, vout: number): Promise { return this.failoverRouter.$get('/tx/' + txId + '/outspend/' + vout); } diff --git a/backend/src/api/common.ts b/backend/src/api/common.ts index 92dfceb52..ddbe98ec5 100644 --- a/backend/src/api/common.ts +++ b/backend/src/api/common.ts @@ -946,6 +946,29 @@ export class Common { return this.validateTransactionHex(matches[1].toLowerCase()); } + static getTransactionsFromRequest(req: Request): string[] { + if (typeof req.body !== 'string') { + throw Object.assign(new Error('Non-string request body'), { code: -1 }); + } + + const txs = req.body.split(','); + + return txs.map(rawTx => { + // Support both upper and lower case hex + // Support both txHash= Form and direct API POST + const reg = /^((?:[a-fA-F0-9]{2})+)$/; + const matches = reg.exec(rawTx); + if (!matches || !matches[1]) { + throw Object.assign(new Error('Invalid hex string'), { code: -2 }); + } + + // Guaranteed to be a hex string of multiple of 2 + // Guaranteed to be lower case + // Guaranteed to pass validation (see function below) + return this.validateTransactionHex(matches[1].toLowerCase()); + }); + } + private static validateTransactionHex(txhex: string): string { // Do not mutate txhex diff --git a/frontend/src/app/interfaces/node-api.interface.ts b/frontend/src/app/interfaces/node-api.interface.ts index 343d43a2e..ed7f5d9d4 100644 --- a/frontend/src/app/interfaces/node-api.interface.ts +++ b/frontend/src/app/interfaces/node-api.interface.ts @@ -423,4 +423,17 @@ export interface AccelerationInfo { effective_fee: number, boost_rate: number, boost_cost: number, +} + +export interface TestMempoolAcceptResult { + txid: string, + wtxid: string, + allowed?: boolean, + vsize?: number, + fees?: { + base: number, + "effective-feerate": number, + "effective-includes": string[], + }, + ['reject-reason']?: string, } \ No newline at end of file diff --git a/frontend/src/app/services/api.service.ts b/frontend/src/app/services/api.service.ts index 145a8705e..f5e59d0c9 100644 --- a/frontend/src/app/services/api.service.ts +++ b/frontend/src/app/services/api.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { HttpClient, HttpParams, HttpResponse } from '@angular/common/http'; -import { CpfpInfo, OptimizedMempoolStats, AddressInformation, LiquidPegs, ITranslators, - PoolStat, BlockExtended, TransactionStripped, RewardStats, AuditScore, BlockSizesAndWeights, RbfTree, BlockAudit, Acceleration, AccelerationHistoryParams, CurrentPegs, AuditStatus, FederationAddress, FederationUtxo, RecentPeg, PegsVolume, AccelerationInfo } from '../interfaces/node-api.interface'; +import { CpfpInfo, OptimizedMempoolStats, AddressInformation, LiquidPegs, ITranslators, PoolStat, BlockExtended, TransactionStripped, RewardStats, AuditScore, BlockSizesAndWeights, + RbfTree, BlockAudit, CurrentPegs, AuditStatus, FederationAddress, FederationUtxo, RecentPeg, PegsVolume, AccelerationInfo, TestMempoolAcceptResult } from '../interfaces/node-api.interface'; import { BehaviorSubject, Observable, catchError, filter, map, of, shareReplay, take, tap } from 'rxjs'; import { StateService } from './state.service'; import { Transaction } from '../interfaces/electrs.interface'; @@ -238,6 +238,10 @@ export class ApiService { return this.httpClient.post(this.apiBaseUrl + this.apiBasePath + '/api/tx', hexPayload, { responseType: 'text' as 'json'}); } + testTransactions$(hexPayload: string): Observable { + return this.httpClient.post(this.apiBaseUrl + this.apiBasePath + '/api/txs/test', hexPayload, { responseType: 'text' as 'json'}); + } + getTransactionStatus$(txid: string): Observable { return this.httpClient.get(this.apiBaseUrl + this.apiBasePath + '/api/tx/' + txid + '/status'); } From f3232b2d5c9d6b5ccf48fdd24295f85a6fe43d9f Mon Sep 17 00:00:00 2001 From: Mononaut Date: Sun, 24 Mar 2024 09:02:19 +0000 Subject: [PATCH 02/62] Add Test Transactions page --- .../test-transactions.component.html | 53 ++++++++++++++ .../test-transactions.component.scss | 33 +++++++++ .../test-transactions.component.ts | 71 +++++++++++++++++++ frontend/src/app/master-page.module.ts | 5 ++ frontend/src/app/services/api.service.ts | 4 +- frontend/src/app/shared/shared.module.ts | 3 + 6 files changed, 167 insertions(+), 2 deletions(-) create mode 100644 frontend/src/app/components/test-transactions/test-transactions.component.html create mode 100644 frontend/src/app/components/test-transactions/test-transactions.component.scss create mode 100644 frontend/src/app/components/test-transactions/test-transactions.component.ts diff --git a/frontend/src/app/components/test-transactions/test-transactions.component.html b/frontend/src/app/components/test-transactions/test-transactions.component.html new file mode 100644 index 000000000..7f15da2f2 --- /dev/null +++ b/frontend/src/app/components/test-transactions/test-transactions.component.html @@ -0,0 +1,53 @@ +
+

Test Transactions

+ +
+ +
+ +
+ + +
+ +

{{ error }}

+
+ +
+ +
+ + + + + + + + + + + + + + + + + +
Allowed?TXIDEffective fee rateRejection reason
+ + ✅ + ❌ + - + + + + + + - + + {{ result['reject-reason'] || '-' }} +
+
+ +
\ No newline at end of file diff --git a/frontend/src/app/components/test-transactions/test-transactions.component.scss b/frontend/src/app/components/test-transactions/test-transactions.component.scss new file mode 100644 index 000000000..399575b8e --- /dev/null +++ b/frontend/src/app/components/test-transactions/test-transactions.component.scss @@ -0,0 +1,33 @@ +.accept-results { + td, th { + &.allowed { + width: 10%; + } + &.txid { + width: 50%; + } + &.rate { + width: 20%; + text-align: right; + white-space: wrap; + } + &.reason { + width: 20%; + text-align: right; + white-space: wrap; + } + } + + @media (max-width: 950px) { + table-layout: auto; + + td, th { + &.allowed { + width: 100px; + } + &.txid { + max-width: 200px; + } + } + } +} \ No newline at end of file diff --git a/frontend/src/app/components/test-transactions/test-transactions.component.ts b/frontend/src/app/components/test-transactions/test-transactions.component.ts new file mode 100644 index 000000000..c959cb2b0 --- /dev/null +++ b/frontend/src/app/components/test-transactions/test-transactions.component.ts @@ -0,0 +1,71 @@ +import { Component, OnInit } from '@angular/core'; +import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; +import { ApiService } from '../../services/api.service'; +import { StateService } from '../../services/state.service'; +import { SeoService } from '../../services/seo.service'; +import { OpenGraphService } from '../../services/opengraph.service'; +import { TestMempoolAcceptResult } from '../../interfaces/node-api.interface'; + +@Component({ + selector: 'app-test-transactions', + templateUrl: './test-transactions.component.html', + styleUrls: ['./test-transactions.component.scss'] +}) +export class TestTransactionsComponent implements OnInit { + testTxsForm: UntypedFormGroup; + error: string = ''; + results: TestMempoolAcceptResult[] = []; + isLoading = false; + invalidMaxfeerate = false; + + constructor( + private formBuilder: UntypedFormBuilder, + private apiService: ApiService, + public stateService: StateService, + private seoService: SeoService, + private ogService: OpenGraphService, + ) { } + + ngOnInit(): void { + this.testTxsForm = this.formBuilder.group({ + txs: ['', Validators.required], + maxfeerate: ['', Validators.min(0)] + }); + + this.seoService.setTitle($localize`:@@meta.title.test-txs:Test Transactions`); + this.ogService.setManualOgImage('tx-push.jpg'); + } + + testTxs() { + let maxfeerate; + this.invalidMaxfeerate = false; + try { + const maxfeerateVal = this.testTxsForm.get('maxfeerate')?.value; + if (maxfeerateVal != null && maxfeerateVal !== '') { + maxfeerate = parseFloat(maxfeerateVal) / 100_000; + } + } catch (e) { + this.invalidMaxfeerate = true; + } + + this.isLoading = true; + this.error = ''; + this.results = []; + this.apiService.testTransactions$((this.testTxsForm.get('txs')?.value as string).split(',').map(hex => hex.trim()).join(','), maxfeerate === 0.1 ? null : maxfeerate) + .subscribe((result) => { + this.isLoading = false; + this.results = result || []; + this.testTxsForm.reset(); + }, + (error) => { + if (typeof error.error === 'string') { + const matchText = error.error.match('"message":"(.*?)"'); + this.error = matchText && matchText[1] || error.error; + } else if (error.message) { + this.error = error.message; + } + this.isLoading = false; + }); + } + +} diff --git a/frontend/src/app/master-page.module.ts b/frontend/src/app/master-page.module.ts index 018809d59..2d3c34a56 100644 --- a/frontend/src/app/master-page.module.ts +++ b/frontend/src/app/master-page.module.ts @@ -6,6 +6,7 @@ import { SharedModule } from './shared/shared.module'; import { StartComponent } from './components/start/start.component'; import { PushTransactionComponent } from './components/push-transaction/push-transaction.component'; +import { TestTransactionsComponent } from './components/test-transactions/test-transactions.component'; import { CalculatorComponent } from './components/calculator/calculator.component'; import { BlocksList } from './components/blocks-list/blocks-list.component'; import { RbfList } from './components/rbf-list/rbf-list.component'; @@ -30,6 +31,10 @@ const routes: Routes = [ path: 'tx/push', component: PushTransactionComponent, }, + { + path: 'tx/test', + component: TestTransactionsComponent, + }, { path: 'about', loadChildren: () => import('./components/about/about.module').then(m => m.AboutModule), diff --git a/frontend/src/app/services/api.service.ts b/frontend/src/app/services/api.service.ts index f5e59d0c9..e41f8eb9e 100644 --- a/frontend/src/app/services/api.service.ts +++ b/frontend/src/app/services/api.service.ts @@ -238,8 +238,8 @@ export class ApiService { return this.httpClient.post(this.apiBaseUrl + this.apiBasePath + '/api/tx', hexPayload, { responseType: 'text' as 'json'}); } - testTransactions$(hexPayload: string): Observable { - return this.httpClient.post(this.apiBaseUrl + this.apiBasePath + '/api/txs/test', hexPayload, { responseType: 'text' as 'json'}); + testTransactions$(hexPayload: string, maxfeerate?: number): Observable { + return this.httpClient.post(this.apiBaseUrl + this.apiBasePath + `/api/txs/test${maxfeerate != null ? '?maxfeerate=' + maxfeerate.toFixed(8) : ''}`, hexPayload); } getTransactionStatus$(txid: string): Observable { diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts index 50268029b..d018dd1e8 100644 --- a/frontend/src/app/shared/shared.module.ts +++ b/frontend/src/app/shared/shared.module.ts @@ -68,6 +68,7 @@ import { DifficultyMiningComponent } from '../components/difficulty-mining/diffi import { RbfTimelineComponent } from '../components/rbf-timeline/rbf-timeline.component'; import { RbfTimelineTooltipComponent } from '../components/rbf-timeline/rbf-timeline-tooltip.component'; import { PushTransactionComponent } from '../components/push-transaction/push-transaction.component'; +import { TestTransactionsComponent } from '../components/test-transactions/test-transactions.component'; import { AssetsFeaturedComponent } from '../components/assets/assets-featured/assets-featured.component'; import { AssetGroupComponent } from '../components/assets/asset-group/asset-group.component'; import { AssetCirculationComponent } from '../components/asset-circulation/asset-circulation.component'; @@ -176,6 +177,7 @@ import { OnlyVsizeDirective, OnlyWeightDirective } from './components/weight-dir RbfTimelineComponent, RbfTimelineTooltipComponent, PushTransactionComponent, + TestTransactionsComponent, AssetsNavComponent, AssetsFeaturedComponent, AssetGroupComponent, @@ -312,6 +314,7 @@ import { OnlyVsizeDirective, OnlyWeightDirective } from './components/weight-dir RbfTimelineComponent, RbfTimelineTooltipComponent, PushTransactionComponent, + TestTransactionsComponent, AssetsNavComponent, AssetsFeaturedComponent, AssetGroupComponent, From 2a4325580248cc252652b074baf085b89dc5ea41 Mon Sep 17 00:00:00 2001 From: Mononaut Date: Mon, 25 Mar 2024 05:52:03 +0000 Subject: [PATCH 03/62] testmempool accept more validation & switch to JSON array format --- backend/src/api/bitcoin/bitcoin.routes.ts | 2 +- backend/src/api/common.ts | 12 ++++++++---- backend/src/index.ts | 1 + .../test-transactions.component.scss | 1 + .../test-transactions.component.ts | 17 ++++++++++++++++- frontend/src/app/services/api.service.ts | 4 ++-- 6 files changed, 29 insertions(+), 8 deletions(-) diff --git a/backend/src/api/bitcoin/bitcoin.routes.ts b/backend/src/api/bitcoin/bitcoin.routes.ts index ab5b0a73a..ec63f4ff8 100644 --- a/backend/src/api/bitcoin/bitcoin.routes.ts +++ b/backend/src/api/bitcoin/bitcoin.routes.ts @@ -751,13 +751,13 @@ class BitcoinRoutes { } private async $testTransactions(req: Request, res: Response) { - res.setHeader('content-type', 'text/plain'); try { const rawTxs = Common.getTransactionsFromRequest(req); const maxfeerate = parseFloat(req.query.maxfeerate as string); const result = await bitcoinApi.$testMempoolAccept(rawTxs, maxfeerate); res.send(result); } catch (e: any) { + res.setHeader('content-type', 'text/plain'); res.status(400).send(e.message && e.code ? 'testmempoolaccept RPC error: ' + JSON.stringify({ code: e.code, message: e.message }) : (e.message || 'Error')); } diff --git a/backend/src/api/common.ts b/backend/src/api/common.ts index ddbe98ec5..2c9338814 100644 --- a/backend/src/api/common.ts +++ b/backend/src/api/common.ts @@ -946,12 +946,16 @@ export class Common { return this.validateTransactionHex(matches[1].toLowerCase()); } - static getTransactionsFromRequest(req: Request): string[] { - if (typeof req.body !== 'string') { - throw Object.assign(new Error('Non-string request body'), { code: -1 }); + static getTransactionsFromRequest(req: Request, limit: number = 25): string[] { + if (!Array.isArray(req.body) || req.body.some(hex => typeof hex !== 'string')) { + throw Object.assign(new Error('Invalid request body (should be an array of hexadecimal strings)'), { code: -1 }); } - const txs = req.body.split(','); + if (limit && req.body.length > limit) { + throw Object.assign(new Error('Exceeded maximum of 25 transactions'), { code: -1 }); + } + + const txs = req.body; return txs.map(rawTx => { // Support both upper and lower case hex diff --git a/backend/src/index.ts b/backend/src/index.ts index b088155ea..df9f7dc65 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -131,6 +131,7 @@ class Server { }) .use(express.urlencoded({ extended: true })) .use(express.text({ type: ['text/plain', 'application/base64'] })) + .use(express.json()) ; if (config.DATABASE.ENABLED && config.FIAT_PRICE.ENABLED) { diff --git a/frontend/src/app/components/test-transactions/test-transactions.component.scss b/frontend/src/app/components/test-transactions/test-transactions.component.scss index 399575b8e..ffdd5811b 100644 --- a/frontend/src/app/components/test-transactions/test-transactions.component.scss +++ b/frontend/src/app/components/test-transactions/test-transactions.component.scss @@ -2,6 +2,7 @@ td, th { &.allowed { width: 10%; + text-align: center; } &.txid { width: 50%; diff --git a/frontend/src/app/components/test-transactions/test-transactions.component.ts b/frontend/src/app/components/test-transactions/test-transactions.component.ts index c959cb2b0..7291dae20 100644 --- a/frontend/src/app/components/test-transactions/test-transactions.component.ts +++ b/frontend/src/app/components/test-transactions/test-transactions.component.ts @@ -37,6 +37,21 @@ export class TestTransactionsComponent implements OnInit { } testTxs() { + let txs: string[] = []; + try { + txs = (this.testTxsForm.get('txs')?.value as string).split(',').map(hex => hex.trim()); + if (!txs?.length) { + this.error = 'At least one transaction is required'; + return; + } else if (txs.length > 25) { + this.error = 'Exceeded maximum of 25 transactions'; + return; + } + } catch (e) { + this.error = e?.message; + return; + } + let maxfeerate; this.invalidMaxfeerate = false; try { @@ -51,7 +66,7 @@ export class TestTransactionsComponent implements OnInit { this.isLoading = true; this.error = ''; this.results = []; - this.apiService.testTransactions$((this.testTxsForm.get('txs')?.value as string).split(',').map(hex => hex.trim()).join(','), maxfeerate === 0.1 ? null : maxfeerate) + this.apiService.testTransactions$(txs, maxfeerate === 0.1 ? null : maxfeerate) .subscribe((result) => { this.isLoading = false; this.results = result || []; diff --git a/frontend/src/app/services/api.service.ts b/frontend/src/app/services/api.service.ts index e41f8eb9e..0531916a0 100644 --- a/frontend/src/app/services/api.service.ts +++ b/frontend/src/app/services/api.service.ts @@ -238,8 +238,8 @@ export class ApiService { return this.httpClient.post(this.apiBaseUrl + this.apiBasePath + '/api/tx', hexPayload, { responseType: 'text' as 'json'}); } - testTransactions$(hexPayload: string, maxfeerate?: number): Observable { - return this.httpClient.post(this.apiBaseUrl + this.apiBasePath + `/api/txs/test${maxfeerate != null ? '?maxfeerate=' + maxfeerate.toFixed(8) : ''}`, hexPayload); + testTransactions$(rawTxs: string[], maxfeerate?: number): Observable { + return this.httpClient.post(this.apiBaseUrl + this.apiBasePath + `/api/txs/test${maxfeerate != null ? '?maxfeerate=' + maxfeerate.toFixed(8) : ''}`, rawTxs); } getTransactionStatus$(txid: string): Observable { From f9498cf5a2e8589b23499cc195f872fe4441801e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 02:06:21 +0000 Subject: [PATCH 04/62] Bump nginx from 1.25.4-alpine to 1.26.0-alpine in /docker/frontend Bumps nginx from 1.25.4-alpine to 1.26.0-alpine. --- updated-dependencies: - dependency-name: nginx dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- docker/frontend/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile index 3a63107bf..bee617595 100644 --- a/docker/frontend/Dockerfile +++ b/docker/frontend/Dockerfile @@ -13,7 +13,7 @@ RUN npm install --omit=dev --omit=optional RUN npm run build -FROM nginx:1.25.4-alpine +FROM nginx:1.26.0-alpine WORKDIR /patch From 57b466d80ff42725ca84b8751d16e487a1af9443 Mon Sep 17 00:00:00 2001 From: natsoni Date: Mon, 29 Apr 2024 11:54:28 +0200 Subject: [PATCH 05/62] Update block display default mode to fees --- frontend/src/app/components/blockchain/blockchain.component.ts | 2 +- frontend/src/app/services/state.service.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/components/blockchain/blockchain.component.ts b/frontend/src/app/components/blockchain/blockchain.component.ts index 60dc22e12..d70e788a2 100644 --- a/frontend/src/app/components/blockchain/blockchain.component.ts +++ b/frontend/src/app/components/blockchain/blockchain.component.ts @@ -55,7 +55,7 @@ export class BlockchainComponent implements OnInit, OnDestroy, OnChanges { firstValueFrom(this.stateService.chainTip$).then(() => { this.loadingTip = false; }); - this.blockDisplayMode = this.StorageService.getValue('block-display-mode-preference') as 'size' | 'fees' || 'size'; + this.blockDisplayMode = this.StorageService.getValue('block-display-mode-preference') as 'size' | 'fees' || 'fees'; } ngOnDestroy(): void { diff --git a/frontend/src/app/services/state.service.ts b/frontend/src/app/services/state.service.ts index 286ae5e48..81fe41bd1 100644 --- a/frontend/src/app/services/state.service.ts +++ b/frontend/src/app/services/state.service.ts @@ -279,7 +279,7 @@ export class StateService { this.rateUnits$ = new BehaviorSubject(rateUnitPreference || 'vb'); const blockDisplayModePreference = this.storageService.getValue('block-display-mode-preference'); - this.blockDisplayMode$ = new BehaviorSubject(blockDisplayModePreference || 'size'); + this.blockDisplayMode$ = new BehaviorSubject(blockDisplayModePreference || 'fees'); const viewAmountModePreference = this.storageService.getValue('view-amount-mode') as 'btc' | 'sats' | 'fiat'; this.viewAmountMode$ = new BehaviorSubject<'btc' | 'sats' | 'fiat'>(viewAmountModePreference || 'btc'); From a582a3b0ed213354bd22aca232fdc69217d7bc76 Mon Sep 17 00:00:00 2001 From: Mononaut Date: Mon, 29 Apr 2024 20:54:56 +0000 Subject: [PATCH 06/62] Polish address balance graph, add period toggle --- .../address-graph.component.html | 6 -- .../address-graph.component.scss | 17 +----- .../address-graph/address-graph.component.ts | 59 +++++++++++++------ .../components/address/address.component.html | 12 +++- .../components/address/address.component.scss | 16 +++++ .../components/address/address.component.ts | 18 ++++++ 6 files changed, 86 insertions(+), 42 deletions(-) diff --git a/frontend/src/app/components/address-graph/address-graph.component.html b/frontend/src/app/components/address-graph/address-graph.component.html index df4cdf330..32e16913a 100644 --- a/frontend/src/app/components/address-graph/address-graph.component.html +++ b/frontend/src/app/components/address-graph/address-graph.component.html @@ -1,12 +1,6 @@
-
-
- Balance History -
-
-
diff --git a/frontend/src/app/components/address-graph/address-graph.component.scss b/frontend/src/app/components/address-graph/address-graph.component.scss index a118549fb..3752203c1 100644 --- a/frontend/src/app/components/address-graph/address-graph.component.scss +++ b/frontend/src/app/components/address-graph/address-graph.component.scss @@ -45,23 +45,8 @@ display: flex; flex: 1; width: 100%; - padding-bottom: 20px; + padding-bottom: 10px; padding-right: 10px; - @media (max-width: 992px) { - padding-bottom: 25px; - } - @media (max-width: 829px) { - padding-bottom: 50px; - } - @media (max-width: 767px) { - padding-bottom: 25px; - } - @media (max-width: 629px) { - padding-bottom: 55px; - } - @media (max-width: 567px) { - padding-bottom: 55px; - } } .chart-widget { width: 100%; diff --git a/frontend/src/app/components/address-graph/address-graph.component.ts b/frontend/src/app/components/address-graph/address-graph.component.ts index 26a1bd408..a5db9602d 100644 --- a/frontend/src/app/components/address-graph/address-graph.component.ts +++ b/frontend/src/app/components/address-graph/address-graph.component.ts @@ -1,6 +1,6 @@ -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Inject, Input, LOCALE_ID, OnChanges, SimpleChanges } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Inject, Input, LOCALE_ID, OnChanges, OnDestroy, SimpleChanges } from '@angular/core'; import { echarts, EChartsOption } from '../../graphs/echarts'; -import { Observable, of } from 'rxjs'; +import { BehaviorSubject, Observable, Subscription, combineLatest, of } from 'rxjs'; import { catchError } from 'rxjs/operators'; import { AddressTxSummary, ChainStats } from '../../interfaces/electrs.interface'; import { ElectrsApiService } from '../../services/electrs-api.service'; @@ -32,7 +32,7 @@ const periodSeconds = { `], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class AddressGraphComponent implements OnChanges { +export class AddressGraphComponent implements OnChanges, OnDestroy { @Input() address: string; @Input() isPubkey: boolean = false; @Input() stats: ChainStats; @@ -46,6 +46,9 @@ export class AddressGraphComponent implements OnChanges { data: any[] = []; hoverData: any[] = []; + subscription: Subscription; + redraw$: BehaviorSubject = new BehaviorSubject(false); + chartOptions: EChartsOption = {}; chartInitOptions = { renderer: 'svg', @@ -70,24 +73,38 @@ export class AddressGraphComponent implements OnChanges { if (!this.address || !this.stats) { return; } - (this.addressSummary$ || (this.isPubkey - ? this.electrsApiService.getScriptHashSummary$((this.address.length === 66 ? '21' : '41') + this.address + 'ac') - : this.electrsApiService.getAddressSummary$(this.address)).pipe( - catchError(e => { - this.error = `Failed to fetch address balance history: ${e?.status || ''} ${e?.statusText || 'unknown error'}`; - return of(null); - }), - )).subscribe(addressSummary => { - if (addressSummary) { - this.error = null; - this.prepareChartOptions(addressSummary); + if (changes.address || changes.isPubkey || changes.addressSummary$) { + if (this.subscription) { + this.subscription.unsubscribe(); } - this.isLoading = false; - this.cd.markForCheck(); - }); + this.subscription = combineLatest([ + this.redraw$, + (this.addressSummary$ || (this.isPubkey + ? this.electrsApiService.getScriptHashSummary$((this.address.length === 66 ? '21' : '41') + this.address + 'ac') + : this.electrsApiService.getAddressSummary$(this.address)).pipe( + catchError(e => { + this.error = `Failed to fetch address balance history: ${e?.status || ''} ${e?.statusText || 'unknown error'}`; + return of(null); + }), + )) + ]).subscribe(([redraw, addressSummary]) => { + if (addressSummary) { + this.error = null; + this.prepareChartOptions(addressSummary); + } + this.isLoading = false; + this.cd.markForCheck(); + }); + } else { + // re-trigger subscription + this.redraw$.next(true); + } } prepareChartOptions(summary): void { + if (!summary || !this.stats) { + return; + } let total = (this.stats.funded_txo_sum - this.stats.spent_txo_sum); this.data = summary.map(d => { const balance = total; @@ -104,8 +121,8 @@ export class AddressGraphComponent implements OnChanges { ); } - const maxValue = this.data.reduce((acc, d) => Math.max(acc, Math.abs(d[1] || d.value[1])), 0); - const minValue = this.data.reduce((acc, d) => Math.min(acc, Math.abs(d[1] || d.value[1])), maxValue); + const maxValue = this.data.reduce((acc, d) => Math.max(acc, Math.abs(d[1] ?? d.value[1])), 0); + const minValue = this.data.reduce((acc, d) => Math.min(acc, Math.abs(d[1] ?? d.value[1])), maxValue); this.chartOptions = { color: [ @@ -230,6 +247,10 @@ export class AddressGraphComponent implements OnChanges { this.chartInstance.on('click', 'series', this.onChartClick.bind(this)); } + ngOnDestroy(): void { + this.subscription.unsubscribe(); + } + isMobile() { return (window.innerWidth <= 767.98); } diff --git a/frontend/src/app/components/address/address.component.html b/frontend/src/app/components/address/address.component.html index 531b97464..661e84869 100644 --- a/frontend/src/app/components/address/address.component.html +++ b/frontend/src/app/components/address/address.component.html @@ -53,10 +53,20 @@
+
+

Balance History

+
+
+ all + | + recent +
- +
diff --git a/frontend/src/app/components/address/address.component.scss b/frontend/src/app/components/address/address.component.scss index 7107c73f2..78ca0e80d 100644 --- a/frontend/src/app/components/address/address.component.scss +++ b/frontend/src/app/components/address/address.component.scss @@ -109,3 +109,19 @@ h1 { flex-grow: 0.5; } } + +.widget-toggler { + font-size: 12px; + position: absolute; + top: -20px; + right: 3px; + text-align: right; +} + +.toggler-option { + text-decoration: none; +} + +.inactive { + color: var(--transparent-fg); +} \ No newline at end of file diff --git a/frontend/src/app/components/address/address.component.ts b/frontend/src/app/components/address/address.component.ts index 95abe4ac1..19712a702 100644 --- a/frontend/src/app/components/address/address.component.ts +++ b/frontend/src/app/components/address/address.component.ts @@ -38,6 +38,8 @@ export class AddressComponent implements OnInit, OnDestroy { txCount = 0; received = 0; sent = 0; + now = Date.now() / 1000; + balancePeriod: 'all' | '1m' = 'all'; private tempTransactions: Transaction[]; private timeTxIndexes: number[]; @@ -174,6 +176,10 @@ export class AddressComponent implements OnInit, OnDestroy { this.transactions = this.tempTransactions; this.isLoadingTransactions = false; + + if (!this.showBalancePeriod()) { + this.setBalancePeriod('all'); + } }, (error) => { console.log(error); @@ -296,6 +302,18 @@ export class AddressComponent implements OnInit, OnDestroy { this.txCount = this.address.chain_stats.tx_count + this.address.mempool_stats.tx_count; } + setBalancePeriod(period: 'all' | '1m'): boolean { + this.balancePeriod = period; + return false; + } + + showBalancePeriod(): boolean { + return this.transactions?.length && ( + !this.transactions[0].status?.confirmed + || this.transactions[0].status.block_time > (this.now - (60 * 60 * 24 * 30)) + ); + } + ngOnDestroy() { this.mainSubscription.unsubscribe(); this.mempoolTxSubscription.unsubscribe(); From bf541f08984cd2b72839229acf18960f2763c56f Mon Sep 17 00:00:00 2001 From: hunicus <93150691+hunicus@users.noreply.github.com> Date: Mon, 29 Apr 2024 08:07:09 -0700 Subject: [PATCH 07/62] Replace bisq with onbtc for about alliances --- .../app/components/about/about.component.html | 4 +- .../app/components/about/about.component.scss | 5 +- frontend/src/resources/profile/onbtc-full.svg | 334 ++++++++++++++++++ 3 files changed, 339 insertions(+), 4 deletions(-) create mode 100644 frontend/src/resources/profile/onbtc-full.svg diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html index 5185c9d01..59c3bfb4a 100644 --- a/frontend/src/app/components/about/about.component.html +++ b/frontend/src/app/components/about/about.component.html @@ -343,8 +343,8 @@ - - + +
diff --git a/frontend/src/app/components/about/about.component.scss b/frontend/src/app/components/about/about.component.scss index 81fcfbbd8..d1c15f838 100644 --- a/frontend/src/app/components/about/about.component.scss +++ b/frontend/src/app/components/about/about.component.scss @@ -129,8 +129,9 @@ position: relative; width: 300px; } - .bisq { - top: 3px; + .sv { + height: 85px; + width: auto; position: relative; } } diff --git a/frontend/src/resources/profile/onbtc-full.svg b/frontend/src/resources/profile/onbtc-full.svg new file mode 100644 index 000000000..1c189ea6d --- /dev/null +++ b/frontend/src/resources/profile/onbtc-full.svg @@ -0,0 +1,334 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From f83404421aeadc076006ff1a976190194a2ccba6 Mon Sep 17 00:00:00 2001 From: Mononaut Date: Wed, 1 May 2024 23:40:39 +0000 Subject: [PATCH 08/62] Add x widget --- frontend/custom-sv-config.json | 12 +++- .../custom-dashboard.component.html | 36 +++++++--- .../custom-dashboard.component.ts | 2 + .../twitter-widget.component.html | 16 +++++ .../twitter-widget.component.scss | 10 +++ .../twitter-widget.component.ts | 65 +++++++++++++++++++ frontend/src/app/services/state.service.ts | 1 + frontend/src/app/shared/shared.module.ts | 3 + 8 files changed, 133 insertions(+), 12 deletions(-) create mode 100644 frontend/src/app/components/twitter-widget/twitter-widget.component.html create mode 100644 frontend/src/app/components/twitter-widget/twitter-widget.component.scss create mode 100644 frontend/src/app/components/twitter-widget/twitter-widget.component.ts diff --git a/frontend/custom-sv-config.json b/frontend/custom-sv-config.json index f64f41be8..0f82a9da2 100644 --- a/frontend/custom-sv-config.json +++ b/frontend/custom-sv-config.json @@ -12,19 +12,26 @@ "dashboard": { "widgets": [ { - "component": "fees" + "component": "fees", + "mobileOrder": 4 }, { "component": "balance", + "mobileOrder": 1, "props": { "address": "32ixEdVJWo3kmvJGMTZq5jAQVZZeuwnqzo" } }, { - "component": "goggles" + "component": "twitter", + "mobileOrder": 5, + "props": { + "handle": "bitcoinofficesv" + } }, { "component": "address", + "mobileOrder": 2, "props": { "address": "32ixEdVJWo3kmvJGMTZq5jAQVZZeuwnqzo", "period": "1m" @@ -35,6 +42,7 @@ }, { "component": "addressTransactions", + "mobileOrder": 3, "props": { "address": "32ixEdVJWo3kmvJGMTZq5jAQVZZeuwnqzo" } diff --git a/frontend/src/app/components/custom-dashboard/custom-dashboard.component.html b/frontend/src/app/components/custom-dashboard/custom-dashboard.component.html index 9180571a0..36a5e956c 100644 --- a/frontend/src/app/components/custom-dashboard/custom-dashboard.component.html +++ b/frontend/src/app/components/custom-dashboard/custom-dashboard.component.html @@ -4,7 +4,7 @@ @for (widget of widgets; track widget.component) { @switch (widget.component) { @case ('fees') { -
+
Transaction Fees
@@ -14,12 +14,12 @@
} @case ('difficulty') { -
+
} @case ('goggles') { -
+
@@ -48,7 +48,7 @@
} @case ('incoming') { -
+
@@ -93,7 +93,7 @@ } @case ('replacements') { -
+
@@ -140,7 +140,7 @@ } @case ('blocks') { -
+
@@ -184,7 +184,7 @@ } @case ('transactions') { -
+
Recent Transactions
@@ -224,13 +224,13 @@ } @case ('balance') { -
+
Treasury
} @case ('address') { -
+
@@ -244,7 +244,7 @@
} @case ('addressTransactions') { -
+
@@ -257,6 +257,22 @@
} + @case ('twitter') { +
+
+
+ +
X Timeline
+   + + + @defer { + + } +
+
+
+ } } }
diff --git a/frontend/src/app/components/custom-dashboard/custom-dashboard.component.ts b/frontend/src/app/components/custom-dashboard/custom-dashboard.component.ts index 2847b6586..2ed6ed48d 100644 --- a/frontend/src/app/components/custom-dashboard/custom-dashboard.component.ts +++ b/frontend/src/app/components/custom-dashboard/custom-dashboard.component.ts @@ -57,6 +57,7 @@ export class CustomDashboardComponent implements OnInit, OnDestroy, AfterViewIni incomingGraphHeight: number = 300; graphHeight: number = 300; webGlEnabled = true; + isMobile: boolean = window.innerWidth <= 767.98; widgets; @@ -368,5 +369,6 @@ export class CustomDashboardComponent implements OnInit, OnDestroy, AfterViewIni this.goggleResolution = 86; this.graphHeight = 310; } + this.isMobile = window.innerWidth <= 767.98; } } diff --git a/frontend/src/app/components/twitter-widget/twitter-widget.component.html b/frontend/src/app/components/twitter-widget/twitter-widget.component.html new file mode 100644 index 000000000..d1e042d60 --- /dev/null +++ b/frontend/src/app/components/twitter-widget/twitter-widget.component.html @@ -0,0 +1,16 @@ +@if (loading) { + +} @else if (error) { +
+ failed to load X timeline +
+} + + diff --git a/frontend/src/app/components/twitter-widget/twitter-widget.component.scss b/frontend/src/app/components/twitter-widget/twitter-widget.component.scss new file mode 100644 index 000000000..38a39c014 --- /dev/null +++ b/frontend/src/app/components/twitter-widget/twitter-widget.component.scss @@ -0,0 +1,10 @@ +.spinner-wrapper, .error-wrapper { + position: absolute; + left: 0; + right: 0; + top: 0; + bottom: 0; + display: flex; + justify-content: center; + align-items: center; +} \ No newline at end of file diff --git a/frontend/src/app/components/twitter-widget/twitter-widget.component.ts b/frontend/src/app/components/twitter-widget/twitter-widget.component.ts new file mode 100644 index 000000000..7ec865de7 --- /dev/null +++ b/frontend/src/app/components/twitter-widget/twitter-widget.component.ts @@ -0,0 +1,65 @@ +import { Component, Input, ChangeDetectionStrategy, SecurityContext } from '@angular/core'; +import { LanguageService } from '../../services/language.service'; +import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser'; + +@Component({ + selector: 'app-twitter-widget', + templateUrl: './twitter-widget.component.html', + styleUrls: ['./twitter-widget.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class TwitterWidgetComponent { + @Input() handle: string; + @Input() width = 300; + @Input() height = 400; + + loading: boolean = true; + error: boolean = false; + lang: string = 'en'; + + iframeSrc: SafeResourceUrl; + + constructor( + private languageService: LanguageService, + public sanitizer: DomSanitizer, + ) { + this.lang = this.languageService.getLanguage(); + this.setIframeSrc(); + } + + setIframeSrc(): void { + this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(this.sanitizer.sanitize(SecurityContext.URL, + 'https://syndication.twitter.com/srv/timeline-profile/screen-name/bitcoinofficesv?creatorScreenName=mempool' + + '&dnt=true' + + '&embedId=twitter-widget-0' + + '&features=eyJ0ZndfdGltZWxpbmVfbGlzdCI6eyJidWNrZXQiOltdLCJ2ZXJzaW9uIjpudWxsfSwidGZ3X2ZvbGxvd2VyX2NvdW50X3N1bnNldCI6eyJidWNrZXQiOnRydWUsInZlcnNpb24iOm51bGx9LCJ0ZndfdHdlZXRfZWRpdF9iYWNrZW5kIjp7ImJ1Y2tldCI6Im9uIiwidmVyc2lvbiI6bnVsbH0sInRmd19yZWZzcmNfc2Vzc2lvbiI6eyJidWNrZXQiOiJvbiIsInZlcnNpb24iOm51bGx9LCJ0ZndfZm9zbnJfc29mdF9pbnRlcnZlbnRpb25zX2VuYWJsZWQiOnsiYnVja2V0Ijoib24iLCJ2ZXJzaW9uIjpudWxsfSwidGZ3X21peGVkX21lZGlhXzE1ODk3Ijp7ImJ1Y2tldCI6InRyZWF0bWVudCIsInZlcnNpb24iOm51bGx9LCJ0ZndfZXhwZXJpbWVudHNfY29va2llX2V4cGlyYXRpb24iOnsiYnVja2V0IjoxMjA5NjAwLCJ2ZXJzaW9uIjpudWxsfSwidGZ3X3Nob3dfYmlyZHdhdGNoX3Bpdm90c19lbmFibGVkIjp7ImJ1Y2tldCI6Im9uIiwidmVyc2lvbiI6bnVsbH0sInRmd19kdXBsaWNhdGVfc2NyaWJlc190b19zZXR0aW5ncyI6eyJidWNrZXQiOiJvbiIsInZlcnNpb24iOm51bGx9LCJ0ZndfdXNlX3Byb2ZpbGVfaW1hZ2Vfc2hhcGVfZW5hYmxlZCI6eyJidWNrZXQiOiJvbiIsInZlcnNpb24iOm51bGx9LCJ0ZndfdmlkZW9faGxzX2R5bmFtaWNfbWFuaWZlc3RzXzE1MDgyIjp7ImJ1Y2tldCI6InRydWVfYml0cmF0ZSIsInZlcnNpb24iOm51bGx9LCJ0ZndfbGVnYWN5X3RpbWVsaW5lX3N1bnNldCI6eyJidWNrZXQiOnRydWUsInZlcnNpb24iOm51bGx9LCJ0ZndfdHdlZXRfZWRpdF9mcm9udGVuZCI6eyJidWNrZXQiOiJvbiIsInZlcnNpb24iOm51bGx9fQ%3D%3D' + + '&frame=false' + + '&hideBorder=true' + + '&hideFooter=false' + + '&hideHeader=true' + + '&hideScrollBar=false' + + `&lang=${this.lang}` + + '&maxHeight=500px' + + '&origin=https%3A%2F%2Fmempool.space%2F' + // + '&sessionId=88f6d661d0dcca99c43c0a590f6a3e61c89226a9' + + '&showHeader=false' + + '&showReplies=false' + + '&siteScreenName=mempool' + + '&theme=dark' + + '&transparent=true' + + '&widgetsVersion=2615f7e52b7e0%3A1702314776716' + )); + } + + onReady(): void { + console.log('ready!'); + this.loading = false; + this.error = false; + } + + onFailed(): void { + console.log('failed!') + this.loading = false; + this.error = true; + } +} \ No newline at end of file diff --git a/frontend/src/app/services/state.service.ts b/frontend/src/app/services/state.service.ts index 286ae5e48..529e53ff0 100644 --- a/frontend/src/app/services/state.service.ts +++ b/frontend/src/app/services/state.service.ts @@ -33,6 +33,7 @@ export interface Customization { dashboard: { widgets: { component: string; + mobileOrder?: number; props: { [key: string]: any }; }[]; }; diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts index 80d6ca3cd..7f52a1b60 100644 --- a/frontend/src/app/shared/shared.module.ts +++ b/frontend/src/app/shared/shared.module.ts @@ -112,6 +112,7 @@ import { ClockComponent } from '../components/clock/clock.component'; import { CalculatorComponent } from '../components/calculator/calculator.component'; import { BitcoinsatoshisPipe } from '../shared/pipes/bitcoinsatoshis.pipe'; import { HttpErrorComponent } from '../shared/components/http-error/http-error.component'; +import { TwitterWidgetComponent } from '../components/twitter-widget/twitter-widget.component'; import { OnlyVsizeDirective, OnlyWeightDirective } from './components/weight-directives/weight-directives'; @@ -224,6 +225,7 @@ import { OnlyVsizeDirective, OnlyWeightDirective } from './components/weight-dir AccelerateCheckout, PendingStatsComponent, HttpErrorComponent, + TwitterWidgetComponent, ], imports: [ CommonModule, @@ -351,6 +353,7 @@ import { OnlyVsizeDirective, OnlyWeightDirective } from './components/weight-dir AccelerateCheckout, PendingStatsComponent, HttpErrorComponent, + TwitterWidgetComponent, MempoolBlockOverviewComponent, ClockchainComponent, From a676d23a54dce903c1a7244899206240b72b2641 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Thu, 2 May 2024 21:00:49 +0000 Subject: [PATCH 09/62] Restore MSRV to 1.63 In trying to upgrade my mempool instance, I discovered I couldn't build the latest mempool Rust code with my available Rust toolchain. It appears in #4612 the Rust MSRV was bumped without justification, which is reverted here. Note that `Cargo.lock` updates here should ensure the versions of dependent crates use the versions supported by our MSRV. Its possible that the dependency downgrades here break something, but things appear to be running fine for me locally, so figured I'd suggest this upstream. --- rust/gbt/Cargo.lock | 120 +++++++++++++--------------------------- rust/gbt/Cargo.toml | 6 +- rust/gbt/rust-toolchain | 2 +- 3 files changed, 41 insertions(+), 87 deletions(-) diff --git a/rust/gbt/Cargo.lock b/rust/gbt/Cargo.lock index d7ac48ec7..ed0b1c783 100644 --- a/rust/gbt/Cargo.lock +++ b/rust/gbt/Cargo.lock @@ -93,7 +93,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad291aa74992b9b7a7e88c38acbbf6ad7e107f1d90ee8775b7bc1fc3394f485c" dependencies = [ "quote", - "syn", + "syn 2.0.52", ] [[package]] @@ -159,12 +159,12 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libloading" -version = "0.8.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ "cfg-if", - "windows-targets", + "winapi", ] [[package]] @@ -199,9 +199,9 @@ dependencies = [ [[package]] name = "napi" -version = "2.16.0" +version = "2.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a63d0570e4c3e0daf7a8d380563610e159f538e20448d6c911337246f40e84" +checksum = "fd063c93b900149304e3ba96ce5bf210cd4f81ef5eb80ded0d100df3e85a3ac0" dependencies = [ "bitflags", "ctor", @@ -213,29 +213,29 @@ dependencies = [ [[package]] name = "napi-build" -version = "2.1.2" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f9130fccc5f763cf2069b34a089a18f0d0883c66aceb81f2fad541a3d823c43" +checksum = "882a73d9ef23e8dc2ebbffb6a6ae2ef467c0f18ac10711e4cc59c5485d41df0e" [[package]] name = "napi-derive" -version = "2.16.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05bb7c37e3c1dda9312fdbe4a9fc7507fca72288ba154ec093e2d49114e727ce" +checksum = "da1c6a8fa84d549aa8708fcd062372bf8ec6e849de39016ab921067d21bde367" dependencies = [ "cfg-if", "convert_case", "napi-derive-backend", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "napi-derive-backend" -version = "1.0.62" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f785a8b8d7b83e925f5aa6d2ae3c159d17fe137ac368dc185bef410e7acdaeb4" +checksum = "20bbc7c69168d06a848f925ec5f0e0997f98e8c8d4f2cc30157f0da51c009e17" dependencies = [ "convert_case", "once_cell", @@ -243,14 +243,14 @@ dependencies = [ "quote", "regex", "semver", - "syn", + "syn 1.0.109", ] [[package]] name = "napi-sys" -version = "2.3.0" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2503fa6af34dc83fb74888df8b22afe933b58d37daf7d80424b1c60c68196b8b" +checksum = "166b5ef52a3ab5575047a9fe8d4a030cdd0f63c96f071cd6907674453b07bae3" dependencies = [ "libloading", ] @@ -333,14 +333,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.3" +version = "1.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.2", + "regex-automata 0.3.9", + "regex-syntax 0.7.5", ] [[package]] @@ -354,13 +354,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.7.5", ] [[package]] @@ -371,9 +371,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "rustc-demangle" @@ -402,6 +402,17 @@ version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "syn" version = "2.0.52" @@ -453,7 +464,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.52", ] [[package]] @@ -534,60 +545,3 @@ name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-targets" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" diff --git a/rust/gbt/Cargo.toml b/rust/gbt/Cargo.toml index c6e736762..898912881 100644 --- a/rust/gbt/Cargo.toml +++ b/rust/gbt/Cargo.toml @@ -14,15 +14,15 @@ crate-type = ["cdylib"] [dependencies] priority-queue = "2.0.2" bytes = "1.4.0" -napi = { version = "2.16.0", features = ["napi8", "tokio_rt"] } -napi-derive = "2.16.0" +napi = { version = "2.0", features = ["napi8", "tokio_rt"] } +napi-derive = "2.0" bytemuck = "1.13.1" tracing = "0.1.36" tracing-log = "0.2.0" tracing-subscriber = { version = "0.3.15", features = ["env-filter"]} [build-dependencies] -napi-build = "2.1.2" +napi-build = "2.0" [profile.release] lto = true diff --git a/rust/gbt/rust-toolchain b/rust/gbt/rust-toolchain index 5b6cd6b3c..58e4eb6b2 100644 --- a/rust/gbt/rust-toolchain +++ b/rust/gbt/rust-toolchain @@ -1 +1 @@ -1.65 +1.63 From f8d30bf528100e7e11b19b852482a357ae10b44f Mon Sep 17 00:00:00 2001 From: Mononaut Date: Sun, 21 Jan 2024 22:47:41 +0000 Subject: [PATCH 10/62] Add 'mempool delta' websocket subscriptions --- backend/src/api/websocket-handler.ts | 69 ++++++++++++++++++++++++++++ backend/src/mempool.interfaces.ts | 14 ++++++ 2 files changed, 83 insertions(+) diff --git a/backend/src/api/websocket-handler.ts b/backend/src/api/websocket-handler.ts index d4ff7efe3..9e8a4653a 100644 --- a/backend/src/api/websocket-handler.ts +++ b/backend/src/api/websocket-handler.ts @@ -3,6 +3,7 @@ import * as WebSocket from 'ws'; import { BlockExtended, TransactionExtended, MempoolTransactionExtended, WebsocketResponse, OptimizedStatistic, ILoadingIndicators, GbtCandidates, TxTrackingInfo, + MempoolBlockDelta, MempoolDelta, MempoolDeltaTxids } from '../mempool.interfaces'; import blocks from './blocks'; import memPool from './mempool'; @@ -364,6 +365,18 @@ class WebsocketHandler { client['track-donation'] = parsedMessage['track-donation']; } + if (parsedMessage['track-mempool-txids'] === true) { + client['track-mempool-txids'] = true; + } else if (parsedMessage['track-mempool-txids'] === false) { + delete client['track-mempool-txids']; + } + + if (parsedMessage['track-mempool'] === true) { + client['track-mempool'] = true; + } else if (parsedMessage['track-mempool'] === false) { + delete client['track-mempool']; + } + if (Object.keys(response).length) { client.send(this.serializeResponse(response)); } @@ -545,6 +558,27 @@ class WebsocketHandler { const latestTransactions = memPool.getLatestTransactions(); + const replacedTransactions: { replaced: string, by: TransactionExtended }[] = []; + for (const tx of newTransactions) { + if (rbfTransactions[tx.txid]) { + for (const replaced of rbfTransactions[tx.txid]) { + replacedTransactions.push({ replaced: replaced.txid, by: tx }); + } + } + } + const mempoolDeltaTxids: MempoolDeltaTxids = { + added: newTransactions.map(tx => tx.txid), + removed: deletedTransactions.map(tx => tx.txid), + mined: [], + replaced: replacedTransactions.map(replacement => ({ replaced: replacement.replaced, by: replacement.by.txid })), + }; + const mempoolDelta: MempoolDelta = { + added: newTransactions, + removed: deletedTransactions.map(tx => tx.txid), + mined: [], + replaced: replacedTransactions, + }; + // update init data const socketDataFields = { 'mempoolInfo': mempoolInfo, @@ -847,6 +881,14 @@ class WebsocketHandler { response['rbfLatestSummary'] = getCachedResponse('rbfLatestSummary', rbfSummary); } + if (client['track-mempool-txids']) { + response['mempool-txids'] = getCachedResponse('mempool-txids', mempoolDeltaTxids); + } + + if (client['track-mempool']) { + response['mempool-transactions'] = getCachedResponse('mempool-transactions', mempoolDelta); + } + if (Object.keys(response).length) { client.send(this.serializeResponse(response)); } @@ -992,6 +1034,25 @@ class WebsocketHandler { const mBlocksWithTransactions = mempoolBlocks.getMempoolBlocksWithTransactions(); + const replacedTransactions: { replaced: string, by: TransactionExtended }[] = []; + for (const txid of Object.keys(rbfTransactions)) { + for (const replaced of rbfTransactions[txid].replaced) { + replacedTransactions.push({ replaced: replaced.txid, by: rbfTransactions[txid].replacedBy }); + } + } + const mempoolDeltaTxids: MempoolDeltaTxids = { + added: [], + removed: [], + mined: transactions.map(tx => tx.txid), + replaced: replacedTransactions.map(replacement => ({ replaced: replacement.replaced, by: replacement.by.txid })), + }; + const mempoolDelta: MempoolDelta = { + added: [], + removed: [], + mined: transactions.map(tx => tx.txid), + replaced: replacedTransactions, + }; + const responseCache = { ...this.socketData }; function getCachedResponse(key, data): string { if (!responseCache[key]) { @@ -1185,6 +1246,14 @@ class WebsocketHandler { } } + if (client['track-mempool-txids']) { + response['mempool-txids'] = getCachedResponse('mempool-txids', mempoolDeltaTxids); + } + + if (client['track-mempool']) { + response['mempool-transactions'] = getCachedResponse('mempool-transactions', mempoolDelta); + } + if (Object.keys(response).length) { client.send(this.serializeResponse(response)); } diff --git a/backend/src/mempool.interfaces.ts b/backend/src/mempool.interfaces.ts index 0b4b20e02..516748e9c 100644 --- a/backend/src/mempool.interfaces.ts +++ b/backend/src/mempool.interfaces.ts @@ -71,6 +71,20 @@ export interface MempoolBlockDelta { changed: MempoolDeltaChange[]; } +export interface MempoolDeltaTxids { + added: string[]; + removed: string[]; + mined: string[]; + replaced: { replaced: string, by: string }[]; +} + +export interface MempoolDelta { + added: MempoolTransactionExtended[]; + removed: string[]; + mined: string[]; + replaced: { replaced: string, by: TransactionExtended }[]; +} + interface VinStrippedToScriptsig { scriptsig: string; } From 5172f032e709e4e6cf7afa7f6e50131dbae2d809 Mon Sep 17 00:00:00 2001 From: Mononaut Date: Fri, 3 May 2024 16:31:56 +0000 Subject: [PATCH 11/62] Add sequence number to track-mempool subscription messages --- backend/src/api/websocket-handler.ts | 20 ++++++++++++-------- backend/src/mempool.interfaces.ts | 2 ++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/backend/src/api/websocket-handler.ts b/backend/src/api/websocket-handler.ts index 9e8a4653a..fdda3df88 100644 --- a/backend/src/api/websocket-handler.ts +++ b/backend/src/api/websocket-handler.ts @@ -558,6 +558,10 @@ class WebsocketHandler { const latestTransactions = memPool.getLatestTransactions(); + if (memPool.isInSync()) { + this.mempoolSequence++; + } + const replacedTransactions: { replaced: string, by: TransactionExtended }[] = []; for (const tx of newTransactions) { if (rbfTransactions[tx.txid]) { @@ -567,12 +571,14 @@ class WebsocketHandler { } } const mempoolDeltaTxids: MempoolDeltaTxids = { + sequence: this.mempoolSequence, added: newTransactions.map(tx => tx.txid), removed: deletedTransactions.map(tx => tx.txid), mined: [], replaced: replacedTransactions.map(replacement => ({ replaced: replacement.replaced, by: replacement.by.txid })), }; const mempoolDelta: MempoolDelta = { + sequence: this.mempoolSequence, added: newTransactions, removed: deletedTransactions.map(tx => tx.txid), mined: [], @@ -638,10 +644,6 @@ class WebsocketHandler { const addressCache = this.makeAddressCache(newTransactions); const removedAddressCache = this.makeAddressCache(deletedTransactions); - if (memPool.isInSync()) { - this.mempoolSequence++; - } - // TODO - Fix indentation after PR is merged for (const server of this.webSocketServers) { server.clients.forEach(async (client) => { @@ -1034,6 +1036,10 @@ class WebsocketHandler { const mBlocksWithTransactions = mempoolBlocks.getMempoolBlocksWithTransactions(); + if (memPool.isInSync()) { + this.mempoolSequence++; + } + const replacedTransactions: { replaced: string, by: TransactionExtended }[] = []; for (const txid of Object.keys(rbfTransactions)) { for (const replaced of rbfTransactions[txid].replaced) { @@ -1041,12 +1047,14 @@ class WebsocketHandler { } } const mempoolDeltaTxids: MempoolDeltaTxids = { + sequence: this.mempoolSequence, added: [], removed: [], mined: transactions.map(tx => tx.txid), replaced: replacedTransactions.map(replacement => ({ replaced: replacement.replaced, by: replacement.by.txid })), }; const mempoolDelta: MempoolDelta = { + sequence: this.mempoolSequence, added: [], removed: [], mined: transactions.map(tx => tx.txid), @@ -1061,10 +1069,6 @@ class WebsocketHandler { return responseCache[key]; } - if (memPool.isInSync()) { - this.mempoolSequence++; - } - // TODO - Fix indentation after PR is merged for (const server of this.webSocketServers) { server.clients.forEach((client) => { diff --git a/backend/src/mempool.interfaces.ts b/backend/src/mempool.interfaces.ts index 516748e9c..0fcddc45a 100644 --- a/backend/src/mempool.interfaces.ts +++ b/backend/src/mempool.interfaces.ts @@ -72,6 +72,7 @@ export interface MempoolBlockDelta { } export interface MempoolDeltaTxids { + sequence: number, added: string[]; removed: string[]; mined: string[]; @@ -79,6 +80,7 @@ export interface MempoolDeltaTxids { } export interface MempoolDelta { + sequence: number, added: MempoolTransactionExtended[]; removed: string[]; mined: string[]; From a8868b5f0f05ab4864ae6000df5692f9a679e27c Mon Sep 17 00:00:00 2001 From: Mononaut Date: Thu, 2 May 2024 23:48:10 +0000 Subject: [PATCH 12/62] Simplify websocket mempool delta handling --- .../mempool-block-overview.component.ts | 46 +++---------------- .../src/app/interfaces/websocket.interface.ts | 10 ++++ frontend/src/app/services/state.service.ts | 31 ++++++------- .../src/app/services/websocket.service.ts | 6 ++- 4 files changed, 36 insertions(+), 57 deletions(-) diff --git a/frontend/src/app/components/mempool-block-overview/mempool-block-overview.component.ts b/frontend/src/app/components/mempool-block-overview/mempool-block-overview.component.ts index 4d01bd9b9..9971e92ab 100644 --- a/frontend/src/app/components/mempool-block-overview/mempool-block-overview.component.ts +++ b/frontend/src/app/components/mempool-block-overview/mempool-block-overview.component.ts @@ -1,11 +1,10 @@ -import { Component, ComponentRef, ViewChild, HostListener, Input, Output, EventEmitter, +import { Component, ViewChild, Input, Output, EventEmitter, OnInit, OnDestroy, OnChanges, ChangeDetectionStrategy, ChangeDetectorRef, AfterViewInit } from '@angular/core'; import { StateService } from '../../services/state.service'; -import { MempoolBlockDelta } from '../../interfaces/websocket.interface'; +import { MempoolBlockDelta, isMempoolDelta } from '../../interfaces/websocket.interface'; import { TransactionStripped } from '../../interfaces/node-api.interface'; import { BlockOverviewGraphComponent } from '../../components/block-overview-graph/block-overview-graph.component'; -import { Subscription, BehaviorSubject, merge, of, timer } from 'rxjs'; -import { switchMap, filter, concatMap, map } from 'rxjs/operators'; +import { Subscription, BehaviorSubject } from 'rxjs'; import { WebsocketService } from '../../services/websocket.service'; import { RelativeUrlPipe } from '../../shared/pipes/relative-url/relative-url.pipe'; import { Router } from '@angular/router'; @@ -39,10 +38,6 @@ export class MempoolBlockOverviewComponent implements OnInit, OnDestroy, OnChang poolDirection: string = 'left'; blockSub: Subscription; - rateLimit = 1000; - private lastEventTime = Date.now() - this.rateLimit; - private subId = 0; - firstLoad: boolean = true; constructor( @@ -62,39 +57,13 @@ export class MempoolBlockOverviewComponent implements OnInit, OnDestroy, OnChang } ngAfterViewInit(): void { - this.blockSub = merge( - this.stateService.mempoolBlockTransactions$, - this.stateService.mempoolBlockDelta$, - ).pipe( - concatMap(update => { - const now = Date.now(); - const timeSinceLastEvent = now - this.lastEventTime; - this.lastEventTime = Math.max(now, this.lastEventTime + this.rateLimit); - - const subId = this.subId; - - // If time since last event is less than X seconds, delay this event - if (timeSinceLastEvent < this.rateLimit) { - return timer(this.rateLimit - timeSinceLastEvent).pipe( - // Emit the event after the timer - map(() => ({ update, subId })) - ); - } else { - // If enough time has passed, emit the event immediately - return of({ update, subId }); - } - }) - ).subscribe(({ update, subId }) => { - // discard stale updates after a block transition - if (subId !== this.subId) { - return; - } + this.blockSub = this.stateService.mempoolBlockUpdate$.subscribe((update) => { // process update - if (update['added']) { + if (isMempoolDelta(update)) { // delta - this.updateBlock(update as MempoolBlockDelta); + this.updateBlock(update); } else { - const transactionsStripped = update as TransactionStripped[]; + const transactionsStripped = update.transactions; // new transactions if (this.firstLoad) { this.replaceBlock(transactionsStripped); @@ -137,7 +106,6 @@ export class MempoolBlockOverviewComponent implements OnInit, OnDestroy, OnChang ngOnChanges(changes): void { if (changes.index) { - this.subId++; this.firstLoad = true; if (this.blockGraph) { this.blockGraph.clear(changes.index.currentValue > changes.index.previousValue ? this.chainDirection : this.poolDirection); diff --git a/frontend/src/app/interfaces/websocket.interface.ts b/frontend/src/app/interfaces/websocket.interface.ts index daf06603f..8c24979e7 100644 --- a/frontend/src/app/interfaces/websocket.interface.ts +++ b/frontend/src/app/interfaces/websocket.interface.ts @@ -75,6 +75,16 @@ export interface MempoolBlockDelta { removed: string[]; changed: { txid: string, rate: number, flags: number, acc: boolean }[]; } +export interface MempoolBlockState { + transactions: TransactionStripped[]; +} +export type MempoolBlockUpdate = MempoolBlockDelta | MempoolBlockState; +export function isMempoolState(update: MempoolBlockUpdate): update is MempoolBlockState { + return update['transactions'] !== undefined; +} +export function isMempoolDelta(update: MempoolBlockUpdate): update is MempoolBlockDelta { + return update['transactions'] === undefined; +} export interface MempoolBlockDeltaCompressed { added: TransactionCompressed[]; diff --git a/frontend/src/app/services/state.service.ts b/frontend/src/app/services/state.service.ts index 286ae5e48..3554e465e 100644 --- a/frontend/src/app/services/state.service.ts +++ b/frontend/src/app/services/state.service.ts @@ -1,7 +1,7 @@ import { Inject, Injectable, PLATFORM_ID, LOCALE_ID } from '@angular/core'; import { ReplaySubject, BehaviorSubject, Subject, fromEvent, Observable, merge } from 'rxjs'; import { Transaction } from '../interfaces/electrs.interface'; -import { HealthCheckHost, IBackendInfo, MempoolBlock, MempoolBlockDelta, MempoolInfo, Recommendedfees, ReplacedTransaction, ReplacementInfo } from '../interfaces/websocket.interface'; +import { HealthCheckHost, IBackendInfo, MempoolBlock, MempoolBlockDelta, MempoolBlockUpdate, MempoolInfo, Recommendedfees, ReplacedTransaction, ReplacementInfo, isMempoolState } from '../interfaces/websocket.interface'; import { BlockExtended, CpfpInfo, DifficultyAdjustment, MempoolPosition, OptimizedMempoolStats, RbfTree, TransactionStripped } from '../interfaces/node-api.interface'; import { Router, NavigationStart } from '@angular/router'; import { isPlatformBrowser } from '@angular/common'; @@ -127,8 +127,7 @@ export class StateService { bsqPrice$ = new ReplaySubject(1); mempoolInfo$ = new ReplaySubject(1); mempoolBlocks$ = new ReplaySubject(1); - mempoolBlockTransactions$ = new Subject(); - mempoolBlockDelta$ = new Subject(); + mempoolBlockUpdate$ = new Subject(); liveMempoolBlockTransactions$: Observable<{ [txid: string]: TransactionStripped}>; txConfirmed$ = new Subject<[string, BlockExtended]>(); txReplaced$ = new Subject(); @@ -215,25 +214,25 @@ export class StateService { this.router.navigate(['/tracker/' + window.location.pathname.slice(4)]); } - this.liveMempoolBlockTransactions$ = merge( - this.mempoolBlockTransactions$.pipe(map(transactions => { return { transactions }; })), - this.mempoolBlockDelta$.pipe(map(delta => { return { delta }; })), - ).pipe(scan((transactions: { [txid: string]: TransactionStripped }, change: any): { [txid: string]: TransactionStripped } => { - if (change.transactions) { - const txMap = {} + this.liveMempoolBlockTransactions$ = this.mempoolBlockUpdate$.pipe(scan((transactions: { [txid: string]: TransactionStripped }, change: MempoolBlockUpdate): { [txid: string]: TransactionStripped } => { + if (isMempoolState(change)) { + const txMap = {}; change.transactions.forEach(tx => { txMap[tx.txid] = tx; - }) + }); return txMap; } else { - change.delta.changed.forEach(tx => { - transactions[tx.txid].rate = tx.rate; - }) - change.delta.removed.forEach(txid => { + change.added.forEach(tx => { + transactions[tx.txid] = tx; + }); + change.removed.forEach(txid => { delete transactions[txid]; }); - change.delta.added.forEach(tx => { - transactions[tx.txid] = tx; + change.changed.forEach(tx => { + if (transactions[tx.txid]) { + transactions[tx.txid].rate = tx.rate; + transactions[tx.txid].acc = tx.acc; + } }); return transactions; } diff --git a/frontend/src/app/services/websocket.service.ts b/frontend/src/app/services/websocket.service.ts index 414f60bc5..e4df12aa6 100644 --- a/frontend/src/app/services/websocket.service.ts +++ b/frontend/src/app/services/websocket.service.ts @@ -401,14 +401,16 @@ export class WebsocketService { if (response['projected-block-transactions'].index == this.trackingMempoolBlock) { if (response['projected-block-transactions'].blockTransactions) { this.stateService.mempoolSequence = response['projected-block-transactions'].sequence; - this.stateService.mempoolBlockTransactions$.next(response['projected-block-transactions'].blockTransactions.map(uncompressTx)); + this.stateService.mempoolBlockUpdate$.next({ + transactions: response['projected-block-transactions'].blockTransactions.map(uncompressTx), + }); } else if (response['projected-block-transactions'].delta) { if (this.stateService.mempoolSequence && response['projected-block-transactions'].sequence !== this.stateService.mempoolSequence + 1) { this.stateService.mempoolSequence = 0; this.startTrackMempoolBlock(this.trackingMempoolBlock, true); } else { this.stateService.mempoolSequence = response['projected-block-transactions'].sequence; - this.stateService.mempoolBlockDelta$.next(uncompressDeltaChange(response['projected-block-transactions'].delta)); + this.stateService.mempoolBlockUpdate$.next(uncompressDeltaChange(response['projected-block-transactions'].delta)); } } } From 44116424b046a0f5bd45a7625dc7651b73c68bbf Mon Sep 17 00:00:00 2001 From: Mononaut Date: Thu, 2 May 2024 23:48:56 +0000 Subject: [PATCH 13/62] Reimplement mempool animation smoothing within viz component --- .../block-overview-graph.component.ts | 68 +++++++++++++++++++ .../block-overview-graph/block-scene.ts | 6 +- .../mempool-block-overview.component.ts | 6 +- 3 files changed, 76 insertions(+), 4 deletions(-) diff --git a/frontend/src/app/components/block-overview-graph/block-overview-graph.component.ts b/frontend/src/app/components/block-overview-graph/block-overview-graph.component.ts index 3fee3f901..57db9bfca 100644 --- a/frontend/src/app/components/block-overview-graph/block-overview-graph.component.ts +++ b/frontend/src/app/components/block-overview-graph/block-overview-graph.component.ts @@ -81,6 +81,20 @@ export class BlockOverviewGraphComponent implements AfterViewInit, OnDestroy, On tooltipPosition: Position; readyNextFrame = false; + lastUpdate: number = 0; + pendingUpdate: { + count: number, + add: { [txid: string]: TransactionStripped }, + remove: { [txid: string]: string }, + change: { [txid: string]: { txid: string, rate: number | undefined, acc: boolean | undefined } }, + direction?: string, + } = { + count: 0, + add: {}, + remove: {}, + change: {}, + direction: 'left', + }; searchText: string; searchSubscription: Subscription; @@ -176,6 +190,7 @@ export class BlockOverviewGraphComponent implements AfterViewInit, OnDestroy, On destroy(): void { if (this.scene) { this.scene.destroy(); + this.clearUpdateQueue(); this.start(); } } @@ -188,6 +203,7 @@ export class BlockOverviewGraphComponent implements AfterViewInit, OnDestroy, On } this.filtersAvailable = filtersAvailable; if (this.scene) { + this.clearUpdateQueue(); this.scene.setup(transactions); this.readyNextFrame = true; this.start(); @@ -197,6 +213,7 @@ export class BlockOverviewGraphComponent implements AfterViewInit, OnDestroy, On enter(transactions: TransactionStripped[], direction: string): void { if (this.scene) { + this.clearUpdateQueue(); this.scene.enter(transactions, direction); this.start(); this.updateSearchHighlight(); @@ -205,6 +222,7 @@ export class BlockOverviewGraphComponent implements AfterViewInit, OnDestroy, On exit(direction: string): void { if (this.scene) { + this.clearUpdateQueue(); this.scene.exit(direction); this.start(); this.updateSearchHighlight(); @@ -213,13 +231,61 @@ export class BlockOverviewGraphComponent implements AfterViewInit, OnDestroy, On replace(transactions: TransactionStripped[], direction: string, sort: boolean = true, startTime?: number): void { if (this.scene) { + this.clearUpdateQueue(); this.scene.replace(transactions || [], direction, sort, startTime); this.start(); this.updateSearchHighlight(); } } + // collates non-urgent updates into a set of consistent pending changes + queueUpdate(add: TransactionStripped[], remove: string[], change: { txid: string, rate: number | undefined, acc: boolean | undefined }[], direction: string = 'left'): void { + for (const tx of add) { + this.pendingUpdate.add[tx.txid] = tx; + delete this.pendingUpdate.remove[tx.txid]; + delete this.pendingUpdate.change[tx.txid]; + } + for (const txid of remove) { + delete this.pendingUpdate.add[txid]; + this.pendingUpdate.remove[txid] = txid; + delete this.pendingUpdate.change[txid]; + } + for (const tx of change) { + if (this.pendingUpdate.add[tx.txid]) { + this.pendingUpdate.add[tx.txid].rate = tx.rate; + this.pendingUpdate.add[tx.txid].acc = tx.acc; + } else { + this.pendingUpdate.change[tx.txid] = tx; + } + } + this.pendingUpdate.direction = direction; + this.pendingUpdate.count++; + } + + applyQueuedUpdates(): void { + if (this.pendingUpdate.count && performance.now() > (this.lastUpdate + this.animationDuration)) { + this.update([], [], [], this.pendingUpdate?.direction); + } + } + + clearUpdateQueue(): void { + this.pendingUpdate = { + count: 0, + add: {}, + remove: {}, + change: {}, + }; + this.lastUpdate = performance.now(); + } + update(add: TransactionStripped[], remove: string[], change: { txid: string, rate: number | undefined, acc: boolean | undefined }[], direction: string = 'left', resetLayout: boolean = false): void { + // merge any pending changes into this update + this.queueUpdate(add, remove, change); + this.applyUpdate(Object.values(this.pendingUpdate.add), Object.values(this.pendingUpdate.remove), Object.values(this.pendingUpdate.change), direction, resetLayout); + this.clearUpdateQueue(); + } + + applyUpdate(add: TransactionStripped[], remove: string[], change: { txid: string, rate: number | undefined, acc: boolean | undefined }[], direction: string = 'left', resetLayout: boolean = false): void { if (this.scene) { add = add.filter(tx => !this.scene.txs[tx.txid]); remove = remove.filter(txid => this.scene.txs[txid]); @@ -230,6 +296,7 @@ export class BlockOverviewGraphComponent implements AfterViewInit, OnDestroy, On } this.scene.update(add, remove, change, direction, resetLayout); this.start(); + this.lastUpdate = performance.now(); this.updateSearchHighlight(); } } @@ -370,6 +437,7 @@ export class BlockOverviewGraphComponent implements AfterViewInit, OnDestroy, On if (!now) { now = performance.now(); } + this.applyQueuedUpdates(); // skip re-render if there's no change to the scene if (this.scene && this.gl) { /* SET UP SHADER UNIFORMS */ diff --git a/frontend/src/app/components/block-overview-graph/block-scene.ts b/frontend/src/app/components/block-overview-graph/block-scene.ts index bef907a7a..9dd76dec9 100644 --- a/frontend/src/app/components/block-overview-graph/block-scene.ts +++ b/frontend/src/app/components/block-overview-graph/block-scene.ts @@ -13,7 +13,7 @@ export default class BlockScene { theme: ThemeService; orientation: string; flip: boolean; - animationDuration: number = 900; + animationDuration: number = 1000; configAnimationOffset: number | null; animationOffset: number; highlightingEnabled: boolean; @@ -179,7 +179,7 @@ export default class BlockScene { removed.forEach(tx => { tx.destroy(); }); - }, 1000); + }, (startTime - performance.now()) + this.animationDuration + 1000); if (resetLayout) { add.forEach(tx => { @@ -239,7 +239,7 @@ export default class BlockScene { { width: number, height: number, resolution: number, blockLimit: number, animationDuration: number, animationOffset: number, orientation: string, flip: boolean, vertexArray: FastVertexArray, theme: ThemeService, highlighting: boolean, colorFunction: ((tx: TxView) => Color) | null } ): void { - this.animationDuration = animationDuration || 1000; + this.animationDuration = animationDuration || this.animationDuration || 1000; this.configAnimationOffset = animationOffset; this.animationOffset = this.configAnimationOffset == null ? (this.width * 1.4) : this.configAnimationOffset; this.orientation = orientation; diff --git a/frontend/src/app/components/mempool-block-overview/mempool-block-overview.component.ts b/frontend/src/app/components/mempool-block-overview/mempool-block-overview.component.ts index 9971e92ab..3cea7e123 100644 --- a/frontend/src/app/components/mempool-block-overview/mempool-block-overview.component.ts +++ b/frontend/src/app/components/mempool-block-overview/mempool-block-overview.component.ts @@ -141,7 +141,11 @@ export class MempoolBlockOverviewComponent implements OnInit, OnDestroy, OnChang const direction = (this.blockIndex == null || this.index < this.blockIndex) ? this.poolDirection : this.chainDirection; this.blockGraph.replace(delta.added, direction); } else { - this.blockGraph.update(delta.added, delta.removed, delta.changed || [], blockMined ? this.chainDirection : this.poolDirection, blockMined); + if (blockMined) { + this.blockGraph.update(delta.added, delta.removed, delta.changed || [], blockMined ? this.chainDirection : this.poolDirection, blockMined); + } else { + this.blockGraph.queueUpdate(delta.added, delta.removed, delta.changed || [], this.poolDirection); + } } this.lastBlockHeight = this.stateService.latestBlockHeight; From e45a03729b6cbb6d01b898d273f7c59a53f0a390 Mon Sep 17 00:00:00 2001 From: softsimon Date: Sat, 4 May 2024 14:19:26 +0700 Subject: [PATCH 14/62] Adding footer link --- .../test-transactions/test-transactions.component.html | 2 +- .../components/global-footer/global-footer.component.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/app/components/test-transactions/test-transactions.component.html b/frontend/src/app/components/test-transactions/test-transactions.component.html index 7f15da2f2..20ba5c4bd 100644 --- a/frontend/src/app/components/test-transactions/test-transactions.component.html +++ b/frontend/src/app/components/test-transactions/test-transactions.component.html @@ -6,7 +6,7 @@
- +
diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.html b/frontend/src/app/shared/components/global-footer/global-footer.component.html index 7e3d44b06..b1ce52e5e 100644 --- a/frontend/src/app/shared/components/global-footer/global-footer.component.html +++ b/frontend/src/app/shared/components/global-footer/global-footer.component.html @@ -49,6 +49,7 @@

Lightning Explorer

Recent Blocks

Broadcast Transaction

+

Test Transaction

Connect to our Nodes

API Documentation

From 2e49ef38c923227dfea1387f61d92a694bc669a1 Mon Sep 17 00:00:00 2001 From: nymkappa <1612910616@pm.me> Date: Sat, 4 May 2024 10:01:21 +0200 Subject: [PATCH 15/62] [lightning] apply 4991 at node creation as well --- backend/src/api/explorer/nodes.api.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/backend/src/api/explorer/nodes.api.ts b/backend/src/api/explorer/nodes.api.ts index 3c65ee1f8..22c854fcc 100644 --- a/backend/src/api/explorer/nodes.api.ts +++ b/backend/src/api/explorer/nodes.api.ts @@ -666,7 +666,9 @@ class NodesApi { node.last_update = null; } - const sockets = (node.addresses?.map(a => a.addr).join(',')) ?? ''; + const uniqueAddr = [...new Set(node.addresses?.map(a => a.addr))]; + const formattedSockets = (uniqueAddr.join(',')) ?? ''; + const query = `INSERT INTO nodes( public_key, first_seen, @@ -695,13 +697,13 @@ class NodesApi { node.alias, this.aliasToSearchText(node.alias), node.color, - sockets, + formattedSockets, JSON.stringify(node.features), node.last_update, node.alias, this.aliasToSearchText(node.alias), node.color, - sockets, + formattedSockets, JSON.stringify(node.features), ]); } catch (e) { From 56a0d89b888c861e49b91060362fd682abbfbcd5 Mon Sep 17 00:00:00 2001 From: Mononaut Date: Sat, 4 May 2024 17:08:38 +0000 Subject: [PATCH 16/62] Improve deferred mempool visualization updates --- .../block-overview-graph.component.ts | 10 ++++++++-- .../mempool-block-overview.component.ts | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/frontend/src/app/components/block-overview-graph/block-overview-graph.component.ts b/frontend/src/app/components/block-overview-graph/block-overview-graph.component.ts index 57db9bfca..ceb12738d 100644 --- a/frontend/src/app/components/block-overview-graph/block-overview-graph.component.ts +++ b/frontend/src/app/components/block-overview-graph/block-overview-graph.component.ts @@ -238,7 +238,7 @@ export class BlockOverviewGraphComponent implements AfterViewInit, OnDestroy, On } } - // collates non-urgent updates into a set of consistent pending changes + // collates deferred updates into a set of consistent pending changes queueUpdate(add: TransactionStripped[], remove: string[], change: { txid: string, rate: number | undefined, acc: boolean | undefined }[], direction: string = 'left'): void { for (const tx of add) { this.pendingUpdate.add[tx.txid] = tx; @@ -262,9 +262,15 @@ export class BlockOverviewGraphComponent implements AfterViewInit, OnDestroy, On this.pendingUpdate.count++; } + deferredUpdate(add: TransactionStripped[], remove: string[], change: { txid: string, rate: number | undefined, acc: boolean | undefined }[], direction: string = 'left'): void { + this.queueUpdate(add, remove, change, direction); + this.applyQueuedUpdates(); + } + applyQueuedUpdates(): void { if (this.pendingUpdate.count && performance.now() > (this.lastUpdate + this.animationDuration)) { - this.update([], [], [], this.pendingUpdate?.direction); + this.applyUpdate(Object.values(this.pendingUpdate.add), Object.values(this.pendingUpdate.remove), Object.values(this.pendingUpdate.change), this.pendingUpdate.direction); + this.clearUpdateQueue(); } } diff --git a/frontend/src/app/components/mempool-block-overview/mempool-block-overview.component.ts b/frontend/src/app/components/mempool-block-overview/mempool-block-overview.component.ts index 3cea7e123..2c564882e 100644 --- a/frontend/src/app/components/mempool-block-overview/mempool-block-overview.component.ts +++ b/frontend/src/app/components/mempool-block-overview/mempool-block-overview.component.ts @@ -144,7 +144,7 @@ export class MempoolBlockOverviewComponent implements OnInit, OnDestroy, OnChang if (blockMined) { this.blockGraph.update(delta.added, delta.removed, delta.changed || [], blockMined ? this.chainDirection : this.poolDirection, blockMined); } else { - this.blockGraph.queueUpdate(delta.added, delta.removed, delta.changed || [], this.poolDirection); + this.blockGraph.deferredUpdate(delta.added, delta.removed, delta.changed || [], this.poolDirection); } } From a29b29300e772e9e1f974156b9300c06e39db7c8 Mon Sep 17 00:00:00 2001 From: Mononaut Date: Sat, 4 May 2024 00:18:33 +0000 Subject: [PATCH 17/62] Replace acceleration API polling with websocket --- backend/src/api/mempool.ts | 4 ++ backend/src/api/websocket-handler.ts | 22 ++++++++ .../accelerations-list.component.ts | 15 ++++-- .../accelerator-dashboard.component.ts | 50 +++++++++++-------- .../pending-stats/pending-stats.component.ts | 8 +-- .../src/app/interfaces/websocket.interface.ts | 9 +++- frontend/src/app/services/state.service.ts | 26 ++++++++-- .../src/app/services/websocket.service.ts | 34 +++++++++++++ 8 files changed, 136 insertions(+), 32 deletions(-) diff --git a/backend/src/api/mempool.ts b/backend/src/api/mempool.ts index 176bedddb..c93d51005 100644 --- a/backend/src/api/mempool.ts +++ b/backend/src/api/mempool.ts @@ -404,6 +404,10 @@ class Mempool { const newAccelerationMap: { [txid: string]: Acceleration } = {}; for (const acceleration of newAccelerations) { + // skip transactions we don't know about + if (!this.mempoolCache[acceleration.txid]) { + continue; + } newAccelerationMap[acceleration.txid] = acceleration; if (this.accelerations[acceleration.txid] == null) { // new acceleration diff --git a/backend/src/api/websocket-handler.ts b/backend/src/api/websocket-handler.ts index fdda3df88..f92e6cdfe 100644 --- a/backend/src/api/websocket-handler.ts +++ b/backend/src/api/websocket-handler.ts @@ -347,6 +347,17 @@ class WebsocketHandler { } } + if (parsedMessage && parsedMessage['track-accelerations'] != null) { + if (parsedMessage['track-accelerations']) { + client['track-accelerations'] = true; + response['accelerations'] = JSON.stringify({ + accelerations: Object.values(memPool.getAccelerations()), + }); + } else { + client['track-accelerations'] = false; + } + } + if (parsedMessage.action === 'init') { if (!this.socketData['blocks']?.length || !this.socketData['da'] || !this.socketData['backendInfo'] || !this.socketData['conversions']) { this.updateSocketData(); @@ -537,6 +548,7 @@ class WebsocketHandler { const vBytesPerSecond = memPool.getVBytesPerSecond(); const rbfTransactions = Common.findRbfTransactions(newTransactions, deletedTransactions); const da = difficultyAdjustment.getDifficultyAdjustment(); + const accelerations = memPool.getAccelerations(); memPool.handleRbfTransactions(rbfTransactions); const rbfChanges = rbfCache.getRbfChanges(); let rbfReplacements; @@ -644,6 +656,12 @@ class WebsocketHandler { const addressCache = this.makeAddressCache(newTransactions); const removedAddressCache = this.makeAddressCache(deletedTransactions); + // pre-compute acceleration delta + const accelerationUpdate = { + added: accelerationDelta.map(txid => accelerations[txid]).filter(acc => acc != null), + removed: accelerationDelta.filter(txid => !accelerations[txid]), + }; + // TODO - Fix indentation after PR is merged for (const server of this.webSocketServers) { server.clients.forEach(async (client) => { @@ -891,6 +909,10 @@ class WebsocketHandler { response['mempool-transactions'] = getCachedResponse('mempool-transactions', mempoolDelta); } + if (client['track-accelerations'] && (accelerationUpdate.added.length || accelerationUpdate.removed.length)) { + response['accelerations'] = getCachedResponse('accelerations', accelerationUpdate); + } + if (Object.keys(response).length) { client.send(this.serializeResponse(response)); } diff --git a/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.ts b/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.ts index f2c082fc8..237b14317 100644 --- a/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.ts +++ b/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.ts @@ -1,5 +1,5 @@ -import { Component, OnInit, ChangeDetectionStrategy, Input, ChangeDetectorRef } from '@angular/core'; -import { combineLatest, BehaviorSubject, Observable, catchError, of, switchMap, tap } from 'rxjs'; +import { Component, OnInit, ChangeDetectionStrategy, Input, ChangeDetectorRef, OnDestroy } from '@angular/core'; +import { BehaviorSubject, Observable, catchError, of, switchMap, tap } from 'rxjs'; import { Acceleration, BlockExtended } from '../../../interfaces/node-api.interface'; import { StateService } from '../../../services/state.service'; import { WebsocketService } from '../../../services/websocket.service'; @@ -11,7 +11,7 @@ import { ServicesApiServices } from '../../../services/services-api.service'; styleUrls: ['./accelerations-list.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class AccelerationsListComponent implements OnInit { +export class AccelerationsListComponent implements OnInit, OnDestroy { @Input() widget: boolean = false; @Input() pending: boolean = false; @Input() accelerations$: Observable; @@ -44,7 +44,10 @@ export class AccelerationsListComponent implements OnInit { this.accelerationList$ = this.pageSubject.pipe( switchMap((page) => { - const accelerationObservable$ = this.accelerations$ || (this.pending ? this.servicesApiService.getAccelerations$() : this.servicesApiService.getAccelerationHistoryObserveResponse$({ page: page })); + const accelerationObservable$ = this.accelerations$ || (this.pending ? this.stateService.liveAccelerations$ : this.servicesApiService.getAccelerationHistoryObserveResponse$({ page: page })); + if (!this.accelerations$ && this.pending) { + this.websocketService.ensureTrackAccelerations(); + } return accelerationObservable$.pipe( switchMap(response => { let accelerations = response; @@ -85,4 +88,8 @@ export class AccelerationsListComponent implements OnInit { trackByBlock(index: number, block: BlockExtended): number { return block.height; } + + ngOnDestroy(): void { + this.websocketService.stopTrackAccelerations(); + } } \ No newline at end of file diff --git a/frontend/src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.ts b/frontend/src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.ts index dc53d8f95..282927b4a 100644 --- a/frontend/src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.ts +++ b/frontend/src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.ts @@ -1,10 +1,10 @@ -import { ChangeDetectionStrategy, Component, HostListener, Inject, OnInit, PLATFORM_ID } from '@angular/core'; +import { ChangeDetectionStrategy, Component, HostListener, Inject, OnDestroy, OnInit, PLATFORM_ID } from '@angular/core'; import { SeoService } from '../../../services/seo.service'; import { OpenGraphService } from '../../../services/opengraph.service'; import { WebsocketService } from '../../../services/websocket.service'; import { Acceleration, BlockExtended } from '../../../interfaces/node-api.interface'; import { StateService } from '../../../services/state.service'; -import { Observable, catchError, combineLatest, distinctUntilChanged, interval, map, of, share, startWith, switchMap, tap } from 'rxjs'; +import { Observable, Subscription, catchError, combineLatest, distinctUntilChanged, map, of, share, switchMap, tap } from 'rxjs'; import { Color } from '../../block-overview-graph/sprite-types'; import { hexToColor } from '../../block-overview-graph/utils'; import TxView from '../../block-overview-graph/tx-view'; @@ -28,7 +28,7 @@ interface AccelerationBlock extends BlockExtended { styleUrls: ['./accelerator-dashboard.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class AcceleratorDashboardComponent implements OnInit { +export class AcceleratorDashboardComponent implements OnInit, OnDestroy { blocks$: Observable; accelerations$: Observable; pendingAccelerations$: Observable; @@ -39,6 +39,8 @@ export class AcceleratorDashboardComponent implements OnInit { firstLoad = true; timespan: '3d' | '1w' | '1m' = '1w'; + accelerationDeltaSubscription: Subscription; + graphHeight: number = 300; theme: ThemeService; @@ -59,27 +61,28 @@ export class AcceleratorDashboardComponent implements OnInit { ngOnInit(): void { this.onResize(); this.websocketService.want(['blocks', 'mempool-blocks', 'stats']); + this.websocketService.startTrackAccelerations(); - this.pendingAccelerations$ = (this.stateService.isBrowser ? interval(30000) : of(null)).pipe( - startWith(true), - switchMap(() => { - return this.serviceApiServices.getAccelerations$().pipe( - catchError(() => { - return of([]); - }), - ); - }), - tap(accelerations => { - if (!this.firstLoad && accelerations.some(acc => !this.seen.has(acc.txid))) { - this.audioService.playSound('bright-harmony'); - } - for(const acc of accelerations) { - this.seen.add(acc.txid); - } - this.firstLoad = false; - }), + this.pendingAccelerations$ = this.stateService.liveAccelerations$.pipe( share(), ); + this.accelerationDeltaSubscription = this.stateService.accelerations$.subscribe((delta) => { + if (!delta.reset) { + let hasNewAcceleration = false; + for (const acc of delta.added) { + if (!this.seen.has(acc.txid)) { + hasNewAcceleration = true; + } + this.seen.add(acc.txid); + } + for (const txid of delta.removed) { + this.seen.delete(txid); + } + if (hasNewAcceleration) { + this.audioService.playSound('bright-harmony'); + } + } + }); this.accelerations$ = this.stateService.chainTip$.pipe( distinctUntilChanged(), @@ -154,6 +157,11 @@ export class AcceleratorDashboardComponent implements OnInit { return false; } + ngOnDestroy(): void { + this.accelerationDeltaSubscription.unsubscribe(); + this.websocketService.stopTrackAccelerations(); + } + @HostListener('window:resize', ['$event']) onResize(): void { if (window.innerWidth >= 992) { diff --git a/frontend/src/app/components/acceleration/pending-stats/pending-stats.component.ts b/frontend/src/app/components/acceleration/pending-stats/pending-stats.component.ts index ed7061156..568e60d7e 100644 --- a/frontend/src/app/components/acceleration/pending-stats/pending-stats.component.ts +++ b/frontend/src/app/components/acceleration/pending-stats/pending-stats.component.ts @@ -2,7 +2,8 @@ import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core import { Observable, of } from 'rxjs'; import { switchMap } from 'rxjs/operators'; import { Acceleration } from '../../../interfaces/node-api.interface'; -import { ServicesApiServices } from '../../../services/services-api.service'; +import { StateService } from '../../../services/state.service'; +import { WebsocketService } from '../../../services/websocket.service'; @Component({ selector: 'app-pending-stats', @@ -15,11 +16,12 @@ export class PendingStatsComponent implements OnInit { public accelerationStats$: Observable; constructor( - private servicesApiService: ServicesApiServices, + private stateService: StateService, + private websocketService: WebsocketService, ) { } ngOnInit(): void { - this.accelerationStats$ = (this.accelerations$ || this.servicesApiService.getAccelerations$()).pipe( + this.accelerationStats$ = (this.accelerations$ || this.stateService.liveAccelerations$).pipe( switchMap(accelerations => { let totalAccelerations = 0; let totalFeeDelta = 0; diff --git a/frontend/src/app/interfaces/websocket.interface.ts b/frontend/src/app/interfaces/websocket.interface.ts index 8c24979e7..22789986e 100644 --- a/frontend/src/app/interfaces/websocket.interface.ts +++ b/frontend/src/app/interfaces/websocket.interface.ts @@ -1,7 +1,7 @@ import { SafeResourceUrl } from '@angular/platform-browser'; import { ILoadingIndicators } from '../services/state.service'; import { Transaction } from './electrs.interface'; -import { BlockExtended, DifficultyAdjustment, RbfTree, TransactionStripped } from './node-api.interface'; +import { Acceleration, BlockExtended, DifficultyAdjustment, RbfTree, TransactionStripped } from './node-api.interface'; export interface WebsocketResponse { backend?: 'esplora' | 'electrum' | 'none'; @@ -35,6 +35,7 @@ export interface WebsocketResponse { 'track-mempool-block'?: number; 'track-rbf'?: string; 'track-rbf-summary'?: boolean; + 'track-accelerations'?: boolean; 'watch-mempool'?: boolean; 'refresh-blocks'?: boolean; } @@ -92,6 +93,12 @@ export interface MempoolBlockDeltaCompressed { changed: MempoolDeltaChange[]; } +export interface AccelerationDelta { + added: Acceleration[]; + removed: string[]; + reset?: boolean; +} + export interface MempoolInfo { loaded: boolean; // (boolean) True if the mempool is fully loaded size: number; // (numeric) Current tx count diff --git a/frontend/src/app/services/state.service.ts b/frontend/src/app/services/state.service.ts index b939574b5..34197a3d1 100644 --- a/frontend/src/app/services/state.service.ts +++ b/frontend/src/app/services/state.service.ts @@ -1,8 +1,8 @@ import { Inject, Injectable, PLATFORM_ID, LOCALE_ID } from '@angular/core'; -import { ReplaySubject, BehaviorSubject, Subject, fromEvent, Observable, merge } from 'rxjs'; +import { ReplaySubject, BehaviorSubject, Subject, fromEvent, Observable } from 'rxjs'; import { Transaction } from '../interfaces/electrs.interface'; -import { HealthCheckHost, IBackendInfo, MempoolBlock, MempoolBlockDelta, MempoolBlockUpdate, MempoolInfo, Recommendedfees, ReplacedTransaction, ReplacementInfo, isMempoolState } from '../interfaces/websocket.interface'; -import { BlockExtended, CpfpInfo, DifficultyAdjustment, MempoolPosition, OptimizedMempoolStats, RbfTree, TransactionStripped } from '../interfaces/node-api.interface'; +import { AccelerationDelta, HealthCheckHost, IBackendInfo, MempoolBlock, MempoolBlockUpdate, MempoolInfo, Recommendedfees, ReplacedTransaction, ReplacementInfo, isMempoolState } from '../interfaces/websocket.interface'; +import { Acceleration, BlockExtended, CpfpInfo, DifficultyAdjustment, MempoolPosition, OptimizedMempoolStats, RbfTree, TransactionStripped } from '../interfaces/node-api.interface'; import { Router, NavigationStart } from '@angular/router'; import { isPlatformBrowser } from '@angular/common'; import { filter, map, scan, shareReplay } from 'rxjs/operators'; @@ -129,6 +129,8 @@ export class StateService { mempoolBlocks$ = new ReplaySubject(1); mempoolBlockUpdate$ = new Subject(); liveMempoolBlockTransactions$: Observable<{ [txid: string]: TransactionStripped}>; + accelerations$ = new Subject(); + liveAccelerations$: Observable; txConfirmed$ = new Subject<[string, BlockExtended]>(); txReplaced$ = new Subject(); txRbfInfo$ = new Subject(); @@ -238,6 +240,24 @@ export class StateService { } }, {})); + // Emits the full list of pending accelerations each time it changes + this.liveAccelerations$ = this.accelerations$.pipe( + scan((accelerations: { [txid: string]: Acceleration }, delta: AccelerationDelta) => { + if (delta.reset) { + accelerations = {}; + } else { + for (const txid of delta.removed) { + delete accelerations[txid]; + } + } + for (const acc of delta.added) { + accelerations[acc.txid] = acc; + } + return accelerations; + }, {}), + map((accMap) => Object.values(accMap).sort((a,b) => b.added - a.added)) + ); + this.networkChanged$.subscribe((network) => { this.transactions$ = new BehaviorSubject(null); this.blocksSubject$.next([]); diff --git a/frontend/src/app/services/websocket.service.ts b/frontend/src/app/services/websocket.service.ts index e4df12aa6..fbadf0de3 100644 --- a/frontend/src/app/services/websocket.service.ts +++ b/frontend/src/app/services/websocket.service.ts @@ -33,6 +33,7 @@ export class WebsocketService { private isTrackingRbfSummary = false; private isTrackingAddress: string | false = false; private isTrackingAddresses: string[] | false = false; + private isTrackingAccelerations: boolean = false; private trackingMempoolBlock: number; private latestGitCommit = ''; private onlineCheckTimeout: number; @@ -132,6 +133,9 @@ export class WebsocketService { if (this.isTrackingAddresses) { this.startTrackAddresses(this.isTrackingAddresses); } + if (this.isTrackingAccelerations) { + this.startTrackAccelerations(); + } this.stateService.connectionState$.next(2); } @@ -235,6 +239,24 @@ export class WebsocketService { this.isTrackingRbfSummary = false; } + startTrackAccelerations() { + this.websocketSubject.next({ 'track-accelerations': true }); + this.isTrackingAccelerations = true; + } + + stopTrackAccelerations() { + if (this.isTrackingAccelerations) { + this.websocketSubject.next({ 'track-accelerations': false }); + this.isTrackingAccelerations = false; + } + } + + ensureTrackAccelerations() { + if (!this.isTrackingAccelerations) { + this.startTrackAccelerations(); + } + } + fetchStatistics(historicalDate: string) { this.websocketSubject.next({ historicalDate }); } @@ -416,6 +438,18 @@ export class WebsocketService { } } + if (response['accelerations']) { + if (response['accelerations'].accelerations) { + this.stateService.accelerations$.next({ + added: response['accelerations'].accelerations, + removed: [], + reset: true, + }); + } else { + this.stateService.accelerations$.next(response['accelerations']); + } + } + if (response['live-2h-chart']) { this.stateService.live2Chart$.next(response['live-2h-chart']); } From 69faa1d493b2341f81cef5615cf6f6cfbbf23ccd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 02:26:59 +0000 Subject: [PATCH 18/62] Bump dtolnay/rust-toolchain Bumps [dtolnay/rust-toolchain](https://github.com/dtolnay/rust-toolchain) from bb45937a053e097f8591208d8e74c90db1873d07 to d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a. - [Release notes](https://github.com/dtolnay/rust-toolchain/releases) - [Commits](https://github.com/dtolnay/rust-toolchain/compare/bb45937a053e097f8591208d8e74c90db1873d07...d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a) --- updated-dependencies: - dependency-name: dtolnay/rust-toolchain dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b392f2dc2..c8e9ae33b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,7 +35,7 @@ jobs: - name: Install ${{ steps.gettoolchain.outputs.toolchain }} Rust toolchain # Latest version available on this commit is 1.71.1 # Commit date is Aug 3, 2023 - uses: dtolnay/rust-toolchain@bb45937a053e097f8591208d8e74c90db1873d07 + uses: dtolnay/rust-toolchain@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a with: toolchain: ${{ steps.gettoolchain.outputs.toolchain }} From 1e5a55917c31350c17f747c3b73ce7b369a0a84e Mon Sep 17 00:00:00 2001 From: Mononaut Date: Mon, 6 May 2024 15:40:32 +0000 Subject: [PATCH 19/62] Add testnet4 frontend support --- frontend/src/app/app-routing.module.ts | 38 +++++++++++++++++++ frontend/src/app/app.constants.ts | 32 ++++++++-------- frontend/src/app/bitcoin.utils.ts | 5 +++ .../components/amount/amount.component.html | 1 + .../blockchain-blocks.component.ts | 1 + .../app/components/clock/clock.component.ts | 1 + .../liquid-master-page.component.html | 3 +- .../master-page-preview.component.html | 3 +- .../master-page/master-page.component.html | 7 ++-- .../search-form/search-form.component.ts | 2 +- .../svg-images/svg-images.component.html | 3 ++ .../components/tracker/tracker.component.html | 3 +- .../tx-bowtie-graph.component.ts | 1 + .../src/app/services/enterprise.service.ts | 1 + frontend/src/app/services/mining.service.ts | 2 +- .../src/app/services/navigation.service.ts | 3 +- frontend/src/app/services/seo.service.ts | 6 ++- frontend/src/app/services/state.service.ts | 12 +++++- frontend/src/app/shared/common.utils.ts | 2 +- .../shared/components/btc/btc.component.html | 1 + .../global-footer.component.html | 5 ++- .../global-footer/global-footer.component.ts | 2 +- .../components/sats/sats.component.html | 1 + frontend/src/app/shared/regex.utils.ts | 34 +++++++++++++++-- 24 files changed, 133 insertions(+), 36 deletions(-) diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts index 7a23e7556..5262a431a 100644 --- a/frontend/src/app/app-routing.module.ts +++ b/frontend/src/app/app-routing.module.ts @@ -53,6 +53,44 @@ let routes: Routes = [ }, ] }, + { + path: 'testnet4', + children: [ + { + path: '', + pathMatch: 'full', + loadChildren: () => import('./bitcoin-graphs.module').then(m => m.BitcoinGraphsModule), + data: { preload: true }, + }, + { + path: '', + loadChildren: () => import('./master-page.module').then(m => m.MasterPageModule), + data: { preload: true }, + }, + { + path: 'wallet', + children: [], + component: AddressGroupComponent, + data: { + networkSpecific: true, + } + }, + { + path: 'status', + data: { networks: ['bitcoin', 'liquid'] }, + component: StatusViewComponent + }, + { + path: '', + loadChildren: () => import('./bitcoin-graphs.module').then(m => m.BitcoinGraphsModule), + data: { preload: true }, + }, + { + path: '**', + redirectTo: '/testnet4' + }, + ] + }, { path: 'signet', children: [ diff --git a/frontend/src/app/app.constants.ts b/frontend/src/app/app.constants.ts index bd81d02c0..aaa53b8ba 100644 --- a/frontend/src/app/app.constants.ts +++ b/frontend/src/app/app.constants.ts @@ -189,22 +189,22 @@ export const specialBlocks = { '0': { labelEvent: 'Genesis', labelEventCompleted: 'The Genesis of Bitcoin', - networks: ['mainnet', 'testnet'], + networks: ['mainnet', 'testnet', 'testnet4'], }, '210000': { labelEvent: 'Bitcoin\'s 1st Halving', labelEventCompleted: 'Block Subsidy has halved to 25 BTC per block', - networks: ['mainnet', 'testnet'], + networks: ['mainnet', 'testnet', 'testnet4'], }, '420000': { labelEvent: 'Bitcoin\'s 2nd Halving', labelEventCompleted: 'Block Subsidy has halved to 12.5 BTC per block', - networks: ['mainnet', 'testnet'], + networks: ['mainnet', 'testnet', 'testnet4'], }, '630000': { labelEvent: 'Bitcoin\'s 3rd Halving', labelEventCompleted: 'Block Subsidy has halved to 6.25 BTC per block', - networks: ['mainnet', 'testnet'], + networks: ['mainnet', 'testnet', 'testnet4'], }, '709632': { labelEvent: 'Taproot 🌱 activation', @@ -214,62 +214,62 @@ export const specialBlocks = { '840000': { labelEvent: 'Bitcoin\'s 4th Halving', labelEventCompleted: 'Block Subsidy has halved to 3.125 BTC per block', - networks: ['mainnet', 'testnet'], + networks: ['mainnet', 'testnet', 'testnet4'], }, '1050000': { labelEvent: 'Bitcoin\'s 5th Halving', labelEventCompleted: 'Block Subsidy has halved to 1.5625 BTC per block', - networks: ['mainnet', 'testnet'], + networks: ['mainnet', 'testnet', 'testnet4'], }, '1260000': { labelEvent: 'Bitcoin\'s 6th Halving', labelEventCompleted: 'Block Subsidy has halved to 0.78125 BTC per block', - networks: ['mainnet', 'testnet'], + networks: ['mainnet', 'testnet', 'testnet4'], }, '1470000': { labelEvent: 'Bitcoin\'s 7th Halving', labelEventCompleted: 'Block Subsidy has halved to 0.390625 BTC per block', - networks: ['mainnet', 'testnet'], + networks: ['mainnet', 'testnet', 'testnet4'], }, '1680000': { labelEvent: 'Bitcoin\'s 8th Halving', labelEventCompleted: 'Block Subsidy has halved to 0.1953125 BTC per block', - networks: ['mainnet', 'testnet'], + networks: ['mainnet', 'testnet', 'testnet4'], }, '1890000': { labelEvent: 'Bitcoin\'s 9th Halving', labelEventCompleted: 'Block Subsidy has halved to 0.09765625 BTC per block', - networks: ['mainnet', 'testnet'], + networks: ['mainnet', 'testnet', 'testnet4'], }, '2100000': { labelEvent: 'Bitcoin\'s 10th Halving', labelEventCompleted: 'Block Subsidy has halved to 0.04882812 BTC per block', - networks: ['mainnet', 'testnet'], + networks: ['mainnet', 'testnet', 'testnet4'], }, '2310000': { labelEvent: 'Bitcoin\'s 11th Halving', labelEventCompleted: 'Block Subsidy has halved to 0.02441406 BTC per block', - networks: ['mainnet', 'testnet'], + networks: ['mainnet', 'testnet', 'testnet4'], }, '2520000': { labelEvent: 'Bitcoin\'s 12th Halving', labelEventCompleted: 'Block Subsidy has halved to 0.01220703 BTC per block', - networks: ['mainnet', 'testnet'], + networks: ['mainnet', 'testnet', 'testnet4'], }, '2730000': { labelEvent: 'Bitcoin\'s 13th Halving', labelEventCompleted: 'Block Subsidy has halved to 0.00610351 BTC per block', - networks: ['mainnet', 'testnet'], + networks: ['mainnet', 'testnet', 'testnet4'], }, '2940000': { labelEvent: 'Bitcoin\'s 14th Halving', labelEventCompleted: 'Block Subsidy has halved to 0.00305175 BTC per block', - networks: ['mainnet', 'testnet'], + networks: ['mainnet', 'testnet', 'testnet4'], }, '3150000': { labelEvent: 'Bitcoin\'s 15th Halving', labelEventCompleted: 'Block Subsidy has halved to 0.00152587 BTC per block', - networks: ['mainnet', 'testnet'], + networks: ['mainnet', 'testnet', 'testnet4'], } }; diff --git a/frontend/src/app/bitcoin.utils.ts b/frontend/src/app/bitcoin.utils.ts index d5b5122fa..b9f4f39e1 100644 --- a/frontend/src/app/bitcoin.utils.ts +++ b/frontend/src/app/bitcoin.utils.ts @@ -266,6 +266,11 @@ const featureActivation = { segwit: 872730, taproot: 2032291, }, + testnet4: { + rbf: 0, + segwit: 0, + taproot: 0, + }, signet: { rbf: 0, segwit: 0, diff --git a/frontend/src/app/components/amount/amount.component.html b/frontend/src/app/components/amount/amount.component.html index f157d17d6..b38cf4c41 100644 --- a/frontend/src/app/components/amount/amount.component.html +++ b/frontend/src/app/components/amount/amount.component.html @@ -43,5 +43,6 @@ L- tL- t + t s diff --git a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts index 35499f162..1d0e284f8 100644 --- a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts +++ b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts @@ -70,6 +70,7 @@ export class BlockchainBlocksComponent implements OnInit, OnChanges, OnDestroy { liquid: ['var(--liquid)', 'var(--testnet-alt)'], 'liquidtestnet': ['var(--liquidtestnet)', 'var(--liquidtestnet-alt)'], testnet: ['var(--testnet)', 'var(--testnet-alt)'], + testnet4: ['var(--testnet)', 'var(--testnet-alt)'], signet: ['var(--signet)', 'var(--signet-alt)'], }; diff --git a/frontend/src/app/components/clock/clock.component.ts b/frontend/src/app/components/clock/clock.component.ts index 94ff3e810..90f24a753 100644 --- a/frontend/src/app/components/clock/clock.component.ts +++ b/frontend/src/app/components/clock/clock.component.ts @@ -36,6 +36,7 @@ export class ClockComponent implements OnInit { liquid: ['#116761', '#183550'], 'liquidtestnet': ['#494a4a', '#272e46'], testnet: ['#1d486f', '#183550'], + testnet4: ['#1d486f', '#183550'], signet: ['#6f1d5d', '#471850'], }; diff --git a/frontend/src/app/components/liquid-master-page/liquid-master-page.component.html b/frontend/src/app/components/liquid-master-page/liquid-master-page.component.html index 7d826ca87..7e39d9341 100644 --- a/frontend/src/app/components/liquid-master-page/liquid-master-page.component.html +++ b/frontend/src/app/components/liquid-master-page/liquid-master-page.component.html @@ -51,7 +51,8 @@
Mainnet Signet - Testnet + Testnet3 + Testnet4
Layer 2 Networks
Liquid Liquid Testnet diff --git a/frontend/src/app/components/master-page-preview/master-page-preview.component.html b/frontend/src/app/components/master-page-preview/master-page-preview.component.html index 36e8eed10..49efce400 100644 --- a/frontend/src/app/components/master-page-preview/master-page-preview.component.html +++ b/frontend/src/app/components/master-page-preview/master-page-preview.component.html @@ -15,7 +15,8 @@
Signet - Testnet + Testnet3 + Testnet4 Mainnet Testnet Mainnet diff --git a/frontend/src/app/components/master-page/master-page.component.html b/frontend/src/app/components/master-page/master-page.component.html index 5da892f4a..6383e999b 100644 --- a/frontend/src/app/components/master-page/master-page.component.html +++ b/frontend/src/app/components/master-page/master-page.component.html @@ -58,14 +58,15 @@ -
+
Mainnet Signet - Testnet + Testnet3 + Testnet4
Layer 2 Networks
Liquid Liquid Testnet @@ -114,7 +115,7 @@
- +
diff --git a/frontend/src/app/components/search-form/search-form.component.ts b/frontend/src/app/components/search-form/search-form.component.ts index 8f5e65f96..fe073564e 100644 --- a/frontend/src/app/components/search-form/search-form.component.ts +++ b/frontend/src/app/components/search-form/search-form.component.ts @@ -179,7 +179,7 @@ export class SearchFormComponent implements OnInit { const lightningResults = result[1]; // Do not show date and timestamp results for liquid - const isNetworkBitcoin = this.network === '' || this.network === 'testnet' || this.network === 'signet'; + const isNetworkBitcoin = this.network === '' || this.network === 'testnet' || this.network === 'testnet4' || this.network === 'signet'; const matchesBlockHeight = this.regexBlockheight.test(searchText) && parseInt(searchText) <= this.stateService.latestBlockHeight; const matchesDateTime = this.regexDate.test(searchText) && new Date(searchText).toString() !== 'Invalid Date' && new Date(searchText).getTime() <= Date.now() && isNetworkBitcoin; diff --git a/frontend/src/app/components/svg-images/svg-images.component.html b/frontend/src/app/components/svg-images/svg-images.component.html index 3fe3f56c8..395bbcc53 100644 --- a/frontend/src/app/components/svg-images/svg-images.component.html +++ b/frontend/src/app/components/svg-images/svg-images.component.html @@ -60,6 +60,9 @@ + + + diff --git a/frontend/src/app/components/tracker/tracker.component.html b/frontend/src/app/components/tracker/tracker.component.html index c75e6fec6..4a726f28e 100644 --- a/frontend/src/app/components/tracker/tracker.component.html +++ b/frontend/src/app/components/tracker/tracker.component.html @@ -5,7 +5,8 @@
Bitcoin Signet - Bitcoin Testnet + Bitcoin Testnet3 + Bitcoin Testnet4 Liquid Liquid Testnet Bitcoin diff --git a/frontend/src/app/components/tx-bowtie-graph/tx-bowtie-graph.component.ts b/frontend/src/app/components/tx-bowtie-graph/tx-bowtie-graph.component.ts index 9bbca05dd..30e85a6e7 100644 --- a/frontend/src/app/components/tx-bowtie-graph/tx-bowtie-graph.component.ts +++ b/frontend/src/app/components/tx-bowtie-graph/tx-bowtie-graph.component.ts @@ -91,6 +91,7 @@ export class TxBowtieGraphComponent implements OnInit, OnChanges { 'liquidtestnet': ['#d2d2d2', '#979797', '#d2d2d200'], // testnet: ['#1d486f', '#183550'], testnet: ['#4edf77', '#10a0af', '#4edf7700'], + testnet4: ['#4edf77', '#10a0af', '#4edf7700'], // signet: ['#6f1d5d', '#471850'], signet: ['#d24fc8', '#a84fd2', '#d24fc800'], }; diff --git a/frontend/src/app/services/enterprise.service.ts b/frontend/src/app/services/enterprise.service.ts index 5de57b059..4ea890f1f 100644 --- a/frontend/src/app/services/enterprise.service.ts +++ b/frontend/src/app/services/enterprise.service.ts @@ -41,6 +41,7 @@ export class EnterpriseService { disableSubnetworks(): void { this.stateService.env.TESTNET_ENABLED = false; + this.stateService.env.TESTNET4_ENABLED = false; this.stateService.env.LIQUID_ENABLED = false; this.stateService.env.LIQUID_TESTNET_ENABLED = false; this.stateService.env.SIGNET_ENABLED = false; diff --git a/frontend/src/app/services/mining.service.ts b/frontend/src/app/services/mining.service.ts index 96723921e..952d13a78 100644 --- a/frontend/src/app/services/mining.service.ts +++ b/frontend/src/app/services/mining.service.ts @@ -58,7 +58,7 @@ export class MiningService { // I think it's fine to hardcode this since we don't have x1000 hashrate jump everyday // If we want to support the mining dashboard for testnet, we can hardcode it too let selectedPower = 18; - if (this.stateService.network === 'testnet') { + if (this.stateService.network === 'testnet' || this.stateService.network === 'testnet4') { selectedPower = 12; } diff --git a/frontend/src/app/services/navigation.service.ts b/frontend/src/app/services/navigation.service.ts index 2db3f6025..1a22c1371 100644 --- a/frontend/src/app/services/navigation.service.ts +++ b/frontend/src/app/services/navigation.service.ts @@ -9,6 +9,7 @@ const networkModules = { subnets: [ { name: 'mainnet', path: '' }, { name: 'testnet', path: '/testnet' }, + { name: 'testnet4', path: '/testnet4' }, { name: 'signet', path: '/signet' }, ], }, @@ -68,7 +69,7 @@ export class NavigationService { } if (route.url?.length) { path = [path, ...route.url.map(segment => segment.path).filter(path => { - return path.length && !['testnet', 'signet'].includes(path); + return path.length && !['testnet', 'testnet4', 'signet'].includes(path); })].join('/'); } route = route.firstChild; diff --git a/frontend/src/app/services/seo.service.ts b/frontend/src/app/services/seo.service.ts index 008cdc9bc..1431a52d8 100644 --- a/frontend/src/app/services/seo.service.ts +++ b/frontend/src/app/services/seo.service.ts @@ -81,7 +81,9 @@ export class SeoService { getTitle(): string { if (this.network === 'testnet') - return this.baseTitle + ' - Bitcoin Testnet'; + return this.baseTitle + ' - Bitcoin Testnet3'; + if (this.network === 'testnet4') + return this.baseTitle + ' - Bitcoin Testnet4'; if (this.network === 'signet') return this.baseTitle + ' - Bitcoin Signet'; if (this.network === 'liquid') @@ -92,7 +94,7 @@ export class SeoService { } getDescription(): string { - if ( (this.network === 'testnet') || (this.network === 'signet') || (this.network === '') || (this.network == 'mainnet') ) + if ( (this.network === 'testnet') || (this.network === 'testnet4') || (this.network === 'signet') || (this.network === '') || (this.network == 'mainnet') ) return this.baseDescription + ' See the real-time status of your transactions, browse network stats, and more.'; if ( (this.network === 'liquid') || (this.network === 'liquidtestnet') ) return this.baseDescription + ' See Liquid transactions & assets, get network info, and more.'; diff --git a/frontend/src/app/services/state.service.ts b/frontend/src/app/services/state.service.ts index b939574b5..1aa126471 100644 --- a/frontend/src/app/services/state.service.ts +++ b/frontend/src/app/services/state.service.ts @@ -40,6 +40,7 @@ export interface Customization { export interface Env { TESTNET_ENABLED: boolean; + TESTNET4_ENABLED: boolean; SIGNET_ENABLED: boolean; LIQUID_ENABLED: boolean; LIQUID_TESTNET_ENABLED: boolean; @@ -73,6 +74,7 @@ export interface Env { const defaultEnv: Env = { 'TESTNET_ENABLED': false, + 'TESTNET4_ENABLED': false, 'SIGNET_ENABLED': false, 'LIQUID_ENABLED': false, 'LIQUID_TESTNET_ENABLED': false, @@ -298,7 +300,7 @@ export class StateService { // (?:preview\/)? optional "preview" prefix (non-capturing) // (testnet|signet)/ network string (captured as networkMatches[1]) // ($|\/) network string must end or end with a slash - const networkMatches = url.match(/^\/(?:[a-z]{2}(?:-[A-Z]{2})?\/)?(?:preview\/)?(testnet|signet)($|\/)/); + const networkMatches = url.match(/^\/(?:[a-z]{2}(?:-[A-Z]{2})?\/)?(?:preview\/)?(testnet4?|signet)($|\/)/); switch (networkMatches && networkMatches[1]) { case 'signet': if (this.network !== 'signet') { @@ -317,6 +319,12 @@ export class StateService { } } return; + case 'testnet4': + if (this.network !== 'testnet4') { + this.network = 'testnet4'; + this.networkChanged$.next('testnet4'); + } + return; default: if (this.env.BASE_MODULE !== 'mempool') { if (this.network !== this.env.BASE_MODULE) { @@ -365,7 +373,7 @@ export class StateService { } isAnyTestnet(): boolean { - return ['testnet', 'signet', 'liquidtestnet'].includes(this.network); + return ['testnet', 'testnet4', 'signet', 'liquidtestnet'].includes(this.network); } resetChainTip() { diff --git a/frontend/src/app/shared/common.utils.ts b/frontend/src/app/shared/common.utils.ts index be1e32c73..28e510e14 100644 --- a/frontend/src/app/shared/common.utils.ts +++ b/frontend/src/app/shared/common.utils.ts @@ -151,7 +151,7 @@ export function nextRoundNumber(num: number): number { export function seoDescriptionNetwork(network: string): string { if( network === 'liquidtestnet' || network === 'testnet' ) { return ' Testnet'; - } else if( network === 'signet' || network === 'testnet' ) { + } else if( network === 'signet' || network === 'testnet' || network === 'testnet4') { return ' ' + network.charAt(0).toUpperCase() + network.slice(1); } return ''; diff --git a/frontend/src/app/shared/components/btc/btc.component.html b/frontend/src/app/shared/components/btc/btc.component.html index c13a8ff31..e002489f5 100644 --- a/frontend/src/app/shared/components/btc/btc.component.html +++ b/frontend/src/app/shared/components/btc/btc.component.html @@ -4,5 +4,6 @@ L- tL- t- + t- s-{{ unit }} \ No newline at end of file diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.html b/frontend/src/app/shared/components/global-footer/global-footer.component.html index b1ce52e5e..cbe7dd330 100644 --- a/frontend/src/app/shared/components/global-footer/global-footer.component.html +++ b/frontend/src/app/shared/components/global-footer/global-footer.component.html @@ -62,10 +62,11 @@

More FAQs »

-
+

Networks

Mainnet Explorer

-

Testnet Explorer

+

Testnet3 Explorer

+

Testnet4 Explorer

Signet Explorer

Liquid Testnet Explorer

Liquid Explorer

diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.ts b/frontend/src/app/shared/components/global-footer/global-footer.component.ts index 5300ba107..48603ffbe 100644 --- a/frontend/src/app/shared/components/global-footer/global-footer.component.ts +++ b/frontend/src/app/shared/components/global-footer/global-footer.component.ts @@ -76,7 +76,7 @@ export class GlobalFooterComponent implements OnInit { networkLink(network) { const thisNetwork = network || 'mainnet'; - if( network === '' || network === 'mainnet' || network === 'testnet' || network === 'signet' ) { + if( network === '' || network === 'mainnet' || network === 'testnet' || network === 'testnet4' || network === 'signet' ) { return (this.env.BASE_MODULE === 'mempool' ? '' : this.env.MEMPOOL_WEBSITE_URL + this.urlLanguage) + this.networkPaths[thisNetwork] || '/'; } if( network === 'liquid' || network === 'liquidtestnet' ) { diff --git a/frontend/src/app/shared/components/sats/sats.component.html b/frontend/src/app/shared/components/sats/sats.component.html index 1b4ab9143..bdd718e9f 100644 --- a/frontend/src/app/shared/components/sats/sats.component.html +++ b/frontend/src/app/shared/components/sats/sats.component.html @@ -4,5 +4,6 @@ L- tL- t- + t- s-sats \ No newline at end of file diff --git a/frontend/src/app/shared/regex.utils.ts b/frontend/src/app/shared/regex.utils.ts index 422d538e0..187111a59 100644 --- a/frontend/src/app/shared/regex.utils.ts +++ b/frontend/src/app/shared/regex.utils.ts @@ -62,6 +62,20 @@ const ADDRESS_CHARS: { + `{20,100}` + `)`, }, + testnet4: { + base58: `[mn2]` // Starts with a single m, n, or 2 (P2PKH is m or n, 2 is P2SH) + + BASE58_CHARS + + `{33,34}`, // m|n is 34 length, 2 is 35 length (We match the first letter separately) + bech32: `(?:` + + `tb1` // Starts with tb1 + + BECH32_CHARS_LW + + `{20,100}` // As per bech32, 6 char checksum is minimum + + `|` + + `TB1` // All upper case version + + BECH32_CHARS_UP + + `{20,100}` + + `)`, + }, signet: { base58: `[mn2]` + BASE58_CHARS @@ -128,7 +142,7 @@ const ADDRESS_CHARS: { type RegexTypeNoAddrNoBlockHash = | `transaction` | `blockheight` | `date` | `timestamp`; export type RegexType = `address` | `blockhash` | RegexTypeNoAddrNoBlockHash; -export const NETWORKS = [`testnet`, `signet`, `liquid`, `liquidtestnet`, `mainnet`] as const; +export const NETWORKS = [`testnet`, `testnet4`, `signet`, `liquid`, `liquidtestnet`, `mainnet`] as const; export type Network = typeof NETWORKS[number]; // Turn const array into union type export const ADDRESS_REGEXES: [RegExp, Network][] = NETWORKS @@ -144,6 +158,8 @@ function isNetworkAvailable(network: Network, env: Env): boolean { switch (network) { case 'testnet': return env.TESTNET_ENABLED === true; + case 'testnet4': + return env.TESTNET4_ENABLED === true; case 'signet': return env.SIGNET_ENABLED === true; case 'liquid': @@ -160,7 +176,7 @@ function isNetworkAvailable(network: Network, env: Env): boolean { export function needBaseModuleChange(fromBaseModule: 'mempool' | 'liquid', toNetwork: Network): boolean { if (!toNetwork) return false; // No target network means no change needed if (fromBaseModule === 'mempool') { - return toNetwork !== 'mainnet' && toNetwork !== 'testnet' && toNetwork !== 'signet'; + return toNetwork !== 'mainnet' && toNetwork !== 'testnet' && toNetwork !== 'testnet4' && toNetwork !== 'signet'; } if (fromBaseModule === 'liquid') { return toNetwork !== 'liquid' && toNetwork !== 'liquidtestnet'; @@ -175,7 +191,7 @@ export function getTargetUrl(toNetwork: Network, address: string, env: Env): str targetUrl += '/address/'; targetUrl += address; } - if (toNetwork === 'mainnet' || toNetwork === 'testnet' || toNetwork === 'signet') { + if (toNetwork === 'mainnet' || toNetwork === 'testnet' || toNetwork === 'testnet4' || toNetwork === 'signet') { targetUrl = env.MEMPOOL_WEBSITE_URL; targetUrl += (toNetwork === 'mainnet' ? '' : `/${toNetwork}`); targetUrl += '/address/'; @@ -209,6 +225,9 @@ export function getRegex(type: RegexType, network?: Network): RegExp { case `testnet`: leadingZeroes = 8; // Assumes at least 32 bits of difficulty break; + case `testnet4`: + leadingZeroes = 8; // Assumes at least 32 bits of difficulty + break; case `signet`: leadingZeroes = 5; break; @@ -261,6 +280,15 @@ export function getRegex(type: RegexType, network?: Network): RegExp { regex += `|`; // OR regex += `(?:02|03)${HEX_CHARS}{64}`; // Compressed pubkey break; + case `testnet4`: + regex += ADDRESS_CHARS.testnet.base58; + regex += `|`; // OR + regex += ADDRESS_CHARS.testnet.bech32; + regex += `|`; // OR + regex += `04${HEX_CHARS}{128}`; // Uncompressed pubkey + regex += `|`; // OR + regex += `(?:02|03)${HEX_CHARS}{64}`; // Compressed pubkey + break; case `signet`: regex += ADDRESS_CHARS.signet.base58; regex += `|`; // OR From f80c99576b7f75ede10cdb7fd76a49962884517f Mon Sep 17 00:00:00 2001 From: wiz Date: Mon, 6 May 2024 23:47:49 +0900 Subject: [PATCH 20/62] ops: Update prod scripts for testnet4 --- production/bitcoin.conf | 33 ++++ production/mempool-build-all | 4 +- production/mempool-config.testnet4.json | 84 ++++++++++ production/mempool-start-all | 2 +- production/nginx/location-testnet4-api.conf | 162 ++++++++++++++++++++ production/nginx/nginx.conf | 2 + production/nginx/server-mempool.conf | 2 + production/nginx/upstream-esplora.conf | 3 + production/nginx/upstream-mempool.conf | 6 +- 9 files changed, 293 insertions(+), 5 deletions(-) create mode 100644 production/mempool-config.testnet4.json create mode 100644 production/nginx/location-testnet4-api.conf diff --git a/production/bitcoin.conf b/production/bitcoin.conf index 3ec72e2e2..26d61b18c 100644 --- a/production/bitcoin.conf +++ b/production/bitcoin.conf @@ -84,6 +84,39 @@ zmqpubrawtx=tcp://127.0.0.1:18335 #addnode=[2401:b140:4::92:205]:18333 #addnode=[2401:b140:4::92:206]:18333 +[testnet4] +daemon=1 +rpcbind=127.0.0.1:48332 +rpcbind=[::1]:48332 +bind=0.0.0.0:48333 +bind=[::]:48333 +zmqpubrawblock=tcp://127.0.0.1:48334 +zmqpubrawtx=tcp://127.0.0.1:48335 +#addnode=[2401:b140:1::92:201]:48333 +#addnode=[2401:b140:1::92:202]:48333 +#addnode=[2401:b140:1::92:203]:48333 +#addnode=[2401:b140:1::92:204]:48333 +#addnode=[2401:b140:1::92:205]:48333 +#addnode=[2401:b140:1::92:206]:48333 +#addnode=[2401:b140:2::92:201]:48333 +#addnode=[2401:b140:2::92:202]:48333 +#addnode=[2401:b140:2::92:203]:48333 +#addnode=[2401:b140:2::92:204]:48333 +#addnode=[2401:b140:2::92:205]:48333 +#addnode=[2401:b140:2::92:206]:48333 +#addnode=[2401:b140:3::92:201]:48333 +#addnode=[2401:b140:3::92:202]:48333 +#addnode=[2401:b140:3::92:203]:48333 +#addnode=[2401:b140:3::92:204]:48333 +#addnode=[2401:b140:3::92:205]:48333 +#addnode=[2401:b140:3::92:206]:48333 +#addnode=[2401:b140:4::92:201]:48333 +#addnode=[2401:b140:4::92:202]:48333 +#addnode=[2401:b140:4::92:203]:48333 +#addnode=[2401:b140:4::92:204]:48333 +#addnode=[2401:b140:4::92:205]:48333 +#addnode=[2401:b140:4::92:206]:48333 + [signet] daemon=1 rpcbind=127.0.0.1:38332 diff --git a/production/mempool-build-all b/production/mempool-build-all index 63dadaac0..1466de3ab 100755 --- a/production/mempool-build-all +++ b/production/mempool-build-all @@ -96,6 +96,8 @@ build_backend() -e "s!__MEMPOOL_MAINNET_PASS__!${MEMPOOL_MAINNET_PASS}!" \ -e "s!__MEMPOOL_TESTNET_USER__!${MEMPOOL_TESTNET_USER}!" \ -e "s!__MEMPOOL_TESTNET_PASS__!${MEMPOOL_TESTNET_PASS}!" \ + -e "s!__MEMPOOL_TESTNET4_USER__!${MEMPOOL_TESTNET4_USER}!" \ + -e "s!__MEMPOOL_TESTNET4_PASS__!${MEMPOOL_TESTNET4_PASS}!" \ -e "s!__MEMPOOL_SIGNET_USER__!${MEMPOOL_SIGNET_USER}!" \ -e "s!__MEMPOOL_SIGNET_PASS__!${MEMPOOL_SIGNET_PASS}!" \ -e "s!__MEMPOOL_MAINNET_LIGHTNING_USER__!${MEMPOOL_MAINNET_LIGHTNING_USER}!" \ @@ -130,7 +132,7 @@ source "${NVM_DIR}/nvm.sh" # what to look for frontends=(mainnet liquid onbtc) -backends=(mainnet testnet signet liquid liquidtestnet onbtc) +backends=(mainnet testnet testnet4 signet liquid liquidtestnet onbtc) frontend_repos=() backend_repos=() diff --git a/production/mempool-config.testnet4.json b/production/mempool-config.testnet4.json new file mode 100644 index 000000000..64336866d --- /dev/null +++ b/production/mempool-config.testnet4.json @@ -0,0 +1,84 @@ +{ + "MEMPOOL": { + "OFFICIAL": true, + "NETWORK": "testnet", + "BACKEND": "esplora", + "HTTP_PORT": 8990, + "MINED_BLOCKS_CACHE": 144, + "SPAWN_CLUSTER_PROCS": 0, + "API_URL_PREFIX": "/api/v1/", + "INDEXING_BLOCKS_AMOUNT": -1, + "AUDIT": true, + "RUST_GBT": true, + "POLL_RATE_MS": 1000, + "DISK_CACHE_BLOCK_INTERVAL": 1, + "MAX_PUSH_TX_SIZE_WEIGHT": 4000000, + "ALLOW_UNREACHABLE": true, + "MAX_TRACKED_ADDRESSES": 10 + }, + "SYSLOG" : { + "MIN_PRIORITY": "debug" + }, + "CORE_RPC": { + "PORT": 48332, + "USERNAME": "__BITCOIN_RPC_USER__", + "PASSWORD": "__BITCOIN_RPC_PASS__" + }, + "ESPLORA": { + "UNIX_SOCKET_PATH": "/bitcoin/socket/esplora-bitcoin-testnet4", + "FALLBACK": [ + "http://node201.fmt.mempool.space:3005", + "http://node202.fmt.mempool.space:3005", + "http://node203.fmt.mempool.space:3005", + "http://node204.fmt.mempool.space:3005", + "http://node205.fmt.mempool.space:3005", + "http://node206.fmt.mempool.space:3005", + "http://node201.va1.mempool.space:3005", + "http://node202.va1.mempool.space:3005", + "http://node203.va1.mempool.space:3005", + "http://node204.va1.mempool.space:3005", + "http://node205.va1.mempool.space:3005", + "http://node206.va1.mempool.space:3005", + "http://node207.va1.mempool.space:3005", + "http://node208.va1.mempool.space:3005", + "http://node209.va1.mempool.space:3005", + "http://node210.va1.mempool.space:3005", + "http://node211.va1.mempool.space:3005", + "http://node212.va1.mempool.space:3005", + "http://node213.va1.mempool.space:3005", + "http://node214.va1.mempool.space:3005", + "http://node201.fra.mempool.space:3005", + "http://node202.fra.mempool.space:3005", + "http://node203.fra.mempool.space:3005", + "http://node204.fra.mempool.space:3005", + "http://node205.fra.mempool.space:3005", + "http://node206.fra.mempool.space:3005", + "http://node207.fra.mempool.space:3005", + "http://node208.fra.mempool.space:3005", + "http://node209.fra.mempool.space:3005", + "http://node210.fra.mempool.space:3005", + "http://node211.fra.mempool.space:3005", + "http://node212.fra.mempool.space:3005", + "http://node213.fra.mempool.space:3005", + "http://node214.fra.mempool.space:3005", + "http://node201.tk7.mempool.space:3005", + "http://node202.tk7.mempool.space:3005", + "http://node203.tk7.mempool.space:3005", + "http://node204.tk7.mempool.space:3005", + "http://node205.tk7.mempool.space:3005", + "http://node206.tk7.mempool.space:3005" + ] + }, + "DATABASE": { + "ENABLED": true, + "HOST": "127.0.0.1", + "SOCKET": "/var/run/mysql/mysql.sock", + "USERNAME": "__MEMPOOL_TESTNET4_USER__", + "PASSWORD": "__MEMPOOL_TESTNET4_PASS__", + "DATABASE": "mempool_testnet4" + }, + "STATISTICS": { + "ENABLED": true, + "TX_PER_SECOND_SAMPLE_PERIOD": 150 + } +} diff --git a/production/mempool-start-all b/production/mempool-start-all index ff962f95e..c08f1ec07 100755 --- a/production/mempool-start-all +++ b/production/mempool-start-all @@ -4,7 +4,7 @@ source "$NVM_DIR/nvm.sh" nvm use v20.12.0 # start all mempool backends that exist -for site in mainnet mainnet-lightning testnet testnet-lightning signet signet-lightning liquid liquidtestnet;do +for site in mainnet mainnet-lightning testnet testnet-lightning testnet4 signet signet-lightning liquid liquidtestnet;do cd "${HOME}/${site}/backend/" && \ echo "starting mempool backend: ${site}" && \ screen -dmS "${site}" sh -c 'while true;do npm run start-production;sleep 1;done' diff --git a/production/nginx/location-testnet4-api.conf b/production/nginx/location-testnet4-api.conf new file mode 100644 index 000000000..c0569ecf2 --- /dev/null +++ b/production/nginx/location-testnet4-api.conf @@ -0,0 +1,162 @@ +########### +# mempool # +########### + +# Block the internal APIs of esplora +location /testnet4/api/internal/ { + return 404; +} +location /testnet4/api/v1/internal/ { + return 404; +} + +# websocket has special HTTP headers +location /testnet4/api/v1/ws { + rewrite ^/testnet4/(.*) /$1 break; + try_files /dev/null @mempool-testnet4-api-v1-websocket; +} + +# warm cache mining and mempool API responses +location /testnet4/api/v1/statistics { + rewrite ^/testnet4/(.*) /$1 break; + try_files /dev/null @mempool-testnet4-api-v1-cache-warm; +} +location /testnet4/api/v1/mining { + rewrite ^/testnet4/(.*) /$1 break; + try_files /dev/null @mempool-testnet4-api-v1-cache-warm; +} + +# it's ok to cache blockchain data "forever", so we do 30d +location /testnet4/api/v1/block/ { + rewrite ^/testnet4/(.*) /$1 break; + try_files /dev/null @mempool-testnet4-api-v1-cache-forever; +} + +# everything else gets "normal" cache +location /testnet4/api/v1 { + rewrite ^/testnet4/(.*) /$1 break; + try_files /dev/null @mempool-testnet4-api-v1-cache-normal; +} + +########### +# esplora # +########### + +# it's ok to cache blockchain data "forever", so we do 30d +location /testnet4/api/block/ { + rewrite ^/testnet4/api/(.*) /$1 break; + try_files /dev/null @esplora-testnet4-api-cache-forever; +} +# other API responses cannot be cached +location /testnet4/api/ { + rewrite ^/testnet4/api/(.*) /$1 break; + try_files /dev/null @esplora-testnet4-api-cache-disabled; +} + +########### +# routing # +########### + +location @mempool-testnet4-api-v1-websocket { + proxy_pass $mempoolTestnet4; + proxy_http_version 1.1; + + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header X-Forwarded-Proto $scheme; +} + +location @mempool-testnet4-api-v1-cache-forever { + proxy_pass $mempoolTestnet4; + + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + + proxy_cache_background_update on; + proxy_cache_use_stale updating; + proxy_cache apicold; + proxy_cache_valid 200 30d; + proxy_redirect off; + + expires 30d; +} + +location @mempool-testnet4-api-v1-cache-warm { + proxy_pass $mempoolTestnet4; + + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + + proxy_cache_background_update on; + proxy_cache_use_stale updating; + proxy_cache apiwarm; + proxy_cache_valid 200 10s; + proxy_redirect off; +} + +location @mempool-testnet4-api-v1-cache-normal { + proxy_pass $mempoolTestnet4; + + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + + proxy_cache apinormal; + proxy_cache_valid 200 10s; + proxy_redirect off; + + expires 10s; +} + +location @mempool-testnet4-api-v1-cache-disabled { + proxy_pass $mempoolTestnet4; + + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + + proxy_redirect off; + proxy_buffering off; + + expires -1; +} + +location @esplora-testnet4-api-cache-disabled { + proxy_pass $esploraTestnet4; + + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + + proxy_redirect off; + proxy_buffering off; + + expires -1; +} + +location @esplora-testnet4-api-cache-forever { + proxy_pass $esploraTestnet4; + + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + + proxy_cache_background_update on; + proxy_cache_use_stale updating; + proxy_cache apicold; + proxy_cache_valid 200 30d; + proxy_redirect off; + + expires 30d; +} diff --git a/production/nginx/nginx.conf b/production/nginx/nginx.conf index c48d4992a..169faab30 100644 --- a/production/nginx/nginx.conf +++ b/production/nginx/nginx.conf @@ -55,12 +55,14 @@ http { set $mempoolMainnetLightning "http://mempool-bitcoin-mainnet-lightning"; set $mempoolTestnet "http://mempool-bitcoin-testnet"; set $mempoolTestnetLightning "http://mempool-bitcoin-testnet-lightning"; + set $mempoolTestnet4 "http://mempool-bitcoin-testnet4"; set $mempoolSignet "http://mempool-bitcoin-signet"; set $mempoolSignetLightning "http://mempool-bitcoin-signet-lightning"; # for blockstream/esplora daemons, see upstream-esplora.conf set $esploraMainnet "http://esplora-bitcoin-mainnet"; set $esploraTestnet "http://esplora-bitcoin-testnet"; + set $esploraTestnet4 "http://esplora-bitcoin-testnet4"; set $esploraSignet "http://esplora-bitcoin-signet"; # filesystem paths diff --git a/production/nginx/server-mempool.conf b/production/nginx/server-mempool.conf index 892fe50e1..a63c27fca 100644 --- a/production/nginx/server-mempool.conf +++ b/production/nginx/server-mempool.conf @@ -5,5 +5,7 @@ include mempool/production/nginx/location-api-v1-lightning.conf; include mempool/production/nginx/location-api.conf; include mempool/production/nginx/location-testnet-api.conf; include mempool/production/nginx/location-testnet-api-v1-lightning.conf; +include mempool/production/nginx/location-testnet4-api.conf; +#include mempool/production/nginx/location-testnet4-api-v1-lightning.conf; include mempool/production/nginx/location-signet-api.conf; include mempool/production/nginx/location-signet-api-v1-lightning.conf; diff --git a/production/nginx/upstream-esplora.conf b/production/nginx/upstream-esplora.conf index b7fbbf163..88ffa11bd 100644 --- a/production/nginx/upstream-esplora.conf +++ b/production/nginx/upstream-esplora.conf @@ -7,6 +7,9 @@ upstream esplora-liquid-mainnet { upstream esplora-bitcoin-testnet { server unix:/bitcoin/socket/esplora-bitcoin-testnet fail_timeout=10s max_fails=10 weight=99999; } +upstream esplora-bitcoin-testnet4 { + server unix:/bitcoin/socket/esplora-bitcoin-testnet4 fail_timeout=10s max_fails=10 weight=99999; +} upstream esplora-bitcoin-signet { server unix:/bitcoin/socket/esplora-bitcoin-signet fail_timeout=10s max_fails=10 weight=99999; } diff --git a/production/nginx/upstream-mempool.conf b/production/nginx/upstream-mempool.conf index c9cf9c2bb..50d291910 100644 --- a/production/nginx/upstream-mempool.conf +++ b/production/nginx/upstream-mempool.conf @@ -7,9 +7,6 @@ upstream mempool-liquid-mainnet { upstream mempool-bitcoin-testnet { server 127.0.0.1:8997 fail_timeout=10s max_fails=10 weight=99999; } -upstream mempool-bitcoin-bisq { - server 127.0.0.1:8996 fail_timeout=10s max_fails=10 weight=99999; -} upstream mempool-bitcoin-signet { server 127.0.0.1:8995 fail_timeout=10s max_fails=10 weight=99999; } @@ -25,3 +22,6 @@ upstream mempool-bitcoin-testnet-lightning { upstream mempool-bitcoin-signet-lightning { server 127.0.0.1:8991 fail_timeout=10s max_fails=10 weight=99999; } +upstream mempool-bitcoin-testnet4 { + server 127.0.0.1:8990 fail_timeout=10s max_fails=10 weight=99999; +} From 26da18810d4ee6773ccc575d9cc1b49a14201a1d Mon Sep 17 00:00:00 2001 From: Mononaut Date: Mon, 6 May 2024 16:48:39 +0000 Subject: [PATCH 21/62] Hide lightning tab on testnet4 --- .../src/app/components/master-page/master-page.component.html | 2 +- .../src/app/components/master-page/master-page.component.ts | 1 + .../components/global-footer/global-footer.component.html | 2 +- .../shared/components/global-footer/global-footer.component.ts | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/components/master-page/master-page.component.html b/frontend/src/app/components/master-page/master-page.component.html index 6383e999b..0c42b49ab 100644 --- a/frontend/src/app/components/master-page/master-page.component.html +++ b/frontend/src/app/components/master-page/master-page.component.html @@ -88,7 +88,7 @@ - diff --git a/frontend/src/app/components/master-page/master-page.component.ts b/frontend/src/app/components/master-page/master-page.component.ts index f3472f204..fc10a9e44 100644 --- a/frontend/src/app/components/master-page/master-page.component.ts +++ b/frontend/src/app/components/master-page/master-page.component.ts @@ -27,6 +27,7 @@ export class MasterPageComponent implements OnInit, OnDestroy { subdomain = ''; networkPaths: { [network: string]: string }; networkPaths$: Observable>; + lightningNetworks = ['', 'mainnet', 'bitcoin', 'testnet', 'signet']; footerVisible = true; user: any = undefined; servicesEnabled = false; diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.html b/frontend/src/app/shared/components/global-footer/global-footer.component.html index cbe7dd330..1e6f96a3d 100644 --- a/frontend/src/app/shared/components/global-footer/global-footer.component.html +++ b/frontend/src/app/shared/components/global-footer/global-footer.component.html @@ -46,7 +46,7 @@

Explore

Mining Dashboard

-

Lightning Explorer

+

Lightning Explorer

Recent Blocks

Broadcast Transaction

Test Transaction

diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.ts b/frontend/src/app/shared/components/global-footer/global-footer.component.ts index 48603ffbe..a0ab07401 100644 --- a/frontend/src/app/shared/components/global-footer/global-footer.component.ts +++ b/frontend/src/app/shared/components/global-footer/global-footer.component.ts @@ -27,6 +27,7 @@ export class GlobalFooterComponent implements OnInit { network$: Observable; networkPaths: { [network: string]: string }; currentNetwork = ''; + lightningNetworks = ['', 'mainnet', 'bitcoin', 'testnet', 'signet']; loggedIn = false; urlSubscription: Subscription; isServicesPage = false; From 15bd58c74600231270a869549f86dafe7ee214fb Mon Sep 17 00:00:00 2001 From: Mononaut Date: Mon, 6 May 2024 17:31:16 +0000 Subject: [PATCH 22/62] testnet4 beta tags --- .../liquid-master-page/liquid-master-page.component.html | 2 +- .../liquid-master-page/liquid-master-page.component.scss | 4 ++++ .../app/components/master-page/master-page.component.html | 2 +- .../app/components/master-page/master-page.component.scss | 4 ++++ .../components/global-footer/global-footer.component.html | 2 +- .../components/global-footer/global-footer.component.scss | 5 +++++ 6 files changed, 16 insertions(+), 3 deletions(-) diff --git a/frontend/src/app/components/liquid-master-page/liquid-master-page.component.html b/frontend/src/app/components/liquid-master-page/liquid-master-page.component.html index 7e39d9341..b2dd0344b 100644 --- a/frontend/src/app/components/liquid-master-page/liquid-master-page.component.html +++ b/frontend/src/app/components/liquid-master-page/liquid-master-page.component.html @@ -52,7 +52,7 @@ Mainnet Signet Testnet3 - Testnet4 + Testnet4 beta
Layer 2 Networks
Liquid Liquid Testnet diff --git a/frontend/src/app/components/liquid-master-page/liquid-master-page.component.scss b/frontend/src/app/components/liquid-master-page/liquid-master-page.component.scss index af7f53770..b0f3ce9c6 100644 --- a/frontend/src/app/components/liquid-master-page/liquid-master-page.component.scss +++ b/frontend/src/app/components/liquid-master-page/liquid-master-page.component.scss @@ -169,4 +169,8 @@ nav { margin-left: 5px; margin-right: 0px; } +} + +.beta-network { + font-size: 8px; } \ No newline at end of file diff --git a/frontend/src/app/components/master-page/master-page.component.html b/frontend/src/app/components/master-page/master-page.component.html index 0c42b49ab..18fbeac68 100644 --- a/frontend/src/app/components/master-page/master-page.component.html +++ b/frontend/src/app/components/master-page/master-page.component.html @@ -66,7 +66,7 @@ Mainnet Signet Testnet3 - Testnet4 + Testnet4 beta
Layer 2 Networks
Liquid Liquid Testnet diff --git a/frontend/src/app/components/master-page/master-page.component.scss b/frontend/src/app/components/master-page/master-page.component.scss index 77fe49927..8704d193a 100644 --- a/frontend/src/app/components/master-page/master-page.component.scss +++ b/frontend/src/app/components/master-page/master-page.component.scss @@ -243,6 +243,10 @@ nav { } } +.beta-network { + font-size: 8px; +} + .current-network-svg { width: 20px; height: 20px; diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.html b/frontend/src/app/shared/components/global-footer/global-footer.component.html index 1e6f96a3d..5b0fd77b9 100644 --- a/frontend/src/app/shared/components/global-footer/global-footer.component.html +++ b/frontend/src/app/shared/components/global-footer/global-footer.component.html @@ -66,7 +66,7 @@

Networks

Mainnet Explorer

Testnet3 Explorer

-

Testnet4 Explorer

+

Testnet4 Explorer beta

Signet Explorer

Liquid Testnet Explorer

Liquid Explorer

diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.scss b/frontend/src/app/shared/components/global-footer/global-footer.component.scss index 880ab79b4..e0daf4f4c 100644 --- a/frontend/src/app/shared/components/global-footer/global-footer.component.scss +++ b/frontend/src/app/shared/components/global-footer/global-footer.component.scss @@ -329,3 +329,8 @@ footer .nowrap { margin-right: 10px; } } + +.beta-network { + font-size: 8px; + margin-left: 1em; +} From de8462e81e71523f5af160804057fc255afcf60a Mon Sep 17 00:00:00 2001 From: Mononaut Date: Mon, 6 May 2024 17:31:49 +0000 Subject: [PATCH 23/62] testnet4 docs --- .../src/app/docs/api-docs/api-docs-data.ts | 39 ++++++++++--------- .../app/docs/api-docs/api-docs.component.html | 2 +- .../app/docs/api-docs/api-docs.component.ts | 5 +++ .../code-template/code-template.component.ts | 18 +++++++-- 4 files changed, 41 insertions(+), 23 deletions(-) diff --git a/frontend/src/app/docs/api-docs/api-docs-data.ts b/frontend/src/app/docs/api-docs/api-docs-data.ts index f4b4dfe04..c337b7520 100644 --- a/frontend/src/app/docs/api-docs/api-docs-data.ts +++ b/frontend/src/app/docs/api-docs/api-docs-data.ts @@ -1,5 +1,6 @@ -const bitcoinNetworks = ["", "testnet", "signet"]; +const bitcoinNetworks = ["", "testnet", "testnet4", "signet"]; const liquidNetworks = ["liquid", "liquidtestnet"]; +const lightningNetworks = ["", "testnet", "signet"]; const miningTimeIntervals = "24h, 3d, 1w, 1m, 3m, 6m, 1y, 2y, 3y"; const emptyCodeSample = { @@ -6513,7 +6514,7 @@ export const restApiDocsData = [ category: "lightning", fragment: "lightning", title: "Lightning", - showConditions: bitcoinNetworks + showConditions: lightningNetworks }, { type: "endpoint", @@ -6525,7 +6526,7 @@ export const restApiDocsData = [ default: "

Returns network-wide stats such as total number of channels and nodes, total capacity, and average/median fee figures.

Pass one of the following for :interval: latest, 24h, 3d, 1w, 1m, 3m, 6m, 1y, 2y, 3y.

" }, urlString: "/v1/lightning/statistics/:interval", - showConditions: bitcoinNetworks, + showConditions: lightningNetworks, showJsExamples: showJsExamplesDefaultFalse, codeExample: { default: { @@ -6621,7 +6622,7 @@ export const restApiDocsData = [ default: "

Returns Lightning nodes and channels that match a full-text, case-insensitive search :query across node aliases, node pubkeys, channel IDs, and short channel IDs.

" }, urlString: "/v1/lightning/search?searchText=:query", - showConditions: bitcoinNetworks, + showConditions: lightningNetworks, showJsExamples: showJsExamplesDefaultFalse, codeExample: { default: { @@ -6706,7 +6707,7 @@ export const restApiDocsData = [ default: "

Returns a list of Lightning nodes running on clearnet in the requested :country, where :country is an ISO Alpha-2 country code.

" }, urlString: "/v1/lightning/nodes/country/:country", - showConditions: bitcoinNetworks, + showConditions: lightningNetworks, showJsExamples: showJsExamplesDefaultFalse, codeExample: { default: { @@ -6928,7 +6929,7 @@ export const restApiDocsData = [ default: "

Returns aggregate capacity and number of clearnet nodes per country. Capacity figures are in satoshis.

" }, urlString: "/v1/lightning/nodes/countries", - showConditions: bitcoinNetworks, + showConditions: lightningNetworks, showJsExamples: showJsExamplesDefaultFalse, codeExample: { default: { @@ -7072,7 +7073,7 @@ export const restApiDocsData = [ default: "

Returns a list of nodes hosted by a specified :isp, where :isp is an ISP's ASN.

" }, urlString: "/v1/lightning/nodes/isp/:isp", - showConditions: bitcoinNetworks, + showConditions: lightningNetworks, showJsExamples: showJsExamplesDefaultFalse, codeExample: { default: { @@ -7191,7 +7192,7 @@ export const restApiDocsData = [ default: "

Returns aggregate capacity, number of nodes, and number of channels per ISP. Capacity figures are in satoshis.

" }, urlString: "/v1/lightning/nodes/isp-ranking", - showConditions: bitcoinNetworks, + showConditions: lightningNetworks, showJsExamples: showJsExamplesDefaultFalse, codeExample: { default: { @@ -7303,7 +7304,7 @@ export const restApiDocsData = [ default: "

Returns two lists of the top 100 nodes: one ordered by liquidity (aggregate channel capacity) and the other ordered by connectivity (number of open channels).

" }, urlString: "/v1/lightning/nodes/rankings", - showConditions: bitcoinNetworks, + showConditions: lightningNetworks, showJsExamples: showJsExamplesDefaultFalse, codeExample: { default: { @@ -7426,7 +7427,7 @@ export const restApiDocsData = [ default: "

Returns a list of the top 100 nodes by liquidity (aggregate channel capacity).

" }, urlString: "/v1/lightning/nodes/rankings/liquidity", - showConditions: bitcoinNetworks, + showConditions: lightningNetworks, showJsExamples: showJsExamplesDefaultFalse, codeExample: { default: { @@ -7623,7 +7624,7 @@ export const restApiDocsData = [ default: "

Returns a list of the top 100 nodes by connectivity (number of open channels).

" }, urlString: "/v1/lightning/nodes/rankings/connectivity", - showConditions: bitcoinNetworks, + showConditions: lightningNetworks, showJsExamples: showJsExamplesDefaultFalse, codeExample: { default: { @@ -7819,7 +7820,7 @@ export const restApiDocsData = [ default: "

Returns a list of the top 100 oldest nodes.

" }, urlString: "/v1/lightning/nodes/rankings/age", - showConditions: bitcoinNetworks, + showConditions: lightningNetworks, showJsExamples: showJsExamplesDefaultFalse, codeExample: { default: { @@ -8006,7 +8007,7 @@ export const restApiDocsData = [ default: "

Returns details about a node with the given :pubKey.

" }, urlString: "/v1/lightning/nodes/:pubKey", - showConditions: bitcoinNetworks, + showConditions: lightningNetworks, showJsExamples: showJsExamplesDefaultFalse, codeExample: { default: { @@ -8170,7 +8171,7 @@ export const restApiDocsData = [ default: "

Returns historical stats for a node with the given :pubKey.

" }, urlString: "/v1/lightning/nodes/:pubKey/statistics", - showConditions: bitcoinNetworks, + showConditions: lightningNetworks, showJsExamples: showJsExamplesDefaultFalse, codeExample: { default: { @@ -8268,7 +8269,7 @@ export const restApiDocsData = [ default: "

Returns info about a Lightning channel with the given :channelId.

" }, urlString: "/v1/lightning/channels/:channelId", - showConditions: bitcoinNetworks, + showConditions: lightningNetworks, showJsExamples: showJsExamplesDefaultFalse, codeExample: { default: { @@ -8433,7 +8434,7 @@ export const restApiDocsData = [ default: "

Returns channels that correspond to the given :txid (multiple transaction IDs can be specified).

" }, urlString: "/v1/lightning/channels/txids?txId[]=:txid", - showConditions: bitcoinNetworks, + showConditions: lightningNetworks, showJsExamples: showJsExamplesDefaultFalse, codeExample: { default: { @@ -8634,7 +8635,7 @@ export const restApiDocsData = [ default: "

Returns a list of a node's channels given its :pubKey. Ten channels are returned at a time. Use :index for paging. :channelStatus can be open, active, or closed.

" }, urlString: "/v1/lightning/channels?public_key=:pubKey&status=:channelStatus", - showConditions: bitcoinNetworks, + showConditions: lightningNetworks, showJsExamples: showJsExamplesDefaultFalse, codeExample: { default: { @@ -8770,7 +8771,7 @@ export const restApiDocsData = [ default: "

Returns a list of channels with corresponding node geodata.

" }, urlString: "/v1/lightning/channels-geo", - showConditions: bitcoinNetworks, + showConditions: lightningNetworks, showJsExamples: showJsExamplesDefaultFalse, codeExample: { default: { @@ -8878,7 +8879,7 @@ export const restApiDocsData = [ default: "

Returns a list of channels with corresponding geodata for a node with the given :pubKey.

" }, urlString: "/v1/lightning/channels-geo/:pubKey", - showConditions: bitcoinNetworks, + showConditions: lightningNetworks, showJsExamples: showJsExamplesDefaultFalse, codeExample: { default: { diff --git a/frontend/src/app/docs/api-docs/api-docs.component.html b/frontend/src/app/docs/api-docs/api-docs.component.html index a6a98018d..f6fad9ee3 100644 --- a/frontend/src/app/docs/api-docs/api-docs.component.html +++ b/frontend/src/app/docs/api-docs/api-docs.component.html @@ -133,7 +133,7 @@

{{electrsPort}}

SSL

Enabled

-

Electrum RPC interface for Bitcoin Signet is publicly available. Electrum RPC interface for all other networks is available to sponsors only—whitelisting is required.

+

Electrum RPC interface for Bitcoin Signet and Bitcoin Testnet4 is publicly available. Electrum RPC interface for all other networks is available to sponsors only—whitelisting is required.

diff --git a/frontend/src/app/docs/api-docs/api-docs.component.ts b/frontend/src/app/docs/api-docs/api-docs.component.ts index dd2681ca8..76d9de8d0 100644 --- a/frontend/src/app/docs/api-docs/api-docs.component.ts +++ b/frontend/src/app/docs/api-docs/api-docs.component.ts @@ -102,6 +102,8 @@ export class ApiDocsComponent implements OnInit, AfterViewInit { this.electrsPort = 50002; break; case "testnet": this.electrsPort = 60002; break; + case "testnet4": + this.electrsPort = 40002; break; case "signet": this.electrsPort = 60602; break; case "liquid": @@ -170,6 +172,9 @@ export class ApiDocsComponent implements OnInit, AfterViewInit { if (network === 'testnet') { curlResponse = code.codeSampleTestnet.curl; } + if (network === 'testnet4') { + curlResponse = code.codeSampleTestnet.curl; + } if (network === 'signet') { curlResponse = code.codeSampleSignet.curl; } diff --git a/frontend/src/app/docs/code-template/code-template.component.ts b/frontend/src/app/docs/code-template/code-template.component.ts index 395f6a297..bd03f5b16 100644 --- a/frontend/src/app/docs/code-template/code-template.component.ts +++ b/frontend/src/app/docs/code-template/code-template.component.ts @@ -111,7 +111,10 @@ export class CodeTemplateComponent implements OnInit { codeText = this.replaceJSPlaceholder(codeText, code.codeSampleMainnet.esModule); } if (this.network === 'testnet') { - codeText = this.replaceJSPlaceholder(codeText, code.codeSampleTestnet.esModule); + codeText = this.replaceJSPlaceholder(codeText, code.codeSampleTestnet.esModule); + } + if (this.network === 'testnet4') { + codeText = this.replaceJSPlaceholder(codeText, code.codeSampleTestnet.esModule); } if (this.network === 'signet') { codeText = this.replaceJSPlaceholder(codeText, code.codeSampleSignet.esModule); @@ -144,7 +147,10 @@ init();`; codeText = this.replaceJSPlaceholder(codeText, code.codeSampleMainnet.esModule); } if (this.network === 'testnet') { - codeText = this.replaceJSPlaceholder(codeText, code.codeSampleTestnet.esModule); + codeText = this.replaceJSPlaceholder(codeText, code.codeSampleTestnet.esModule); + } + if (this.network === 'testnet4') { + codeText = this.replaceJSPlaceholder(codeText, code.codeSampleTestnet.esModule); } if (this.network === 'signet') { codeText = this.replaceJSPlaceholder(codeText, code.codeSampleSignet.esModule); @@ -212,6 +218,9 @@ yarn add @mempool/liquid.js`; if (this.network === 'testnet') { return this.replaceCurlPlaceholder(code.codeTemplate.curl, code.codeSampleTestnet); } + if (this.network === 'testnet4') { + return this.replaceCurlPlaceholder(code.codeTemplate.curl, code.codeSampleTestnet); + } if (this.network === 'signet') { return this.replaceCurlPlaceholder(code.codeTemplate.curl, code.codeSampleSignet); } @@ -234,6 +243,9 @@ yarn add @mempool/liquid.js`; if (this.network === 'testnet') { return code.codeSampleTestnet.response; } + if (this.network === 'testnet4') { + return code.codeSampleTestnet.response; + } if (this.network === 'signet') { return code.codeSampleSignet.response; } @@ -247,7 +259,7 @@ yarn add @mempool/liquid.js`; } wrapPythonTemplate(code: any) { - return ( ( this.network === 'testnet' || this.network === 'signet' ) ? ( code.codeTemplate.python.replace( "wss://mempool.space/api/v1/ws", "wss://mempool.space/" + this.network + "/api/v1/ws" ) ) : code.codeTemplate.python ); + return ( ( this.network === 'testnet' || this.network === 'testnet4' || this.network === 'signet' ) ? ( code.codeTemplate.python.replace( "wss://mempool.space/api/v1/ws", "wss://mempool.space/" + this.network + "/api/v1/ws" ) ) : code.codeTemplate.python ); } replaceJSPlaceholder(text: string, code: any) { From 1312dd45e659e3b76c3315090886fe4bee7b4b0d Mon Sep 17 00:00:00 2001 From: hunicus <93150691+hunicus@users.noreply.github.com> Date: Mon, 6 May 2024 14:33:42 -0400 Subject: [PATCH 24/62] Replace twitter logo with x logo --- .../components/global-footer/global-footer.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.html b/frontend/src/app/shared/components/global-footer/global-footer.component.html index 5b0fd77b9..ce0431b78 100644 --- a/frontend/src/app/shared/components/global-footer/global-footer.component.html +++ b/frontend/src/app/shared/components/global-footer/global-footer.component.html @@ -90,7 +90,7 @@ diff --git a/frontend/src/app/services/theme.service.ts b/frontend/src/app/services/theme.service.ts index 7981f37a3..3bdb1c65b 100644 --- a/frontend/src/app/services/theme.service.ts +++ b/frontend/src/app/services/theme.service.ts @@ -24,7 +24,7 @@ export class ThemeService { apply(theme) { this.theme = theme; if (theme !== 'default') { - theme === 'contrast' ? this.mempoolFeeColors = contrastMempoolFeeColors : this.mempoolFeeColors = defaultMempoolFeeColors; + theme === 'contrast' || theme === 'bukele' ? this.mempoolFeeColors = contrastMempoolFeeColors : this.mempoolFeeColors = defaultMempoolFeeColors; try { if (!this.style) { this.style = document.createElement('link'); diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss index 12783a332..dd0ce8bef 100644 --- a/frontend/src/styles.scss +++ b/frontend/src/styles.scss @@ -106,6 +106,11 @@ $dropdown-link-active-bg: $active-bg; --grey: #6c757d; --tooltip-grey: #b1b1b1; --orange: #b86d12; + + --search-button: #4d2d77; + --search-button-border: #472a6e; + --search-button-focus: #533180; + --search-button-shadow: #7c58ab80; } html, body { @@ -192,21 +197,21 @@ main { .btn-purple:not(:disabled):not(.disabled):active, .btn-purple:not(:disabled):not(.disabled).active, .show > .btn-purple.dropdown-toggle { color: #fff; - background-color: #4d2d77; - border-color: #472a6e; + background-color: var(--search-button); + border-color: var(--search-button-border); } .btn-purple:focus, .btn-purple.focus { color: #fff; - background-color: #533180; - border-color: #4d2d77; - box-shadow: 0 0 0 0.2rem rgb(124 88 171 / 50%); + background-color: var(--search-button-focus); + border-color: var(--search-button); + box-shadow: 0 0 0 0.2rem var(--search-button-shadow); } .btn-purple:hover { color: #fff; - background-color: #533180; - border-color: #4d2d77; + background-color: var(--search-button-focus); + border-color: var(--search-button); } .form-control.form-control-secondary { @@ -1299,3 +1304,9 @@ a { .badge-info { background-color: var(--info); } + +.btn-primary { + color: var(--fg); + background-color: var(--primary); + border-color: var(--primary); +} \ No newline at end of file diff --git a/frontend/src/theme-bukele.scss b/frontend/src/theme-bukele.scss index e9124194e..e81058dab 100644 --- a/frontend/src/theme-bukele.scss +++ b/frontend/src/theme-bukele.scss @@ -1,9 +1,9 @@ /* Theme */ -$bg: #1c1e4d; -$active-bg: #313945; +$bg: #313945; +$active-bg: #000000; $hover-bg: #E5E5E5; -$fg: #FFFFFF; -$title-fg: #c9a892; +$fg: #ffffff; +$title-fg: #c19a81; $taproot: #eba814; $taproot-light: #d5a90a; @@ -17,11 +17,11 @@ $gray-700: $fg; $nav-tabs-link-active-bg: $active-bg; -$primary: #343992; -$secondary: #32345e; -$tertiary: #a08674; +$primary: #007cfa; +$secondary: #1c1e4d; +$tertiary: #8c7566; $success: #009900; -$info: #e4d3c8; +$info: #dac3b4; $h5-font-size: 1.15rem !default; @@ -74,14 +74,14 @@ $dropdown-link-active-bg: $active-bg; --skeleton-bg: #2e324e; --skeleton-bg-light: #5d6182; - --box-bg: #15173a; - --stat-box-bg: #0e0f28; + --box-bg: #272d37; + --stat-box-bg: #1c2027; --alert-bg: #3a1c61; --navbar-bg: #212121; --transparent-fg: #ffffffbb; --fade-out-box-bg-start: rgba(23, 28, 42, 0); --fade-out-box-bg-end: rgba(23, 28, 42, 1); - --opacity: 0.7; + --opacity: 0.57; --testnet: #1d486f; --signet: #6f1d5d; @@ -103,4 +103,9 @@ $dropdown-link-active-bg: $active-bg; --grey: #7e7e7e; --tooltip-grey: #b1b1b1; --orange: #ff9f00; + + --search-button: #645449; + --search-button-border: #605046; + --search-button-focus: #786457; + --search-button-shadow: #a0867480; } diff --git a/frontend/src/theme-contrast.scss b/frontend/src/theme-contrast.scss index a3faddaef..61188a361 100644 --- a/frontend/src/theme-contrast.scss +++ b/frontend/src/theme-contrast.scss @@ -103,4 +103,9 @@ $dropdown-link-active-bg: $active-bg; --grey: #7e7e7e; --tooltip-grey: #b1b1b1; --orange: #ff9f00; + + --search-button: #4d2d77; + --search-button-border: #472a6e; + --search-button-focus: #533180; + --search-button-shadow: #7c58ab80; } diff --git a/frontend/src/theme-wiz.scss b/frontend/src/theme-wiz.scss index f46576c11..d560a6575 100644 --- a/frontend/src/theme-wiz.scss +++ b/frontend/src/theme-wiz.scss @@ -103,4 +103,9 @@ $dropdown-link-active-bg: $active-bg; --grey: #7e7e7e; --tooltip-grey: #b1b1b1; --orange: #ff9f00; + + --search-button: #4d2d77; + --search-button-border: #472a6e; + --search-button-focus: #533180; + --search-button-shadow: #7c58ab80; } From 4c697d000802decca827b41d8f1b905aaaf7a7ea Mon Sep 17 00:00:00 2001 From: Mononaut Date: Tue, 7 May 2024 22:42:06 +0000 Subject: [PATCH 30/62] Update onbtc theme & branding --- frontend/custom-sv-config.json | 8 +- .../liquid-master-page.component.scss | 5 +- .../master-page-preview.component.html | 2 +- .../master-page-preview.component.scss | 3 +- .../master-page/master-page.component.html | 54 +- .../master-page/master-page.component.scss | 5 +- frontend/src/app/services/state.service.ts | 4 +- .../global-footer.component.html | 36 +- .../global-footer/global-footer.component.ts | 15 +- frontend/src/index.sv.html | 2 +- frontend/src/resources/elsalvador.svg | 27 +- frontend/src/resources/onbtc.svg | 112 +-- frontend/src/resources/onbtclogo.svg | 678 ++++++++++++++++++ frontend/src/theme-bukele.scss | 64 +- frontend/src/theme-contrast.scss | 3 +- frontend/src/theme-wiz.scss | 3 +- 16 files changed, 829 insertions(+), 192 deletions(-) create mode 100644 frontend/src/resources/onbtclogo.svg diff --git a/frontend/custom-sv-config.json b/frontend/custom-sv-config.json index f64f41be8..7a62d1ec5 100644 --- a/frontend/custom-sv-config.json +++ b/frontend/custom-sv-config.json @@ -1,12 +1,12 @@ { - "theme": "contrast", + "theme": "bukele", "enterprise": "onbtc", "branding": { "name": "onbtc", - "title": "Oficina Nacional del Bitcoin", + "title": "Bitcoin Office", "site_id": 19, - "header_img": "/resources/onbtc.svg", - "img": "/resources/elsalvador.svg", + "header_img": "/resources/onbtclogo.svg", + "footer_img": "/resources/onbtclogo.svg", "rounded_corner": true }, "dashboard": { diff --git a/frontend/src/app/components/liquid-master-page/liquid-master-page.component.scss b/frontend/src/app/components/liquid-master-page/liquid-master-page.component.scss index b0f3ce9c6..17bc8aeb5 100644 --- a/frontend/src/app/components/liquid-master-page/liquid-master-page.component.scss +++ b/frontend/src/app/components/liquid-master-page/liquid-master-page.component.scss @@ -4,6 +4,7 @@ top: 0; width: 100%; z-index: 100; + background-color: var(--bg); } li.nav-item.active { @@ -17,7 +18,7 @@ fa-icon { .navbar { z-index: 100; min-height: 64px; - background-color: var(--bg); + background-color: var(--nav-bg); } li.nav-item { @@ -48,7 +49,7 @@ li.nav-item { } .navbar-nav { - background: var(--navbar-bg); + background: var(--nav-bg); bottom: 0; box-shadow: 0px 0px 15px 0px #000; flex-direction: row; diff --git a/frontend/src/app/components/master-page-preview/master-page-preview.component.html b/frontend/src/app/components/master-page-preview/master-page-preview.component.html index 49efce400..8f3204ec4 100644 --- a/frontend/src/app/components/master-page-preview/master-page-preview.component.html +++ b/frontend/src/app/components/master-page-preview/master-page-preview.component.html @@ -6,7 +6,7 @@ } @if (enterpriseInfo?.header_img) { - enterpriseInfo.title + enterpriseInfo.title } @else { diff --git a/frontend/src/app/components/master-page-preview/master-page-preview.component.scss b/frontend/src/app/components/master-page-preview/master-page-preview.component.scss index fb0fd5c24..bb2e5b706 100644 --- a/frontend/src/app/components/master-page-preview/master-page-preview.component.scss +++ b/frontend/src/app/components/master-page-preview/master-page-preview.component.scss @@ -5,6 +5,7 @@ max-width: 1200px; max-height: 600px; padding-top: 80px; + background: var(--nav-bg); header { position: absolute; @@ -18,7 +19,7 @@ flex-direction: row; justify-content: space-between; align-items: center; - background: var(--stat-box-bg); + background: var(--nav-bg); text-align: start; font-size: 1.8em; } diff --git a/frontend/src/app/components/master-page/master-page.component.html b/frontend/src/app/components/master-page/master-page.component.html index 18fbeac68..169dd24a3 100644 --- a/frontend/src/app/components/master-page/master-page.component.html +++ b/frontend/src/app/components/master-page/master-page.component.html @@ -17,16 +17,16 @@ - -
- -
-
- @if (enterpriseInfo?.header_img) { - enterpriseInfo.title + enterpriseInfo.title } @else { + +
+ +
+
+ } @@ -38,24 +38,28 @@ - -
- -
-
- - - @if (enterpriseInfo?.header_img) { - enterpriseInfo.title - } @else { - - - } -
-
Offline
-
Reconnecting...
-
- + @if (enterpriseInfo?.header_img) { + enterpriseInfo.title + } @else { + +
+ +
+
+ + + @if (enterpriseInfo?.header_img) { + enterpriseInfo.title + } @else { + + + } +
+
Offline
+
Reconnecting...
+
+ + }
diff --git a/frontend/src/app/components/master-page/master-page.component.scss b/frontend/src/app/components/master-page/master-page.component.scss index 8704d193a..6bd4fd821 100644 --- a/frontend/src/app/components/master-page/master-page.component.scss +++ b/frontend/src/app/components/master-page/master-page.component.scss @@ -3,6 +3,7 @@ position: -webkit-sticky; top: 0; width: 100%; + background-color: var(--bg); z-index: 100; } @@ -18,7 +19,7 @@ fa-icon { z-index: 100; min-height: 64px; width: 100%; - background-color: var(--bg); + background-color: var(--nav-bg); } li.nav-item { @@ -59,7 +60,7 @@ li.nav-item { } .navbar-nav { - background: var(--navbar-bg); + background: var(--nav-bg); bottom: 0; box-shadow: 0px 0px 15px 0px #000; flex-direction: row; diff --git a/frontend/src/app/services/state.service.ts b/frontend/src/app/services/state.service.ts index 36fdf0b03..be44716d8 100644 --- a/frontend/src/app/services/state.service.ts +++ b/frontend/src/app/services/state.service.ts @@ -27,7 +27,9 @@ export interface Customization { name: string; site_id?: number; title: string; - img: string; + img?: string; + header_img?: string; + footer_img?: string; rounded_corner: boolean; }, dashboard: { diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.html b/frontend/src/app/shared/components/global-footer/global-footer.component.html index 5b0fd77b9..a14076022 100644 --- a/frontend/src/app/shared/components/global-footer/global-footer.component.html +++ b/frontend/src/app/shared/components/global-footer/global-footer.component.html @@ -4,13 +4,19 @@
-

- Explore the full Bitcoin ecosystem - ® -

+ @if (!enterpriseInfo?.footer_img) { +

+ Explore the full Bitcoin ecosystem + ® +

+ }
@@ -32,14 +38,16 @@
- -

- Explore the full Bitcoin ecosystem - ® -

+ @if (!enterpriseInfo?.footer_img) { + +

+ Explore the full Bitcoin ecosystem + ® +

+ }
diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.ts b/frontend/src/app/shared/components/global-footer/global-footer.component.ts index a0ab07401..469a12076 100644 --- a/frontend/src/app/shared/components/global-footer/global-footer.component.ts +++ b/frontend/src/app/shared/components/global-footer/global-footer.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit, Inject, LOCALE_ID, HostListener } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit, Inject, LOCALE_ID, HostListener, OnDestroy } from '@angular/core'; import { Router, ActivatedRoute } from '@angular/router'; import { Observable, merge, of, Subject, Subscription } from 'rxjs'; import { tap, takeUntil } from 'rxjs/operators'; @@ -8,6 +8,7 @@ import { LanguageService } from '../../../services/language.service'; import { NavigationService } from '../../../services/navigation.service'; import { StorageService } from '../../../services/storage.service'; import { WebsocketService } from '../../../services/websocket.service'; +import { EnterpriseService } from '../../../services/enterprise.service'; @Component({ selector: 'app-global-footer', @@ -15,7 +16,7 @@ import { WebsocketService } from '../../../services/websocket.service'; styleUrls: ['./global-footer.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class GlobalFooterComponent implements OnInit { +export class GlobalFooterComponent implements OnInit, OnDestroy { private destroy$: Subject = new Subject(); env: Env; officialMempoolSpace = this.stateService.env.OFFICIAL_MEMPOOL_SPACE; @@ -32,10 +33,14 @@ export class GlobalFooterComponent implements OnInit { urlSubscription: Subscription; isServicesPage = false; + enterpriseInfo: any; + enterpriseInfo$: Subscription; + constructor( public stateService: StateService, private languageService: LanguageService, private navigationService: NavigationService, + private enterpriseService: EnterpriseService, @Inject(LOCALE_ID) public locale: string, private storageService: StorageService, private route: ActivatedRoute, @@ -54,6 +59,9 @@ export class GlobalFooterComponent implements OnInit { this.navigationService.subnetPaths.subscribe((paths) => { this.networkPaths = paths; }); + this.enterpriseInfo$ = this.enterpriseService.info$.subscribe(info => { + this.enterpriseInfo = info; + }); this.network$ = merge(of(''), this.stateService.networkChanged$).pipe( tap((network: string) => { return network; @@ -73,6 +81,9 @@ export class GlobalFooterComponent implements OnInit { this.destroy$.next(true); this.destroy$.complete(); this.urlSubscription.unsubscribe(); + if (this.enterpriseInfo$) { + this.enterpriseInfo$.unsubscribe(); + } } networkLink(network) { diff --git a/frontend/src/index.sv.html b/frontend/src/index.sv.html index a18c1d7fe..58cfd179b 100644 --- a/frontend/src/index.sv.html +++ b/frontend/src/index.sv.html @@ -3,7 +3,7 @@ - Oficina Nacional del Bitcoin - Bitcoin Explorer + Bitcoin Office - Explorer diff --git a/frontend/src/resources/elsalvador.svg b/frontend/src/resources/elsalvador.svg index eb2aff426..fc5a59185 100644 --- a/frontend/src/resources/elsalvador.svg +++ b/frontend/src/resources/elsalvador.svg @@ -1,37 +1,12 @@ - - - - - + transform="translate(-15.744428,-40.187135)"> + d="m 17.787525,49.237549 c 0,1.063761 -0.270162,1.384578 -1.65474,1.384578 h -0.388357 v 0.320817 h 6.179946 c 2.718501,0 3.647182,-1.874246 3.647182,-3.208169 0,-1.317038 -0.928681,-2.347029 -2.51588,-2.819812 v -0.03377 c 1.131301,-0.202621 1.924901,-1.097532 1.924901,-2.059982 0,-0.810485 -0.337702,-1.384578 -1.029991,-1.874246 -0.607864,-0.439013 -1.908016,-0.658519 -3.393905,-0.658519 -0.320817,0 -1.604084,0.01689 -2.532765,0.05065 -0.489668,0.01689 -1.65474,0.08443 -2.127522,0.101311 v 0.320817 h 0.590978 c 1.181957,0 1.300153,0.506553 1.300153,1.469003 z m 1.401463,-8.577631 c 0.422127,-0.01688 1.114417,-0.05065 1.485889,-0.05065 2.076867,0 2.786041,1.080646 2.786041,2.262603 0,1.317038 -0.810485,1.958672 -2.431454,1.958672 h -1.840476 z m 0,4.491436 h 1.823591 c 1.975556,0 2.971777,1.333923 2.971777,2.634076 0,1.317038 -0.641634,2.701616 -2.870467,2.701616 -1.418348,0 -1.924901,-0.455898 -1.924901,-1.739165 z" /> + d="m 31.329346,50.622127 c -1.165072,0 -1.435233,-0.337702 -1.435233,-1.333923 v -7.159282 c 0,-1.131302 0.371472,-1.367693 1.435233,-1.367693 v -0.320817 h -4.103079 v 0.320817 c 0.945565,0.05065 1.266382,0.303931 1.266382,1.215727 v 7.193052 c 0,1.131302 -0.219506,1.401463 -1.266382,1.452119 v 0.320817 h 4.103079 z" /> + d="m 38.505484,41.048275 h 2.938008 c 0.675404,0 0.979335,0.388358 1.232612,1.874246 h 0.303932 l -0.270162,-2.735386 h -0.320817 c -0.03377,0.202621 -0.287046,0.253277 -0.523438,0.253277 h -8.121733 c -0.118195,0 -0.236391,-0.01689 -0.337702,-0.05066 -0.10131,-0.03377 -0.168851,-0.10131 -0.185736,-0.202621 h -0.320817 l -0.270161,2.735386 h 0.303932 c 0.253276,-1.485888 0.557208,-1.874246 1.232612,-1.874246 h 2.938007 v 8.341239 c 0,0.911796 -0.303932,1.232613 -1.333923,1.232613 H 35.14535 v 0.320817 h 5.318806 v -0.320817 h -0.624749 c -1.029991,0 -1.333923,-0.320817 -1.333923,-1.232613 z" /> + d="m 54.732034,43.209568 -0.151966,-2.448339 h -0.253277 c -0.03377,0.05065 -0.118196,0.10131 -0.303932,0.10131 -0.523438,0 -1.435233,-0.675404 -3.562756,-0.675404 -3.528985,0 -6.06175,2.363914 -6.06175,5.639623 0,3.123744 2.465224,5.386347 5.892899,5.386347 1.992442,0 2.735387,-0.607863 3.816033,-0.455898 0.405242,-0.658518 0.86114,-1.705395 1.080646,-2.465224 h -0.320817 c -1.148186,2.043097 -2.786041,2.498995 -4.119964,2.498995 -2.566535,0 -4.761598,-2.245719 -4.761598,-5.301922 0,-2.836696 1.75605,-4.879793 4.575862,-4.879793 1.840476,0 3.292594,1.029991 3.849803,2.600305 z" /> + d="m 68.83106,45.404631 c 0,-3.039318 -2.735386,-5.217496 -5.92667,-5.217496 -3.596526,0 -6.179946,2.380799 -6.179946,5.740934 0,3.157514 2.786041,5.285036 6.095521,5.285036 3.275709,0 6.011095,-2.397684 6.011095,-5.808474 z m -1.587199,0.557208 c 0,2.397684 -1.317038,4.829139 -4.069309,4.829139 -2.718501,0 -4.862909,-2.228833 -4.862909,-5.386347 0,-2.026212 1.181957,-4.795368 4.153735,-4.795368 2.786041,0 4.778483,2.211948 4.778483,5.352576 z" /> + d="m 74.588877,50.622127 c -1.165072,0 -1.435233,-0.337702 -1.435233,-1.333923 v -7.159282 c 0,-1.131302 0.371472,-1.367693 1.435233,-1.367693 v -0.320817 h -4.103079 v 0.320817 c 0.945565,0.05065 1.266382,0.303931 1.266382,1.215727 v 7.193052 c 0,1.131302 -0.219506,1.401463 -1.266382,1.452119 v 0.320817 h 4.103079 z" /> + d="m 87.252675,51.061139 v -9.421885 c 0,-0.658519 0.270161,-0.878025 1.536544,-0.878025 v -0.320817 h -3.951114 v 0.320817 c 1.350808,0.03377 1.65474,0.219506 1.65474,1.249497 v 6.72027 l -7.952882,-8.290584 h -2.65096 v 0.320817 c 0.590978,0.01689 1.029991,0.151966 1.418348,0.422127 v 8.307469 c 0,0.776715 -0.337702,1.131302 -1.384578,1.131302 h -0.06754 v 0.320817 h 3.917343 v -0.320817 c -1.435234,0 -1.705395,-0.253277 -1.705395,-1.469004 v -7.243708 l 8.746481,9.151724 z" /> + d="m 27.851044,62.280894 c 0,-3.039318 -2.735386,-5.217496 -5.92667,-5.217496 -3.596526,0 -6.179946,2.380799 -6.179946,5.740934 0,3.157513 2.786041,5.285036 6.095521,5.285036 3.275709,0 6.011095,-2.397684 6.011095,-5.808474 z m -1.587199,0.557208 c 0,2.397684 -1.317038,4.829138 -4.069309,4.829138 -2.718501,0 -4.862909,-2.228833 -4.862909,-5.386346 0,-2.026212 1.181957,-4.795369 4.153735,-4.795369 2.786041,0 4.778483,2.211948 4.778483,5.352577 z" /> + d="m 36.749491,60.81189 h -0.287047 c -0.05065,0.726059 -0.354587,1.080646 -0.979336,1.080646 h -3.343249 v -3.967998 h 3.208168 c 1.046877,0 1.384579,0.405242 1.401464,1.384578 h 0.287046 v -1.992442 h -7.564524 v 0.320817 c 1.181957,0.01689 1.266382,0.506553 1.266382,1.5872 v 6.618959 c 0,1.367693 -0.185736,1.587199 -1.232612,1.654739 v 0.320817 h 4.103079 v -0.320817 c -1.266382,0 -1.469003,-0.354587 -1.469003,-1.300152 V 62.5004 h 3.123743 c 0.810485,0 1.165072,0.303932 1.198842,1.283267 h 0.287047 z" /> + d="m 45.715447,60.81189 h -0.287046 c -0.05066,0.726059 -0.354587,1.080646 -0.979336,1.080646 h -3.34325 v -3.967998 h 3.208169 c 1.046876,0 1.384578,0.405242 1.401463,1.384578 h 0.287047 V 57.316674 H 38.43797 v 0.320817 c 1.181956,0.01689 1.266382,0.506553 1.266382,1.5872 v 6.618959 c 0,1.367693 -0.185736,1.587199 -1.232612,1.654739 v 0.320817 h 4.103079 v -0.320817 c -1.266383,0 -1.469004,-0.354587 -1.469004,-1.300152 V 62.5004 h 3.123744 c 0.810484,0 1.165071,0.303932 1.198842,1.283267 h 0.287046 z" /> + d="m 51.540777,67.498389 c -1.165072,0 -1.435234,-0.337702 -1.435234,-1.333923 v -7.159282 c 0,-1.131301 0.371472,-1.367693 1.435234,-1.367693 v -0.320817 h -4.10308 v 0.320817 c 0.945566,0.05066 1.266383,0.303932 1.266383,1.215727 v 7.193053 c 0,1.131301 -0.219506,1.401463 -1.266383,1.452118 v 0.320817 h 4.10308 z" /> + d="m 63.512285,60.085831 -0.151966,-2.44834 h -0.253276 c -0.03377,0.05066 -0.118196,0.101311 -0.303932,0.101311 -0.523438,0 -1.435234,-0.675404 -3.562756,-0.675404 -3.528986,0 -6.061751,2.363914 -6.061751,5.639623 0,3.123744 2.465225,5.386347 5.8929,5.386347 1.992442,0 2.735386,-0.607864 3.816032,-0.455898 0.405243,-0.658519 0.86114,-1.705395 1.080647,-2.465224 h -0.320817 c -1.148187,2.043097 -2.786042,2.498994 -4.119964,2.498994 -2.566535,0 -4.761598,-2.245718 -4.761598,-5.301921 0,-2.836697 1.75605,-4.879794 4.575862,-4.879794 1.840475,0 3.292594,1.029991 3.849802,2.600306 z" /> - - - - - - - - - - - - + d="m 72.444469,60.81189 h -0.320817 c -0.08443,0.979336 -0.371472,1.266382 -0.979335,1.266382 h -3.022433 v -4.153734 h 3.562756 c 0.607863,0 1.029991,0.303932 1.249497,1.739165 h 0.303932 L 73.102988,57.316674 H 64.99814 v 0.320817 h 0.371473 c 1.131301,0 1.350808,0.405243 1.350808,1.350808 v 7.125512 c 0,1.013106 -0.236392,1.384578 -1.5872,1.384578 h -0.472783 v 0.320817 h 8.965988 l 0.270162,-2.51588 h -0.303932 c -0.422127,1.452119 -0.776715,1.908017 -1.958671,1.908017 h -2.600306 c -0.624748,0 -0.911795,-0.151966 -0.911795,-0.928681 v -3.596526 h 2.853582 c 0.692289,0 1.013106,0.135081 1.148186,1.333923 h 0.320817 z" /> diff --git a/frontend/src/resources/onbtclogo.svg b/frontend/src/resources/onbtclogo.svg new file mode 100644 index 000000000..c07b7661b --- /dev/null +++ b/frontend/src/resources/onbtclogo.svg @@ -0,0 +1,678 @@ + + diff --git a/frontend/src/theme-bukele.scss b/frontend/src/theme-bukele.scss index e81058dab..afb2d2e76 100644 --- a/frontend/src/theme-bukele.scss +++ b/frontend/src/theme-bukele.scss @@ -1,9 +1,10 @@ /* Theme */ -$bg: #313945; +$bg: #11131f; $active-bg: #000000; -$hover-bg: #E5E5E5; -$fg: #ffffff; -$title-fg: #c19a81; +$hover-bg: #12131e; +$fg: #d2d2d2; +$nav-bg: #111e60; +$title-fg: #2055e3; $taproot: #eba814; $taproot-light: #d5a90a; @@ -18,10 +19,10 @@ $gray-700: $fg; $nav-tabs-link-active-bg: $active-bg; $primary: #007cfa; -$secondary: #1c1e4d; -$tertiary: #8c7566; -$success: #009900; -$info: #dac3b4; +$secondary: #272f4e; +$tertiary: #ff9900; +$success: #0aab2f; +$info: #00ddff; $h5-font-size: 1.15rem !default; @@ -61,6 +62,7 @@ $dropdown-link-active-bg: $active-bg; --active-bg: #{$active-bg}; --hover-bg: #{$hover-bg}; --fg: #{$fg}; + --nav-bg: #{$nav-bg}; --title-fg: #{$title-fg}; --primary: #{$primary}; @@ -70,25 +72,24 @@ $dropdown-link-active-bg: $active-bg; --info: #{$info}; --link-color: #{$link-color}; --link-hover-color: #{$link-hover-color}; - --icon: #f1f1f1; + --icon: #d2d2d2; --skeleton-bg: #2e324e; --skeleton-bg-light: #5d6182; - --box-bg: #272d37; - --stat-box-bg: #1c2027; + --box-bg: #171c2a; + --stat-box-bg: #0b1018; --alert-bg: #3a1c61; - --navbar-bg: #212121; --transparent-fg: #ffffffbb; --fade-out-box-bg-start: rgba(23, 28, 42, 0); --fade-out-box-bg-end: rgba(23, 28, 42, 1); - --opacity: 0.57; + --opacity: 0.9; --testnet: #1d486f; --signet: #6f1d5d; --liquid: #116761; --liquidtestnet: #494a4a; - --mainnet-alt: #a08674; + --mainnet-alt: #9339f4; --testnet-alt: #183550; --signet-alt: #471850; --liquidtestnet-alt: #272e46; @@ -104,8 +105,35 @@ $dropdown-link-active-bg: $active-bg; --tooltip-grey: #b1b1b1; --orange: #ff9f00; - --search-button: #645449; - --search-button-border: #605046; - --search-button-focus: #786457; - --search-button-shadow: #a0867480; + --search-button: #d5a90a; + --search-button-border: #d5a90a; + --search-button-focus: #eba814; + --search-button-shadow: #eba814; } + +.navbar { + --secondary: #041437; +} + +.nav-item.active, .btn-purple { + --icon: white; +} + +.btn-purple:not(:disabled):not(.disabled):active, .btn-purple:not(:disabled):not(.disabled).active, .show > .btn-purple.dropdown-toggle { + color: #fff; + background-color: var(--search-button); + border-color: var(--search-button-border); +} + +.btn-purple:focus, .btn-purple.focus { + color: #fff; + background-color: var(--search-button-focus); + border-color: var(--search-button); + box-shadow: 0 0 0 0.2rem var(--search-button-shadow); +} + +.btn-purple:hover { + color: #fff; + background-color: var(--search-button-focus); + border-color: var(--search-button); +} \ No newline at end of file diff --git a/frontend/src/theme-contrast.scss b/frontend/src/theme-contrast.scss index 61188a361..6d80f1edb 100644 --- a/frontend/src/theme-contrast.scss +++ b/frontend/src/theme-contrast.scss @@ -3,6 +3,7 @@ $bg: #11131f; $active-bg: #000000; $hover-bg: #12131e; $fg: #fff; +$nav-bg: $bg; $title-fg: #2055e3; $taproot: #eba814; @@ -61,6 +62,7 @@ $dropdown-link-active-bg: $active-bg; --active-bg: #{$active-bg}; --hover-bg: #{$hover-bg}; --fg: #{$fg}; + --nav-bg: #{$nav-bg}; --title-fg: #{$title-fg}; --primary: #{$primary}; @@ -77,7 +79,6 @@ $dropdown-link-active-bg: $active-bg; --box-bg: #171c2a; --stat-box-bg: #0b1018; --alert-bg: #3a1c61; - --navbar-bg: #121212; --transparent-fg: #ffffffbb; --fade-out-box-bg-start: rgba(23, 28, 42, 0); --fade-out-box-bg-end: rgba(23, 28, 42, 1); diff --git a/frontend/src/theme-wiz.scss b/frontend/src/theme-wiz.scss index d560a6575..2dd5eb67b 100644 --- a/frontend/src/theme-wiz.scss +++ b/frontend/src/theme-wiz.scss @@ -3,6 +3,7 @@ $bg: #11131f; $active-bg: #000000; $hover-bg: #12131e; $fg: #fff; +$nav-bg: $bg; $title-fg: #2055e3; $taproot: #eba814; @@ -61,6 +62,7 @@ $dropdown-link-active-bg: $active-bg; --active-bg: #{$active-bg}; --hover-bg: #{$hover-bg}; --fg: #{$fg}; + --nav-bg: #{$nav-bg}; --title-fg: #{$title-fg}; --primary: #{$primary}; @@ -77,7 +79,6 @@ $dropdown-link-active-bg: $active-bg; --box-bg: #171c2a; --stat-box-bg: #0b1018; --alert-bg: #3a1c61; - --navbar-bg: #121212; --transparent-fg: #ffffffbb; --fade-out-box-bg-start: rgba(23, 28, 42, 0); --fade-out-box-bg-end: rgba(23, 28, 42, 1); From 788a95b26078841888126c660f0036eb32f34603 Mon Sep 17 00:00:00 2001 From: Mononaut Date: Tue, 7 May 2024 23:31:51 +0000 Subject: [PATCH 31/62] disable selector when forcing custom theme --- frontend/src/app/services/theme.service.ts | 6 ++++-- .../global-footer/global-footer.component.html | 16 ++++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/frontend/src/app/services/theme.service.ts b/frontend/src/app/services/theme.service.ts index 3bdb1c65b..0a0fdc505 100644 --- a/frontend/src/app/services/theme.service.ts +++ b/frontend/src/app/services/theme.service.ts @@ -17,7 +17,7 @@ export class ThemeService { private storageService: StorageService, private stateService: StateService, ) { - const theme = this.storageService.getValue('theme-preference') || this.stateService.env.customize?.theme || 'default'; + const theme = this.stateService.env.customize?.theme || this.storageService.getValue('theme-preference') || 'default'; this.apply(theme); } @@ -44,7 +44,9 @@ export class ThemeService { this.style = null; } } - this.storageService.setValue('theme-preference', theme); + if (!this.stateService.env.customize?.theme) { + this.storageService.setValue('theme-preference', theme); + } this.themeChanged$.next(this.theme); } } diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.html b/frontend/src/app/shared/components/global-footer/global-footer.component.html index a14076022..1a3d68cba 100644 --- a/frontend/src/app/shared/components/global-footer/global-footer.component.html +++ b/frontend/src/app/shared/components/global-footer/global-footer.component.html @@ -27,17 +27,21 @@
-
- -
+ @if (!env.customize?.theme) { +
+ +
+ }
-
- -
+ @if (!env.customize?.theme) { +
+ +
+ } @if (!enterpriseInfo?.footer_img) { - +
diff --git a/frontend/src/app/components/custom-dashboard/custom-dashboard.component.ts b/frontend/src/app/components/custom-dashboard/custom-dashboard.component.ts index 2847b6586..e64151323 100644 --- a/frontend/src/app/components/custom-dashboard/custom-dashboard.component.ts +++ b/frontend/src/app/components/custom-dashboard/custom-dashboard.component.ts @@ -1,4 +1,4 @@ -import { AfterViewInit, ChangeDetectionStrategy, Component, HostListener, Inject, OnDestroy, OnInit, PLATFORM_ID } from '@angular/core'; +import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, HostListener, Inject, OnDestroy, OnInit, PLATFORM_ID } from '@angular/core'; import { combineLatest, merge, Observable, of, Subject, Subscription } from 'rxjs'; import { catchError, filter, map, scan, share, shareReplay, startWith, switchMap, tap } from 'rxjs/operators'; import { BlockExtended, OptimizedMempoolStats, TransactionStripped } from '../../interfaces/node-api.interface'; @@ -85,6 +85,7 @@ export class CustomDashboardComponent implements OnInit, OnDestroy, AfterViewIni private electrsApiService: ElectrsApiService, private websocketService: WebsocketService, private seoService: SeoService, + private cd: ChangeDetectorRef, @Inject(PLATFORM_ID) private platformId: Object, ) { this.webGlEnabled = this.stateService.isBrowser && detectWebGL(); @@ -283,8 +284,8 @@ export class CustomDashboardComponent implements OnInit, OnDestroy, AfterViewIni startAddressSubscription(): void { if (this.stateService.env.customize && this.stateService.env.customize.dashboard.widgets.some(w => w.props?.address)) { - const address = this.stateService.env.customize.dashboard.widgets.find(w => w.props?.address).props.address; - const addressString = (/^[A-Z]{2,5}1[AC-HJ-NP-Z02-9]{8,100}|04[a-fA-F0-9]{128}|(02|03)[a-fA-F0-9]{64}$/.test(address)) ? address.toLowerCase() : address; + let addressString = this.stateService.env.customize.dashboard.widgets.find(w => w.props?.address).props.address; + addressString = (/^[A-Z]{2,5}1[AC-HJ-NP-Z02-9]{8,100}|04[a-fA-F0-9]{128}|(02|03)[a-fA-F0-9]{64}$/.test(addressString)) ? addressString.toLowerCase() : addressString; this.addressSubscription = ( addressString.match(/04[a-fA-F0-9]{128}|(02|03)[a-fA-F0-9]{64}/) @@ -299,6 +300,7 @@ export class CustomDashboardComponent implements OnInit, OnDestroy, AfterViewIni ).subscribe((address: Address) => { this.websocketService.startTrackAddress(address.address); this.address = address; + this.cd.markForCheck(); }); this.addressSummary$ = ( From c15393981dcd450eeac5d2361b12c9617e6e128c Mon Sep 17 00:00:00 2001 From: Mononaut Date: Wed, 8 May 2024 00:22:54 +0000 Subject: [PATCH 33/62] Update onbtc fallback preview img --- frontend/src/resources/sv/onbtc-preview.jpg | Bin 81761 -> 348463 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/frontend/src/resources/sv/onbtc-preview.jpg b/frontend/src/resources/sv/onbtc-preview.jpg index 1ae838e1251d2567cb9ac9a1de1c4ca65a0b5bc4..b243fd8e054702c03620e66e814c1ec81dcdda3f 100644 GIT binary patch literal 348463 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%0DY*^0qb>1VjvjAHfBeTN}EASOo|OoQx3UeR+7 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