py-near 1.1.22__py3-none-any.whl → 1.1.25__py3-none-any.whl

py_near/account.py

@@ -69,7 +69,11 @@ class Account(object):
 
         for pk in private_keys:
             if isinstance(pk, str):
-                pk = base58.b58decode(pk.replace("ed25519:", ""))
+                try:
+                    pk = base58.b58decode(pk.replace("ed25519:", ""))
+                except UnicodeEncodeError:
+                    logger.error(f"Can't decode private key {pk[:10]}")
+                    continue
             private_key = ed25519.SigningKey(pk)
             public_key = base58.b58encode(
                 private_key.get_verifying_key().to_bytes()
@@ -117,6 +121,12 @@ 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()
         access_key = await self.get_access_key(pk)
 
@@ -146,7 +156,10 @@ class Account(object):
             )
         except JsonProviderError as e:
             e.trx_hash = trx_hash
-            raise e
+            raise
+        except Exception as e:
+            e.trx_hash = trx_hash
+            raise
         finally:
             await self._free_signers.put(pk)
 

py_near/providers.py

@@ -75,31 +75,35 @@ class JsonProvider(object):
         available_rpcs = []
         for rpc_addr in self._rpc_addresses:
             try:
+                data = {
+                    "jsonrpc": "2.0",
+                    "method": "status",
+                    "params": {"finality": "final"},
+                    "id": 1,
+                }
                 async with aiohttp.ClientSession() as session:
-                    r = await session.get(
-                        "%s/status" % rpc_addr, timeout=TIMEOUT_WAIT_RPC
-                    )
-                    if r.status == 200:
-                        data = json.loads(await r.text())
-                        if data["sync_info"]["syncing"]:
-                            last_block_ts = datetime.datetime.fromisoformat(
-                                data["sync_info"]["latest_block_time"]
-                            )
-                            diff = (
-                                datetime.datetime.utcnow().timestamp()
-                                - last_block_ts.timestamp()
-                            )
-                            is_syncing = diff > 60
+                    async with session.post(rpc_addr, json=data) as r:
+                        if r.status == 200:
+                            data = json.loads(await r.text())
+                            if data["sync_info"]["syncing"]:
+                                last_block_ts = datetime.datetime.fromisoformat(
+                                    data["sync_info"]["latest_block_time"]
+                                )
+                                diff = (
+                                    datetime.datetime.utcnow().timestamp()
+                                    - last_block_ts.timestamp()
+                                )
+                                is_syncing = diff > 60
+                            else:
+                                is_syncing = False
+                            if is_syncing:
+                                logger.error(f"Remove async RPC : {rpc_addr} ({diff})")
+                                continue
+                            available_rpcs.append(rpc_addr)
                         else:
-                            is_syncing = False
-                        if is_syncing:
-                            logger.error(f"Remove async RPC : {rpc_addr} ({diff})")
-                            continue
-                        available_rpcs.append(rpc_addr)
-                    else:
-                        logger.error(
-                            f"Remove rpc because of error {r.status}: {rpc_addr}"
-                        )
+                            logger.error(
+                                f"Remove rpc because of error {r.status}: {rpc_addr}"
+                            )
             except Exception as e:
                 if rpc_addr in self._available_rpcs:
                     logger.error(f"Remove rpc: {e}")
@@ -208,12 +212,16 @@ class JsonProvider(object):
         await self.check_available_rpcs()
         for rpc_addr in self._available_rpcs:
             try:
+                data = {
+                    "jsonrpc": "2.0",
+                    "method": "status",
+                    "params": {"finality": "final"},
+                    "id": 1,
+                }
                 async with aiohttp.ClientSession() as session:
-                    r = await session.get(
-                        f"{rpc_addr}/status", timeout=TIMEOUT_WAIT_RPC
-                    )
-                    if r.status == 200:
-                        return json.loads(await r.text())
+                    async with session.post(rpc_addr, json=data) as r:
+                        if r.status == 200:
+                            return json.loads(await r.text())
             except (
                 ClientResponseError,
                 ClientConnectorError,

{py_near-1.1.22.dist-info → py_near-1.1.25.dist-info}/METADATA

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

{py_near-1.1.22.dist-info → py_near-1.1.25.dist-info}/RECORD

@@ -1,5 +1,5 @@
 py_near/__init__.py,sha256=t5fAxjaU8dN8xpQR2vz0ZGhfTkdVy2RCbkhJhZFglk4,50
-py_near/account.py,sha256=9n6cBun9Mo936eNiNoCjqCIkQw_qujGNwhhilkPIBkY,16205
+py_near/account.py,sha256=sw5bqGUFFOkqc8COGB4GYUM9YzSgLO_jIUli4RTQEQo,16655
 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=h5f5LTPkGdIdbTs5pzdVVddc5QExrxl-HKejYgobM5k,12163
+py_near/providers.py,sha256=9i9laUNtQFGfiTGglXB95rp1g8Ph49d0dXKHxYnJHOo,12529
 py_near/transactions.py,sha256=QAXegv2JpKISk92NaChtIH6-QPHrcWbrwdKH_lH4TsU,3186
 py_near/utils.py,sha256=FirRH93ydH1cwjn0-sNrZeIn3BRD6QHedrP2VkAdJ6g,126
-py_near-1.1.22.dist-info/LICENSE,sha256=I_GOA9xJ35FiL-KnYXZJdATkbO2KcV2dK2enRGVxzKM,1023
-py_near-1.1.22.dist-info/METADATA,sha256=3g_TVvP46Bvl9Fli0K451j4yEfSxMIuOtdjQh_qH7hQ,4713
-py_near-1.1.22.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-py_near-1.1.22.dist-info/RECORD,,
+py_near-1.1.25.dist-info/LICENSE,sha256=I_GOA9xJ35FiL-KnYXZJdATkbO2KcV2dK2enRGVxzKM,1023
+py_near-1.1.25.dist-info/METADATA,sha256=d1SofefxxzkkBmOEPhvgGghb51slREAebC8DwT4d1FY,4713
+py_near-1.1.25.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+py_near-1.1.25.dist-info/RECORD,,