naeural-client 3.0.8__py3-none-any.whl → 3.1.0__py3-none-any.whl

naeural_client/_ver.py

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

naeural_client/base/generic_session.py

@@ -328,7 +328,7 @@ class GenericSession(BaseDecentrAIObject):
     self.__fill_config(
       host=self.__host, 
       port=self.__port, 
-      user=self.__port, 
+      user=self.__user,
       pwd=self.__pwd, 
       secured=self.__secured,
     )
@@ -3000,6 +3000,7 @@ class GenericSession(BaseDecentrAIObject):
           
       eth: bool, optional
           If True, will use the nodes eth addresses instead of internal. Defaults to False.
+          It will also display extra info about node wallets (ETH and $R1 balances)
           
       all_info: bool, optional
           If True, will return all the information. Defaults to False.
@@ -3032,10 +3033,17 @@ class GenericSession(BaseDecentrAIObject):
       if all_info:
         mapping = OrderedDict({
           # we assign dummy integer values to the computed columns 
-          # and we will fillter them 
+          # and we will filter them 
           'ETH Address': 1,
           **mapping
         })
+      if eth or all_info:
+        mapping = OrderedDict({
+          **mapping,
+          'ETH' : 2,
+          '$R1' : 3,
+        })        
+      # end if eth or all_info
       res = OrderedDict()
       for k in mapping:
         res[k] = []
@@ -3074,6 +3082,7 @@ class GenericSession(BaseDecentrAIObject):
             continue
           for key, column in reverse_mapping.items():
             if isinstance(key, int):
+              # if the key is an integer, then it is a computed column
               continue
             val = node_info.get(key, None)
             if key == PAYLOAD_DATA.NETMON_LAST_REMOTE_TIME:
@@ -3088,16 +3097,26 @@ class GenericSession(BaseDecentrAIObject):
                 # again self.get_node_alias(best_super) might not work if using the hb data
                 best_super_alias = node_info.get(PAYLOAD_DATA.NETMON_EEID, None)
               val = self.bc_engine._add_prefix(val)
+              add_balance = False
               if all_info:
                 val_eth = self.bc_engine.node_address_to_eth_address(val)
                 res['ETH Address'].append(val_eth)
+                eth_addr = val_eth
+                add_balance = True
               elif eth:
                 val = self.bc_engine.node_address_to_eth_address(val)
+                eth_addr = val
+                add_balance = True
+              if add_balance:
+                eth_balance = self.bc_engine.web3_get_balance_eth(val)
+                r1_balance = self.bc_engine.web3_get_balance_r1(val)
+                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)          
+            res[column].append(val)                        
         # end for
       # end if
       pd.options.display.float_format = '{:.1f}'.format

naeural_client/bc/base.py

@@ -815,7 +815,7 @@ class BaseBlockEngine(_EVMMixin):
 
     """
     if from_file and os.path.isfile(source):
-      self.P("Reading SK from '{}'".format(source), verbosity=1)
+      self.P("Reading SK from '{}'".format(source), verbosity=2)
       with open(source, 'rt') as fh:
         data = fh.read()
     else:

naeural_client/bc/evm.py

@@ -1,5 +1,8 @@
+import json
 import os
 
+from collections import namedtuple
+
 from eth_account import Account
 from eth_utils import keccak, to_checksum_address
 from eth_account.messages import encode_defunct
@@ -10,346 +13,769 @@ 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:
+Web3Vars = namedtuple("Web3Vars", [
+  "w3", "rpc_url", "nd_contract_address", "r1_contract_address", "network"
+])
+
+
+if not EE_VPN_IMPL:
+  from web3 import Web3
+else:
   class Web3:
     """
     VPS enabled. Web3 is not available.
     """
-else:
-  from web3 import Web3
-
 
+# A minimal ERC20 ABI for balanceOf, transfer, and decimals functions.
+ERC20_ABI = [
+  {
+      "constant": True,
+      "inputs": [{"name": "_owner", "type": "address"}],
+      "name": "balanceOf",
+      "outputs": [{"name": "balance", "type": "uint256"}],
+      "payable": False,
+      "stateMutability": "view",
+      "type": "function"
+  },
+  {
+      "constant": False,
+      "inputs": [
+          {"name": "_to", "type": "address"},
+          {"name": "_value", "type": "uint256"}
+      ],
+      "name": "transfer",
+      "outputs": [{"name": "success", "type": "bool"}],
+      "payable": False,
+      "stateMutability": "nonpayable",
+      "type": "function"
+  },
+  {
+      "constant": True,
+      "inputs": [],
+      "name": "decimals",
+      "outputs": [{"name": "", "type": "uint8"}],
+      "payable": False,
+      "stateMutability": "view",
+      "type": "function"
+  }
+]
 
 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
+  # EVM address methods
+  if True:
+    @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)
     
-    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.
+    @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)
+
+
+    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.
 
-    Parameters
-    ----------
-    address : str
-        The address string to verify.
+      Returns
+      -------
+      bool
+        True if the node address is in the list of Ethereum addresses.
 
-    Returns
-    -------
-    bool
-        True if `address` meets the basic criteria for an EVM address, False otherwise.
-    """
-    return _EVMMixin.is_valid_evm_address(address)
+      """
+      eth_addr = self.node_address_to_eth_address(node_address)
+      return eth_addr in lst_eth_addrs    
   
   
-  @staticmethod
-  def get_evm_network() -> str:
-    """
-    Get the current network
+  # EVM networks
+  if True:
+    def reset_network(self, network: str):
+      assert network.lower() in dAuth.EVM_NET_DATA, f"Invalid network: {network}"
+      os.environ[dAuth.DAUTH_NET_ENV_KEY] = network
+      return
+    
+    def get_evm_network(self) -> str:
+      """
+      Get the current network
+
+      Returns
+      -------
+      str
+        the network name.
+
+      """
+      network = os.environ.get(dAuth.DAUTH_NET_ENV_KEY, dAuth.DAUTH_SDK_NET_DEFAULT)
+      if not hasattr(self, "current_evm_network") or self.current_evm_network != network:
+        self.current_evm_network = network
+        network_data = self.get_network_data(network)
+        rpc_url = network_data[dAuth.EvmNetData.DAUTH_RPC_KEY]
+        self.web3 = Web3(Web3.HTTPProvider(rpc_url))
+        self.P(f"Resetting Web3 for {network=} via {rpc_url=}...")
+      return network
+    
+    @property
+    def evm_network(self):
+      return self.get_evm_network()
 
-    Returns
-    -------
-    str
-      the network name.
+    
+    def get_network_data(self, network: str) -> dict:
+      assert isinstance(network, str) and network.lower() in dAuth.EVM_NET_DATA, f"Invalid network: {network}"
+      return dAuth.EVM_NET_DATA[network.lower()]
+    
 
-    """
-    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()]
+    @property
+    def network_rpc(self):
+      return self.get_network_data(self.evm_network)[dAuth.EvmNetData.DAUTH_RPC_KEY]
 
-    
-  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
+    @property
+    def nd_contract_address(self):
+      return self.get_network_data(self.evm_network)[dAuth.EvmNetData.DAUTH_ND_ADDR_KEY]
     
-    if network is None:
-      network = self.evm_network
-    
-    assert self.is_valid_eth_address(address), "Invalid Ethereum address"
+    @property
+    def r1_contract_address(self):
+      return self.get_network_data(self.evm_network)[dAuth.EvmNetData.DAUTH_R1_ADDR_KEY]
+
+
+    def _get_web3_vars(self, network=None) -> Web3Vars:
+      if network is None:
+        network = self.evm_network
+        w3 = self.web3
+        rpc_url = self.network_rpc
+        nd_contract_address = self.nd_contract_address
+        r1_contract_address = self.r1_contract_address
+      else:
+        network_data = self.get_network_data(network)        
+        nd_contract_address = network_data[dAuth.EvmNetData.DAUTH_ND_ADDR_KEY]
+        rpc_url = network_data[dAuth.EvmNetData.DAUTH_RPC_KEY]
+        r1_contract_address = network_data[dAuth.EvmNetData.DAUTH_R1_ADDR_KEY]
+        w3 = Web3(Web3.HTTPProvider(rpc_url)) 
+        self.P(f"Created temporary Web3 for {network=} via {rpc_url=}...", verbosity=2)
+      result = Web3Vars(
+        w3=w3, rpc_url=rpc_url, nd_contract_address=nd_contract_address, 
+        r1_contract_address=r1_contract_address, network=network
+      )
+      return result
+
+
+  # EVM signing methods (internal)
+  if True:
+    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
     
-    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]
+    def eth_sign_message(self, types, values):
+      """
+      Signs a message using the private key.
+
+      Parameters
+      ----------
+      types : list
+          The types of the values.
           
-    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
+      values : list of any
+          The values to sign.
 
-    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)
+      Returns
+      -------
+      str
+          The signature of the message.
+          
+      Notes
+      -----
+      
+      This function is using the `eth_account` property generated from the private key via
+      the `_get_eth_account` method at the time of the object creation.
+      """
+      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
     
-    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.
+  ### Web3 functions
+  if True:     
+    def web3_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.
+      """
+      return self.eth_hash_message(types, values, as_hex=as_hex)
+    
+    def web3_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 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
+      Returns
+      -------
+      str
+          The signature of the message.
+          
+      Notes
+      -----
 
-    Parameters
-    ----------
-    node_address : str
-      the node address.
+      """
+      return self.eth_sign_message(types, values)
+          
+    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
       
-    lst_eth_addrs : list
-      list of Ethereum addresses.
-
-    Returns
-    -------
-    bool
-      True if the node address is in the list of Ethereum addresses.
+      w3vars = self._get_web3_vars(network)
+      
+      assert self.is_valid_eth_address(address), "Invalid Ethereum address"
+      
+      if debug:
+        self.P(f"Checking if {address} ({network}) is allowed...")
+      
+      contract_abi = dAuth.DAUTH_ABI_IS_NODE_ACTIVE
+      contract = w3vars.w3.eth.contract(address=w3vars.nd_contract_address, abi=contract_abi)
 
-    """
-    eth_addr = self.node_address_to_eth_address(node_address)
-    return eth_addr in lst_eth_addrs
+      result = contract.functions.isNodeActive(address).call()
+      return result
 
 
-  def eth_hash_message(self, types, values, as_hex=False):
-    """
-    Hashes a message using the keccak256 algorithm.
+    def web3_get_oracles(self, network=None, debug=False) -> list:
+      """
+      Get the list of oracles from the contract
 
-    Parameters
-    ----------
-    types : list
-        The types of the values.
-        
-    values : list of any
-        The values to hash.
+      Parameters
+      ----------
+      network : str, optional
+        the network to use. The default is None.
 
-    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.
+      Returns
+      -------
+      list
+        the list of oracles addresses.
 
-    Parameters
-    ----------
-    types : list
-        The types of the values.
-        
-    values : list of any
-        The values to sign.
+      """
+      w3vars = self._get_web3_vars(network)
 
-    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.
+      if debug:
+        self.P(f"Getting oracles for {w3vars.network} via {w3vars.rpc_url}...")
+      
+      contract_abi = dAuth.DAUTH_ABI_GET_SIGNERS
+      contract = w3vars.w3.eth.contract(
+        address=w3vars.nd_contract_address, abi=contract_abi
+      )
 
-    Parameters
-    ----------
-    message : str
-        The message to sign.
-        
-    signature_only : bool, optional
-        Whether to return only the signature. The default is True
+      result = contract.functions.getSigners().call()
+      return result    
 
-    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 web3_get_balance_eth(self, address=None, network=None):
+      """
+      Get the ETH balance of the address
+
+      Parameters
+      ----------
+      address : str
+          The address to check.
+
+      Returns
+      -------
+      float
+          The balance of the address.
+      """
+      if address is None:
+        address = self.eth_address
+      assert self.is_valid_eth_address(address), "Invalid Ethereum address"
+      w3vars = self._get_web3_vars(network)
+      balance_wei = w3vars.w3.eth.get_balance(address)
+      balance_eth = w3vars.w3.from_wei(balance_wei, 'ether')
+      return float(balance_eth)
+
+
+    def web3_send_eth(
+      self, 
+      to_address, 
+      amount_eth, 
+      extra_buffer_eth=0.005, 
+      network=None,
+      wait_for_tx=True,
+      timeout=120,
+      return_receipt=False,
+      raise_if_error=False,
+    ):
+      """
+      Send ETH from the account associated with this object to another address,
+      ensuring there is enough balance to cover the transfer amount, gas costs,
+      and an additional buffer.
+
+      Parameters
+      ----------
+      to_address : str
+          The recipient Ethereum address.
+          
+      amount_eth : float
+          The amount of ETH to send.
+          
+      extra_buffer_eth : float, optional
+          An additional amount (in ETH) as a safety margin. Default is 0.005 ETH.
+          
+      network : str, optional
+          The network to use. Default is None.
+      
+      wait_for_tx : bool, optional
+          Whether to wait for the transaction to be mined. Default is True.
+          
+      timeout : int, optional 
+          The maximum time to wait for the transaction to be mined, in seconds. Default is 120 seconds.
+          
+      return_receipt : bool, optional
+          If True, returns the transaction receipt instead of the transaction hash. Default is False.
+          
+      raise_if_error : bool, optional
+          If True, raises an exception if the transaction fails. Default is False.
+
+      Returns
+      -------
+      str
+          The transaction hash of the broadcasted transaction.
+      """
+      w3vars = self._get_web3_vars(network=network)
+      network = w3vars.network
+      
+      # Get the sender's address from the object's stored attribute (assumed available)
+      from_address = self.eth_address
+
+      # Fetch the current balance (in Wei)
+      balance_wei = w3vars.w3.eth.get_balance(from_address)
+      
+      # Define gas parameters for a standard ETH transfer.
+      gas_limit = 21000  # typical gas limit for a simple ETH transfer
+      gas_price = w3vars.w3.to_wei('50', 'gwei')  # example gas price; you may choose a dynamic approach
+      
+      # Calculate the total gas cost.
+      gas_cost = gas_limit * gas_price
+      
+      # Convert transfer amount and buffer to Wei.
+      amount_wei = w3vars.w3.to_wei(amount_eth, 'ether')
+      extra_buffer = w3vars.w3.to_wei(extra_buffer_eth, 'ether')
+      
+      # Compute the total cost: amount to send + gas cost + extra buffer.
+      total_cost = amount_wei + gas_cost + extra_buffer
+      
+      # Check if the balance is sufficient.
+      if balance_wei < total_cost:
+        msg = "Insufficient funds: your balance is less than the required amount plus gas cost and buffer."
+        if raise_if_error:
+          raise Exception(msg)
+        else:
+          self.P(msg, color='r')
+          return None
+      
+      # Get the nonce for the transaction.
+      nonce = w3vars.w3.eth.get_transaction_count(from_address)
+      
+      chain_id = w3vars.w3.eth.chain_id
+          
+      # Build the transaction dictionary.
+      tx = {
+        'nonce': nonce,
+        'to': to_address,
+        'value': amount_wei,
+        'gas': gas_limit,
+        'gasPrice': gas_price,
+        'chainId': chain_id,
+      }
+      
+      self.P(f"Executing transaction on {network} via {w3vars.rpc_url}:\n {json.dumps(tx, indent=2)}", verbosity=2)
+          
+      # Sign the transaction with the account's private key.
+      signed_tx = w3vars.w3.eth.account.sign_transaction(tx, self.eth_account.key)
+      
+      # Broadcast the signed transaction.
+      tx_hash = w3vars.w3.eth.send_raw_transaction(signed_tx.raw_transaction)
+      
+      if wait_for_tx:
+        # Wait for the transaction receipt with the specified timeout.
+        self.P("Waiting for transaction to be mined...", verbosity=2)
+        tx_receipt = w3vars.w3.eth.wait_for_transaction_receipt(tx_hash, timeout=timeout)
+        tx_hash_hex = tx_receipt.transactionHash.hex()
+        self.P(f"Transaction mined: {tx_hash_hex}", color='g', verbosity=2)
+        if return_receipt:          
+          return tx_receipt
+        else:
+          return tx_hash_hex
+      else:
+        return tx_hash.hex()
+
+
+    def web3_get_balance_r1(self, address=None, network=None):
+      """
+      Get the R1 balance of the address
+
+      Parameters
+      ----------
+      address : str
+          The address to check.
+
+      Returns
+      -------
+      float
+          The balance of the address.
+      """
+      if address is None:
+        address = self.eth_address
+      assert self.is_valid_eth_address(address), "Invalid Ethereum address"
+      w3vars = self._get_web3_vars(network)
+
+      token_contract = w3vars.w3.eth.contract(
+        address=w3vars.r1_contract_address, abi=ERC20_ABI
+      )
+
+      try:
+          decimals = token_contract.functions.decimals().call()
+      except Exception:
+          decimals = 18  # default to 18 if the decimals call fails
+
+      raw_balance = token_contract.functions.balanceOf(address).call()
+      human_balance = raw_balance / (10 ** decimals)
+      return float(human_balance)
     
-  def eth_sign_node_epochs(
-    self, 
-    node, 
-    epochs, 
-    epochs_vals, 
-    signature_only=True, 
-    use_evm_node_addr=True
-  ):
-    """
-    Signs the node availability
+    def web3_send_r1(
+      self,
+      to_address: str,
+      amount: float,
+      extra_buffer_eth: float = 0.005,
+      wait_for_tx: bool = False,
+      timeout: int = 120,
+      network: str = None,
+      return_receipt=False,
+      raise_if_error=False,
+    ):
+      """
+      Send R1 tokens from the default account (self.eth_address) to the specified address.
+
+      Parameters
+      ----------
+      to_address : str
+          The recipient's Ethereum address.
+          
+      amount : float
+          The amount of R1 tokens to send (in human-readable units).
+          
+      extra_buffer_eth : float, optional
+          Additional ETH (in Ether) as a buffer for gas fees. Default is 0.005 ETH.
+          
+      wait_for_tx : bool, optional
+          If True, waits for the transaction to be mined and returns the receipt.
+          If False, returns immediately with the transaction hash.
+          
+      timeout : int, optional
+          Maximum number of seconds to wait for the transaction receipt. Default is 120.
+          
+      network : str, optional
+          The network to use. If None, uses the default self.evm_network.
 
-    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.
+      return_receipt: bool, optional
+          If True, returns the transaction receipt instead of the transaction hash.
+          
+      raise_if_error : bool, optional
+          If True, raises an exception if the transaction fails. Default is False.  
+          
+      Returns
+      -------
+          If wait_for_tx is False, returns the transaction hash as a string.
+          If wait_for_tx is True, returns the transaction receipt as a dict.
+      """
+      # Validate the recipient address.
+      assert self.is_valid_eth_address(to_address), "Invalid Ethereum address"
+      
+      # Retrieve the Web3 instance, RPC URL, and the R1 contract address.
+      # Note: This follows the same pattern as web3_get_balance_r1.
+      w3vars = self._get_web3_vars(network)
+      network = w3vars.network
+      
+      # Create the token contract instance.
+      token_contract = w3vars.w3.eth.contract(
+        address=w3vars.r1_contract_address, abi=ERC20_ABI
+      )
+      
+      # Get the token's decimals (default to 18 if not available).
+      try:
+          decimals = token_contract.functions.decimals().call()
+      except Exception:
+          decimals = 18
+
+      # Convert the human-readable amount to the token's smallest unit.
+      token_amount = int(amount * (10 ** decimals))
+      
+      # Ensure the sender has enough R1 token balance.
+      sender_balance = token_contract.functions.balanceOf(self.eth_address).call()
+      if sender_balance < token_amount:
+        msg = "Insufficient funds: your $R1 balance is less than the required amount."
+        if raise_if_error:
+          raise Exception(msg)
+        else:
+          self.P(msg, color='r')
+          return None
+      
+      # Estimate gas fees for the token transfer.
+      gas_price = w3vars.w3.to_wei('50', 'gwei')  # Adjust as needed or use a dynamic gas strategy.
+      estimated_gas = token_contract.functions.transfer(
+        to_address, token_amount
+      ).estimate_gas(
+        {'from': self.eth_address}
+      )
+      gas_cost = estimated_gas * gas_price
+      
+      # Check that the sender's ETH balance can cover gas costs plus an extra buffer.
+      eth_balance = w3vars.w3.eth.get_balance(self.eth_address)
+      extra_buffer = w3vars.w3.to_wei(extra_buffer_eth, 'ether')
+      if eth_balance < gas_cost + extra_buffer:
+          raise Exception("Insufficient ETH balance to cover gas fees and extra buffer.")
+      
+      # Get the transaction count for the nonce.
+      nonce = w3vars.w3.eth.get_transaction_count(self.eth_address)
+      
+      # Programmatically determine the chainId.
+      chain_id = w3vars.w3.eth.chain_id
+
+      # Build the transaction for the ERC20 transfer.
+      tx = token_contract.functions.transfer(to_address, token_amount).build_transaction({
+        'from': self.eth_address,
+        'nonce': nonce,
+        'gas': estimated_gas,
+        'gasPrice': gas_price,
+        'chainId': chain_id,
+      })
+      
+      self.P(f"Executing transaction on {network} via {w3vars.rpc_url}:\n {json.dumps(dict(tx), indent=2)}", verbosity=2)      
+      
+      # Sign the transaction using the internal account (via _get_eth_account).
+      eth_account = self._get_eth_account()
+      signed_tx = w3vars.w3.eth.account.sign_transaction(tx, eth_account.key)
+      
+      # Broadcast the transaction.
+      tx_hash = w3vars.w3.eth.send_raw_transaction(signed_tx.raw_transaction)
+      
+      if wait_for_tx:
+        # Wait for the transaction receipt if required.
+        tx_receipt = w3vars.w3.eth.wait_for_transaction_receipt(tx_hash, timeout=timeout)
+        tx_hash_hex = tx_receipt.transactionHash.hex()
+        self.P(f"Transaction mined: {tx_hash_hex}", color='g', verbosity=2)
+        if return_receipt:          
+          return tx_receipt
+        else:
+          return tx_hash_hex
+      else:
+        return tx_hash.hex()
 
-    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/cli/nodes.py

@@ -76,6 +76,8 @@ def get_nodes(args):
     log_with_color(f"No supervisors or no comms available in {elapsed:.1f}s. Please check your settings.", color='r')
   else:
     log_with_color(f"<{network}> {prefix}odes reported by <{supervisor}> '{super_alias}' in {elapsed:.1f}s ({nr_supers} supervisors seen):", color='b')
+    import pandas as pd
+    pd.set_option('display.float_format', '{:.4f}'.format)
     log_with_color(f"{df}")    
   return
   

naeural_client/const/evm_net.py

@@ -2,6 +2,7 @@ class EvmNetData:
   DAUTH_URL_KEY = 'EE_DAUTH_URL'
   DAUTH_ND_ADDR_KEY = 'EE_DAUTH_ND_ADDR'
   DAUTH_RPC_KEY = 'EE_DAUTH_RPC'
+  DAUTH_R1_ADDR_KEY = 'EE_DAUTH_R1_ADDR'
   
   EE_GENESIS_EPOCH_DATE_KEY = 'EE_GENESIS_EPOCH_DATE'
   EE_EPOCH_INTERVALS_KEY = 'EE_EPOCH_INTERVALS'
@@ -15,6 +16,7 @@ EVM_NET_DATA = {
   'mainnet': {
     EvmNetData.DAUTH_URL_KEY                    : "https://dauth.ratio1.ai/get_auth_data",
     EvmNetData.DAUTH_ND_ADDR_KEY                : "0xE20198EE2B76eED916A568a47cdea9681f7c79BF",
+    EvmNetData.DAUTH_R1_ADDR_KEY                : "0xc992DcaB6D3F8783fBf0c935E7bCeB20aa50A6f1",
     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,
@@ -26,6 +28,7 @@ EVM_NET_DATA = {
   'testnet': {
     EvmNetData.DAUTH_URL_KEY                    : "https://testnet-dauth.ratio1.ai/get_auth_data",
     EvmNetData.DAUTH_ND_ADDR_KEY                : "0xE20198EE2B76eED916A568a47cdea9681f7c79BF",
+    EvmNetData.DAUTH_R1_ADDR_KEY                : "0xc992DcaB6D3F8783fBf0c935E7bCeB20aa50A6f1",
     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,
@@ -38,6 +41,7 @@ EVM_NET_DATA = {
   'devnet' : {
     EvmNetData.DAUTH_URL_KEY                    : "https://devnet-dauth.ratio1.ai/get_auth_data",
     EvmNetData.DAUTH_ND_ADDR_KEY                : "0x9f49fc29366F1C8285d42e7E82cA0bb668B32CeA",
+    EvmNetData.DAUTH_R1_ADDR_KEY                : "0xEF38a3d84D3E3111fb7b794Ba3240187b8B32825",
     EvmNetData.DAUTH_RPC_KEY                    : "https://base-sepolia.public.blastapi.io",
     EvmNetData.EE_GENESIS_EPOCH_DATE_KEY        : "2025-02-12 16:00:00",
     EvmNetData.EE_EPOCH_INTERVALS_KEY           : 1,

{naeural_client-3.0.8.dist-info → naeural_client-3.1.0.dist-info}/METADATA

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

@@ -1,10 +1,10 @@
 naeural_client/__init__.py,sha256=YimqgDbjLuywsf8zCWE0EaUXH4MBUrqLxt0TDV558hQ,632
-naeural_client/_ver.py,sha256=agGbq5olvN2ffZrM6LrywhSzIGk7JKT-eRMKkI0bRjM,330
+naeural_client/_ver.py,sha256=38HgbYd0O610ADMgWk8TVOk4AsO8FARwG5095hnCzG4,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
 naeural_client/base/distributed_custom_code_presets.py,sha256=cvz5R88P6Z5V61Ce1vHVVh8bOkgXd6gve_vdESDNAsg,2544
-naeural_client/base/generic_session.py,sha256=UVrcCfq9W-wBCF8b3XTFtNzXJ2NDaBJKPx5NWwIW1Xk,115925
+naeural_client/base/generic_session.py,sha256=eIN-VG1Mr7Z8fqZBngUvS29a0QdAnxT1TIgZxjvXEHE,116714
 naeural_client/base/instance.py,sha256=bDb9y9ez1vLEGGOCAACQoil7Dw-h7UAwCc18IEfqEas,20789
 naeural_client/base/pipeline.py,sha256=GYqDd59QQEn7_MTM_dhWsZtdit5q3rECC8HEivWXowo,60068
 naeural_client/base/plugin_template.py,sha256=7YAFaND2iXoZLgtunjYkFf_TBGieFr3VdNLO3vCqzmM,138795
@@ -14,17 +14,17 @@ 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=zhfzFFMYSmWB-2KLclvnEF35jobrNLFLIFc4ZvxCcE0,44568
+naeural_client/bc/base.py,sha256=CNFhPYMj45oVoP0xU9w8VzLUOBHgSljj8pFIzxjUwLg,44568
 naeural_client/bc/chain.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 naeural_client/bc/ec.py,sha256=FwlkWmJvQ9aHuf_BZX1CWSUAxw6OZ9jBparLIWcs_e4,18933
-naeural_client/bc/evm.py,sha256=3QwHxU5nOM03OmcxtxaqCBaoft2o-QuAQ-hWD-miKJI,8937
+naeural_client/bc/evm.py,sha256=mb1jltZ-KYSQVY75CSXtr8OtXwQyaMGVSl67-UCs620,23869
 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
 naeural_client/cli/README.md,sha256=WPdI_EjzAbUW1aPyj1sSR8rLydcJKZtoiaEtklQrjHo,74
 naeural_client/cli/cli.py,sha256=MH43FKpUfEG5Y8x8n1KZQh3UaSiLOwyvrWiYp_wLVW4,4070
 naeural_client/cli/cli_commands.py,sha256=XfZGVCSD2-rUr2EdQXOxxN2VwQd2f2aTMeSgRzXnuvs,3829
-naeural_client/cli/nodes.py,sha256=53-Ht42Xiq3rJEVA2ErZHLLC9OUjh6-rNGrc2RA-U8o,5733
+naeural_client/cli/nodes.py,sha256=F7_qGplqOnrU2vLqBYFFn3ifgSoWHarHPrx89I6JI9w,5816
 naeural_client/cli/oracles.py,sha256=Y_PzHshfSERS_Utjjtw5d_BsQRdGr6P4L6uW8yTdA0M,4809
 naeural_client/code_cheker/__init__.py,sha256=pwkdeZGVL16ZA4Qf2mRahEhoOvKhL7FyuQbMFLr1E5M,33
 naeural_client/code_cheker/base.py,sha256=lT5DRIFO5rqzsMNCmdMRfkAeevmezozehyfgmhnKpuI,19074
@@ -38,7 +38,7 @@ naeural_client/const/apps.py,sha256=ePBiJXLuPfFOKuw-LJrT9OWbaodU7QApfDurIPNDoB4,
 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=IEX8t7OcDwONfYcqooZjmgsbFeWy6VynKHK-7nZD0KM,2891
+naeural_client/const/evm_net.py,sha256=ZBlnyuNrcaLzyisckgDE_1bnM2udPo0vmOAesyS98V0,3220
 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
@@ -96,8 +96,8 @@ naeural_client/utils/comm_utils.py,sha256=4cS9llRr_pK_3rNgDcRMCQwYPO0kcNU7AdWy_L
 naeural_client/utils/config.py,sha256=upTCJWpZ-Or8V_71DHrIZ429LKn08KNySKcw0WIADcc,10348
 naeural_client/utils/dotenv.py,sha256=_AgSo35n7EnQv5yDyu7C7i0kHragLJoCGydHjvOkrYY,2008
 naeural_client/utils/oracle_sync/oracle_tester.py,sha256=X-923ccjkr6_kzbbiuAAcWSIhMtBDOH2VURjTh55apQ,27235
-naeural_client-3.0.8.dist-info/METADATA,sha256=YL5ezBTn3NKUskdV7k5H1DuWYtHlMI9Q0bWiDYjVTrA,12353
-naeural_client-3.0.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-naeural_client-3.0.8.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
-naeural_client-3.0.8.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-naeural_client-3.0.8.dist-info/RECORD,,
+naeural_client-3.1.0.dist-info/METADATA,sha256=vsuimbxed9PBhcijsT7y795y4TEaztysc2tCnIogIEY,12353
+naeural_client-3.1.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+naeural_client-3.1.0.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
+naeural_client-3.1.0.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+naeural_client-3.1.0.dist-info/RECORD,,