evm,vm: remove the hacks to prevent account cleanups of system contra…

…cts (#3418) * evm,vm: remove the hacks to prevent account cleanups of system contracts * lint --------- Co-authored-by: acolytec3 <[email protected]> Co-authored-by: Holger Drewes <[email protected]>
ethereumjs · May 19, 2024 · 38c4a73 · 38c4a73
1 parent c95499c
commit 38c4a73
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/packages/evm/src/journal.ts b/packages/evm/src/journal.ts
@@ -2,7 +2,6 @@ import { Hardfork } from '@ethereumjs/common'
 import {
   Address,
   RIPEMD160_ADDRESS_STRING,
-  bigIntToHex,
   bytesToHex,
   bytesToUnprefixedHex,
   stripHexPrefix,
@@ -198,13 +197,6 @@ export class Journal {
         const address = new Address(hexToBytes(`0x${addressHex}`))
         const account = await this.stateManager.getAccount(address)
         if (account === undefined || account.isEmpty()) {
-          if (this.common.isActivatedEIP(2935)) {
-            // The history storage address is exempt of state clearing by EIP-158 if the EIP is activated
-            const addr = bigIntToHex(this.common.param('vm', 'historyStorageAddress')).slice(2)
-            if (addressHex === addr) {
-              continue
-            }
-          }
           await this.deleteAccount(address)
           if (this.DEBUG) {
             this._debug(`Cleanup touched account address=${address} (>= SpuriousDragon)`)

diff --git a/packages/vm/src/runBlock.ts b/packages/vm/src/runBlock.ts
@@ -545,6 +545,9 @@ export async function accumulateParentBlockHash(
     }
     // eslint-disable-next-line no-empty
   } catch (_e) {}
+
+  // do cleanup if the code was not deployed
+  await this.evm.journal.cleanup()
 }
 
 export async function accumulateParentBeaconBlockRoot(
@@ -590,6 +593,9 @@ export async function accumulateParentBeaconBlockRoot(
     setLengthLeft(bigIntToBytes(timestampExtended), 32),
     root
   )
+
+  // do cleanup if the code was not deployed
+  await this.evm.journal.cleanup()
 }
 
 /**