Merge pull request #1724 from carver/upgrade-deps

Upgrade eth-account and eth-tester
ethereum · Sep 2, 2020 · ad4772f · ad4772f
2 parents d431db5 + 706a314
commit ad4772f
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 10 deletions.
diff --git a/newsfragments/1724.misc.rst b/newsfragments/1724.misc.rst
@@ -0,0 +1,2 @@
+Upgrade eth-tester to v0.5.0-beta.2 and eth-account to v0.5.3. These both support the latest pyrlp,
+which has a performance bump.
diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 
 extras_require = {
     'tester': [
-        "eth-tester[py-evm]==v0.5.0-beta.1",
+        "eth-tester[py-evm]==v0.5.0-beta.2",
         "py-geth>=2.4.0,<3",
     ],
     'linter': [
@@ -70,7 +70,7 @@
     include_package_data=True,
     install_requires=[
         "eth-abi>=2.0.0b6,<3.0.0",
-        "eth-account>=0.5.2,<0.6.0",
+        "eth-account>=0.5.3,<0.6.0",
         "eth-hash[pycryptodome]>=0.2.0,<1.0.0",
         "eth-typing>=2.0.0,<3.0.0",
         "eth-utils>=1.9.3,<2.0.0",

diff --git a/web3/_utils/formatters.py b/web3/_utils/formatters.py
@@ -21,7 +21,7 @@
     to_dict,
     to_list,
 )
-from eth_utils.curried import (  # type: ignore
+from eth_utils.curried import (
     apply_formatter_at_index,
 )
 from eth_utils.toolz import (

diff --git a/web3/_utils/method_formatters.py b/web3/_utils/method_formatters.py
@@ -6,10 +6,11 @@
     Collection,
     Dict,
     Iterable,
+    Tuple,
     Union,
 )
 
-from eth_utils.curried import (  # type: ignore
+from eth_utils.curried import (
     apply_formatter_at_index,
     apply_formatter_if,
     apply_formatter_to_array,
@@ -299,7 +300,12 @@ def apply_list_to_array_formatter(formatter: Any) -> Callable[..., Any]:
 )
 
 
+estimate_gas_without_block_id: Callable[[Dict[str, Any]], Dict[str, Any]]
 estimate_gas_without_block_id = apply_formatter_at_index(transaction_param_formatter, 0)
+estimate_gas_with_block_id: Callable[
+    [Tuple[Dict[str, Any], Union[str, int]]],
+    Tuple[Dict[str, Any], int]
+]
 estimate_gas_with_block_id = apply_formatters_to_sequence([
     transaction_param_formatter,
     block_number_formatter,

diff --git a/web3/_utils/rpc_abi.py b/web3/_utils/rpc_abi.py
@@ -13,7 +13,7 @@
 from eth_utils import (
     to_dict,
 )
-from eth_utils.curried import (  # type: ignore
+from eth_utils.curried import (
     apply_formatter_at_index,
 )
 from eth_utils.toolz import (

diff --git a/web3/_utils/validation.py b/web3/_utils/validation.py
@@ -21,7 +21,7 @@
     is_list_like,
     is_string,
 )
-from eth_utils.curried import (  # type: ignore
+from eth_utils.curried import (
     apply_formatter_to_array,
 )
 from eth_utils.hexadecimal import (

diff --git a/web3/method.py b/web3/method.py
@@ -15,7 +15,7 @@
 )
 import warnings
 
-from eth_utils.curried import (  # type: ignore
+from eth_utils.curried import (
     to_tuple,
 )
 from eth_utils.toolz import (

diff --git a/web3/middleware/geth_poa.py b/web3/middleware/geth_poa.py
@@ -1,4 +1,4 @@
-from eth_utils.curried import (  # type: ignore
+from eth_utils.curried import (
     apply_formatters_to_dict,
     apply_key_map,
 )

diff --git a/web3/middleware/validation.py b/web3/middleware/validation.py
@@ -4,7 +4,7 @@
     Callable,
 )
 
-from eth_utils.curried import (  # type: ignore
+from eth_utils.curried import (
     apply_formatter_at_index,
     apply_formatter_if,
     apply_formatters_to_dict,

diff --git a/web3/providers/eth_tester/middleware.py b/web3/providers/eth_tester/middleware.py
@@ -13,7 +13,7 @@
     is_hex,
     is_string,
 )
-from eth_utils.curried import (  # type: ignore
+from eth_utils.curried import (
     apply_formatter_if,
     apply_formatters_to_dict,
 )