Remove deprecated bitcoin mainnet configuration files and update tests to use Palladium network

This commit is contained in:
2025-11-27 18:38:36 +01:00
parent cc25276e6c
commit b896c7cd6a
8 changed files with 7 additions and 2370 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -1,106 +0,0 @@
{
"0294ac3e099def03c12a37e30fe5364b1223fd60069869142ef96580c8439c2e0a": {
"host": "8.210.134.135",
"port": 26658
},
"03864ef025fde8fb587d989186ce6a4a186895ee44a926bfc370e2c366597a3f8f": {
"host": "3.33.236.230",
"port": 9735
},
"03cde60a6323f7122d5178255766e38114b4722ede08f7c9e0c5df9b912cc201d6": {
"host": "34.65.85.39",
"port": 9745
},
"027100442c3b79f606f80f322d98d499eefcb060599efc5d4ecb00209c2cb54190": {
"host": "3.230.33.224",
"port": 9735
},
"033d8656219478701227199cbd6f670335c8d408a92ae88b962c49d4dc0e83e025": {
"host": "34.65.85.39",
"port": 9735
},
"02f1a8c87607f415c8f22c00593002775941dea48869ce23096af27b0cfdcc0b69": {
"host": "52.13.118.208",
"port": 9735
},
"034ea80f8b148c750463546bd999bf7321a0e6dfc60aaf84bd0400a2e8d376c0d5": {
"host": "213.174.156.79",
"port": 9735
},
"033e9ce4e8f0e68f7db49ffb6b9eecc10605f3f3fcb3c630545887749ab515b9c7": {
"host": "213.174.156.72",
"port": 9735
},
"035e4ff418fc8b5554c5d9eea66396c227bd429a3251c8cbc711002ba215bfc226": {
"host": "170.75.163.209",
"port": 9735
},
"037659a0ac8eb3b8d0a720114efc861d3a940382dcfa1403746b4f8f6b2e8810ba": {
"host": "34.78.139.195",
"port": 9735
},
"03a93b87bf9f052b8e862d51ebbac4ce5e97b5f4137563cd5128548d7f5978dda9": {
"host": "134.209.139.244",
"port": 9735
},
"0288be11d147e1525f7f234f304b094d6627d2c70f3313d7ba3696887b261c4447": {
"host": "18.219.93.203",
"port": 9735
},
"0322d0e43b3d92d30ed187f4e101a9a9605c3ee5fc9721e6dac3ce3d7732fbb13e": {
"host": "164.92.106.32",
"port": 9735
},
"02c197ffa4c2aa4105dd4c4b7279ba1b9061b22910ebbfa759b0001bed9ee48a16": {
"host": "18.181.210.139",
"port": 9735
},
"03c8e5f583585cac1de2b7503a6ccd3c12ba477cfd139cd4905be504c2f48e86bd": {
"host": "34.73.189.183",
"port": 9735
},
"021c97a90a411ff2b10dc2a8e32de2f29d2fa49d41bfbb52bd416e460db0747d0d": {
"host": "54.184.88.251",
"port": 9735
},
"037f990e61acee8a7697966afd29dd88f3b1f8a7b14d625c4f8742bd952003a590": {
"host": "185.5.53.91",
"port": 9735
},
"0326e692c455dd554c709bbb470b0ca7e0bb04152f777d1445fd0bf3709a2833a3": {
"host": "57.129.59.146",
"port": 9735
},
"02e4971e61a3f55718ae31e2eed19aaf2e32caf3eb5ef5ff03e01aa3ada8907e78": {
"host": "52.38.27.190",
"port": 9735
},
"0391904d140fdf88d19423513945a5fcc49c606521b65a85f6d6fe46ebdd1c7665": {
"host": "5.75.184.195",
"port": 35933
},
"026165850492521f4ac8abd9bd8088123446d126f648ca35e60f88177dc149ceb2": {
"host": "45.86.229.190",
"port": 9735
},
"027ce055380348d7812d2ae7745701c9f93e70c1adeb2657f053f91df4f2843c71": {
"host": "157.90.112.145",
"port": 9735
},
"029efe15ef5f0fcc2fdd6b910405e78056b28c9b64e1feff5f13b8dce307e67cad": {
"host": "103.126.161.206",
"port": 9742
},
"03abf6f44c355dec0d5aa155bdbdd6e0c8fefe318eff402de65c6eb2e1be55dc3e": {
"host": "3.132.230.42",
"port": 9735
},
"03271338633d2d37b285dae4df40b413d8c6c791fbee7797bc5dc70812196d7d5c": {
"host": "63.35.146.37",
"port": 9735
},
"03037dc08e9ac63b82581f79b662a4d0ceca8a8ca162b1af3551595b8f2d97b70a": {
"host": "34.68.41.206",
"port": 9735
}
}

View File

@@ -1,475 +0,0 @@
{
"104.248.139.211": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4.2"
},
"128.0.190.26": {
"pruning": "-",
"s": "50002",
"version": "1.4.2"
},
"142.93.6.38": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4.2"
},
"157.245.172.236": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4.2"
},
"159.65.53.177": {
"pruning": "-",
"t": "50001",
"version": "1.4.2"
},
"167.172.42.31": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4.2"
},
"188.230.155.0": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4.2"
},
"22mgr2fndslabzvx4sj7ialugn2jv3cfqjb3dnj67a6vnrkp7g4l37ad.onion": {
"pruning": "-",
"t": "50001",
"version": "1.4.2"
},
"2AZZARITA.hopto.org": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4.2"
},
"2electrumx.hopto.me": {
"pruning": "-",
"s": "56022",
"t": "56021",
"version": "1.4.2"
},
"2ex.digitaleveryware.com": {
"pruning": "-",
"s": "50002",
"version": "1.4.2"
},
"37.205.9.165": {
"pruning": "-",
"s": "50002",
"version": "1.4.2"
},
"68.183.188.105": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4.2"
},
"73.92.198.54": {
"pruning": "-",
"s": "50002",
"version": "1.4.2"
},
"89.248.168.53": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4.2"
},
"E-X.not.fyi": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4"
},
"VPS.hsmiths.com": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4"
},
"alviss.coinjoined.com": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4.2"
},
"assuredly.not.fyi": {
"pruning": "-",
"s": "50002",
"version": "1.4.2"
},
"bejqtnc64qttdempkczylydg7l3ordwugbdar7yqbndck53ukx7wnwad.onion": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4.5"
},
"bitcoin.aranguren.org": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4.2"
},
"bitcoin.lu.ke": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4.2"
},
"bitcoins.sk": {
"pruning": "-",
"s": "56002",
"t": "56001",
"version": "1.4.2"
},
"blackie.c3-soft.com": {
"pruning": "-",
"s": "57002",
"t": "57001",
"version": "1.4.5"
},
"blkhub.net": {
"pruning": "-",
"s": "50002",
"version": "1.4.2"
},
"blockstream.info": {
"pruning": "-",
"s": "700",
"t": "110",
"version": "1.4"
},
"btc.electroncash.dk": {
"pruning": "-",
"s": "60002",
"t": "60001",
"version": "1.4.5"
},
"btc.litepay.ch": {
"pruning": "-",
"s": "50002",
"version": "1.4.2"
},
"btc.ocf.sh": {
"pruning": "-",
"s": "50002",
"version": "1.4.2"
},
"btce.iiiiiii.biz": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4.2"
},
"de.poiuty.com": {
"pruning": "-",
"s": "50002",
"t": "50004",
"version": "1.4.5"
},
"e.keff.org": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4"
},
"e2.keff.org": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4"
},
"eai.coincited.net": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4.2"
},
"ecdsa.net": {
"pruning": "-",
"s": "110",
"t": "50001",
"version": "1.4"
},
"egyh5mutxwcvwhlvjubf6wytwoq5xxvfb2522ocx77puc6ihmffrh6id.onion": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4.2"
},
"electrum.bitaroo.net": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4.2"
},
"electrum.blockstream.info": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4"
},
"electrum.dcn.io": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4.2"
},
"electrum.diynodes.com": {
"pruning": "-",
"s": "50022",
"version": "1.4"
},
"electrum.emzy.de": {
"pruning": "-",
"s": "50002",
"version": "1.4.2"
},
"electrum.hodlister.co": {
"pruning": "-",
"s": "50002",
"version": "1.4"
},
"electrum.hsmiths.com": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4"
},
"electrum.jochen-hoenicke.de": {
"pruning": "-",
"s": "50006",
"t": "50099",
"version": "1.4.5"
},
"electrum.pabu.io": {
"pruning": "-",
"s": "50002",
"version": "1.4.2"
},
"electrum.qtornado.com": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4"
},
"electrum3.hodlister.co": {
"pruning": "-",
"s": "50002",
"version": "1.4"
},
"electrum5.hodlister.co": {
"pruning": "-",
"s": "50002",
"version": "1.4"
},
"electrumx.alexridevski.net": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4.2"
},
"electrumx.erbium.eu": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4"
},
"electrumx.schulzemic.net": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4.2"
},
"elx.bitske.com": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4.2"
},
"ex.btcmp.com": {
"pruning": "-",
"s": "50002",
"version": "1.4.2"
},
"ex03.axalgo.com": {
"pruning": "-",
"s": "50002",
"version": "1.4.2"
},
"explorerzydxu5ecjrkwceayqybizmpjjznk5izmitf2modhcusuqlid.onion": {
"pruning": "-",
"t": "110",
"version": "1.4"
},
"exs.dyshek.org": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4.2"
},
"fortress.qtornado.com": {
"pruning": "-",
"s": "443",
"version": "1.5"
},
"fulcrum.grey.pw": {
"pruning": "-",
"s": "51002",
"t": "51001",
"version": "1.4.5"
},
"fulcrum.sethforprivacy.com": {
"pruning": "-",
"s": "50002",
"version": "1.4"
},
"gall.pro": {
"pruning": "-",
"s": "50002",
"version": "1.4.2"
},
"guichet.centure.cc": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4.2"
},
"hodlers.beer": {
"pruning": "-",
"s": "50002",
"version": "1.4.2"
},
"horsey.cryptocowboys.net": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4.2"
},
"kareoke.qoppa.org": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4.2"
},
"kittycp2gatrqhlwpmbczk5rblw62enrpo2rzwtkfrrr27hq435d4vid.onion": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4.2"
},
"lavahost.org": {
"pruning": "-",
"s": "50002",
"version": "1.4.2"
},
"node.degga.net": {
"pruning": "-",
"s": "50002",
"version": "1.4.2"
},
"node1.btccuracao.com": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4.2"
},
"nuzzg3pku3xbctgamzq3pf7ztakkiidnmmier64arqwh3ajdddovatad.onion": {
"pruning": "-",
"s": "50002",
"version": "1.4.2"
},
"qly7g5n5t3f3h23xvbp44vs6vpmayurno4basuu5rcvrupli7y2jmgid.onion": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4.2"
},
"rzspa374ob3hlyjptkdgz6a62wim2mpanuw6m3shlwn2cxg2smy3p7yd.onion": {
"pruning": "-",
"s": "50004",
"t": "50003",
"version": "1.4.2"
},
"skbxmit.coinjoined.com": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4.2"
},
"smmalis37.ddns.net": {
"pruning": "-",
"s": "50002",
"version": "1.4.2"
},
"stavver.dyshek.org": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4.2"
},
"tardis.bauerj.eu": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4"
},
"ty6cgwaf2pbc244gijtmpfvte3wwfp32wgz57eltjkgtsel2q7jufjyd.onion": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4.2"
},
"udfpzbte2hommnvag5f3qlouqkhvp3xybhlus2yvfeqdwlhjroe4bbyd.onion": {
"pruning": "-",
"s": "60002",
"t": "60001",
"version": "1.4.5"
},
"v7gtzf7nua6hdmb2wtqaqioqmesdb4xrlly4zwr7bvayxv2bpg665pqd.onion": {
"pruning": "-",
"t": "50001",
"version": "1.4.2"
},
"v7o2hkemnt677k3jxcbosmjjxw3p5khjyu7jwv7orfy6rwtkizbshwqd.onion": {
"pruning": "-",
"t": "57001",
"version": "1.4.5"
},
"venmrle3xuwkgkd42wg7f735l6cghst3sdfa3w3ryib2rochfhld6lid.onion": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4.2"
},
"vmd71287.contaboserver.net": {
"pruning": "-",
"s": "50002",
"version": "1.4.2"
},
"vmd84592.contaboserver.net": {
"pruning": "-",
"s": "50002",
"version": "1.4.2"
},
"wsw6tua3xl24gsmi264zaep6seppjyrkyucpsmuxnjzyt3f3j6swshad.onion": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4.2"
},
"xtrum.com": {
"pruning": "-",
"s": "50002",
"t": "50001",
"version": "1.4.2"
}
}

View File

@@ -55,7 +55,7 @@ class ElectrumTestCase(unittest.IsolatedAsyncioTestCase, Logger):
def tearDownClass(cls):
super().tearDownClass()
if cls.TESTNET or cls.REGTEST:
constants.BitcoinMainnet.set_as_network()
constants.Palladium.set_as_network()
def setUp(self):
have_lock = self._test_lock.acquire(timeout=0.1)

View File

@@ -497,7 +497,7 @@ class Test_bitcoin(ElectrumTestCase):
self.assertEqual(address_to_script('tb1pqqqqp399et2xygdj5xreqhjjvcmzhxw4aywxecjdzew6hylgvsesf3hn0c', net=constants.BitcoinTestnet).hex(), '5120000000c4a5cad46221b2a187905e5266362b99d5e91c6ce24d165dab93e86433')
# invalid addresses (from BIP-0173)
for net in [constants.BitcoinMainnet, constants.BitcoinTestnet]:
for net in [constants.Palladium, constants.BitcoinTestnet]:
self.assertFalse(is_address('tc1qw508d6qejxtdg4y5r3zarvary0c5xw7kg3g4ty', net=net))
self.assertFalse(is_address('bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t5', net=net))
self.assertFalse(is_address('BC13W508D6QEJXTDG4Y5R3ZARVARY0C5XW7KN40WF2', net=net))
@@ -510,7 +510,7 @@ class Test_bitcoin(ElectrumTestCase):
self.assertFalse(is_address('bc1gmk9yu', net=net))
# invalid addresses (from BIP-0350)
for net in [constants.BitcoinMainnet, constants.BitcoinTestnet]:
for net in [constants.Palladium, constants.BitcoinTestnet]:
self.assertFalse(is_address('tc1p0xlxvlhemja6c4dqv22uapctqupfhlxm9h8z3k2e72q4k9hcz7vq5zuyut', net=net))
self.assertFalse(is_address('bc1p0xlxvlhemja6c4dqv22uapctqupfhlxm9h8z3k2e72q4k9hcz7vqh2y7hd', net=net))
self.assertFalse(is_address('tb1z0xlxvlhemja6c4dqv22uapctqupfhlxm9h8z3k2e72q4k9hcz7vqglt7rf', net=net))

View File

@@ -53,7 +53,7 @@ class TestBlockchain(ElectrumTestCase):
@classmethod
def tearDownClass(cls):
super().tearDownClass()
constants.BitcoinMainnet.set_as_network()
constants.Palladium.set_as_network()
def setUp(self):
super().setUp()

View File

@@ -93,7 +93,7 @@ class TestHeaderChainResolution(ElectrumTestCase):
@classmethod
def tearDownClass(cls):
super().tearDownClass()
constants.BitcoinMainnet.set_as_network()
constants.Palladium.set_as_network()
def tearDown(self):
blockchain.blockchains = {}

View File

@@ -82,14 +82,14 @@ class TestValidPSBT(ElectrumTestCase):
def test_valid_psbt_008(self):
# Case: PSBT with `PSBT_GLOBAL_XPUB`.
constants.BitcoinMainnet.set_as_network()
constants.Palladium.set_as_network()
try:
tx1 = tx_from_any(bytes.fromhex('70736274ff01009d0100000002710ea76ab45c5cb6438e607e59cc037626981805ae9e0dfd9089012abb0be5350100000000ffffffff190994d6a8b3c8c82ccbcfb2fba4106aa06639b872a8d447465c0d42588d6d670000000000ffffffff0200e1f505000000001976a914b6bc2c0ee5655a843d79afedd0ccc3f7dd64340988ac605af405000000001600141188ef8e4ce0449eaac8fb141cbf5a1176e6a088000000004f010488b21e039e530cac800000003dbc8a5c9769f031b17e77fea1518603221a18fd18f2b9a54c6c8c1ac75cbc3502f230584b155d1c7f1cd45120a653c48d650b431b67c5b2c13f27d7142037c1691027569c503100008000000080000000800001011f00e1f5050000000016001433b982f91b28f160c920b4ab95e58ce50dda3a4a220203309680f33c7de38ea6a47cd4ecd66f1f5a49747c6ffb8808ed09039243e3ad5c47304402202d704ced830c56a909344bd742b6852dccd103e963bae92d38e75254d2bb424502202d86c437195df46c0ceda084f2a291c3da2d64070f76bf9b90b195e7ef28f77201220603309680f33c7de38ea6a47cd4ecd66f1f5a49747c6ffb8808ed09039243e3ad5c1827569c5031000080000000800000008000000000010000000001011f00e1f50500000000160014388fb944307eb77ef45197d0b0b245e079f011de220202c777161f73d0b7c72b9ee7bde650293d13f095bc7656ad1f525da5fd2e10b11047304402204cb1fb5f869c942e0e26100576125439179ae88dca8a9dc3ba08f7953988faa60220521f49ca791c27d70e273c9b14616985909361e25be274ea200d7e08827e514d01220602c777161f73d0b7c72b9ee7bde650293d13f095bc7656ad1f525da5fd2e10b1101827569c5031000080000000800000008000000000000000000000220202d20ca502ee289686d21815bd43a80637b0698e1fbcdbe4caed445f6c1a0a90ef1827569c50310000800000008000000080000000000400000000'))
tx2 = tx_from_any('cHNidP8BAJ0BAAAAAnEOp2q0XFy2Q45gflnMA3YmmBgFrp4N/ZCJASq7C+U1AQAAAAD/////GQmU1qizyMgsy8+y+6QQaqBmObhyqNRHRlwNQliNbWcAAAAAAP////8CAOH1BQAAAAAZdqkUtrwsDuVlWoQ9ea/t0MzD991kNAmIrGBa9AUAAAAAFgAUEYjvjkzgRJ6qyPsUHL9aEXbmoIgAAAAATwEEiLIeA55TDKyAAAAAPbyKXJdp8DGxfnf+oVGGAyIaGP0Y8rmlTGyMGsdcvDUC8jBYSxVdHH8c1FEgplPEjWULQxtnxbLBPyfXFCA3wWkQJ1acUDEAAIAAAACAAAAAgAABAR8A4fUFAAAAABYAFDO5gvkbKPFgySC0q5XljOUN2jpKIgIDMJaA8zx9446mpHzU7NZvH1pJdHxv+4gI7QkDkkPjrVxHMEQCIC1wTO2DDFapCTRL10K2hS3M0QPpY7rpLTjnUlTSu0JFAiAthsQ3GV30bAztoITyopHD2i1kBw92v5uQsZXn7yj3cgEiBgMwloDzPH3jjqakfNTs1m8fWkl0fG/7iAjtCQOSQ+OtXBgnVpxQMQAAgAAAAIAAAACAAAAAAAEAAAAAAQEfAOH1BQAAAAAWABQ4j7lEMH63fvRRl9CwskXgefAR3iICAsd3Fh9z0LfHK57nveZQKT0T8JW8dlatH1Jdpf0uELEQRzBEAiBMsftfhpyULg4mEAV2ElQ5F5rojcqKncO6CPeVOYj6pgIgUh9JynkcJ9cOJzybFGFphZCTYeJb4nTqIA1+CIJ+UU0BIgYCx3cWH3PQt8crnue95lApPRPwlbx2Vq0fUl2l/S4QsRAYJ1acUDEAAIAAAACAAAAAgAAAAAAAAAAAAAAiAgLSDKUC7iiWhtIYFb1DqAY3sGmOH7zb5MrtRF9sGgqQ7xgnVpxQMQAAgAAAAIAAAACAAAAAAAQAAAAA')
for tx in (tx1, tx2):
self.assertEqual(1, len(tx.xpubs))
finally:
constants.BitcoinTestnet.set_as_network()
constants.Palladium.set_as_network()
def test_valid_psbt__input_with_both_witness_utxo_and_nonwitness_utxo(self):
# Case: PSBT where an input has both WITNESS_UTXO and UTXO.