diff --git a/electrum/simple_config.py b/electrum/simple_config.py index d97c8d8ef..2ddac15b7 100644 --- a/electrum/simple_config.py +++ b/electrum/simple_config.py @@ -840,8 +840,15 @@ class SimpleConfig(Logger): f"Either use config.cv.{name}.set() or assign to config.{name} instead.") 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_ONESERVER = ConfigVar('oneserver', default=False, type_=bool) NETWORK_PROXY = ConfigVar('proxy', default=None) @@ -951,7 +958,10 @@ class SimpleConfig(Logger): SSL_CERTFILE_PATH = ConfigVar('ssl_certfile', 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 WATCHTOWER_CLIENT_ENABLED = ConfigVar('use_watchtower', default=False, type_=bool) WATCHTOWER_CLIENT_URL = ConfigVar('watchtower_url', default=None, type_=str) diff --git a/electrum/submarine_swaps.py b/electrum/submarine_swaps.py index 7918283d5..4e7c7fe8e 100644 --- a/electrum/submarine_swaps.py +++ b/electrum/submarine_swaps.py @@ -32,9 +32,6 @@ if TYPE_CHECKING: 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: self.prepayments[swap.prepay_hash] = bytes.fromhex(k) # api url - if constants.net == constants.BitcoinMainnet: - self.api_url = API_URL_MAINNET - elif constants.net == constants.BitcoinTestnet: - self.api_url = API_URL_TESTNET - else: - self.api_url = API_URL_REGTEST + self.api_url = wallet.config.get_swapserver_url() # init default min & max self.init_min_max_values()