naeural-client 2.7.27__py3-none-any.whl → 2.7.29__py3-none-any.whl

naeural_client/_ver.py

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

naeural_client/bc/base.py

@@ -7,7 +7,6 @@ import datetime
 import uuid
 import requests
 
-from web3 import Web3
 
 from hashlib import sha256, md5
 from threading import Lock
@@ -24,7 +23,10 @@ from ..const.base import (
   DAUTH_NONCE, dAuth,
 )
 
-    
+from .evm import _EVMMixin, Web3, EE_VPN_IMPL
+
+EVM_COMMENT = " # "
+INVALID_COMMENT = " # INVALID: "
   
   
 class _DotDict(dict):
@@ -238,7 +240,7 @@ def ripemd160(data):
   
 # END ## RIPEMD160  
 
-class BaseBlockEngine:
+class BaseBlockEngine(_EVMMixin):
   """
   This multiton (multi-singleton via key) is the base workhorse of the private blockchain. 
   
@@ -326,7 +328,8 @@ class BaseBlockEngine:
     self.__pem_file = pem_fn
     self._init()
     return
-  
+
+
   def P(self, s, color=None, boxed=False, verbosity=1, **kwargs):
     if verbosity > self.__verbosity:
       return
@@ -338,16 +341,36 @@ class BaseBlockEngine:
       boxed=boxed, 
       **kwargs
     )
+    return
   
   
   @property
   def eth_enabled(self):
     return self.__eth_enabled
-  
+
+
+  def set_eth_flag(self, value):    
+    if value != self.__eth_enabled:
+      self.__eth_enabled = value
+      self.log.P("Changed eth_enabled to {}".format(value), color='d')
+    return
+
+
   @property
   def name(self):
     return self.__name
 
+  
+  @property
+  def eth_address(self):
+    return self.__eth_address
+
+
+  @property
+  def eth_account(self):
+    return self.__eth_account
+
+
   def _init(self):
     self.P(
       f"Initializing BC-engine (ETH_ENABLED={self.__eth_enabled})...", verbosity=1
@@ -523,7 +546,7 @@ class BaseBlockEngine:
     return path  
   
   
-  def address_is_valid(self, address):
+  def address_is_valid(self, address, return_error=False):
     """
     Checks if an address is valid
 
@@ -539,11 +562,15 @@ class BaseBlockEngine:
 
     """
     result = False
+    msg = ""
     try:
       pk = self._address_to_pk(address)
       result = False if pk is None else True
-    except:
+    except Exception as exc:
       result = False
+      msg = str(exc)
+    if return_error:
+      return result, msg
     return result
   
   
@@ -558,8 +585,10 @@ class BaseBlockEngine:
     if isinstance(address, list) and len(address) > 0:
       # self.P(f"Adding addresses to the allowed list:\n{address}", verbosity=1)
       # now check addresses
-      lst_addresses = []
+      lst_lines = []
+      lst_addrs = []
       lst_names = []
+      whitelist = self.whitelist_with_prefixes
       for addr in address:
         addr = addr.strip()
         parts = addr.split()
@@ -567,31 +596,45 @@ class BaseBlockEngine:
           continue
         addr = parts[0]
         name = parts[1] if len(parts) > 1 else ""
-        if not self.address_is_valid(addr):
+        is_valid, valid_msg = self.address_is_valid(addr, return_error=True)
+        if not is_valid:
           self.P("WARNING: address <{}> is not valid. Ignoring.".format(addr), color='r')
+          addr = "# " + addr
+          name = name + INVALID_COMMENT + valid_msg
+          continue # skip invalid address or go forward and add it ...
         else:
-          lst_addresses.append(self.maybe_add_prefix(addr))
-          lst_names.append(name)
+          addr = self.maybe_add_prefix(addr)
+          if addr in whitelist:
+            self.P("WARNING: address <{}> already in the allowed list. Ignoring.".format(addr), color='r')
+            continue
+          eth = self.node_address_to_eth_address(addr)
+          name = name + EVM_COMMENT + eth          
+        str_line = "{}{}".format(addr, ("  " + name) if len(name)>0 else "")
+        lst_lines.append(str_line)
+        lst_addrs.append(addr)
+        lst_names.append(name)
         #endif
       #endfor
-      if len(lst_addresses) > 0:
-        existing_addrs, existing_names = self._load_and_maybe_create_allowed(
-          return_names=True, return_prefix=True
-        )
-        for addr, name in zip(lst_addresses, lst_names):
-          if addr not in existing_addrs:
+      if len(lst_lines) > 0:
+        with self._whitelist_lock:
+          fn = self._get_allowed_file()
+          with open(fn, 'rt') as fh:
+            lst_existing = fh.readlines()
+          #endwith
+        for line, addr, name in zip(lst_lines, lst_addrs, lst_names):
+          if line not in lst_existing:
             changed = True
-            existing_addrs.append(addr)
-            existing_names.append(name)
-            self.P("Address <{}{}> added to the allowed list.".format(addr, name), color='g')
-          #endif new address
+            lst_existing.append(line)
+            self.P("Address <{}> added to the allowed list.".format(addr), color='g')
         #endfor
         if changed:
           with self._whitelist_lock:
             fn = self._get_allowed_file()
             with open(fn, 'wt') as fh:
-              for addr, name in zip(existing_addrs, existing_names):
-                fh.write("{}{}\n".format(addr, ("  " + name) if len(name)>0 else ""))
+              for line in lst_existing:
+                line = line.strip()
+                if line != "":
+                  fh.write(f"{line}\n")
               #endfor each address in modified whitelist
             #endwith open file
           #endwith lock
@@ -617,30 +660,42 @@ class BaseBlockEngine:
             fh.write('\n')
         lst_allowed = [x.strip() for x in lst_allowed]
         lst_allowed = [x for x in lst_allowed if x != '']
-        lst_lines = []
-        errors = False
+        lst_lines_to_write = []
+        needs_rewrite = False
         for allowed_tuple in lst_allowed:
           parts = allowed_tuple.split()
           if len(parts) == 0:
             continue
           allowed = parts[0]
+          if allowed.startswith("#"):
+            # skip comments but keep them if we re-write the file
+            lst_lines_to_write.append(allowed_tuple)
+            continue
           allowed = self._remove_prefix(allowed)
           name = parts[1] if len(parts) > 1 else ""
-          if not self.address_is_valid(allowed):
-            self.P("WARNING: address <{}> is not valid. Removing {} from allowed list.".format(
+          is_valid, valid_msg = self.address_is_valid(allowed, return_error=True)
+          if not is_valid:
+            self.P("WARNING: address <{}> is not valid. Commenting {} from allowed list.".format(
               allowed, allowed_tuple), color='r'
             )
-            errors = True
+            needs_rewrite = True
+            error_line = "# " + allowed_tuple + INVALID_COMMENT + valid_msg
+            lst_lines_to_write.append(error_line)
           else:
             if return_prefix:
               allowed = self.maybe_add_prefix(allowed)
             lst_final.append(allowed)
-            lst_lines.append(allowed_tuple)
             lst_names.append(name)
-        if errors:
+            if len(parts) < 3:
+              eth = self.node_address_to_eth_address(allowed)
+              allowed_tuple = allowed_tuple + EVM_COMMENT + eth
+              needs_rewrite = True 
+            lst_lines_to_write.append(allowed_tuple)
+              
+        if needs_rewrite:
           with open(fn, 'wt') as fh:
-            for line in lst_lines:
-              fh.write("{}\n".format(line))   
+            for line in lst_lines_to_write:
+              fh.write(f"{line}\n")
       except Exception as exc:
         self.P(f"ERROR: failed to load the allowed list of addresses: {exc}", color='r')
       #endtry
@@ -899,32 +954,6 @@ class BaseBlockEngine:
     """
     raise NotImplementedError()  
   
-  
-  def _get_eth_address(self):
-    """
-    Returns the Ethereum address for the current pk
-
-    Returns
-    -------
-    eth_address : str
-      the Ethereum address.
-
-    """
-    raise NotImplementedError()
-  
-  
-  def _get_eth_acccount(self):
-    """
-    Returns the Ethereum account for the current sk
-
-    Returns
-    -------
-    eth_account : str
-      the Ethereum account.
-
-    """
-    raise NotImplementedError()
-    
       
   
   #############################################################################
@@ -1346,161 +1375,7 @@ class BaseBlockEngine:
     raise NotImplementedError()
   
   
-  ### Ethereum
-  
-  def set_eth_flag(self, value):    
-    if value != self.__eth_enabled:
-      self.__eth_enabled = value
-      self.log.P("Changed eth_enabled to {}".format(value), color='d')
-    return
-  
-  @property
-  def eth_address(self):
-    return self.__eth_address
-  
-  @property
-  def eth_account(self):
-    return self.__eth_account
   
-  @staticmethod
-  def is_valid_evm_address(address: str) -> bool:
-    """
-    Check if the input string is a valid Ethereum (EVM) address using basic heuristics.
-
-    Parameters
-    ----------
-    address : str
-        The address string to verify.
-
-    Returns
-    -------
-    bool
-        True if `address` meets the basic criteria for an EVM address, False otherwise.
-    """
-    # Basic checks:
-    # A) Must start with '0x'
-    # B) Must be exactly 42 characters in total
-    # C) All remaining characters must be valid hexadecimal digits
-    if not address.startswith("0x"):
-      return False
-    if len(address) != 42:
-      return False
-    
-    hex_part = address[2:]
-    # Ensure all characters in the hex part are valid hex digits
-    return all(c in "0123456789abcdefABCDEF" for c in hex_part)
-  
-  @staticmethod
-  def is_valid_eth_address(address: str) -> bool:
-    """
-    Check if the input string is a valid Ethereum (EVM) address using basic heuristics.
-
-    Parameters
-    ----------
-    address : str
-        The address string to verify.
-
-    Returns
-    -------
-    bool
-        True if `address` meets the basic criteria for an EVM address, False otherwise.
-    """
-    return BaseBlockEngine.is_valid_evm_address(address)
-  
-  
-  @staticmethod
-  def get_evm_network() -> str:
-    """
-    Get the current network
-
-    Returns
-    -------
-    str
-      the network name.
-
-    """
-    return os.environ.get(dAuth.DAUTH_NET_ENV_KEY, dAuth.DAUTH_SDK_NET_DEFAULT)
-  
-  @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:
-    """
-    Check if the address is allowed to send commands to the node
-
-    Parameters
-    ----------
-    address : str
-      the address to check.
-    """
-    if network is None:
-      network = self.evm_network
-    
-    assert BaseBlockEngine.is_valid_eth_address(address), "Invalid Ethereum address"
-    
-    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}...")
-    
-    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=None, debug=False) -> list:
-    """
-    Get the list of oracles from the contract
-
-    Parameters
-    ----------
-    network : str, optional
-      the network to use. The default is None.
-
-    Returns
-    -------
-    list
-      the list of oracles addresses.
-
-    """
-    if network is None:
-      network = BaseBlockEngine.get_evm_network()
-
-    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"Getting oracles for {network} via {rpc_url}...")
-    
-    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
-
 
   def dauth_autocomplete(
     self, 
@@ -1510,6 +1385,7 @@ class BaseBlockEngine:
     max_tries=5,
     network=None,
     return_full_data=False,
+    debug_data=False,
     **kwargs
   ):
     """
@@ -1529,6 +1405,9 @@ class BaseBlockEngine:
     dict with the dAuth information if the request got status 200(if errors occured, but
     the status is still 200, an empty dictionary will be returned).
     """
+    if EE_VPN_IMPL:
+      return {}
+    #endif EE_VPN_IMPL
     from naeural_client._ver import __VER__ as sdk_version
     try:
       from ver import __VER__ as app_version
@@ -1575,19 +1454,31 @@ class BaseBlockEngine:
       while not done:
         self.P(f"<{eth_short}> ({network}) dAuth with `{url}`... (try {tries + 1} / {max_tries})")
         try:
-          to_send = {
-            **kwargs,
-            DAUTH_NONCE : str(uuid.uuid4())[:8],
-            dAuth.DAUTH_SENDER_APP_VER  : app_version,
-            dAuth.DAUTH_SENDER_SDK_VER  : sdk_version,
-            dAuth.DAUTH_SENDER_CORE_VER : core_version,
-          }
+          if debug_data:
+            to_send = {
+              DAUTH_NONCE : str(uuid.uuid4())[:8],
+              dAuth.DAUTH_SENDER_APP_VER  : app_version,
+              dAuth.DAUTH_SENDER_SDK_VER  : sdk_version,
+              dAuth.DAUTH_SENDER_CORE_VER : core_version,
+              **kwargs,
+            }
+          else:
+            to_send = {
+              **kwargs,
+              DAUTH_NONCE : str(uuid.uuid4())[:8],
+              dAuth.DAUTH_SENDER_APP_VER  : app_version,
+              dAuth.DAUTH_SENDER_SDK_VER  : sdk_version,
+              dAuth.DAUTH_SENDER_CORE_VER : core_version,
+            }
           ######
           if len(kwargs) == 0:
             to_send[dAuth.DAUTH_SENDER_ALIAS] = dAuth.DAUTH_SENDER_ALIAS_DEFAULT
           ######
-          self.sign(to_send)          
-          response = requests.post(url, json={'body' : to_send})
+          self.sign(to_send)    
+          json_to_send = {'body' : to_send}
+          if debug:
+            self.P(f"Sending to dAuth URL: {url}\n{json.dumps(json_to_send, indent=2)}")   
+          response = requests.post(url, json=json_to_send)
           if response.status_code == 200:
             dct_response = response.json()
             dct_result = dct_response.get('result', {}) or {}

naeural_client/bc/ec.py

@@ -12,11 +12,9 @@ from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives.ciphers.aead import AESGCM
 from cryptography.hazmat.primitives.kdf.hkdf import HKDF
 
-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, Web3
+
+from .base import BaseBlockEngine, VerifyMessage, BCct
 
 
 
@@ -669,192 +667,3 @@ class BaseBCEllipticCurveEngine(BaseBlockEngine):
   
   ## end multi destination encryption
   
-  
-  ### ETH
-
-  def _get_eth_address(self, pk=None):
-    if pk is None:
-      pk = self.public_key
-    raw_public_key = pk.public_numbers()
-
-    # Compute Ethereum-compatible address
-    x = raw_public_key.x.to_bytes(32, 'big')
-    y = raw_public_key.y.to_bytes(32, 'big')
-    uncompressed_key = b'\x04' + x + y
-    keccak_hash = keccak(uncompressed_key[1:])  # Remove 0x04 prefix
-    eth_address = "0x" + keccak_hash[-20:].hex()
-    eth_address = to_checksum_address(eth_address)
-    return eth_address    
-  
-  def _get_eth_account(self):
-    private_key_bytes = self.private_key.private_numbers().private_value.to_bytes(32, 'big')
-    return Account.from_key(private_key_bytes)
-  
-  
-  def node_address_to_eth_address(self, address):
-    """
-    Converts a node address to an Ethereum address.
-
-    Parameters
-    ----------
-    address : str
-        The node address convert.
-
-    Returns
-    -------
-    str
-        The Ethereum address.
-    """
-    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.
-
-    Parameters
-    ----------
-    types : list
-        The types of the values.
-        
-    values : list of any
-        The values to hash.
-
-    Returns
-    -------
-    bytes
-        The hash of the message in hexadecimal format.
-    """
-    message = Web3.solidity_keccak(types, values)
-    if as_hex:
-      return message.hex()
-    return message
-  
-  
-  def eth_sign_message(self, types, values):
-    """
-    Signs a message using the private key.
-
-    Parameters
-    ----------
-    types : list
-        The types of the values.
-        
-    values : list of any
-        The values to sign.
-
-    Returns
-    -------
-    str
-        The signature of the message.
-    """
-    message_hash = self.eth_hash_message(types, values, as_hex=False)
-    signable_message = encode_defunct(primitive=message_hash)
-    signed_message = Account.sign_message(signable_message, private_key=self.eth_account.key)
-    if hasattr(signed_message, "message_hash"): # backward compatibility
-      signed_message_hash = signed_message.message_hash
-    else:
-      signed_message_hash = signed_message.messageHash
-    return {
-        "message_hash": message_hash.hex(),
-        "r": hex(signed_message.r),
-        "s": hex(signed_message.s),
-        "v": signed_message.v,
-        "signature": signed_message.signature.hex(),
-        "signed_message": signed_message_hash.hex(),
-        "sender" : self.eth_address,
-        "eth_signed_data" : types,
-    }
-    
-  def eth_sign_text(self, message, signature_only=True):
-    """
-    Signs a text message using the private key.
-
-    Parameters
-    ----------
-    message : str
-        The message to sign.
-        
-    signature_only : bool, optional
-        Whether to return only the signature. The default is True
-
-    Returns
-    -------
-    str
-        The signature of the message.
-    """
-    types = ["string"]
-    values = [message]
-    result = self.eth_sign_message(types, values)
-    if signature_only:
-      return result["signature"]
-    return result
-    
-    
-    
-  def eth_sign_node_epochs(
-    self, 
-    node, 
-    epochs, 
-    epochs_vals, 
-    signature_only=True, 
-    use_evm_node_addr=True
-  ):
-    """
-    Signs the node availability
-
-    Parameters
-    ----------
-    node : str
-        The node address to sign. Either the node address or the Ethereum address based on `use_evm_node_addr`.
-        
-    epochs : list of int
-        The epochs to sign.
-        
-    epochs_vals : list of int
-        The values for each epoch.
-        
-    signature_only : bool, optional
-        Whether to return only the signature. The default is True.
-        
-    use_evm_node_addr : bool, optional
-        Whether to use the Ethereum address of the node. The default is True.
-
-    Returns
-    -------
-    str
-        The signature of the message.
-    """
-    if use_evm_node_addr:
-      types = ["address", "uint256[]", "uint256[]"]  
-    else:
-      types = ["string", "uint256[]", "uint256[]"]
-    values = [node, epochs, epochs_vals]
-    result = self.eth_sign_message(types, values)
-    if signature_only:
-      return result["signature"]
-    return result
-  
-  

naeural_client/bc/evm.py

@@ -0,0 +1,355 @@
+import os
+
+from eth_account import Account
+from eth_utils import keccak, to_checksum_address
+from eth_account.messages import encode_defunct
+
+from ..const.base import EE_VPN_IMPL_ENV_KEY, dAuth
+
+EE_VPN_IMPL = str(os.environ.get(EE_VPN_IMPL_ENV_KEY, False)).lower() in [
+  'true', '1', 'yes', 'y', 't', 'on'
+]
+
+if EE_VPN_IMPL:
+  class Web3:
+    """
+    VPS enabled. Web3 is not available.
+    """
+else:
+  from web3 import Web3
+
+
+
+class _EVMMixin:
+  
+  
+  @staticmethod
+  def is_valid_evm_address(address: str) -> bool:
+    """
+    Check if the input string is a valid Ethereum (EVM) address using basic heuristics.
+
+    Parameters
+    ----------
+    address : str
+        The address string to verify.
+
+    Returns
+    -------
+    bool
+        True if `address` meets the basic criteria for an EVM address, False otherwise.
+    """
+    # Basic checks:
+    # A) Must start with '0x'
+    # B) Must be exactly 42 characters in total
+    # C) All remaining characters must be valid hexadecimal digits
+    if not address.startswith("0x"):
+      return False
+    if len(address) != 42:
+      return False
+    
+    hex_part = address[2:]
+    # Ensure all characters in the hex part are valid hex digits
+    return all(c in "0123456789abcdefABCDEF" for c in hex_part)
+  
+  @staticmethod
+  def is_valid_eth_address(address: str) -> bool:
+    """
+    Check if the input string is a valid Ethereum (EVM) address using basic heuristics.
+
+    Parameters
+    ----------
+    address : str
+        The address string to verify.
+
+    Returns
+    -------
+    bool
+        True if `address` meets the basic criteria for an EVM address, False otherwise.
+    """
+    return _EVMMixin.is_valid_evm_address(address)
+  
+  
+  @staticmethod
+  def get_evm_network() -> str:
+    """
+    Get the current network
+
+    Returns
+    -------
+    str
+      the network name.
+
+    """
+    return os.environ.get(dAuth.DAUTH_NET_ENV_KEY, dAuth.DAUTH_SDK_NET_DEFAULT)
+  
+  @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:
+    """
+    Check if the address is allowed to send commands to the node
+
+    Parameters
+    ----------
+    address : str
+      the address to check.
+    """
+    if EE_VPN_IMPL:
+      self.P("VPN implementation. Skipping Ethereum check.", color='r')
+      return False
+    
+    if network is None:
+      network = self.evm_network
+    
+    assert self.is_valid_eth_address(address), "Invalid Ethereum address"
+    
+    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}...")
+    
+    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=None, debug=False) -> list:
+    """
+    Get the list of oracles from the contract
+
+    Parameters
+    ----------
+    network : str, optional
+      the network to use. The default is None.
+
+    Returns
+    -------
+    list
+      the list of oracles addresses.
+
+    """
+    if network is None:
+      network = self.evm_network
+
+    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"Getting oracles for {network} via {rpc_url}...")
+    
+    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
+  
+
+  
+  ### ETH
+
+  def _get_eth_address(self, pk=None):
+    if pk is None:
+      pk = self.public_key
+    raw_public_key = pk.public_numbers()
+
+    # Compute Ethereum-compatible address
+    x = raw_public_key.x.to_bytes(32, 'big')
+    y = raw_public_key.y.to_bytes(32, 'big')
+    uncompressed_key = b'\x04' + x + y
+    keccak_hash = keccak(uncompressed_key[1:])  # Remove 0x04 prefix
+    eth_address = "0x" + keccak_hash[-20:].hex()
+    eth_address = to_checksum_address(eth_address)
+    return eth_address    
+  
+  def _get_eth_account(self):
+    private_key_bytes = self.private_key.private_numbers().private_value.to_bytes(32, 'big')
+    return Account.from_key(private_key_bytes)
+  
+  
+  def node_address_to_eth_address(self, address):
+    """
+    Converts a node address to an Ethereum address.
+
+    Parameters
+    ----------
+    address : str
+        The node address convert.
+
+    Returns
+    -------
+    str
+        The Ethereum address.
+    """
+    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.
+
+    Parameters
+    ----------
+    types : list
+        The types of the values.
+        
+    values : list of any
+        The values to hash.
+
+    Returns
+    -------
+    bytes
+        The hash of the message in hexadecimal format.
+    """
+    message = Web3.solidity_keccak(types, values)
+    if as_hex:
+      return message.hex()
+    return message
+  
+  
+  def eth_sign_message(self, types, values):
+    """
+    Signs a message using the private key.
+
+    Parameters
+    ----------
+    types : list
+        The types of the values.
+        
+    values : list of any
+        The values to sign.
+
+    Returns
+    -------
+    str
+        The signature of the message.
+    """
+    message_hash = self.eth_hash_message(types, values, as_hex=False)
+    signable_message = encode_defunct(primitive=message_hash)
+    signed_message = Account.sign_message(signable_message, private_key=self.eth_account.key)
+    if hasattr(signed_message, "message_hash"): # backward compatibility
+      signed_message_hash = signed_message.message_hash
+    else:
+      signed_message_hash = signed_message.messageHash
+    return {
+        "message_hash": message_hash.hex(),
+        "r": hex(signed_message.r),
+        "s": hex(signed_message.s),
+        "v": signed_message.v,
+        "signature": signed_message.signature.hex(),
+        "signed_message": signed_message_hash.hex(),
+        "sender" : self.eth_address,
+        "eth_signed_data" : types,
+    }
+    
+  def eth_sign_text(self, message, signature_only=True):
+    """
+    Signs a text message using the private key.
+
+    Parameters
+    ----------
+    message : str
+        The message to sign.
+        
+    signature_only : bool, optional
+        Whether to return only the signature. The default is True
+
+    Returns
+    -------
+    str
+        The signature of the message.
+    """
+    types = ["string"]
+    values = [message]
+    result = self.eth_sign_message(types, values)
+    if signature_only:
+      return result["signature"]
+    return result
+    
+    
+    
+  def eth_sign_node_epochs(
+    self, 
+    node, 
+    epochs, 
+    epochs_vals, 
+    signature_only=True, 
+    use_evm_node_addr=True
+  ):
+    """
+    Signs the node availability
+
+    Parameters
+    ----------
+    node : str
+        The node address to sign. Either the node address or the Ethereum address based on `use_evm_node_addr`.
+        
+    epochs : list of int
+        The epochs to sign.
+        
+    epochs_vals : list of int
+        The values for each epoch.
+        
+    signature_only : bool, optional
+        Whether to return only the signature. The default is True.
+        
+    use_evm_node_addr : bool, optional
+        Whether to use the Ethereum address of the node. The default is True.
+
+    Returns
+    -------
+    str
+        The signature of the message.
+    """
+    if use_evm_node_addr:
+      types = ["address", "uint256[]", "uint256[]"]  
+    else:
+      types = ["string", "uint256[]", "uint256[]"]
+    values = [node, epochs, epochs_vals]
+    result = self.eth_sign_message(types, values)
+    if signature_only:
+      return result["signature"]
+    return result
+  
+    
+  

naeural_client/const/base.py

@@ -15,6 +15,8 @@ class BCctbase:
   ETH_SENDER= 'EE_ETH_SENDER'
 
 
+EE_VPN_IMPL_ENV_KEY = 'EE_VPN_IMPL'
+
 DAUTH_SUBKEY = 'auth'
 DAUTH_ENV_KEY = 'EE_DAUTH_URL'
 DAUTH_NONCE = 'nonce'

{naeural_client-2.7.27.dist-info → naeural_client-2.7.29.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naeural_client
-Version: 2.7.27
+Version: 2.7.29
 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.27.dist-info → naeural_client-2.7.29.dist-info}/RECORD

@@ -1,5 +1,5 @@
 naeural_client/__init__.py,sha256=YimqgDbjLuywsf8zCWE0EaUXH4MBUrqLxt0TDV558hQ,632
-naeural_client/_ver.py,sha256=xPABtqoee7FOJbdkfLEdq81iAPs9A1AH0mTWt03WkkA,331
+naeural_client/_ver.py,sha256=JqBpFIjrfwZRS_X2fLTG2ivMFcGrMcEOLgQ2jSW3iOY,331
 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,9 +14,10 @@ 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=-BXy-o3mP3Z6Qo2oc0DbWAuUdT3wQOGJbED9QtQ2KCE,46624
+naeural_client/bc/base.py,sha256=zhfzFFMYSmWB-2KLclvnEF35jobrNLFLIFc4ZvxCcE0,44568
 naeural_client/bc/chain.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-naeural_client/bc/ec.py,sha256=-HPfKpYAqy_eZpiJf3gWR2L4ZDDP7fZY2uwdNYYmS80,23868
+naeural_client/bc/ec.py,sha256=FwlkWmJvQ9aHuf_BZX1CWSUAxw6OZ9jBparLIWcs_e4,18933
+naeural_client/bc/evm.py,sha256=3QwHxU5nOM03OmcxtxaqCBaoft2o-QuAQ-hWD-miKJI,8937
 naeural_client/certs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 naeural_client/certs/r9092118.ala.eu-central-1.emqxsl.com.crt,sha256=y-6io0tseyx9-a4Pmde1z1gPULtJNSYUpG_YFkYaMKU,1337
 naeural_client/certs/s624dbd4.ala.us-east-1.emqxsl.com.crt,sha256=y-6io0tseyx9-a4Pmde1z1gPULtJNSYUpG_YFkYaMKU,1337
@@ -34,7 +35,7 @@ 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=uq1HrxBsrFFiMP0yL0TcDANuxiSPafSx1Yh5ZyxRubE,5633
+naeural_client/const/base.py,sha256=zfJyGGdrNz_OA5i_6cQxH2lEeJ4PO3092NrwM_gZ_U8,5670
 naeural_client/const/comms.py,sha256=La6JXWHexH8CfcBCKyT4fCIoeaoZlcm7KtZ57ab4ZgU,2201
 naeural_client/const/environment.py,sha256=RpdDhDgB8NgRoFTk28eODigf9y0WcT9lul6mBOD029w,879
 naeural_client/const/evm_net.py,sha256=mOSvsJnir1v_BrmKS51xIy9ddlZnQwlXWenzGXmXMOE,2606
@@ -85,8 +86,8 @@ naeural_client/utils/comm_utils.py,sha256=4cS9llRr_pK_3rNgDcRMCQwYPO0kcNU7AdWy_L
 naeural_client/utils/config.py,sha256=IG7-rRYBWCqCiI2kDesFmY8gld0Ku9xWgzNPE1rwVcA,10352
 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.27.dist-info/METADATA,sha256=ljUYQkJp_UZZ1YFBTa40yuFvo-DgIAvTQUQJsVnmg50,12354
-naeural_client-2.7.27.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-naeural_client-2.7.27.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
-naeural_client-2.7.27.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-naeural_client-2.7.27.dist-info/RECORD,,
+naeural_client-2.7.29.dist-info/METADATA,sha256=rWf_TRBs9LncFBWUHz9UAWuou8d5U3Y9vWXiXPN0410,12354
+naeural_client-2.7.29.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+naeural_client-2.7.29.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
+naeural_client-2.7.29.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+naeural_client-2.7.29.dist-info/RECORD,,