midefos/basicswap
1
0
Fork 0
mirror of https://github.com/basicswap/basicswap.git synced 2025-11-05 10:28:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #369 from tecnovert/prepare

Browse Source 
prepare: start Particl daemon only once.
This commit is contained in:
tecnovert
2025-10-02 18:26:49 +00:00
committed by GitHub
parent 93e5ce0ab9 add3a1d83e
commit b35f74c659
1 changed files with 53 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
basicswap/bin/prepare.py
View File

@@ -1768,7 +1768,7 @@ def finalise_daemon(d):
fp.close() fp.close()
def test_particl_encryption(data_dir, settings, chain, use_tor_proxy): def test_particl_encryption(data_dir, settings, chain, use_tor_proxy, extra_opts):
swap_client = None swap_client = None
daemons = [] daemons = []
daemon_args = ["-noconnect", "-nodnsseed", "-nofindpeers", "-nostaking"] daemon_args = ["-noconnect", "-nodnsseed", "-nofindpeers", "-nostaking"]
@@ -1805,12 +1805,14 @@ def test_particl_encryption(data_dir, settings, chain, use_tor_proxy):
"Must set WALLET_ENCRYPTION_PWD to add coin when Particl wallet is encrypted" "Must set WALLET_ENCRYPTION_PWD to add coin when Particl wallet is encrypted"
) )
swap_client.ci(c).unlockWallet(WALLET_ENCRYPTION_PWD) swap_client.ci(c).unlockWallet(WALLET_ENCRYPTION_PWD)
extra_opts["particl_daemon"] = daemons[-1]
finally: finally:
if swap_client: if swap_client:
swap_client.finalise() swap_client.finalise()
del swap_client del swap_client
for d in daemons: if "particl_daemon" not in extra_opts:
finalise_daemon(d) for d in daemons:
finalise_daemon(d)
def encrypt_wallet(swap_client, coin_type) -> None: def encrypt_wallet(swap_client, coin_type) -> None:
@@ -1904,15 +1906,20 @@ def initialise_wallets(
] ]
extra_config = {"stdout_to_file": True, "coin_name": coin_name} extra_config = {"stdout_to_file": True, "coin_name": coin_name}
daemons.append(
startDaemon( if c == Coins.PART and "particl_daemon" in extra_opts:
coin_settings["datadir"], daemons.append(extra_opts["particl_daemon"])
coin_settings["bindir"], del extra_opts["particl_daemon"]
filename, else:
daemon_args + coin_args, daemons.append(
extra_config=extra_config, startDaemon(
coin_settings["datadir"],
coin_settings["bindir"],
filename,
daemon_args + coin_args,
extra_config=extra_config,
)
) )
)
swap_client.setDaemonPID(c, daemons[-1].handle.pid) swap_client.setDaemonPID(c, daemons[-1].handle.pid)
swap_client.setCoinRunParams(c) swap_client.setCoinRunParams(c)
swap_client.createCoinInterface(c) swap_client.createCoinInterface(c)
@@ -2973,34 +2980,44 @@ def main():
"tor_control_password", None "tor_control_password", None
) )
if particl_wallet_mnemonic != "none": try:
# Ensure Particl wallet is unencrypted or correct password is supplied
test_particl_encryption(data_dir, settings, chain, use_tor_proxy)
settings["chainclients"][add_coin] = chainclients[add_coin]
if not no_cores:
prepareCore(add_coin, known_coins[add_coin], settings, data_dir, extra_opts)
if not (prepare_bin_only or upgrade_cores):
prepareDataDir(
add_coin, settings, chain, particl_wallet_mnemonic, extra_opts
)
if particl_wallet_mnemonic != "none": if particl_wallet_mnemonic != "none":
initialise_wallets( # Ensure Particl wallet is unencrypted or correct password is supplied
None, # Keep daemon running to use in initialise_wallets
{ test_particl_encryption(
add_coin, data_dir, settings, chain, use_tor_proxy, extra_opts
},
data_dir,
settings,
chain,
use_tor_proxy,
extra_opts=extra_opts,
) )
save_config(config_path, settings) settings["chainclients"][add_coin] = chainclients[add_coin]
if not no_cores:
prepareCore(
add_coin, known_coins[add_coin], settings, data_dir, extra_opts
)
if not (prepare_bin_only or upgrade_cores):
prepareDataDir(
add_coin, settings, chain, particl_wallet_mnemonic, extra_opts
)
if particl_wallet_mnemonic != "none":
initialise_wallets(
None,
{
add_coin,
},
data_dir,
settings,
chain,
use_tor_proxy,
extra_opts=extra_opts,
)
save_config(config_path, settings)
finally:
if "particl_daemon" in extra_opts:
finalise_daemon(extra_opts["particl_daemon"])
del extra_opts["particl_daemon"]
logger.info(f"Done. Coin {add_coin} successfully added.") logger.info(f"Done. Coin {add_coin} successfully added.")
return 0 return 0