naeural-client 2.6.11__tar.gz → 2.6.14__tar.gz

{naeural_client-2.6.11 → naeural_client-2.6.14}/PKG-INFO

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

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

{naeural_client-2.6.11 → naeural_client-2.6.14}/naeural_client/bc/base.py

@@ -260,6 +260,7 @@ class BaseBlockEngine:
   
   """
   _lock: Lock = Lock()
+  _whitelist_lock : Lock = Lock()
   __instances = {}
   
   def __new__(
@@ -544,25 +545,42 @@ class BaseBlockEngine:
     
   
   def _load_and_maybe_create_allowed(self):
-    fn = self._get_allowed_file()
-    lst_allowed = []
-    if os.path.isfile(fn):
-      with open(fn, 'rt') as fh:
-        lst_allowed = fh.readlines()
-    else:
-      full_path = os.path.abspath(fn)
-      self.P("WARNING: no `{}` file found. Creating empty one.".format(full_path), verbosity=1)
-      with open(fn, 'wt') as fh:
-        fh.write('\n')
-    lst_allowed = [x.strip() for x in lst_allowed]
-    lst_allowed = [x.split()[0] for x in lst_allowed if x != '']
-    lst_allowed = [self._remove_prefix(x) for x in lst_allowed if x != '']
     lst_final = []
-    for allowed in lst_allowed:
-      if not self.address_is_valid(allowed):
-        self.P("WARNING: address <{}> is not valid. Removing from allowed list.".format(allowed), color='r')
-      else:
-        lst_final.append(allowed)
+    with self._whitelist_lock:
+      try:
+        fn = self._get_allowed_file()
+        lst_allowed = []
+        if os.path.isfile(fn):
+          with open(fn, 'rt') as fh:
+            lst_allowed = fh.readlines()
+        else:
+          full_path = os.path.abspath(fn)
+          self.P("WARNING: no `{}` file found. Creating empty one.".format(full_path), verbosity=1)
+          with open(fn, 'wt') as fh:
+            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
+        for allowed_tuple in lst_allowed:
+          allowed = allowed_tuple.split()[0]
+          allowed = self._remove_prefix(allowed)
+          if not self.address_is_valid(allowed):
+            self.P("WARNING: address <{}> is not valid. Removing {} from allowed list.".format(
+              allowed, allowed_tuple), color='r'
+            )
+            errors = True
+          else:
+            lst_final.append(allowed)
+            lst_lines.append(allowed_tuple)
+        if errors:
+          with open(fn, 'wt') as fh:
+            for line in lst_lines:
+              fh.write("{}\n".format(line))   
+      except Exception as exc:
+        self.P(f"ERROR: failed to load the allowed list of addresses: {exc}", color='r')
+      #endtry
+    #endwith
     return lst_final
   
         

{naeural_client-2.6.11 → naeural_client-2.6.14}/naeural_client/const/base.py

@@ -12,10 +12,12 @@ class BCctbase:
 
 DAUTH_URL = 'https://dauth.ratio1.ai/get_auth_data'
 DAUTH_SUBKEY = 'auth'
-DAUTH_ENV_KEY = 'DAUTH_URL'
+DAUTH_ENV_KEY = 'EE_DAUTH_URL'
 DAUTH_NONCE = 'nonce'
 DAUTH_VARS = [DAUTH_NONCE, BCctbase.SIGN, BCctbase.SENDER, BCctbase.HASH]
 
+ETH_ENABLED_ENV_KEY = 'EE_ETH_ENABLED'
+
 
 class LocalInfo:
   LOCAL_INFO_FILE = 'local_info.json'

{naeural_client-2.6.11 → naeural_client-2.6.14}/pyproject.toml

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