Require BaseAtomicDB in ChainDB and HeaderDB

Author: carver

docs/cookbooks/index.rst

@@ -44,13 +44,13 @@ Then to initialize, you can start it up with an in-memory database:
 
 .. doctest::
 
-  >>> from eth.db.backends.memory import MemoryDB
+  >>> from eth.db.atomic import AtomicDB
   >>> from eth.chains.mainnet import MAINNET_GENESIS_HEADER
 
   >>> # start a fresh in-memory db
 
   >>> # initialize a fresh chain
-  >>> chain = chain_class.from_genesis_header(MemoryDB(), MAINNET_GENESIS_HEADER)
+  >>> chain = chain_class.from_genesis_header(AtomicDB(), MAINNET_GENESIS_HEADER)
 
 .. _evm_cookbook_recipe_creating_a_chain_with_custom_state:
 
@@ -66,7 +66,7 @@ state.
   >>> from eth_keys import keys
   >>> from eth import constants
   >>> from eth.chains.mainnet import MainnetChain
-  >>> from eth.db.backends.memory import MemoryDB
+  >>> from eth.db.atomic import AtomicDB
   >>> from eth_utils import to_wei, encode_hex
 
 
@@ -95,7 +95,7 @@ state.
   ...     'nonce': constants.GENESIS_NONCE
   ... }
 
->>> chain = MainnetChain.from_genesis(MemoryDB(), GENESIS_PARAMS, GENESIS_STATE)
+  >>> chain = MainnetChain.from_genesis(AtomicDB(), GENESIS_PARAMS, GENESIS_STATE)
 
 .. _evm_cookbook_recipe_getting_the_balance_from_an_account:
 

docs/guides/eth/building_an_app_that_uses_pyevm.rst

@@ -70,9 +70,9 @@ Next, we'll create a new directory ``app`` and create a file ``main.py`` inside.
 
 .. code-block:: python
 
-  from evm import constants
-  from evm.chains.mainnet import MainnetChain
-  from evm.db.backends.memory import MemoryDB
+  from eth import constants
+  from eth.chains.mainnet import MainnetChain
+  from eth.db.backends.memory import MemoryDB
 
   from eth_utils import to_wei, encode_hex
 

docs/guides/eth/understanding_the_mining_process.rst

@@ -44,19 +44,19 @@ cookbook.
 
 ::
 
-  from eth.db.backends.memory import MemoryDB
+  from eth.db.atomic import AtomicDB
   from eth.chains.mainnet import MAINNET_GENESIS_HEADER
 
   # initialize a fresh chain
-  chain = chain_class.from_genesis_header(MemoryDB(), MAINNET_GENESIS_HEADER)
+  chain = chain_class.from_genesis_header(AtomicDB(), MAINNET_GENESIS_HEADER)
 
 Since we decided to not add any transactions to our block let's just call
 :func:`~~eth.chains.base.MiningChain.mine_block` and see what happens.
 
 ::
 
   # initialize a fresh chain
-  chain = chain_class.from_genesis_header(MemoryDB(), MAINNET_GENESIS_HEADER)
+  chain = chain_class.from_genesis_header(AtomicDB(), MAINNET_GENESIS_HEADER)
 
   chain.mine_block()
 
@@ -163,15 +163,15 @@ Next, we'll create the chain itself using the defined ``GENESIS_PARAMS`` and the
 
   from eth import MiningChain
   from eth.vm.forks.byzantium import ByzantiumVM
-  from eth.db.backends.memory import MemoryDB
+  from eth.db.backends.memory import AtomicDB
 
 
   klass = MiningChain.configure(
       __name__='TestChain',
       vm_configuration=(
           (constants.GENESIS_BLOCK_NUMBER, ByzantiumVM),
       ))
-  chain = klass.from_genesis(MemoryDB(), GENESIS_PARAMS)
+  chain = klass.from_genesis(AtomicDB(), GENESIS_PARAMS)
 
 
 Now that we have the building blocks available, let's put it all together and mine a proper block!
@@ -319,7 +319,7 @@ zero value transfer transaction.
   >>> from eth.chains.base import MiningChain
   >>> from eth.consensus.pow import mine_pow_nonce
   >>> from eth.vm.forks.byzantium import ByzantiumVM
-  >>> from eth.db.backends.memory import MemoryDB
+  >>> from eth.db.atomic import AtomicDB
 
 
   >>> GENESIS_PARAMS = {
@@ -350,7 +350,7 @@ zero value transfer transaction.
   ...         (constants.GENESIS_BLOCK_NUMBER, ByzantiumVM),
   ...     ))
 
-  >>> chain = klass.from_genesis(MemoryDB(), GENESIS_PARAMS)
+  >>> chain = klass.from_genesis(AtomicDB(), GENESIS_PARAMS)
   >>> vm = chain.get_vm()
 
   >>> nonce = vm.state.account_db.get_nonce(SENDER)

eth/chains/base.py

@@ -42,7 +42,7 @@
     ValidationError,
 )
 
-from eth.db.backends.base import BaseDB
+from eth.db.backends.base import BaseAtomicDB
 from eth.db.chain import (
     BaseChainDB,
     ChainDB,
@@ -144,15 +144,15 @@ def get_vm_configuration(cls) -> Tuple[Tuple[int, Type['BaseVM']], ...]:
     @classmethod
     @abstractmethod
     def from_genesis(cls,
-                     base_db: BaseDB,
+                     base_db: BaseAtomicDB,
                      genesis_params: Dict[str, HeaderParams],
                      genesis_state: AccountState=None) -> 'BaseChain':
         raise NotImplementedError("Chain classes must implement this method")
 
     @classmethod
     @abstractmethod
     def from_genesis_header(cls,
-                            base_db: BaseDB,
+                            base_db: BaseAtomicDB,
                             genesis_header: BlockHeader) -> 'BaseChain':
         raise NotImplementedError("Chain classes must implement this method")
 
@@ -322,7 +322,7 @@ class Chain(BaseChain):
 
     chaindb_class = ChainDB  # type: Type[BaseChainDB]
 
-    def __init__(self, base_db: BaseDB) -> None:
+    def __init__(self, base_db: BaseAtomicDB) -> None:
         if not self.vm_configuration:
             raise ValueError(
                 "The Chain class cannot be instantiated with an empty `vm_configuration`"
@@ -349,7 +349,7 @@ def get_chaindb_class(cls) -> Type[BaseChainDB]:
     #
     @classmethod
     def from_genesis(cls,
-                     base_db: BaseDB,
+                     base_db: BaseAtomicDB,
                      genesis_params: Dict[str, HeaderParams],
                      genesis_state: AccountState=None) -> 'BaseChain':
         """
@@ -389,7 +389,7 @@ def from_genesis(cls,
 
     @classmethod
     def from_genesis_header(cls,
-                            base_db: BaseDB,
+                            base_db: BaseAtomicDB,
                             genesis_header: BlockHeader) -> 'BaseChain':
         """
         Initializes the chain from the genesis header.
@@ -824,7 +824,7 @@ def _extract_uncle_hashes(blocks):
 class MiningChain(Chain):
     header = None  # type: BlockHeader
 
-    def __init__(self, base_db: BaseDB, header: BlockHeader=None) -> None:
+    def __init__(self, base_db: BaseAtomicDB, header: BlockHeader=None) -> None:
         super().__init__(base_db)
         self.header = self.ensure_header(header)
 

eth/db/__init__.py

@@ -8,13 +8,13 @@
     import_string,
 )
 from eth.db.backends.base import (
-    BaseDB
+    BaseAtomicDB,
 )
 
-DEFAULT_DB_BACKEND = 'eth.db.backends.memory.MemoryDB'
+DEFAULT_DB_BACKEND = 'eth.db.atomic.AtomicDB'
 
 
-def get_db_backend_class(import_path: str = None) -> Type[BaseDB]:
+def get_db_backend_class(import_path: str = None) -> Type[BaseAtomicDB]:
     if import_path is None:
         import_path = os.environ.get(
             'CHAIN_DB_BACKEND_CLASS',
@@ -23,6 +23,6 @@ def get_db_backend_class(import_path: str = None) -> Type[BaseDB]:
     return import_string(import_path)
 
 
-def get_db_backend(import_path: str = None, **init_kwargs: Any) -> BaseDB:
+def get_db_backend(import_path: str = None, **init_kwargs: Any) -> BaseAtomicDB:
     backend_class = get_db_backend_class(import_path)
     return backend_class(**init_kwargs)

eth/db/chain.py

@@ -41,7 +41,7 @@
 )
 from eth.db.header import BaseHeaderDB, HeaderDB
 from eth.db.backends.base import (
-    BaseDB
+    BaseAtomicDB
 )
 from eth.db.schema import SchemaV1
 from eth.rlp.headers import (
@@ -74,10 +74,10 @@ class TransactionKey(rlp.Serializable):
 
 
 class BaseChainDB(BaseHeaderDB):
-    db = None  # type: BaseDB
+    db = None  # type: BaseAtomicDB
 
     @abstractmethod
-    def __init__(self, db: BaseDB) -> None:
+    def __init__(self, db: BaseAtomicDB) -> None:
         raise NotImplementedError("ChainDB classes must implement this method")
 
     #
@@ -161,7 +161,7 @@ def persist_trie_data_dict(self, trie_data_dict: Dict[bytes, bytes]) -> None:
 
 
 class ChainDB(HeaderDB, BaseChainDB):
-    def __init__(self, db: BaseDB) -> None:
+    def __init__(self, db: BaseAtomicDB) -> None:
         self.db = db
 
     #

eth/db/header.py

@@ -28,7 +28,7 @@
     HeaderNotFound,
     ParentNotFound,
 )
-from eth.db import BaseDB
+from eth.db.backends.base import BaseDB
 from eth.db.schema import SchemaV1
 from eth.rlp.headers import BlockHeader
 from eth.validation import (

eth/tools/builder/chain/builders.py

@@ -20,6 +20,7 @@
     MiningChain,
 )
 from eth.db.backends.memory import MemoryDB
+from eth.db.atomic import AtomicDB
 from eth.validation import (
     validate_vm_configuration,
 )
@@ -318,7 +319,7 @@ def genesis(chain_class, db=None, params=None, state=None):
         genesis_params = merge(genesis_params_defaults, params)
 
     if db is None:
-        base_db = MemoryDB()
+        base_db = AtomicDB()
     else:
         base_db = db
 
@@ -383,10 +384,14 @@ def copy(chain):
     if not isinstance(chain, MiningChain):
         raise ValidationError("`at_block_number` may only be used with 'MiningChain")
     base_db = chain.chaindb.db
-    if not isinstance(base_db, MemoryDB):
+    if not isinstance(base_db, AtomicDB):
         raise ValidationError("Unsupported database type: {0}".format(type(base_db)))
 
-    db = MemoryDB(base_db.kv_store.copy())
+    if isinstance(base_db.wrapped_db, MemoryDB):
+        db = AtomicDB(MemoryDB(base_db.wrapped_db.kv_store.copy()))
+    else:
+        raise ValidationError("Unsupported wrapped database: {0}".format(type(base_db.wrapped_db)))
+
     chain_copy = type(chain)(db, chain.header)
     return chain_copy
 

eth/tools/fixtures/helpers.py

@@ -9,7 +9,7 @@
 )
 
 from eth import MainnetChain
-from eth.db.backends.memory import MemoryDB
+from eth.db.atomic import AtomicDB
 from eth.utils.state import (
     diff_account_db,
 )
@@ -147,7 +147,7 @@ def genesis_params_from_fixture(fixture):
 
 
 def new_chain_from_fixture(fixture):
-    base_db = MemoryDB()
+    base_db = AtomicDB()
 
     vm_config = chain_vm_configuration(fixture)
 

scripts/benchmark/utils/chain_plumbing.py

@@ -31,8 +31,8 @@
 from eth.chains.mainnet import (
     BaseMainnetChain,
 )
-from eth.db.backends.memory import (
-    MemoryDB
+from eth.db.atomic import (
+    AtomicDB,
 )
 
 AddressSetup = NamedTuple('AddressSetup', [
@@ -83,7 +83,7 @@ def genesis_state(setup: Iterable[AddressSetup]) -> Any:
 
 
 def chain_without_pow(
-        base_db: MemoryDB,
+        base_db: AtomicDB,
         vm: Type[BaseVM],
         genesis_params: Any,
         genesis_state: Any) -> MiningChain:
@@ -101,7 +101,7 @@ def chain_without_pow(
 
 def get_chain(vm: Type[BaseVM]) -> MiningChain:
     return chain_without_pow(
-        MemoryDB(),
+        AtomicDB(),
         vm,
         GENESIS_PARAMS,
         genesis_state([