Ecosystem/basicswap
1
0
Fork 0
mirror of https://github.com/basicswap/basicswap.git synced 2025-01-31 06:45:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

prepare: don't start daemon if coin config exists in basicswap.json
Some checks are pending
lint / build (3.12) (push) Waiting to run
Details

Browse source
This commit is contained in:
nahuhh 2024-11-14 04:57:06 +00:00 committed by tecnovert
parent f93fae6696
commit 6be9a14335
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
basicswap/bin/prepare.py
View file

@ -2075,12 +2075,6 @@ def main():
if add_coin != '': if add_coin != '':
logger.info('Adding coin: %s', add_coin) logger.info('Adding coin: %s', add_coin)
settings = load_config(config_path) settings = load_config(config_path)
if tor_control_password is None and settings.get('use_tor', False):
extra_opts['tor_control_password'] = settings.get('tor_control_password', None)
if particl_wallet_mnemonic != 'none':
# Ensure Particl wallet is unencrypted or correct password is supplied
test_particl_encryption(data_dir, settings, chain, use_tor_proxy)
if add_coin in settings['chainclients']: if add_coin in settings['chainclients']:
coin_settings = settings['chainclients'][add_coin] coin_settings = settings['chainclients'][add_coin]
@ -2096,6 +2090,13 @@ def main():
return 0 return 0
exitWithError('{} is already in the settings file'.format(add_coin)) exitWithError('{} is already in the settings file'.format(add_coin))
if tor_control_password is None and settings.get('use_tor', False):
extra_opts['tor_control_password'] = settings.get('tor_control_password', None)
if particl_wallet_mnemonic != 'none':
# 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] settings['chainclients'][add_coin] = chainclients[add_coin]
settings['use_tor_proxy'] = use_tor_proxy settings['use_tor_proxy'] = use_tor_proxy