py-near 1.1.42__tar.gz → 1.1.44__tar.gz

{py_near-1.1.42 → py_near-1.1.44}/PKG-INFO

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

{py_near-1.1.42 → py_near-1.1.44}/pyproject.toml

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

@@ -81,7 +81,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,31 +94,40 @@ class JsonProvider(object):
                     "params": {"finality": "final"},
                     "id": 1,
                 }
-                async with self.session.post(rpc_addr, json=data) as r:
-                    if r.status == 200:
-                        data = json.loads(await r.text())["result"]
-                        if data["sync_info"]["syncing"]:
-                            last_block_ts = datetime.datetime.fromisoformat(
-                                data["sync_info"]["latest_block_time"]
-                            )
-                            diff = (
-                                datetime.datetime.utcnow().timestamp()
-                                - last_block_ts.timestamp()
-                            )
-                            is_syncing = diff > 60
+                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, 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"]:
+                                last_block_ts = datetime.datetime.fromisoformat(
+                                    data["sync_info"]["latest_block_time"]
+                                )
+                                diff = (
+                                    datetime.datetime.utcnow().timestamp()
+                                    - last_block_ts.timestamp()
+                                )
+                                is_syncing = diff > 60
+                            else:
+                                is_syncing = False
+                            if is_syncing:
+                                logger.error(f"Remove async RPC : {rpc_addr} ({diff})")
+                                continue
+                            available_rpcs.append(rpc_addr)
                         else:
-                            is_syncing = False
-                        if is_syncing:
-                            logger.error(f"Remove async RPC : {rpc_addr} ({diff})")
-                            continue
-                        available_rpcs.append(rpc_addr)
-                    else:
-                        logger.error(
-                            f"Remove rpc because of error {r.status}: {rpc_addr}"
-                        )
+                            logger.error(
+                                f"Remove rpc because of error {r.status}: {rpc_addr}"
+                            )
             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
@@ -137,23 +147,24 @@ class JsonProvider(object):
             if "@" in rpc_call_addr:
                 auth_key = rpc_call_addr.split("//")[1].split("@")[0]
                 rpc_call_addr = rpc_call_addr.replace(auth_key + "@", "")
-            r = await self.session.post(
-                rpc_call_addr,
-                json=j,
-                timeout=self._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())
-            return {
-                "error": {
-                    "cause": {"name": "RPC_ERROR", "message": f"Status: {r.status}"},
-                    "data": await r.text(),
+            async with aiohttp.ClientSession() as session:
+                r = await session.post(
+                    rpc_call_addr,
+                    json=j,
+                    timeout=self._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())
+                return {
+                    "error": {
+                        "cause": {"name": "RPC_ERROR", "message": f"Status: {r.status}"},
+                        "data": await r.text(),
+                    }
                 }
-            }
 
         if broadcast or threshold:
             pending = [
@@ -161,6 +172,7 @@ class JsonProvider(object):
             ]
 
             responses = []
+            correct_responses = []
             while pending and len(pending):
                 done, pending = await asyncio.wait(
                     pending, return_when=asyncio.FIRST_COMPLETED
@@ -173,7 +185,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 = [
@@ -183,6 +195,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: