diff --git a/basicswap/bin/prepare.py b/basicswap/bin/prepare.py index 9efe44c..b5295bd 100755 --- a/basicswap/bin/prepare.py +++ b/basicswap/bin/prepare.py @@ -2469,11 +2469,7 @@ def main(): server_str = s[1].strip() parts = server_str.split(":") if len(parts) >= 2: - server = { - "host": parts[0], - "port": int(parts[1]), - "ssl": parts[2].lower() == "true" if len(parts) > 2 else True, - } + server = f"{parts[0]}:{parts[1]}" if coin_prefix not in electrum_servers: electrum_servers[coin_prefix] = [] electrum_servers[coin_prefix].append(server) diff --git a/basicswap/bin/run.py b/basicswap/bin/run.py index d67859f..d7bd10e 100755 --- a/basicswap/bin/run.py +++ b/basicswap/bin/run.py @@ -371,6 +371,19 @@ def runClient( with open(settings_path) as fs: settings = json.load(fs) + # TEMP: + config_changed = False + for coin_name, coin_data in settings.get("chainclients", {}).items(): + for key in ["electrum_clearnet_servers", "electrum_onion_servers"]: + servers = coin_data.get(key) + if servers and isinstance(servers, list) and len(servers) > 0: + if isinstance(servers[0], dict): + coin_data[key] = [f"{s['host']}:{s['port']}" for s in servers] + config_changed = True + if config_changed: + with open(settings_path, "w") as fs: + json.dump(settings, fs, indent=4) + swap_client = BasicSwap( data_dir, settings, chain, log_name=log_prefix, extra_opts=extra_opts )