py-near 1.1.35__tar.gz → 1.1.37__tar.gz

{py_near-1.1.35 → py_near-1.1.37}/PKG-INFO

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

{py_near-1.1.35 → py_near-1.1.37}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "py-near"
-version = "1.1.35"
+version = "1.1.37"
 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.35"
+version = "1.1.37"
 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.35 → py_near-1.1.37}/src/py_near/account.py

@@ -15,6 +15,7 @@ from py_near.dapps.ft.async_client import FT
 from py_near.dapps.staking.async_client import Staking
 from py_near.exceptions.provider import (
     JsonProviderError,
+    RPCTimeoutError,
 )
 from py_near.models import (
     TransactionResult,
@@ -151,7 +152,11 @@ class Account(object):
 
         try:
             if included:
-                await self._provider.send_tx_included(serialized_tx)
+                try:
+                    await self._provider.send_tx_included(serialized_tx)
+                except RPCTimeoutError as e:
+                    if "Transaction not included" in str(e):
+                        logger.error(f"Transaction not included {trx_hash}")
                 return trx_hash
             elif nowait:
                 return await self._provider.send_tx(serialized_tx)

{py_near-1.1.35 → py_near-1.1.37}/src/py_near/providers.py

@@ -23,7 +23,8 @@ from py_near.exceptions.provider import (
     InvalidTransactionError,
     RPCTimeoutError,
     UnknownAccessKeyError,
-    ERROR_CODE_TO_EXCEPTION, InvalidNonce,
+    ERROR_CODE_TO_EXCEPTION,
+    InvalidNonce,
 )
 from py_near.models import TransactionResult
 
@@ -128,22 +129,26 @@ class JsonProvider(object):
                         json=j,
                         timeout=timeout,
                         headers={
-                            "Referer": "https://tgapp.herewallet.app/"
+                            "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
             ]
+            res = None
             for t in tasks:
                 try:
                     res = await t
-                    return res
+                    if "error" not in res:
+                        return res
                 except Exception as e:
                     logger.error(f"Rpc error: {e}")
                     continue
+            return res
         for rpc_addr in self._available_rpcs:
             try:
                 async with aiohttp.ClientSession() as session:
@@ -229,16 +234,13 @@ class JsonProvider(object):
         try:
             return await self.json_rpc(
                 "send_tx",
-                {"signed_tx_base64": signed_tx, "wait_until": "INCLUDED_FINAL"},
+                {"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):