ui: Add warning to unlock page.

2024-05-20_merge
tecnovert 2 years ago
parent b5b43a8bf3
commit 9370eff4a6
No known key found for this signature in database
GPG Key ID: 8ED6D8750C4E3F93
  1. 2
      basicswap/ui/page_encryption.py
  2. 12
      bin/basicswap_prepare.py
  3. 5
      doc/guix.md

@ -45,7 +45,7 @@ def page_unlock(self, url_split, post_string):
server = self.server server = self.server
swap_client = server.swap_client swap_client = server.swap_client
messages = [] messages = ['Warning: This will unlock the system for all users!', ]
err_messages = [] err_messages = []
form_data = self.checkForm(post_string, 'unlock', err_messages) form_data = self.checkForm(post_string, 'unlock', err_messages)

@ -24,6 +24,7 @@ import urllib.parse
from urllib.request import urlretrieve from urllib.request import urlretrieve
import basicswap.config as cfg import basicswap.config as cfg
from basicswap import __version__
from basicswap.base import getaddrinfo_tor from basicswap.base import getaddrinfo_tor
from basicswap.basicswap import BasicSwap from basicswap.basicswap import BasicSwap
from basicswap.chainparams import Coins from basicswap.chainparams import Coins
@ -884,8 +885,7 @@ def exitWithError(error_msg):
def printVersion(): def printVersion():
from basicswap import __version__ logger.info(f'Basicswap version: {__version__}')
logger.info('Basicswap version: %s', __version__)
logger.info('Core versions:') logger.info('Core versions:')
for coin, version in known_coins.items(): for coin, version in known_coins.items():
@ -1195,9 +1195,11 @@ def main():
if bin_dir is None: if bin_dir is None:
bin_dir = os.path.join(data_dir, 'bin') bin_dir = os.path.join(data_dir, 'bin')
logger.info('datadir: %s', data_dir) logger.info(f'BasicSwap prepare script {__version__}\n')
logger.info('bindir: %s', bin_dir) logger.info(f'Data dir: {data_dir}')
logger.info('Chain: %s', chain) 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: if port_offset is None:
port_offset = 300 if chain == 'testnet' else 0 port_offset = 300 if chain == 'testnet' else 0

@ -1,8 +1,9 @@
## Guix ## Guix
Start a development environment 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 Run tests
@ -15,7 +16,7 @@ Run tests
pytest -vs tests/basicswap/test_run.py::Test::test_02_part_ltc pytest -vs tests/basicswap/test_run.py::Test::test_02_part_ltc
Install package Install basicswap package
guix package --install -L. basicswap guix package --install -L. basicswap

Loading…
Cancel
Save