py-near 1.1.43__tar.gz → 1.1.45__tar.gz

{py_near-1.1.43 → py_near-1.1.45}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-near
-Version: 1.1.43
+Version: 1.1.45
 Summary: Pretty simple and fully asynchronous framework for working with NEAR blockchain
 Author: pvolnov
 Author-email: petr@herewallet.app

{py_near-1.1.43 → py_near-1.1.45}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "py-near"
-version = "1.1.43"
+version = "1.1.45"
 description="Pretty simple and fully asynchronous framework for working with NEAR blockchain"
 authors = ["pvolnov <petr@herewallet.app>"]
 readme = "README.md"
@@ -22,7 +22,7 @@ base58 = "^2.1.1"
 
 [project]
 name = "py-near"
-version = "1.1.43"
+version = "1.1.45"
 description = "Pretty simple and fully asynchronous framework for working with NEAR blockchaink"
 authors = [ {name = "pvolnov", email = "petr@herewallet.app"} ]
 requires-python = ">=3.7"

{py_near-1.1.43 → py_near-1.1.45}/src/py_near/providers.py

@@ -61,10 +61,9 @@ class JsonProvider(object):
         self._last_rpc_addr_check = 0
         self.allow_broadcast = allow_broadcast
         self._timeout = timeout
-        self.session = aiohttp.ClientSession()
 
     async def shutdown(self):
-        await self.session.close()
+        pass
 
     async def check_available_rpcs(self):
         if (
@@ -81,7 +80,8 @@ class JsonProvider(object):
             await asyncio.sleep(3)
 
         if not self._available_rpcs:
-            raise RpcNotAvailableError("All RPCs are unavailable")
+            self._available_rpcs = self._rpc_addresses.copy()
+            logger.error("All RPCs are async, reset to default list")
 
     async def _check_available_rpcs(self):
         available_rpcs = []
@@ -93,8 +93,15 @@ class JsonProvider(object):
                     "params": {"finality": "final"},
                     "id": 1,
                 }
+                auth_key = "py-near"
+                if "@" in rpc_addr:
+                    auth_key = rpc_addr.split("//")[1].split("@")[0]
+                    rpc_addr = rpc_addr.replace(auth_key + "@", "")
                 async with aiohttp.ClientSession() as session:
-                    async with session.post(rpc_addr, json=data) as r:
+                    async with session.post(rpc_addr, json=data, headers={
+                        "Referer": "https://tgapp.herewallet.app",
+                        "Authorization": f"Bearer {auth_key}",
+                    }) as r:
                         if r.status == 200:
                             data = json.loads(await r.text())["result"]
                             if data["sync_info"]["syncing"]:
@@ -119,6 +126,7 @@ class JsonProvider(object):
             except Exception as e:
                 if rpc_addr in self._available_rpcs:
                     logger.error(f"Remove rpc: {e}")
+                logger.error(f"Rpc check error: {e}")
         self._available_rpcs = available_rpcs
 
     @staticmethod
@@ -163,6 +171,7 @@ class JsonProvider(object):
             ]
 
             responses = []
+            correct_responses = []
             while pending and len(pending):
                 done, pending = await asyncio.wait(
                     pending, return_when=asyncio.FIRST_COMPLETED
@@ -175,7 +184,7 @@ class JsonProvider(object):
                         responses.append(result)
                     except Exception as e:
                         logger.warning(e)
-                if responses:
+                if responses and threshold:
                     array = [hash(json.dumps(x)) for x in responses]
                     most_frequent_element = self.most_frequent_by_hash(array)
                     correct_responses = [
@@ -185,6 +194,7 @@ class JsonProvider(object):
                         for task in pending:
                             task.cancel()
                         return most_frequent_element
+            raise RpcEmptyResponse(f"Threshold not reached: {len(correct_responses)}/{threshold}")
         else:
             for rpc_addr in self._available_rpcs:
                 try: