From a392ebbc6460501b44cb43dfe297fd1f3265729b Mon Sep 17 00:00:00 2001
From: Sam Wilson <sam@binarycake.ca>
Date: Sat, 25 Jan 2025 13:41:31 -0500
Subject: [PATCH] change type of branch node subnodes (#1066)

---
 setup.cfg                   |  2 +-
 src/ethereum/prague/trie.py | 36 ++++++++++++++++++++++++++++++------
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 4cb3796099..1666e6b37f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -119,7 +119,7 @@ python_requires = >=3.10
 install_requires =
     pycryptodome>=3,<4
     coincurve>=20,<21
-    typing_extensions>=4
+    typing_extensions>=4.2
     py_ecc @ git+https://github.com/petertdavies/py_ecc.git@127184f4c57b1812da959586d0fe8f43bb1a2389
     ethereum-types>=0.2.1,<0.3
     ethereum-rlp>=0.1.1,<0.2
diff --git a/src/ethereum/prague/trie.py b/src/ethereum/prague/trie.py
index 03ae159be7..c81ef86b61 100644
--- a/src/ethereum/prague/trie.py
+++ b/src/ethereum/prague/trie.py
@@ -24,14 +24,17 @@
     MutableMapping,
     Optional,
     Sequence,
+    Tuple,
     TypeVar,
     Union,
+    cast,
 )
 
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes
 from ethereum_types.frozen import slotted_freezable
 from ethereum_types.numeric import U256, Uint
+from typing_extensions import assert_type
 
 from ethereum.cancun import trie as previous_trie
 from ethereum.crypto.hash import keccak256
@@ -95,12 +98,32 @@ class ExtensionNode:
     subnode: rlp.Extended
 
 
+BranchSubnodes = Tuple[
+    rlp.Extended,
+    rlp.Extended,
+    rlp.Extended,
+    rlp.Extended,
+    rlp.Extended,
+    rlp.Extended,
+    rlp.Extended,
+    rlp.Extended,
+    rlp.Extended,
+    rlp.Extended,
+    rlp.Extended,
+    rlp.Extended,
+    rlp.Extended,
+    rlp.Extended,
+    rlp.Extended,
+    rlp.Extended,
+]
+
+
 @slotted_freezable
 @dataclass
 class BranchNode:
     """Branch node in the Merkle Trie"""
 
-    subnodes: List[rlp.Extended]
+    subnodes: BranchSubnodes
     value: rlp.Extended
 
 
@@ -140,7 +163,7 @@ def encode_internal_node(node: Optional[InternalNode]) -> rlp.Extended:
             node.subnode,
         )
     elif isinstance(node, BranchNode):
-        unencoded = node.subnodes + [node.value]
+        unencoded = list(node.subnodes) + [node.value]
     else:
         raise AssertionError(f"Invalid internal node type {type(node)}!")
 
@@ -461,10 +484,11 @@ def patricialize(
         else:
             branches[key[level]][key] = obj[key]
 
+    subnodes = tuple(
+        encode_internal_node(patricialize(branches[k], level + Uint(1)))
+        for k in range(16)
+    )
     return BranchNode(
-        [
-            encode_internal_node(patricialize(branches[k], level + Uint(1)))
-            for k in range(16)
-        ],
+        cast(BranchSubnodes, assert_type(subnodes, Tuple[rlp.Extended, ...])),
         value,
     )