refactor: Separate pyevm implementation from environment

boa/__init__.py

@@ -4,7 +4,7 @@
 from boa.contracts.base_evm_contract import BoaError
 from boa.contracts.vyper.vyper_contract import check_boa_error_matches
 from boa.debugger import BoaDebug
-from boa.environment import Env, enable_pyevm_verbose_logging, patch_opcode
+from boa.environment import Env
 from boa.interpret import (
     from_etherscan,
     load,
@@ -17,6 +17,7 @@
 from boa.network import NetworkEnv
 from boa.precompile import precompile
 from boa.test.strategies import fuzz
+from boa.vm.py_evm import enable_pyevm_verbose_logging, patch_opcode
 
 # turn off tracebacks if we are in repl
 # https://stackoverflow.com/a/64523765

boa/contracts/abi/abi_contract.py

@@ -226,7 +226,7 @@ def __init__(
         self._abi = abi
         self._functions = functions
 
-        self._bytecode = self.env.vm.state.get_code(address.canonical_address)
+        self._bytecode = self.env.get_code(address)
         if not self._bytecode:
             warn(
                 f"Requested {self} but there is no bytecode at that address!",

boa/contracts/vyper/decoder_utils.py

@@ -14,13 +14,14 @@
 )
 from vyper.utils import unsigned_to_signed
 
+from boa.util.abi import Address
 from boa.vm.utils import ceil32, floor32
 
 
 # wrap storage in something which looks like memory
 class ByteAddressableStorage:
-    def __init__(self, db, address, key):
-        self.db = db
+    def __init__(self, evm, address: Address, key: int):
+        self.evm = evm
         self.address = address
         self.key = key
 
@@ -31,7 +32,7 @@ def __getitem__(self, subscript):
             stop = subscript.stop
             i = self.key + start // 32
             while i < self.key + ceil32(stop) // 32:
-                ret += self.db.get_storage(self.address, i).to_bytes(32, "big")
+                ret += self.evm.get_storage_slot(self.address, i)
                 i += 1
 
             start_ofst = floor32(start)

boa/contracts/vyper/vyper_contract.py

@@ -120,8 +120,7 @@ def at(self, address: Any) -> "VyperContract":
         address = Address(address)
 
         ret = self.deploy(override_address=address, skip_initcode=True)
-        vm = ret.env.vm
-        bytecode = vm.state.get_code(address.canonical_address)
+        bytecode = ret.env.get_code(address)
 
         ret._set_bytecode(bytecode)
 
@@ -366,8 +365,7 @@ def setpath(lens, path, val):
 class StorageVar:
     def __init__(self, contract, slot, typ):
         self.contract = contract
-        self.addr = self.contract._address.canonical_address
-        self.accountdb = contract.env.vm.state._account_db
+        self.addr = self.contract._address
         self.slot = slot
         self.typ = typ
 
@@ -376,7 +374,7 @@ def _decode(self, slot, typ, truncate_limit=None):
         if truncate_limit is not None and n > truncate_limit:
             return None  # indicate failure to caller
 
-        fakemem = ByteAddressableStorage(self.accountdb, self.addr, slot)
+        fakemem = ByteAddressableStorage(self.contract.env.evm, self.addr, slot)
         return decode_vyper_object(fakemem, typ)
 
     def _dealias(self, maybe_address):
@@ -709,7 +707,7 @@ def marshal_to_python(self, computation, vyper_typ):
             self.handle_error(computation)
 
         # cache gas used for call if profiling is enabled
-        gas_meter = self.env.vm.state.computation_class._gas_meter_class
+        gas_meter = self.env.get_gas_meter_class()
         if gas_meter == ProfilingGasMeter:
             cache_gas_used_for_computation(self, computation)