NMC and CLTV, abs lock values still to be verified

This commit is contained in:
tecnovert
2019-07-25 00:59:40 +02:00
parent 222fbb492f
commit 307b8ab8bf
6 changed files with 638 additions and 45 deletions

View File

@@ -23,6 +23,7 @@ import time
from urllib.request import urlretrieve
import urllib.parse
import logging
import platform
import gnupg
@@ -30,7 +31,10 @@ import basicswap.config as cfg
from basicswap.util import callrpc_cli
from bin.basicswap_run import startDaemon
BIN_ARCH = 'x86_64-linux-gnu.tar.gz'
if platform.system() == 'Darwin':
BIN_ARCH = 'osx64.tar.gz'
else:
BIN_ARCH = 'x86_64-linux-gnu.tar.gz'
known_coins = {
'particl': '0.18.1.0',
@@ -358,6 +362,7 @@ def main():
'datadir': os.path.join(data_dir, 'namecoin'),
'bindir': os.path.join(data_dir, 'bins', 'namecoin'),
'use_segwit': False,
'use_csv': False,
'blocks_confirmed': 1
}
}

View File

@@ -22,7 +22,6 @@ import signal
import subprocess
import logging
import basicswap.config as cfg
from basicswap import __version__
from basicswap.basicswap import BasicSwap
from basicswap.http_server import HttpThread
@@ -66,17 +65,10 @@ def runClient(fp, dataDir, chain):
for c, v in settings['chainclients'].items():
if v['manage_daemon'] is True:
logger.info('Starting {} daemon'.format(c.capitalize()))
if c == 'particl':
daemons.append(startDaemon(v['datadir'], v['bindir'], cfg.PARTICLD))
logger.info('Started {} {}'.format(cfg.PARTICLD, daemons[-1].pid))
elif c == 'bitcoin':
daemons.append(startDaemon(v['datadir'], v['bindir'], cfg.BITCOIND))
logger.info('Started {} {}'.format(cfg.BITCOIND, daemons[-1].pid))
elif c == 'litecoin':
daemons.append(startDaemon(v['datadir'], v['bindir'], cfg.LITECOIND))
logger.info('Started {} {}'.format(cfg.LITECOIND, daemons[-1].pid))
else:
logger.warning('Unknown chain', c)
filename = c + 'd' + ('.exe' if os.name == 'nt' else '')
daemons.append(startDaemon(v['datadir'], v['bindir'], filename))
logger.info('Started {} {}'.format(filename, daemons[-1].pid))
swap_client = BasicSwap(fp, dataDir, settings, chain)