[ci] Added user versions for store descriptors in validator app and sv app

Signed-off-by: Raymond Roestenburg <raymond.roestenburg@digitalasset.com>

Author: ray-roestenburg-da

apps/scan/src/main/scala/org/lfdecentralizedtrust/splice/scan/ScanApp.scala

@@ -185,7 +185,8 @@ class ScanApp(
         nodeMetrics.dbScanStore,
         config.automation.ingestion,
         initialRound.toLong,
-        config.storeDescriptorUserVersion,
+        config.acsStoreDescriptorUserVersion,
+        config.txLogStoreDescriptorUserVersion,
       )
       updateHistory = new UpdateHistory(
         storage,

apps/scan/src/main/scala/org/lfdecentralizedtrust/splice/scan/config/ScanAppConfig.scala

@@ -59,7 +59,8 @@ case class ScanAppBackendConfig(
     txLogBackfillBatchSize: Int = 100,
     bftSequencers: Seq[BftSequencerConfig] = Seq.empty,
     cache: ScanCacheConfig = ScanCacheConfig(),
-    storeDescriptorUserVersion: Option[Long] = None,
+    acsStoreDescriptorUserVersion: Option[Long] = None,
+    txLogStoreDescriptorUserVersion: Option[Long] = None,
 ) extends SpliceBackendConfig
     with BaseScanAppConfig // TODO(DACH-NY/canton-network-node#736): fork or generalize this trait.
     {

apps/scan/src/main/scala/org/lfdecentralizedtrust/splice/scan/store/ScanStore.scala

@@ -317,7 +317,8 @@ object ScanStore {
       metrics: DbScanStoreMetrics,
       ingestionConfig: IngestionConfig,
       initialRound: Long,
-      storeDescriptorUserVersion: Option[Long] = None,
+      acsStoreDescriptorUserVersion: Option[Long] = None,
+      txLogStoreDescriptorUserVersion: Option[Long] = None,
   )(implicit
       ec: ExecutionContext,
       templateJsonDecoder: TemplateJsonDecoder,
@@ -338,7 +339,8 @@ object ScanStore {
         ingestionConfig,
         metrics,
         initialRound,
-        storeDescriptorUserVersion,
+        acsStoreDescriptorUserVersion,
+        txLogStoreDescriptorUserVersion,
       ),
       cacheConfigs,
       metrics,

apps/scan/src/main/scala/org/lfdecentralizedtrust/splice/scan/store/db/DbScanStore.scala

@@ -100,7 +100,8 @@ class DbScanStore(
     ingestionConfig: IngestionConfig,
     storeMetrics: DbScanStoreMetrics,
     initialRound: Long,
-    storeDescriptorUserVersion: Option[Long] = None,
+    acsStoreDescriptorUserVersion: Option[Long] = None,
+    txLogStoreDescriptorUserVersion: Option[Long] = None,
 )(implicit
     override protected val ec: ExecutionContext,
     templateJsonDecoder: TemplateJsonDecoder,
@@ -120,7 +121,7 @@ class DbScanStore(
         key = Map(
           "dsoParty" -> key.dsoParty.toProtoPrimitive
         ),
-        userVersion = storeDescriptorUserVersion,
+        userVersion = acsStoreDescriptorUserVersion,
       ),
       txLogStoreDescriptor = StoreDescriptor(
         version = 1,
@@ -130,7 +131,7 @@ class DbScanStore(
         key = Map(
           "dsoParty" -> key.dsoParty.toProtoPrimitive
         ),
-        userVersion = storeDescriptorUserVersion,
+        userVersion = txLogStoreDescriptorUserVersion,
       ),
       domainMigrationInfo,
       ingestionConfig,

apps/sv/src/main/scala/org/lfdecentralizedtrust/splice/sv/SvApp.scala

@@ -316,6 +316,8 @@ class SvApp(
           loggerFactory,
           retryProvider,
           config.spliceInstanceNames,
+          config.svAcsStoreDescriptorUserVersion,
+          config.dsoAcsStoreDescriptorUserVersion,
         )
       // Ensure DSO party, DsoRules, AmuletRules, Mediator, and Sequencer nodes are setup
       // -------------------------------------------------------------------------------
@@ -360,6 +362,8 @@ class SvApp(
                 config.spliceInstanceNames,
                 loggerFactory,
                 config.parameters.enabledFeatures,
+                config.svAcsStoreDescriptorUserVersion,
+                config.dsoAcsStoreDescriptorUserVersion,
               )
               initializer.bootstrapDso()
             }
@@ -403,6 +407,8 @@ class SvApp(
               config.spliceInstanceNames,
               newJoiningNodeInitializer,
               config.parameters.enabledFeatures,
+              config.svAcsStoreDescriptorUserVersion,
+              config.dsoAcsStoreDescriptorUserVersion,
             ).migrateDomain()
           }
         case None =>

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

@@ -366,6 +366,8 @@ case class SvAppBackendConfig(
     validateTopologyAfterMigration: Boolean = false,
     // The threshold above which unclaimed development fund coupons will be merged.
     unclaimedDevelopmentFundCouponsThreshold: Int = 10,
+    svAcsStoreDescriptorUserVersion: Option[Long] = None,
+    dsoAcsStoreDescriptorUserVersion: Option[Long] = None,
 ) extends SpliceBackendConfig {
 
   def shouldSkipSynchronizerInitialization =

apps/sv/src/main/scala/org/lfdecentralizedtrust/splice/sv/onboarding/NodeInitializerUtil.scala

@@ -65,6 +65,7 @@ trait NodeInitializerUtil extends NamedLogging with Spanning with SynchronizerNo
       key: SvStore.Key,
       domainMigrationInfo: DomainMigrationInfo,
       participantId: ParticipantId,
+      acsStoreDescriptorUserVersion: Option[Long],
   )(implicit
       ec: ExecutionContext,
       templateDecoder: TemplateJsonDecoder,
@@ -77,6 +78,7 @@ trait NodeInitializerUtil extends NamedLogging with Spanning with SynchronizerNo
     domainMigrationInfo,
     participantId,
     config.automation.ingestion,
+    acsStoreDescriptorUserVersion,
   )
 
   protected def newSvSvAutomationService(
@@ -112,6 +114,7 @@ trait NodeInitializerUtil extends NamedLogging with Spanning with SynchronizerNo
       key: SvStore.Key,
       domainMigrationInfo: DomainMigrationInfo,
       participantId: ParticipantId,
+      acsStoreDescriptorUserVersion: Option[Long],
   )(implicit
       ec: ExecutionContext,
       templateDecoder: TemplateJsonDecoder,
@@ -125,6 +128,7 @@ trait NodeInitializerUtil extends NamedLogging with Spanning with SynchronizerNo
       domainMigrationInfo,
       participantId,
       config.automation.ingestion,
+      acsStoreDescriptorUserVersion,
     )
   }
 

apps/sv/src/main/scala/org/lfdecentralizedtrust/splice/sv/onboarding/domainmigration/DomainMigrationInitializer.scala

@@ -101,6 +101,8 @@ class DomainMigrationInitializer(
         Option[CometBftNode],
     ) => JoiningNodeInitializer,
     enabledFeatures: EnabledFeaturesConfig,
+    svAcsStoreDescriptorUserVersion: Option[Long],
+    dsoAcsStoreDescriptorUserVersion: Option[Long],
 )(implicit
     ec: ExecutionContextExecutor,
     httpClient: HttpClient,
@@ -183,8 +185,13 @@ class DomainMigrationInitializer(
             )
           ),
         )
-      svStore = newSvStore(storeKey, migrationInfo, participantId)
-      dsoStore = newDsoStore(svStore.key, migrationInfo, participantId)
+      svStore = newSvStore(storeKey, migrationInfo, participantId, svAcsStoreDescriptorUserVersion)
+      dsoStore = newDsoStore(
+        svStore.key,
+        migrationInfo,
+        participantId,
+        dsoAcsStoreDescriptorUserVersion,
+      )
       svAutomation = newSvSvAutomationService(
         svStore,
         dsoStore,

apps/sv/src/main/scala/org/lfdecentralizedtrust/splice/sv/onboarding/joining/JoiningNodeInitializer.scala

@@ -100,6 +100,8 @@ class JoiningNodeInitializer(
     override val loggerFactory: NamedLoggerFactory,
     override protected val retryProvider: RetryProvider,
     override protected val spliceInstanceNamesConfig: SpliceInstanceNamesConfig,
+    svAcsStoreDescriptorUserVersion: Option[Long],
+    dsoAcsStoreDescriptorUserVersion: Option[Long],
 )(implicit
     ec: ExecutionContextExecutor,
     httpClient: HttpClient,
@@ -191,8 +193,13 @@ class JoiningNodeInitializer(
           currentMigrationId = config.domainMigrationId,
           migrationTimeInfo = None, // This SV doesn't know about any migrations
         )
-      svStore = newSvStore(storeKey, migrationInfo, participantId)
-      dsoStore = newDsoStore(svStore.key, migrationInfo, participantId)
+      svStore = newSvStore(storeKey, migrationInfo, participantId, svAcsStoreDescriptorUserVersion)
+      dsoStore = newDsoStore(
+        svStore.key,
+        migrationInfo,
+        participantId,
+        dsoAcsStoreDescriptorUserVersion,
+      )
       svAutomation = newSvSvAutomationService(
         svStore,
         dsoStore,

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

@@ -121,6 +121,8 @@ class SV1Initializer(
     override protected val spliceInstanceNamesConfig: SpliceInstanceNamesConfig,
     override protected val loggerFactory: NamedLoggerFactory,
     enabledFeatures: EnabledFeaturesConfig,
+    svAcsStoreDescriptorUserVersion: Option[Long],
+    dsoAcsStoreDescriptorUserVersion: Option[Long],
 )(implicit
     ec: ExecutionContextExecutor,
     httpClient: HttpClient,
@@ -281,8 +283,13 @@ class SV1Initializer(
           currentMigrationId = config.domainMigrationId, // Note: not guaranteed to be 0 for sv1
           migrationTimeInfo = None, // No previous migration, we're starting the network
         )
-      svStore = newSvStore(storeKey, migrationInfo, participantId)
-      dsoStore = newDsoStore(svStore.key, migrationInfo, participantId)
+      svStore = newSvStore(storeKey, migrationInfo, participantId, svAcsStoreDescriptorUserVersion)
+      dsoStore = newDsoStore(
+        svStore.key,
+        migrationInfo,
+        participantId,
+        dsoAcsStoreDescriptorUserVersion,
+      )
       svAutomation = newSvSvAutomationService(
         svStore,
         dsoStore,