naeural-client 2.6.39__tar.gz → 2.6.41__tar.gz

{naeural_client-2.6.39 → naeural_client-2.6.41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naeural_client
-Version: 2.6.39
+Version: 2.6.41
 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.6.39 → naeural_client-2.6.41}/naeural_client/_ver.py

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

{naeural_client-2.6.39 → naeural_client-2.6.41}/naeural_client/bc/base.py

@@ -7,6 +7,8 @@ import datetime
 import uuid
 import requests
 
+from web3 import Web3
+
 from hashlib import sha256, md5
 from threading import Lock
 from copy import deepcopy
@@ -1404,6 +1406,72 @@ class BaseBlockEngine:
         True if `address` meets the basic criteria for an EVM address, False otherwise.
     """
     return BaseBlockEngine.is_valid_evm_address(address)
+
+  
+  @staticmethod
+  def web3_is_node_licensed(address : str, network='mainnet') -> bool:
+    """
+    Check if the address is allowed to send commands to the node
+
+    Parameters
+    ----------
+    address : str
+      the address to check.
+    """
+    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
+    
+    w3 = Web3(Web3.HTTPProvider(rpc_url)) 
+
+    contract_abi = dAuth.DAUTH_ABI_IS_NODE_ACTIVE
+
+    contract = w3.eth.contract(address=contract_address, abi=contract_abi)
+
+    result = contract.functions.isNodeActive(address).call()
+    return result
+
+
+  def web3_get_oracles(self, network='mainnet') -> list:
+    """
+    Get the list of oracles from the contract
+
+    Parameters
+    ----------
+    network : str, optional
+      the network to use. The default is 'mainnet'.
+
+    Returns
+    -------
+    list
+      the list of oracles addresses.
+
+    """
+    assert network.lower() in ['mainnet', 'testnet'], f"Invalid network {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
+    
+    w3 = Web3(Web3.HTTPProvider(rpc_url)) 
+
+    contract_abi = dAuth.DAUTH_ABI_GET_SIGNERS
+
+    contract = w3.eth.contract(address=contract_address, abi=contract_abi)
+
+    result = contract.functions.getSigners().call()
+    return result
+  
   
   
   ### end Ethereum

{naeural_client-2.6.39 → naeural_client-2.6.41}/naeural_client/bc/ec.py

@@ -12,12 +12,11 @@ from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives.ciphers.aead import AESGCM
 from cryptography.hazmat.primitives.kdf.hkdf import HKDF
 
-from web3 import Web3
 from eth_account import Account
 from eth_utils import keccak, to_checksum_address
 from eth_account.messages import encode_defunct
 
-from .base import BaseBlockEngine, VerifyMessage, BCct
+from .base import BaseBlockEngine, VerifyMessage, BCct, Web3
 
 
 
@@ -708,9 +707,29 @@ class BaseBCEllipticCurveEngine(BaseBlockEngine):
     """
     public_key = self._address_to_pk(address)
     return self._get_eth_address(pk=public_key)
-    
-
   
+  def is_node_address_in_eth_addresses(self, node_address: str, lst_eth_addrs) -> bool:
+    """
+    Check if the node address is in the list of Ethereum addresses
+
+    Parameters
+    ----------
+    node_address : str
+      the node address.
+      
+    lst_eth_addrs : list
+      list of Ethereum addresses.
+
+    Returns
+    -------
+    bool
+      True if the node address is in the list of Ethereum addresses.
+
+    """
+    eth_addr = self.node_address_to_eth_address(node_address)
+    return eth_addr in lst_eth_addrs
+
+
   def eth_hash_message(self, types, values, as_hex=False):
     """
     Hashes a message using the keccak256 algorithm.

{naeural_client-2.6.39 → naeural_client-2.6.41}/naeural_client/const/base.py

@@ -16,7 +16,49 @@ 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 = '0x9aB4e425c7dFFC7Aa1A7a262727b0b663e047571'
+  DAUTH_MAINNET_ND_ADDR = ''
+  
+  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'
@@ -44,6 +86,9 @@ class dAuth:
   DAUTH_SENDER_TYPE_SDK = 'sdk'
   DAUTH_SENDER_TYPE_NODE = 'node'
   DAUTH_SENDER_ETH = 'sender_eth_addr'
+  DAUTH_ABI_IS_NODE_ACTIVE = _DAUTH_ABI_IS_NODE_ACTIVE
+  DAUTH_ABI_GET_SIGNERS = _DAUTH_ABI_GET_SIGNERS
+# end class dAuth
 
 ETH_ENABLED_ENV_KEY = 'EE_ETH_ENABLED'
 

{naeural_client-2.6.39 → naeural_client-2.6.41}/naeural_client/utils/oracle_sync/oracle_tester.py

@@ -575,7 +575,7 @@ def handle_command_results(res):
 def oracle_tester_init(silent=True, **kwargs):
   log = Logger(
     "R1CTL",
-    base_folder=get_user_folder(),
+    base_folder=str(get_user_folder()),
     app_folder="_local_cache",
     silent=silent
   )

{naeural_client-2.6.39 → naeural_client-2.6.41}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "naeural_client"
-version = "2.6.39"
+version = "2.6.41"
 authors = [
   { name="Andrei Ionut Damian", email="andrei.damian@me.com" },
   { name="Cristan Bleotiu", email="cristibleotiu@gmail.com" },

{naeural_client-2.6.39 → naeural_client-2.6.41}/xperimental/_checks/auth_check.py

@@ -15,9 +15,18 @@ if __name__ == '__main__' :
         
       }
   )
+
+  eng2 = DefaultBlockEngine(
+    log=l, name="default", 
+    config={
+        "PEM_FILE": "r03.pem",
+      }
+  )
+  
+  to_use = eng2
   
   for _ in range(4):
-    d = eng1.dauth_autocomplete(
+    d = to_use.dauth_autocomplete(
       add_env=False,
       debug=True,
       max_tries=1,

naeural_client-2.6.41/xperimental/dauth/is_node_allowed.py

@@ -0,0 +1,69 @@
+
+import json
+
+
+from naeural_client import Logger, const
+from naeural_client.bc import DefaultBlockEngine
+
+
+
+if __name__ == '__main__' :
+  l = Logger("ENC", base_folder=".", app_folder="_local_cache")
+  eng = DefaultBlockEngine(
+    log=l, name="default", 
+    config={
+        
+      }
+  )
+  
+  network = 'testnet'
+  addresses = [
+    "0x93B04EF1152D81A0847C2272860a8a5C70280E14",
+    "0x1Fe3222f6a2844364E2BDc796e0Df547ea26B815",    
+    
+    "0x99Ac885B00a150cFc93EA1A51FcC035C17aCB02c",
+    "0x49943d72CF93B69AE22c7194093804635a99eF2B",
+    "0x64A4C148FDa4a0D900daB9417cd65968993d30b3",
+    "0x4B50d4ac46c3ba0F463603587d41c67213A0a091",
+
+    
+    "0x1351504af17BFdb80491D9223d6Bcb6BB964DCeD",
+    "0x2539fDD57f93b267E58d5f2E6F77063C0230F6F4",
+        
+  ]
+  
+  for addr in addresses:
+    is_active = eng.web3_is_node_licensed(
+      address=addr, network=network
+    )
+    l.P("{} {}".format(
+        addr,
+        "has a license" if is_active else "does NOT have a license"
+      ), 
+      color='g' if is_active else 'r'
+    )
+    
+  oracles = eng.web3_get_oracles(network=network)
+  l.P("\nOracles:\n {}".format(json.dumps(oracles, indent=2)), 
+    color='b'
+  )
+  
+  supervisors = [
+    "0xai_Amfnbt3N-qg2-qGtywZIPQBTVlAnoADVRmSAsdDhlQ-6",
+    "0xai_AwxGtRVqRlUrUoZNvf827uOswFmCkFXXguRmkpnyJBhQ",
+    "0xai_A4cZdKZZdj9We5W7T-NJPdQuhH2c8-aMI3-r7XlT0jqn",
+    "0xai_AvuUcmXyn6U3z8XRagqG8_d2sKCDZ5FIDpkUlpUz3Iuh"
+  ]
+  
+  for supervisor in supervisors:
+    is_supervisor_allowed = eng.is_node_address_in_eth_addresses(
+      node_address=supervisor, lst_eth_addrs=oracles
+    )
+    l.P("Node {} {}".format(
+        supervisor,
+        "is supervisor" if is_supervisor_allowed else "is NOT supervisor"
+      ), 
+      color='g' if is_supervisor_allowed else 'r'
+    )
+ 
+