AaronFiore/electrum
1
0
Fork 0
Code Activity

make submarine swap server url configurable

Browse Source
This commit is contained in:
ThomasV
2023-06-19 14:46:56 +02:00
parent 606c51bc4e
commit 39f8664402
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
electrum/simple_config.py
View File

@@ -840,8 +840,15 @@ class SimpleConfig(Logger):
f"Either use config.cv.{name}.set() or assign to config.{name} instead.") f"Either use config.cv.{name}.set() or assign to config.{name} instead.")
return CVLookupHelper() return CVLookupHelper()
# config variables -----> def get_swapserver_url(self):
if constants.net == constants.BitcoinMainnet:
return wallet.config.SWAPSERVER_URL_MAINNET
elif constants.net == constants.BitcoinTestnet:
return wallet.config.SWAPSERVER_URL_TESTNET
else:
return wallet.config.SWAPSERVER_URL_REGTEST
# config variables ----->
NETWORK_AUTO_CONNECT = ConfigVar('auto_connect', default=True, type_=bool) NETWORK_AUTO_CONNECT = ConfigVar('auto_connect', default=True, type_=bool)
NETWORK_ONESERVER = ConfigVar('oneserver', default=False, type_=bool) NETWORK_ONESERVER = ConfigVar('oneserver', default=False, type_=bool)
NETWORK_PROXY = ConfigVar('proxy', default=None) NETWORK_PROXY = ConfigVar('proxy', default=None)
@@ -951,7 +958,10 @@ class SimpleConfig(Logger):
SSL_CERTFILE_PATH = ConfigVar('ssl_certfile', default='', type_=str) SSL_CERTFILE_PATH = ConfigVar('ssl_certfile', default='', type_=str)
SSL_KEYFILE_PATH = ConfigVar('ssl_keyfile', default='', type_=str) SSL_KEYFILE_PATH = ConfigVar('ssl_keyfile', default='', type_=str)
# submarine swap server
SWAPSERVER_URL_MAINNET = ConfigVar('swapserver_url_mainnet', default='https://swaps.electrum.org/api', type_=str)
SWAPSERVER_URL_TESTNET = ConfigVar('swapserver_url_testnet', default='https://swaps.electrum.org/testnet', type_=str)
SWAPSERVER_URL_REGTEST = ConfigVar('swapserver_url_regtest', default='https://localhost/api', type_=str)
# connect to remote WT # connect to remote WT
WATCHTOWER_CLIENT_ENABLED = ConfigVar('use_watchtower', default=False, type_=bool) WATCHTOWER_CLIENT_ENABLED = ConfigVar('use_watchtower', default=False, type_=bool)
WATCHTOWER_CLIENT_URL = ConfigVar('watchtower_url', default=None, type_=str) WATCHTOWER_CLIENT_URL = ConfigVar('watchtower_url', default=None, type_=str)

10
electrum/submarine_swaps.py
View File

@@ -32,9 +32,6 @@ if TYPE_CHECKING:
from .simple_config import SimpleConfig from .simple_config import SimpleConfig
API_URL_MAINNET = 'https://swaps.electrum.org/api'
API_URL_TESTNET = 'https://swaps.electrum.org/testnet'
API_URL_REGTEST = 'https://localhost/api'
@@ -159,12 +156,7 @@ class SwapManager(Logger):
if swap.is_reverse and swap.prepay_hash is not None: if swap.is_reverse and swap.prepay_hash is not None:
self.prepayments[swap.prepay_hash] = bytes.fromhex(k) self.prepayments[swap.prepay_hash] = bytes.fromhex(k)
# api url # api url
if constants.net == constants.BitcoinMainnet: self.api_url = wallet.config.get_swapserver_url()
self.api_url = API_URL_MAINNET
elif constants.net == constants.BitcoinTestnet:
self.api_url = API_URL_TESTNET
else:
self.api_url = API_URL_REGTEST
# init default min & max # init default min & max
self.init_min_max_values() self.init_min_max_values()