py-near 1.1.15__tar.gz → 1.1.16__tar.gz

{py_near-1.1.15 → py_near-1.1.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-near
-Version: 1.1.15
+Version: 1.1.16
 Summary: Pretty simple and fully asynchronous framework for working with NEAR blockchain
 Author: pvolnov
 Author-email: petr@herewallet.app
@@ -11,6 +11,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: aiohttp (>=3.7.4,<4.0.0)
 Requires-Dist: ed25519 (>=1.5,<2.0)
 Requires-Dist: py-near-primitives (>=0.2.3,<0.3.0)

{py_near-1.1.15 → py_near-1.1.16}/pyproject.toml

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

@@ -368,17 +368,22 @@ class Account(object):
         )
 
     async def view_function(
-        self, contract_id: str, method_name: str, args: dict
+        self,
+        contract_id: str,
+        method_name: str,
+        args: dict,
+        block_id: Optional[int] = None,
     ) -> ViewFunctionResult:
         """
         Call view function on smart contract. View function is read only function, it can't change state
         :param contract_id: smart contract account id
         :param method_name: method name to call
         :param args: json args to call method
+        :param block_id: execution view transaction in block with given id
         :return: result of view function call
         """
         result = await self._provider.view_call(
-            contract_id, method_name, json.dumps(args).encode("utf8")
+            contract_id, method_name, json.dumps(args).encode("utf8"), block_id=block_id
         )
         if "error" in result:
             raise ViewFunctionError(result["error"])

{py_near-1.1.15 → py_near-1.1.16}/src/py_near/providers.py

@@ -77,21 +77,31 @@ class JsonProvider(object):
                     if rpc_addr in self._available_rpcs:
                         if r.status == 200:
                             logger.error(f"Remove async RPC : {rpc_addr}")
-                        logger.error(
-                            f"Remove rpc because of error {r.status}: {rpc_addr}"
-                        )
+                        else:
+                            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}")
-                continue
         self._available_rpcs = [
             r[0] for r in sorted(available_rpcs, key=lambda x: x[1])
         ]
 
     async def call_rpc_request(self, method, params, timeout=TIMEOUT_WAIT_RPC):
-        if self._last_rpc_addr_check < datetime.datetime.now().timestamp() - 30:
+        if (
+            self._last_rpc_addr_check < datetime.datetime.now().timestamp() - 30
+            or not self._available_rpcs
+        ):
             self._last_rpc_addr_check = datetime.datetime.now().timestamp()
-            asyncio.create_task(self.check_available_rpcs())
+            if self._available_rpcs:
+                asyncio.create_task(self.check_available_rpcs())
+            else:
+                logger.warning("No RPC available, rechecking")
+                await self.check_available_rpcs()
+
+        if not self._available_rpcs:
+            raise RpcNotAvailableError("No RPC available")
 
         j = {"method": method, "params": params, "id": "dontcare", "jsonrpc": "2.0"}
 
@@ -256,17 +266,25 @@ class JsonProvider(object):
             },
         )
 
-    async def view_call(self, account_id, method_name, args, finality="optimistic"):
-        return await self.json_rpc(
-            "query",
-            {
-                "request_type": "call_function",
-                "account_id": account_id,
-                "method_name": method_name,
-                "args_base64": base64.b64encode(args).decode("utf8"),
-                "finality": finality,
-            },
-        )
+    async def view_call(
+        self,
+        account_id,
+        method_name,
+        args,
+        finality="optimistic",
+        block_id: Optional[int] = None,
+    ):
+        body = {
+            "request_type": "call_function",
+            "account_id": account_id,
+            "method_name": method_name,
+            "args_base64": base64.b64encode(args).decode("utf8"),
+        }
+        if block_id:
+            body["block_id"] = block_id
+        else:
+            body["finality"] = finality
+        return await self.json_rpc("query", body)
 
     async def get_block(self, block_id):
         return await self.json_rpc("block", [block_id])