ratio1 3.4.86__py3-none-any.whl → 3.4.88__py3-none-any.whl

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/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/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:

{ratio1-3.4.86.dist-info → ratio1-3.4.88.dist-info}/METADATA

@@ -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.dist-info → ratio1-3.4.88.dist-info}/RECORD

@@ -1,10 +1,10 @@
 ratio1/__init__.py,sha256=YimqgDbjLuywsf8zCWE0EaUXH4MBUrqLxt0TDV558hQ,632
-ratio1/_ver.py,sha256=t9VS_l6tDXEhA-DtdV11uCrCKusCG-cUF7zWnM9CF-E,331
+ratio1/_ver.py,sha256=KBX4wRnlHrRWGTg3781atMEGfpsDqSshmos9h1nmjvU,331
 ratio1/base_decentra_object.py,sha256=iXvAAf6wPnGWzeeiRfwLojVoan-m1e_VsyPzjUQuENo,4492
 ratio1/plugins_manager_mixin.py,sha256=X1JdGLDz0gN1rPnTN_5mJXR8JmqoBFQISJXmPR9yvCo,11106
 ratio1/base/__init__.py,sha256=hACh83_cIv7-PwYMM3bQm2IBmNqiHw-3PAfDfAEKz9A,259
 ratio1/base/distributed_custom_code_presets.py,sha256=cvz5R88P6Z5V61Ce1vHVVh8bOkgXd6gve_vdESDNAsg,2544
-ratio1/base/generic_session.py,sha256=KhSNXUP_jxN1y1e7D_V6okG3uyQ0r2n2FZJwbDq-a5g,187926
+ratio1/base/generic_session.py,sha256=kTO5VIGQ4ZgGlN6JtZ82TGT9u-l-wX3s6JM__VtCwbU,188158
 ratio1/base/instance.py,sha256=oQvwzzRvir7851wyhDx_BwN6y_VgsNWwYo53vN33QI4,21914
 ratio1/base/pipeline.py,sha256=szoHrk1qBdY6NKPUk3tUTsJx3XzYp5C2GTOlzRiQi48,62489
 ratio1/base/plugin_template.py,sha256=Gs438cSkhvxPujE4CRH_32pcuZaVwI9kia8E4VDRpSU,138794
@@ -48,7 +48,7 @@ ratio1/const/evm_net.py,sha256=9is8Gx2_xtKlWRNAZTNAmmaA33c30xvpBT-zL4AtIuM,16774
 ratio1/const/formatter.py,sha256=AW3bWlqf39uaqV4BBUuW95qKYfF2OkkU4f9hy3kSVhM,200
 ratio1/const/heartbeat.py,sha256=Z_n87yI-L4vlBmlHZhkruysEJV5JVbXLQlGI26R42C4,3197
 ratio1/const/misc.py,sha256=VDCwwpf5bl9ltx9rzT2WPVP8B3mZFRufU1tSS5MO240,413
-ratio1/const/payload.py,sha256=0rzfC__amwAIeTA8WIVteohMDN5zbBg4txis57Qh0PM,6844
+ratio1/const/payload.py,sha256=HvKcN6a0r1ma1IMuBYZpYne9zTuLO8_8_18XflndAXY,7910
 ratio1/const/plugins/deeploy_const.py,sha256=8QcIf7zo_gSC6SdHqQVecn4yOUKCPMXzHC9zgGW5-3E,13314
 ratio1/default/__init__.py,sha256=ozU6CMMuWl0LhG8Ae3LrZ65a6tLrptfscVYGf83zjxM,46
 ratio1/default/instance/__init__.py,sha256=JQiqTFm_U5__z4bTlvT033hUOSIDCtrQ-evMrhT6JdA,741
@@ -105,8 +105,8 @@ ratio1/utils/comm_utils.py,sha256=4cS9llRr_pK_3rNgDcRMCQwYPO0kcNU7AdWy_LtMyCY,10
 ratio1/utils/config.py,sha256=Elfkl7W4aDMvB5WZLiYlPXrecBncgTxb4hcKhQedMzI,10111
 ratio1/utils/dotenv.py,sha256=_AgSo35n7EnQv5yDyu7C7i0kHragLJoCGydHjvOkrYY,2008
 ratio1/utils/oracle_sync/oracle_tester.py,sha256=aJOPcZhtbw1XPqsFG4qYpfv2Taj5-qRXbwJzrPyeXDE,27465
-ratio1-3.4.86.dist-info/METADATA,sha256=_Zr3blZF3PUgKWP19qEu_tLMOKRc4cySgEDtAVD-x2M,12255
-ratio1-3.4.86.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ratio1-3.4.86.dist-info/entry_points.txt,sha256=DR_olREzU1egwmgek3s4GfQslBi-KR7lXsd4ap0TFxE,46
-ratio1-3.4.86.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-ratio1-3.4.86.dist-info/RECORD,,
+ratio1-3.4.88.dist-info/METADATA,sha256=leT_mX54IZnC---M00RkaKIzkw5ixmVa3sIUdi_q-Hk,12255
+ratio1-3.4.88.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ratio1-3.4.88.dist-info/entry_points.txt,sha256=DR_olREzU1egwmgek3s4GfQslBi-KR7lXsd4ap0TFxE,46
+ratio1-3.4.88.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+ratio1-3.4.88.dist-info/RECORD,,