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

prepare: Read settings file in preparebinonly mode if it exists.

Browse Source
This commit is contained in:
tecnovert
2019-08-18 20:49:47 +02:00
parent f906b1aebb
commit 976761ef34
2 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
bin/basicswap_prepare.py
View File

@@ -489,27 +489,31 @@ def main():
return 0
logger.info('With coins: %s', ', '.join(with_coins))
if os.path.exists(config_path) and not prepare_bin_only:
exitWithError('{} exists'.format(config_path))
if os.path.exists(config_path):
if not prepare_bin_only:
exitWithError('{} exists'.format(config_path))
else:
with open(config_path) as fs:
settings = json.load(fs)
else:
for c in with_coins:
withchainclients[c] = chainclients[c]
for c in with_coins:
withchainclients[c] = chainclients[c]
settings = {
'debug': True,
'zmqhost': 'tcp://127.0.0.1',
'zmqport': 20792 + port_offset,
'htmlhost': 'localhost',
'htmlport': 12700 + port_offset,
'network_key': '7sW2UEcHXvuqEjkpE5mD584zRaQYs6WXYohue4jLFZPTvMSxwvgs',
'network_pubkey': '035758c4a22d7dd59165db02a56156e790224361eb3191f02197addcb3bde903d2',
'chainclients': withchainclients,
'auto_reply_delay_min': 5, # Min delay before sending a response message
'auto_reply_delay_max': 50, # Max delay before sending a response message
'check_progress_seconds': 60,
'check_watched_seconds': 60,
'check_expired_seconds': 60
}
settings = {
'debug': True,
'zmqhost': 'tcp://127.0.0.1',
'zmqport': 20792 + port_offset,
'htmlhost': 'localhost',
'htmlport': 12700 + port_offset,
'network_key': '7sW2UEcHXvuqEjkpE5mD584zRaQYs6WXYohue4jLFZPTvMSxwvgs',
'network_pubkey': '035758c4a22d7dd59165db02a56156e790224361eb3191f02197addcb3bde903d2',
'chainclients': withchainclients,
'auto_reply_delay_min': 5, # Min delay before sending a response message
'auto_reply_delay_max': 50, # Max delay before sending a response message
'check_progress_seconds': 60,
'check_watched_seconds': 60,
'check_expired_seconds': 60
}
for c in with_coins:
prepareCore(c, known_coins[c], settings, data_dir)