diff --git a/basicswap/ui/page_encryption.py b/basicswap/ui/page_encryption.py index 55d2c58..581430b 100644 --- a/basicswap/ui/page_encryption.py +++ b/basicswap/ui/page_encryption.py @@ -45,7 +45,7 @@ def page_unlock(self, url_split, post_string): server = self.server swap_client = server.swap_client - messages = [] + messages = ['Warning: This will unlock the system for all users!', ] err_messages = [] form_data = self.checkForm(post_string, 'unlock', err_messages) diff --git a/bin/basicswap_prepare.py b/bin/basicswap_prepare.py index 699044f..c1863a0 100755 --- a/bin/basicswap_prepare.py +++ b/bin/basicswap_prepare.py @@ -24,6 +24,7 @@ import urllib.parse from urllib.request import urlretrieve import basicswap.config as cfg +from basicswap import __version__ from basicswap.base import getaddrinfo_tor from basicswap.basicswap import BasicSwap from basicswap.chainparams import Coins @@ -884,8 +885,7 @@ def exitWithError(error_msg): def printVersion(): - from basicswap import __version__ - logger.info('Basicswap version: %s', __version__) + logger.info(f'Basicswap version: {__version__}') logger.info('Core versions:') for coin, version in known_coins.items(): @@ -1195,9 +1195,11 @@ def main(): if bin_dir is None: bin_dir = os.path.join(data_dir, 'bin') - logger.info('datadir: %s', data_dir) - logger.info('bindir: %s', bin_dir) - logger.info('Chain: %s', chain) + logger.info(f'BasicSwap prepare script {__version__}\n') + logger.info(f'Data dir: {data_dir}') + logger.info(f'Bin dir: {bin_dir}') + logger.info(f'Chain: {chain}') + logger.info('WALLET_ENCRYPTION_PWD is {}set'.format('not ' if WALLET_ENCRYPTION_PWD == '' else '')) if port_offset is None: port_offset = 300 if chain == 'testnet' else 0 diff --git a/doc/guix.md b/doc/guix.md index a525f4b..a39f5ee 100644 --- a/doc/guix.md +++ b/doc/guix.md @@ -1,8 +1,9 @@ ## Guix Start a development environment +(openssl is included only to set SSL_CERTS_DIRS) - guix shell --pure -L. -D basicswap + guix shell --pure -L. openssl -D basicswap Run tests @@ -15,7 +16,7 @@ Run tests pytest -vs tests/basicswap/test_run.py::Test::test_02_part_ltc -Install package +Install basicswap package guix package --install -L. basicswap