naeural-client 2.3.3__py3-none-any.whl → 2.3.5__py3-none-any.whl

naeural_client/_ver.py

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

naeural_client/bc/base.py

@@ -14,12 +14,24 @@ from cryptography.hazmat.primitives import serialization
 
 from ..utils.config import get_user_folder
 
-
-class BCct:
+class BCctbase: 
   SIGN      = 'EE_SIGN'
   SENDER    = 'EE_SENDER'
   HASH      = 'EE_HASH'
   
+  ETH_SIGN  = 'EE_ETH_SIGN'
+  ETH_SENDER= 'EE_ETH_SENDER'
+  
+  # TODO: generate automaticall the NON_DATA_FIELDS
+  
+
+class BCct:
+  SIGN        = BCctbase.SIGN
+  SENDER      = BCctbase.SENDER
+  HASH        = BCctbase.HASH
+  ETH_SIGN    = BCctbase.ETH_SIGN
+  ETH_SENDER  = BCctbase.ETH_SENDER
+  
   ADDR_PREFIX_OLD = "aixp_"
   ADDR_PREFIX   = "0xai_"
   
@@ -56,7 +68,7 @@ class VerifyMessage(_DotDict):
     self.sender = None
     
     
-NON_DATA_FIELDS = [BCct.HASH, BCct.SIGN, BCct.SENDER]
+NON_DATA_FIELDS = [val for key, val in BCctbase.__dict__.items() if key[0] != '_']
 
 def replace_nan_inf(data, inplace=False):
   assert isinstance(data, (dict, list)), "Only dictionaries and lists are supported"
@@ -534,6 +546,25 @@ class BaseBlockEngine:
       address = address[len(BCct.ADDR_PREFIX_OLD):]
     return address
   
+  def _add_prefix(self, address):
+    """
+    Adds the prefix to the address
+
+    Parameters
+    ----------
+    address : str
+      the text address.
+
+    Returns
+    -------
+    address : str
+      the address with the prefix.
+    """
+    address = self._remove_prefix(address)
+    address = BCct.ADDR_PREFIX + address  
+    return address
+
+  
   def _pk_to_address(self, public_key):
     """
     Given a pk object will return the simple text address.
@@ -889,7 +920,7 @@ class BaseBlockEngine:
     return result
   
   
-  def sign(self, dct_data: dict, add_data=True, use_digest=True, replace_nan=True) -> str:
+  def sign(self, dct_data: dict, add_data=True, use_digest=True, replace_nan=True, eth_sign=False) -> str:
     """
     Generates the signature for a dict object.
     Does not add the signature to the dict object
@@ -908,6 +939,9 @@ class BaseBlockEngine:
       
     replace_nan: bool, optional
       will replace `np.nan` and `np.inf` with `None` before signing. 
+      
+    eth_sign: bool, optional
+      will also sign the data with the Ethereum account. Default `False`
 
     Returns
     -------
@@ -926,6 +960,7 @@ class BaseBlockEngine:
       return_all=True, 
       replace_nan=replace_nan,
     )
+    text_data = bdata.decode()
     if use_digest:
       bdata = bin_hexdigest # to-sign data is the hash
     # finally sign either full or just hash
@@ -934,6 +969,15 @@ class BaseBlockEngine:
       # not populate dict
       dct_data[BCct.SIGN] = result
       dct_data[BCct.SENDER] = self.address
+      dct_data[BCct.ETH_SENDER] = self.eth_address
+      ### add eth signature
+      dct_data[BCct.ETH_SIGN] = "0xBEEF"
+      if eth_sign:
+        eth_sign_info = self.eth_sign_text(text_data, signature_only=False)
+        # can be replaced with dct_data[BCct.ETH_SIGN] = self.eth_sign_text(bdata.decode(), signature_only=True)
+        eth_sign = eth_sign_info.get('signature')
+        dct_data[BCct.ETH_SIGN] = eth_sign
+      ### end eth signature
       if use_digest:
         dct_data[BCct.HASH] = hexdigest
     return result

naeural_client/bc/ec.py

@@ -494,6 +494,32 @@ class BaseBCEllipticCurveEngine(BaseBlockEngine):
         "sender" : self.eth_address,
     }
     
+  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):
     """
     Signs the node availability

{naeural_client-2.3.3.dist-info → naeural_client-2.3.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: naeural_client
-Version: 2.3.3
+Version: 2.3.5
 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.3.3.dist-info → naeural_client-2.3.5.dist-info}/RECORD

@@ -1,5 +1,5 @@
 naeural_client/__init__.py,sha256=UKEDGS0wFYyxwmhEAKJGecO2vYbIfRYUP4SQgnK10IE,578
-naeural_client/_ver.py,sha256=GQ_36ciIRKCRNG8bJxPw3rbxI1SLK92UEEFnv7b2rwg,330
+naeural_client/_ver.py,sha256=EWnqul34PhmTnOrLt56k1VLDiMRHZEMFzpZfYfZWZAc,330
 naeural_client/base_decentra_object.py,sha256=wXjl65gWxxkhV6Tq48wFfNGITvdYdkKPT-wLurGB5vc,4287
 naeural_client/plugins_manager_mixin.py,sha256=X1JdGLDz0gN1rPnTN_5mJXR8JmqoBFQISJXmPR9yvCo,11106
 naeural_client/base/__init__.py,sha256=hACh83_cIv7-PwYMM3bQm2IBmNqiHw-3PAfDfAEKz9A,259
@@ -13,9 +13,9 @@ naeural_client/base/transaction.py,sha256=bfs6td5M0fINgPQNxhrl_AUjb1YiilLDQ-Cd_o
 naeural_client/base/payload/__init__.py,sha256=y8fBI8tG2ObNfaXFWjyWZXwu878FRYj_I8GIbHT4GKE,29
 naeural_client/base/payload/payload.py,sha256=v50D7mBBD2WwWzvpbRGMSr-X6vv5ie21IY1aDxTqe1c,2275
 naeural_client/bc/__init__.py,sha256=FQj23D1PrY06NUOARiKQi4cdj0-VxnoYgYDEht8lpr8,158
-naeural_client/bc/base.py,sha256=GI9CbI2RVgIBXpOoRjrhXt45tONlBDMrybX_BcL3_Os,29513
+naeural_client/bc/base.py,sha256=ckUjK8f8pk5t70-hnDMPoqRwcQXlPFERNgCli2MKSKQ,30790
 naeural_client/bc/chain.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-naeural_client/bc/ec.py,sha256=raIGI7BpSH8xU_Bg7RpKv9KEW3F6PuAdL5miZfvw7iI,14027
+naeural_client/bc/ec.py,sha256=9yhMq3HEICQRLD9MO3YYlWrSIA9Dled4GAh4DVNs3h0,14593
 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/cli/README.md,sha256=WPdI_EjzAbUW1aPyj1sSR8rLydcJKZtoiaEtklQrjHo,74
@@ -80,8 +80,8 @@ naeural_client/utils/__init__.py,sha256=mAnke3-MeRzz3nhQvhuHqLnpaaCSmDxicd7Ck9uw
 naeural_client/utils/comm_utils.py,sha256=4cS9llRr_pK_3rNgDcRMCQwYPO0kcNU7AdWy_LtMyCY,1072
 naeural_client/utils/config.py,sha256=t_VzyBnRHJa-Kt71HUu9gXxeDOri1Aqf_-gjO04gAYs,3681
 naeural_client/utils/dotenv.py,sha256=_AgSo35n7EnQv5yDyu7C7i0kHragLJoCGydHjvOkrYY,2008
-naeural_client-2.3.3.dist-info/METADATA,sha256=K-DHydXlyDgYHKBW_lYVnGV3ZG0xqoePu216HbcdsPY,14449
-naeural_client-2.3.3.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-naeural_client-2.3.3.dist-info/entry_points.txt,sha256=PNdyotDaQBAslZREx5luVyj0kqpQnwNACwkFNTPIHU4,55
-naeural_client-2.3.3.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-naeural_client-2.3.3.dist-info/RECORD,,
+naeural_client-2.3.5.dist-info/METADATA,sha256=l_voa5q2PaSwS1ZqkDu_w2ncdFah_jSWomW1kEY_8Z8,14449
+naeural_client-2.3.5.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+naeural_client-2.3.5.dist-info/entry_points.txt,sha256=PNdyotDaQBAslZREx5luVyj0kqpQnwNACwkFNTPIHU4,55
+naeural_client-2.3.5.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+naeural_client-2.3.5.dist-info/RECORD,,