use lru cache for ethash cache

Author: heikoheiko

ethereum/blocks.py

@@ -347,10 +347,9 @@ def check_pow(self, db=None, nonce=None):
 
         # Grab current cache
         current_cache_size = get_cache_size(self.number)
-        cache = get_cache_memoized(db, seed, current_cache_size)
+        cache = get_cache_memoized(seed, current_cache_size)
         current_full_size = get_full_size(self.number)
-        mining_output = hashimoto_light(current_full_size, cache,
-                                        header_hash, nonce)
+        mining_output = hashimoto_light(current_full_size, cache, header_hash, nonce)
         diff = self.difficulty
         if mining_output['mix digest'] != self.mixhash:
             return False
@@ -1242,30 +1241,9 @@ def __repr__(self):
     def __structlog__(self):
         return encode_hex(self.hash)
 
-
-cache_cache = {}
-
-
-def peck_cache(db, seedhash, size):
-    key = b'cache:' + seedhash + b',' + str_to_bytes(str(size))
-    if key not in db:
-        cache = mkcache(size, seedhash)
-        cache_cache[key] = cache
-        cache_serialized = serialize_cache(cache)
-        cache_hash = utils.sha3(cache_serialized)
-        db.put(cache_hash, cache_serialized)
-        db.put(key, cache_hash)
-    elif key not in cache_cache:
-        o = db.get(db.get(key))
-        cache_cache[key] = o
-        return deserialize_cache(o)
-
-
-def get_cache_memoized(db, seedhash, size):
-    key = b'cache:' + seedhash + b',' + str_to_bytes(str(size))
-    peck_cache(db, seedhash, size)
-    return cache_cache[key]
-
+@lru_cache(5)
+def get_cache_memoized(seedhash, size):
+    return mkcache(size, seedhash)
 
 # Gas limit adjustment algo
 def calc_gaslimit(parent):

ethereum/miner.py

@@ -58,7 +58,7 @@ def mine(self, steps=1000):
         """
         #b = self.block
         sz = blocks.get_cache_size(self.block.number)
-        cache = blocks.get_cache_memoized(self.block.db, self.block.header.seed, sz)
+        cache = blocks.get_cache_memoized(self.block.header.seed, sz)
         fsz = blocks.get_full_size(self.block.number)
         nonce = utils.big_endian_to_int(self.block.nonce)
         TT64M1 = 2**64 - 1

ethereum/processblock.py

@@ -243,7 +243,7 @@ def _apply_msg(ext, msg, code):
 
 
 def create_contract(ext, msg):
-    print('CREATING WITH GAS', msg.gas)
+    #print('CREATING WITH GAS', msg.gas)
     sender = decode_hex(msg.sender) if len(msg.sender) == 40 else msg.sender
     if ext.tx_origin != msg.sender:
         ext._block.increment_nonce(msg.sender)
@@ -268,7 +268,7 @@ def create_contract(ext, msg):
             gas -= gcost
         else:
             dat = []
-            print('CONTRACT CREATION OOG', 'have', gas, 'want', gcost)
+            #print('CONTRACT CREATION OOG', 'have', gas, 'want', gcost)
             log_msg.debug('CONTRACT CREATION OOG', have=gas, want=gcost)
         ext._block.set_code(msg.to, b''.join(map(ascii_chr, dat)))
         return 1, gas, msg.to

ethereum/tests/test_chain.py

@@ -15,26 +15,12 @@
 logger = get_logger()
 # configure_logging('eth.vm:trace,eth.vm.memory:info')
 
-
 _db = new_db()
-blocks.peck_cache(_db, b'\x00' * 32, ethash_utils.get_cache_size(0))
 
 
 @pytest.fixture(scope='function')
 def db():
-    """A database that contains the cache by default."""
-    new_db = EphemDB()
-
-    class DefaultDict(dict):
-
-        def __missing__(self, key):
-            return _db.get(key)
-
-        def __contains__(self, key):
-            return super(DefaultDict, self).__contains__(key) or key in _db
-    new_db.db = DefaultDict()
-    return new_db
-
+    return EphemDB()
 alt_db = db