py-near 1.1.28__py3-none-any.whl → 1.1.31__py3-none-any.whl

py_near/account.py

@@ -122,13 +122,9 @@ class Account(object):
             raise ValueError("You must provide a private key or seed to call methods")
         await self._update_last_block_hash()
 
-        while True:
-            if self._free_signers.empty():
-                logger.info("Free signer not found")
-                await asyncio.sleep(0.5)
-                continue
-            break
         pk = await self._free_signers.get()
+        await self._free_signers.put(pk)
+
         if self._access_key_nonce[pk] == 0:
             access_key = await self.get_access_key(pk)
             self._access_key_nonce[pk] = access_key.nonce

py_near/providers.py

@@ -44,7 +44,11 @@ PROVIDER_CODE_TO_EXCEPTION = {
 
 
 class JsonProvider(object):
-    def __init__(self, rpc_addr):
+    def __init__(self, rpc_addr, allow_broadcast=True):
+        """
+        :param rpc_addr: str or list of str
+        :param allow_broadcast: bool - submit signed transaction to all RPCs
+        """
         if isinstance(rpc_addr, tuple):
             self._rpc_addresses = ["http://{}:{}".format(*rpc_addr)]
         elif isinstance(rpc_addr, list):
@@ -53,6 +57,7 @@ class JsonProvider(object):
             self._rpc_addresses = [rpc_addr]
         self._available_rpcs = self._rpc_addresses.copy()
         self._last_rpc_addr_check = 0
+        self.allow_broadcast = allow_broadcast
 
     async def check_available_rpcs(self):
         if (
@@ -84,7 +89,7 @@ class JsonProvider(object):
                 async with aiohttp.ClientSession() as session:
                     async with session.post(rpc_addr, json=data) as r:
                         if r.status == 200:
-                            data = json.loads(await r.text())['result']
+                            data = json.loads(await r.text())["result"]
                             if data["sync_info"]["syncing"]:
                                 last_block_ts = datetime.datetime.fromisoformat(
                                     data["sync_info"]["latest_block_time"]
@@ -109,16 +114,27 @@ class JsonProvider(object):
                     logger.error(f"Remove rpc: {e}")
         self._available_rpcs = available_rpcs
 
-    async def call_rpc_request(self, method, params, timeout=TIMEOUT_WAIT_RPC):
+    async def call_rpc_request(
+        self, method, params, timeout=TIMEOUT_WAIT_RPC, broadcast=False
+    ):
         await self.check_available_rpcs()
         j = {"method": method, "params": params, "id": "dontcare", "jsonrpc": "2.0"}
-
+        res = {}
         for rpc_addr in self._available_rpcs:
             try:
                 async with aiohttp.ClientSession() as session:
-                    r = await session.post(rpc_addr, json=j, timeout=timeout)
+                    r = await session.post(
+                        rpc_addr,
+                        json=j,
+                        timeout=timeout,
+                        headers={
+                            "Referer": "https://tgapp.herewallet.app/"
+                        },  # NEAR RPC requires Referer header
+                    )
                     r.raise_for_status()
-                    return json.loads(await r.text())
+                    res = json.loads(await r.text())
+                    if not broadcast:
+                        return res
             except (
                 RPCTimeoutError,
                 ClientResponseError,
@@ -128,6 +144,7 @@ class JsonProvider(object):
             ) as e:
                 logger.error(f"Rpc error: {e}")
                 continue
+        return res
 
     @staticmethod
     def get_error_from_response(content: dict):
@@ -151,8 +168,10 @@ class JsonProvider(object):
                     break
             return error
 
-    async def json_rpc(self, method, params, timeout=TIMEOUT_WAIT_RPC):
-        content = await self.call_rpc_request(method, params, timeout)
+    async def json_rpc(self, method, params, timeout=TIMEOUT_WAIT_RPC, broadcast=False):
+        content = await self.call_rpc_request(
+            method, params, timeout, broadcast=broadcast
+        )
         if not content:
             raise RpcEmptyResponse("RPC returned empty response")
 
@@ -168,7 +187,12 @@ class JsonProvider(object):
         :param timeout: rpc request timeout
         :return:
         """
-        return await self.json_rpc("broadcast_tx_async", [signed_tx], timeout=timeout)
+        return await self.json_rpc(
+            "broadcast_tx_async",
+            [signed_tx],
+            timeout=timeout,
+            broadcast=self.allow_broadcast,
+        )
 
     async def wait_for_trx(self, trx_hash, receiver_id) -> TransactionResult:
         for _ in range(6):
@@ -202,6 +226,7 @@ class JsonProvider(object):
                 "broadcast_tx_commit",
                 [signed_tx],
                 timeout=timeout,
+                broadcast=self.allow_broadcast,
             )
             return TransactionResult(**res)
         except RPCTimeoutError:
@@ -221,7 +246,7 @@ class JsonProvider(object):
                 async with aiohttp.ClientSession() as session:
                     async with session.post(rpc_addr, json=data) as r:
                         if r.status == 200:
-                            return json.loads(await r.text())['result']
+                            return json.loads(await r.text())["result"]
             except (
                 ClientResponseError,
                 ClientConnectorError,

{py_near-1.1.28.dist-info → py_near-1.1.31.dist-info}/METADATA

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

{py_near-1.1.28.dist-info → py_near-1.1.31.dist-info}/RECORD

@@ -1,5 +1,5 @@
 py_near/__init__.py,sha256=t5fAxjaU8dN8xpQR2vz0ZGhfTkdVy2RCbkhJhZFglk4,50
-py_near/account.py,sha256=s2-nq5qKlxGPK9KHj6Ige2RuCi5uPVVQ9HpFG9eKJ8c,16872
+py_near/account.py,sha256=YbF7wnO-FFsSlJINYqF0Z5M4oF5Z4IVEXd64qZFvgZI,16714
 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=a6u-JMmHnYAYKzHd1kde2DFG5afHRj6CUeo6x25isYk,12549
+py_near/providers.py,sha256=wRY_fHePvlV-jC-j8NTtpHhb8EedpzLFQ1DQROt-brE,13363
 py_near/transactions.py,sha256=QAXegv2JpKISk92NaChtIH6-QPHrcWbrwdKH_lH4TsU,3186
 py_near/utils.py,sha256=FirRH93ydH1cwjn0-sNrZeIn3BRD6QHedrP2VkAdJ6g,126
-py_near-1.1.28.dist-info/LICENSE,sha256=I_GOA9xJ35FiL-KnYXZJdATkbO2KcV2dK2enRGVxzKM,1023
-py_near-1.1.28.dist-info/METADATA,sha256=p0h71-fg9WGFFIYX2nbAGRs-7U_I2Z7-Ht9HLn4O6oY,4713
-py_near-1.1.28.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-py_near-1.1.28.dist-info/RECORD,,
+py_near-1.1.31.dist-info/LICENSE,sha256=I_GOA9xJ35FiL-KnYXZJdATkbO2KcV2dK2enRGVxzKM,1023
+py_near-1.1.31.dist-info/METADATA,sha256=EiR0adIzbk1Dxot0y4nK3jVRkG5oPxrY9YPRsuRK4YQ,4713
+py_near-1.1.31.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+py_near-1.1.31.dist-info/RECORD,,