Don't start cores for unknown coins.

master^2
tecnovert 7 months ago
parent ebdbe115dd
commit b07bc3c456
  1. 8
      bin/basicswap_prepare.py
  2. 5
      bin/basicswap_run.py

@ -1556,24 +1556,24 @@ def main():
particl_wallet_mnemonic = s[1].strip('"') particl_wallet_mnemonic = s[1].strip('"')
continue continue
if name in ('withcoin', 'withcoins'): if name in ('withcoin', 'withcoins'):
for coin in [s.lower() for s in s[1].split(',')]: for coin in [s.strip().lower() for s in s[1].split(',')]:
ensure_coin_valid(coin) ensure_coin_valid(coin)
with_coins.add(coin) with_coins.add(coin)
coins_changed = True coins_changed = True
continue continue
if name in ('withoutcoin', 'withoutcoins'): if name in ('withoutcoin', 'withoutcoins'):
for coin in [s.lower() for s in s[1].split(',')]: for coin in [s.strip().lower() for s in s[1].split(',')]:
ensure_coin_valid(coin, test_disabled=False) ensure_coin_valid(coin, test_disabled=False)
with_coins.discard(coin) with_coins.discard(coin)
coins_changed = True coins_changed = True
continue continue
if name == 'addcoin': if name == 'addcoin':
add_coin = s[1].lower() add_coin = s[1].strip().lower()
ensure_coin_valid(add_coin) ensure_coin_valid(add_coin)
with_coins = {add_coin, } with_coins = {add_coin, }
continue continue
if name == 'disablecoin': if name == 'disablecoin':
disable_coin = s[1].lower() disable_coin = s[1].strip().lower()
ensure_coin_valid(disable_coin, test_disabled=False) ensure_coin_valid(disable_coin, test_disabled=False)
continue continue
if name == 'htmlhost': if name == 'htmlhost':

@ -200,15 +200,14 @@ def runClient(fp, data_dir, chain, start_only_coins):
try: try:
# Try start daemons # Try start daemons
for c, v in settings['chainclients'].items(): for c, v in settings['chainclients'].items():
if len(start_only_coins) > 0 and c not in start_only_coins: if len(start_only_coins) > 0 and c not in start_only_coins:
continue continue
try: try:
coin_id = swap_client.getCoinIdFromName(c) coin_id = swap_client.getCoinIdFromName(c)
display_name = getCoinName(coin_id) display_name = getCoinName(coin_id)
except Exception as e: except Exception as e:
logger.warning('Error getting coin display name for {}: {}'.format(c, str(e))) logger.warning('Not starting unknown coin: {}'.format(c))
display_name = 'Unknown' continue
if c == 'monero': if c == 'monero':
if v['manage_daemon'] is True: if v['manage_daemon'] is True:
swap_client.log.info(f'Starting {display_name} daemon') swap_client.log.info(f'Starting {display_name} daemon')

Loading…
Cancel
Save