Pass config.acsCommitmentReconciliationInterval to DsoBootstrap (#3365)

* [ci] init

Signed-off-by: Julien Tinguely <[email protected]>

* [ci] move acsCommitmentReconciliationInterval to FoundDso AppConfig

Signed-off-by: Julien Tinguely <[email protected]>

---------

Signed-off-by: Julien Tinguely <[email protected]>

Author: julientinguely-da

apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/tests/ManualStartIntegrationTest.scala

@@ -25,6 +25,7 @@ import org.lfdecentralizedtrust.splice.integration.tests.SpliceTests.{
 }
 import org.lfdecentralizedtrust.splice.store.AppStoreWithIngestion.SpliceLedgerConnectionPriority.Low
 import org.lfdecentralizedtrust.splice.sv.config.SvAppBackendConfig
+import org.lfdecentralizedtrust.splice.sv.config.SvOnboardingConfig.FoundDso
 import org.lfdecentralizedtrust.splice.util.{StandaloneCanton, TriggerTestUtil, WalletTestUtil}
 
 import java.util.UUID
@@ -68,9 +69,21 @@ class ManualStartIntegrationTest
           // as pruning can be done only up to the end of the latest complete acs commitment interval
           svApps = conf.svApps.updatedWith(InstanceName.tryCreate("sv1")) {
             _.map { config =>
-              config.copy(acsCommitmentReconciliationInterval =
-                PositiveDurationSeconds.ofSeconds(30)
-              )
+              config.onboarding match {
+                case Some(c) =>
+                  c match {
+                    case foundDsoConfig: FoundDso =>
+                      config.copy(onboarding =
+                        Some(
+                          foundDsoConfig.copy(acsCommitmentReconciliationInterval =
+                            PositiveDurationSeconds.ofSeconds(30)
+                          )
+                        )
+                      )
+                    case _ => config
+                  }
+                case None => config
+              }
             }
           },
           validatorApps = conf.validatorApps
@@ -190,7 +203,7 @@ class ManualStartIntegrationTest
         }
 
         clue("Check sv1 participant is actively pruning") {
-          eventually(70.seconds) {
+          eventually(120.seconds) {
             sv1Backend.svAutomation
               .connection(Low)
               // returns 0 when participant pruning is disabled

apps/sv/src/main/scala/org/lfdecentralizedtrust/splice/sv/config/SvAppConfig.scala

@@ -81,6 +81,8 @@ object SvBootstrapDumpConfig {
 
 object SvOnboardingConfig {
   case class FoundDso(
+      acsCommitmentReconciliationInterval: PositiveDurationSeconds =
+        SvUtil.defaultAcsCommitmentReconciliationInterval,
       name: String,
       firstSvRewardWeightBps: Long,
       dsoPartyHint: String = "DSO",
@@ -322,8 +324,6 @@ case class SvAppBackendConfig(
     // Defaults to 24h to allow for 24h between preparation and execution of an externally signed transaction
     preparationTimeRecordTimeTolerance: NonNegativeFiniteDuration =
       NonNegativeFiniteDuration.ofHours(24),
-    acsCommitmentReconciliationInterval: PositiveDurationSeconds =
-      SvUtil.defaultAcsCommitmentReconciliationInterval,
     // Defaults to 48h as it must be at least 2x preparationTimeRecordtimeTolerance
     mediatorDeduplicationTimeout: NonNegativeFiniteDuration = NonNegativeFiniteDuration.ofHours(48),
     // We want to be able to override this for simtime tests

apps/sv/src/main/scala/org/lfdecentralizedtrust/splice/sv/onboarding/sv1/SV1Initializer.scala

@@ -481,7 +481,7 @@ class SV1Initializer(
         val values = initialValues.tryUpdate(
           trafficControlParameters = Some(initialTrafficControlParameters),
           reconciliationInterval =
-            PositiveSeconds.fromConfig(config.acsCommitmentReconciliationInterval),
+            PositiveSeconds.fromConfig(sv1Config.acsCommitmentReconciliationInterval),
           acsCommitmentsCatchUp = Some(SvUtil.defaultAcsCommitmentsCatchUpParameters),
           preparationTimeRecordTimeTolerance =
             NonNegativeFiniteDuration.fromConfig(config.preparationTimeRecordTimeTolerance),
@@ -650,7 +650,11 @@ class SV1Initializer(
     private def bootstrapDso(initialRound: Long, packageVersionSupport: PackageVersionSupport)(
         implicit tc: TraceContext
     ): Future[Unit] = {
-      val dsoRulesConfig = SvUtil.defaultDsoRulesConfig(synchronizerId, sv1Config.voteCooldownTime)
+      val dsoRulesConfig = SvUtil.defaultDsoRulesConfig(
+        synchronizerId,
+        sv1Config.voteCooldownTime,
+        sv1Config.acsCommitmentReconciliationInterval,
+      )
       for {
         (participantId, trafficStateForAllMembers, amuletRules, dsoRules) <- (
           participantAdminConnection.getParticipantId(),

apps/sv/src/main/scala/org/lfdecentralizedtrust/splice/sv/util/SvUtil.scala

@@ -131,15 +131,18 @@ object SvUtil {
     List.empty.asJava,
   )
 
-  private def defaultDsoDecentralizedSynchronizerConfig(synchronizerId: SynchronizerId) =
+  private def defaultDsoDecentralizedSynchronizerConfig(
+      synchronizerId: SynchronizerId,
+      acsCommitmentReconciliationInterval: PositiveDurationSeconds,
+  ) =
     new DsoDecentralizedSynchronizerConfig(
       // domains
       Map(
         synchronizerId.toProtoPrimitive -> new SynchronizerConfig(
           dso.decentralizedsynchronizer.SynchronizerState.DS_OPERATIONAL,
           "TODO(DACH-NY/canton-network-node#4900): share CometBFT genesis.json of sv1 via DsoRules config.",
           // TODO(M3-47): also share the Canton SynchronizerId of the decentralized domain here
-          Optional.of(defaultAcsCommitmentReconciliationInterval.duration.toSeconds),
+          Optional.of(acsCommitmentReconciliationInterval.duration.toSeconds),
         )
       ).asJava,
       synchronizerId.toProtoPrimitive, // lastSynchronizerId
@@ -246,6 +249,7 @@ object SvUtil {
   def defaultDsoRulesConfig(
       synchronizerId: SynchronizerId,
       voteCooldownTime: Option[NonNegativeFiniteDuration] = None,
+      acsCommitmentReconciliationInterval: PositiveDurationSeconds,
   ): DsoRulesConfig = new DsoRulesConfig(
     10, // numUnclaimedRewardsThreshold
     5, // numMemberTrafficContractsThreshold, arbitrarily set as 5 for now.
@@ -256,7 +260,10 @@ object SvUtil {
     new RelTime(TimeUnit.SECONDS.toMicros(70)), // dsoDelegateInactiveTimeout
     defaultSynchronizerNodeConfigLimits,
     1024, // maxTextLength
-    defaultDsoDecentralizedSynchronizerConfig(synchronizerId), // decentralizedSynchronizerConfig
+    defaultDsoDecentralizedSynchronizerConfig(
+      synchronizerId,
+      acsCommitmentReconciliationInterval,
+    ), // decentralizedSynchronizerConfig
     Optional.empty(), // nextScheduledHardDomainMigration
     voteCooldownTime.map(t => new RelTime(t.duration.toMicros)).toJava,
   )