Bitcoin SignetL-
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 @@
-
+
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
Networks
- + + 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 @@