From 7813cc5d3be401cd1d9d5be9e35cf76ee2e9cd58 Mon Sep 17 00:00:00 2001
From: Veselin Penev <penev.veselin@gmail.com>
Date: Sat, 15 Jun 2024 13:29:27 +0200
Subject: [PATCH] solved requirements.txt issue, switched from ed25519 to
 PyNaCl

---
 bitdust/dht/dht_records.py          |  4 ++--
 bitdust_forks/Bismuth/difficulty.py |  2 +-
 bitdust_forks/websocket/_app.py     | 12 +++++++++---
 requirements.txt                    |  3 +--
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/bitdust/dht/dht_records.py b/bitdust/dht/dht_records.py
index faab55662..7cb7747be 100644
--- a/bitdust/dht/dht_records.py
+++ b/bitdust/dht/dht_records.py
@@ -210,7 +210,7 @@
             {
                 'op': 'exist',
             },
-        ],  # 'archive_folder_path': [{'op': 'exist', }, ],
+        ],
     },
     'bismuth_identity_request': {
         'type': [
@@ -412,7 +412,7 @@ def set_message_broker(customer_idurl, broker_idurl, position=0, revision=None,
             'timestamp': utime.utcnow_to_sec1970(),
             'revision': 0 if revision is None else revision,
             'customer_idurl': customer_idurl.to_text(),
-            'broker_idurl': broker_idurl.to_text(),  # 'archive_folder_path': archive_folder_path,
+            'broker_idurl': broker_idurl.to_text(),
             'position': position,
         },
         rules=get_rules('message_broker'),
diff --git a/bitdust_forks/Bismuth/difficulty.py b/bitdust_forks/Bismuth/difficulty.py
index e4342ee7b..d0401e5ef 100644
--- a/bitdust_forks/Bismuth/difficulty.py
+++ b/bitdust_forks/Bismuth/difficulty.py
@@ -6,7 +6,7 @@
 from quantizer import quantize_two, quantize_ten
 
 
-_Debug = True
+_Debug = False
 
 DEFAULT_DIFFICULTY = 10
 
diff --git a/bitdust_forks/websocket/_app.py b/bitdust_forks/websocket/_app.py
index ea6f08df7..205b79e90 100644
--- a/bitdust_forks/websocket/_app.py
+++ b/bitdust_forks/websocket/_app.py
@@ -231,9 +231,15 @@ def teardown(close_frame=None):
             If close_frame is set, we will invoke the on_close handler with the
             statusCode and reason from there.
             """
-            if thread and thread.isAlive():
-                event.set()
-                thread.join()
+            if thread:
+                isAlive = False
+                if hasattr(thread, 'isAlive'):
+                    isAlive = thread.isAlive()
+                elif hasattr(thread, 'is_alive'):
+                    isAlive = thread.is_alive()
+                if isAlive:
+                    event.set()
+                    thread.join()
             self.keep_running = False
             if self.sock:
                 self.sock.close()
diff --git a/requirements.txt b/requirements.txt
index e34178476..23a0449d5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,14 +12,12 @@ appdirs==1.4.4
 attrs==22.2.0
 Automat==22.10.0
 
-# Bismuth
 base58==2.1.1
 cffi==1.15.1
 coincurve==16.0.0
 constantly==15.1.0
 coverage==6.2
 cryptography==39.0.0
-ed25519==1.5
 hyperlink==21.0.0
 idna==3.4
 incremental==22.10.0
@@ -29,6 +27,7 @@ pyasn1==0.4.8
 pyasn1-modules==0.2.8
 pycparser==2.21
 pycryptodomex==3.16.0
+PyNaCl==1.5
 pynacl==1.5.0
 pyparsing==3.0.9
 PySocks==1.7.1