Check network on start and reset db

services/chainstorage/src/main/java/tech/pegasys/teku/services/chainstorage/EphemeryDatabaseReset.java

@@ -27,15 +27,19 @@ public class EphemeryDatabaseReset {
   Database resetDatabaseAndCreate(
       final ServiceConfig serviceConfig, final VersionedDatabaseFactory dbFactory) {
     try {
-      final Path beaconDataDir = serviceConfig.getDataDirLayout().getBeaconDataDirectory();
+      final Path beaconDataDir =
+          serviceConfig.getDataDirLayout().getBeaconDataDirectory().getParent();
+      final Path dbDataDir = beaconDataDir.resolve("db");
+      final Path networkFile = beaconDataDir.resolve("network.yml");
       final Path validatorDataDir = serviceConfig.getDataDirLayout().getValidatorDataDirectory();
       final Path slashProtectionDir;
       if (validatorDataDir.endsWith("slashprotection")) {
         slashProtectionDir = validatorDataDir;
       } else {
         slashProtectionDir = validatorDataDir.resolve("slashprotection");
       }
-      deleteDirectoryRecursively(beaconDataDir);
+      deleteDirectoryRecursively(dbDataDir);
+      deleteFile(networkFile);
       deleteDirectoryRecursively(slashProtectionDir);
       return dbFactory.createDatabase();
     } catch (final Exception ex) {
@@ -44,6 +48,12 @@ Database resetDatabaseAndCreate(
     }
   }
 
+  void deleteFile(final Path path) throws IOException {
+    if (Files.exists(path)) {
+      Files.delete(path);
+    }
+  }
+
   void deleteDirectoryRecursively(final Path path) throws IOException {
     if (Files.isDirectory(path)) {
       try (var stream = Files.walk(path)) {

services/chainstorage/src/main/java/tech/pegasys/teku/services/chainstorage/StorageService.java

@@ -59,7 +59,6 @@ public class StorageService extends Service implements StorageServiceFacade {
   private final boolean depositSnapshotStorageEnabled;
   private final boolean blobSidecarsStorageCountersEnabled;
   private static final Logger LOG = LogManager.getLogger();
-  private final EphemeryDatabaseReset ephemeryDatabaseReset;
 
   public StorageService(
       final ServiceConfig serviceConfig,
@@ -70,7 +69,6 @@ public StorageService(
     this.config = storageConfiguration;
     this.depositSnapshotStorageEnabled = depositSnapshotStorageEnabled;
     this.blobSidecarsStorageCountersEnabled = blobSidecarsStorageCountersEnabled;
-    this.ephemeryDatabaseReset = new EphemeryDatabaseReset();
   }
 
   @Override
@@ -92,7 +90,10 @@ protected SafeFuture<?> doStart() {
               try {
                 database = dbFactory.createDatabase();
               } catch (EphemeryException e) {
+                final EphemeryDatabaseReset ephemeryDatabaseReset = new EphemeryDatabaseReset();
                 database = ephemeryDatabaseReset.resetDatabaseAndCreate(serviceConfig, dbFactory);
+                LOG.warn(
+                    "Ephemery network deposit contract id has updated, resetting the stored database and slashing protection data.");
               }
               final SettableLabelledGauge pruningTimingsLabelledGauge =
                   SettableLabelledGauge.create(

services/chainstorage/src/test/java/tech/pegasys/teku/services/chainstorage/EphemeryDatabaseResetTest.java

@@ -16,14 +16,17 @@
 import static java.nio.file.Files.createTempDirectory;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -44,8 +47,9 @@ class EphemeryDatabaseResetTest {
 
   @Mock private DataDirLayout dataDirLayout;
   private Path beaconDataDir;
+  private Path dbDataDir;
   private Path resolvedSlashProtectionDir;
-
+  private File networkFile;
   @Mock private Database database;
 
   @InjectMocks private EphemeryDatabaseReset ephemeryDatabaseReset;
@@ -55,30 +59,44 @@ void setUp() throws IOException {
     MockitoAnnotations.openMocks(this);
     ephemeryDatabaseReset = spy(new EphemeryDatabaseReset());
     beaconDataDir = createTempDirectory("beaconDataDir");
+    dbDataDir = beaconDataDir.resolve("db");
+    networkFile = new File(beaconDataDir.toFile(), "network.yml");
     final Path validatorDataDir = createTempDirectory("validatorDataDir");
     resolvedSlashProtectionDir = validatorDataDir.resolve("slashprotection");
+
     when(serviceConfig.getDataDirLayout()).thenReturn(dataDirLayout);
     when(dataDirLayout.getBeaconDataDirectory()).thenReturn(beaconDataDir);
+    when(dataDirLayout.getBeaconDataDirectory().resolve("db")).thenReturn(dbDataDir);
+    when(dataDirLayout.getBeaconDataDirectory().resolve("network.yml"))
+        .thenReturn(networkFile.toPath());
     when(dataDirLayout.getValidatorDataDirectory()).thenReturn(validatorDataDir);
     when(dataDirLayout.getValidatorDataDirectory().resolve("slashprotection"))
         .thenReturn(resolvedSlashProtectionDir);
   }
 
   @Test
-  void shouldResetDirectoriesAndCreateDatabase() throws IOException {
+  void shouldResetSpecificDirectoriesAndCreateDatabase() throws IOException {
+    final Path kvStoreDir = beaconDataDir.resolve("kvstore");
+    Files.createDirectory(kvStoreDir);
+    final Path dbVersion = beaconDataDir.resolve("db.version");
+    Files.createFile(dbVersion);
+
     when(dbFactory.createDatabase()).thenReturn(database);
+
     final Database result = ephemeryDatabaseReset.resetDatabaseAndCreate(serviceConfig, dbFactory);
-    verify(ephemeryDatabaseReset).deleteDirectoryRecursively(beaconDataDir);
+    verify(ephemeryDatabaseReset).deleteDirectoryRecursively(dbDataDir);
+    verify(ephemeryDatabaseReset).deleteFile(networkFile.toPath());
     verify(ephemeryDatabaseReset).deleteDirectoryRecursively(resolvedSlashProtectionDir);
-    verify(dbFactory).createDatabase();
+    assertTrue(Files.exists(kvStoreDir));
+    assertTrue(Files.exists(dbVersion));
     assertEquals(database, result);
   }
 
   @Test
   void shouldThrowInvalidConfigurationExceptionWhenDirectoryDeletionFails() throws IOException {
     doThrow(new IOException("Failed to delete directory"))
         .when(ephemeryDatabaseReset)
-        .deleteDirectoryRecursively(beaconDataDir);
+        .deleteDirectoryRecursively(dbDataDir);
     final InvalidConfigurationException exception =
         assertThrows(
             InvalidConfigurationException.class,
@@ -94,7 +112,7 @@ void shouldThrowInvalidConfigurationExceptionWhenDirectoryDeletionFails() throws
 
   @Test
   void shouldThrowInvalidConfigurationExceptionWhenDatabaseCreationFails() throws IOException {
-    doNothing().when(ephemeryDatabaseReset).deleteDirectoryRecursively(beaconDataDir);
+    doNothing().when(ephemeryDatabaseReset).deleteDirectoryRecursively(dbDataDir);
     doNothing().when(ephemeryDatabaseReset).deleteDirectoryRecursively(resolvedSlashProtectionDir);
     when(dbFactory.createDatabase()).thenThrow(new RuntimeException("Database creation failed"));
     final InvalidConfigurationException exception =
@@ -106,7 +124,7 @@ void shouldThrowInvalidConfigurationExceptionWhenDatabaseCreationFails() throws
     assertEquals(
         "The existing ephemery database was old, and was unable to reset it.",
         exception.getMessage());
-    verify(ephemeryDatabaseReset).deleteDirectoryRecursively(beaconDataDir);
+    verify(ephemeryDatabaseReset).deleteDirectoryRecursively(dbDataDir);
     verify(ephemeryDatabaseReset).deleteDirectoryRecursively(resolvedSlashProtectionDir);
     verify(dbFactory).createDatabase();
   }