Merge branch '202501_chains': mv chain-specific json files to chains/

contrib/build-wine/deterministic.spec

@@ -32,6 +32,7 @@ datas = [
     (f"{PROJECT_ROOT}/{PYPKG}/lnwire/*.csv", f"{PYPKG}/lnwire"),
     (f"{PROJECT_ROOT}/{PYPKG}/wordlist/english.txt", f"{PYPKG}/wordlist"),
     (f"{PROJECT_ROOT}/{PYPKG}/wordlist/slip39.txt", f"{PYPKG}/wordlist"),
+    (f"{PROJECT_ROOT}/{PYPKG}/chains", f"{PYPKG}/chains"),
     (f"{PROJECT_ROOT}/{PYPKG}/locale", f"{PYPKG}/locale"),
     (f"{PROJECT_ROOT}/{PYPKG}/plugins", f"{PYPKG}/plugins"),
     (f"{PROJECT_ROOT}/{PYPKG}/gui/icons", f"{PYPKG}/gui/icons"),

contrib/osx/osx.spec

@@ -35,6 +35,7 @@ datas = [
     (f"{PROJECT_ROOT}/{PYPKG}/lnwire/*.csv", f"{PYPKG}/lnwire"),
     (f"{PROJECT_ROOT}/{PYPKG}/wordlist/english.txt", f"{PYPKG}/wordlist"),
     (f"{PROJECT_ROOT}/{PYPKG}/wordlist/slip39.txt", f"{PYPKG}/wordlist"),
+    (f"{PROJECT_ROOT}/{PYPKG}/chains", f"{PYPKG}/chains"),
     (f"{PROJECT_ROOT}/{PYPKG}/locale", f"{PYPKG}/locale"),
     (f"{PROJECT_ROOT}/{PYPKG}/plugins", f"{PYPKG}/plugins"),
     (f"{PROJECT_ROOT}/{PYPKG}/gui/icons", f"{PYPKG}/gui/icons"),

electrum/constants.py

@@ -32,12 +32,16 @@ from .util import inv_dict, all_subclasses
 from . import bitcoin
 
 
-def read_json(filename, default):
+def read_json(filename, default=None):
     path = os.path.join(os.path.dirname(__file__), filename)
     try:
         with open(path, 'r') as f:
             r = json.loads(f.read())
     except Exception:
+        if default is None:
+            # Sometimes it's better to hard-fail: the file might be missing
+            # due to a packaging issue, which might otherwise go unnoticed.
+            raise
         r = default
     return r
 
@@ -53,7 +57,7 @@ def create_fallback_node_list(fallback_nodes_dict: dict[str, dict]) -> List[LNPe
 
 GIT_REPO_URL = "https://github.com/spesmilo/electrum"
 GIT_REPO_ISSUES_URL = "https://github.com/spesmilo/electrum/issues"
-BIP39_WALLET_FORMATS = read_json('bip39_wallet_formats.json', [])
+BIP39_WALLET_FORMATS = read_json('bip39_wallet_formats.json')
 
 
 class AbstractNet:
@@ -104,9 +108,9 @@ class BitcoinMainnet(AbstractNet):
     BOLT11_HRP = SEGWIT_HRP
     GENESIS = "000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f"
     DEFAULT_PORTS = {'t': '50001', 's': '50002'}
-    DEFAULT_SERVERS = read_json('servers.json', {})
-    FALLBACK_LN_NODES = create_fallback_node_list(read_json('fallback_lnnodes_mainnet.json', {}))
-    CHECKPOINTS = read_json('checkpoints.json', [])
+    DEFAULT_SERVERS = read_json(os.path.join('chains', 'servers.json'))
+    FALLBACK_LN_NODES = create_fallback_node_list(read_json(os.path.join('chains', 'fallback_lnnodes_mainnet.json')))
+    CHECKPOINTS = read_json(os.path.join('chains', 'checkpoints.json'))
     BLOCK_HEIGHT_FIRST_LIGHTNING_CHANNELS = 497000
 
     XPRV_HEADERS = {
@@ -145,9 +149,9 @@ class BitcoinTestnet(AbstractNet):
     BOLT11_HRP = SEGWIT_HRP
     GENESIS = "000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943"
     DEFAULT_PORTS = {'t': '51001', 's': '51002'}
-    DEFAULT_SERVERS = read_json('servers_testnet.json', {})
-    FALLBACK_LN_NODES = create_fallback_node_list(read_json('fallback_lnnodes_testnet3.json', {}))
-    CHECKPOINTS = read_json('checkpoints_testnet.json', [])
+    DEFAULT_SERVERS = read_json(os.path.join('chains', 'servers_testnet.json'), {})
+    FALLBACK_LN_NODES = create_fallback_node_list(read_json(os.path.join('chains', 'fallback_lnnodes_testnet3.json'), {}))
+    CHECKPOINTS = read_json(os.path.join('chains', 'checkpoints_testnet.json'), [])
 
     XPRV_HEADERS = {
         'standard':    0x04358394,  # tprv
@@ -177,9 +181,9 @@ class BitcoinTestnet4(BitcoinTestnet):
 
     NET_NAME = "testnet4"
     GENESIS = "00000000da84f2bafbbc53dee25a72ae507ff4914b867c565be350b0da8bf043"
-    DEFAULT_SERVERS = read_json('servers_testnet4.json', {})
-    FALLBACK_LN_NODES = create_fallback_node_list(read_json('fallback_lnnodes_testnet4.json', {}))
-    CHECKPOINTS = read_json('checkpoints_testnet4.json', [])
+    DEFAULT_SERVERS = read_json(os.path.join('chains', 'servers_testnet4.json'), {})
+    FALLBACK_LN_NODES = create_fallback_node_list(read_json(os.path.join('chains', 'fallback_lnnodes_testnet4.json'), {}))
+    CHECKPOINTS = read_json(os.path.join('chains', 'checkpoints_testnet4.json'), [])
     LN_DNS_SEEDS = []
 
 
@@ -189,7 +193,7 @@ class BitcoinRegtest(BitcoinTestnet):
     SEGWIT_HRP = "bcrt"
     BOLT11_HRP = SEGWIT_HRP
     GENESIS = "0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206"
-    DEFAULT_SERVERS = read_json('servers_regtest.json', {})
+    DEFAULT_SERVERS = read_json(os.path.join('chains', 'servers_regtest.json'), {})
     FALLBACK_LN_NODES = []
     CHECKPOINTS = []
     LN_DNS_SEEDS = []
@@ -204,7 +208,7 @@ class BitcoinSimnet(BitcoinTestnet):
     SEGWIT_HRP = "sb"
     BOLT11_HRP = SEGWIT_HRP
     GENESIS = "683e86bd5c6d110d91b94b97137ba6bfe02dbbdb8e3dff722a669b5d69d77af6"
-    DEFAULT_SERVERS = read_json('servers_regtest.json', {})
+    DEFAULT_SERVERS = read_json(os.path.join('chains', 'servers_regtest.json'), {})
     FALLBACK_LN_NODES = []
     CHECKPOINTS = []
     LN_DNS_SEEDS = []
@@ -215,8 +219,8 @@ class BitcoinSignet(BitcoinTestnet):
     NET_NAME = "signet"
     BOLT11_HRP = "tbs"
     GENESIS = "00000008819873e925422c1ff0f99f7cc9bbb232af63a077a480a3633bee1ef6"
-    DEFAULT_SERVERS = read_json('servers_signet.json', {})
-    FALLBACK_LN_NODES = create_fallback_node_list(read_json('fallback_lnnodes_signet.json', {}))
+    DEFAULT_SERVERS = read_json(os.path.join('chains', 'servers_signet.json'), {})
+    FALLBACK_LN_NODES = create_fallback_node_list(read_json(os.path.join('chains', 'fallback_lnnodes_signet.json'), {}))
     CHECKPOINTS = []
     LN_DNS_SEEDS = []