Merge pull request #1953 from carver/upgrade-py-trie

Upgrade py-trie to v2-alpha.3, and eth-utils to v1.9.4

Author: carver

eth/tools/_utils/normalization.py

@@ -33,10 +33,13 @@
     HexStr,
 )
 
-from eth_utils import (
+from eth_utils.curried import (
+    apply_formatter_if,
+    apply_formatter_to_array,
     apply_formatters_to_dict,
     big_endian_to_int,
     decode_hex,
+    hexstr_if_str,
     is_0x_prefixed,
     is_bytes,
     is_hex,
@@ -48,7 +51,6 @@
     to_dict,
     ValidationError,
 )
-import eth_utils.curried
 
 from eth.constants import (
     CREATE_CONTRACT_ADDRESS,
@@ -128,7 +130,7 @@ def normalize_to_address(value: AnyStr) -> Address:
         return CREATE_CONTRACT_ADDRESS
 
 
-robust_decode_hex = eth_utils.curried.hexstr_if_str(to_bytes)
+robust_decode_hex = hexstr_if_str(to_bytes)
 
 
 #
@@ -247,7 +249,7 @@ def state_definition_to_dict(state_definition: GeneralState) -> AccountState:
         "nonce": normalize_int,
         "storage": normalize_storage
     }, required=[])),
-    eth_utils.curried.apply_formatter_if(
+    apply_formatter_if(
         lambda s: isinstance(s, Iterable) and not isinstance(s, Mapping),
         state_definition_to_dict
     ),
@@ -271,13 +273,13 @@ def state_definition_to_dict(state_definition: GeneralState) -> AccountState:
 
 
 normalize_main_transaction_group = dict_normalizer({
-    "data": eth_utils.curried.apply_formatter_to_array(normalize_bytes),
-    "gasLimit": eth_utils.curried.apply_formatter_to_array(normalize_int),
+    "data": apply_formatter_to_array(normalize_bytes),
+    "gasLimit": apply_formatter_to_array(normalize_int),
     "gasPrice": normalize_int,
     "nonce": normalize_int,
     "secretKey": normalize_bytes,
     "to": normalize_to_address,
-    "value": eth_utils.curried.apply_formatter_to_array(normalize_int),
+    "value": apply_formatter_to_array(normalize_int),
 })
 
 
@@ -306,14 +308,16 @@ def state_definition_to_dict(state_definition: GeneralState) -> AccountState:
     "gasLimit": normalize_int,
     "value": normalize_int,
 })
-normalize_call_creates = eth_utils.curried.apply_formatter_to_array(normalize_call_create_item)
+normalize_call_creates: Callable[[Iterable[Any]], Iterable[Any]]
+normalize_call_creates = apply_formatter_to_array(normalize_call_create_item)
 
 normalize_log_item = dict_normalizer({
     "address": to_canonical_address,
-    "topics": eth_utils.curried.apply_formatter_to_array(normalize_int),
+    "topics": apply_formatter_to_array(normalize_int),
     "data": normalize_bytes,
 })
-normalize_logs = eth_utils.curried.apply_formatter_to_array(normalize_log_item)
+normalize_logs: Callable[[Iterable[Any]], Iterable[Any]]
+normalize_logs = apply_formatter_to_array(normalize_log_item)
 
 
 normalize_main_environment = dict_normalizer({

eth/tools/fixtures/fillers/formatters.py

@@ -1,15 +1,22 @@
+from typing import (
+    Any,
+    Callable,
+    List,
+)
+
 from eth_utils.curried import (
+    apply_formatter_to_array,
+    apply_formatters_to_dict,
     apply_formatters_to_sequence,
     encode_hex,
     to_checksum_address,
     to_hex,
 )
 
 from eth_utils.toolz import curried
-import eth_utils.curried
 
 
-environment_formatter = eth_utils.curried.apply_formatters_to_dict({
+environment_formatter = apply_formatters_to_dict({
     "currentCoinbase": to_checksum_address,
     "previousHash": encode_hex,
     "currentNumber": to_hex,
@@ -19,35 +26,37 @@
 })
 
 
+storage_item_formatter: Callable[[List[Any]], List[Any]]
 storage_item_formatter = apply_formatters_to_sequence([to_hex, to_hex])
 storage_formatter = curried.itemmap(storage_item_formatter)
 
 
-account_state_formatter = eth_utils.curried.apply_formatters_to_dict({
+account_state_formatter = apply_formatters_to_dict({
     "balance": to_hex,
     "nonce": to_hex,
     "code": encode_hex,
     "storage": storage_formatter,
 })
 
 
+state_item_formatter: Callable[[List[Any]], List[Any]]
 state_item_formatter = apply_formatters_to_sequence([to_checksum_address, account_state_formatter])
 state_formatter = curried.itemmap(state_item_formatter)
 
 
-transaction_group_formatter = eth_utils.curried.apply_formatters_to_dict({
+transaction_group_formatter = apply_formatters_to_dict({
     # all transaction types
     "to": to_checksum_address,
-    "data": eth_utils.curried.apply_formatter_to_array(encode_hex),
-    "gasLimit": eth_utils.curried.apply_formatter_to_array(to_hex),
+    "data": apply_formatter_to_array(encode_hex),
+    "gasLimit": apply_formatter_to_array(to_hex),
     "gasPrice": to_hex,
     "nonce": to_hex,
     "secretKey": encode_hex,
-    "value": eth_utils.curried.apply_formatter_to_array(to_hex),
+    "value": apply_formatter_to_array(to_hex),
 })
 
 
-execution_formatter = eth_utils.curried.apply_formatters_to_dict({
+execution_formatter = apply_formatters_to_dict({
     "address": to_checksum_address,
     "origin": to_checksum_address,
     "caller": to_checksum_address,
@@ -59,13 +68,14 @@
 })
 
 
-expect_element_formatter = eth_utils.curried.apply_formatters_to_dict({
+expect_element_formatter = apply_formatters_to_dict({
     "result": state_formatter
 })
-expect_formatter = eth_utils.curried.apply_formatter_to_array(expect_element_formatter)
+expect_formatter: Callable[[List[Any]], List[Any]]
+expect_formatter = apply_formatter_to_array(expect_element_formatter)
 
 
-test_formatter = eth_utils.curried.apply_formatters_to_dict({
+test_formatter = apply_formatters_to_dict({
     "env": environment_formatter,
     "pre": state_formatter,
     "transaction": transaction_group_formatter,
@@ -75,27 +85,28 @@
 filler_formatter = curried.valmap(test_formatter)
 
 
-state_post_formatter = eth_utils.curried.apply_formatters_to_dict({
+state_post_formatter = apply_formatters_to_dict({
     "hash": encode_hex
 })
 
 
-filled_state_test_formatter = curried.valmap(eth_utils.curried.apply_formatters_to_dict({
+filled_state_test_formatter = curried.valmap(apply_formatters_to_dict({
     "env": environment_formatter,
     "pre": state_formatter,
     "transaction": transaction_group_formatter,
     "post": state_post_formatter,
 }))
 
-call_create_item_formatter = eth_utils.curried.apply_formatters_to_dict({
+call_create_item_formatter = apply_formatters_to_dict({
     "data": encode_hex,
     "destination": to_checksum_address,
     "gasLimit": to_hex,
     "value": to_hex,
 })
-call_creates_formatter = eth_utils.curried.apply_formatter_to_array(call_create_item_formatter)
+call_creates_formatter: Callable[[List[Any]], List[Any]]
+call_creates_formatter = apply_formatter_to_array(call_create_item_formatter)
 
-filled_vm_test_formatter = curried.valmap(eth_utils.curried.apply_formatters_to_dict({
+filled_vm_test_formatter = curried.valmap(apply_formatters_to_dict({
     "env": environment_formatter,
     "pre": state_formatter,
     "exec": execution_formatter,

newsfragments/1953.misc.rst

@@ -0,0 +1,2 @@
+Upgrade py-trie to v2.0.0-alpha.3 for a dependency fix, and eth-utils to v1.9.4 for a type-check
+fix.

setup.py

@@ -10,13 +10,13 @@
         "eth-bloom>=1.0.3,<2.0.0",
         "eth-keys>=0.2.1,<0.4.0",
         "eth-typing>=2.2.0,<3.0.0",
-        "eth-utils>=1.8.0,<2.0.0",
+        "eth-utils>=1.9.4,<2.0.0",
         "lru-dict>=1.1.6",
         "mypy_extensions>=0.4.1,<1.0.0",
         "py-ecc>=1.4.7,<5.0.0",
         "pyethash>=0.1.27,<1.0.0",
         "rlp>=1.1.0,<2.0.0",
-        "trie==2.0.0-alpha.2",
+        "trie==2.0.0-alpha.3",
     ],
     # The eth-extra sections is for libraries that the evm does not
     # explicitly need to function and hence should not depend on.
@@ -54,7 +54,7 @@
         # Sphinx pined to `<1.8.0`: https://github.com/sphinx-doc/sphinx/issues/3494
         "Sphinx>=1.5.5,<1.8.0",
         "sphinx_rtd_theme>=0.1.9",
-        "sphinxcontrib-asyncio>=0.2.0",
+        "sphinxcontrib-asyncio>=0.2.0,<0.3",
         "towncrier>=19.2.0, <20",
     ],
     'dev': [