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

coins: Rename Pivx -> PIVX

Browse Source
This commit is contained in:
tecnovert
2022-10-24 20:49:36 +02:00
parent e46fd193fe
commit 59fb6c18ed
10 changed files with 75 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/basicswap_prepare.py
View File

@@ -27,6 +27,7 @@ import basicswap.config as cfg
from basicswap.base import getaddrinfo_tor
from basicswap.basicswap import BasicSwap
from basicswap.chainparams import Coins
from basicswap.ui.util import getCoinName
from basicswap.util import toBool
from basicswap.util.rfc2440 import rfc2440_hash_password
from basicswap.contrib.rpcauth import generate_salt, password_to_hmac
@@ -895,7 +896,7 @@ def initialise_wallets(particl_wallet_mnemonic, with_coins, data_dir, settings,
# Create wallet if it doesn't exist yet
wallets = swap_client.callcoinrpc(c, 'listwallets')
if len(wallets) < 1:
logger.info('Creating wallet.dat for {}.'.format(coin_name.capitalize()))
logger.info('Creating wallet.dat for {}.'.format(getCoinName(c)))
swap_client.callcoinrpc(c, 'createwallet', ['wallet.dat'])
if 'particl' in with_coins and c == Coins.PART:

14
bin/basicswap_run.py
View File

@@ -17,11 +17,11 @@ import subprocess
import basicswap.config as cfg
from basicswap import __version__
from basicswap.ui.util import getCoinName
from basicswap.basicswap import BasicSwap
from basicswap.http_server import HttpThread
from basicswap.contrib.websocket_server import WebsocketServer
logger = logging.getLogger()
logger.level = logging.DEBUG
if not len(logger.handlers):
@@ -142,15 +142,21 @@ def runClient(fp, data_dir, chain):
try:
# Try start daemons
for c, v in settings['chainclients'].items():
try:
coin_id = swap_client.getCoinIdFromName(c)
display_name = getCoinName(coin_id)
except Exception as e:
logger.warning('Error getting coin display name for {}: {}'.format(c, str(e)))
display_name = 'Unknown'
if c == 'monero':
if v['manage_daemon'] is True:
swap_client.log.info('Starting {} daemon'.format(c.capitalize()))
swap_client.log.info(f'Starting {display_name} daemon')
daemons.append(startXmrDaemon(v['datadir'], v['bindir'], 'monerod'))
pid = daemons[-1].pid
swap_client.log.info('Started {} {}'.format('monerod', pid))
if v['manage_wallet_daemon'] is True:
swap_client.log.info('Starting {} wallet daemon'.format(c.capitalize()))
swap_client.log.info(f'Starting {display_name} wallet daemon')
daemon_addr = '{}:{}'.format(v['rpchost'], v['rpcport'])
swap_client.log.info('daemon-address: {}'.format(daemon_addr))
opts = ['--daemon-address', daemon_addr, ]
@@ -160,7 +166,7 @@ def runClient(fp, data_dir, chain):
continue
if v['manage_daemon'] is True:
swap_client.log.info('Starting {} daemon'.format(c.capitalize()))
swap_client.log.info(f'Starting {display_name} daemon')
filename = c + 'd' + ('.exe' if os.name == 'nt' else '')
daemons.append(startDaemon(v['datadir'], v['bindir'], filename))