ratio1 3.4.86__tar.gz → 3.4.88__tar.gz

{ratio1-3.4.86 → ratio1-3.4.88}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ratio1
-Version: 3.4.86
+Version: 3.4.88
 Summary: `ratio1` or Ration1 SDK is the Python SDK required for client app development for the Ratio1 ecosystem
 Project-URL: Homepage, https://github.com/Ratio1/ratio1_sdk
 Project-URL: Bug Tracker, https://github.com/Ratio1/ratio1_sdk/issues

{ratio1-3.4.86 → ratio1-3.4.88}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ratio1"
-version = "3.4.86"
+version = "3.4.88"
 authors = [
   { name="Andrei Ionut Damian", email="andrei.damian@ratio1.ai" },
   { name="Cristan Bleotiu", email="cristian.bleotiu@ratio1.ai" },

{ratio1-3.4.86 → ratio1-3.4.88}/ratio1/_ver.py

@@ -1,4 +1,4 @@
-__VER__ = "3.4.86"
+__VER__ = "3.4.88"
 
 if __name__ == "__main__":
   with open("pyproject.toml", "rt") as fd:

{ratio1-3.4.86 → ratio1-3.4.88}/ratio1/base/generic_session.py

@@ -24,7 +24,7 @@ from ..bc import DefaultBlockEngine, _DotDict, EE_VPN_IMPL
 from ..const import (
   COMMANDS, ENVIRONMENT, HB, PAYLOAD_DATA, STATUS_TYPE, 
   PLUGIN_SIGNATURES, DEFAULT_PIPELINES,
-  BLOCKCHAIN_CONFIG, SESSION_CT, NET_CONFIG
+  BLOCKCHAIN_CONFIG, SESSION_CT, NET_CONFIG,
 )
 from ..const import comms as comm_ct
 from ..const import DEEPLOY_CT
@@ -993,7 +993,7 @@ class GenericSession(BaseDecentrAIObject):
       sender_addr: str,
     ):
       """
-      This method processes the net-mon messages received from the communication
+      This method processes the net-mon (NETMON) messages received from the communication
       channel.
       """
       REQUIRED_PIPELINE = DEFAULT_PIPELINES.ADMIN_PIPELINE
@@ -1007,8 +1007,12 @@ class GenericSession(BaseDecentrAIObject):
         ee_id = dict_msg.get(PAYLOAD_DATA.EE_ID, None)
         current_network = dict_msg.get(PAYLOAD_DATA.NETMON_CURRENT_NETWORK, {})        
         if current_network:
-          # received valid netmon current network
-          
+          # received valid netmon current network          
+          if self._eth_enabled:
+            dct_msg = PAYLOAD_DATA.maybe_convert_netmon_whitelist(dict_msg)
+            current_network = dct_msg.get(PAYLOAD_DATA.NETMON_CURRENT_NETWORK, {})
+          # end if eth enabled
+
           # first we record the second of the minute
           second_bin = self.log.second_of_minute()
           self._netmon_second_bins[second_bin] += 1

{ratio1-3.4.86 → ratio1-3.4.88}/ratio1/const/payload.py

@@ -208,13 +208,36 @@ class PAYLOAD_DATA:
   NETMON_LAST_SEEN = 'last_seen_sec'
   NETMON_IS_SUPERVISOR = 'is_supervisor'
   NETMON_WHITELIST = 'whitelist'
+  NETMON_WHITELIST_MAP = 'whitelist_map'
   NETMON_NODE_SECURED = 'secured'
   NETMON_NODE_VERSION = 'version'
   NETMON_NODE_R1FS_ID = 'r1fs_id'
   NETMON_NODE_R1FS_ONLINE = 'r1fs_online'
   NETMON_NODE_R1FS_RELAY = 'r1fs_relay'
   
-
+  @staticmethod
+  def maybe_convert_netmon_whitelist(full_payload : dict) -> dict:
+    """
+    This function will convert each node individual whitelist from the compressed index-based
+    version to the full address version if needed (EVM-based implementations only).    
+    """
+    current_network = full_payload.get(PAYLOAD_DATA.NETMON_CURRENT_NETWORK, {})
+    dct_whitelist = full_payload.get(PAYLOAD_DATA.NETMON_WHITELIST_MAP, {})
+    if len(dct_whitelist) == 0:
+      return full_payload
+    # now lets decompress the whitelists
+    dct_idx_to_addr = {str(v): k for k, v in dct_whitelist.items()}
+    for node_info in current_network.values():
+      wl_indexes = node_info.get(PAYLOAD_DATA.NETMON_WHITELIST, [])
+      if not isinstance(wl_indexes, list):
+        wl_indexes = []
+      full_wl = []
+      for idx in wl_indexes:
+        addr = dct_idx_to_addr.get(str(idx), None)
+        if addr is not None:
+          full_wl.append(addr)
+      node_info[PAYLOAD_DATA.NETMON_WHITELIST] = full_wl
+    return full_payload
   
   
 class NET_CONFIG: