py-near 1.1.38__tar.gz → 1.1.39__tar.gz

{py_near-1.1.38 → py_near-1.1.39}/PKG-INFO

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

{py_near-1.1.38 → py_near-1.1.39}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "py-near"
-version = "1.1.38"
+version = "1.1.39"
 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.38"
+version = "1.1.39"
 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.38 → py_near-1.1.39}/src/py_near/providers.py

@@ -121,82 +121,66 @@ class JsonProvider(object):
     ):
         await self.check_available_rpcs()
         j = {"method": method, "params": params, "id": "dontcare", "jsonrpc": "2.0"}
-        res = {}
-        if broadcast or threshold:
 
-            async def f(rpc_call_addr):
-                async with aiohttp.ClientSession() as session:
-                    r = await session.post(
-                        rpc_call_addr,
-                        json=j,
-                        timeout=timeout,
-                        headers={
-                            "Referer": "https://tgapp.herewallet.app"
-                        },  # NEAR RPC requires Referer header
-                    )
-                    if r.status == 200:
-                        return json.loads(await r.text())
+        async def f(rpc_call_addr):
+            auth_key = "py-near"
+            if "@" in rpc_call_addr:
+                auth_key = rpc_call_addr.split("//")[1].split("@")[0]
+                rpc_call_addr = rpc_call_addr.replace(auth_key + "@", "")
+            async with aiohttp.ClientSession() as session:
+                r = await session.post(
+                    rpc_call_addr,
+                    json=j,
+                    timeout=timeout,
+                    headers={
+                        "Referer": "https://tgapp.herewallet.app",
+                        "Authorization": f"Bearer {auth_key}",
+                    },  # NEAR RPC requires Referer header
+                )
+                if r.status == 200:
+                    return json.loads(await r.text())
 
+        if broadcast or threshold:
             tasks = [
                 asyncio.create_task(f(rpc_addr)) for rpc_addr in self._available_rpcs
             ]
-            responses = []
-            for t in tasks:
-                try:
-                    responses.append(await t)
-                except Exception as e:
-                    logger.error(f"Rpc error: {e}")
-                    continue
-
-            def most_frequent_by_hash(array):
-                counter = Counter(array)
-                most_frequent = counter.most_common(1)[0][0]
-                return most_frequent
-
-            if threshold:
-                # return first most frequent response
-                array = [hash(json.dumps(x)) for x in responses]
-                most_frequent_element = most_frequent_by_hash(array)
-                correct_responses = [
-                    x for x in responses if hash(json.dumps(x)) == most_frequent_element
-                ]
-                if len(correct_responses) >= threshold:
-                    return responses[0]
-                raise Exception(
-                    f"Threshold not reached: {len(correct_responses)}/{threshold}"
-                )
-
-            if broadcast:
-                # return first response without errors
-                for res in responses:
-                    if "error" not in res:
-                        return res
-            return responses[0]
-
-        for rpc_addr in self._available_rpcs:
+        else:
+            tasks = [f(rpc_addr) for rpc_addr in self._available_rpcs]
+        responses = []
+        for t in tasks:
             try:
-                async with aiohttp.ClientSession() as session:
-                    r = await session.post(
-                        rpc_addr,
-                        json=j,
-                        timeout=timeout,
-                        headers={
-                            "Referer": "https://tgapp.herewallet.app/"
-                        },  # NEAR RPC requires Referer header
-                    )
-                    r.raise_for_status()
-                    res = json.loads(await r.text())
-                    return res
-            except (
-                RPCTimeoutError,
-                ClientResponseError,
-                ClientConnectorError,
-                ServerDisconnectedError,
-                ConnectionError,
-            ) as e:
+                res = await t
+                if res:
+                    responses.append(res)
+                    if not (broadcast or threshold):
+                        return res
+            except Exception as e:
                 logger.error(f"Rpc error: {e}")
                 continue
-        return res
+        if not responses:
+            raise RpcEmptyResponse("RPC returned empty response")
+        def most_frequent_by_hash(array):
+            counter = Counter(array)
+            most_frequent = counter.most_common(1)[0][0]
+            return most_frequent
+
+        if threshold:
+            # return first most frequent response
+            array = [hash(json.dumps(x)) for x in responses]
+            most_frequent_element = most_frequent_by_hash(array)
+            correct_responses = [
+                x for x in responses if hash(json.dumps(x)) == most_frequent_element
+            ]
+            if len(correct_responses) >= threshold:
+                return responses[0]
+            raise Exception(
+                f"Threshold not reached: {len(correct_responses)}/{threshold}"
+            )
+
+        for res in responses:
+            if "error" not in res:
+                return res
+        raise RpcEmptyResponse("RPC returned empty response")
 
     @staticmethod
     def get_error_from_response(content: dict):