From f0dbea0533b79cdb7622af28bc91f344bb3b6dfd Mon Sep 17 00:00:00 2001
From: Evgeny Gusarov <evgeny@stakewise.io>
Date: Mon, 2 Oct 2023 18:56:12 +0300
Subject: [PATCH] Upgrade web3 version to 6.10.0

---
 poetry.lock           | 10 +++++-----
 pyproject.toml        |  4 ++--
 sw_utils/execution.py | 26 +-------------------------
 3 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index ecd4921..cb40c8e 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 1.5.1 and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand.
 
 [[package]]
 name = "aiohttp"
@@ -2388,13 +2388,13 @@ test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess
 
 [[package]]
 name = "web3"
-version = "6.8.0"
+version = "6.10.0"
 description = "web3.py"
 optional = false
 python-versions = ">=3.7.2"
 files = [
-    {file = "web3-6.8.0-py3-none-any.whl", hash = "sha256:cc383afaf4cfde9fd6c8934ec23c47035520129ee93e4e068520e565d31dee9e"},
-    {file = "web3-6.8.0.tar.gz", hash = "sha256:5db6ed63bca526a5542d9a84778c8b549199009b9f71079ff53a7b82dadf0d0b"},
+    {file = "web3-6.10.0-py3-none-any.whl", hash = "sha256:070625a0da4f0fcac090fa95186e0b865a1bbc43efb78fd2ee805f7bf9cd8986"},
+    {file = "web3-6.10.0.tar.gz", hash = "sha256:ea89f8a6ee74b74c3ff21954eafe00ec914365adb904c6c374f559bc46d4a61c"},
 ]
 
 [package.dependencies]
@@ -2674,4 +2674,4 @@ multidict = ">=4.0"
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.10"
-content-hash = "f515bc903b4151174d42344dbe646fd12f3de6338c05ef66f8837ae94a563736"
+content-hash = "8f9d9d4d9d85596c2a3256034c4fcee6675b15336d754a68a65115ddf36602a6"
diff --git a/pyproject.toml b/pyproject.toml
index 760c014..238e4da 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sw-utils"
-version = "0.3.25"
+version = "0.3.26"
 description = "StakeWise Python utils"
 authors = ["StakeWise Labs <info@stakewise.io>"]
 license = "GPL-3.0-or-later"
@@ -12,7 +12,7 @@ milagro-bls-binding = "==1.9.0"
 py-ecc = "^6.0.0"
 ipfshttpclient = "^0.8.0a2"
 types-requests = "^2.28.11.15"
-web3 = "==6.8.0"
+web3 = "==6.10.0"
 tenacity = "==8.2.2"
 pyrsistent = "0.19.3"
 
diff --git a/sw_utils/execution.py b/sw_utils/execution.py
index aa413a5..677b239 100644
--- a/sw_utils/execution.py
+++ b/sw_utils/execution.py
@@ -111,30 +111,6 @@ def set_retry_timeout(self, retry_timeout: int):
         self.retry_timeout = retry_timeout
 
 
-# pylint: disable=abstract-method
-class ExtendedAsyncEth(AsyncEth):
-    """
-    todo: remove when PR gets merged
-    https://github.com/ethereum/web3.py/pull/3084
-    """
-
-    @property
-    async def max_priority_fee(self) -> Wei:
-        """
-        Try to use eth_maxPriorityFeePerGas but, since this is not part
-        of the spec and is only supported by some clients, fall back to
-        an eth_feeHistory calculation with min and max caps.
-        """
-        try:
-            return await self._max_priority_fee()
-        except (ValueError, MethodUnavailable):
-            warnings.warn(
-                'There was an issue with the method eth_maxPriorityFeePerGas. '
-                'Calculating using eth_feeHistory.'
-            )
-            return await async_fee_history_priority_fee(self)
-
-
 def get_execution_client(
     endpoints: list[str], is_poa=False, timeout=60, retry_timeout=0
 ) -> AsyncWeb3:
@@ -143,7 +119,7 @@ def get_execution_client(
     )
     client = AsyncWeb3(
         provider,
-        modules={'eth': (ExtendedAsyncEth,), 'net': AsyncNet},
+        modules={'eth': (AsyncEth,), 'net': AsyncNet},
     )
 
     if is_poa: