Merge pull request #790 from vesellov/master

solved requirements.txt issue, switched from ed25519 to PyNaCl

CHANGELOG.txt

@@ -1,6 +1,18 @@
 Change Log
 ==========
 
+2024-06-01 Veselin Penev [penev.veselin@gmail.com](mailto:penev.veselin@gmail.com)
+
+* introduce new group streaming solution
+* also a new solution for messages history sharing between group participants
+* introduce process to accept storage payments by suppliers
+* introduce sequence_number for storage contracts
+* made keys_synchronizer() more reliable
+* able to force restart of fire_hire() in api.files_sync()
+* added regression test for new streaming methods
+
+
+
 2024-04-14 Veselin Penev [penev.veselin@gmail.com](mailto:penev.veselin@gmail.com)
 
 * added HMTL WEB template

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'),

bitdust_forks/Bismuth/difficulty.py

@@ -6,7 +6,7 @@
 from quantizer import quantize_two, quantize_ten
 
 
-_Debug = True
+_Debug = False
 
 DEFAULT_DIFFICULTY = 10
 

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()

regress/scenarios.py

@@ -1424,6 +1424,8 @@ def scenario14(old_customer_1_info, customer_1_shared_file_info):
     customer_1_supplier_idurls_before = kw.supplier_list_v1('customer-1', expected_min_suppliers=2, expected_max_suppliers=2)
     assert len(customer_1_supplier_idurls_before) == 2
 
+    kw.file_list_all_v1('customer-1', reliable_shares=True, expected_reliable=100)
+
     possible_suppliers = set([
         'http://id-a:8084/supplier-1.xml',
         'http://id-a:8084/supplier-2.xml',
@@ -1477,6 +1479,8 @@ def scenario14(old_customer_1_info, customer_1_shared_file_info):
 
     kw.wait_packets_finished(SUPPLIERS_IDS + CUSTOMERS_IDS_12)
 
+    kw.file_list_all_v1('customer-1', reliable_shares=True, expected_reliable=100)
+
     # make sure we can still download the file back on customer-1
     kw.verify_file_download_start(
         node='customer-1',

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