py-near 1.1.48__py3-none-any.whl → 1.1.50__py3-none-any.whl

py_near/account.py

@@ -1,8 +1,17 @@
 import asyncio
 import collections
 import json
+import sys
 from typing import List, Union, Dict, Optional
 
+if sys.version_info.major == 3 and sys.version_info.minor >= 10:
+    from collections.abc import MutableSet, MutableMapping
+
+    collections.MutableSet = collections.abc.MutableSet
+    collections.MutableMapping = collections.abc.MutableMapping
+else:
+    from collections import MutableSet
+
 import base58
 import ed25519
 from loguru import logger

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/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"]

{py_near-1.1.48.dist-info → py_near-1.1.50.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-near
-Version: 1.1.48
+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.48.dist-info → py_near-1.1.50.dist-info}/RECORD

@@ -1,5 +1,5 @@
 py_near/__init__.py,sha256=t5fAxjaU8dN8xpQR2vz0ZGhfTkdVy2RCbkhJhZFglk4,50
-py_near/account.py,sha256=hz-LZpGvy1cE0_iHX4_TGpOpJ5gfe0P9EAJ_0b-S8E0,17805
+py_near/account.py,sha256=77jCtVaGXK_ejQ0SyRYRgJ4Ez1DaWByfAX94Uuph-aw,18107
 py_near/constants.py,sha256=inaWIuwmF1EB5JSB0ynnZY5rKY_QsxhF9KuCOhPsM6k,164
 py_near/dapps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 py_near/dapps/core.py,sha256=LtN9aW2gw2mvEdhzQcQJIidtjv-XL1xjb0LK8DzqtqE,231
@@ -19,11 +19,11 @@ py_near/dapps/staking/models.py,sha256=zC5M_pc1oMqHq4GaYif1uwFbW6acD2BsiA9rbyiaU
 py_near/exceptions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 py_near/exceptions/exceptions.py,sha256=DEFipaAHm0y7oCuN2QKzHsiQvUTUQVl-Ce36Ag7n7hs,5509
 py_near/exceptions/provider.py,sha256=K-wexgjPJ8sw42JePwaP7R5dJEIn9DoFJRvVcURsx6s,7718
-py_near/models.py,sha256=GZQD1TKGWlwqsJsKRXrVNBjCdAIpk7GQypU-QOtAPFs,11533
-py_near/providers.py,sha256=1eg9MFIYIKA09bZyTdSZ2Umrh0kX1SUFEhY_tN8Cqz4,16722
+py_near/models.py,sha256=85ynmLVJnzWvFKq-Z8iIO0waU-2iP-CSkaOGX4mYoL0,11590
+py_near/providers.py,sha256=qSeBa_dL5PG262mEOfcnt_15D_OBf07szGCMVS7nfTc,16003
 py_near/transactions.py,sha256=QAXegv2JpKISk92NaChtIH6-QPHrcWbrwdKH_lH4TsU,3186
 py_near/utils.py,sha256=FirRH93ydH1cwjn0-sNrZeIn3BRD6QHedrP2VkAdJ6g,126
-py_near-1.1.48.dist-info/LICENSE,sha256=I_GOA9xJ35FiL-KnYXZJdATkbO2KcV2dK2enRGVxzKM,1023
-py_near-1.1.48.dist-info/METADATA,sha256=B1qxjAdBfRjjNnJkZB-MLaxbquD6l4TcMopAZ3JVz24,4693
-py_near-1.1.48.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-py_near-1.1.48.dist-info/RECORD,,
+py_near-1.1.50.dist-info/LICENSE,sha256=I_GOA9xJ35FiL-KnYXZJdATkbO2KcV2dK2enRGVxzKM,1023
+py_near-1.1.50.dist-info/METADATA,sha256=aGwb2Lr4zn6aI92kfAAAIXqk1h5sZmGXoP5BWOwCWeQ,4693
+py_near-1.1.50.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+py_near-1.1.50.dist-info/RECORD,,