Ecosystem/basicswap
1
0
Fork 0
mirror of https://github.com/basicswap/basicswap.git synced 2024-12-22 19:49:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix BCH exchange name, pipe daemon output to file from prepare.
Some checks failed
lint / build (3.12) (push) Has been cancelled
Details

Browse source
This commit is contained in:
tecnovert 2024-11-13 19:02:46 +02:00
parent 4693d96c52
commit 56b41f7a7f
No known key found for this signature in database
GPG key ID: 8ED6D8750C4E3F93
4 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
basicswap/bin/prepare.py
View file

@ -1327,9 +1327,10 @@ def test_particl_encryption(data_dir, settings, chain, use_tor_proxy):
coin_name = 'particl' coin_name = 'particl'
coin_settings = settings['chainclients'][coin_name] coin_settings = settings['chainclients'][coin_name]
daemon_args += getCoreBinArgs(c, coin_settings) daemon_args += getCoreBinArgs(c, coin_settings)
extra_config = { 'stdout_to_file': True }
if coin_settings['manage_daemon']: if coin_settings['manage_daemon']:
filename: str = getCoreBinName(c, coin_settings, coin_name + 'd') filename: str = getCoreBinName(c, coin_settings, coin_name + 'd')
daemons.append(startDaemon(coin_settings['datadir'], coin_settings['bindir'], filename, daemon_args)) daemons.append(startDaemon(coin_settings['datadir'], coin_settings['bindir'], filename, daemon_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)
@ -1396,7 +1397,8 @@ def initialise_wallets(particl_wallet_mnemonic, with_coins, data_dir, settings,
if c == Coins.FIRO: if c == Coins.FIRO:
coin_args += ['-hdseed={}'.format(swap_client.getWalletKey(Coins.FIRO, 1).hex())] coin_args += ['-hdseed={}'.format(swap_client.getWalletKey(Coins.FIRO, 1).hex())]
daemons.append(startDaemon(coin_settings['datadir'], coin_settings['bindir'], filename, daemon_args + coin_args)) extra_config = { 'stdout_to_file': True }
daemons.append(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)

7
basicswap/bin/run.py
View file

@ -92,10 +92,11 @@ def startDaemon(node_dir, bin_dir, daemon_bin, opts=[], extra_config={}):
stdout_dest = subprocess.PIPE stdout_dest = subprocess.PIPE
stderr_dest = subprocess.PIPE stderr_dest = subprocess.PIPE
shell: bool = False
if extra_config.get('use_shell', False): if extra_config.get('use_shell', False):
str_args = ' '.join(args) args = ' '.join(args)
return Daemon(subprocess.Popen(str_args, shell=True, stdin=subprocess.PIPE, stdout=stdout_dest, stderr=stderr_dest, cwd=datadir_path), opened_files) shell = True
return Daemon(subprocess.Popen(args, stdin=subprocess.PIPE, stdout=stdout_dest, stderr=stderr_dest, cwd=datadir_path), opened_files) return Daemon(subprocess.Popen(args, shell=shell, stdin=subprocess.PIPE, stdout=stdout_dest, stderr=stderr_dest, cwd=datadir_path), opened_files)
def startXmrDaemon(node_dir, bin_dir, daemon_bin, opts=[]): def startXmrDaemon(node_dir, bin_dir, daemon_bin, opts=[]):

4
basicswap/interface/bch.py
View file

@ -82,8 +82,8 @@ class BCHInterface(BTCInterface):
# bch does not have segwit, but we return true here to avoid extra checks in basicswap.py # bch does not have segwit, but we return true here to avoid extra checks in basicswap.py
return True return True
def getExchangeName(self, exchange_name): def getExchangeName(self, exchange_name: str) -> str:
return 'bch' return 'bitcoin-cash'
def getNewAddress(self, use_segwit: bool = False, label: str = 'swap_receive') -> str: def getNewAddress(self, use_segwit: bool = False, label: str = 'swap_receive') -> str:
args = [label] args = [label]

2
basicswap/interface/firo.py
View file

@ -42,7 +42,7 @@ class FIROInterface(BTCInterface):
# No multiwallet support # No multiwallet support
self.rpc_wallet = make_rpc_func(self._rpcport, self._rpcauth, host=self._rpc_host) self.rpc_wallet = make_rpc_func(self._rpcport, self._rpcauth, host=self._rpc_host)
def getExchangeName(self, exchange_name): def getExchangeName(self, exchange_name: str) -> str:
return 'zcoin' return 'zcoin'
def initialiseWallet(self, key): def initialiseWallet(self, key):