Fixes after merging upstream

Groestlcoin · Jan 17, 2025 · 18cd1ce · 18cd1ce
1 parent 633883a
commit 18cd1ce
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 18 deletions.
diff --git a/contrib/deterministic-build/requirements.txt b/contrib/deterministic-build/requirements.txt
@@ -18,8 +18,6 @@ electrum-aionostr==0.0.6 \
     --hash=sha256:6eead6193edc6ab8455b7ddee1b3f4f5cb3c65d0ea1bdbdadb44506eb8f67092
 electrum-ecc==0.0.3 \
     --hash=sha256:c8ab69fecb294825367030da532b2d191883fa169789faa2942c256b4043d0a2
-electrum-aionostr==0.0.6 \
-    --hash=sha256:6eead6193edc6ab8455b7ddee1b3f4f5cb3c65d0ea1bdbdadb44506eb8f67092
 frozenlist==1.3.3 \
     --hash=sha256:58bcc55721e8a90b88332d6cd441261ebb22342e238296bb330968952fbb3a6a
 idna==3.6 \

diff --git a/electrum_grs/lnworker.py b/electrum_grs/lnworker.py
@@ -122,20 +122,7 @@
     LNPeerAddr(host='104.236.15.120', port=9735, pubkey=bfh('02f31ea82a5c07387abec0274b457db35355ef874e21bb2fdc4f4abb3f5d0d82ce')),
 ]
 
-FALLBACK_NODE_LIST_SIGNET = (
-    LNPeerAddr(host='34.68.95.152', port=9735, pubkey=bfh('02357a375a846279fc1e8413f5e182652a125e5f6a4f4653bffabebb8177a6d8aa')),
-    LNPeerAddr(host='34.124.125.201', port=9735, pubkey=bfh('0305061295fa30847df41ae6ee809b560e78d65c2a7337a41c725ea3920b65e08a')),
-    LNPeerAddr(host='35.247.14.99', port=9735, pubkey=bfh('027554f8d4d99a43cf1b49d274f698ee5045273cd377206eba62ea308b4386a4fa')),
-    LNPeerAddr(host='34.138.100.228', port=9735, pubkey=bfh('0244bb7ba2392ab2d493ad04ad4afcd482ca44a2bfe5b42bcc830bfe00e5b08082')),
-    LNPeerAddr(host='34.74.81.232', port=9735, pubkey=bfh('03adf6efe5346d455172c750a655b07fb85be4f50f5b555f9f91a853a6b448c3bf')),
-    LNPeerAddr(host='34.138.237.159', port=9735, pubkey=bfh('03ea42c9408a73dabdcb5655e2923956d132fbb25cb71e7c00a29e10c73e937e64')),
-    LNPeerAddr(host='34.75.211.29', port=9735, pubkey=bfh('024d899b60d5de58e8d66af042445323a48b6962d6c667c033802421dc49abc232')),
-    LNPeerAddr(host='34.73.252.102', port=9735, pubkey=bfh('02e8430ba207ce87bd2d4ab36497b9eac10e6d5d86f9fda8aa270c48877e0a8259')),
-    LNPeerAddr(host='175.45.182.145', port=39735, pubkey=bfh('0265ed138065b84d6b9448f9e0a2fd4ceb63fef08efe1dfc949a63d5d43110e4c0')), # port: not a typo
-    LNPeerAddr(host='104.244.73.68', port=9735, pubkey=bfh('0307238136c48cd35084c4efadc486143a7e8a7acd8ff8ac053fdab4efabc551c4')),
-    LNPeerAddr(host='84.247.50.180', port=44149, pubkey=bfh('020ee56ff81d12d17d5d3eea5306a8982a5763522ca73e0e220ce282030543c90c')),
-    LNPeerAddr(host='signet-eclair.wakiyamap.dev', port=9735, pubkey=bfh('0271cf3881e6eadad960f47125434342e57e65b98a78afa99f9b4191c02dd7ab3b')),
-)
+FALLBACK_NODE_LIST_SIGNET = ()
 
 from .trampoline import trampolines_by_id, hardcoded_trampoline_nodes, is_hardcoded_trampoline
 
@@ -3128,4 +3115,3 @@ def get_forwarding_failure(self, payment_key: str) -> Tuple[Optional[bytes], Opt
         error_bytes = bytes.fromhex(error_hex) if error_hex else None
         failure_message = OnionRoutingFailure.from_bytes(bytes.fromhex(failure_hex)) if failure_hex else None
         return error_bytes, failure_message
-
diff --git a/run_electrum_grs b/run_electrum_grs
@@ -331,7 +331,7 @@ def main():
         if util.get_android_package_name() == "org.groestlcoin.testnet.electrumgrs":
             # ~hack for easier testnet builds. pkgname subject to change.
             config_options['testnet'] = True
-        elif util.get_android_package_name() == "org.electrum.regtest.electrum":
+        elif util.get_android_package_name() == "org.groestlcoin.regtest.electrumgrs":
             # ~hack for easier regtest builds. pkgname subject to change.
             config_options['regtest'] = True
     else: