py-near 1.1.36__py3-none-any.whl → 1.1.37__py3-none-any.whl

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/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:
@@ -236,9 +241,6 @@ class JsonProvider(object):
         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.36.dist-info → py_near-1.1.37.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
 py_near/__init__.py,sha256=t5fAxjaU8dN8xpQR2vz0ZGhfTkdVy2RCbkhJhZFglk4,50
-py_near/account.py,sha256=z7zjGRJbK8CPkw3b9w7m0M55YUT-kKaMU9JJO0hy14w,17259
+py_near/account.py,sha256=kg3Nhq1vaOh10amO8gadBlGCpOADWbL1H8zm5rXBQJ8,17488
 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
@@ -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=WT8-hSipTFUATyfZo_YLn8xT8aSkWr3EVq_XZ1elY44,15118
+py_near/providers.py,sha256=fUEMTpy-LadTZ32lVmGjKKPrTgm3cCFVGatMeWaAa9c,15120
 py_near/transactions.py,sha256=QAXegv2JpKISk92NaChtIH6-QPHrcWbrwdKH_lH4TsU,3186
 py_near/utils.py,sha256=FirRH93ydH1cwjn0-sNrZeIn3BRD6QHedrP2VkAdJ6g,126
-py_near-1.1.36.dist-info/LICENSE,sha256=I_GOA9xJ35FiL-KnYXZJdATkbO2KcV2dK2enRGVxzKM,1023
-py_near-1.1.36.dist-info/METADATA,sha256=-RXgeTEdOVUzQuQFGqkOhHMg8BWM8cFSMUZd21VeySs,4713
-py_near-1.1.36.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-py_near-1.1.36.dist-info/RECORD,,
+py_near-1.1.37.dist-info/LICENSE,sha256=I_GOA9xJ35FiL-KnYXZJdATkbO2KcV2dK2enRGVxzKM,1023
+py_near-1.1.37.dist-info/METADATA,sha256=DA8ZhE1CgjLDaxvKImj1ASgwUXwYSYxvvJelUwiov_Y,4713
+py_near-1.1.37.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+py_near-1.1.37.dist-info/RECORD,,