debug: Reduce default min_sequence_lock_seconds when debug mode is active.

basicswap/basicswap.py

@@ -251,7 +251,7 @@ class BasicSwap(BaseApp):
         self.min_delay_retry = self.settings.get('min_delay_retry', 60)
         self.max_delay_retry = self.settings.get('max_delay_retry', 5 * 60)
 
-        self.min_sequence_lock_seconds = self.settings.get('min_sequence_lock_seconds', 1 * 60 * 60)
+        self.min_sequence_lock_seconds = self.settings.get('min_sequence_lock_seconds', 60 if self.debug else (1 * 60 * 60))
         self.max_sequence_lock_seconds = self.settings.get('max_sequence_lock_seconds', 96 * 60 * 60)
 
         self._bid_expired_leeway = 5

basicswap/http_server.py

@@ -124,18 +124,19 @@ class HttpHandler(BaseHTTPRequestHandler):
         if swap_client._show_notifications:
             args_dict['notifications'] = swap_client.getNotifications()
 
+        # TODO: Remove _withids
         if 'messages' in args_dict:
             messages_with_ids = []
             for msg in args_dict['messages']:
                 messages_with_ids.append((self.server.msg_id_counter, msg))
                 self.server.msg_id_counter += 1
-            args_dict['messages'] = messages_with_ids
+            args_dict['messages_withids'] = messages_with_ids
         if 'err_messages' in args_dict:
             err_messages_with_ids = []
             for msg in args_dict['err_messages']:
                 err_messages_with_ids.append((self.server.msg_id_counter, msg))
                 self.server.msg_id_counter += 1
-            args_dict['err_messages'] = err_messages_with_ids
+            args_dict['err_messages_withids'] = err_messages_with_ids
 
         if self.server.msg_id_counter >= 0x7FFFFFFF:
             self.server.msg_id_counter = 0

doc/install.md

@@ -32,7 +32,7 @@ Without this step you will need to preface each `docker-compose` command with `s
 
 #### Create the images:
 
-COINDATA_PATH can be set to your preferance but must be exported each time you launch Basicswap.<br>
+COINDATA_PATH can be set to your preference but must be exported each time you launch Basicswap.<br>
 Consider adding COINDATA_PATH to the `.env` file in the docker directory file so it's always set.
 
     export COINDATA_PATH=/var/data/coinswaps