naeural-client 2.5.26__tar.gz → 2.5.28__tar.gz

{naeural_client-2.5.26 → naeural_client-2.5.28}/PKG-INFO

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

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

{naeural_client-2.5.26 → naeural_client-2.5.28}/naeural_client/base/generic_session.py

@@ -751,7 +751,7 @@ class GenericSession(BaseDecentrAIObject):
       """
       raise NotImplementedError
 
-    def close(self, close_pipelines=False, wait_close=False, **kwargs):
+    def close(self, close_pipelines=False, wait_close=True, **kwargs):
       """
       Close the session, releasing all resources and closing all threads
       Resources are released in the main loop thread, so this method will block until the main loop thread exits.
@@ -762,7 +762,7 @@ class GenericSession(BaseDecentrAIObject):
       close_pipelines : bool, optional
           close all the pipelines created by or attached to this session (basically calling `.close_own_pipelines()` for you), by default False
       wait_close : bool, optional
-          If `True`, will wait for the main loop thread to exit. Defaults to `False`
+          If `True`, will wait for the main loop thread to exit. Defaults to `True`
       """
 
       if close_pipelines:

{naeural_client-2.5.26 → naeural_client-2.5.28}/naeural_client/bc/ec.py

@@ -766,6 +766,7 @@ class BaseBCEllipticCurveEngine(BaseBlockEngine):
         "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):
@@ -794,14 +795,21 @@ class BaseBCEllipticCurveEngine(BaseBlockEngine):
     
     
     
-  def eth_sign_node_epochs(self, node, epochs, epochs_vals, signature_only=True):
+  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.
+        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.
@@ -811,13 +819,19 @@ class BaseBCEllipticCurveEngine(BaseBlockEngine):
         
     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.
     """
-    types = ["string", "uint256[]", "uint256[]"]
+    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:

{naeural_client-2.5.26 → naeural_client-2.5.28}/pyproject.toml

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

{naeural_client-2.5.26 → naeural_client-2.5.28}/xperimental/eth/eth_sign.py

@@ -35,40 +35,26 @@ if __name__ == '__main__' :
 
    
   node = "0xai_Amfnbt3N-qg2-qGtywZIPQBTVlAnoADVRmSAsdDhlQ-6"
+  node_eth = eng1.node_address_to_eth_address(node)
+  l.P("Node: {}\nNode Eth: {}".format(node, node_eth))
   epochs = [245, 246, 247, 248, 249, 250]
   epochs_vals = [124, 37, 30, 6, 19, 4]
+  USE_ETH_ADDR = True
+  
+  if USE_ETH_ADDR:  
+    types = ["address", "uint256[]", "uint256[]"]
+    node_data = node_eth
+  else:
+    types = ["string", "uint256[]", "uint256[]"]
+    node_data = node
+    
+  values = [node_data, epochs, epochs_vals]
   
-  types = ["string", "uint256[]", "uint256[]"]
-  values = [node, epochs, epochs_vals]
-  
-  
-  from web3 import Web3
-  from eth_account import Account
-  from eth_account.messages import encode_defunct
-  
-  message_hash = Web3.solidity_keccak(types, values)
-  signable_message = encode_defunct(primitive=message_hash)
-  signed_message = Account.sign_message(signable_message, private_key=private_key)
-  
-  results = {
-    "sender" : eng1.eth_address,
-    "message_hash": message_hash.hex(),
-    "signature": signed_message.signature.hex(),
-    "signed_message": signed_message.message_hash.hex(),
-  }
-  l.P("Signable message: {}".format(signable_message))
-  l.P("Results:\n{}".format(json.dumps(results, indent=2)))
-  
+ 
   s2 = eng1.eth_sign_message(types, values)
   l.P("Results:\n{}".format(json.dumps(s2, indent=2)))
-  l.P("Signature: {}".format(eng1.eth_sign_node_epochs(node, epochs, epochs_vals)))
-  
-  
-  
-  
-  
-  
-  
-  
   
-  
+  res = eng1.eth_sign_node_epochs(node_data, epochs, epochs_vals, signature_only=False, use_evm_node_addr=USE_ETH_ADDR)
+  eth_signature = res["signature"]
+  inputs = res["eth_signed_data"]
+  l.P(f"Results:\n  Signature: {eth_signature}\n  Inputs: {inputs}")