py-near 1.1.22__tar.gz → 1.1.25__tar.gz

{py_near-1.1.22 → py_near-1.1.25}/PKG-INFO

@@ -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 → py_near-1.1.25}/pyproject.toml

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