Update Splice from CCI (#349)

Signed-off-by: DA Automation <splice-maintainers@digitalasset.com>
Co-authored-by: DA Automation <splice-maintainers@digitalasset.com>

Author: canton-network-da

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

@@ -1,7 +1,12 @@
 package org.lfdecentralizedtrust.splice.integration.tests
 
+import org.lfdecentralizedtrust.splice.config.ConfigTransforms.{
+  ConfigurableApp,
+  updateAutomationConfig,
+}
 import org.lfdecentralizedtrust.splice.integration.EnvironmentDefinition
 import org.lfdecentralizedtrust.splice.integration.tests.SpliceTests.IntegrationTest
+import org.lfdecentralizedtrust.splice.sv.automation.singlesv.LocalSequencerConnectionsTrigger
 import org.lfdecentralizedtrust.splice.util.SpliceUtil.defaultIssuanceCurve
 import org.lfdecentralizedtrust.splice.util.{SvTestUtil, TimeTestUtil, WalletTestUtil}
 
@@ -16,6 +21,14 @@ class ScanWithGradualStartsTimeBasedIntegrationTest
   override def environmentDefinition: SpliceEnvironmentDefinition =
     EnvironmentDefinition
       .simpleTopology4SvsWithSimTime(this.getClass.getSimpleName)
+      .addConfigTransforms((_, config) =>
+        updateAutomationConfig(ConfigurableApp.Sv)(
+          // SVs's sequencer connection choice is not relevant to this test
+          // but the reconciliation can cause flakiness
+          // TODO(#8300): Unpause again once this reconciliation is less disruptive
+          _.withPausedTrigger[LocalSequencerConnectionsTrigger]
+        )(config)
+      )
       .withManualStart
 
   "initialize a scan app that joins late" in { implicit env =>

apps/common/src/main/scala/org/lfdecentralizedtrust/splice/environment/PackageVersionSupport.scala

@@ -4,12 +4,16 @@
 package org.lfdecentralizedtrust.splice.environment
 
 import com.digitalasset.canton.data.CantonTimestamp
+import com.digitalasset.canton.logging.pretty.Pretty
+import com.digitalasset.canton.logging.pretty.Pretty.{param, prettyOfClass}
 import com.digitalasset.canton.topology.{PartyId, SynchronizerId}
 import com.digitalasset.canton.tracing.TraceContext
+import com.digitalasset.canton.util.ShowUtil.ShowStringSyntax
 import com.digitalasset.daml.lf.data.Ref.PackageVersion
 import com.digitalasset.daml.lf.language.Ast
 import org.lfdecentralizedtrust.splice.codegen.java.splice.amuletrules.AmuletRules
 import org.lfdecentralizedtrust.splice.environment.PackageIdResolver.HasAmuletRules
+import org.lfdecentralizedtrust.splice.environment.PackageVersionSupport.FeatureSupport
 import org.lfdecentralizedtrust.splice.util.AmuletConfigSchedule
 
 import scala.concurrent.{ExecutionContext, Future}
@@ -18,19 +22,19 @@ trait PackageVersionSupport {
 
   def supportsValidatorLicenseMetadata(parties: Seq[PartyId], now: CantonTimestamp)(implicit
       tc: TraceContext
-  ): Future[Boolean] = {
+  ): Future[FeatureSupport] = {
     isDarSupported(parties, PackageIdResolver.Package.SpliceAmulet, now, DarResources.amulet_0_1_3)
   }
 
   def supportsValidatorLicenseActivity(parties: Seq[PartyId], now: CantonTimestamp)(implicit
       tc: TraceContext
-  ): Future[Boolean] = {
+  ): Future[FeatureSupport] = {
     isDarSupported(parties, PackageIdResolver.Package.SpliceAmulet, now, DarResources.amulet_0_1_3)
   }
 
   def supportsPruneAmuletConfigSchedule(parties: Seq[PartyId], now: CantonTimestamp)(implicit
       tc: TraceContext
-  ): Future[Boolean] = {
+  ): Future[FeatureSupport] = {
     isDarSupported(
       parties,
       PackageIdResolver.Package.SpliceDsoGovernance,
@@ -41,7 +45,7 @@ trait PackageVersionSupport {
 
   def supportsMergeDuplicatedValidatorLicense(parties: Seq[PartyId], now: CantonTimestamp)(implicit
       tc: TraceContext
-  ): Future[Boolean] = {
+  ): Future[FeatureSupport] = {
     isDarSupported(
       parties,
       PackageIdResolver.Package.SpliceDsoGovernance,
@@ -52,7 +56,7 @@ trait PackageVersionSupport {
 
   def supportsLegacySequencerConfig(parties: Seq[PartyId], now: CantonTimestamp)(implicit
       tc: TraceContext
-  ): Future[Boolean] = {
+  ): Future[FeatureSupport] = {
     isDarSupported(
       parties,
       PackageIdResolver.Package.SpliceDsoGovernance,
@@ -63,13 +67,13 @@ trait PackageVersionSupport {
 
   def supportsValidatorLivenessActivityRecord(parties: Seq[PartyId], now: CantonTimestamp)(implicit
       tc: TraceContext
-  ): Future[Boolean] = {
+  ): Future[FeatureSupport] = {
     isDarSupported(parties, PackageIdResolver.Package.SpliceAmulet, now, DarResources.amulet_0_1_5)
   }
 
   def supportsDsoRulesCreateExternalPartyAmuletRules(parties: Seq[PartyId], now: CantonTimestamp)(
       implicit tc: TraceContext
-  ): Future[Boolean] = {
+  ): Future[FeatureSupport] = {
     isDarSupported(
       parties,
       PackageIdResolver.Package.SpliceDsoGovernance,
@@ -80,7 +84,7 @@ trait PackageVersionSupport {
 
   def supportsNewGovernanceFlow(parties: Seq[PartyId], now: CantonTimestamp)(implicit
       tc: TraceContext
-  ): Future[Boolean] = {
+  ): Future[FeatureSupport] = {
     isDarSupported(
       parties,
       PackageIdResolver.Package.SpliceDsoGovernance,
@@ -107,7 +111,7 @@ trait PackageVersionSupport {
       metadata: Ast.PackageMetadata,
   )(implicit
       tc: TraceContext
-  ): Future[Boolean]
+  ): Future[FeatureSupport]
 
 }
 
@@ -120,18 +124,28 @@ class AmuletRulesPackageVersionSupport private[environment] (amuletRules: HasAmu
       packageId: PackageIdResolver.Package,
       at: CantonTimestamp,
       metadata: Ast.PackageMetadata,
-  )(implicit tc: TraceContext): Future[Boolean] = {
+  )(implicit tc: TraceContext): Future[FeatureSupport] = {
     basedOnCurrentAmuletRules { amuletRules =>
       val packageVersion = metadata.version
       val packageConfig = AmuletConfigSchedule(amuletRules).getConfigAsOf(at).packageConfig
       val activeVersion = PackageIdResolver.readPackageVersion(packageConfig, packageId)
-      packageVersion >= activeVersion
+      val isSupported = packageVersion >= activeVersion
+      val activePackageId = DarResources
+        .lookupPackageMetadata(
+          metadata.name,
+          activeVersion,
+        )
+        .map(_.packageId)
+      FeatureSupport(
+        isSupported,
+        activePackageId.toList,
+      )
     }
   }
 
   private def basedOnCurrentAmuletRules(
-      condition: AmuletRules => Boolean
-  )(implicit tc: TraceContext): Future[Boolean] = {
+      condition: AmuletRules => FeatureSupport
+  )(implicit tc: TraceContext): Future[FeatureSupport] = {
     amuletRules.getAmuletRules().map(amuletRules => condition(amuletRules.payload))
   }
 
@@ -148,7 +162,7 @@ class TopologyAwarePackageVersionSupport private[environment] (
       packageId: PackageIdResolver.Package,
       at: CantonTimestamp,
       metadata: Ast.PackageMetadata,
-  )(implicit tc: TraceContext): Future[Boolean] = {
+  )(implicit tc: TraceContext): Future[FeatureSupport] = {
     connection
       .getSupportedPackageVersion(
         synchronizerId,
@@ -157,15 +171,38 @@ class TopologyAwarePackageVersionSupport private[environment] (
         at,
       )
       .map(
-        _.exists { packageReference =>
+        _.filter { packageReference =>
           PackageVersion.assertFromString(packageReference.packageVersion) >= metadata.version
         }
       )
+      .map { supportedPackages =>
+        supportedPackages.fold(FeatureSupport(supported = false, Seq.empty))(packageReference =>
+          FeatureSupport(
+            supported = true,
+            Seq(
+              packageReference.packageId
+            ),
+          )
+        )
+      }
   }
 }
 
 object PackageVersionSupport {
 
+  case class FeatureSupport(
+      supported: Boolean,
+      packageIds: Seq[String],
+  )
+
+  object FeatureSupport {
+
+    implicit val featureSupportPretty: Pretty[FeatureSupport] = prettyOfClass(
+      param("supported", t => t.supported),
+      param("prefferredPackageIds", _.packageIds.map(_.singleQuoted)),
+    )
+  }
+
   def createPackageVersionSupport(
       enableCantonPackageSelection: Boolean,
       amuletRules: HasAmuletRules,

apps/common/src/main/scala/org/lfdecentralizedtrust/splice/environment/SpliceLedgerConnection.scala

@@ -876,6 +876,7 @@ class SpliceLedgerConnection(
       disclosedContracts: DisclosedContracts,
       priority: CommandPriority,
       deadline: Option[NonNegativeFiniteDuration] = None,
+      preferredPackageIds: Seq[String] = Seq.empty,
   ) {
     private type DedupNotSpecifiedYet = CmdId =:= Any
     private type SynchronizerIdRequired = DomId <:< SynchronizerId
@@ -885,6 +886,7 @@ class SpliceLedgerConnection(
         synchronizerId: DomId0 = this.synchronizerId,
         disclosedContracts: DisclosedContracts = this.disclosedContracts,
         deadline: Option[NonNegativeFiniteDuration] = this.deadline,
+        preferredPackageIds: Seq[String] = this.preferredPackageIds,
     ): submit[C, CmdId0, DomId0] =
       new submit(
         actAs,
@@ -895,6 +897,7 @@ class SpliceLedgerConnection(
         disclosedContracts,
         priority,
         deadline,
+        preferredPackageIds,
       )
 
     def withDedup(commandId: CommandId, deduplicationOffset: Long)(implicit
@@ -904,6 +907,12 @@ class SpliceLedgerConnection(
         commandIdDeduplicationOffset = (commandId, deduplicationOffset)
       )
 
+    def withPrefferedPackage(packageIds: Seq[String]): submit[C, CmdId, DomId] = {
+      copy(
+        preferredPackageIds = packageIds
+      )
+    }
+
     def withDedup(commandId: CommandId, deduplicationConfig: DedupConfig)(implicit
         cid: DedupNotSpecifiedYet
     ): submit[C, (CommandId, DedupConfig), DomId] =
@@ -989,6 +998,7 @@ class SpliceLedgerConnection(
                 disclosedContracts = disclosedContracts,
                 waitFor = waitFor,
                 deadline = deadline,
+                preferredPackageIds = preferredPackageIds,
               )
             )(getOffsetAndResult)
 

apps/common/src/main/scala/org/lfdecentralizedtrust/splice/environment/ledger/api/LedgerClient.scala

@@ -211,6 +211,7 @@ private[environment] class LedgerClient(
       disclosedContracts: DisclosedContracts,
       waitFor: SubmitAndWaitFor[Z],
       deadline: Option[NonNegativeFiniteDuration] = None,
+      preferredPackageIds: Seq[String] = Seq.empty,
   )(implicit ec: ExecutionContext, traceContext: TraceContext): Future[Z] = {
     val commandsBuilder = CommandsOuterClass.Commands.newBuilder
       .setSynchronizerId(synchronizerId)
@@ -221,6 +222,7 @@ private[environment] class LedgerClient(
       .addAllCommands {
         commands.map(_.toProtoCommand).asJava
       }
+      .addAllPackageIdSelectionPreference(preferredPackageIds.asJava)
       .addAllDisclosedContracts(disclosedContracts.toLedgerApiDisclosedContracts.asJava)
     deduplicationConfig match {
       case DedupOffset(offset) =>

apps/common/src/main/scala/org/lfdecentralizedtrust/splice/http/HttpFeatureSupportHandler.scala

@@ -34,9 +34,9 @@ trait HttpFeatureSupportHandler extends Spanning with NamedLogging {
           ),
           CantonTimestamp.now(),
         )
-        .map { supportNewsGovernanceFlow =>
+        .map { featureSupport =>
           FeatureSupportResponse(
-            supportNewsGovernanceFlow
+            featureSupport.supported
           )
         }
     }

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

@@ -215,22 +215,20 @@ class ScanApp(
         config.spliceInstanceNames.nameServiceNameAcronym.toLowerCase(),
       )
       synchronizerId <- appInitStep("Get synchronizer id") {
-        store
-          .lookupAmuletRules()
-          .map(
-            _.fold(
-              throw Status.NOT_FOUND
-                .withDescription("Amulet rules not yet available")
-                .asRuntimeException()
-            )(
-              _.state.fold(
-                identity,
-                throw Status.NOT_FOUND
-                  .withDescription("Amulet rules in fllight")
-                  .asRuntimeException(),
-              )
+        retryProvider.getValueWithRetries(
+          RetryFor.WaitingOnInitDependency,
+          "amulet synchronizer id",
+          "amulet rules synchronizer id",
+          store.getAmuletRulesWithState().map {
+            _.state.fold(
+              identity,
+              throw Status.FAILED_PRECONDITION
+                .withDescription("Amulet rules in fllight")
+                .asRuntimeException(),
             )
-          )
+          },
+          logger,
+        )
       }
       packageVersionSupport = PackageVersionSupport.createPackageVersionSupport(
         config.parameters.enableCantonPackageSelection,

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

@@ -1269,7 +1269,7 @@ object SvApp {
               logger.debug("Trying to create validator license for SV party")
               val dsoParty = store.key.dsoParty
               for {
-                supportsValidatorLicenseMetadata <- packageVersionSupport
+                validatorLicenseMetadataFeatureSupport <- packageVersionSupport
                   .supportsValidatorLicenseMetadata(
                     Seq(dsoParty, svParty),
                     clock.now,
@@ -1279,9 +1279,11 @@ object SvApp {
                     svParty.toProtoPrimitive,
                     svParty.toProtoPrimitive,
                     Some(BuildInfo.compiledVersion)
-                      .filter(_ => supportsValidatorLicenseMetadata)
+                      .filter(_ => validatorLicenseMetadataFeatureSupport.supported)
+                      .toJava,
+                    Some(config.contactPoint)
+                      .filter(_ => validatorLicenseMetadataFeatureSupport.supported)
                       .toJava,
-                    Some(config.contactPoint).filter(_ => supportsValidatorLicenseMetadata).toJava,
                   )
                 )
                 _ <- dsoStoreWithIngestion.connection
@@ -1290,6 +1292,7 @@ object SvApp {
                     readAs = Seq(dsoParty),
                     cmd,
                   )
+                  .withPrefferedPackage(validatorLicenseMetadataFeatureSupport.packageIds)
                   .withDedup(
                     commandId = SpliceLedgerConnection.CommandId(
                       "org.lfdecentralizedtrust.splice.sv.createSvValidatorLicense",

apps/sv/src/main/scala/org/lfdecentralizedtrust/splice/sv/admin/http/HttpSvHandler.scala

@@ -749,17 +749,18 @@ class HttpSvHandler(
     for {
       dsoRules <- dsoStore.getDsoRules()
       now = clock.now
-      supportsValidatorLicenseMetadata <- packageVersionSupport.supportsValidatorLicenseMetadata(
-        Seq(svParty, candidateParty, dsoParty),
-        now,
-      )
+      validatorLicenseMetadataFeatureSupport <- packageVersionSupport
+        .supportsValidatorLicenseMetadata(
+          Seq(svParty, candidateParty, dsoParty),
+          now,
+        )
       cmds = Seq(
         dsoRules.exercise(
           _.exerciseDsoRules_OnboardValidator(
             svParty.toProtoPrimitive,
             candidateParty.toProtoPrimitive,
-            version.filter(_ => supportsValidatorLicenseMetadata).toJava,
-            contactPoint.filter(_ => supportsValidatorLicenseMetadata).toJava,
+            version.filter(_ => validatorLicenseMetadataFeatureSupport.supported).toJava,
+            contactPoint.filter(_ => validatorLicenseMetadataFeatureSupport.supported).toJava,
           )
         ),
         validatorOnboarding.exercise(
@@ -769,6 +770,7 @@ class HttpSvHandler(
       _ <- dsoStoreWithIngestion.connection
         .submit(Seq(svParty), Seq(dsoParty), cmds)
         .withSynchronizerId(dsoRules.domain)
+        .withPrefferedPackage(validatorLicenseMetadataFeatureSupport.packageIds)
         .noDedup // No command-dedup required, as the ValidatorOnboarding contract is archived
         .yieldUnit()
     } yield ()