From 31766508b454896a4e02ee64e849667aeb1e3528 Mon Sep 17 00:00:00 2001 From: tecnovert Date: Wed, 31 Jul 2019 18:53:44 +0200 Subject: [PATCH] Workaround missing litecoin pid file on windows. --- basicswap/basicswap.py | 5 ++++- bin/basicswap_prepare.py | 4 ++++ bin/basicswap_run.py | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/basicswap/basicswap.py b/basicswap/basicswap.py index 18e6a48..f94d1ce 100644 --- a/basicswap/basicswap.py +++ b/basicswap/basicswap.py @@ -423,6 +423,7 @@ class BasicSwap(): 'last_height_checked': last_height_checked, 'use_segwit': chain_client_settings.get('use_segwit', False), 'use_csv': chain_client_settings.get('use_csv', True), + 'core_version_group': chain_client_settings.get('core_version_group', 0), 'pid': None, } @@ -445,6 +446,7 @@ class BasicSwap(): self.log.debug('Reading %s rpc credentials from auth cookie %s', coin, authcookiepath) # Wait for daemon to start # Test pids to ensure authcookie is read for the correct process + datadir_pid = -1 for i in range(20): try: with open(pidfilepath, 'rb') as fp: @@ -454,7 +456,8 @@ class BasicSwap(): except Exception: time.sleep(0.5) try: - assert(datadir_pid == cc['pid']) + if os.name != 'nt' or cc['core_version_group'] > 17: # litecoin on windows doesn't write a pid file + assert(datadir_pid == cc['pid']) with open(authcookiepath, 'rb') as fp: cc['rpcauth'] = fp.read().decode('utf-8') except Exception: diff --git a/bin/basicswap_prepare.py b/bin/basicswap_prepare.py index 62a034d..8ca6f56 100644 --- a/bin/basicswap_prepare.py +++ b/bin/basicswap_prepare.py @@ -381,6 +381,7 @@ def main(): 'blocks_confirmed': 2, 'override_feerate': 0.002, 'conf_target': 2, + 'core_version_group': 18, }, 'litecoin': { 'connection_type': 'rpc' if 'litecoin' in with_coins else 'none', @@ -391,6 +392,7 @@ def main(): 'use_segwit': True, 'blocks_confirmed': 2, 'conf_target': 2, + 'core_version_group': 17, }, 'bitcoin': { 'connection_type': 'rpc' if 'bitcoin' in with_coins else 'none', @@ -401,6 +403,7 @@ def main(): 'use_segwit': True, 'blocks_confirmed': 1, 'conf_target': 2, + 'core_version_group': 18, }, 'namecoin': { 'connection_type': 'rpc' if 'namecoin' in with_coins else 'none', @@ -412,6 +415,7 @@ def main(): 'use_csv': False, 'blocks_confirmed': 1, 'conf_target': 2, + 'core_version_group': 18, } } diff --git a/bin/basicswap_run.py b/bin/basicswap_run.py index 61198a4..5833702 100644 --- a/bin/basicswap_run.py +++ b/bin/basicswap_run.py @@ -20,7 +20,7 @@ import subprocess import logging from basicswap import __version__ -from basicswap.basicswap import BasicSwap, Coins +from basicswap.basicswap import BasicSwap from basicswap.http_server import HttpThread