naeural-client 2.7.8__py3-none-any.whl → 2.7.9__py3-none-any.whl

naeural_client/_ver.py

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

naeural_client/bc/base.py

@@ -1424,6 +1424,10 @@ class BaseBlockEngine:
   @property
   def evm_network(self):
     return self.get_evm_network()
+  
+  def get_network_data(self, network=None):
+    assert isinstance(network, str) and network.lower() in dAuth.EVM_NET_DATA, f"Invalid network: {network}"
+    return dAuth.EVM_NET_DATA[network.lower()]
 
     
   def web3_is_node_licensed(self, address : str, network=None, debug=False) -> bool:
@@ -1437,19 +1441,14 @@ class BaseBlockEngine:
     """
     if network is None:
       network = self.evm_network
-
-    assert network.lower() in ['mainnet', 'testnet'], f"Invalid network {network}"
     
     assert BaseBlockEngine.is_valid_eth_address(address), "Invalid Ethereum address"
-      
     
-    if network.lower() == 'mainnet':
-      contract_address = dAuth.DAUTH_MAINNET_ND_ADDR
-      rpc_url = dAuth.DAUTH_MAINNET_RPC
-    else:
-      contract_address = dAuth.DAUTH_TESTNET_ND_ADDR
-      rpc_url = dAuth.DAUTH_TESTNET_RPC
-      
+    network_data = self.get_network_data(network)
+    
+    contract_address = network_data[dAuth.EvmNetData.DAUTH_ND_ADDR_KEY]
+    rpc_url = network_data[dAuth.EvmNetData.DAUTH_RPC_KEY]
+          
     if debug:
       self.P(f"Checking if {address} ({network}) is allowed via {rpc_url}...")
     
@@ -1481,14 +1480,10 @@ class BaseBlockEngine:
     if network is None:
       network = BaseBlockEngine.get_evm_network()
 
-    assert network.lower() in ['mainnet', 'testnet'], f"Invalid network {network}"
+    network_data = self.get_network_data(network)
     
-    if network.lower() == 'mainnet':
-      contract_address = dAuth.DAUTH_MAINNET_ND_ADDR
-      rpc_url = dAuth.DAUTH_MAINNET_RPC
-    else:
-      contract_address = dAuth.DAUTH_TESTNET_ND_ADDR
-      rpc_url = dAuth.DAUTH_TESTNET_RPC
+    contract_address = network_data[dAuth.EvmNetData.DAUTH_ND_ADDR_KEY]
+    rpc_url = network_data[dAuth.EvmNetData.DAUTH_RPC_KEY]
 
     if debug:
       self.P(f"Getting oracles for {network} via {rpc_url}...")
@@ -1565,10 +1560,8 @@ class BaseBlockEngine:
         in_env = True
         url = os.environ[DAUTH_ENV_KEY]
       else:
-        if network == 'mainnet':
-          url = dAuth.DAUTH_MAINNET_URL
-        else:
-          url = dAuth.DAUTH_TESTNET_URL
+        network_data = self.get_network_data(network)
+        url = network_data[dAuth.EvmNetData.DAUTH_URL_KEY]
       #endif not in env
       
     if isinstance(url, str) and len(url) > 0:

naeural_client/const/base.py

@@ -1,3 +1,8 @@
+from .evm_net import (
+  _DAUTH_ABI_IS_NODE_ACTIVE, _DAUTH_ABI_GET_SIGNERS,
+  EvmNetData, EVM_NET_DATA
+)
+
 EE_ID = 'EE_ID'
 SB_ID = 'SB_ID'  # change to SB_ID = EE_ID post mod from sb to ee
 
@@ -10,59 +15,22 @@ class BCctbase:
   ETH_SENDER= 'EE_ETH_SENDER'
 
 
-DAUTH_TESTNET_URL = 'https://dauth-test.ratio1.ai/get_auth_data'
-DAUTH_MAINNET_URL = 'https://dauth-main.ratio1.ai/get_auth_data'
 DAUTH_SUBKEY = 'auth'
 DAUTH_ENV_KEY = 'EE_DAUTH_URL'
 DAUTH_NONCE = 'nonce'
 DAUTH_VARS = [DAUTH_NONCE, BCctbase.SIGN, BCctbase.SENDER, BCctbase.HASH]
 
-_DAUTH_ABI_IS_NODE_ACTIVE = [{
-  "inputs": [
-    {
-      "internalType": "address",
-      "name": "nodeAddress",
-      "type": "address"
-    }
-  ],
-  "name": "isNodeActive",
-  "outputs": [
-    {
-      "internalType": "bool",
-      "name": "",
-      "type": "bool"
-    }
-  ],
-  "stateMutability": "view",
-  "type": "function"
-}]
-
-_DAUTH_ABI_GET_SIGNERS = [{
-  "inputs": [],
-  "name": "getSigners",
-  "outputs": [
-    {
-      "internalType": "address[]",
-      "name": "",
-      "type": "address[]"
-    }
-  ],
-  "stateMutability": "view",
-  "type": "function"
-}]
+
 
 
 
 class dAuth:
-  DAUTH_TESTNET_ND_ADDR = '0xE20198EE2B76eED916A568a47cdea9681f7c79BF'
-  DAUTH_MAINNET_ND_ADDR = '0xE20198EE2B76eED916A568a47cdea9681f7c79BF'
-  
+  EvmNetData = EvmNetData
+  EVM_NET_DATA = EVM_NET_DATA
+    
   DAUTH_NET_ENV_KEY = 'EE_EVM_NET'
   DAUTH_SDK_NET_DEFAULT = 'testnet'
-  
-  DAUTH_MAINNET_RPC = 'https://base-mainnet.public.blastapi.io'
-  DAUTH_TESTNET_RPC = 'https://base-sepolia.public.blastapi.io'
-  
+    
   DAUTH_SENDER_ALIAS = 'sender_alias'
   DAUTH_SENDER_ALIAS_DEFAULT = 'direct-call'
   DAUTH_SENDER_CORE_VER = 'sender_core_ver'
@@ -79,8 +47,6 @@ class dAuth:
   
   DAUTH_WHITELIST = 'whitelist'
   
-  DAUTH_TESTNET_URL = DAUTH_TESTNET_URL
-  DAUTH_MAINNET_URL = DAUTH_MAINNET_URL
   DAUTH_SUBKEY = DAUTH_SUBKEY
   DAUTH_NONCE = DAUTH_NONCE
   DAUTH_VARS = DAUTH_VARS

naeural_client/const/evm_net.py

@@ -0,0 +1,79 @@
+class EvmNetData:
+  DAUTH_URL_KEY = 'EE_DAUTH_URL'
+  DAUTH_ND_ADDR_KEY = 'EE_DAUTH_ND_ADDR'
+  DAUTH_RPC_KEY = 'EE_DAUTH_RPC'
+  
+  EE_GENESIS_EPOCH_DATE_KEY = 'EE_GENESIS_EPOCH_DATE'
+  EE_EPOCH_INTERVALS_KEY = 'EE_EPOCH_INTERVALS'
+  EE_EPOCH_INTERVAL_SECONDS_KEY = 'EE_EPOCH_INTERVAL_SECONDS'
+  
+  EE_SUPERVISOR_MIN_AVAIL_PRC_KEY = 'EE_SUPERVISOR_MIN_AVAIL_PRC'
+  
+  
+EVM_NET_DATA = {
+  'testnet': {
+    EvmNetData.DAUTH_URL_KEY                    : "https://dauth-test.ratio1.ai/get_auth_data",
+    EvmNetData.DAUTH_ND_ADDR_KEY                : "0xE20198EE2B76eED916A568a47cdea9681f7c79BF",
+    EvmNetData.DAUTH_RPC_KEY                    : "https://base-sepolia.public.blastapi.io",      
+    EvmNetData.EE_GENESIS_EPOCH_DATE_KEY        : "2025-02-05 16:00:00",
+    EvmNetData.EE_EPOCH_INTERVALS_KEY           : 24,
+    EvmNetData.EE_EPOCH_INTERVAL_SECONDS_KEY    : 3600,
+    EvmNetData.EE_SUPERVISOR_MIN_AVAIL_PRC_KEY  : 0.6,
+  },
+
+  'mainnet': {
+    EvmNetData.DAUTH_URL_KEY                    : "https://dauth-main.ratio1.ai/get_auth_data",
+    EvmNetData.DAUTH_ND_ADDR_KEY                : "0xE20198EE2B76eED916A568a47cdea9681f7c79BF",
+    EvmNetData.DAUTH_RPC_KEY                    : "https://base-mainnet.public.blastapi.io",
+    EvmNetData.EE_GENESIS_EPOCH_DATE_KEY        : "2025-02-05 16:00:00",
+    EvmNetData.EE_EPOCH_INTERVALS_KEY           : 24,
+    EvmNetData.EE_EPOCH_INTERVAL_SECONDS_KEY    : 3600,
+    EvmNetData.EE_SUPERVISOR_MIN_AVAIL_PRC_KEY  : 0.6,
+  },        
+  
+  'devnet' : {
+    EvmNetData.DAUTH_URL_KEY                    : "https://dauth-devnet.ratio1.ai/get_auth_data",
+    EvmNetData.DAUTH_ND_ADDR_KEY                : "0xE20198EE2B76eED916A568a47cdea9681f7c79BF",
+    EvmNetData.DAUTH_RPC_KEY                    : "https://base-sepolia.public.blastapi.io",
+    EvmNetData.EE_GENESIS_EPOCH_DATE_KEY        : "2025-02-05 16:00:00",
+    EvmNetData.EE_EPOCH_INTERVALS_KEY           : 24,
+    EvmNetData.EE_EPOCH_INTERVAL_SECONDS_KEY    : 3600,
+    EvmNetData.EE_SUPERVISOR_MIN_AVAIL_PRC_KEY  : 0.6,
+  },
+
+}
+
+
+_DAUTH_ABI_IS_NODE_ACTIVE = [{
+  "inputs": [
+    {
+      "internalType": "address",
+      "name": "nodeAddress",
+      "type": "address"
+    }
+  ],
+  "name": "isNodeActive",
+  "outputs": [
+    {
+      "internalType": "bool",
+      "name": "",
+      "type": "bool"
+    }
+  ],
+  "stateMutability": "view",
+  "type": "function"
+}]
+
+_DAUTH_ABI_GET_SIGNERS = [{
+  "inputs": [],
+  "name": "getSigners",
+  "outputs": [
+    {
+      "internalType": "address[]",
+      "name": "",
+      "type": "address[]"
+    }
+  ],
+  "stateMutability": "view",
+  "type": "function"
+}]

{naeural_client-2.7.8.dist-info → naeural_client-2.7.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naeural_client
-Version: 2.7.8
+Version: 2.7.9
 Summary: `naeural_client` is the Python SDK required for client app development for the Naeural Edge Protocol Edge Protocol framework
 Project-URL: Homepage, https://github.com/NaeuralEdgeProtocol/naeural_client
 Project-URL: Bug Tracker, https://github.com/NaeuralEdgeProtocol/naeural_client/issues

{naeural_client-2.7.8.dist-info → naeural_client-2.7.9.dist-info}/RECORD

@@ -1,5 +1,5 @@
 naeural_client/__init__.py,sha256=YimqgDbjLuywsf8zCWE0EaUXH4MBUrqLxt0TDV558hQ,632
-naeural_client/_ver.py,sha256=xyIpvn7b735D9Wb7uaQLhUG4S1REdX5ilj50twPH4lk,330
+naeural_client/_ver.py,sha256=RxS-goK_0TushM31dt1Xwef54molpj9g6fHoISGRH68,330
 naeural_client/base_decentra_object.py,sha256=C4iwZTkhKNBS4VHlJs5DfElRYLo4Q9l1V1DNVSk1fyQ,4412
 naeural_client/plugins_manager_mixin.py,sha256=X1JdGLDz0gN1rPnTN_5mJXR8JmqoBFQISJXmPR9yvCo,11106
 naeural_client/base/__init__.py,sha256=hACh83_cIv7-PwYMM3bQm2IBmNqiHw-3PAfDfAEKz9A,259
@@ -14,7 +14,7 @@ naeural_client/base/webapp_pipeline.py,sha256=ZNGqZ36DY076XVDfGu2Q61kCt3kxIJ4Mi4
 naeural_client/base/payload/__init__.py,sha256=y8fBI8tG2ObNfaXFWjyWZXwu878FRYj_I8GIbHT4GKE,29
 naeural_client/base/payload/payload.py,sha256=x-au7l67Z_vfn_4R2C_pjZCaFuUVXHngJiGOfIAYVdE,2690
 naeural_client/bc/__init__.py,sha256=FQj23D1PrY06NUOARiKQi4cdj0-VxnoYgYDEht8lpr8,158
-naeural_client/bc/base.py,sha256=afXeOiPjA6_md3MGfuXwYIFTh7vErjU7vYK-rpQ_WRw,46536
+naeural_client/bc/base.py,sha256=Zo04bbqTi3SJVaS7W3Y9RdRsGHGdqEbNOpc70M0ZRgo,46456
 naeural_client/bc/chain.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 naeural_client/bc/ec.py,sha256=-HPfKpYAqy_eZpiJf3gWR2L4ZDDP7fZY2uwdNYYmS80,23868
 naeural_client/certs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -34,9 +34,10 @@ naeural_client/comm/mqtt_wrapper.py,sha256=Ig3bFZkCbWd4y_Whn2PPa91Z3aLgNbNPau6Tn
 naeural_client/const/README.md,sha256=6OHesr-f5NBuuJGryEoi_TCu2XdlhfQYlDKx_IJoXeg,177
 naeural_client/const/__init__.py,sha256=MM6Zib6i7M2qWcMkLtLx14zqU-lE-u2uPHjNvbh2jAM,478
 naeural_client/const/apps.py,sha256=ePBiJXLuPfFOKuw-LJrT9OWbaodU7QApfDurIPNDoB4,655
-naeural_client/const/base.py,sha256=g3II1Ys-1sjr1OG-sDJyRCV3F48VnxKQc7zTBPn-7FE,6510
+naeural_client/const/base.py,sha256=uq1HrxBsrFFiMP0yL0TcDANuxiSPafSx1Yh5ZyxRubE,5633
 naeural_client/const/comms.py,sha256=La6JXWHexH8CfcBCKyT4fCIoeaoZlcm7KtZ57ab4ZgU,2201
 naeural_client/const/environment.py,sha256=RpdDhDgB8NgRoFTk28eODigf9y0WcT9lul6mBOD029w,879
+naeural_client/const/evm_net.py,sha256=Uido0Bbb1oUZhlRVAn26mDOac1_nAFvu3mK5qjhCpd4,2598
 naeural_client/const/formatter.py,sha256=AW3bWlqf39uaqV4BBUuW95qKYfF2OkkU4f9hy3kSVhM,200
 naeural_client/const/heartbeat.py,sha256=xHZBX_NzHTklwA2_AEKR0SGdlbavMT4nirqjQg8WlTU,2550
 naeural_client/const/misc.py,sha256=VDCwwpf5bl9ltx9rzT2WPVP8B3mZFRufU1tSS5MO240,413
@@ -84,8 +85,8 @@ naeural_client/utils/comm_utils.py,sha256=4cS9llRr_pK_3rNgDcRMCQwYPO0kcNU7AdWy_L
 naeural_client/utils/config.py,sha256=QDrVywnhmf1k-sAb5jIBHZ_80TjNZk02uRG-t8mYLKQ,7413
 naeural_client/utils/dotenv.py,sha256=_AgSo35n7EnQv5yDyu7C7i0kHragLJoCGydHjvOkrYY,2008
 naeural_client/utils/oracle_sync/oracle_tester.py,sha256=GmZwu2JM9_UB2K-4rKB3o0RgWLqM-7Im6HwBnQLXmHI,25312
-naeural_client-2.7.8.dist-info/METADATA,sha256=14nrgXbF5gavIW1PCqmurhH5_7HD5lbrVIlo9BObw_E,12353
-naeural_client-2.7.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-naeural_client-2.7.8.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
-naeural_client-2.7.8.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-naeural_client-2.7.8.dist-info/RECORD,,
+naeural_client-2.7.9.dist-info/METADATA,sha256=nPlDJRYH1_RsZ-c9ibXVBUgDPYIHUfZEJQHvvkWuJ0M,12353
+naeural_client-2.7.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+naeural_client-2.7.9.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
+naeural_client-2.7.9.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+naeural_client-2.7.9.dist-info/RECORD,,