py-near 1.1.36__py3-none-any.whl → 1.1.38__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)
@@ -389,6 +394,7 @@ class Account(object):
         method_name: str,
         args: dict,
         block_id: Optional[int] = None,
+        threshold: Optional[int] = None,
     ) -> ViewFunctionResult:
         """
         Call view function on smart contract. View function is read only function, it can't change state
@@ -396,10 +402,11 @@ class Account(object):
         :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
+        :param threshold: minimal amount of nodes with same result
         :return: result of view function call
         """
         result = await self._provider.view_call(
-            contract_id, method_name, json.dumps(args).encode("utf8"), block_id=block_id
+            contract_id, method_name, json.dumps(args).encode("utf8"), block_id=block_id, threshold=threshold
         )
         if "error" in result:
             raise ViewFunctionError(result["error"])

py_near/providers.py

@@ -1,6 +1,7 @@
 import asyncio
 import base64
 import json
+from collections import Counter
 from typing import Optional
 
 import aiohttp
@@ -23,7 +24,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
 
@@ -115,12 +117,13 @@ class JsonProvider(object):
         self._available_rpcs = available_rpcs
 
     async def call_rpc_request(
-        self, method, params, timeout=TIMEOUT_WAIT_RPC, broadcast=False
+        self, method, params, timeout=TIMEOUT_WAIT_RPC, broadcast=False, threshold=None
     ):
         await self.check_available_rpcs()
         j = {"method": method, "params": params, "id": "dontcare", "jsonrpc": "2.0"}
         res = {}
-        if broadcast:
+        if broadcast or threshold:
+
             async def f(rpc_call_addr):
                 async with aiohttp.ClientSession() as session:
                     r = await session.post(
@@ -128,22 +131,48 @@ 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
+                    if r.status == 200:
+                        return json.loads(await r.text())
+
             tasks = [
                 asyncio.create_task(f(rpc_addr)) for rpc_addr in self._available_rpcs
             ]
+            responses = []
             for t in tasks:
                 try:
-                    res = await t
-                    return res
+                    responses.append(await t)
                 except Exception as e:
                     logger.error(f"Rpc error: {e}")
                     continue
+
+            def most_frequent_by_hash(array):
+                counter = Counter(array)
+                most_frequent = counter.most_common(1)[0][0]
+                return most_frequent
+
+            if threshold:
+                # return first most frequent response
+                array = [hash(json.dumps(x)) for x in responses]
+                most_frequent_element = most_frequent_by_hash(array)
+                correct_responses = [
+                    x for x in responses if hash(json.dumps(x)) == most_frequent_element
+                ]
+                if len(correct_responses) >= threshold:
+                    return responses[0]
+                raise Exception(
+                    f"Threshold not reached: {len(correct_responses)}/{threshold}"
+                )
+
+            if broadcast:
+                # return first response without errors
+                for res in responses:
+                    if "error" not in res:
+                        return res
+            return responses[0]
+
         for rpc_addr in self._available_rpcs:
             try:
                 async with aiohttp.ClientSession() as session:
@@ -191,9 +220,11 @@ class JsonProvider(object):
                     break
             return error
 
-    async def json_rpc(self, method, params, timeout=TIMEOUT_WAIT_RPC, broadcast=False):
+    async def json_rpc(
+        self, method, params, timeout=TIMEOUT_WAIT_RPC, broadcast=False, threshold=None
+    ):
         content = await self.call_rpc_request(
-            method, params, timeout, broadcast=broadcast
+            method, params, timeout, broadcast=broadcast, threshold=threshold
         )
         if not content:
             raise RpcEmptyResponse("RPC returned empty response")
@@ -236,9 +267,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):
@@ -356,6 +384,7 @@ class JsonProvider(object):
         args,
         finality="optimistic",
         block_id: Optional[int] = None,
+        threshold: Optional[int] = None,
     ):
         body = {
             "request_type": "call_function",
@@ -367,7 +396,7 @@ class JsonProvider(object):
             body["block_id"] = block_id
         else:
             body["finality"] = finality
-        return await self.json_rpc("query", body)
+        return await self.json_rpc("query", body, threshold=threshold)
 
     async def get_block(self, block_id):
         return await self.json_rpc("block", [block_id])

{py_near-1.1.36.dist-info → py_near-1.1.38.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-near
-Version: 1.1.36
+Version: 1.1.38
 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.38.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=CX0fYvWJj8g7QANLUr3G5eUvO347UW1jlunphN47Heg,17617
 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=A_h587h5e-HXJeko7z2YdDw0SkC3snNJ8hk90POOge8,16190
 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.38.dist-info/LICENSE,sha256=I_GOA9xJ35FiL-KnYXZJdATkbO2KcV2dK2enRGVxzKM,1023
+py_near-1.1.38.dist-info/METADATA,sha256=YD1v8lUXSE_IgAcDNcwkEPbY16lL12k3Ri_YORwqmO0,4713
+py_near-1.1.38.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+py_near-1.1.38.dist-info/RECORD,,