From 1e5a55917c31350c17f747c3b73ce7b369a0a84e Mon Sep 17 00:00:00 2001 From: Mononaut Date: Mon, 6 May 2024 15:40:32 +0000 Subject: [PATCH 1/5] 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 2/5] 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 3/5] 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 4/5] 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 5/5] 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) {