solver-multirpc 3.1.6__py3-none-any.whl → 3.1.7__py3-none-any.whl

multirpc/__init__.py

@@ -1 +1,2 @@
-from .base_multi_rpc_interface import BaseMultiRpc
+from .sync_multi_rpc_interface import MultiRpc
+from .async_multi_rpc_interface import AsyncMultiRpc

multirpc/async_multi_rpc_interface.py

@@ -1,13 +1,12 @@
 import asyncio
 import logging
-from typing import Dict, List, Optional, Union
+from typing import List, Optional, Union
 
 from eth_typing import Address, ChecksumAddress
 from web3._utils.contracts import encode_transaction_data  # noqa
 from web3.types import BlockData, BlockIdentifier, TxReceipt
 
-from . import BaseMultiRpc
-from .base_multi_rpc_interface import BaseContractFunction
+from .base_multi_rpc_interface import BaseContractFunction, BaseMultiRpc
 from .constants import GasLimit, GasUpperBound, ViewPolicy
 from .exceptions import DontHaveThisRpcType, KwargsNotSupportedInMultiCall, TransactionTypeNotSupportedInMultiCall
 from .gas_estimation import GasEstimation, GasEstimationMethod
@@ -24,7 +23,7 @@ class AsyncMultiRpc(BaseMultiRpc):
             self,
             rpc_urls: NestedDict,
             contract_address: Union[Address, ChecksumAddress, str],
-            contract_abi: Dict,
+            contract_abi: list,
             rpcs_supporting_tx_trace: Optional[List[str]] = None,
             view_policy: ViewPolicy = ViewPolicy.MostUpdated,
             gas_estimation: Optional[GasEstimation] = None,

multirpc/base_multi_rpc_interface.py

@@ -24,7 +24,7 @@ from .exceptions import (DontHaveThisRpcType, FailedOnAllRPCs, GetBlockFailed, N
                          TransactionFailedStatus, TransactionValueError, Web3InterfaceException)
 from .gas_estimation import GasEstimation, GasEstimationMethod
 from .tx_trace import TxTrace
-from .utils import NestedDict, ResultEvent, TxPriority, calculate_chain_id, create_web3_from_rpc, \
+from .utils import NestedDict, ResultEvent, TxPriority, get_chain_id, create_web3_from_rpc, \
     get_span_proper_label_from_provider, get_unix_time, reduce_list_of_list
 
 T = TypeVar("T")
@@ -39,7 +39,7 @@ class BaseMultiRpc(ABC):
             self,
             rpc_urls: NestedDict,
             contract_address: Union[Address, ChecksumAddress, str],
-            contract_abi: Dict,
+            contract_abi: list,
             rpcs_supporting_tx_trace: Optional[List[str]] = None,
             view_policy: ViewPolicy = ViewPolicy.MostUpdated,
             gas_estimation: Optional[GasEstimation] = None,
@@ -112,7 +112,7 @@ class BaseMultiRpc(ABC):
 
     async def setup(self) -> None:
         self.providers = await create_web3_from_rpc(self.rpc_urls, self.is_proof_authority)
-        self.chain_id = await calculate_chain_id(self.providers)
+        self.chain_id = await get_chain_id(self.providers)
 
         if self.gas_estimation is None and self.providers.get('transaction'):
             self.gas_estimation = GasEstimation(

multirpc/sync_multi_rpc_interface.py

@@ -1,13 +1,12 @@
 import asyncio
 import logging
-from typing import Dict, List, Optional, Union
+from typing import List, Optional, Union
 
 from eth_typing import Address, ChecksumAddress
 from web3._utils.contracts import encode_transaction_data  # noqa
 from web3.types import BlockData, BlockIdentifier, TxReceipt
 
-from . import BaseMultiRpc
-from .base_multi_rpc_interface import BaseContractFunction
+from .base_multi_rpc_interface import BaseContractFunction, BaseMultiRpc
 from .constants import GasLimit, GasUpperBound, ViewPolicy
 from .exceptions import DontHaveThisRpcType, KwargsNotSupportedInMultiCall, TransactionTypeNotSupportedInMultiCall
 from .gas_estimation import GasEstimation, GasEstimationMethod
@@ -24,7 +23,7 @@ class MultiRpc(BaseMultiRpc):
             self,
             rpc_urls: NestedDict,
             contract_address: Union[Address, ChecksumAddress, str],
-            contract_abi: Dict,
+            contract_abi: list,
             rpcs_supporting_tx_trace: Optional[List[str]] = None,
             view_policy: ViewPolicy = ViewPolicy.MostUpdated,
             gas_estimation: Optional[GasEstimation] = None,

multirpc/utils.py

@@ -9,12 +9,12 @@ from threading import Thread
 from typing import Any, Dict, List, Tuple, Union
 
 import aiohttp.client_exceptions
-from aiohttp import ClientTimeout
+from aiohttp import ClientSession, ClientTimeout
 from eth_typing import URI
 from web3 import AsyncHTTPProvider, AsyncWeb3, Web3, WebSocketProvider
 from web3._utils.http import DEFAULT_HTTP_TIMEOUT
 from web3._utils.http_session_manager import HTTPSessionManager
-from web3.middleware import ExtraDataToPOAMiddleware
+from web3.middleware import ExtraDataToPOAMiddleware, Web3Middleware
 
 from .constants import MaxRPCInEachBracket, MultiRPCLogger
 from .exceptions import AtLastProvideOneValidRPCInEachBracket, MaximumRPCInEachBracketReached
@@ -156,9 +156,11 @@ class MultiRpcHTTPSessionManager(HTTPSessionManager):
             self, endpoint_uri: URI, data: Union[bytes, Dict[str, Any]], **kwargs: Any
     ) -> bytes:
         kwargs.setdefault("timeout", ClientTimeout(DEFAULT_HTTP_TIMEOUT))
-        session = await self.async_cache_and_return_session(
-            endpoint_uri, request_timeout=kwargs["timeout"]
-        )
+
+        session = ClientSession(raise_for_status=True)
+        # session = await self.async_cache_and_return_session(      # fixme: original code
+        #     endpoint_uri, request_timeout=kwargs["timeout"]
+        # )
 
         try:
             self.logger.debug(f'making post request, {endpoint_uri=}, {kwargs=}')
@@ -174,9 +176,12 @@ class MultiRpcHTTPSessionManager(HTTPSessionManager):
             self, endpoint_uri: URI, *args: Any, **kwargs: Any
     ) -> Dict[str, Any]:
         kwargs.setdefault("timeout", ClientTimeout(DEFAULT_HTTP_TIMEOUT))
-        session = await self.async_cache_and_return_session(
-            endpoint_uri, request_timeout=kwargs["timeout"]
-        )
+
+        session = ClientSession(raise_for_status=True)
+        # session = await self.async_cache_and_return_session(      # fixme: original code
+        #     endpoint_uri, request_timeout=kwargs["timeout"]
+        # )
+
         try:
             response = await session.get(endpoint_uri, *args, **kwargs)
             response.raise_for_status()
@@ -197,6 +202,48 @@ class MultiRpcAsyncHTTPProvider(AsyncHTTPProvider):
         self._request_session_manager = MultiRpcHTTPSessionManager()
 
 
+class SimpleCacheMiddleware(Web3Middleware):
+    rpc_whitelist = {
+        "web3_clientVersion",
+        "net_version",
+        "eth_chainId",
+    }
+
+    def __init__(self, w3):
+        super().__init__(w3)
+        self.cache = {}
+
+    def wrap_make_request(self, make_request):
+        def middleware(method, params: Any):
+            cache_key = (method, tuple(params))
+            if method in self.rpc_whitelist and cache_key in self.cache:
+                return self.cache[cache_key]  # Return cached response
+
+            response = make_request(method, params)  # Make actual RPC request
+
+            if method in self.rpc_whitelist:
+                self.cache[cache_key] = response  # Store response in cache
+
+            return response
+
+        return middleware
+
+    async def async_wrap_make_request(self, make_request):
+        async def middleware(method, params: Any):
+            cache_key = (method, tuple(params))
+            if method in self.rpc_whitelist and cache_key in self.cache:
+                return self.cache[cache_key]  # Return cached response
+
+            response = await make_request(method, params)  # Make actual RPC request
+
+            if method in self.rpc_whitelist:
+                self.cache[cache_key] = response  # Store response in cache
+
+            return response
+
+        return middleware
+
+
 async def create_web3_from_rpc(rpc_urls: NestedDict, is_proof_of_authority: bool) -> NestedDict:
     async def create_web3(rpc_: str):
         async_w3: AsyncWeb3
@@ -206,6 +253,7 @@ async def create_web3_from_rpc(rpc_urls: NestedDict, is_proof_of_authority: bool
             async_w3 = AsyncWeb3(WebSocketProvider(rpc_))
         if is_proof_of_authority:
             async_w3.middleware_onion.inject(ExtraDataToPOAMiddleware, layer=0)
+        async_w3.middleware_onion.add(SimpleCacheMiddleware, 'simple_cache')
         try:
             status = await async_w3.is_connected()
         except (asyncio.exceptions.TimeoutError, aiohttp.client_exceptions.ClientResponseError):
@@ -234,7 +282,7 @@ async def create_web3_from_rpc(rpc_urls: NestedDict, is_proof_of_authority: bool
     return providers
 
 
-async def calculate_chain_id(providers: NestedDict) -> int:
+async def get_chain_id(providers: NestedDict) -> int:
     last_error = None
     for key, providers in providers.items():
         for provider in providers:

{solver_multirpc-3.1.6.dist-info → solver_multirpc-3.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: solver-multirpc
-Version: 3.1.6
+Version: 3.1.7
 Summary: A robust Python library for interacting with Ethereum smart contracts via multiple RPC endpoints, ensuring reliability, availability, and load distribution with automatic retries on failure.
 License: MIT
 Author: rorschach
@@ -52,7 +52,7 @@ Below is an example of how to use the AsyncMultiRpc class for asynchronous opera
 import asyncio
 import json
 from multirpc.utils import NestedDict
-from multirpc.async_multi_rpc_interface import AsyncMultiRpc
+from multirpc import AsyncMultiRpc
 
 
 async def main():
@@ -198,7 +198,6 @@ Here is an example:
 ```python
 from multirpc import GasEstimation, TxPriority, GasEstimationMethod
 from web3 import Web3
-from web3.types import Wei
 
 
 class CustomGasEstimation(GasEstimation):

solver_multirpc-3.1.7.dist-info/RECORD

@@ -0,0 +1,12 @@
+multirpc/__init__.py,sha256=f7h3txKkb_WQX6u-PzbgMpHt1VGqA0OjhrSe4Vdsk5I,100
+multirpc/async_multi_rpc_interface.py,sha256=2YyGXst5jyxZ7ro7z7qeOAF2wKC4JEgbwkR-ADCa-9w,5548
+multirpc/base_multi_rpc_interface.py,sha256=I6WP0e3hcJ1IMVipuWdrZFNjoZBdL4BGZ4eXQVT11oI,28502
+multirpc/constants.py,sha256=h0njFnxTtWU8-NO_3q7sMrLAqQAv4JxM3nZcc2WOqEc,1210
+multirpc/exceptions.py,sha256=V8WDmDWeeTLQ1TOJ9_IWXt0z-qefJiDfQ6pAdhuwdcA,1785
+multirpc/gas_estimation.py,sha256=k0FVO9FgSRuRQhEkQ9YZZ-rSpW_zxaLLFdMAYOF3xco,7276
+multirpc/sync_multi_rpc_interface.py,sha256=T9x5bLbLJF_1XorkkDqzc8pZmbdNs6OE9trGjVWQBdg,5762
+multirpc/tx_trace.py,sha256=G7sTVMzALtTeC1F2JjxMSGRRFlmAAZG-Sdhd4UQtfw8,7885
+multirpc/utils.py,sha256=ZyFzFT6UDSaMRV_F_fXHyCMm1-jRcPvV_oX1NAtwPek,10212
+solver_multirpc-3.1.7.dist-info/METADATA,sha256=e95fhgu4DJIyuq92GH0toEkwS9LI9XYX6T16Goyc3tM,8286
+solver_multirpc-3.1.7.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+solver_multirpc-3.1.7.dist-info/RECORD,,

solver_multirpc-3.1.6.dist-info/RECORD

@@ -1,12 +0,0 @@
-multirpc/__init__.py,sha256=uZJfs4NxerMAEVi_FX15MO5RCc1o15i_kYECoPp43ec,51
-multirpc/async_multi_rpc_interface.py,sha256=8W3V3HfrlVbI6DGNkxRw1ZuduM6t24MObLIKh6Zq1ZU,5567
-multirpc/base_multi_rpc_interface.py,sha256=aMIXXX5S-UvXiNBqr1EUxMngHO_dgJL7v2J9lqJ2zdU,28514
-multirpc/constants.py,sha256=h0njFnxTtWU8-NO_3q7sMrLAqQAv4JxM3nZcc2WOqEc,1210
-multirpc/exceptions.py,sha256=V8WDmDWeeTLQ1TOJ9_IWXt0z-qefJiDfQ6pAdhuwdcA,1785
-multirpc/gas_estimation.py,sha256=k0FVO9FgSRuRQhEkQ9YZZ-rSpW_zxaLLFdMAYOF3xco,7276
-multirpc/sync_multi_rpc_interface.py,sha256=6zKEtuXq7Uy7MDEe7nM-ifdpMZNrRYbIIsJSxiRVW_Q,5781
-multirpc/tx_trace.py,sha256=G7sTVMzALtTeC1F2JjxMSGRRFlmAAZG-Sdhd4UQtfw8,7885
-multirpc/utils.py,sha256=YYX628ZAsNf3nuY4XicsxtHs69WKYl0kX2Uh--Xpj5o,8586
-solver_multirpc-3.1.6.dist-info/METADATA,sha256=JQlH_vWFxJf7hriNUCYwTRElhD8ERMHiA_ZtRwvxBMo,8339
-solver_multirpc-3.1.6.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-solver_multirpc-3.1.6.dist-info/RECORD,,