Added Zen of Reticulum

Fix stored messages always getting deleted if config path has underscores

.github/ISSUE_TEMPLATE/🐛-bug-report.md

@@ -12,7 +12,7 @@ Before creating a bug report on this issue tracker, you **must** read the [Contr
 
 - The issue tracker is used by developers of this project. **Do not use it to ask general questions, or for support requests**.
 - Ideas and feature requests can be made on the [Discussions](https://github.com/markqvist/Reticulum/discussions). **Only** feature requests accepted by maintainers and developers are tracked and included on the issue tracker. **Do not post feature requests here**.
-- After reading the [Contribution Guidelines](https://github.com/markqvist/Reticulum/blob/master/Contributing.md), delete this section from your bug report.
+- After reading the [Contribution Guidelines](https://github.com/markqvist/Reticulum/blob/master/Contributing.md), **delete this section only** (*"Read the Contribution Guidelines"*) from your bug report, **and fill in all the other sections**.
 
 **Describe the Bug**
 A clear and concise description of what the bug is.

FUNDING.yml

@@ -0,0 +1,3 @@
+liberapay: Reticulum
+ko_fi: markqvist
+custom: "https://unsigned.io/donate"

LICENSE

@@ -1,6 +1,6 @@
-MIT License
+Reticulum License
 
-Copyright (c) 2020 Mark Qvist / unsigned.io
+Copyright (c) 2020-2025 Mark Qvist
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -9,8 +9,16 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+- The Software shall not be used in any kind of system which includes amongst
+  its functions the ability to purposefully do harm to human beings.
+
+- The Software shall not be used, directly or indirectly, in the creation of
+  an artificial intelligence, machine learning or language model training
+  dataset, including but not limited to any use that contributes to the
+  training or development of such a model or algorithm.
+
+- The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

LXMF/Handlers.py

@@ -1,4 +1,5 @@
 import time
+import threading
 import RNS
 import RNS.vendor.umsgpack as msgpack
 
@@ -7,21 +8,11 @@ from .LXMessage import LXMessage
 
 class LXMFDeliveryAnnounceHandler:
     def __init__(self, lxmrouter):
-        self.aspect_filter = APP_NAME+".delivery"
+        self.aspect_filter          = APP_NAME+".delivery"
         self.receive_path_responses = True
-        self.lxmrouter = lxmrouter
+        self.lxmrouter              = lxmrouter
 
     def received_announce(self, destination_hash, announced_identity, app_data):
-        for lxmessage in self.lxmrouter.pending_outbound:
-            if destination_hash == lxmessage.destination_hash:
-                if lxmessage.method == LXMessage.DIRECT or lxmessage.method == LXMessage.OPPORTUNISTIC:
-                    lxmessage.next_delivery_attempt = time.time()
-
-                    while self.lxmrouter.processing_outbound:
-                        time.sleep(0.1)
-
-                    self.lxmrouter.process_outbound()
-
         try:
             stamp_cost = stamp_cost_from_app_data(app_data)
             self.lxmrouter.update_stamp_cost(destination_hash, stamp_cost)
@@ -29,35 +20,72 @@ class LXMFDeliveryAnnounceHandler:
         except Exception as e:
             RNS.log(f"An error occurred while trying to decode announced stamp cost. The contained exception was: {e}", RNS.LOG_ERROR)
 
+        for lxmessage in self.lxmrouter.pending_outbound:
+            if destination_hash     == lxmessage.destination_hash:
+                if lxmessage.method == LXMessage.DIRECT or lxmessage.method == LXMessage.OPPORTUNISTIC:
+                    lxmessage.next_delivery_attempt = time.time()
+
+                    def outbound_trigger():
+                        while self.lxmrouter.outbound_processing_lock.locked(): time.sleep(0.1)
+                        self.lxmrouter.process_outbound()
+
+                    threading.Thread(target=outbound_trigger, daemon=True).start()
+
 
 class LXMFPropagationAnnounceHandler:
     def __init__(self, lxmrouter):
-        self.aspect_filter = APP_NAME+".propagation"
-        self.receive_path_responses = False
-        self.lxmrouter = lxmrouter
+        self.aspect_filter          = APP_NAME+".propagation"
+        self.receive_path_responses = True
+        self.lxmrouter              = lxmrouter
 
-    def received_announce(self, destination_hash, announced_identity, app_data):
+    def received_announce(self, destination_hash, announced_identity, app_data, announce_packet_hash, is_path_response):
         try:
             if type(app_data) == bytes:
-                if self.lxmrouter.propagation_node and self.lxmrouter.autopeer:
-                    data = msgpack.unpackb(app_data)
+                if self.lxmrouter.propagation_node:
+                    if pn_announce_data_is_valid(app_data):
+                        data                               = msgpack.unpackb(app_data)
+                        node_timebase                      = int(data[1])
+                        propagation_enabled                =     data[2]
+                        propagation_transfer_limit         = int(data[3])
+                        propagation_sync_limit             = int(data[4])
+                        propagation_stamp_cost             = int(data[5][0])
+                        propagation_stamp_cost_flexibility = int(data[5][1])
+                        peering_cost                       = int(data[5][2])
+                        metadata                           =     data[6]
+                        
+                        if destination_hash in self.lxmrouter.static_peers:
+                            static_peer = self.lxmrouter.peers[destination_hash]
+                            if not is_path_response or static_peer.last_heard == 0:
+                                self.lxmrouter.peer(destination_hash=destination_hash,
+                                                    timestamp=node_timebase,
+                                                    propagation_transfer_limit=propagation_transfer_limit,
+                                                    propagation_sync_limit=propagation_sync_limit,
+                                                    propagation_stamp_cost=propagation_stamp_cost,
+                                                    propagation_stamp_cost_flexibility=propagation_stamp_cost_flexibility,
+                                                    peering_cost=peering_cost,
+                                                    metadata=metadata)
 
-                    if pn_announce_data_is_valid(data):
-                        node_timebase = data[1]
-                        propagation_transfer_limit = None
-                        if len(data) >= 3:
-                            try:
-                                propagation_transfer_limit = float(data[2])
-                            except:
-                                propagation_transfer_limit = None
+                        else:
+                            if self.lxmrouter.autopeer and not is_path_response:
+                                if propagation_enabled == True:
+                                    if RNS.Transport.hops_to(destination_hash) <= self.lxmrouter.autopeer_maxdepth:
+                                        self.lxmrouter.peer(destination_hash=destination_hash,
+                                                            timestamp=node_timebase,
+                                                            propagation_transfer_limit=propagation_transfer_limit,
+                                                            propagation_sync_limit=propagation_sync_limit,
+                                                            propagation_stamp_cost=propagation_stamp_cost,
+                                                            propagation_stamp_cost_flexibility=propagation_stamp_cost_flexibility,
+                                                            peering_cost=peering_cost,
+                                                            metadata=metadata)
 
-                        if data[0] == True:
-                            if RNS.Transport.hops_to(destination_hash) <= self.lxmrouter.autopeer_maxdepth:
-                                self.lxmrouter.peer(destination_hash, node_timebase, propagation_transfer_limit)
+                                    else:
+                                        if destination_hash in self.lxmrouter.peers:
+                                            RNS.log(f"Peer {self.lxmrouter.peers[destination_hash]} moved outside auto-peering range, breaking peering...")
+                                            self.lxmrouter.unpeer(destination_hash, node_timebase)
 
-                        elif data[0] == False:
-                            self.lxmrouter.unpeer(destination_hash, node_timebase)
+                                elif propagation_enabled == False:
+                                    self.lxmrouter.unpeer(destination_hash, node_timebase)
 
         except Exception as e:
             RNS.log("Error while evaluating propagation node announce, ignoring announce.", RNS.LOG_DEBUG)
-            RNS.log("The contained exception was: "+str(e), RNS.LOG_DEBUG)
+            RNS.log(f"The contained exception was: {str(e)}", RNS.LOG_DEBUG)

LXMF/LXMF.py

@@ -91,6 +91,18 @@ RENDERER_MICRON        = 0x01
 RENDERER_MARKDOWN      = 0x02
 RENDERER_BBCODE        = 0x03
 
+# Optional propagation node metadata fields. These
+# fields may be highly unstable in allocation and
+# availability until the version 1.0.0 release, so use
+# at your own risk until then, and expect changes!
+PN_META_VERSION        = 0x00
+PN_META_NAME           = 0x01
+PN_META_SYNC_STRATUM   = 0x02
+PN_META_SYNC_THROTTLE  = 0x03
+PN_META_AUTH_BAND      = 0x04
+PN_META_UTIL_PRESSURE  = 0x05
+PN_META_CUSTOM         = 0xFF
+
 ##########################################################
 # The following helper functions makes it easier to      #
 # handle and operate on LXMF data in client programs     #
@@ -99,21 +111,17 @@ RENDERER_BBCODE        = 0x03
 import RNS
 import RNS.vendor.umsgpack as msgpack
 def display_name_from_app_data(app_data=None):
-    if app_data == None:
-        return None
-    elif len(app_data) == 0:
-        return None
+    if app_data == None:     return None
+    elif len(app_data) == 0: return None
     else:
         # Version 0.5.0+ announce format
         if (app_data[0] >= 0x90 and app_data[0] <= 0x9f) or app_data[0] == 0xdc:
             peer_data = msgpack.unpackb(app_data)
             if type(peer_data) == list:
-                if len(peer_data) < 1:
-                    return None
+                if len(peer_data) < 1: return None
                 else:
                     dn = peer_data[0]
-                    if dn == None:
-                        return None
+                    if dn == None: return None
                     else:
                         try:
                             decoded = dn.decode("utf-8")
@@ -127,36 +135,61 @@ def display_name_from_app_data(app_data=None):
             return app_data.decode("utf-8")
 
 def stamp_cost_from_app_data(app_data=None):
-    if app_data == None or app_data == b"":
-        return None
+    if app_data == None or app_data == b"": return None
     else:
         # Version 0.5.0+ announce format
         if (app_data[0] >= 0x90 and app_data[0] <= 0x9f) or app_data[0] == 0xdc:
             peer_data = msgpack.unpackb(app_data)
             if type(peer_data) == list:
-                if len(peer_data) < 2:
-                    return None
-                else:
-                    return peer_data[1]
+                if len(peer_data) < 2: return None
+                else: return peer_data[1]
 
         # Original announce format
+        else: return None
+
+def pn_name_from_app_data(app_data=None):
+    if app_data == None: return None
+    else:
+        if pn_announce_data_is_valid(app_data):
+            data = msgpack.unpackb(app_data)
+            metadata = data[6]
+            if not PN_META_NAME in metadata: return None
+            else:
+                try: return metadata[PN_META_NAME].decode("utf-8")
+                except: return None
+
+    return None
+
+def pn_stamp_cost_from_app_data(app_data=None):
+    if app_data == None: return None
+    else:
+        if pn_announce_data_is_valid(app_data):
+            data = msgpack.unpackb(app_data)
+            return data[5][0]
         else:
             return None
 
 def pn_announce_data_is_valid(data):
     try:
-        if type(data) == bytes:
-            data = msgpack.unpackb(data)
-
-        if len(data) < 3:
-            raise ValueError("Invalid announce data: Insufficient peer data")
+        if type(data) != bytes: return False
+        else:                   data = msgpack.unpackb(data)
+        if len(data) < 7: raise ValueError("Invalid announce data: Insufficient peer data, likely from deprecated LXMF version")
         else:
-            if data[0] != True and data[0] != False:
-                raise ValueError("Invalid announce data: Indeterminate propagation node status")
-            try:
-                int(data[1])
-            except:
-                raise ValueError("Invalid announce data: Could not decode peer timebase")
+            try:                                     int(data[1])
+            except:                                  raise ValueError("Invalid announce data: Could not decode timebase")
+            if data[2] != True and data[2] != False: raise ValueError("Invalid announce data: Indeterminate propagation node status")
+            try:                                     int(data[3])
+            except:                                  raise ValueError("Invalid announce data: Could not decode propagation transfer limit")
+            try:                                     int(data[4])
+            except:                                  raise ValueError("Invalid announce data: Could not decode propagation sync limit")
+            if type(data[5]) != list:                raise ValueError("Invalid announce data: Could not decode stamp costs")
+            try:                                     int(data[5][0])
+            except:                                  raise ValueError("Invalid announce data: Could not decode target stamp cost")
+            try:                                     int(data[5][1])
+            except:                                  raise ValueError("Invalid announce data: Could not decode stamp cost flexibility")
+            try:                                     int(data[5][2])
+            except:                                  raise ValueError("Invalid announce data: Could not decode peering cost")
+            if type(data[6]) != dict:                raise ValueError("Invalid announce data: Could not decode metadata")
     
     except Exception as e:
         RNS.log(f"Could not validate propagation node announce data: {e}", RNS.LOG_DEBUG)

LXMF/LXMPeer.py

@@ -1,24 +1,38 @@
 import os
 import time
+import threading
 
 import RNS
 import RNS.vendor.umsgpack as msgpack
+import LXMF.LXStamper as LXStamper
 
+from collections import deque
 from .LXMF import APP_NAME
+from .LXMF import PN_META_NAME
 
 class LXMPeer:
     OFFER_REQUEST_PATH = "/offer"
     MESSAGE_GET_PATH   = "/get"
 
-    IDLE              = 0x00
-    LINK_ESTABLISHING = 0x01
-    LINK_READY        = 0x02
-    REQUEST_SENT      = 0x03
-    RESPONSE_RECEIVED = 0x04
+    IDLE                  = 0x00
+    LINK_ESTABLISHING     = 0x01
+    LINK_READY            = 0x02
+    REQUEST_SENT          = 0x03
+    RESPONSE_RECEIVED     = 0x04
     RESOURCE_TRANSFERRING = 0x05
 
-    ERROR_NO_IDENTITY = 0xf0
-    ERROR_NO_ACCESS   = 0xf1
+    ERROR_NO_IDENTITY     = 0xf0
+    ERROR_NO_ACCESS       = 0xf1
+    ERROR_INVALID_KEY     = 0xf3
+    ERROR_INVALID_DATA    = 0xf4
+    ERROR_INVALID_STAMP   = 0xf5
+    ERROR_THROTTLED       = 0xf6
+    ERROR_NOT_FOUND       = 0xfd
+    ERROR_TIMEOUT         = 0xfe
+
+    STRATEGY_LAZY         = 0x01
+    STRATEGY_PERSISTENT   = 0x02
+    DEFAULT_SYNC_STRATEGY = STRATEGY_PERSISTENT
 
     # Maximum amount of time a peer can
     # be unreachable before it is removed
@@ -38,48 +52,111 @@ class LXMPeer:
     @staticmethod
     def from_bytes(peer_bytes, router):
         dictionary = msgpack.unpackb(peer_bytes)
+        peer_destination_hash = dictionary["destination_hash"]
+        peer_peering_timebase = dictionary["peering_timebase"]
+        peer_alive = dictionary["alive"]
+        peer_last_heard = dictionary["last_heard"]
 
-        peer = LXMPeer(router, dictionary["destination_hash"])
-        peer.peering_timebase = dictionary["peering_timebase"]
-        peer.alive = dictionary["alive"]
-        peer.last_heard = dictionary["last_heard"]
-        if "link_establishment_rate" in dictionary:
-            peer.link_establishment_rate = dictionary["link_establishment_rate"]
-        else:
-            peer.link_establishment_rate = 0
+        peer = LXMPeer(router, peer_destination_hash)
+        peer.peering_timebase = peer_peering_timebase
+        peer.alive = peer_alive
+        peer.last_heard = peer_last_heard
+
+        if "link_establishment_rate" in dictionary: peer.link_establishment_rate = dictionary["link_establishment_rate"]
+        else: peer.link_establishment_rate = 0
         
-        if "sync_transfer_rate" in dictionary:
-            peer.sync_transfer_rate = dictionary["sync_transfer_rate"]
-        else:
-            peer.sync_transfer_rate = 0
+        if "sync_transfer_rate" in dictionary: peer.sync_transfer_rate = dictionary["sync_transfer_rate"]
+        else:                                  peer.sync_transfer_rate = 0
 
         if "propagation_transfer_limit" in dictionary:
-            try:
-                peer.propagation_transfer_limit = float(dictionary["propagation_transfer_limit"])
-            except Exception as e:
-                peer.propagation_transfer_limit = None
-        else:
-            peer.propagation_transfer_limit = None
+            try:                   peer.propagation_transfer_limit = float(dictionary["propagation_transfer_limit"])
+            except Exception as e: peer.propagation_transfer_limit = None
+        else:                      peer.propagation_transfer_limit = None
 
+        if "propagation_sync_limit" in dictionary:
+            try:    peer.propagation_sync_limit = int(dictionary["propagation_sync_limit"])
+            except: peer.propagation_sync_limit = peer.propagation_transfer_limit
+        else:       peer.propagation_sync_limit = peer.propagation_transfer_limit
+
+        if "propagation_stamp_cost" in dictionary:
+            try:    peer.propagation_stamp_cost = int(dictionary["propagation_stamp_cost"])
+            except: peer.propagation_stamp_cost = None
+        else:       peer.propagation_stamp_cost = None
+
+        if "propagation_stamp_cost_flexibility" in dictionary:
+            try:    peer.propagation_stamp_cost_flexibility = int(dictionary["propagation_stamp_cost_flexibility"])
+            except: peer.propagation_stamp_cost_flexibility = None
+        else:       peer.propagation_stamp_cost_flexibility = None
+
+        if "peering_cost" in dictionary:
+            try:    peer.peering_cost = int(dictionary["peering_cost"])
+            except: peer.peering_cost = None
+        else:       peer.peering_cost = None
+
+        if "sync_strategy" in dictionary:
+            try: peer.sync_strategy = int(dictionary["sync_strategy"])
+            except: peer.sync_strategy = LXMPeer.DEFAULT_SYNC_STRATEGY
+        else: peer.sync_strategy = LXMPeer.DEFAULT_SYNC_STRATEGY
+        
+        if "offered"  in dictionary:          peer.offered = dictionary["offered"]
+        else:                                 peer.offered = 0
+        if "outgoing" in dictionary:          peer.outgoing = dictionary["outgoing"]
+        else:                                 peer.outgoing = 0
+        if "incoming" in dictionary:          peer.incoming = dictionary["incoming"]
+        else:                                 peer.incoming = 0
+        if "rx_bytes" in dictionary:          peer.rx_bytes = dictionary["rx_bytes"]
+        else:                                 peer.rx_bytes = 0
+        if "tx_bytes" in dictionary:          peer.tx_bytes = dictionary["tx_bytes"]
+        else:                                 peer.tx_bytes = 0
+        if "last_sync_attempt" in dictionary: peer.last_sync_attempt = dictionary["last_sync_attempt"]
+        else:                                 peer.last_sync_attempt = 0
+        if "peering_key" in dictionary:       peer.peering_key = dictionary["peering_key"]
+        else:                                 peer.peering_key = None
+        if "metadata" in dictionary:          peer.metadata = dictionary["metadata"]
+        else:                                 peer.metadata = None
+
+        hm_count = 0
         for transient_id in dictionary["handled_ids"]:
             if transient_id in router.propagation_entries:
-                peer.handled_messages[transient_id] = router.propagation_entries[transient_id]
+                peer.add_handled_message(transient_id)
+                hm_count += 1
 
+        um_count = 0
         for transient_id in dictionary["unhandled_ids"]:
             if transient_id in router.propagation_entries:
-                peer.unhandled_messages[transient_id] = router.propagation_entries[transient_id]
+                peer.add_unhandled_message(transient_id)
+                um_count += 1
 
+        peer._hm_count = hm_count
+        peer._um_count = um_count
+        peer._hm_counts_synced = True
+        peer._um_counts_synced = True
+
+        del dictionary
         return peer
 
     def to_bytes(self):
         dictionary = {}
         dictionary["peering_timebase"] = self.peering_timebase
         dictionary["alive"] = self.alive
+        dictionary["metadata"] = self.metadata
         dictionary["last_heard"] = self.last_heard
+        dictionary["sync_strategy"] = self.sync_strategy
+        dictionary["peering_key"] = self.peering_key
         dictionary["destination_hash"] = self.destination_hash
         dictionary["link_establishment_rate"] = self.link_establishment_rate
         dictionary["sync_transfer_rate"] = self.sync_transfer_rate
         dictionary["propagation_transfer_limit"] = self.propagation_transfer_limit
+        dictionary["propagation_sync_limit"] = self.propagation_sync_limit
+        dictionary["propagation_stamp_cost"] = self.propagation_stamp_cost
+        dictionary["propagation_stamp_cost_flexibility"] = self.propagation_stamp_cost_flexibility
+        dictionary["peering_cost"] = self.peering_cost
+        dictionary["last_sync_attempt"] = self.last_sync_attempt
+        dictionary["offered"]  = self.offered
+        dictionary["outgoing"] = self.outgoing
+        dictionary["incoming"] = self.incoming
+        dictionary["rx_bytes"] = self.rx_bytes
+        dictionary["tx_bytes"] = self.tx_bytes
 
         handled_ids = []
         for transient_id in self.handled_messages:
@@ -92,24 +169,50 @@ class LXMPeer:
         dictionary["handled_ids"] = handled_ids
         dictionary["unhandled_ids"] = unhandled_ids
 
-        return msgpack.packb(dictionary)
+        peer_bytes = msgpack.packb(dictionary)
+        del dictionary
 
-    def __init__(self, router, destination_hash):
-        self.alive = False
-        self.last_heard = 0
-        self.next_sync_attempt = 0
-        self.last_sync_attempt = 0
-        self.sync_backoff = 0
-        self.peering_timebase = 0
+        return peer_bytes
+
+    def __init__(self, router, destination_hash, sync_strategy=DEFAULT_SYNC_STRATEGY):
+        self.alive         = False
+        self.last_heard    = 0
+        self.sync_strategy = sync_strategy
+        self.peering_key   = None
+        self.peering_cost  = None
+        self.metadata      = None
+
+        self.next_sync_attempt       = 0
+        self.last_sync_attempt       = 0
+        self.sync_backoff            = 0
+        self.peering_timebase        = 0
         self.link_establishment_rate = 0
-        self.sync_transfer_rate = 0
-        self.propagation_transfer_limit = None
+        self.sync_transfer_rate      = 0
+
+        self.propagation_transfer_limit         = None
+        self.propagation_sync_limit             = None
+        self.propagation_stamp_cost             = None
+        self.propagation_stamp_cost_flexibility = None
+        self.currently_transferring_messages    = None
+        self.handled_messages_queue             = deque()
+        self.unhandled_messages_queue           = deque()
+
+        self.offered   = 0   # Messages offered to this peer
+        self.outgoing  = 0   # Messages transferred to this peer
+        self.incoming  = 0   # Messages received from this peer
+        self.rx_bytes  = 0   # Bytes received from this peer
+        self.tx_bytes  = 0   # Bytes sent to this peer
+
+        self._hm_count = 0
+        self._um_count = 0
+        self._hm_counts_synced = False
+        self._um_counts_synced = False
+
+        self._peering_key_lock = threading.Lock()
 
         self.link = None
         self.state = LXMPeer.IDLE
 
-        self.unhandled_messages = {}
-        self.handled_messages = {}
         self.last_offer = []
         
         self.router = router
@@ -118,13 +221,77 @@ class LXMPeer:
         if self.identity != None:
             self.destination = RNS.Destination(self.identity, RNS.Destination.OUT, RNS.Destination.SINGLE, APP_NAME, "propagation")
         else:
+            self.destination = None
             RNS.log(f"Could not recall identity for LXMF propagation peer {RNS.prettyhexrep(self.destination_hash)}, will retry identity resolution on next sync", RNS.LOG_WARNING)
 
+    def peering_key_ready(self):
+        if not self.peering_cost: return False
+        if type(self.peering_key) == list and len(self.peering_key) == 2:
+            value = self.peering_key[1]
+            if value >= self.peering_cost: return True
+            else:
+                RNS.log(f"Peering key value mismatch for {self}. Current value is {value}, but peer requires {self.peering_cost}. Scheduling regeneration...", RNS.LOG_WARNING)
+                self.peering_key = None
+
+        return False
+
+    def peering_key_value(self):
+        if type(self.peering_key) == list and len(self.peering_key) == 2: return self.peering_key[1]
+        else: return None
+
+    def generate_peering_key(self):
+        if self.peering_cost == None: return False
+        with self._peering_key_lock:
+            if self.peering_key != None: return True
+            else:
+                RNS.log(f"Generating peering key for {self}", RNS.LOG_NOTICE)
+                if self.router.identity == None:
+                    RNS.log(f"Could not update peering key for {self} since the local LXMF router identity is not configured", RNS.LOG_ERROR)
+                    return False
+
+                if self.identity == None:
+                    self.identity = RNS.Identity.recall(destination_hash)
+                    if self.identity == None:
+                        RNS.log(f"Could not update peering key for {self} since its identity could not be recalled", RNS.LOG_ERROR)
+                        return False
+
+                key_material        = self.identity.hash+self.router.identity.hash
+                peering_key, value  = LXStamper.generate_stamp(key_material, self.peering_cost, expand_rounds=LXStamper.WORKBLOCK_EXPAND_ROUNDS_PEERING)
+                if value >= self.peering_cost:
+                    self.peering_key = [peering_key, value]
+                    RNS.log(f"Peering key successfully generated for {self}", RNS.LOG_NOTICE)
+                    return True
+
+        return False
+
     def sync(self):
         RNS.log("Initiating LXMF Propagation Node sync with peer "+RNS.prettyhexrep(self.destination_hash), RNS.LOG_DEBUG)
         self.last_sync_attempt = time.time()
 
-        if time.time() > self.next_sync_attempt:
+        sync_time_reached = time.time() > self.next_sync_attempt
+        stamp_costs_known = self.propagation_stamp_cost != None and self.propagation_stamp_cost_flexibility != None and self.peering_cost != None
+        peering_key_ready = self.peering_key_ready()
+        sync_checks = sync_time_reached and stamp_costs_known and peering_key_ready
+
+        if not sync_checks:
+            try:
+                if not sync_time_reached:
+                    postpone_reason = " due to previous failures"
+                    if self.last_sync_attempt > self.last_heard: self.alive = False
+                elif not stamp_costs_known:
+                    postpone_reason = " since its required stamp costs are not yet known"
+                elif not peering_key_ready:
+                    postpone_reason = " since a peering key has not been generated yet"
+                    def job(): self.generate_peering_key()
+                    threading.Thread(target=job, daemon=True).start()
+
+                delay = self.next_sync_attempt-time.time()
+                postpone_delay =  f" for {RNS.prettytime(delay)}" if delay > 0 else ""
+                RNS.log(f"Postponing sync with peer {RNS.prettyhexrep(self.destination_hash)}{postpone_delay}{postpone_reason}", RNS.LOG_DEBUG)
+            except Exception as e:
+                RNS.trace_exception(e)
+
+        else:
             if not RNS.Transport.has_path(self.destination_hash):
                 RNS.log("No path to peer "+RNS.prettyhexrep(self.destination_hash)+" exists, requesting...", RNS.LOG_DEBUG)
                 RNS.Transport.request_path(self.destination_hash)
@@ -140,7 +307,15 @@ class LXMPeer:
                         self.destination = RNS.Destination(self.identity, RNS.Destination.OUT, RNS.Destination.SINGLE, APP_NAME, "propagation")
 
                 if self.destination != None:
+                    if len(self.unhandled_messages) == 0:
+                        RNS.log(f"Sync requested for {self}, but no unhandled messages exist for peer. Sync complete.", RNS.LOG_DEBUG)
+                        return
+
                     if len(self.unhandled_messages) > 0:
+                        if self.currently_transferring_messages != None:
+                            RNS.log(f"Sync requested for {self}, but current message transfer index was not clear. Aborting.", RNS.LOG_ERROR)
+                            return
+
                         if self.state == LXMPeer.IDLE:
                             RNS.log("Establishing link for sync to peer "+RNS.prettyhexrep(self.destination_hash)+"...", RNS.LOG_DEBUG)
                             self.sync_backoff += LXMPeer.SYNC_BACKOFF_STEP
@@ -153,58 +328,69 @@ class LXMPeer:
                                 self.alive = True
                                 self.last_heard = time.time()
                                 self.sync_backoff = 0
+                                min_accepted_cost = min(0, self.propagation_stamp_cost-self.propagation_stamp_cost_flexibility)
 
-                                RNS.log("Synchronisation link to peer "+RNS.prettyhexrep(self.destination_hash)+" established, preparing request...", RNS.LOG_DEBUG)
+                                RNS.log("Synchronisation link to peer "+RNS.prettyhexrep(self.destination_hash)+" established, preparing sync offer...", RNS.LOG_DEBUG)
                                 unhandled_entries = []
-                                unhandled_ids = []
-                                purged_ids = []
+                                unhandled_ids     = []
+                                purged_ids        = []
+                                low_value_ids     = []
                                 for transient_id in self.unhandled_messages:
                                     if transient_id in self.router.propagation_entries:
-                                        unhandled_entry = [
-                                            transient_id,
-                                            self.router.get_weight(transient_id),
-                                            self.router.get_size(transient_id),
-                                        ]
-                                        unhandled_entries.append(unhandled_entry)
-                                    else:
-                                        purged_ids.append(transient_id)
+                                        if self.router.get_stamp_value(transient_id) < min_accepted_cost: low_value_ids.append(transient_id)
+                                        else:
+                                            unhandled_entry = [ transient_id,
+                                                                self.router.get_weight(transient_id),
+                                                                self.router.get_size(transient_id) ]
+                                            
+                                            unhandled_entries.append(unhandled_entry)
+                                    
+                                    else: purged_ids.append(transient_id)
 
                                 for transient_id in purged_ids:
-                                    RNS.log("Dropping unhandled message "+RNS.prettyhexrep(transient_id)+" for peer "+RNS.prettyhexrep(self.destination_hash)+" since it no longer exists in the message store.", RNS.LOG_DEBUG)
-                                    self.unhandled_messages.pop(transient_id)
+                                    RNS.log(f"Dropping unhandled message {RNS.prettyhexrep(transient_id)} for peer {RNS.prettyhexrep(self.destination_hash)} since it no longer exists in the message store.", RNS.LOG_DEBUG)
+                                    self.remove_unhandled_message(transient_id)
+
+                                for transient_id in low_value_ids:
+                                    RNS.log(f"Dropping unhandled message {RNS.prettyhexrep(transient_id)} for peer {RNS.prettyhexrep(self.destination_hash)} since its stamp value is lower than peer requirement of {min_accepted_cost}.", RNS.LOG_DEBUG)
+                                    self.remove_unhandled_message(transient_id)
 
                                 unhandled_entries.sort(key=lambda e: e[1], reverse=False)
-                                per_message_overhead = 16 # Really only 2 bytes, but set a bit higher for now
-                                cumulative_size = 24 # Initialised to highest reasonable binary structure overhead
-                                for unhandled_entry in unhandled_entries:
-                                    transient_id = unhandled_entry[0]
-                                    weight = unhandled_entry[1]
-                                    lxm_size = unhandled_entry[2]
-                                    next_size = cumulative_size + (lxm_size+per_message_overhead)
-                                    if self.propagation_transfer_limit != None and next_size > (self.propagation_transfer_limit*1000):
-                                        pass
-                                    else:
-                                        cumulative_size += (lxm_size+per_message_overhead)
-                                        unhandled_ids.append(transient_id)
+                                per_message_overhead  = 16 # Really only 2 bytes, but set a bit higher for now
+                                cumulative_size       = 24 # Initialised to highest reasonable binary structure overhead
+                                RNS.log(f"Syncing to peer with per-message limit {RNS.prettysize(self.propagation_transfer_limit*1000)} and sync limit {RNS.prettysize(self.propagation_sync_limit*1000)}")  # TODO: Remove debug
 
-                                RNS.log("Sending sync request to peer "+str(self.destination), RNS.LOG_DEBUG)
+                                for unhandled_entry in unhandled_entries:
+                                    transient_id      = unhandled_entry[0]
+                                    weight            = unhandled_entry[1]
+                                    lxm_size          = unhandled_entry[2]
+                                    lxm_transfer_size = lxm_size+per_message_overhead
+                                    next_size         = cumulative_size + lxm_transfer_size
+
+                                    if self.propagation_transfer_limit != None and lxm_transfer_size > (self.propagation_transfer_limit*1000):
+                                        self.remove_unhandled_message(transient_id)
+                                        self.add_handled_message(transient_id)
+                                        continue
+
+                                    if self.propagation_sync_limit != None and next_size >= (self.propagation_sync_limit*1000):
+                                        continue
+
+                                    cumulative_size += lxm_transfer_size
+                                    unhandled_ids.append(transient_id)
+
+                                offer = [self.peering_key[0], unhandled_ids]
+
+                                RNS.log(f"Offering {len(unhandled_ids)} messages to peer {RNS.prettyhexrep(self.destination.hash)} ({RNS.prettysize(len(msgpack.packb(unhandled_ids)))})", RNS.LOG_VERBOSE)
                                 self.last_offer = unhandled_ids
-                                self.link.request(LXMPeer.OFFER_REQUEST_PATH, self.last_offer, response_callback=self.offer_response, failed_callback=self.request_failed)
+                                self.link.request(LXMPeer.OFFER_REQUEST_PATH, offer, response_callback=self.offer_response, failed_callback=self.request_failed)
                                 self.state = LXMPeer.REQUEST_SENT
 
                 else:
-                    RNS.log("Could not request sync to peer "+RNS.prettyhexrep(self.destination_hash)+" since its identity could not be recalled.", RNS.LOG_ERROR)
-
-        else:
-            RNS.log("Postponing sync with peer "+RNS.prettyhexrep(self.destination_hash)+" for "+RNS.prettytime(self.next_sync_attempt-time.time())+" due to previous failures", RNS.LOG_DEBUG)
-            if self.last_sync_attempt > self.last_heard:
-                self.alive = False
+                    RNS.log(f"Could not request sync to peer {RNS.prettyhexrep(self.destination_hash)} since its identity could not be recalled.", RNS.LOG_ERROR)
 
     def request_failed(self, request_receipt):
-        RNS.log("Sync request to peer "+str(self.destination)+" failed", RNS.LOG_DEBUG)
-        if self.link != None:
-            self.link.teardown()
-        
+        RNS.log(f"Sync request to peer {self.destination} failed", RNS.LOG_DEBUG)
+        if self.link != None: self.link.teardown()
         self.state = LXMPeer.IDLE
 
     def offer_response(self, request_receipt):
@@ -217,22 +403,35 @@ class LXMPeer:
 
             if response == LXMPeer.ERROR_NO_IDENTITY:
                 if self.link != None:
-                    RNS.log("Remote peer indicated that no identification was received, retrying...", RNS.LOG_DEBUG)
+                    RNS.log("Remote peer indicated that no identification was received, retrying...", RNS.LOG_VERBOSE)
                     self.link.identify()
                     self.state = LXMPeer.LINK_READY
                     self.sync()
+                    return
+
+            elif response == LXMPeer.ERROR_NO_ACCESS:
+                RNS.log("Remote indicated that access was denied, breaking peering", RNS.LOG_VERBOSE)
+                self.router.unpeer(self.destination_hash)
+                return
+
+            elif response == LXMPeer.ERROR_THROTTLED:
+                throttle_time = self.router.PN_STAMP_THROTTLE
+                RNS.log(f"Remote indicated that we're throttled, postponing sync for {RNS.prettytime(throttle_time)}", RNS.LOG_VERBOSE)
+                self.next_sync_attempt = time.time()+throttle_time
+                return
 
             elif response == False:
                 # Peer already has all advertised messages
                 for transient_id in self.last_offer:
                     if transient_id in self.unhandled_messages:
-                        self.handled_messages[transient_id] = self.unhandled_messages.pop(transient_id)
+                        self.add_handled_message(transient_id)
+                        self.remove_unhandled_message(transient_id)
                     
 
             elif response == True:
                 # Peer wants all advertised messages
                 for transient_id in self.last_offer:
-                    wanted_messages.append(self.unhandled_messages[transient_id])
+                    wanted_messages.append(self.router.propagation_entries[transient_id])
                     wanted_message_ids.append(transient_id)
 
             else:
@@ -241,18 +440,17 @@ class LXMPeer:
                     # If the peer did not want the message, it has
                     # already received it from another peer.
                     if not transient_id in response:
-                        if transient_id in self.unhandled_messages:
-                            self.handled_messages[transient_id] = self.unhandled_messages.pop(transient_id)
+                        self.add_handled_message(transient_id)
+                        self.remove_unhandled_message(transient_id)
 
                 for transient_id in response:
-                    wanted_messages.append(self.unhandled_messages[transient_id])
+                    wanted_messages.append(self.router.propagation_entries[transient_id])
                     wanted_message_ids.append(transient_id)
 
             if len(wanted_messages) > 0:
-                RNS.log("Peer wanted "+str(len(wanted_messages))+" of the available messages", RNS.LOG_DEBUG)
+                RNS.log(f"Peer {RNS.prettyhexrep(self.destination_hash)} wanted {str(len(wanted_messages))} of the available messages", RNS.LOG_VERBOSE)
 
                 lxm_list = []
-
                 for message_entry in wanted_messages:
                     file_path = message_entry[1]
                     if os.path.isfile(file_path):
@@ -262,13 +460,15 @@ class LXMPeer:
                         lxm_list.append(lxmf_data)
 
                 data = msgpack.packb([time.time(), lxm_list])
+                RNS.log(f"Total transfer size for this sync is {RNS.prettysize(len(data))}", RNS.LOG_VERBOSE)
                 resource = RNS.Resource(data, self.link, callback = self.resource_concluded)
-                resource.transferred_messages = wanted_message_ids
-                resource.sync_transfer_started = time.time()
+                self.currently_transferring_messages = wanted_message_ids
+                self.current_sync_transfer_started = time.time()
                 self.state = LXMPeer.RESOURCE_TRANSFERRING
 
             else:
-                RNS.log("Peer "+RNS.prettyhexrep(self.destination_hash)+" did not request any of the available messages, sync completed", RNS.LOG_DEBUG)
+                RNS.log(f"Peer {RNS.prettyhexrep(self.destination_hash)} did not request any of the available messages, sync completed", RNS.LOG_VERBOSE)
+                self.offered += len(self.last_offer)
                 if self.link != None:
                     self.link.teardown()
 
@@ -287,32 +487,45 @@ class LXMPeer:
 
     def resource_concluded(self, resource):
         if resource.status == RNS.Resource.COMPLETE:
-            for transient_id in resource.transferred_messages:
-                message = self.unhandled_messages.pop(transient_id)
-                self.handled_messages[transient_id] = message
-            
-            if self.link != None:
-                self.link.teardown()
+            if self.currently_transferring_messages == None:
+                RNS.log(f"Sync transfer completed on {self}, but transferred message index was unavailable. Aborting.", RNS.LOG_ERROR)
+                if self.link != None: self.link.teardown()
+                self.link  = None
+                self.state = LXMPeer.IDLE
 
-            self.link = None
-            self.state = LXMPeer.IDLE
+            for transient_id in self.currently_transferring_messages:
+                self.add_handled_message(transient_id)
+                self.remove_unhandled_message(transient_id)
+            
+            if self.link != None: self.link.teardown()
+            self.link     = None
+            self.state    = LXMPeer.IDLE
 
             rate_str = ""
-            if hasattr(resource, "sync_transfer_started") and resource.sync_transfer_started:
-                self.sync_transfer_rate = (resource.get_transfer_size()*8)/(time.time()-resource.sync_transfer_started)
+            if self.current_sync_transfer_started != None:
+                self.sync_transfer_rate = (resource.get_transfer_size()*8)/(time.time()-self.current_sync_transfer_started)
                 rate_str = f" at {RNS.prettyspeed(self.sync_transfer_rate)}"
 
-            RNS.log("Sync to peer "+RNS.prettyhexrep(self.destination_hash)+" completed"+rate_str, RNS.LOG_DEBUG)
-            self.alive = True
+            RNS.log(f"Syncing {len(self.currently_transferring_messages)} messages to peer {RNS.prettyhexrep(self.destination_hash)} completed{rate_str}", RNS.LOG_VERBOSE)
+            self.alive      = True
             self.last_heard = time.time()
+            self.offered   += len(self.last_offer)
+            self.outgoing  += len(self.currently_transferring_messages)
+            self.tx_bytes  += resource.get_data_size()
+
+            self.currently_transferring_messages = None
+            self.current_sync_transfer_started   = None
+
+            if self.sync_strategy == self.STRATEGY_PERSISTENT:
+                if self.unhandled_message_count > 0: self.sync()
         
         else:
-            RNS.log("Resource transfer for LXMF peer sync failed to "+str(self.destination), RNS.LOG_DEBUG)
-            if self.link != None:
-                self.link.teardown()
-
-            self.link = None
-            self.state = LXMPeer.IDLE
+            RNS.log("Resource transfer for LXMF peer sync failed to "+str(self.destination), RNS.LOG_VERBOSE)
+            if self.link != None: self.link.teardown()
+            self.link     = None
+            self.state    = LXMPeer.IDLE
+            self.currently_transferring_messages = None
+            self.current_sync_transfer_started   = None
 
     def link_established(self, link):
         self.link.identify(self.router.identity)
@@ -325,15 +538,105 @@ class LXMPeer:
         self.sync()
 
     def link_closed(self, link):
-        self.link = None
+        self.link  = None
         self.state = LXMPeer.IDLE
 
-    def handle_message(self, transient_id):
-        if not transient_id in self.handled_messages and not transient_id in self.unhandled_messages:
-            self.unhandled_messages[transient_id] = self.router.propagation_entries[transient_id]
+    def queued_items(self):
+        return len(self.handled_messages_queue) > 0 or len(self.unhandled_messages_queue) > 0
 
-    def __str__(self):
-        if self.destination_hash:
-            return RNS.prettyhexrep(self.destination_hash)
+    def queue_unhandled_message(self, transient_id):
+        self.unhandled_messages_queue.append(transient_id)
+
+    def queue_handled_message(self, transient_id):
+        self.handled_messages_queue.append(transient_id)
+
+    def process_queues(self):
+        if len(self.unhandled_messages_queue) > 0 or len(self.handled_messages_queue) > 0:            
+            handled_messages = self.handled_messages
+            unhandled_messages = self.unhandled_messages
+
+            while len(self.handled_messages_queue) > 0:
+                transient_id = self.handled_messages_queue.pop()
+                if not transient_id in handled_messages: self.add_handled_message(transient_id)
+                if transient_id in unhandled_messages:   self.remove_unhandled_message(transient_id)
+
+            while len(self.unhandled_messages_queue) > 0:
+                transient_id = self.unhandled_messages_queue.pop()
+                if not transient_id in handled_messages and not transient_id in unhandled_messages:
+                    self.add_unhandled_message(transient_id)
+
+            del handled_messages, unhandled_messages
+
+    @property
+    def handled_messages(self):
+        pes = self.router.propagation_entries.copy()
+        hm = list(filter(lambda tid: self.destination_hash in pes[tid][4], pes))
+        self._hm_count = len(hm); del pes
+        self._hm_counts_synced = True
+        return hm
+
+    @property
+    def unhandled_messages(self):
+        pes = self.router.propagation_entries.copy()
+        um = list(filter(lambda tid: self.destination_hash in pes[tid][5], pes))
+        self._um_count = len(um); del pes
+        self._um_counts_synced = True
+        return um
+
+    @property
+    def handled_message_count(self):
+        if not self._hm_counts_synced: self._update_counts()
+        return self._hm_count
+
+    @property
+    def unhandled_message_count(self):
+        if not self._um_counts_synced: self._update_counts()
+        return self._um_count
+
+    @property
+    def acceptance_rate(self):
+        return 0 if self.offered == 0 else (self.outgoing/self.offered)
+
+    def _update_counts(self):
+        if not self._hm_counts_synced:
+            hm = self.handled_messages; del hm
+
+        if not self._um_counts_synced:
+            um = self.unhandled_messages; del um
+
+    def add_handled_message(self, transient_id):
+        if transient_id in self.router.propagation_entries:
+            if not self.destination_hash in self.router.propagation_entries[transient_id][4]:
+                self.router.propagation_entries[transient_id][4].append(self.destination_hash)
+                self._hm_counts_synced = False
+
+    def add_unhandled_message(self, transient_id):
+        if transient_id in self.router.propagation_entries:
+            if not self.destination_hash in self.router.propagation_entries[transient_id][5]:
+                self.router.propagation_entries[transient_id][5].append(self.destination_hash)
+                self._um_count += 1
+
+    def remove_handled_message(self, transient_id):
+        if transient_id in self.router.propagation_entries:
+            if self.destination_hash in self.router.propagation_entries[transient_id][4]:
+                self.router.propagation_entries[transient_id][4].remove(self.destination_hash)
+                self._hm_counts_synced = False
+
+    def remove_unhandled_message(self, transient_id):
+        if transient_id in self.router.propagation_entries:
+            if self.destination_hash in self.router.propagation_entries[transient_id][5]:
+                self.router.propagation_entries[transient_id][5].remove(self.destination_hash)
+                self._um_counts_synced = False
+
+    @property
+    def name(self):
+        if type(self.metadata) != dict: return None
         else:
-            return "<Unknown>"
+            if not PN_META_NAME in self.metadata: return None
+            else:
+                try: return self.metadata[PN_META_NAME].decode("utf-8")
+                except: return None
+    
+    def __str__(self):
+        if self.destination_hash: return RNS.prettyhexrep(self.destination_hash)
+        else: return "<Unknown>"

LXMF/LXMessage.py

@@ -145,26 +145,32 @@ class LXMessage:
 
         self.set_fields(fields)
 
-        self.payload          = None
-        self.timestamp        = None
-        self.signature        = None
-        self.hash             = None
-        self.packed           = None
-        self.state            = LXMessage.GENERATING
-        self.method           = LXMessage.UNKNOWN
-        self.progress         = 0.0
-        self.rssi             = None
-        self.snr              = None
-        self.q                = None
+        self.payload                 = None
+        self.timestamp               = None
+        self.signature               = None
+        self.hash                    = None
+        self.transient_id            = None
+        self.packed                  = None
+        self.state                   = LXMessage.GENERATING
+        self.method                  = LXMessage.UNKNOWN
+        self.progress                = 0.0
+        self.rssi                    = None
+        self.snr                     = None
+        self.q                       = None
 
-        self.stamp            = None
-        self.stamp_cost       = stamp_cost
-        self.stamp_value      = None
-        self.stamp_valid      = False
-        self.stamp_checked    = False
-        self.defer_stamp      = True
-        self.outbound_ticket  = None
-        self.include_ticket   = include_ticket
+        self.stamp                   = None
+        self.stamp_cost              = stamp_cost
+        self.stamp_value             = None
+        self.stamp_valid             = False
+        self.stamp_checked           = False
+        self.propagation_stamp       = None
+        self.propagation_stamp_value = None
+        self.propagation_stamp_valid = False
+        self.propagation_target_cost = None
+        self.defer_stamp             = True
+        self.defer_propagation_stamp = True
+        self.outbound_ticket         = None
+        self.include_ticket          = include_ticket
 
         self.propagation_packed      = None
         self.paper_packed            = None
@@ -184,6 +190,7 @@ class LXMessage:
         self.resource_representation = None
         self.__delivery_destination  = None
         self.__delivery_callback     = None
+        self.__pn_encrypted_data     = None
         self.failed_callback         = None
         
         self.deferred_stamp_generating = False
@@ -268,15 +275,6 @@ class LXMessage:
     def register_failed_callback(self, callback):
         self.failed_callback = callback
 
-    @staticmethod
-    def stamp_valid(stamp, target_cost, workblock):
-        target = 0b1 << 256-target_cost
-        result = RNS.Identity.full_hash(workblock+stamp)
-        if int.from_bytes(result, byteorder="big") > target:
-            return False
-        else:
-            return True
-
     def validate_stamp(self, target_cost, tickets=None):
         if tickets != None:
             for ticket in tickets:
@@ -293,7 +291,7 @@ class LXMessage:
             return False
         else:
             workblock = LXStamper.stamp_workblock(self.message_id)
-            if LXMessage.stamp_valid(self.stamp, target_cost, workblock):
+            if LXStamper.stamp_valid(self.stamp, target_cost, workblock):
                 RNS.log(f"Stamp on {self} validated", RNS.LOG_DEBUG) # TODO: Remove at some point
                 self.stamp_value = LXStamper.stamp_value(workblock, self.stamp)
                 return True
@@ -333,10 +331,35 @@ class LXMessage:
             else:
                 return None
 
-    def pack(self):
+    def get_propagation_stamp(self, target_cost, timeout=None):
+        # If a stamp was already generated, return
+        # it immediately.
+        if self.propagation_stamp != None:
+            return self.propagation_stamp
+
+        # Otherwise, we will need to generate a
+        # valid stamp according to the cost that
+        # the propagation node has specified.
+        else:
+            self.propagation_target_cost = target_cost
+            if self.propagation_target_cost == None:
+                raise ValueError("Cannot generate propagation stamp without configured target propagation cost")
+
+            
+            if not self.transient_id: self.pack()
+            generated_stamp, value = LXStamper.generate_stamp(self.transient_id, target_cost, expand_rounds=LXStamper.WORKBLOCK_EXPAND_ROUNDS_PN)
+            if generated_stamp:
+                self.propagation_stamp = generated_stamp
+                self.propagation_stamp_value = value
+                self.propagation_stamp_valid = True
+                return generated_stamp
+            
+            else:
+                return None
+
+    def pack(self, payload_updated=False):
         if not self.packed:
-            if self.timestamp == None:
-                self.timestamp = time.time()
+            if self.timestamp == None: self.timestamp = time.time()
 
             self.propagation_packed = None
             self.paper_packed = None
@@ -352,9 +375,8 @@ class LXMessage:
 
             if not self.defer_stamp:
                 self.stamp       = self.get_stamp()
-                if self.stamp   != None:
-                    self.payload.append(self.stamp)
-            
+                if self.stamp   != None: self.payload.append(self.stamp)
+
             signed_part      = b""
             signed_part     += hashed_part
             signed_part     += self.hash
@@ -380,7 +402,7 @@ class LXMessage:
             if self.desired_method == LXMessage.OPPORTUNISTIC:
                 if self.__destination.type == RNS.Destination.SINGLE:
                     if content_size > LXMessage.ENCRYPTED_PACKET_MAX_CONTENT:
-                        RNS.log(f"Opportunistic delivery was requested for {self}, but content exceeds packet size limit. Falling back to link-based delivery.", RNS.LOG_DEBUG)
+                        RNS.log(f"Opportunistic delivery was requested for {self}, but content of length {content_size} exceeds packet size limit. Falling back to link-based delivery.", RNS.LOG_DEBUG)
                         self.desired_method = LXMessage.DIRECT
 
             # Set delivery parameters according to delivery method
@@ -409,9 +431,14 @@ class LXMessage:
             elif self.desired_method == LXMessage.PROPAGATED:
                 single_packet_content_limit = LXMessage.LINK_PACKET_MAX_CONTENT
 
-                encrypted_data = self.__destination.encrypt(self.packed[LXMessage.DESTINATION_LENGTH:])
-                self.ratchet_id = self.__destination.latest_ratchet_id
-                self.propagation_packed = msgpack.packb([time.time(), [self.packed[:LXMessage.DESTINATION_LENGTH]+encrypted_data]])
+                if self.__pn_encrypted_data == None or payload_updated:
+                    self.__pn_encrypted_data = self.__destination.encrypt(self.packed[LXMessage.DESTINATION_LENGTH:])
+                    self.ratchet_id          = self.__destination.latest_ratchet_id
+
+                lxmf_data = self.packed[:LXMessage.DESTINATION_LENGTH]+self.__pn_encrypted_data
+                self.transient_id = RNS.Identity.full_hash(lxmf_data)
+                if self.propagation_stamp != None: lxmf_data += self.propagation_stamp
+                self.propagation_packed = msgpack.packb([time.time(), [lxmf_data]])
 
                 content_size = len(self.propagation_packed)
                 if content_size <= single_packet_content_limit:

LXMF/LXStamper.py

@@ -3,25 +3,28 @@ import RNS.vendor.umsgpack as msgpack
 
 import os
 import time
+import math
+import itertools
 import multiprocessing
 
-WORKBLOCK_EXPAND_ROUNDS = 3000
+WORKBLOCK_EXPAND_ROUNDS         = 3000
+WORKBLOCK_EXPAND_ROUNDS_PN      = 1000
+WORKBLOCK_EXPAND_ROUNDS_PEERING = 25
+STAMP_SIZE                      = RNS.Identity.HASHLENGTH//8
+PN_VALIDATION_POOL_MIN_SIZE     = 256
 
 active_jobs = {}
 
-def stamp_workblock(message_id):
+def stamp_workblock(material, expand_rounds=WORKBLOCK_EXPAND_ROUNDS):
     wb_st = time.time()
-    expand_rounds = WORKBLOCK_EXPAND_ROUNDS
     workblock = b""
     for n in range(expand_rounds):
-        workblock += RNS.Cryptography.hkdf(
-            length=256,
-            derive_from=message_id,
-            salt=RNS.Identity.full_hash(message_id+msgpack.packb(n)),
-            context=None,
-        )
+        workblock += RNS.Cryptography.hkdf(length=256,
+                                           derive_from=material,
+                                           salt=RNS.Identity.full_hash(material+msgpack.packb(n)),
+                                           context=None)
     wb_time = time.time() - wb_st
-    RNS.log(f"Stamp workblock size {RNS.prettysize(len(workblock))}, generated in {round(wb_time*1000,2)}ms", RNS.LOG_DEBUG)
+    # RNS.log(f"Stamp workblock size {RNS.prettysize(len(workblock))}, generated in {round(wb_time*1000,2)}ms", RNS.LOG_DEBUG)
 
     return workblock
 
@@ -36,28 +39,72 @@ def stamp_value(workblock, stamp):
  
     return value
 
-def generate_stamp(message_id, stamp_cost):
+def stamp_valid(stamp, target_cost, workblock):
+    target = 0b1 << 256-target_cost
+    result = RNS.Identity.full_hash(workblock+stamp)
+    if int.from_bytes(result, byteorder="big") > target: return False
+    else: return True
+
+def validate_peering_key(peering_id, peering_key, target_cost):
+    workblock = stamp_workblock(peering_id, expand_rounds=WORKBLOCK_EXPAND_ROUNDS_PEERING)
+    if not stamp_valid(peering_key, target_cost, workblock): return False
+    else: return True
+
+def validate_pn_stamp(transient_data, target_cost):
+    from .LXMessage import LXMessage
+    if len(transient_data) <= LXMessage.LXMF_OVERHEAD+STAMP_SIZE: return None, None, None, None
+    else:
+        lxm_data     = transient_data[:-STAMP_SIZE]
+        stamp        = transient_data[-STAMP_SIZE:]
+        transient_id = RNS.Identity.full_hash(lxm_data)
+        workblock    = stamp_workblock(transient_id, expand_rounds=WORKBLOCK_EXPAND_ROUNDS_PN)
+        
+        if not stamp_valid(stamp, target_cost, workblock): return None, None, None, None
+        else:
+            value = stamp_value(workblock, stamp)
+            return transient_id, lxm_data, value, stamp
+
+def validate_pn_stamps_job_simple(transient_list, target_cost):
+    validated_messages = []
+    for transient_data in transient_list:
+        transient_id, lxm_data, value, stamp_data = validate_pn_stamp(transient_data, target_cost)
+        if transient_id: validated_messages.append([transient_id, lxm_data, value, stamp_data])
+
+    return validated_messages
+
+def validate_pn_stamps_job_multip(transient_list, target_cost):
+    cores      = multiprocessing.cpu_count()
+    pool_count = min(cores, math.ceil(len(transient_list) / PN_VALIDATION_POOL_MIN_SIZE))
+        
+    RNS.log(f"Validating {len(transient_list)} stamps using {pool_count} processes...", RNS.LOG_VERBOSE)
+    with multiprocessing.get_context("spawn").Pool(pool_count) as p:
+        validated_entries = p.starmap(validate_pn_stamp, zip(transient_list, itertools.repeat(target_cost)))
+    
+    RNS.log(f"Validation pool completed for {len(transient_list)} stamps", RNS.LOG_VERBOSE)
+
+    return [e for e in validated_entries if e[0] != None]
+
+def validate_pn_stamps(transient_list, target_cost):
+    non_mp_platform = RNS.vendor.platformutils.is_android()
+    if len(transient_list) <= PN_VALIDATION_POOL_MIN_SIZE or non_mp_platform: return validate_pn_stamps_job_simple(transient_list, target_cost)
+    else:                                                                     return validate_pn_stamps_job_multip(transient_list, target_cost)
+
+def generate_stamp(message_id, stamp_cost, expand_rounds=WORKBLOCK_EXPAND_ROUNDS):
     RNS.log(f"Generating stamp with cost {stamp_cost} for {RNS.prettyhexrep(message_id)}...", RNS.LOG_DEBUG)
-    workblock = stamp_workblock(message_id)
+    workblock = stamp_workblock(message_id, expand_rounds=expand_rounds)
     
     start_time = time.time()
     stamp = None
     rounds = 0
     value = 0
 
-    if RNS.vendor.platformutils.is_windows() or RNS.vendor.platformutils.is_darwin():
-        stamp, rounds = job_simple(stamp_cost, workblock, message_id)
-
-    elif RNS.vendor.platformutils.is_android():
-        stamp, rounds = job_android(stamp_cost, workblock, message_id)
-
-    else:
-        stamp, rounds = job_linux(stamp_cost, workblock, message_id)
+    if RNS.vendor.platformutils.is_windows() or RNS.vendor.platformutils.is_darwin(): stamp, rounds = job_simple(stamp_cost, workblock, message_id)
+    elif RNS.vendor.platformutils.is_android(): stamp, rounds = job_android(stamp_cost, workblock, message_id)
+    else: stamp, rounds = job_linux(stamp_cost, workblock, message_id)
     
     duration = time.time() - start_time
     speed = rounds/duration
-    if stamp != None:
-        value = stamp_value(workblock, stamp)
+    if stamp != None: value = stamp_value(workblock, stamp)
 
     RNS.log(f"Stamp with value {value} generated in {RNS.prettytime(duration)}, {rounds} rounds, {int(speed)} rounds per second", RNS.LOG_DEBUG)
 
@@ -113,10 +160,8 @@ def job_simple(stamp_cost, workblock, message_id):
     def sv(s, c, w):
         target = 0b1<<256-c; m = w+s
         result = RNS.Identity.full_hash(m)
-        if int.from_bytes(result, byteorder="big") > target:
-            return False
-        else:
-            return True
+        if int.from_bytes(result, byteorder="big") > target: return False
+        else:                                                return True
 
     while not sv(pstamp, stamp_cost, workblock) and not active_jobs[message_id]:
         pstamp = os.urandom(256//8); rounds += 1
@@ -135,7 +180,8 @@ def job_linux(stamp_cost, workblock, message_id):
     allow_kill = True
     stamp = None
     total_rounds = 0
-    jobs = multiprocessing.cpu_count()
+    cores = multiprocessing.cpu_count()
+    jobs = cores if cores <= 12 else int(cores/2)
     stop_event   = multiprocessing.Event()
     result_queue = multiprocessing.Queue(1)
     rounds_queue = multiprocessing.Queue()
@@ -164,22 +210,19 @@ def job_linux(stamp_cost, workblock, message_id):
     job_procs = []
     RNS.log(f"Starting {jobs} stamp generation workers", RNS.LOG_DEBUG)
     for jpn in range(jobs):
-        process = multiprocessing.Process(target=job, kwargs={"stop_event": stop_event, "pn": jpn, "sc": stamp_cost, "wb": workblock}, daemon=True)
+        process = multiprocessing.get_context("fork").Process(target=job, kwargs={"stop_event": stop_event, "pn": jpn, "sc": stamp_cost, "wb": workblock}, daemon=True)
         job_procs.append(process)
         process.start()
 
     active_jobs[message_id] = [stop_event, result_queue]
 
     stamp = result_queue.get()
-    RNS.log("Got stamp result from worker", RNS.LOG_DEBUG) # TODO: Remove
 
     # Collect any potential spurious
     # results from worker queue.
     try:
-        while True:
-            result_queue.get_nowait()
-    except:
-        pass
+        while True: result_queue.get_nowait()
+    except: pass
 
     for j in range(jobs):
         nrounds = 0
@@ -310,6 +353,13 @@ def job_android(stamp_cost, workblock, message_id):
 
     return stamp, total_rounds
 
+# def stamp_value_linear(workblock, stamp):
+#     value = 0
+#     bits = 256
+#     material = RNS.Identity.full_hash(workblock+stamp)
+#     s = int.from_bytes(material, byteorder="big")
+#     return s.bit_count()
+
 if __name__ == "__main__":
     import sys
     if len(sys.argv) < 2:
@@ -325,4 +375,21 @@ if __name__ == "__main__":
     RNS.loglevel = RNS.LOG_DEBUG
     RNS.log("Testing LXMF stamp generation", RNS.LOG_DEBUG)
     message_id = os.urandom(32)
-    generate_stamp(message_id, cost)
+    generate_stamp(message_id, cost)
+
+    RNS.log("", RNS.LOG_DEBUG)
+    RNS.log("Testing propagation stamp generation", RNS.LOG_DEBUG)
+    message_id = os.urandom(32)
+    generate_stamp(message_id, cost, expand_rounds=WORKBLOCK_EXPAND_ROUNDS_PN)
+
+    RNS.log("", RNS.LOG_DEBUG)
+    RNS.log("Testing peering key generation", RNS.LOG_DEBUG)
+    message_id = os.urandom(32)
+    generate_stamp(message_id, cost, expand_rounds=WORKBLOCK_EXPAND_ROUNDS_PEERING)
+
+    transient_list = []
+    st = time.time(); count = 10000
+    for i in range(count): transient_list.append(os.urandom(256))
+    validate_pn_stamps(transient_list, 5)
+    dt = time.time()-st; mps = count/dt
+    RNS.log(f"Validated {count} PN stamps in {RNS.prettytime(dt)}, {round(mps,1)} m/s", RNS.LOG_DEBUG)

LXMF/Utilities/lxmd.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
 
-# MIT License
+# Reticulum License
 #
-# Copyright (c) 2016-2022 Mark Qvist / unsigned.io
+# Copyright (c) 2020-2025 Mark Qvist
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -11,8 +11,16 @@
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
+# - The Software shall not be used in any kind of system which includes amongst
+#   its functions the ability to purposefully do harm to human beings.
+#
+# - The Software shall not be used, directly or indirectly, in the creation of
+#   an artificial intelligence, machine learning or language model training
+#   dataset, including but not limited to any use that contributes to the
+#   training or development of such a model or algorithm.
+#
+# - The above copyright notice and this permission notice shall be included in
+#   all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -35,6 +43,7 @@ import time
 import os
 
 from LXMF._version import __version__
+from LXMF import APP_NAME
 
 from RNS.vendor.configobj import ConfigObj
 
@@ -96,6 +105,11 @@ def apply_config():
         else:
             active_configuration["enable_propagation_node"] = False
 
+        if "propagation" in lxmd_config and "node_name" in lxmd_config["propagation"]:
+            active_configuration["node_name"] = lxmd_config["propagation"].get("node_name")
+        else:
+            active_configuration["node_name"] = None
+
         if "propagation" in lxmd_config and "auth_required" in lxmd_config["propagation"]:
             active_configuration["auth_required"] = lxmd_config["propagation"].as_bool("auth_required")
         else:
@@ -126,7 +140,7 @@ def apply_config():
             if active_configuration["message_storage_limit"] < 0.005:
                 active_configuration["message_storage_limit"] = 0.005
         else:
-            active_configuration["message_storage_limit"] = 2000
+            active_configuration["message_storage_limit"] = 500
         
         if "propagation" in lxmd_config and "propagation_transfer_max_accepted_size" in lxmd_config["propagation"]:
             active_configuration["propagation_transfer_max_accepted_size"] = lxmd_config["propagation"].as_float("propagation_transfer_max_accepted_size")
@@ -134,11 +148,76 @@ def apply_config():
                 active_configuration["propagation_transfer_max_accepted_size"] = 0.38
         else:
             active_configuration["propagation_transfer_max_accepted_size"] = 256
+
+        if "propagation" in lxmd_config and "propagation_message_max_accepted_size" in lxmd_config["propagation"]:
+            active_configuration["propagation_transfer_max_accepted_size"] = lxmd_config["propagation"].as_float("propagation_message_max_accepted_size")
+            if active_configuration["propagation_transfer_max_accepted_size"] < 0.38:
+                active_configuration["propagation_transfer_max_accepted_size"] = 0.38
+        else:
+            active_configuration["propagation_transfer_max_accepted_size"] = 256
+        
+        if "propagation" in lxmd_config and "propagation_sync_max_accepted_size" in lxmd_config["propagation"]:
+            active_configuration["propagation_sync_max_accepted_size"] = lxmd_config["propagation"].as_float("propagation_sync_max_accepted_size")
+            if active_configuration["propagation_sync_max_accepted_size"] < 0.38:
+                active_configuration["propagation_sync_max_accepted_size"] = 0.38
+        else:
+            active_configuration["propagation_sync_max_accepted_size"] = 256*40
+        
+        if "propagation" in lxmd_config and "propagation_stamp_cost_target" in lxmd_config["propagation"]:
+            active_configuration["propagation_stamp_cost_target"] = lxmd_config["propagation"].as_int("propagation_stamp_cost_target")
+            if active_configuration["propagation_stamp_cost_target"] < LXMF.LXMRouter.PROPAGATION_COST_MIN:
+                active_configuration["propagation_stamp_cost_target"] = LXMF.LXMRouter.PROPAGATION_COST_MIN
+        else:
+            active_configuration["propagation_stamp_cost_target"] = LXMF.LXMRouter.PROPAGATION_COST
+        
+        if "propagation" in lxmd_config and "propagation_stamp_cost_flexibility" in lxmd_config["propagation"]:
+            active_configuration["propagation_stamp_cost_flexibility"] = lxmd_config["propagation"].as_int("propagation_stamp_cost_flexibility")
+            if active_configuration["propagation_stamp_cost_flexibility"] < 0:
+                active_configuration["propagation_stamp_cost_flexibility"] = 0
+        else:
+            active_configuration["propagation_stamp_cost_flexibility"] = LXMF.LXMRouter.PROPAGATION_COST_FLEX
+        
+        if "propagation" in lxmd_config and "peering_cost" in lxmd_config["propagation"]:
+            active_configuration["peering_cost"] = lxmd_config["propagation"].as_int("peering_cost")
+            if active_configuration["peering_cost"] < 0:
+                active_configuration["peering_cost"] = 0
+        else:
+            active_configuration["peering_cost"] = LXMF.LXMRouter.PEERING_COST
+        
+        if "propagation" in lxmd_config and "remote_peering_cost_max" in lxmd_config["propagation"]:
+            active_configuration["remote_peering_cost_max"] = lxmd_config["propagation"].as_int("remote_peering_cost_max")
+            if active_configuration["remote_peering_cost_max"] < 0:
+                active_configuration["remote_peering_cost_max"] = 0
+        else:
+            active_configuration["remote_peering_cost_max"] = LXMF.LXMRouter.MAX_PEERING_COST
         
         if "propagation" in lxmd_config and "prioritise_destinations" in lxmd_config["propagation"]:
             active_configuration["prioritised_lxmf_destinations"] = lxmd_config["propagation"].as_list("prioritise_destinations")
         else:
             active_configuration["prioritised_lxmf_destinations"] = []
+        
+        if "propagation" in lxmd_config and "control_allowed" in lxmd_config["propagation"]:
+            active_configuration["control_allowed_identities"] = lxmd_config["propagation"].as_list("control_allowed")
+        else:
+            active_configuration["control_allowed_identities"] = []
+
+        if "propagation" in lxmd_config and "static_peers" in lxmd_config["propagation"]:
+            static_peers = lxmd_config["propagation"].as_list("static_peers")
+            active_configuration["static_peers"] = []
+            for static_peer in static_peers:
+                active_configuration["static_peers"].append(bytes.fromhex(static_peer))
+        else:
+            active_configuration["static_peers"] = []
+
+        if "propagation" in lxmd_config and "max_peers" in lxmd_config["propagation"]:
+            active_configuration["max_peers"] = lxmd_config["propagation"].as_int("max_peers")
+        else:
+            active_configuration["max_peers"] = None
+
+        if "propagation" in lxmd_config and "from_static_only" in lxmd_config["propagation"]:
+            active_configuration["from_static_only"] = lxmd_config["propagation"].as_bool("from_static_only")
+        else:
+            active_configuration["from_static_only"] = False
 
         # Load various settings
         if "logging" in lxmd_config and "loglevel" in lxmd_config["logging"]:
@@ -240,11 +319,8 @@ def program_setup(configdir = None, rnsconfigdir = None, run_pn = False, on_inbo
     storagedir   = configdir+"/storage"
     lxmdir       = storagedir+"/messages"
 
-    if not os.path.isdir(storagedir):
-        os.makedirs(storagedir)
-
-    if not os.path.isdir(lxmdir):
-        os.makedirs(lxmdir)
+    if not os.path.isdir(storagedir): os.makedirs(storagedir)
+    if not os.path.isdir(lxmdir):     os.makedirs(lxmdir)
 
     if not os.path.isfile(configpath):
         RNS.log("Could not load config file, creating default configuration file...")
@@ -272,6 +348,7 @@ def program_setup(configdir = None, rnsconfigdir = None, run_pn = False, on_inbo
     # Start Reticulum
     RNS.log("Substantiating Reticulum...")
     reticulum = RNS.Reticulum(configdir=rnsconfigdir, loglevel=targetloglevel, logdest=targetlogdest)
+    if targetlogdest == RNS.LOG_FILE: RNS.logfile = configdir+"/logfile"
 
     # Generate or load primary identity
     if os.path.isfile(identitypath):
@@ -304,8 +381,17 @@ def program_setup(configdir = None, rnsconfigdir = None, run_pn = False, on_inbo
         autopeer = active_configuration["autopeer"],
         autopeer_maxdepth = active_configuration["autopeer_maxdepth"],
         propagation_limit = active_configuration["propagation_transfer_max_accepted_size"],
+        propagation_cost = active_configuration["propagation_stamp_cost_target"],
+        propagation_cost_flexibility = active_configuration["propagation_stamp_cost_flexibility"],
+        peering_cost = active_configuration["peering_cost"],
+        max_peering_cost = active_configuration["remote_peering_cost_max"],
+        sync_limit = active_configuration["propagation_sync_max_accepted_size"],
         delivery_limit = active_configuration["delivery_transfer_max_accepted_size"],
-    )
+        max_peers = active_configuration["max_peers"],
+        static_peers = active_configuration["static_peers"],
+        from_static_only = active_configuration["from_static_only"],
+        name = active_configuration["node_name"])
+    
     message_router.register_delivery_callback(lxmf_delivery)
 
     for destination_hash in active_configuration["ignored_lxmf_destinations"]:
@@ -337,13 +423,16 @@ def program_setup(configdir = None, rnsconfigdir = None, run_pn = False, on_inbo
         for dest_str in active_configuration["prioritised_lxmf_destinations"]:
             try:
                 dest_hash = bytes.fromhex(dest_str)
-                if len(dest_hash) == RNS.Reticulum.TRUNCATED_HASHLENGTH//8:
-                    message_router.prioritise(dest_hash)
-
-            except Exception as e:
-                RNS.log("Cannot prioritise "+str(dest_str)+", it is not a valid destination hash", RNS.LOG_ERROR)
+                if len(dest_hash) == RNS.Reticulum.TRUNCATED_HASHLENGTH//8: message_router.prioritise(dest_hash)
+            except Exception as e: RNS.log("Cannot prioritise "+str(dest_str)+", it is not a valid destination hash", RNS.LOG_ERROR)
 
         message_router.enable_propagation()
+        
+        for ident_str in active_configuration["control_allowed_identities"]:
+            try:
+                identity_hash = bytes.fromhex(ident_str)
+                if len(identity_hash) == RNS.Reticulum.TRUNCATED_HASHLENGTH//8: message_router.allow_control(identity_hash)
+            except Exception as e: RNS.log(f"Cannot allow control from {ident_str}, it is not a valid identity hash", RNS.LOG_ERROR)
 
         RNS.log("LXMF Propagation Node started on "+RNS.prettyhexrep(message_router.propagation_destination.hash))
 
@@ -362,13 +451,13 @@ def jobs():
         try:
             if "peer_announce_interval" in active_configuration and active_configuration["peer_announce_interval"] != None:
                 if time.time() > last_peer_announce + active_configuration["peer_announce_interval"]:
-                    RNS.log("Sending announce for LXMF delivery destination", RNS.LOG_EXTREME)
+                    RNS.log("Sending announce for LXMF delivery destination", RNS.LOG_VERBOSE)
                     message_router.announce(lxmf_destination.hash)
                     last_peer_announce = time.time()
 
             if "node_announce_interval" in active_configuration and active_configuration["node_announce_interval"] != None:
                 if time.time() > last_node_announce + active_configuration["node_announce_interval"]:
-                    RNS.log("Sending announce for LXMF Propagation Node", RNS.LOG_EXTREME)
+                    RNS.log("Sending announce for LXMF Propagation Node", RNS.LOG_VERBOSE)
                     message_router.announce_propagation_node()
                     last_node_announce = time.time()
 
@@ -381,7 +470,7 @@ def deferred_start_jobs():
     global active_configuration, last_peer_announce, last_node_announce
     global message_router, lxmf_destination
     time.sleep(DEFFERED_JOBS_DELAY)
-    RNS.log("Running deferred start jobs")
+    RNS.log("Running deferred start jobs", RNS.LOG_DEBUG)
     if active_configuration["peer_announce_at_start"]:
         RNS.log("Sending announce for LXMF delivery destination", RNS.LOG_EXTREME)
         message_router.announce(lxmf_destination.hash)
@@ -394,6 +483,379 @@ def deferred_start_jobs():
     last_node_announce = time.time()
     threading.Thread(target=jobs, daemon=True).start()
 
+def _request_sync(identity, destination_hash, remote_identity, timeout=15, exit_on_fail=False):
+    control_destination = RNS.Destination(remote_identity, RNS.Destination.OUT, RNS.Destination.SINGLE, APP_NAME, "propagation", "control")
+
+    timeout = time.time()+timeout
+    def check_timeout():
+        if time.time() > timeout:
+            if exit_on_fail:
+                print("Requesting lxmd peer sync timed out, exiting now")
+                exit(200)
+            else:
+                return LXMF.LXMPeer.LXMPeer.ERROR_TIMEOUT
+        else:
+            time.sleep(0.1)
+
+    if not RNS.Transport.has_path(control_destination.hash):
+        RNS.Transport.request_path(control_destination.hash)
+        while not RNS.Transport.has_path(control_destination.hash):
+            tc = check_timeout()
+            if tc:
+                return tc
+
+    link = RNS.Link(control_destination)
+    while not link.status == RNS.Link.ACTIVE:
+        tc = check_timeout()
+        if tc:
+            return tc
+
+    link.identify(identity)
+    request_receipt = link.request(LXMF.LXMRouter.SYNC_REQUEST_PATH, data=destination_hash, response_callback=None, failed_callback=None)
+    while not request_receipt.get_status() == RNS.RequestReceipt.READY:
+        tc = check_timeout()
+        if tc:
+            return tc
+
+    link.teardown()
+    return request_receipt.get_response()
+
+
+def request_sync(target, remote=None, configdir=None, rnsconfigdir=None, verbosity=0, quietness=0, timeout=15, identity_path=None):
+    global configpath, identitypath, storagedir, lxmdir
+    global lxmd_config, active_configuration, targetloglevel
+
+    try:
+        peer_destination_hash = bytes.fromhex(target)
+        if len(peer_destination_hash) != RNS.Identity.TRUNCATED_HASHLENGTH//8: raise ValueError(f"Destination hash length must be {RNS.Identity.TRUNCATED_HASHLENGTH//8*2} characters")
+    except Exception as e:
+        print(f"Invalid peer destination hash: {e}")
+        exit(203)
+    remote
+    _remote_init(configdir, rnsconfigdir, verbosity, quietness, identity_path)
+    response = _request_sync(identity, peer_destination_hash, remote_identity=_get_target_identity(remote), timeout=timeout, exit_on_fail=True)
+
+    if response == LXMF.LXMPeer.LXMPeer.ERROR_NO_IDENTITY:
+        print("Remote received no identity")
+        exit(203)
+    elif response == LXMF.LXMPeer.LXMPeer.ERROR_NO_ACCESS:
+        print("Access denied")
+        exit(204)
+    elif response == LXMF.LXMPeer.LXMPeer.ERROR_INVALID_DATA:
+        print("Invalid data received by remote")
+        exit(205)
+    elif response == LXMF.LXMPeer.LXMPeer.ERROR_NOT_FOUND:
+        print("The requested peer was not found")
+        exit(206)
+    elif response == None:
+        print("Empty response received")
+        exit(207)
+    else:
+        print(f"Sync requested for peer {RNS.prettyhexrep(peer_destination_hash)}")
+        exit(0)
+
+def _request_unpeer(identity, destination_hash, remote_identity, timeout=15, exit_on_fail=False):
+    control_destination = RNS.Destination(remote_identity, RNS.Destination.OUT, RNS.Destination.SINGLE, APP_NAME, "propagation", "control")
+
+    timeout = time.time()+timeout
+    def check_timeout():
+        if time.time() > timeout:
+            if exit_on_fail:
+                print("Requesting lxmd peering break timed out, exiting now")
+                exit(200)
+            else: return LXMF.LXMPeer.LXMPeer.ERROR_TIMEOUT
+        else: time.sleep(0.1)
+
+    if not RNS.Transport.has_path(control_destination.hash):
+        RNS.Transport.request_path(control_destination.hash)
+        while not RNS.Transport.has_path(control_destination.hash):
+            tc = check_timeout()
+            if tc:
+                return tc
+
+    link = RNS.Link(control_destination)
+    while not link.status == RNS.Link.ACTIVE:
+        tc = check_timeout()
+        if tc:
+            return tc
+
+    link.identify(identity)
+    request_receipt = link.request(LXMF.LXMRouter.UNPEER_REQUEST_PATH, data=destination_hash, response_callback=None, failed_callback=None)
+    while not request_receipt.get_status() == RNS.RequestReceipt.READY:
+        tc = check_timeout()
+        if tc:
+            return tc
+
+    link.teardown()
+    return request_receipt.get_response()
+
+
+def request_unpeer(target, remote=None, configdir=None, rnsconfigdir=None, verbosity=0, quietness=0, timeout=15, identity_path=None):
+    global configpath, identitypath, storagedir, lxmdir
+    global lxmd_config, active_configuration, targetloglevel
+
+    try:
+        peer_destination_hash = bytes.fromhex(target)
+        if len(peer_destination_hash) != RNS.Identity.TRUNCATED_HASHLENGTH//8: raise ValueError(f"Destination hash length must be {RNS.Identity.TRUNCATED_HASHLENGTH//8*2} characters")
+    except Exception as e:
+        print(f"Invalid peer destination hash: {e}")
+        exit(203)
+    remote
+    _remote_init(configdir, rnsconfigdir, verbosity, quietness, identity_path)
+    response = _request_unpeer(identity, peer_destination_hash, remote_identity=_get_target_identity(remote), timeout=timeout, exit_on_fail=True)
+
+    if response == LXMF.LXMPeer.LXMPeer.ERROR_NO_IDENTITY:
+        print("Remote received no identity")
+        exit(203)
+    elif response == LXMF.LXMPeer.LXMPeer.ERROR_NO_ACCESS:
+        print("Access denied")
+        exit(204)
+    elif response == LXMF.LXMPeer.LXMPeer.ERROR_INVALID_DATA:
+        print("Invalid data received by remote")
+        exit(205)
+    elif response == LXMF.LXMPeer.LXMPeer.ERROR_NOT_FOUND:
+        print("The requested peer was not found")
+        exit(206)
+    elif response == None:
+        print("Empty response received")
+        exit(207)
+    else:
+        print(f"Broke peering with {RNS.prettyhexrep(peer_destination_hash)}")
+        exit(0)
+
+def query_status(identity, remote_identity=None, timeout=5, exit_on_fail=False):
+    if remote_identity == None: remote_identity = identity
+    control_destination = RNS.Destination(remote_identity, RNS.Destination.OUT, RNS.Destination.SINGLE, APP_NAME, "propagation", "control")
+
+    timeout = time.time()+timeout
+    def check_timeout():
+        if time.time() > timeout:
+            if exit_on_fail:
+                print("Getting lxmd statistics timed out, exiting now")
+                exit(200)
+            else: return LXMF.LXMPeer.LXMPeer.ERROR_TIMEOUT
+        else: time.sleep(0.1)
+
+    if not RNS.Transport.has_path(control_destination.hash):
+        RNS.Transport.request_path(control_destination.hash)
+        while not RNS.Transport.has_path(control_destination.hash):
+            tc = check_timeout()
+            if tc: return tc
+
+    link = RNS.Link(control_destination)
+    while not link.status == RNS.Link.ACTIVE:
+        tc = check_timeout()
+        if tc: return tc
+
+    link.identify(identity)
+    request_receipt = link.request(LXMF.LXMRouter.STATS_GET_PATH, data=None, response_callback=None, failed_callback=None)
+    while not request_receipt.get_status() == RNS.RequestReceipt.READY:
+        tc = check_timeout()
+        if tc: return tc
+
+    link.teardown()
+    return request_receipt.get_response()
+
+def get_status(remote=None, configdir=None, rnsconfigdir=None, verbosity=0, quietness=0, timeout=5,
+               show_status=False, show_peers=False, identity_path=None):
+
+    global identity
+    _remote_init(configdir, rnsconfigdir, verbosity, quietness, identity_path)
+    response = query_status(identity, remote_identity=_get_target_identity(remote), timeout=timeout, exit_on_fail=True)
+
+    if response == LXMF.LXMPeer.LXMPeer.ERROR_NO_IDENTITY:
+        print("Remote received no identity")
+        exit(203)
+    if response == LXMF.LXMPeer.LXMPeer.ERROR_NO_ACCESS:
+        print("Access denied")
+        exit(204)
+    elif response == None:
+        print("Empty response received")
+        exit(207)
+    else:
+        s = response
+        mutil = round((s["messagestore"]["bytes"]/s["messagestore"]["limit"])*100, 2)
+        ms_util = f"{mutil}%"
+        if s["from_static_only"]:
+            who_str = "static peers only"
+        else:
+            who_str = "all nodes"
+
+        available_peers = 0
+        unreachable_peers = 0
+        peered_incoming = 0
+        peered_outgoing = 0
+        peered_rx_bytes = 0
+        peered_tx_bytes = 0
+        for peer_id in s["peers"]:
+            p = s["peers"][peer_id]
+            pm = p["messages"]
+            peered_incoming += pm["incoming"]
+            peered_outgoing += pm["outgoing"]
+            peered_rx_bytes += p["rx_bytes"]
+            peered_tx_bytes += p["tx_bytes"]
+
+            if p["alive"]: available_peers   += 1
+            else:          unreachable_peers += 1
+
+        total_incoming = peered_incoming+s["unpeered_propagation_incoming"]+s["clients"]["client_propagation_messages_received"]
+        total_rx_bytes = peered_rx_bytes+s["unpeered_propagation_rx_bytes"]
+        if total_incoming != 0: df = round(peered_outgoing/total_incoming, 2)
+        else:                   df = 0
+
+        dhs = RNS.prettyhexrep(s["destination_hash"]); uts = RNS.prettytime(s["uptime"])
+        print(f"\nLXMF Propagation Node running on {dhs}, uptime is {uts}")
+
+        if show_status:
+            msb   = RNS.prettysize(s["messagestore"]["bytes"]); msl = RNS.prettysize(s["messagestore"]["limit"])
+            ptl   = RNS.prettysize(s["propagation_limit"]*1000); psl = RNS.prettysize(s["sync_limit"]*1000); 
+            uprx = RNS.prettysize(s["unpeered_propagation_rx_bytes"])
+            mscnt = s["messagestore"]["count"]; stp = s["total_peers"]; smp = s["max_peers"]; sdp = s["discovered_peers"]
+            ssp   = s["static_peers"]; cprr = s["clients"]["client_propagation_messages_received"]
+            cprs  = s["clients"]["client_propagation_messages_served"]; upi = s["unpeered_propagation_incoming"]
+            psc   = s["target_stamp_cost"]; scf = s["stamp_cost_flexibility"]
+            pc    = s["peering_cost"]; pcm = s["max_peering_cost"]
+            print(f"Messagestore contains {mscnt} messages, {msb} ({ms_util} utilised of {msl})")
+            print(f"Required propagation stamp cost is {psc}, flexibility is {scf}")
+            print(f"Peering cost is {pc}, max remote peering cost is {pcm}")
+            print(f"Accepting propagated messages from {who_str}")
+            print(f"{ptl} message limit, {psl} sync limit")
+            print(f"")
+            print(f"Peers   : {stp} total (peer limit is {smp})")
+            print(f"          {sdp} discovered, {ssp} static")
+            print(f"          {available_peers} available, {unreachable_peers} unreachable")
+            print(f"")
+            print(f"Traffic : {total_incoming} messages received in total ({RNS.prettysize(total_rx_bytes)})")
+            print(f"          {peered_incoming} messages received from peered nodes ({RNS.prettysize(peered_rx_bytes)})")
+            print(f"          {upi} messages received from unpeered nodes ({uprx})")
+            print(f"          {peered_outgoing} messages transferred to peered nodes ({RNS.prettysize(peered_tx_bytes)})")
+            print(f"          {cprr} propagation messages received directly from clients")
+            print(f"          {cprs} propagation messages served to clients")
+            print(f"          Distribution factor is {df}")
+            print(f"")
+
+        if show_peers:
+            if not show_status:
+                print("")
+
+            for peer_id in s["peers"]:
+                ind = "  "
+                p = s["peers"][peer_id]
+                if p["type"] == "static":
+                    t = "Static peer     "
+                elif p["type"] == "discovered":
+                    t = "Discovered peer "
+                else:
+                    t = "Unknown peer    "
+                a = "Available" if p["alive"] == True else "Unreachable"
+                h = max(time.time()-p["last_heard"], 0)
+                hops = p["network_distance"]
+                hs = "hops unknown" if hops == RNS.Transport.PATHFINDER_M else f"{hops} hop away" if hops == 1 else f"{hops} hops away"
+                pm = p["messages"]; pk = p["peering_key"]
+                pc = p["peering_cost"]; psc = p["target_stamp_cost"]; psf = p["stamp_cost_flexibility"]
+                if pc == None: pc = "unknown"
+                if psc == None: psc = "unknown"
+                if psf == None: psf = "unknown"
+                if pk == None: pk = "Not generated"
+                else:          pk = f"Generated, value is {pk}"
+                if p["last_sync_attempt"] != 0:
+                    lsa = p["last_sync_attempt"]
+                    ls = f"last synced {RNS.prettytime(max(time.time()-lsa, 0))} ago"
+                else:
+                    ls = "never synced"
+
+                sstr = RNS.prettyspeed(p["str"]); sler = RNS.prettyspeed(p["ler"])
+                stl = RNS.prettysize(p["transfer_limit"]*1000) if p["transfer_limit"] else "Unknown"
+                ssl = RNS.prettysize(p["sync_limit"]*1000) if p["sync_limit"] else "unknown"
+                srxb = RNS.prettysize(p["rx_bytes"]); stxb = RNS.prettysize(p["tx_bytes"]); pmo = pm["offered"]; pmout = pm["outgoing"]
+                pmi  = pm["incoming"]; pmuh = pm["unhandled"]; ar = round(p["acceptance_rate"]*100, 2)
+                if p["name"] == None: nn = ""
+                else: nn = p["name"].strip().replace("\n", "").replace("\r", "")
+                if len(nn) > 45: nn = f"{nn[:45]}..."
+                print(f"{ind}{t}{RNS.prettyhexrep(peer_id)}")
+                if len(nn): print(f"{ind*2}Name       : {nn}")
+                print(f"{ind*2}Status     : {a}, {hs}, last heard {RNS.prettytime(h)} ago")
+                print(f"{ind*2}Costs      : Propagation {psc} (flex {psf}), peering {pc}")
+                print(f"{ind*2}Sync key   : {pk}")
+                print(f"{ind*2}Speeds     : {sstr} STR, {sler} LER")
+                print(f"{ind*2}Limits     : {stl} message limit, {ssl} sync limit")
+                print(f"{ind*2}Messages   : {pmo} offered, {pmout} outgoing, {pmi} incoming, {ar}% acceptance rate")
+                print(f"{ind*2}Traffic    : {srxb} received, {stxb} sent")
+                ms = "" if pm["unhandled"] == 1 else "s"
+                print(f"{ind*2}Sync state : {pmuh} unhandled message{ms}, {ls}")
+                print("")
+
+def _get_target_identity(remote=None, timeout=5):
+    global identity
+    timeout = time.time()+timeout
+    def check_timeout():
+        if time.time() > timeout:
+            print("Resolving remote identity timed out, exiting now")
+            exit(200)
+        else: time.sleep(0.1)
+
+    if remote == None: return identity
+    else:
+        try:
+            destination_hash = bytes.fromhex(remote)
+            if len(destination_hash) != RNS.Identity.TRUNCATED_HASHLENGTH//8: raise ValueError(f"Destination hash length must be {RNS.Identity.TRUNCATED_HASHLENGTH//8*2} characters")
+        except Exception as e:
+            print(f"Invalid remote destination hash: {e}")
+            exit(203)
+
+        remote_identity = RNS.Identity.recall(destination_hash)
+        if remote_identity: return remote_identity
+        else:
+            if not RNS.Transport.has_path(destination_hash):
+                RNS.Transport.request_path(destination_hash)
+                while not RNS.Transport.has_path(destination_hash):
+                    tc = check_timeout()
+                    if tc: return tc
+
+            return RNS.Identity.recall(destination_hash)
+
+def _remote_init(configdir=None, rnsconfigdir=None, verbosity=0, quietness=0, identity_path=None):
+    global configpath, identitypath, storagedir, lxmdir, identity
+    global lxmd_config, active_configuration, targetloglevel
+    targetlogdest  = RNS.LOG_STDOUT
+
+    if identity_path == None:
+        if configdir == None:
+            if os.path.isdir("/etc/lxmd") and os.path.isfile("/etc/lxmd/config"): configdir = "/etc/lxmd"
+            elif os.path.isdir(RNS.Reticulum.userdir+"/.config/lxmd") and os.path.isfile(Reticulum.userdir+"/.config/lxmd/config"): configdir = RNS.Reticulum.userdir+"/.config/lxmd"
+            else: configdir = RNS.Reticulum.userdir+"/.lxmd"
+
+        configpath   = configdir+"/config"
+        identitypath = configdir+"/identity"
+        identity = None
+
+        if not os.path.isdir(configdir):
+            RNS.log("Specified configuration directory does not exist, exiting now", RNS.LOG_ERROR)
+            exit(201)
+        if not os.path.isfile(identitypath):
+            RNS.log("Identity file not found in specified configuration directory, exiting now", RNS.LOG_ERROR)
+            exit(202)
+        else:
+            identity = RNS.Identity.from_file(identitypath)
+            if identity == None:
+                RNS.log("Could not load the Primary Identity from "+identitypath, RNS.LOG_ERROR)
+                exit(4)
+
+    else:
+        if not os.path.isfile(identity_path):
+            RNS.log("Identity file not found in specified configuration directory, exiting now", RNS.LOG_ERROR)
+            exit(202)
+        else:
+            identity = RNS.Identity.from_file(identity_path)
+            if identity == None:
+                RNS.log("Could not load the Primary Identity from "+identity_path, RNS.LOG_ERROR)
+                exit(4)        
+
+    if targetloglevel == None: targetloglevel = 3
+    if verbosity != 0 or quietness != 0: targetloglevel = targetloglevel+verbosity-quietness
+    
+    reticulum = RNS.Reticulum(configdir=rnsconfigdir, loglevel=targetloglevel, logdest=targetlogdest)
+
 def main():
     try:
         parser = argparse.ArgumentParser(description="Lightweight Extensible Messaging Daemon")
@@ -404,6 +866,13 @@ def main():
         parser.add_argument("-v", "--verbose", action="count", default=0)
         parser.add_argument("-q", "--quiet", action="count", default=0)
         parser.add_argument("-s", "--service", action="store_true", default=False, help="lxmd is running as a service and should log to file")
+        parser.add_argument("--status", action="store_true", default=False, help="display node status")
+        parser.add_argument("--peers", action="store_true", default=False, help="display peered nodes")
+        parser.add_argument("--sync", action="store", default=None, help="request a sync with the specified peer", type=str)
+        parser.add_argument("-b", "--break", dest="unpeer", action="store", default=None, help="break peering with the specified peer", type=str)
+        parser.add_argument("--timeout", action="store", default=None, help="timeout in seconds for query operations", type=float)
+        parser.add_argument("-r", "--remote", action="store", default=None, help="remote propagation node destination hash", type=str)
+        parser.add_argument("--identity", action="store", default=None, help="path to identity used for remote requests", type=str)
         parser.add_argument("--exampleconfig", action="store_true", default=False, help="print verbose configuration example to stdout and exit")
         parser.add_argument("--version", action="version", version="lxmd {version}".format(version=__version__))
         
@@ -413,15 +882,50 @@ def main():
             print(__default_lxmd_config__)
             exit()
 
-        program_setup(
-            configdir = args.config,
-            rnsconfigdir=args.rnsconfig,
-            run_pn=args.propagation_node,
-            on_inbound=args.on_inbound,
-            verbosity=args.verbose,
-            quietness=args.quiet,
-            service=args.service
-        )
+        if args.status or args.peers:
+            if not args.timeout: args.timeout = 5
+            get_status(configdir = args.config,
+                       rnsconfigdir=args.rnsconfig,
+                       verbosity=args.verbose,
+                       quietness=args.quiet,
+                       timeout=args.timeout,
+                       show_status=args.status,
+                       show_peers=args.peers,
+                       identity_path=args.identity,
+                       remote=args.remote)
+            exit()
+
+        if args.sync:
+            if not args.timeout: args.timeout = 10
+            request_sync(target=args.sync,
+                         configdir = args.config,
+                         rnsconfigdir=args.rnsconfig,
+                         verbosity=args.verbose,
+                         quietness=args.quiet,
+                         timeout=args.timeout,
+                         identity_path=args.identity,
+                         remote=args.remote)
+            exit()
+
+        if args.unpeer:
+            if not args.timeout: args.timeout = 10
+            request_unpeer(target=args.unpeer,
+                           configdir = args.config,
+                           rnsconfigdir=args.rnsconfig,
+                           verbosity=args.verbose,
+                           quietness=args.quiet,
+                           timeout=args.timeout,
+                           identity_path=args.identity,
+                           remote=args.remote)
+            exit()
+
+        program_setup(configdir = args.config,
+                      rnsconfigdir=args.rnsconfig,
+                      run_pn=args.propagation_node,
+                      on_inbound=args.on_inbound,
+                      verbosity=args.verbose,
+                      quietness=args.quiet,
+                      service=args.service)
 
     except KeyboardInterrupt:
         print("")
@@ -437,6 +941,17 @@ __default_lxmd_config__ = """# This is an example LXM Daemon config file.
 
 enable_node = no
 
+# You can specify identity hashes for remotes
+# that are allowed to control and query status
+# for this propagation node.
+
+# control_allowed = 7d7e542829b40f32364499b27438dba8, 437229f8e29598b2282b88bad5e44698
+
+# An optional name for this node, included
+# in announces.
+
+# node_name = Anonymous Propagation Node
+
 # Automatic announce interval in minutes.
 # 6 hours by default.
 
@@ -454,20 +969,7 @@ autopeer = yes
 # The maximum peering depth (in hops) for
 # automatically peered nodes.
 
-autopeer_maxdepth = 4
-
-# The maximum accepted transfer size per in-
-# coming propagation transfer, in kilobytes.
-# This also sets the upper limit for the size
-# of single messages accepted onto this node.
-#
-# If a node wants to propagate a larger number
-# of messages to this node, than what can fit
-# within this limit, it will prioritise sending
-# the smallest messages first, and try again
-# with any remaining messages at a later point.
-
-propagation_transfer_max_accepted_size = 256
+autopeer_maxdepth = 6
 
 # The maximum amount of storage to use for
 # the LXMF Propagation Node message store,
@@ -477,9 +979,57 @@ propagation_transfer_max_accepted_size = 256
 # LXMF prioritises keeping messages that are
 # new and small. Large and old messages will
 # be removed first. This setting is optional
-# and defaults to 2 gigabytes.
+# and defaults to 500 megabytes.
 
-# message_storage_limit = 2000
+# message_storage_limit = 500
+
+# The maximum accepted transfer size per in-
+# coming propagation message, in kilobytes.
+# This sets the upper limit for the size of
+# single messages accepted onto this node.
+
+# propagation_message_max_accepted_size = 256
+
+# The maximum accepted transfer size per in-
+# coming propagation node sync.
+#
+# If a node wants to propagate a larger number
+# of messages to this node, than what can fit
+# within this limit, it will prioritise sending
+# the smallest messages first, and try again
+# with any remaining messages at a later point.
+
+# propagation_sync_max_accepted_size = 10240
+
+# You can configure the target stamp cost
+# required to deliver messages via this node.
+
+# propagation_stamp_cost_target = 16
+
+# If set higher than 0, the stamp cost flexi-
+# bility option will make this node accept
+# messages with a lower stamp cost than the
+# target from other propagation nodes (but
+# not from peers directly). This allows the
+# network to gradually adjust stamp cost.
+
+# propagation_stamp_cost_flexibility = 3
+
+# The peering_cost option configures the target
+# value required for a remote node to peer with
+# and deliver messages to this node.
+
+# peering_cost = 18
+
+# You can configure the maximum peering cost
+# of remote nodes that this node will peer with.
+# Setting this to a higher number will allow
+# this node to peer with other nodes requiring
+# a higher peering key value, but will require
+# more computation time during initial peering
+# when generating the peering key.
+
+# remote_peering_cost_max = 26
 
 # You can tell the LXMF message router to
 # prioritise storage for one or more
@@ -491,6 +1041,25 @@ propagation_transfer_max_accepted_size = 256
 
 # prioritise_destinations = 41d20c727598a3fbbdf9106133a3a0ed, d924b81822ca24e68e2effea99bcb8cf
 
+# You can configure the maximum number of other
+# propagation nodes that this node will peer
+# with automatically. The default is 20.
+
+# max_peers = 20
+
+# You can configure a list of static propagation
+# node peers, that this node will always be
+# peered with, by specifying a list of
+# destination hashes.
+
+# static_peers = e17f833c4ddf8890dd3a79a6fea8161d, 5a2d0029b6e5ec87020abaea0d746da4
+
+# You can configure the propagation node to
+# only accept incoming propagation messages
+# from configured static peers.
+
+# from_static_only = True
+
 # By default, any destination is allowed to
 # connect and download messages, but you can
 # optionally restrict this. If you enable

LXMF/_version.py

@@ -1 +1 @@
-__version__ = "0.6.0"
+__version__ = "0.9.4"

MIRROR.md

@@ -0,0 +1,33 @@
+This repository is a public mirror. All potential future development is happening elsewhere.
+
+I am stepping back from all public-facing interaction with this project. Reticulum has always been primarily my work, and continuing in the current public, internet-facing model is no longer sustainable.
+
+The software remains available for use as-is. Occasional updates may appear at unpredictable intervals, but there will be no support, no responses to issues, no discussions, and no community management in this or any other public venue. If it doesn't work for you, it doesn't work. That is the entire extent of available troubleshooting assistance I can offer you.
+
+If you've followed this project for a while, you already know what this means. You know who designed, wrote and tested this, and you know how many years of my life it took. You'll also know about both my particular challenges and strengths, and how I believe anything worth building needs to be built and  maintained with our own hands.
+
+Seven months ago, I said I needed to step back, that I was exhausted, and that I needed to recover. I believed a public resolve would be enough to effectuate that, but while striving to get just a few more useful features and protocols out, the unproductive requests and demands also ramped up, and I got pulled back into the same patterns and draining interactions that I'd explicitly said I couldn't sustain anymore.
+
+So here's what you might have already guessed: I'm done playing the game by rules I can't win at.
+
+Everything you need is right here, and by any sensible measure, it's done. Anyone who wants to invest the time, skill and persistence can build on it, or completely re-imagine it with different priorities. That was always the point.
+
+The people who actually contributed - you know who you are, and you know I mean it when I say: Thank you. All of you who've used this to build something real - that was the goal, and you did it without needing me to hold your hand.
+
+The rest of you: You have what you need. Use it or don't. I am not going to be the person who explains it to you anymore.
+
+This is not a temporary break. It's not "see you after some rest", but a recognition that the current model is fundamentally incompatible with my life, my health, and my reality.
+
+If you want to support continued work, you can do so at the donation links listed in this repository. But please understand, that this is not purchasing support or guaranteeing updates. It is support for work that happens on my timeline, according to my capacity, which at the moment is not what it was.
+
+If you want Reticulum to continue evolving, you have the power to make that happen. The protocol is public domain. The code is open source. Everything you need is right here. I've provided the tools, but building what comes next is not my responsibility anymore. It's yours.
+
+To the small group of people who has actually been here, and understood what this work was and what it cost - you already know where to find me if it actually matters.
+
+To everyone else: This is where we part ways. No hard feelings. It's just time.
+
+---
+
+असतो मा सद्गमय
+तमसो मा ज्योतिर्गमय
+मृत्योर्मा अमृतं गमय

Makefile

@@ -16,7 +16,12 @@ create_symlinks:
 	-ln -s ../../LXMF ./LXMF/Utilities/LXMF
 
 build_wheel:
-	python3 setup.py sdist bdist_wheel
+	python3 setup.py bdist_wheel
+
+build_sdist:
+	python3 setup.py sdist
+
+build_spkg: remove_symlinks build_sdist create_symlinks
 
 release: remove_symlinks build_wheel create_symlinks
 

README.md

@@ -1,5 +1,7 @@
 # Lightweight Extensible Message Format
 
+*This repository is [a public mirror](./MIRROR.md). All development is happening elsewhere.*
+
 LXMF is a simple and flexible messaging format and delivery protocol that allows a wide variety of implementations, while using as little bandwidth as possible. It is built on top of [Reticulum](https://reticulum.network) and offers zero-conf message routing, end-to-end encryption and Forward Secrecy, and can be transported over any kind of medium that Reticulum supports.
 
 LXMF is efficient enough that it can deliver messages over extremely low-bandwidth systems such as packet radio or LoRa. Encrypted LXMF messages can also be encoded as QR-codes or text-based URIs, allowing completely analog *paper message* transport.
@@ -12,6 +14,7 @@ User-facing clients built on LXMF include:
 
 Community-provided tools and utilities for LXMF include:
 
+- [LXMFy](https://lxmfy.quad4.io/)
 - [LXMF-Bot](https://github.com/randogoth/lxmf-bot)
 - [LXMF Messageboard](https://github.com/chengtripp/lxmf_messageboard)
 - [LXMEvent](https://github.com/faragher/LXMEvent)
@@ -182,6 +185,26 @@ options:
 
 Or run `lxmd --exampleconfig` to generate a commented example configuration documenting all the available configuration directives.
 
+## Support LXMF Development
+You can help support the continued development of open, free and private communications systems by donating via one of the following channels:
+
+- Monero:
+  ```
+  84FpY1QbxHcgdseePYNmhTHcrgMX4nFfBYtz2GKYToqHVVhJp8Eaw1Z1EedRnKD19b3B8NiLCGVxzKV17UMmmeEsCrPyA5w
+  ```
+- Bitcoin
+  ```
+  bc1pgqgu8h8xvj4jtafslq396v7ju7hkgymyrzyqft4llfslz5vp99psqfk3a6
+  ```
+- Ethereum
+  ```
+  0x91C421DdfB8a30a49A71d63447ddb54cEBe3465E
+  ```
+- Liberapay: https://liberapay.com/Reticulum/
+
+- Ko-Fi: https://ko-fi.com/markqvist
+
+
 ## Caveat Emptor
 
 LXMF is beta software, and should be considered experimental. While it has been built with cryptography best practices very foremost in mind, it _has not_ been externally security audited, and there could very well be privacy-breaking bugs. If you want to help out, or help sponsor an audit, please do get in touch.

Zen of Reticulum.md

@@ -0,0 +1,415 @@
+# Zen of Reticulum
+
+## I: The Illusion Of The Center
+
+For the better part of a generation, we have been taught to visualize the digital world through the lens of hierarchy. The mental maps we carry are dominated by a single, misleading image: **The Cloud**.
+
+We imagine the network as a vast, ethereal space "up there" or "out there". A centralized repository of services and data to which we, the lowly clients, must connect. We build our software with this assumption hardcoded into our logic: *There is a server. The server has the authority. The server knows the way. I must find the server to function*.
+
+This is the Client-Server mental model, and it is the primary obstacle to understanding Reticulum.
+
+### Fallacy Of The Cloud
+
+The first step in the Zen of Reticulum is to realize that *there is no cloud*. There is only other people's computers. When you build for the cloud, you are building *for* a landlord. You are accepting that your application's existence is conditional on the permission, uptime, and continued goodwill of a central authority.
+
+In Reticulum, you must shift your thinking from "connecting to" to "being among". Reticulum is not a service you subscribe to - *it is a fabric you inhabit*. There is no "up there". There is only *here* and *there*, and the space between them is peer-to-peer.
+
+### Decentralization Or Uncentralizability?
+
+It is common to hear the word "decentralized" thrown around in modern tech circles. But often, this is merely a marketing term for "slightly distributed centralization". A blockchain with a few dominant miners, or a federated protocol with a few giant servers. *In practice*, it's still centralized. It simply has a few centers instead of one.
+
+Reticulum goes further. It wants **Uncentralizability**.
+
+This is not a wishful political stance, but a foundational mathematical characteristic of the protocol, onto which everything else has been built. Reticulum assumes that every peer on the network is potentially hostile, and every link is potentially compromised. It is designed with no "privileged" nodes. While some nodes may act as Transport Instances - forwarding traffic for others - they do so *blindly*, and they only know about their immediate surroundings, and nothing more. They route based on cryptographic proofs, not on administrative privilege. They cannot see who is talking to whom, nor can they selectively manipulate traffic without breaking their own ability to route entirely.
+
+The system is designed to make hierarchy structurally impossible. You cannot hijack an address, because there is no central registry to hijack. You cannot block a user, because there is no central switch to flip. You can offer paths through the network, but you can't force anyone to use them.
+
+### Death To The Address
+
+To break free of the center, you must also let go of the concept of the "Address".
+
+In the IP world, an address is a location. It is a coordinate in a *deeply hierarchical* and static grid. If you move your computer to a different house, your address changes. If your router reboots, your address might change. Your *identity* is bound to your *location*, and therefore, it is fragile, and easily controlled.
+
+Reticulum abolishes this link between *Identity* and *Location*.
+
+In Reticulum, an address is not a place; it is a **Hash of an Identity**. It is a cryptographic representation of *who* you are, not *where* you are. Because of this, your address is portable. You can take a laptop from a WiFi cafe in Berlin, to a LoRa mesh in the mountains, to a packet radio link on a boat, and your "address" - your *Destination Hash* - never changes.
+
+The network does not route to a place; it routes to a *person* (or a machine). When you send a packet, you are not targeting a coordinate in a grid; you are encrypting a message for a specific entity. The network dynamically discovers where that entity currently resides, and it does so in a way where no one really knows where that entity is actually located physically.
+
+**Consider:**
+
+- **The Old Way:** *"I am at `192.168.1.5`. Come find me"*.
+- **The Zen Way:** *"I am `<327c1b2f87c9353e01769b01090b18f2>`. Wherever I am, my peers can reach me"*.
+
+Once you stop thinking about servers and start thinking about portable identities, where everyone can always reach everyone else directly, the illusion of the center fades away. You realize there *is* no center holding the network together. No coordinators or bureaucrats required. The network is simply the sum of its peers, communicating directly, sovereignly, and without a master.
+
+
+## II: Physics Of Trust
+*Paranoia Is A Great Design Principle*
+
+If we accept that there is no center - that the network is a chaotic, peer-to-peer mesh - we are forced to confront a terrifying reality: **There is no one guarding the door**.
+
+In the traditional networking mindset, we rely on the concept of the "trusted core". We assume our local coffee shop WiFi is safe, or that the backbone providers are neutral custodians. We build our security like a castle: strong walls on the outside, soft and trusting on the inside. We use encryption only when we step out into the "wild" internet.
+
+### Hostile Environments
+
+The Zen of Reticulum requires you to invert this. You must assume that *every* environment is hostile. This isn't cynicism, just uncaring physics.
+
+When you transmit information over radio waves, you are shouting into a crowded room. Anyone can listen. When you traverse the internet, your packets pass through routers controlled by strangers, corporations, and state actors. Assuming privacy in this environment without cryptographic protection is not optimism but gross negligence.
+
+Reticulum is built on the premise that every link is tapped, and every peer is a potential adversary. If your system cannot survive an adversary owning the physical layer, it cannot survive at all.
+
+But this is the paradox: By assuming the network is hostile, you make it safe. When you accept the dangers for what they are, they become manageable. When you stop trusting the infrastructure and start trusting the math, you eliminate the single point of failure: Human integrity.
+
+### Encryption Is Not A Feature
+
+In the world of TCP/IP, encryption is an afterthought. It is a layer we slap on top of the protocol (HTTPS, TLS) to patch the security holes of the original design. It is a "feature" you sometimes *enable* for "sensitive data". This is fundamentally flawed, since all data is sensitive.
+
+In Reticulum, encryption is **gravity**.
+
+It is not optional. It is not a plugin. It is the *fundamental force that allows the network to exist*. If you were to strip the encryption from Reticulum, the routing would break. The Transport system uses cryptographic signatures and entropy to verify paths and pass information. If packets were plaintext, intermediate nodes could not prove that a route was valid, nor could endpoints prevent spoofing or tampering.
+
+In Reticulum, the entropy of the encrypted packet *is* the routing logic.
+
+To ask for a version of Reticulum without encryption is like asking for a version of the ocean without liquid. You are not asking for a feature change; you're asking for a different physical universe. We design for a universe where information has mass, structure, and integrity.
+
+### Zero-Trust Architectures
+
+We must unlearn our reliance on **Institutional Trust**.
+
+For decades, we have been trained to trust authorities. We trust a website because a chain of Certificate Authorities (companies we don't know) vouches for it. We trust an app because it is in an app store (run by a corporation we don't control). We trust a message because it comes from a phone number assigned by a telecom. Yet, everything in our digital information sphere today is more untrustworthy and risky than a medieval second-hand underwear market.
+
+Reticulum replaces institutional trust with **Cryptographic Proof**.
+
+In Reticulum, you do not trust a node because it has a nice hostname or because it is listed in a directory. You trust it because it holds the private key corresponding to the Destination Hash you are communicating with. This trust is binary, mathematical, and **absolute**. Either the signature matches, or it does not. There is no "maybe".
+
+This shift moves the power from the institution to the individual. You become the ultimate arbiter of your own trust relationships. You decide which keys to accept, which paths to follow, and which identities to recognize.
+
+**Consider:**
+
+- **The Old Way:** *"I trust this site because the browser says the lock icon is green"*.
+- **The Zen Way:** *"I trust this destination because I have verified its hash fingerprint out-of-band, and the math confirms the signature"*.
+
+When you internalize the Physics of Trust, you stop looking for protection from firewalls, VPNs, and Terms of Service agreements. You realize that true security comes from the design of the protocol itself. You can stop trusting the cloud, and you start trusting the code - because you can verify it yourself.
+
+
+## III: Merits Of Scarcity
+*Every Bit Counts*
+
+We have grown addicted to abundance. In the modern digital ecosystem, bandwidth is treated as an endless, flat ocean. We stream high-definition video without a thought, we ship entire libraries of code just to render a single button, and we measure performance in gigabits per second. This abundance has hollowed out our craft. When constraints vanish, efficiency dies, and with it, a certain kind of Clarity and Quality.
+
+Reticulum asks you to step out of the ocean and onto the tightrope.
+
+### The Bandwidth Fallacy
+
+The Zen of Reticulum requires the realization that **5 bits per second is a valid speed**.
+
+To a modern developer, this sounds like paralysis. But there is a profound freedom in limits: When you have a gigabit connection, you can be incredibly sloppy. You can be wasteful. You can push your problems onto the infrastructure. *"It’s slow? Get a faster router"*.
+
+But on a high-latency, low-bandwidth link (be it a noisy HF radio channel or a tenuous LoRa hop) you cannot push problems anywhere. You must solve them. The network does not negotiate with waste.
+
+This forces a shift from consumption to interaction. You are no longer, then, consuming a service provided by a fat pipe; you are engaging in a careful negotiation with the physical medium. The medium becomes a partner in the conversation, not just a dumb conduit. You suddenly need to *understand the world to be in it*.
+
+### Cost Of A Byte
+
+In a scarce economy, a byte is not just data, but energy, time, and space.
+
+Every byte you transmit consumes battery life on a solar-powered node. It occupies valuable airtime that could have been used by another peer. It represents a measurable slice of the electromagnetic spectrum.
+
+When you internalize this, you begin to write code differently. You stop asking, "How much data can I send?" and start asking, "What is the *minimum* amount of information required to convey this intent? How can I best utilize my informational entropy?"
+
+This is where the elegance of Reticulum shines. The protocol is designed to strip away the non-essential. A link establishment takes three very small packets. A destination hash fits in 16 bytes. The overhead is vanishingly small, leaving almost the entire channel for the message itself.
+
+**Consider:**
+
+- **The Old Way:** *"I need to send a status update. I'll send a JSON object with metadata, timestamps, and user profile info (15KB)."*
+- **The Zen Way:** *"I need to send a status update. I'll send a single byte representing the state code. The context is already known."*
+
+This is of course optimization, but more importantly, *it is a form of respect*. Efficiency in a shared medium is an act of stewardship. By taking only what you need from the network, you leave room for others. The network listens to those who speak with purpose.
+
+### Flow & Time
+
+Scarcity also teaches us about time. We have become addicted to the *synchronous* now - the instant ping, the real-time stream. But Reticulum embraces *asynchronous* time.
+
+When links are intermittent and latency is measured in minutes or hours, "real-time" is an illusion. Reticulum doesn't encourage **Store and Forward** as a mere fallback, but as a primary mode of existence. You write a message, it propagates when it can, and it arrives when it arrives.
+
+This changes the psychological texture of communication. It removes the anxiety of the immediate response. It allows for contemplation. You are not demanding the recipient's attention *right now*; you are placing a gift in their path, to be found when they are ready.
+
+By designing for delay, you design for resilience. You are no longer building a house of cards that collapses when a single packet drops. You are building a stone arch that distributes the load *over time*.
+
+### Liberation From Limits
+
+There is a strange optimism in scarcity. When you are forced to work within strict constraints, you are forced to prioritize. *You* must decide what truly matters. *That* is the real core of agency.
+
+In the infinite fantasy world of The Cloud, everything is urgent, so nothing is. In the economy of Reticulum, the cost of transmission forces you to weigh the value of your message. Do you really need to send that heart beat? Is that photo essential?
+
+When you strip away the noise, what remains is *signal*.
+
+This discipline creates a different kind of developer. It creates a craftsman who understands that the best code is the code you don't have to write. It creates a user who understands that the most powerful message is the one that is *understood*, not the one that is loudest. In the world of Reticulum, you are not a mere consumer of bandwidth; you are an architect of intent.
+
+
+## IV: Sovereignty Through Infrastructure
+**Be Your Own Network**
+
+We live in an era of digital tenancy. We lease our connectivity from ISPs. We rent our storage from cloud providers. We even borrow our identity from social media platforms. We are tenants in a house we did not build, governed by rules we did not write, subject to eviction at the whim of a landlord who has never met us.
+
+The Zen of Reticulum is the realization that you *can* own the house.
+
+### A Carrier-Grade Fallacy
+
+For decades, we have been gaslit into believing that networking is really not just hard, but impossible. It is presented as a dark art reserved for telcos and billionaires, requiring millions of dollars of fiber optics, climate-controlled data centers, and armies of engineers. We are told that building reliable infrastructure is "too complex" for the individual or small organization.
+
+This is a big, fat lie.
+
+Physics is simple. A radio wave needs a transmitter and a receiver. A packet needs a path. The "complexity" of the modern internet is largely bureaucratic - a mountain of billing systems, regulatory capture, and legacy cruft designed to keep the gatekeepers in power.
+
+Reticulum strips away the bureaucracy. It runs on hardware that costs the price of a dinner. It runs on spectrum that is free to use. It demonstrates that a robust, planetary-scale network does not require a Fortune 500 company. It requires only the will to deploy, and the distributed, uncoordinated efforts of many individuals.
+
+### Personal Infrastructure
+
+This is where the rubber meets the road. You can read about Reticulum, you can understand the theory, but the insights only arrive when you plug in a radio and run a Transport Node. Suddenly, you are no longer a consumer. You're an operator.
+
+This shift is subtle but profound. When you run your own infrastructure, the network ceases to be a service that is provided *to* you. It becomes a space that you *inhabit*. You become responsible for the flow of information. You gain an intimate understanding of the medium - the way the weather affects the radio waves, the way the topology changes, the way the packets dance through the ether.
+
+There is a quiet competence that comes from this. You stop asking "Is the internet down?" and start asking "Is *my* links up?" You stop waiting for a technician and start checking the logs. This is a form of strength. To understand the system that carries your words is to be free from the mystery that keeps you dependent.
+
+### The Ability To Disconnect
+
+Why go to the trouble? Why buy the radio, write the config, and leave the Pi running in the corner?
+
+Because the old, centralized network is fragile. And because most of us doesn't even really want to be there anymore.
+
+The internet we rely on today is a chain of single points of failure. Cut the undersea cable, and a continent goes dark. Shut down the power grid, and the cloud evaporates. Deprioritize the "wrong" traffic, and the flow of information is strangled.
+
+Sovereignty is the ability to survive the cut, whether or not that cut was an accident or on purpose.
+
+When you build your own infrastructure, you build a lifeline. Reticulum is designed to function over media that the traditional internet cannot touch - bare wires, battery-powered radios, ad-hoc WiFi meshes. When the grid fails, or the censors arrive, or the bill goes unpaid, your Reticulum network continues to hum.
+
+This is not about "dropping out" of society. It is about building a substrate on which an actual *Society* can function.
+
+**Consider:**
+
+- **The Old Way:** "My connection is slow. I should call my ISP and complain."
+- **The Zen Way:** "The path is noisy. I will adjust the antenna or find a better route."
+
+By taking ownership of the infrastructure, you take ownership of your voice. You stop shouting into someone else's megaphone and start building your own. The network is no longer something that happens to you; it is something you make happen.
+
+
+# V: Identity and Nomadism
+**A Fluid Self**
+
+In the old world, you are defined by your coordinates. If you are at `34.109.71.5`, you're *here*. If you unplug the cable and walk down the street, you vanish. Your digital self evaporates because it was tethered to the wall. You are a ghost in the endless machinations of gears, levers and transistors, bound to the hardware, and those that own it.
+
+This creates a subtle, constant anxiety. We are terrified of disconnecting because, in the architecture of the old web, disconnecting is a kind of death.
+
+The Zen of Reticulum offers a different way to be.
+
+### Portable Existence
+
+In Reticulum, your identity is not a location, or a username granted by a service. It is a cryptographic key - a complex, unique mathematical signature that exists independently of the physical world. You can carry it only in your mind, if you want to.
+
+Think of it less like a street address and more like a name. *A true name*.
+
+If you travel from Berlin to Tokyo, you do not change your name. You are still you. The people who know you can still recognize you. Reticulum applies this principle to the network layer. Your Destination Hash is **invariant**. It travels with you, stored securely on your device, *immutable as a stone*.
+
+This changes the relationship between you and the machine. You are not "logged into" the network via a specific gateway. You *are* the endpoint. The network does not connect to a place; *it converges on you*.
+
+### Roaming Nodes
+
+This freedom introduces a new concept of time and space: **Nomadism**.
+
+Because your identity is portable, your connectivity can be fluid. You can be sitting at a desk connected to a fiber backbone one moment, and walking through a field connected only to a long-range LoRa mesh the next. To the rest of the network, nothing has changed. Your friends do not need to update your contact info. The messages they send do not bounce back. The network senses the shift in the medium and reroutes the flow of data automatically.
+
+You are no longer a stationary node in a fixed grid. You are a wanderer in a fluid medium.
+
+The interfaces - whether it is WiFi, Ethernet, Packet Radio, or a physical wire - is merely the clothing your node wears. You change it to suit the environment. Underneath, you remain the same. This is the liberation of the protocol. It treats the physical medium as a transient circumstance, not a definition of self.
+
+**Consider:**
+
+- **The Old Way:** *"I lost connection. I have to reconnect to the VPN to tell them where I am now."*
+- **The Zen Way:** *"I moved. The network subtly bends to accomodate this new reality."*
+
+### Announcing Presence
+
+How does the network find a wanderer? It listens.
+
+In the IP world, we query directories. We ask a server, "Where is Mark?" The server checks its database and gives us a coordinate. This means that someone, somewhere, is keeping track of you. It assumes and *requires* surveillance.
+
+Reticulum replaces surveillance with **Announces**.
+
+Instead of asking a central authority where you are, you simply state your presence. You broadcast a cryptographic proof: "I am here, and I am who I say I am". This ripples out through the mesh. Your neighbors hear it, update their path tables, and pass it on.
+
+This is a quiet, organic process. It is the digital equivalent of lighting lanterns in the dark. You do not need to chase the light; you let the light find you. It respects your autonomy. You choose when to announce, how often to speak, and to whom. You also choose when to disappear - for but a moment or perpetually.
+
+### Anchor In The Flow
+
+There is a deep peace in this nomadism. It teaches you that stability does not come from standing still. Stability comes from *internal coherence*.
+
+By holding your own private key, you hold your own center of gravity. The world around you; the infrastructure, the topography and the availability of links can all shift chaotically. Storms can knock out towers. Cables can be cut. The internet can go down.
+
+But as long as you possess your key, you possess your identity. The entire infrastructure can be destroyed and rebuilt, and you are still you. Nothing lasts, yet nothing is lost.
+
+You become a sovereign entity moving through the noise, connected not by the rigidity of cables, but by the fluidity of recognition. The network becomes a place you inhabit, rather than a utility you subscribe to: You are at home in the ether.
+
+
+## VI: Ethics Of The Tool
+**Technology With Conscience**
+
+You have unlearned the center. You have accepted the physics of trust. You have embraced the economy of scarcity and the freedom of unbound nomadism. You are standing in a new space. Now, look at the tool in your hand.
+
+In the old world, we were taught that technology is neutral. We are told that "guns don't kill people, people do", or that a component is just a component, indifferent to what its combinatorial potential is. This is a convenient lie. It serves only to allow the builders to wash their hands of responsibility.
+
+But we know better now. We know that **architecture is politics**, and *politics is control*. The way you build a system determines how it will be used. If you build a system optimized for mass surveillance, you *will* get a panopticon. If you build a system optimized for centralized control, you *will* get a dictatorship. If you build a system optimized for extraction, you *will* get a parasite.
+
+The Zen of Reticulum asserts that a tool is never neutral.
+
+On the very contrary: A tool is intent, **crystallized**.
+
+### The Harm Principle
+
+Why does the Reticulum License forbid the software from being used in systems designed to harm humans? Is it not just a restriction on freedom?
+
+It is a restriction on *license*, yes, but it is an expansion of *freedom*.
+
+Building powerful tools without a moral compass is in no way virtuous or commendable, it is plain and simple irresponsibility.
+
+A tool that can easily be used to oppress is a real danger to the user. If you build a network that can be turned against you by a tyrant, you are not free. You are merely waiting for the leash to tighten. By encoding the "Harm Principle" into the legal DNA of the reference implementation, we are building a safeguard. We are stating, clearly and immutably, that *this tool* is for **life**, not for death.
+
+This aligns the software with the interests of humanity. It cements that the network cannot be conscripted into a kill-system, a weaponized drone controller, or a torture device without breaking the license and the law. It is a line drawn in the sand - not by a government or external authority, but by the creators of the tool itself.
+
+**Consider:**
+
+- **The Old Way:** *"It's just software. How people use it is not my problem."*
+- **The Zen Way:** *"This software is a habitat. I will not allow it to be used to build a cage."*
+
+It is *your* choice whether to align with this - we are not forcing this stance on anyone. If you choose to align with life over death, with creativity over destruction, we grant you an immensely powerful tool, to own and build with as you please. If you do not, we deny it.
+
+If you do not like this, we most assuredly do not need you here, and you are on your own.
+
+### Public Domain Protocol
+
+This leads to a vital distinction: The difference between the *idea* and the *implementation*.
+
+The protocol - the mathematical rules of how Reticulum works - is dedicated to the Public Domain. It belongs to humanity. **No one can own it**. Anyone can implement it, improve it, or adapt it. This is the core idea of free communication, which itself must be forever free.
+
+But the functional, deployed *reference implementation* - the Python code, the maintenance, the years of labor - has a conscience. This distinction is the engine of sustainability. It allows the protocol to be universal, while ensuring that the specific labor of the builders is not hijacked to undermine the foundational intent of the project itself. From this document, it should be very clear what this intent is.
+
+If you want to build a system with Reticulum that manipulates and damages users for profits or targets missiles, you can use the public domain protocol, and start from scratch. But you cannot take our work. You must do your own. This serves as a pillar of accountability. If you want to build a weapon, *you* go and forge the steel yourself, while the world observes. And when the blood is drawn - it is on **your** hands.
+
+### Preserving Human Agency
+
+We live in an era of predatory extraction. The open-source commons is being scraped, ingested, and regurgitated by machine learning algorithms, whose corporate owners seek to replace the very humans who built those commons. Our code, our words, and our creativity is being used to train systems that are specifically designed to make us obsolete, without offering anything else in return than serfdom and leashes.
+
+Reticulum stands against this.
+
+The license protects the software from being used to feed the beast. It draws a hard line: This tool is for *people*. It is for human-to-human connection. It is not a dataset to be strip-mined for the purpose of building a synthetic overlord, puppeteered by a miniscule conglomerate of controllers.
+
+This is a radical act of preservation. By protecting the code from AI appropriation, we are protecting space for human agency. We are ensuring that there remains a digital realm where the actors are flesh, blood and soul, where decisions are made by minds, not overlords hiding behind models.
+
+When you use Reticulum, you are using a tool that respects you. It does not see you as a product to be tracked. It does not see your data as fuel for an algorithm. It sees you as a sovereign, equal peer.
+
+This changes the foundational premise of using the technology. It restores dignity to the interaction. You are not the user of a service; you are a participant in a mutual covenant. The tool aligns with your autonomy, rather than eroding it.
+
+In this way, ethics is not a restriction, but a foundation. It is the foundation that helps ensure the network will still belong to you tomorrow.
+
+
+## VII: Design Patterns For Post-IP Systems
+**Practical Philosophy for Developers**
+
+The philosophy is useless if it cannot be hammered into code. The metaphors we have explored - nomadism, scarcity, trust - are not just poetry, but real-world engineering constraints. When you sit down to write software for Reticulum, these concepts must shape the very structure of your application.
+
+We are now moving from the *why* to the *how*. This is where the abstract becomes concrete, and where you will see the true depth of the patterns we have been weaving.
+
+### Store & Forward
+
+The web has trained us to be impatient. We write synchronous code. We fire a request and we wait, blocking the UI, holding our breath. If the response doesn't come in 250 milliseconds, we show a spinner. If it doesn't come in five seconds, we show an error. We treat network connectivity as a binary state: either we are "online" or we are "broken".
+
+This is brittle. It is a rejection of reality.
+
+In Reticulum, connectivity is a spectrum, and presence is asynchronous. If at all applicable to your intent, you must design your applications to embrace **Store & Forward**.
+
+Instead of demanding an immediate answer, your application should act as a patient participant. You create a message for someone or something in the mesh. The network holds it. It carries it from node to node, perhaps over hours or days, waiting for the recipient to appear. When they finally surface, the message is delivered. This requires a shift from "request/response" to "event/handler". How exactly you do this is a challenge for you to solve intelligently within your problem domain, but Reticulum-based systems already exist that does this extremely well, and you can use them for inspiration.
+
+**Consider:**
+
+- **The Old Way:** `Connect() -> Send() -> Wait() -> Crash if timeout.`
+- **The Zen Way:** `Send() -> Continue living. -> Receive() when it arrives.`
+
+This changes the user experience profoundly. It removes the anxiety of the loading bar. It creates a sense of continuity. The user is not "waiting for the network"; they are interacting with a persistent log of communication that lives in the network itself.
+
+### Naming Is Power
+
+In the IP world, we are slaves to the Domain Name System. We rely on a hierarchy of registrars to map human-readable names to machine-readable addresses. This hierarchy is a choke point. If the registrar revokes your domain, or if the DNS server goes down, you vanish.
+
+Reticulum dissolves this hierarchy with **Hash-based Identity**.
+
+In this design pattern, a name is not a string you look up; it is a cryptographic destination you verify. When you design for Reticulum, you stop asking the user for a URL and start asking for a Destination or Identity Hash.
+
+This feels strange at first. A hash like `<83b7328926fed0d2e6a10a7671f9e237>` looks alien compared to `myfriend.com`. But that alienness is the armor. It **cannot** be spoofed. It **cannot** be censored by a registrar. It is **absolute**.
+
+Designing for this means shifting your UI metaphors. You are no longer browsing a web of pages; you are managing a ledger of keys. You are building an "Address Book" that is actually a keyring. The names are given by the user, and the power stays with them. That hashes look complex is directly analogous to the strengths of the bonds formed by their use. It forces the user to engage in a moment of verification, an out-of-band handshake, which restores the human element of trust that SSL certificates stripped away.
+
+### The Interface Is The Medium
+
+One of the most liberating patterns in Reticulum is **Transport Agnosticism**.
+
+In traditional networking, your code is often littered with transport logic. "Am I on WiFi? Check bandwidth. Am I on Cellular? Check data plan. Am I on Ethernet?". You are constantly micromanaging the pipe.
+
+In Reticulum, you write to the API, and the API writes to the medium. You send a packet to a Destination. You do not care if that packet travels over a TCP tunnel, a LoRa radio wave, or a serial wire interface. That is the stack's concern.
+
+This allows you to write **Universal Applications**.
+Imagine a messaging app. You write it once. It works on a laptop connected to fiber. It works on a phone in the city using WiFi. And, without a single line of code changed, it works on a device in the wilderness, talking only to other devices via radio.
+
+The pattern is simple: **Never code to the hardware. Code to the intent.**
+
+**Consider:**
+
+- **The Old Way:** `socket.connect(ip, port)`
+- **The Zen Way:** `RNS.Packet(destination, data).send()`
+
+By abstracting the medium, you make your software immortal to changes in infrastructure. The user might switch from a 4G hotspot to a HF modem tomorrow. Your software doesn't need to know. It simply continues the conversation.
+
+### Emergent Patterns
+
+When you combine these patterns - *Store & Forward*, *Hash-based Identity*, and *Transport Agnosticism* - you create software that feels fundamentally different.
+
+It feels *grounded*. It doesn't flicker when the signal drops. It doesn't panic when the server is down. It has weight. It has persistence. It has *relevance*.
+
+You are no longer building a "client" that begs a "server" for attention. You are building an autonomous agent that exists within the mesh. It speaks when it needs to, listens when it can, and carries its identity with it wherever it goes.
+
+This is the culmination of the Zen. The code is not just a set of instructions: It is a behavioral envelope. It is a way of *being* in the network.
+
+
+## VIII: Fabric Of The Independent
+
+We have stripped away the illusions. We have seen that the center is empty, that trust *must* be hard, that resources are finite, and that we must own our infrastructure. We have seen that tools have ethics and that our identity can move fluidly.
+
+This is a reclaiming of the commons. For too long, we have allowed the most vital substrate of human society - *our ability to speak to one another* - to be colonized by entities that do not share our interests. We have allowed the architecture of our communication to be designed by accountants rather than architects.
+
+We are taking it back. Not by petitioning the masters, but by building the new world within, over, under and around the shell of the old.
+
+### The Work Is Finished
+
+The heavy lifting is done.
+
+The protocol is in the public domain, a gift to humanity that can never be taken away. The software is written, tested, and running on devices scattered across the globe. The manual lies open before you. The source code for the reference implementation is now distributed on hundreds of thousands of devices across the planet. No one can delete or destroy it. The hardware is accessible and abundant.
+
+It was a hard road to get here, but we got here. Now, there is no roadmap committee waiting for approval. There is no venture capital dictating the user experience. There is no CEO to sign off on the next feature release.
+
+There is only you.
+
+The barrier to entry is no longer complexity: It is the mere habit of dependency. You were conditioned to wait. Wait for the app update. Wait for the ISP to fix the line. Wait for the platform to allow the post. Wait for the government to change the policies. Wait for the likes. Wait for the revolution to be televised.
+
+The revolution never was televised.
+
+It is packetized.
+
+### Open Sky
+
+The future of this technology is a construction project.
+
+It looks like a single node on a windowsill, listening to the static. It looks like a message sent to a neighbor, bypassing the noise of the commercial web. It looks like a community mesh that grows, link by link, hop by hop, carried by hands that care more about connection than profit.
+
+You have the blueprints. You have the tools. You have the philosophy. The noise of the old world has fallen away, leaving you with the quiet clarity of the open spectrum.
+
+*Mark, early 2026*

requirements.txt

@@ -1,3 +1,2 @@
-qrcode==7.4.2
-rns==0.7.8
-setuptools==70.0.0
+qrcode>=7.4.2
+rns>=1.0.0

setup.py

@@ -15,9 +15,10 @@ setuptools.setup(
     long_description_content_type="text/markdown",
     url="https://github.com/markqvist/lxmf",
     packages=["LXMF", "LXMF.Utilities"],
+    license="Reticulum License",
+    license_files = ("LICENSE"),
     classifiers=[
         "Programming Language :: Python :: 3",
-        "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
     ],
     entry_points= {
@@ -25,6 +26,6 @@ setuptools.setup(
             'lxmd=LXMF.Utilities.lxmd:main',
         ]
     },
-    install_requires=['rns>=0.9.1'],
-    python_requires='>=3.7',
+    install_requires=["rns>=1.1.1"],
+    python_requires=">=3.7",
 )