[VM] fix account exists if account was previously deleted in cache

ethereumjs · Jul 31, 2020 · bdbc197 · bdbc197
1 parent a360a81
commit bdbc197
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/packages/vm/lib/state/cache.ts b/packages/vm/lib/state/cache.ts
@@ -51,6 +51,19 @@ export default class Cache {
     }
   }
 
+  /**
+   * Returns true if the key was deleted and thus existed in the cache earlier
+   * @param key - trie key to lookup
+   */
+  keyIsDeleted(key: Buffer): boolean {
+    const keyStr = key.toString('hex')
+    const it = this._cache.find(keyStr)
+    if (it.node) {
+      return it.value.deleted
+    }
+    return false
+  }
+
   /**
    * Looks up address in underlying trie.
    * @param address - Address of account

diff --git a/packages/vm/lib/state/stateManager.ts b/packages/vm/lib/state/stateManager.ts
@@ -494,7 +494,7 @@ export default class DefaultStateManager implements StateManager {
    */
   async accountExists(address: Buffer): Promise<boolean> {
     const account = await this._cache.lookup(address)
-    if (account) {
+    if (account && !this._cache.keyIsDeleted(address)) {
       return true
     }
     if (await this._cache._trie.get(address)) {