fix: get latest version in store after legacy pruning fails (#1067)

Author: PaddyMc

nodedb.go

@@ -724,7 +724,15 @@ func (ndb *nodeDB) deleteVersionsTo(toVersion int64) error {
 		if err := ndb.deleteLegacyVersions(legacyLatestVersion); err != nil {
 			ndb.logger.Error("Error deleting legacy versions", "err", err)
 		}
-		first = legacyLatestVersion + 1
+		// NOTE: When pruning is broken for legacy versions we need to find the
+		// latest non legacy version in the store
+		// TODO: Make sure legacy pruning works as expected and does not fail
+		firstNonLegacyVersion, err := ndb.getFirstNonLegacyVersion()
+		if err != nil {
+			return err
+		}
+		first = firstNonLegacyVersion
+
 		// reset the legacy latest version forcibly to avoid multiple calls
 		ndb.resetLegacyLatestVersion(-1)
 	}
@@ -766,6 +774,35 @@ func (ndb *nodeDB) legacyRootKey(version int64) []byte {
 	return legacyRootKeyFormat.Key(version)
 }
 
+// getFirstNonLegacyVersion binary searches the store for the first non-legacy version
+func (ndb *nodeDB) getFirstNonLegacyVersion() (int64, error) {
+	ndb.mtx.Lock()
+	firstVersion := ndb.firstVersion
+	ndb.mtx.Unlock()
+
+	// Find the first version
+	_, latestVersion, err := ndb.getLatestVersion()
+	if err != nil {
+		return 0, err
+	}
+	for firstVersion < latestVersion {
+		version := (latestVersion + firstVersion) >> 1
+		has, err := ndb.hasVersion(version)
+		if err != nil {
+			return 0, err
+		}
+		if has {
+			latestVersion = version
+		} else {
+			firstVersion = version + 1
+		}
+	}
+
+	ndb.resetFirstVersion(latestVersion)
+
+	return latestVersion, nil
+}
+
 func (ndb *nodeDB) getFirstVersion() (int64, error) {
 	ndb.mtx.Lock()
 	firstVersion := ndb.firstVersion

nodedb_test.go

@@ -446,3 +446,43 @@ func TestCloseNodeDB(t *testing.T) {
 	require.NoError(t, ndb.Close())
 	require.NoError(t, ndb.Close()) // must not block or fail on second call
 }
+
+func TestGetFirstNonLegacyVersion(t *testing.T) {
+	db := dbm.NewMemDB()
+	ndb := newNodeDB(db, 0, DefaultOptions(), NewNopLogger())
+
+	// Test case 1: Empty database
+	firstVersion, err := ndb.getFirstNonLegacyVersion()
+	require.NoError(t, err)
+	require.Equal(t, int64(0), firstVersion)
+
+	// Test case 2: Database with only legacy versions
+	// Create a legacy version at version 1
+	legacyRoot := GetRootKey(1)
+	require.NoError(t, ndb.batch.Set(ndb.legacyRootKey(1), legacyRoot))
+	require.NoError(t, ndb.batch.Write())
+
+	firstVersion, err = ndb.getFirstNonLegacyVersion()
+	require.NoError(t, err)
+	require.Equal(t, int64(0), firstVersion)
+
+	// Test case 3: Database with both legacy and non-legacy versions
+	// Create a non-legacy version at version 2
+	nonLegacyRoot := GetRootKey(2)
+	require.NoError(t, ndb.batch.Set(ndb.nodeKey(nonLegacyRoot), []byte{}))
+	require.NoError(t, ndb.batch.Write())
+
+	firstVersion, err = ndb.getFirstNonLegacyVersion()
+	require.NoError(t, err)
+	require.Equal(t, int64(2), firstVersion)
+
+	// Test case 4: Database with multiple non-legacy versions
+	// Create another non-legacy version at version 3
+	nonLegacyRoot3 := GetRootKey(3)
+	require.NoError(t, ndb.batch.Set(ndb.nodeKey(nonLegacyRoot3), []byte{}))
+	require.NoError(t, ndb.batch.Write())
+
+	firstVersion, err = ndb.getFirstNonLegacyVersion()
+	require.NoError(t, err)
+	require.Equal(t, int64(2), firstVersion) // Should still return the first non-legacy version
+}