vm: ensure system address is not created if it is empty

ethereumjs · May 4, 2024 · f427ca0 · f427ca0
1 parent 6357645
commit f427ca0
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/packages/vm/src/requests.ts b/packages/vm/src/requests.ts
@@ -72,6 +72,8 @@ const accumulateEIP7002Requests = async (vm: VM, requests: CLRequest[]): Promise
   )
   const systemAddress = Address.fromString(bytesToHex(systemAddressBytes))
 
+  const addrIsEmpty = (await vm.stateManager.getAccount(systemAddress)) === undefined
+
   const results = await vm.evm.runCall({
     caller: systemAddress,
     gasLimit: BigInt(1_000_000),
@@ -92,6 +94,10 @@ const accumulateEIP7002Requests = async (vm: VM, requests: CLRequest[]): Promise
       requests.push(request)
     }
   }
+
+  if (addrIsEmpty) {
+    await vm.stateManager.deleteAccount(systemAddress)
+  }
 }
 
 const accumulateDeposits = async (