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

naeural_client/_ver.py

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

naeural_client/bc/evm.py

@@ -3,6 +3,8 @@ import os
 
 from collections import namedtuple
 
+from datetime import timezone, datetime
+
 from eth_account import Account
 from eth_utils import keccak, to_checksum_address
 from eth_account.messages import encode_defunct
@@ -14,7 +16,8 @@ EE_VPN_IMPL = str(os.environ.get(EE_VPN_IMPL_ENV_KEY, False)).lower() in [
 ]
 
 Web3Vars = namedtuple("Web3Vars", [
-  "w3", "rpc_url", "nd_contract_address", "r1_contract_address", "network"
+  "w3", "rpc_url", "nd_contract_address", "r1_contract_address", "network", 
+  "genesis_date", "epoch_length_seconds" 
 ])
 
 
@@ -224,22 +227,87 @@ class _EVMMixin:
       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)) 
+        w3 = None
+        
+      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]
+      str_genesis_date = network_data[dAuth.EvmNetData.EE_GENESIS_EPOCH_DATE_KEY]
+      genesis_date = self.log.str_to_date(str_genesis_date).replace(tzinfo=timezone.utc)
+      ep_sec = (
+        network_data[dAuth.EvmNetData.EE_EPOCH_INTERVAL_SECONDS_KEY] * 
+        network_data[dAuth.EvmNetData.EE_EPOCH_INTERVALS_KEY]
+      )
+
+      if w3 is None:
+        w3 = Web3(Web3.HTTPProvider(rpc_url))
         self.P(f"Created temporary Web3 for {network=} via {rpc_url=}...", verbosity=2)
+      #end if
+      
       result = Web3Vars(
-        w3=w3, rpc_url=rpc_url, nd_contract_address=nd_contract_address, 
-        r1_contract_address=r1_contract_address, network=network
+        w3=w3, 
+        rpc_url=rpc_url, 
+        nd_contract_address=nd_contract_address, 
+        r1_contract_address=r1_contract_address, 
+        network=network,
+        genesis_date=genesis_date,
+        epoch_length_seconds=ep_sec
       )
       return result
 
+  # Epoch handling
+  if True:    
+    def get_epoch_id(self, date : any, network: str = None):
+      """
+      Given a date as string or datetime, returns the epoch id - ie the number of days since 
+      the genesis epoch.
+
+      Parameters
+      ----------
+      date : str or date
+        The date as string that will be converted to epoch id.
+      """
+      w3vars = self._get_web3_vars(network)
+      if isinstance(date, str):
+        # remove milliseconds from string
+        date = date.split('.')[0]
+        date = self.log.str_to_date(date)
+        # again this is correct to replace in order to have a timezone aware date
+        # and not consider the local timezone. the `date` string naive should be UTC offsetted
+        date = date.replace(tzinfo=timezone.utc) 
+      # compute difference between date and self.__genesis_date in seconds
+      elapsed_seconds = (date - w3vars.genesis_date).total_seconds()
+      
+      # the epoch id starts from 0 - the genesis epoch
+      # the epoch id is the number of days since the genesis epoch
+      # # TODO: change this if we move to start-from-one offset by adding +1
+      # OBS: epoch always ends at AB:CD:59 no matter what 
+      epoch_id = int(elapsed_seconds / w3vars.epoch_length_seconds) 
+      return epoch_id
+
+
+    def get_current_date(self):
+      # we convert local time to UTC time
+      return datetime.now(timezone.utc)
+
+
+    def get_time_epoch(self):
+      """
+      Returns the current epoch id.
+      """
+      return self.get_epoch_id(self.get_current_date())
+
+    
+    def get_current_epoch(self):
+      """
+      Returns the current epoch id using `get_time_epoch`.
+      """
+      return self.get_time_epoch()    
+    
+  ## End Epoch handling
+      
 
   # EVM signing methods (internal)
   if True:

naeural_client/certs/a0d9818f.ala.eu-central-1.emqxsl.com.crt

@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
+QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT
+MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
+b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB
+CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97
+nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt
+43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P
+T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4
+gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO
+BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR
+TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw
+DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr
+hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg
+06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF
+PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls
+YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
+CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
+-----END CERTIFICATE-----

naeural_client/utils/config.py

@@ -88,6 +88,7 @@ def get_user_folder():
   """
   return BaseLogger.get_user_folder(as_str=False, include_sdk_home=True)
 
+
 def get_user_config_file():
   """
   Returns the user configuration file.
@@ -95,11 +96,10 @@ def get_user_config_file():
   return get_user_folder() / CONFIG_FILE
 
 
-
-
 def get_network():
   return os.environ.get(dAuth.DAUTH_NET_ENV_KEY, dAuth.DAUTH_SDK_NET_DEFAULT)
 
+
 def get_networks(args):
   """
   Shows the network configuration.
@@ -185,6 +185,7 @@ def reset_config(*larg, keep_existing=False, **kwargs):
   show_version()
   return
 
+
 def show_address(args):
   """
   Displays the current client address.
@@ -196,6 +197,7 @@ def show_address(args):
   log_with_color(f"{sess.get_client_address()}", color='b')
   return
 
+
 def show_version(silent=True):
   from naeural_client import Session
   sess = Session(
@@ -203,10 +205,14 @@ def show_version(silent=True):
   )  
   
   user_folder = get_user_folder()  
+  
+  # TODO: get the epoch from the SDK  - AFTER moving get_epoch_id from core
+  
 
   log_with_color(f"SDK folder:     {user_folder}", color='b')
   log_with_color(f"SDK version:    {version}", color='b')
   log_with_color(f"Ratio1 network: {get_network()}", color='b')
+  log_with_color(f"Network Epoch:  {sess.bc_engine.get_current_epoch()}", color='b')
   log_with_color(f"SDK addr:       {sess.get_client_address()}", color='b')
   log_with_color(f"SDK ETH addr:   {sess.bc_engine.eth_address}", color='b')
   return

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

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

@@ -1,5 +1,5 @@
 naeural_client/__init__.py,sha256=YimqgDbjLuywsf8zCWE0EaUXH4MBUrqLxt0TDV558hQ,632
-naeural_client/_ver.py,sha256=38HgbYd0O610ADMgWk8TVOk4AsO8FARwG5095hnCzG4,330
+naeural_client/_ver.py,sha256=oELIU7G9GJjuV-9BiL-8ZqllYO1e53-SZBsHBYMM1W0,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
@@ -17,8 +17,9 @@ naeural_client/bc/__init__.py,sha256=FQj23D1PrY06NUOARiKQi4cdj0-VxnoYgYDEht8lpr8
 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=mb1jltZ-KYSQVY75CSXtr8OtXwQyaMGVSl67-UCs620,23869
+naeural_client/bc/evm.py,sha256=8_9IBum2wpw0SwWl5xBceU9p-9o4zyF6JBIJJiMr-a8,26022
 naeural_client/certs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+naeural_client/certs/a0d9818f.ala.eu-central-1.emqxsl.com.crt,sha256=y-6io0tseyx9-a4Pmde1z1gPULtJNSYUpG_YFkYaMKU,1337
 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
@@ -93,11 +94,11 @@ naeural_client/logging/tzlocal/win32.py,sha256=zBoj0vFVrGhnCm_f7xmYzGym4-fV-4Ij2
 naeural_client/logging/tzlocal/windows_tz.py,sha256=Sv9okktjZJfRGGUOOppsvQuX_eXyXUxkSKCAFmWT9Hw,34203
 naeural_client/utils/__init__.py,sha256=mAnke3-MeRzz3nhQvhuHqLnpaaCSmDxicd7Ck9uwpmI,77
 naeural_client/utils/comm_utils.py,sha256=4cS9llRr_pK_3rNgDcRMCQwYPO0kcNU7AdWy_LtMyCY,1072
-naeural_client/utils/config.py,sha256=upTCJWpZ-Or8V_71DHrIZ429LKn08KNySKcw0WIADcc,10348
+naeural_client/utils/config.py,sha256=QamxSnF6rqw91VhMWZoeO1EYUKjqWa-D8VFC1tIzTTM,10517
 naeural_client/utils/dotenv.py,sha256=_AgSo35n7EnQv5yDyu7C7i0kHragLJoCGydHjvOkrYY,2008
 naeural_client/utils/oracle_sync/oracle_tester.py,sha256=X-923ccjkr6_kzbbiuAAcWSIhMtBDOH2VURjTh55apQ,27235
-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,,
+naeural_client-3.1.2.dist-info/METADATA,sha256=Bly9lKoB7F77fKWrAwuIgGQTY-rnahBje6pcdPXCvmU,12353
+naeural_client-3.1.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+naeural_client-3.1.2.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
+naeural_client-3.1.2.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+naeural_client-3.1.2.dist-info/RECORD,,