naeural-client 2.6.11__py3-none-any.whl → 2.6.14__py3-none-any.whl

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/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/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.dist-info → naeural_client-2.6.14.dist-info}/METADATA

@@ -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.dist-info → naeural_client-2.6.14.dist-info}/RECORD

@@ -1,5 +1,5 @@
 naeural_client/__init__.py,sha256=YimqgDbjLuywsf8zCWE0EaUXH4MBUrqLxt0TDV558hQ,632
-naeural_client/_ver.py,sha256=DptYuPW6mJovNNYWBJDpDjURb7EaP7awqEvtRD_YvcE,331
+naeural_client/_ver.py,sha256=suKXv38GGYBJ0RcB_6qcC-hc1VP14y80oKWh1Ov0_Xg,331
 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
@@ -14,7 +14,7 @@ naeural_client/base/webapp_pipeline.py,sha256=QmPLVmhP0CPdi0YuvbZEH4APYz2Amtw3gy
 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=sBWApNp_9gm4IIgSTwfZpTyskI74sgS2fdls2fm2kOQ,35554
+naeural_client/bc/base.py,sha256=hVdk_Vxi94jMy6OJfbYVrbQgMCNNi3BgVOj_NCw5cKc,36159
 naeural_client/bc/chain.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 naeural_client/bc/ec.py,sha256=qI8l7YqiS4MNftlx-tF7IZUswrSeQc7KMn5OZ0fEaJs,23370
 naeural_client/certs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -32,7 +32,7 @@ naeural_client/comm/mqtt_wrapper.py,sha256=Ig3bFZkCbWd4y_Whn2PPa91Z3aLgNbNPau6Tn
 naeural_client/const/README.md,sha256=6OHesr-f5NBuuJGryEoi_TCu2XdlhfQYlDKx_IJoXeg,177
 naeural_client/const/__init__.py,sha256=MM6Zib6i7M2qWcMkLtLx14zqU-lE-u2uPHjNvbh2jAM,478
 naeural_client/const/apps.py,sha256=gIONTZUkqPveu3DwelyJWpbFMeIR9l6DlaNg-xEfK1A,611
-naeural_client/const/base.py,sha256=Lqe9SxlijYVWvRD3jS5ThforbWu7QUO0mTNGHp4XB2Q,4424
+naeural_client/const/base.py,sha256=Ld6WuQeqm5FbARL_-xs3gXxpa46ypksHimAk1g4qanw,4467
 naeural_client/const/comms.py,sha256=La6JXWHexH8CfcBCKyT4fCIoeaoZlcm7KtZ57ab4ZgU,2201
 naeural_client/const/environment.py,sha256=iytmTDgbOjvORPwHQmc0K0r-xJx7dnnzNnqAJJiFCDA,870
 naeural_client/const/formatter.py,sha256=AW3bWlqf39uaqV4BBUuW95qKYfF2OkkU4f9hy3kSVhM,200
@@ -81,8 +81,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=v7xHikr6Z5Sbvf3opYeMhYzGWD2pe0HlRwa-aGJzUh8,6323
 naeural_client/utils/dotenv.py,sha256=_AgSo35n7EnQv5yDyu7C7i0kHragLJoCGydHjvOkrYY,2008
-naeural_client-2.6.11.dist-info/METADATA,sha256=3k54h_N0eh40gxgXGgMUVYDouqYYMZhZ6PNGQE5Gs98,13176
-naeural_client-2.6.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-naeural_client-2.6.11.dist-info/entry_points.txt,sha256=PNdyotDaQBAslZREx5luVyj0kqpQnwNACwkFNTPIHU4,55
-naeural_client-2.6.11.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-naeural_client-2.6.11.dist-info/RECORD,,
+naeural_client-2.6.14.dist-info/METADATA,sha256=tI-zL6Ld5JvnTFP9JDWK8sfx788VwVGABqbmCfubxUQ,13176
+naeural_client-2.6.14.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+naeural_client-2.6.14.dist-info/entry_points.txt,sha256=PNdyotDaQBAslZREx5luVyj0kqpQnwNACwkFNTPIHU4,55
+naeural_client-2.6.14.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+naeural_client-2.6.14.dist-info/RECORD,,