ratio1 3.4.74__tar.gz → 3.4.76__tar.gz

{ratio1-3.4.74 → ratio1-3.4.76}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ratio1
-Version: 3.4.74
+Version: 3.4.76
 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.74 → ratio1-3.4.76}/pyproject.toml

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

{ratio1-3.4.74 → ratio1-3.4.76}/ratio1/_ver.py

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

{ratio1-3.4.74 → ratio1-3.4.76}/ratio1/base/generic_session.py

@@ -4701,6 +4701,7 @@ class GenericSession(BaseDecentrAIObject):
             best_super = supervisor
         best_super_alias = None
         # done found best supervisor
+        nodes_for_eth = []
         for _, node_info in best_info.items():
           is_online = node_info.get(PAYLOAD_DATA.NETMON_STATUS_KEY, None) == PAYLOAD_DATA.NETMON_STATUS_ONLINE
           is_supervisor = node_info.get(PAYLOAD_DATA.NETMON_IS_SUPERVISOR, False)
@@ -4745,17 +4746,29 @@ class GenericSession(BaseDecentrAIObject):
                 eth_addr = val
                 add_balance = True
               if add_balance:
-                eth_balance = self.bc_engine.web3_get_balance_eth(eth_addr)
-                r1_balance = self.bc_engine.web3_get_balance_r1(eth_addr)
-                res['ETH'].append(round(eth_balance,4))
-                res['$R1'].append(round(r1_balance,4))
+                nodes_for_eth.append(eth_addr)
+                # eth_balance = self.bc_engine.web3_get_balance_eth(eth_addr)
+                # r1_balance = self.bc_engine.web3_get_balance_r1(eth_addr)
+                # res['ETH'].append(round(eth_balance,4))
+                # res['$R1'].append(round(r1_balance,4))
             elif key == PAYLOAD_DATA.NETMON_WHITELIST:
               val = client_is_allowed
             elif key in [PAYLOAD_DATA.NETMON_STATUS_KEY, PAYLOAD_DATA.NETMON_NODE_VERSION]:
               val = val.split(' ')[0]
             res[column].append(val)                        
         # end for
+        if len(nodes_for_eth) > 0:
+          balances = self.bc_engine.web3_get_addresses_balances(nodes_for_eth)
+          self.P("Executed web3_get_addresses_balances: {}".format(balances))
+          for _addr in nodes_for_eth:
+            eth_balance = balances[_addr]['ethBalance']
+            r1_balance = balances[_addr]['r1Balance']
+            res['ETH'].append(round(eth_balance,4))
+            res['$R1'].append(round(r1_balance,4))
+          # end for
+        # end if
       # end if
+      
       pd.options.display.float_format = '{:.1f}'.format
       df_res = pd.DataFrame(res)
       if alias_filter is not None:

{ratio1-3.4.74 → ratio1-3.4.76}/ratio1/const/evm_net.py

@@ -22,6 +22,10 @@ class EvmNetData:
 
   EE_ORACLE_API_URL_KEY = 'EE_ORACLE_API_URL'
   EE_DEEPLOY_API_URL_KEY = 'EE_DEEPLOY_API_URL'
+  EE_DAPP_API_URL_KEY = 'EE_DAPP_API_URL_KEY'
+
+  # Node tags constants.
+  EE_NODETAG_KYB='EE_NODETAG_KYB'
 # endclass EvmNetData
 
 
@@ -433,6 +437,7 @@ EVM_NET_DATA = {
     EvmNetData.EE_SUPERVISOR_MIN_AVAIL_PRC_KEY  : 0.90,
     EvmNetData.EE_ORACLE_API_URL_KEY            : "https://oracle.ratio1.ai",
     EvmNetData.EE_DEEPLOY_API_URL_KEY           : "https://deeploy-api.ratio1.ai",
+    EvmNetData.EE_DAPP_API_URL_KEY              : "https://dapp-api.ratio1.ai",
     EvmNetData.DAUTH_GET_ORACLES_ABI            : _DAUTH_ABI_GET_ORACLES,
   },
 
@@ -451,6 +456,7 @@ EVM_NET_DATA = {
     EvmNetData.EE_SUPERVISOR_MIN_AVAIL_PRC_KEY  : 0.6,
     EvmNetData.EE_ORACLE_API_URL_KEY            : "https://testnet-oracle.ratio1.ai",
     EvmNetData.EE_DEEPLOY_API_URL_KEY           : "https://testnet-deeploy-api.ratio1.ai",
+    EvmNetData.EE_DAPP_API_URL_KEY              : "https://testnet-dapp-api.ratio1.ai",
     EvmNetData.DAUTH_GET_ORACLES_ABI            : _DAUTH_ABI_GET_ORACLES,
   },
 
@@ -470,6 +476,7 @@ EVM_NET_DATA = {
     EvmNetData.EE_SUPERVISOR_MIN_AVAIL_PRC_KEY  : 0.6,
     EvmNetData.EE_ORACLE_API_URL_KEY            : "https://devnet-oracle.ratio1.ai",
     EvmNetData.EE_DEEPLOY_API_URL_KEY           : "https://devnet-deeploy-api.ratio1.ai",
+    EvmNetData.EE_DAPP_API_URL_KEY              : "https://devnet-dapp-api.ratio1.ai",
     EvmNetData.DAUTH_GET_ORACLES_ABI            : _DAUTH_ABI_GET_ORACLES,
   },
 }

{ratio1-3.4.74 → ratio1-3.4.76}/ratio1/const/heartbeat.py

@@ -74,6 +74,9 @@ R1FS_ID = 'R1FS_ID'
 R1FS_ONLINE = 'R1FS_ONLINE'
 R1FS_RELAY = 'R1FS_RELAY'
 
+# Node tags.
+EE_NODETAG_KYB = 'EE_NODETAG_KYB'
+# End node tags.
 
 class COMM_INFO:
   IN_KB = 'IN_KB'