Merge branch 'master' into piper/remove-multi-trie-support

evm/chains/base.py

@@ -41,6 +41,9 @@
 from evm.rlp.headers import (
     BlockHeader,
 )
+from evm.utils.db import (
+    apply_state_dict,
+)
 from evm.utils.chain import (
     generate_vms_by_range,
 )
@@ -439,7 +442,8 @@ def from_genesis(cls,
         if genesis_state is None:
             genesis_state = {}
 
-        state_db.apply_state_dict(genesis_state)
+        # mutation
+        apply_state_dict(state_db, genesis_state)
 
         if 'state_root' not in genesis_params:
             # If the genesis state_root was not specified, use the value

evm/db/account.py

@@ -55,10 +55,6 @@ def __init__(self) -> None:
             "Must be implemented by subclasses"
         )
 
-    @abstractmethod
-    def apply_state_dict(self, state_dict):
-        raise NotImplementedError("Must be implemented by subclasses")
-
     @abstractmethod
     def decommission(self):
         raise NotImplementedError("Must be implemented by subclasses")
@@ -167,15 +163,6 @@ def _trie(self):
     def _trie(self, value):
         self.__trie = value
 
-    def apply_state_dict(self, state_dict):
-        for account, account_data in state_dict.items():
-            self.set_balance(account, account_data["balance"])
-            self.set_nonce(account, account_data["nonce"])
-            self.set_code(account, account_data["code"])
-
-            for slot, value in account_data["storage"].items():
-                self.set_storage(account, slot, value)
-
     def decommission(self):
         self.db = None
         self.__trie = None

evm/tools/test_builder/builder_utils.py

@@ -17,6 +17,10 @@
     to_text,
     int_to_big_endian,
 )
+
+from evm.utils.db import (
+    apply_state_dict,
+)
 from evm.utils.padding import (
     pad32,
 )
@@ -111,7 +115,7 @@ def get_version_from_git():
 
 def calc_state_root(state, account_state_db_class):
     state_db = account_state_db_class(MemoryDB())
-    state_db.apply_state_dict(state)
+    apply_state_dict(state_db, state)
     return state_db.root_hash
 
 

evm/utils/db.py

@@ -31,3 +31,15 @@ def get_block_header_by_hash(block_hash: BlockHeader, db: 'BaseChainDB') -> Bloc
     Returns the header for the parent block.
     """
     return db.get_block_header_by_hash(block_hash)
+
+
+def apply_state_dict(account_db, state_dict):
+    for account, account_data in state_dict.items():
+        account_db.set_balance(account, account_data["balance"])
+        account_db.set_nonce(account, account_data["nonce"])
+        account_db.set_code(account, account_data["code"])
+
+        for slot, value in account_data["storage"].items():
+            account_db.set_storage(account, slot, value)
+
+    return account_db

tests/json-fixtures/test_state.py

@@ -43,6 +43,9 @@
     normalize_statetest_fixture,
     should_run_slow_tests,
 )
+from evm.utils.db import (
+    apply_state_dict,
+)
 
 from eth_typing.enums import (
     ForkName
@@ -270,7 +273,7 @@ def test_state_fixtures(fixture, fixture_vm_class):
 
     state = vm.state
     with state.mutable_state_db() as state_db:
-        state_db.apply_state_dict(fixture['pre'])
+        apply_state_dict(state_db, fixture['pre'])
     # Update state_root manually
     vm.block = vm.block.copy(header=vm.block.header.copy(state_root=state.state_root))
     if 'secretKey' in fixture['transaction']: