Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add testnet4 support #699

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+90 −10
Open

add testnet4 support #699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 84 additions & 4 deletions app/coins/btc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,30 +65,35 @@ module.exports = {
logoUrlsByNetwork:{
"main":"./img/network-mainnet/logo.svg",
"test":"./img/network-testnet/logo.svg",
"testnet4":"./img/network-testnet/logo.svg",
"regtest":"./img/network-regtest/logo.svg",
"signet":"./img/network-signet/logo.svg"
},
coinIconUrlsByNetwork:{
"main":"./img/network-mainnet/coin-icon.svg",
"test":"./img/network-testnet/coin-icon.svg",
"testnet4":"./img/network-testnet/coin-icon.svg",
"signet":"./img/network-signet/coin-icon.svg",
"regtest":"./img/network-regtest/coin-icon.svg"
},
coinColorsByNetwork: {
"main": "#F7931A",
"test": "#1daf00",
"test": "#8f9a22",
"testnet4": "#1daf00",
Comment on lines +81 to +82
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder why do you change the testnet3 coin color at this point? I think both testnet3 & 4 could use the same color green.

And also I wonder if this also changes the color of the favicon, which follows coin color as well in order to visually distinguish browser tabs.

Copy link
Contributor Author

@0xf0xx0 0xf0xx0 Dec 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i picked a color between mainnet and testnet to make the explorer icons visually distinct, but now that i look closer it doesnt look like these colors are even used. the favicons are hardcoded in their respective .svgs, and the tab color is hardcoded here: https://github.com/janoside/btc-rpc-explorer/blob/153aa0ae7f902562bd1cfa2bbcea4c00026e5aef/views/layout.pug#L49C45-L50C1

"signet": "#af008c",
"regtest": "#777"
},
siteTitlesByNetwork: {
"main":"Bitcoin Explorer",
"test":"Testnet Explorer",
"test":"Testnet3 Explorer",
"testnet4":"Testnet4 Explorer",
"regtest":"Regtest Explorer",
"signet":"Signet Explorer",
},
demoSiteUrlsByNetwork: {
"main": "https://bitcoinexplorer.org",
"test": "https://testnet.bitcoinexplorer.org",
"testnet4": "https://testnet.bitcoinexplorer.org",
"signet": "https://signet.bitcoinexplorer.org",
},
knownTransactionsByNetwork: {
Expand All @@ -110,6 +115,7 @@ module.exports = {
maxSupplyByNetwork: {
"main": new Decimal(20999817.31308491), // ref: https://bitcoin.stackexchange.com/a/38998
"test": new Decimal(21000000),
"testnet4": new Decimal(21000000),
"regtest": new Decimal(21000000),
"signet": new Decimal(21000000)
},
Expand All @@ -124,13 +130,15 @@ module.exports = {
halvingBlockIntervalsByNetwork: {
"main": 210000,
"test": 210000,
"testnet4": 210000,
"regtest": 150,
"signet": 210000
},

terminalHalvingCountByNetwork: {
"main": 32,
"test": 32,
"testnet4": 32,
"regtest": 32,
"signet": 32
},
Expand Down Expand Up @@ -163,16 +171,18 @@ module.exports = {
"lastUpdated": 1681140656788
}
},

genesisBlockHashesByNetwork:{
"main": "000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f",
"test": "000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943",
"testnet4": "00000000da84f2bafbbc53dee25a72ae507ff4914b867c565be350b0da8bf043",
"regtest": "0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206",
"signet": "00000008819873e925422c1ff0f99f7cc9bbb232af63a077a480a3633bee1ef6",
"signet": "00000008819873e925422c1ff0f99f7cc9bbb232af63a077a480a3633bee1ef6",
},
genesisCoinbaseTransactionIdsByNetwork: {
"main": "4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b",
"test": "4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b",
"testnet4": "7aa0a7ae1e223414cb807e40cd57e667b718e42aaf9306db9102fe28912b7b4e",
"regtest": "4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b",
"signet": "4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b"
},
Expand Down Expand Up @@ -244,6 +254,37 @@ module.exports = {
"time": 1296688602,
"blocktime": 1296688602
},
"testnet4": {
"hex": "01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff5504ffff001d01044c4c30332f4d61792f323032342030303030303030303030303030303030303030303165626435386332343439373062336161396437383362623030313031316662653865613865393865303065ffffffff0100f2052a010000002321000000000000000000000000000000000000000000000000000000000000000000ac00000000",
"txid": "7aa0a7ae1e223414cb807e40cd57e667b718e42aaf9306db9102fe28912b7b4e",
"hash": "7aa0a7ae1e223414cb807e40cd57e667b718e42aaf9306db9102fe28912b7b4e",
"version": 1,
"size": 180,
"vsize": 180,
"weight": 720,
"locktime": 0,
"vin": [
{
"coinbase": "04ffff001d01044c4c30332f4d61792f323032342030303030303030303030303030303030303030303165626435386332343439373062336161396437383362623030313031316662653865613865393865303065",
"sequence": 4294967295
}
],
"vout": [
{
"value": 50.00000000,
"n": 0,
"scriptPubKey": {
"asm": "000000000000000000000000000000000000000000000000000000000000000000 OP_CHECKSIG",
"desc": "raw(21000000000000000000000000000000000000000000000000000000000000000000ac)#8erpcjk9",
"hex": "21000000000000000000000000000000000000000000000000000000000000000000ac",
"type": "nonstandard"
}
}
],
"blockhash": "00000000da84f2bafbbc53dee25a72ae507ff4914b867c565be350b0da8bf043",
"time": 1714777860,
"blocktime": 1714777860
},
"regtest": {
"hex": "01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff4d04ffff001d0104455468652054696d65732030332f4a616e2f32303039204368616e63656c6c6f72206f6e206272696e6b206f66207365636f6e64206261696c6f757420666f722062616e6b73ffffffff0100f2052a01000000434104678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5fac00000000",
"txid": "4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b",
Expand Down Expand Up @@ -380,6 +421,45 @@ module.exports = {
"utxo_increase": 1,
"utxo_size_inc": 117
},
"testnet4": {
"avgfee": 0,
"avgfeerate": 0,
"avgtxsize": 0,
"blockhash": "00000000da84f2bafbbc53dee25a72ae507ff4914b867c565be350b0da8bf043",
"feerate_percentiles": [
0,
0,
0,
0,
0
],
"height": 0,
"ins": 0,
"maxfee": 0,
"maxfeerate": 0,
"maxtxsize": 0,
"medianfee": 0,
"mediantime": 1714777860,
"mediantxsize": 0,
"minfee": 0,
"minfeerate": 0,
"mintxsize": 0,
"outs": 1,
"subsidy": 5000000000,
"swtotal_size": 0,
"swtotal_weight": 0,
"swtxs": 0,
"time": 1714777860,
"total_out": 0,
"total_size": 0,
"total_weight": 0,
"totalfee": 0,
"txs": 1,
"utxo_increase": 1,
"utxo_size_inc": 85,
"utxo_increase_actual": 0,
"utxo_size_inc_actual": 0
},
"regtest": {
"avgfee": 0,
"avgfeerate": 0,
Expand Down
4 changes: 2 additions & 2 deletions views/includes/shared-mixins.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,8 @@ mixin txList(visibleTxs, txCount, limit, offset, inputsByTxid, options={})
- txFee = new Decimal(totalIOValues.input).minus(totalIOValues.output);
- txFeeRate = txFee.dividedBy(tx.vsize).times(coinConfig.baseCurrencyUnit.multiplier);

if (!coinbaseTx && Object.keys(txInputs).length < tx.vin.length)

if (!coinbaseTx && txInputs && Object.keys(txInputs).length < tx.vin.length)
+infoBadge
span(data-bs-toggle="tooltip", title="Data truncated by performance settings. See transaction details for fee info.")
span.fw-light …
Expand Down
8 changes: 4 additions & 4 deletions views/layout.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ html(lang="en")
meta(property="twitter:domain" content="bitcoinexplorer.org")

- var network = global.activeBlockchain || "main";
if (!network.endsWith("net") && network != "regtest")
if (!network.endsWith("net") && network != "regtest" && network != "testnet4")
- network = (network + "net"); // handles "main" -> "mainnet" and "test" -> "testnet"

link(rel="apple-touch-icon", sizes="180x180", href=assetUrl(`./img/network-${network}/apple-touch-icon.png`))
Expand Down Expand Up @@ -102,7 +102,7 @@ html(lang="en")
div.dropdown-menu.dropdown-menu-end.shadow(aria-label="Demo Sites")
span.dropdown-header Public Demo Sites

- var demoSites = ["main", "test", "signet"];
- var demoSites = ["main", "test", "testnet4", "signet"];

each demoSite in demoSites
a.dropdown-item(href=coinConfig.demoSiteUrlsByNetwork[demoSite])
Expand Down Expand Up @@ -308,8 +308,8 @@ html(lang="en")
+copyTextButton("http://btcexpz7xlwrqknqw6p3bok6shf73qtkd6zxct4x4qta2ktvh7ntprad.onion")

div.mt-2
- var demoSites = ["main", "test", "signet"];
- var demoSites = ["main", "test", "testnet4", "signet"];

each demoSite in demoSites
a.me-2(href=coinConfig.demoSiteUrlsByNetwork[demoSite], title=coinConfig.siteTitlesByNetwork[demoSite], data-bs-toggle="tooltip")
img(src=assetUrl(coinConfig.logoUrlsByNetwork[demoSite]), alt=coinConfig.siteTitlesByNetwork[demoSite], style="width: 40px; height: 40px;")
Expand Down
Loading