py-near 1.1.33__py3-none-any.whl → 1.1.35__py3-none-any.whl

py_near/providers.py

@@ -23,7 +23,7 @@ from py_near.exceptions.provider import (
     InvalidTransactionError,
     RPCTimeoutError,
     UnknownAccessKeyError,
-    ERROR_CODE_TO_EXCEPTION,
+    ERROR_CODE_TO_EXCEPTION, InvalidNonce,
 )
 from py_near.models import TransactionResult
 
@@ -120,6 +120,30 @@ class JsonProvider(object):
         await self.check_available_rpcs()
         j = {"method": method, "params": params, "id": "dontcare", "jsonrpc": "2.0"}
         res = {}
+        if broadcast:
+            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
+                    )
+                    r.raise_for_status()
+                    res = json.loads(await r.text())
+                    return res
+            tasks = [
+                asyncio.create_task(f(rpc_addr)) for rpc_addr in self._available_rpcs
+            ]
+            for t in tasks:
+                try:
+                    res = await t
+                    return res
+                except Exception as e:
+                    logger.error(f"Rpc error: {e}")
+                    continue
         for rpc_addr in self._available_rpcs:
             try:
                 async with aiohttp.ClientSession() as session:
@@ -133,8 +157,7 @@ class JsonProvider(object):
                     )
                     r.raise_for_status()
                     res = json.loads(await r.text())
-                    if not broadcast:
-                        return res
+                    return res
             except (
                 RPCTimeoutError,
                 ClientResponseError,
@@ -203,12 +226,19 @@ class JsonProvider(object):
         :param timeout: rpc request timeout
         :return:
         """
-        return await self.json_rpc(
-            "send_tx",
-            {"signed_tx_base64": signed_tx, "wait_until": "INCLUDED_FINAL"},
-            timeout=timeout,
-            broadcast=self.allow_broadcast,
-        )
+        try:
+            return await self.json_rpc(
+                "send_tx",
+                {"signed_tx_base64": signed_tx, "wait_until": "INCLUDED_FINAL"},
+                timeout=timeout,
+                broadcast=self.allow_broadcast,
+            )
+        except InvalidNonce:
+            logger.warning("Invalid nonce during broadcast included transaction")
+            return None
+        except RPCTimeoutError:
+            raise RPCTimeoutError("Transaction not included")
+
 
     async def wait_for_trx(self, trx_hash, receiver_id) -> TransactionResult:
         for _ in range(6):

{py_near-1.1.33.dist-info → py_near-1.1.35.dist-info}/METADATA

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

{py_near-1.1.33.dist-info → py_near-1.1.35.dist-info}/RECORD

@@ -20,10 +20,10 @@ py_near/exceptions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 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=E1FTza1IokXrFtOCPABW9UsXkgzqoTuxZfRWhCeixhk,13933
+py_near/providers.py,sha256=TbkVFzW0SUdb_8UAe51b4j99MdBNfcl5yhLUif1tK7w,15124
 py_near/transactions.py,sha256=QAXegv2JpKISk92NaChtIH6-QPHrcWbrwdKH_lH4TsU,3186
 py_near/utils.py,sha256=FirRH93ydH1cwjn0-sNrZeIn3BRD6QHedrP2VkAdJ6g,126
-py_near-1.1.33.dist-info/LICENSE,sha256=I_GOA9xJ35FiL-KnYXZJdATkbO2KcV2dK2enRGVxzKM,1023
-py_near-1.1.33.dist-info/METADATA,sha256=STbfqsZrVA2yc5v-A2tiaLr8wfNQzAxB75yjYekvaek,4713
-py_near-1.1.33.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-py_near-1.1.33.dist-info/RECORD,,
+py_near-1.1.35.dist-info/LICENSE,sha256=I_GOA9xJ35FiL-KnYXZJdATkbO2KcV2dK2enRGVxzKM,1023
+py_near-1.1.35.dist-info/METADATA,sha256=jBst8XdqvnEzgB3RRf5fU_g025Jurf10JNyZIOmw7-w,4713
+py_near-1.1.35.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+py_near-1.1.35.dist-info/RECORD,,