From 99ee35b140aeb3254ea78cdac0450f74a980d46c Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 16 Apr 2026 22:46:33 +0000
Subject: [PATCH 1/2] Initial plan


From 0797c7337e2cc8c9f0904ee18759e95d6351e9ec Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 16 Apr 2026 22:51:45 +0000
Subject: [PATCH 2/2] Enable auto quorum set configuration by default

Since stellar-core v22.3.0 shipped long ago, all stable images now
support the SKIP_HIGH_CRITICAL_VALIDATOR_CHECKS_FOR_TESTING config
option. This commit:

1. Changes --enable-relaxed-auto-qset-config default from false to true
2. Removes RequireExplicitQset and skipHighCriticalValidatorChecks=false
   overrides from old-image missions, allowing them to use auto quorum
   set configuration
3. Updates related comments in StellarCoreSet.fs

Agent-Logs-Url: https://github.com/stellar/supercluster/sessions/dcaac6b7-fa02-4444-a8bc-a8ff62e60327

Co-authored-by: marta-lokhova <9428003+marta-lokhova@users.noreply.github.com>
---
 src/App/Program.fs                             |  4 ++--
 src/FSLibrary.Tests/Tests.fs                   |  2 +-
 src/FSLibrary/MissionCatchupHelpers.fs         | 18 +++---------------
 src/FSLibrary/MissionDatabaseInplaceUpgrade.fs |  6 +-----
 .../MissionMixedImageLoadGeneration.fs         |  6 +-----
 .../MissionMixedImageNetworkSurvey.fs          |  6 +-----
 src/FSLibrary/MissionVersionMixConsensus.fs    | 11 +----------
 src/FSLibrary/StellarCoreSet.fs                | 16 +++++++---------
 8 files changed, 17 insertions(+), 52 deletions(-)

diff --git a/src/App/Program.fs b/src/App/Program.fs
index e8fb0560..6c3808b0 100644
--- a/src/App/Program.fs
+++ b/src/App/Program.fs
@@ -524,7 +524,7 @@ type MissionOptions
     [<Option("enable-relaxed-auto-qset-config",
              HelpText = "Enables the use of automatic quorum set configuration on missions that may create core sets that do not satisfy the redundancy and history requirements placed on pubnet validators.  Requires a stellar-core version that supports the SKIP_HIGH_CRITICAL_VALIDATOR_CHECKS_FOR_TESTING config option.",
              Required = false,
-             Default = false)>]
+             Default = true)>]
     member self.EnableRelaxedAutoQsetConfig = enableRelaxedAutoQsetConfig
 
     [<Option("job-monitor-external-host",
@@ -727,7 +727,7 @@ let main argv =
                   catchupSkipKnownResultsForTesting = None
                   checkEventsAreConsistentWithEntryDiffs = None
                   updateSorobanCosts = None
-                  enableRelaxedAutoQsetConfig = false
+                  enableRelaxedAutoQsetConfig = true
                   jobMonitorExternalHost = None
                   txBatchMaxSize = None
                   runForMaxTps = None
diff --git a/src/FSLibrary.Tests/Tests.fs b/src/FSLibrary.Tests/Tests.fs
index 02ed37bf..5a47123e 100644
--- a/src/FSLibrary.Tests/Tests.fs
+++ b/src/FSLibrary.Tests/Tests.fs
@@ -124,7 +124,7 @@ let ctx : MissionContext =
       updateSorobanCosts = None
       genesisTestAccountCount = None
       asanOptions = None
-      enableRelaxedAutoQsetConfig = false
+      enableRelaxedAutoQsetConfig = true
       jobMonitorExternalHost = None
       txBatchMaxSize = None
       runForMaxTps = None
diff --git a/src/FSLibrary/MissionCatchupHelpers.fs b/src/FSLibrary/MissionCatchupHelpers.fs
index 802c8818..a3fe33f1 100644
--- a/src/FSLibrary/MissionCatchupHelpers.fs
+++ b/src/FSLibrary/MissionCatchupHelpers.fs
@@ -60,11 +60,7 @@ let MakeCatchupSets (options: CatchupMissionOptions) =
         { CoreSetOptions.GetDefault options.generatorImage with
               nodeCount = 1
               quorumSet = CoreSetQuorum(CoreSetName "generator")
-              accelerateTime = true
-              // FIXME: Remove these options once the stable (old) image in
-              // CI supports skipping validator quality checks
-              skipHighCriticalValidatorChecks = false
-              quorumSetConfigType = RequireExplicitQset }
+              accelerateTime = true }
 
 
     let generatorSet = MakeLiveCoreSet "generator" generatorOptions
@@ -74,11 +70,7 @@ let MakeCatchupSets (options: CatchupMissionOptions) =
               nodeCount = 1
               quorumSet = CoreSetQuorum(CoreSetName "generator")
               accelerateTime = true
-              initialization = CoreSetInitialization.DefaultNoForceSCP
-              // FIXME: Remove these options once the stable (old) image in
-              // CI supports skipping validator quality checks
-              skipHighCriticalValidatorChecks = false
-              quorumSetConfigType = RequireExplicitQset }
+              initialization = CoreSetInitialization.DefaultNoForceSCP }
 
     let minimal1Options = { newNodeOptions with catchupMode = CatchupRecent(0) }
     let minimal1Set = MakeDeferredCoreSet "minimal1" minimal1Options
@@ -133,11 +125,7 @@ let MakeCatchupSets (options: CatchupMissionOptions) =
         { CoreSetOptions.GetDefault options.versionImage with
               nodeCount = 1
               quorumSet = CoreSetQuorum(CoreSetName "version")
-              accelerateTime = true
-              // FIXME: Remove these options once the stable (old) image in
-              // CI supports skipping validator quality checks
-              skipHighCriticalValidatorChecks = false
-              quorumSetConfigType = RequireExplicitQset }
+              accelerateTime = true }
 
     let versionSet = MakeLiveCoreSet "version" versionOptions
 
diff --git a/src/FSLibrary/MissionDatabaseInplaceUpgrade.fs b/src/FSLibrary/MissionDatabaseInplaceUpgrade.fs
index 80eda899..3e4a8ad2 100644
--- a/src/FSLibrary/MissionDatabaseInplaceUpgrade.fs
+++ b/src/FSLibrary/MissionDatabaseInplaceUpgrade.fs
@@ -31,11 +31,7 @@ let databaseInplaceUpgrade (context: MissionContext) =
             "before-upgrade"
             { CoreSetOptions.GetDefault oldImage with
                   nodeCount = 1
-                  quorumSet = quorumSet
-                  // FIXME: Remove these options once the stable (old) image in
-                  // CI supports skipping validator quality checks
-                  skipHighCriticalValidatorChecks = false
-                  quorumSetConfigType = RequireExplicitQset }
+                  quorumSet = quorumSet }
 
     let fetchFromPeer = Some(CoreSetName("before-upgrade"), 0)
 
diff --git a/src/FSLibrary/MissionMixedImageLoadGeneration.fs b/src/FSLibrary/MissionMixedImageLoadGeneration.fs
index 8ed62b68..b53ba96a 100644
--- a/src/FSLibrary/MissionMixedImageLoadGeneration.fs
+++ b/src/FSLibrary/MissionMixedImageLoadGeneration.fs
@@ -46,11 +46,7 @@ let mixedImageLoadGeneration (oldImageNodeCount: int) (context: MissionContext)
                   invariantChecks = AllInvariantsExceptEvents
                   accelerateTime = false
                   dumpDatabase = false
-                  quorumSet = qSet
-                  // FIXME: Remove these options once the stable (old) image in
-                  // CI supports skipping validator quality checks
-                  skipHighCriticalValidatorChecks = false
-                  quorumSetConfigType = RequireExplicitQset }
+                  quorumSet = qSet }
 
     let newCoreSet =
         MakeLiveCoreSet
diff --git a/src/FSLibrary/MissionMixedImageNetworkSurvey.fs b/src/FSLibrary/MissionMixedImageNetworkSurvey.fs
index 869eeb38..d294ccaa 100644
--- a/src/FSLibrary/MissionMixedImageNetworkSurvey.fs
+++ b/src/FSLibrary/MissionMixedImageNetworkSurvey.fs
@@ -119,11 +119,7 @@ let mixedImageNetworkSurvey (context: MissionContext) =
               { CoreSetOptions.GetDefault oldImage with
                     nodeCount = oldKeys.Length
                     accelerateTime = false
-                    surveyPhaseDuration = Some surveyPhaseDurationMinutes
-                    // FIXME: Remove these options once the stable (old) image
-                    // in CI supports skipping validator quality checks
-                    skipHighCriticalValidatorChecks = false
-                    quorumSetConfigType = RequireExplicitQset } }
+                    surveyPhaseDuration = Some surveyPhaseDurationMinutes } }
 
     let newCoreSet =
         { name = CoreSetName newName
diff --git a/src/FSLibrary/MissionVersionMixConsensus.fs b/src/FSLibrary/MissionVersionMixConsensus.fs
index 9703dda1..26d797be 100644
--- a/src/FSLibrary/MissionVersionMixConsensus.fs
+++ b/src/FSLibrary/MissionVersionMixConsensus.fs
@@ -27,11 +27,7 @@ let versionMixConsensus (context: MissionContext) =
             "before"
             { CoreSetOptions.GetDefault oldImage with
                   nodeCount = 2
-                  quorumSet = CoreSetQuorum(CoreSetName "before")
-                  // FIXME: Remove these options once the stable (old) image in
-                  // CI supports skipping validator quality checks
-                  skipHighCriticalValidatorChecks = false
-                  quorumSetConfigType = RequireExplicitQset }
+                  quorumSet = CoreSetQuorum(CoreSetName "before") }
 
     let fetchFromPeer = Some(CoreSetName("before"), 0)
 
@@ -42,7 +38,6 @@ let versionMixConsensus (context: MissionContext) =
                   nodeCount = 2
                   historyNodes = Some([])
                   quorumSet = CoreSetQuorumListWithThreshold([ CoreSetName "new-core"; CoreSetName "old-core" ], 100)
-                  quorumSetConfigType = RequireExplicitQset
                   initialization =
                       { newDb = true
                         newHist = true
@@ -58,10 +53,6 @@ let versionMixConsensus (context: MissionContext) =
                   nodeCount = 2
                   historyNodes = Some([])
                   quorumSet = CoreSetQuorumListWithThreshold([ CoreSetName "new-core"; CoreSetName "old-core" ], 100)
-                  // FIXME: Remove these options once the stable (old) image in
-                  // CI supports skipping validator quality checks
-                  skipHighCriticalValidatorChecks = false
-                  quorumSetConfigType = RequireExplicitQset
                   initialization =
                       { newDb = true
                         newHist = true
diff --git a/src/FSLibrary/StellarCoreSet.fs b/src/FSLibrary/StellarCoreSet.fs
index 34a2d84f..f6dc0ccd 100644
--- a/src/FSLibrary/StellarCoreSet.fs
+++ b/src/FSLibrary/StellarCoreSet.fs
@@ -177,14 +177,12 @@ type InvariantChecksSpec =
 // Determines how quorum set configurations should be generated
 type QuorumSetConfiguration =
     // Prefer automatic quorum set configuration. Fall back on explicit quorum
-    // set configuration if automatic configuration is not possible, or if
-    // --enable-relaxed-auto-qset-config is not set.
+    // set configuration if automatic configuration is not possible.
     | PreferAutoQset
     // Require automatic quorum set configuration. Fail if automatic
-    // configuration is not possible. Uses automatic configuration even if
-    // --enable-relaxed-auto-qset-config is not set, so missions using this
-    // option *must* satisfy the HIGH quality validator checks present in
-    // stellar-core.
+    // configuration is not possible. Missions using this option *must* satisfy
+    // the HIGH quality validator checks present in stellar-core, or set
+    // `skipHighCriticalValidatorChecks` to `true`.
     | RequireAutoQset
     // Require explicit quorum set configuration.
     | RequireExplicitQset
@@ -222,9 +220,9 @@ type CoreSetOptions =
       addArtificialDelayUsec: int option
       surveyPhaseDuration: int option
       updateSorobanCosts: bool option
-      // `skipHighCriticalValidatorChecks` exists to allow supercluster to
-      // remain compatible with older stellar-core images that do not have the
-      // ability to turn of validator checks for HIGH and CRITICAL validators
+      // `skipHighCriticalValidatorChecks` controls whether to set
+      // SKIP_HIGH_CRITICAL_VALIDATOR_CHECKS_FOR_TESTING in stellar-core config,
+      // which disables validator checks for HIGH and CRITICAL validators.
       skipHighCriticalValidatorChecks: bool }
 
     member self.WithWaitForConsensus(w: bool) =