.

[ci]

Signed-off-by: Moritz Kiefer <[email protected]>

Author: cocreature

apps/app/src/main/scala/org/lfdecentralizedtrust/splice/config/SpliceConfig.scala

@@ -541,6 +541,10 @@ object SpliceConfig {
     implicit val partyIdConfigReader: ConfigReader[PartyId] = ConfigReader.fromString(str =>
       Codec.decode(Codec.Party)(str).left.map(err => CannotConvert(str, "PartyId", err))
     )
+    implicit val packageVersionConfigReader: ConfigReader[PackageVersion] =
+      ConfigReader.fromString(str =>
+        PackageVersion.fromString(str).left.map(err => CannotConvert(str, "PackageVersion", err))
+      )
     implicit val beneficiaryConfigReader: ConfigReader[BeneficiaryConfig] =
       deriveReader[BeneficiaryConfig]
     implicit val svParticipantClientConfigReader: ConfigReader[SvParticipantClientConfig] =
@@ -890,6 +894,8 @@ object SpliceConfig {
       deriveWriter[PeriodicBackupDumpConfig]
     implicit val partyIdConfigWriter: ConfigWriter[PartyId] =
       implicitly[ConfigWriter[String]].contramap(_.toString)
+    implicit val packageVersionConfigWriter: ConfigWriter[PackageVersion] =
+      implicitly[ConfigWriter[String]].contramap(_.toString)
     implicit val beneficiaryConfigWriter: ConfigWriter[BeneficiaryConfig] =
       deriveWriter[BeneficiaryConfig]
     implicit val svParticipantClientConfigWriter: ConfigWriter[SvParticipantClientConfig] =

apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/EnvironmentDefinition.scala

@@ -26,6 +26,7 @@ import org.lfdecentralizedtrust.splice.console.{
   ValidatorAppBackendReference,
 }
 import org.lfdecentralizedtrust.splice.environment.{
+  DarResources,
   SpliceConsoleEnvironment,
   SpliceEnvironment,
   SpliceEnvironmentFactory,
@@ -106,30 +107,40 @@ case class EnvironmentDefinition(
     })
 
   def withInitialPackageVersions: EnvironmentDefinition =
-    addConfigTransforms((_, config) =>
-      ConfigTransforms.updateAllSvAppFoundDsoConfigs_(
-        _.copy(
-          // FIXME: read config from env var or something
-          initialPackageConfig = InitialPackageConfig(
-            amuletVersion = "0.1.8",
-            amuletNameServiceVersion = "0.1.8",
-            dsoGovernanceVersion = "0.1.11",
-            validatorLifecycleVersion = "0.1.2",
-            walletVersion = "0.1.8",
-            walletPaymentsVersion = "0.1.8",
+    addConfigTransforms(
+      (_, config) =>
+        ConfigTransforms.updateAllSvAppFoundDsoConfigs_(
+          _.copy(
+            // FIXME: read config from env var or something
+            initialPackageConfig = InitialPackageConfig(
+              amuletVersion = "0.1.8",
+              amuletNameServiceVersion = "0.1.8",
+              dsoGovernanceVersion = "0.1.11",
+              validatorLifecycleVersion = "0.1.2",
+              walletVersion = "0.1.8",
+              walletPaymentsVersion = "0.1.8",
+            )
           )
-        )
-      )(config),
+        )(config),
       (_, config) =>
-      ConfigTransforms.updateAllValidatorAppConfigs_( c =>
-        c.copy(
-          appInstances = c.appInstances.transform {
-            // FIXME
-            case ("splitwell", instance) => instance.copy(dars = Seq(java.nio.file.Paths.get("daml/dars/splitwell-0.1.8.dar")))
-            case (_, instance) => instance
-          }
-        )
-      )(config)
+        ConfigTransforms.updateAllValidatorAppConfigs_(c =>
+          c.copy(
+            appInstances = c.appInstances.transform {
+              // FIXME
+              case ("splitwell", instance) =>
+                instance.copy(dars = Seq(java.nio.file.Paths.get("daml/dars/splitwell-0.1.8.dar")))
+              case (_, instance) => instance
+            }
+          )
+        )(config),
+      (_, config) =>
+        ConfigTransforms.updateAllSplitwellAppConfigs_(c =>
+          c.copy(
+            requiredDarVersion =
+              // FIXME
+              DarResources.splitwell_0_1_8.metadata.version
+          )
+        )(config),
     )
 
   def withInitializedNodes(): EnvironmentDefinition =

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

@@ -13,6 +13,9 @@ class DockerComposeFullNetworkFrontendIntegrationTest
   override def environmentDefinition: SpliceEnvironmentDefinition =
     EnvironmentDefinition.empty(this.getClass.getSimpleName)
 
+  // This does nothing as the wallet clients will not actually be connected to the compose setup
+  override protected def runTokenStandardCliSanityCheck: Boolean = false
+
   override lazy val resetRequiredTopologyState = false
 
   val partyHint = "local-composeValidator-1"

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

@@ -17,14 +17,12 @@ class SplitwellIntegrationTest
     with WalletTestUtil
     with TriggerTestUtil {
 
-  private val darPath = "daml/splitwell/.daml/dist/splitwell-current.dar"
-
   override def environmentDefinition: SpliceEnvironmentDefinition =
     EnvironmentDefinition
       .simpleTopology1Sv(this.getClass.getSimpleName)
       .withAdditionalSetup(implicit env => {
-        aliceValidatorBackend.participantClient.upload_dar_unless_exists(darPath)
-        bobValidatorBackend.participantClient.upload_dar_unless_exists(darPath)
+        aliceValidatorBackend.participantClient.upload_dar_unless_exists(splitwellDarPath)
+        bobValidatorBackend.participantClient.upload_dar_unless_exists(splitwellDarPath)
       })
       // TODO(#8300) Consider removing this once domain config updates are less disruptive to carefully-timed batching tests.
       .withSequencerConnectionsFromScanDisabled()

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

@@ -22,15 +22,13 @@ class SplitwellUpgradeIntegrationTest
     with SplitwellTestUtil
     with WalletTestUtil {
 
-  private val darPath = "daml/splitwell/.daml/dist/splitwell-current.dar"
-
   override def environmentDefinition: SpliceEnvironmentDefinition =
     EnvironmentDefinition
       .simpleTopology1Sv(this.getClass.getSimpleName)
       .addConfigTransform((_, config) => ConfigTransforms.useSplitwellUpgradeDomain()(config))
       .withAdditionalSetup(implicit env => {
-        aliceValidatorBackend.participantClient.upload_dar_unless_exists(darPath)
-        bobValidatorBackend.participantClient.upload_dar_unless_exists(darPath)
+        aliceValidatorBackend.participantClient.upload_dar_unless_exists(splitwellDarPath)
+        bobValidatorBackend.participantClient.upload_dar_unless_exists(splitwellDarPath)
       })
       // TODO(#8300) Consider removing this once domain config updates are less disruptive to carefully-timed batching tests.
       .withSequencerConnectionsFromScanDisabled()

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

@@ -382,6 +382,7 @@ object BaseWalletTransfersFrontendIntegrationTest {
   )
 }
 
+@org.lfdecentralizedtrust.splice.util.scalatesttags.Amulet_0_1_9
 class WalletTransferOffersFrontendIntegrationTest
     extends BaseWalletTransfersFrontendIntegrationTest {
   override protected def createTransferOfferViaBackend(walletClient: WalletAppClientReference)(
@@ -408,6 +409,7 @@ class WalletTransferOffersFrontendIntegrationTest
   override protected def shouldDisableTokenStandardSwitch: Boolean = true
 }
 
+@org.lfdecentralizedtrust.splice.util.scalatesttags.Amulet_0_1_9
 class TokenStandardWalletTransfersFrontendIntegrationTest
     extends BaseWalletTransfersFrontendIntegrationTest {
   override protected def createTransferOfferViaBackend(walletClient: WalletAppClientReference)(

apps/splitwell/src/main/scala/org/lfdecentralizedtrust/splice/splitwell/SplitwellApp.scala

@@ -15,6 +15,7 @@ import com.digitalasset.canton.resource.Storage
 import com.digitalasset.canton.time.Clock
 import com.digitalasset.canton.topology.{PartyId, SynchronizerId}
 import com.digitalasset.canton.tracing.{TraceContext, TracerProvider}
+import io.grpc.Status
 import io.opentelemetry.api.trace.Tracer
 import org.apache.pekko.actor.ActorSystem
 import org.apache.pekko.http.cors.scaladsl.CorsDirectives.cors
@@ -225,7 +226,16 @@ class SplitwellApp(
     )
   }
 
-  override lazy val requiredPackageIds = Set(DarResources.splitwell.bootstrap.packageId)
+  override lazy val requiredPackageIds = Set(
+    DarResources.splitwell.all
+      .find(_.metadata.version == config.requiredDarVersion)
+      .getOrElse(
+        throw Status.INVALID_ARGUMENT
+          .withDescription(s"No splitwell DAR with version ${config.requiredDarVersion} found")
+          .asRuntimeException
+      )
+      .packageId
+  )
 
   protected[this] override def automationServices(st: SplitwellApp.State) =
     Seq(st.automation)

apps/splitwell/src/main/scala/org/lfdecentralizedtrust/splice/splitwell/config/SplitwellAppConfig.scala

@@ -12,7 +12,9 @@ import org.lfdecentralizedtrust.splice.config.{
   HttpClientConfig,
   NetworkAppClientConfig,
 }
+import org.lfdecentralizedtrust.splice.environment.DarResources
 import org.lfdecentralizedtrust.splice.scan.config.ScanAppClientConfig
+import com.digitalasset.daml.lf.data.Ref.PackageVersion
 import com.digitalasset.canton.config.*
 
 case class SplitwellSynchronizerConfig(
@@ -40,6 +42,7 @@ case class SplitwellAppBackendConfig(
     domainMigrationId: Long = 0L,
     domains: SplitwellSynchronizerConfig,
     parameters: SpliceParametersConfig = SpliceParametersConfig(batching = BatchingConfig()),
+    requiredDarVersion: PackageVersion = DarResources.splitwell.bootstrap.metadata.version,
 ) extends SpliceBackendConfig // TODO(#736): fork or generalize this trait.
     {
   override val nodeTypeName: String = "splitwell"