py-near 1.1.49__tar.gz → 1.1.50__tar.gz

{py_near-1.1.49 → py_near-1.1.50}/PKG-INFO

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

{py_near-1.1.49 → py_near-1.1.50}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "py-near"
-version = "1.1.49"
+version = "1.1.50"
 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.49"
+version = "1.1.50"
 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.49 → py_near-1.1.50}/src/py_near/models.py

@@ -48,8 +48,10 @@ class ReceiptOutcome:
     tokens_burnt: str
     executor_id: str
     gas_burnt: int
+    receipt_id: str
 
     def __init__(self, data):
+        self.receipt_id = data['id']
         self.logs = data["outcome"]["logs"]
         self.metadata = data["outcome"]["metadata"]
         self.receipt_ids = data["outcome"]["receipt_ids"]

{py_near-1.1.49 → py_near-1.1.50}/src/py_near/providers.py

@@ -6,6 +6,7 @@ from collections import Counter
 from typing import Optional
 
 import httpx
+from httpx import Limits
 from loguru import logger
 
 from py_near.constants import TIMEOUT_WAIT_RPC
@@ -60,29 +61,13 @@ class JsonProvider(object):
         self._last_rpc_addr_check = 0
         self.allow_broadcast = allow_broadcast
         self._timeout = timeout
-        self._client: httpx.AsyncClient = httpx.AsyncClient()
+        self._client = httpx.AsyncClient(
+            limits=Limits(max_connections=1000, max_keepalive_connections=200)
+        )
 
     async def shutdown(self):
         pass
 
-    async def check_available_rpcs(self):
-        if (
-            self._last_rpc_addr_check < datetime.datetime.now().timestamp() - 30
-            or not self._available_rpcs
-        ):
-            self._last_rpc_addr_check = datetime.datetime.now().timestamp()
-            asyncio.create_task(self._check_available_rpcs())
-
-        for _ in range(5):
-            if self._available_rpcs:
-                break
-            await self._check_available_rpcs()
-            await asyncio.sleep(3)
-
-        if not self._available_rpcs:
-            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 = []
         for rpc_addr in self._rpc_addresses:
@@ -132,7 +117,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}")
+                logger.exception(e)
         self._available_rpcs = available_rpcs
 
     @staticmethod
@@ -144,7 +129,6 @@ class JsonProvider(object):
     async def call_rpc_request(
         self, method, params, broadcast=False, threshold: int = 0
     ):
-        await self.check_available_rpcs()
         j = {"method": method, "params": params, "id": "dontcare", "jsonrpc": "2.0"}
 
         async def f(rpc_call_addr):
@@ -325,7 +309,6 @@ class JsonProvider(object):
                 return await self.wait_for_trx(trx_hash, receiver_id)
 
     async def get_status(self):
-        await self.check_available_rpcs()
         for rpc_addr in self._available_rpcs.copy():
             try:
                 data = {
@@ -340,9 +323,7 @@ class JsonProvider(object):
                 if "@" in rpc_addr:
                     auth_key = rpc_addr.split("//")[1].split("@")[0]
                     rpc_addr = rpc_addr.replace(auth_key + "@", "")
-                    headers = {
-                        "Authorization": f"Bearer {auth_key}"
-                    }
+                    headers = {"Authorization": f"Bearer {auth_key}"}
                 r = await self._client.post(rpc_addr, json=data, headers=headers)
                 if r.status_code == 200:
                     return json.loads(r.text)["result"]