py-near 1.1.34__tar.gz → 1.1.36__tar.gz

{py_near-1.1.34 → py_near-1.1.36}/PKG-INFO

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

{py_near-1.1.34 → py_near-1.1.36}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "py-near"
-version = "1.1.34"
+version = "1.1.36"
 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.34"
+version = "1.1.36"
 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.34 → py_near-1.1.36}/src/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
 
@@ -134,7 +134,6 @@ class JsonProvider(object):
                     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
             ]
@@ -227,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"},
+                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):