Merge pull request #1898 from carver/only-delete-missing-storage

Only delete (account) storage values if they are present

Author: carver

eth/db/storage.py

@@ -210,7 +210,15 @@ def set(self, slot: int, value: int) -> None:
         if value:
             self._journal_storage[key] = rlp.encode(value)
         else:
-            del self._journal_storage[key]
+            try:
+                current_val = self._journal_storage[key]
+            except KeyError:
+                # deleting an empty key has no effect
+                return
+            else:
+                if current_val != b'':
+                    # only try to delete the value if it's present
+                    del self._journal_storage[key]
 
     def delete(self) -> None:
         self.logger.debug2(

newsfragments/1898.bugfix.rst

@@ -0,0 +1,3 @@
+When double-deleting a storage slot, got ``KeyError: (b'\x03', 'key could not be deleted in
+JournalDB, because it was missing')``. This was fallout from `#1893
+  <https://github.com/ethereum/py-evm/pull/1893>`_