Fix contract_count not inserted in db

bin/basicswap_prepare.py

@@ -46,6 +46,7 @@ known_coins = {
     'litecoin': '0.18.1',
     'bitcoin': '0.20.1',
     'namecoin': '0.18.0',
+    'monero': '0.17.0.1',
 }
 
 logger = logging.getLogger()
@@ -124,6 +125,15 @@ def prepareCore(coin, version, settings, data_dir):
         os_dir_name = 'linux'
         os_name = 'linux'
 
+    if coin == 'monero':
+        url = 'https://downloads.getmonero.org/cli/monero-linux-x64-v${}.tar.bz2'.format(version)
+
+        release_path = os.path.join(bin_dir, release_filename)
+        if not os.path.exists(release_path):
+            downloadFile(release_url, release_path)
+
+        raise ValueError('TODO')
+
     release_filename = '{}-{}-{}'.format(coin, version, BIN_ARCH)
     if coin == 'particl':
         signing_key_name = 'tecnovert'

bin/basicswap_run.py

@@ -45,7 +45,7 @@ def startDaemon(node_dir, bin_dir, daemon_bin, opts=[]):
     daemon_bin = os.path.expanduser(os.path.join(bin_dir, daemon_bin))
 
     args = [daemon_bin, '-datadir=' + os.path.expanduser(node_dir)] + opts
-    logger.info('Starting node ' + daemon_bin + ' ' + '-datadir=' + node_dir)
+    logging.info('Starting node ' + daemon_bin + ' ' + '-datadir=' + node_dir)
     return subprocess.Popen(args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 
 
@@ -118,9 +118,13 @@ def runClient(fp, data_dir, chain):
     closed_pids = []
     for d in daemons:
         int_pid = d.pid
-        logger.info('Terminating {}'.format(int_pid))
+        logging.info('Interrupting {}'.format(int_pid))
+        try:
+            d.send_signal(signal.SIGINT)
+        except Exception as e:
+            logging.info('Interrupting %d, error %s', d.pid, str(e))
+    for d in daemons:
         try:
-            d.terminate()
             d.wait(timeout=120)
             if d.stdout:
                 d.stdout.close()