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

Upgrade py-trie to v2 alpha 1

Author: carver

eth/db/storage.py

@@ -129,6 +129,7 @@ def __getitem__(self, key: bytes) -> bytes:
                 exc.missing_node_hash,
                 self._starting_root_hash,
                 exc.requested_key,
+                exc.prefix,
                 self._address,
             ) from exc
 
@@ -153,6 +154,7 @@ def __delitem__(self, key: bytes) -> None:
                 exc.missing_node_hash,
                 self._starting_root_hash,
                 exc.requested_key,
+                exc.prefix,
                 self._address,
             ) from exc
 

eth/vm/interrupt.py

@@ -1,3 +1,7 @@
+from typing import (
+    Optional,
+)
+
 from eth_typing import (
     Address,
     Hash32,
@@ -8,6 +12,9 @@
 from trie.exceptions import (
     MissingTrieNode,
 )
+from trie.typing import (
+    Nibbles,
+)
 
 from eth.exceptions import (
     PyEVMError,
@@ -53,6 +60,7 @@ def __init__(
             missing_node_hash: Hash32,
             storage_root_hash: Hash32,
             requested_key: Hash32,
+            prefix: Optional[Nibbles],
             account_address: Address,
             *args: bytes) -> None:
         if not isinstance(account_address, bytes):
@@ -62,6 +70,7 @@ def __init__(
             missing_node_hash,
             storage_root_hash,
             requested_key,
+            prefix,
             account_address,
             *args,
         )
@@ -72,7 +81,7 @@ def storage_root_hash(self) -> Hash32:
 
     @property
     def account_address(self) -> Address:
-        return self.args[3]
+        return self.args[4]
 
     def __repr__(self) -> str:
         return f"MissingStorageTrieNode: {self}"

newsfragments/1935.internal.rst

@@ -0,0 +1 @@
+Upgrade py-trie to the new v2.0.0-alpha.1, and pin it for stability.

setup.py

@@ -16,7 +16,7 @@
         "py-ecc>=1.4.7,<5.0.0",
         "pyethash>=0.1.27,<1.0.0",
         "rlp>=1.1.0,<2.0.0",
-        "trie>=1.4.0,<2.0.0",
+        "trie==2.0.0-alpha.1",
     ],
     # The eth-extra sections is for libraries that the evm does not
     # explicitly need to function and hence should not depend on.