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

coins: Update Bitcoin version.

Browse source
This commit is contained in:
tecnovert 2023-12-31 02:15:31 +02:00
parent 03fdf44220
commit 192aff221e
No known key found for this signature in database
GPG key ID: 8ED6D8750C4E3F93
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
basicswap/basicswap.py
View file

@ -820,6 +820,9 @@ class BasicSwap(BaseApp):
chain_client_settings = self.getChainClientSettings(coin_type) chain_client_settings = self.getChainClientSettings(coin_type)
if 'startup_tries' in chain_client_settings: if 'startup_tries' in chain_client_settings:
startup_tries = chain_client_settings['startup_tries'] startup_tries = chain_client_settings['startup_tries']
if startup_tries < 1:
self.log.warning('startup_tries can\'t be less than 1.')
startup_tries = 1
for i in range(startup_tries): for i in range(startup_tries):
if self.delay_event.is_set(): if self.delay_event.is_set():
return return

3
bin/basicswap_prepare.py
View file

@ -45,7 +45,7 @@ PARTICL_LINUX_EXTRA = os.getenv('PARTICL_LINUX_EXTRA', 'nousb')
LITECOIN_VERSION = os.getenv('LITECOIN_VERSION', '0.21.2.2') LITECOIN_VERSION = os.getenv('LITECOIN_VERSION', '0.21.2.2')
LITECOIN_VERSION_TAG = os.getenv('LITECOIN_VERSION_TAG', '') LITECOIN_VERSION_TAG = os.getenv('LITECOIN_VERSION_TAG', '')
BITCOIN_VERSION = os.getenv('BITCOIN_VERSION', '23.0') BITCOIN_VERSION = os.getenv('BITCOIN_VERSION', '26.0')
BITCOIN_VERSION_TAG = os.getenv('BITCOIN_VERSION_TAG', '') BITCOIN_VERSION_TAG = os.getenv('BITCOIN_VERSION_TAG', '')
MONERO_VERSION = os.getenv('MONERO_VERSION', '0.18.2.2') MONERO_VERSION = os.getenv('MONERO_VERSION', '0.18.2.2')
@ -884,6 +884,7 @@ def prepareDataDir(coin, settings, chain, particl_mnemonic, extra_opts={}):
if LTC_RPC_USER != '': if LTC_RPC_USER != '':
fp.write('rpcauth={}:{}${}\n'.format(LTC_RPC_USER, salt, password_to_hmac(salt, LTC_RPC_PWD))) fp.write('rpcauth={}:{}${}\n'.format(LTC_RPC_USER, salt, password_to_hmac(salt, LTC_RPC_PWD)))
elif coin == 'bitcoin': elif coin == 'bitcoin':
fp.write('deprecatedrpc=create_bdb\n')
fp.write('prune=2000\n') fp.write('prune=2000\n')
fp.write('fallbackfee=0.0002\n') fp.write('fallbackfee=0.0002\n')
if BTC_RPC_USER != '': if BTC_RPC_USER != '':

4
tests/basicswap/common.py
View file

@ -73,7 +73,9 @@ def prepareDataDir(datadir, node_id, conf_file, dir_prefix, base_p2p_port=BASE_P
fp.write('wallet=wallet.dat\n') fp.write('wallet=wallet.dat\n')
fp.write('findpeers=0\n') fp.write('findpeers=0\n')
if base_p2p_port == BASE_PORT: # Particl if base_p2p_port == BTC_BASE_PORT:
fp.write('deprecatedrpc=create_bdb\n')
elif base_p2p_port == BASE_PORT: # Particl
fp.write('zmqpubsmsg=tcp://127.0.0.1:{}\n'.format(BASE_ZMQ_PORT + node_id)) fp.write('zmqpubsmsg=tcp://127.0.0.1:{}\n'.format(BASE_ZMQ_PORT + node_id))
# minstakeinterval=5 # Using walletsettings stakelimit instead # minstakeinterval=5 # Using walletsettings stakelimit instead
fp.write('stakethreadconddelayms=1000\n') fp.write('stakethreadconddelayms=1000\n')