Switch to relying on package names instead of module names

apps/app/src/main/scala/org/lfdecentralizedtrust/splice/console/LedgerApiExtensions.scala

@@ -404,7 +404,7 @@ trait LedgerApiExtensions extends AppendedClues with Matchers {
             predicate: TC => Boolean = (_: TC) => true,
         ): Seq[TC] = {
           val filterIdentifier =
-            PackageQualifiedName.getFromResources(templateCompanion.getTemplateIdWithPackageId)
+            PackageQualifiedName.fromJavaCodegenCompanion(templateCompanion)
           val templateId = TemplateId(
             s"#${filterIdentifier.packageName}",
             filterIdentifier.qualifiedName.moduleName,
@@ -443,8 +443,7 @@ trait LedgerApiExtensions extends AppendedClues with Matchers {
         ](templateCompanion: javaapi.data.codegen.ContractCompanion[TC, TCid, T])(
             partyId: PartyId
         ): Seq[CreatedEvent] = {
-          val filterIdentifier =
-            PackageQualifiedName.getFromResources(templateCompanion.getTemplateIdWithPackageId)
+          val filterIdentifier = PackageQualifiedName.fromJavaCodegenCompanion(templateCompanion)
           val templateId = TemplateId(
             s"#${filterIdentifier.packageName}",
             filterIdentifier.qualifiedName.moduleName,

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

@@ -1025,11 +1025,11 @@ class DecentralizedSynchronizerMigrationIntegrationTest
                   pageSize = 1000,
                   templates = Some(
                     Vector(
-                      DsoRules.TEMPLATE_ID_WITH_PACKAGE_ID,
-                      AmuletRules.TEMPLATE_ID_WITH_PACKAGE_ID,
-                      AnsRules.TEMPLATE_ID_WITH_PACKAGE_ID,
+                      DsoRules.COMPANION,
+                      AmuletRules.COMPANION,
+                      AnsRules.COMPANION,
                     ).map(
-                      PackageQualifiedName.getFromResources(_)
+                      PackageQualifiedName.fromJavaCodegenCompanion
                     )
                   ),
                 )

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

@@ -510,8 +510,8 @@ class ScanTimeBasedIntegrationTest
       migrationId,
       templates = Some(
         Vector(
-          PackageQualifiedName.getFromResources(Amulet.TEMPLATE_ID_WITH_PACKAGE_ID),
-          PackageQualifiedName.getFromResources(AnsEntry.TEMPLATE_ID_WITH_PACKAGE_ID),
+          PackageQualifiedName.fromJavaCodegenCompanion(Amulet.COMPANION),
+          PackageQualifiedName.fromJavaCodegenCompanion(AnsEntry.COMPANION),
         )
       ),
       partyIds = Some(Vector(aliceUserParty)),

apps/common/src/main/scala/org/lfdecentralizedtrust/splice/store/DbVotesStoreQueryBuilder.scala

@@ -11,7 +11,6 @@ import org.lfdecentralizedtrust.splice.codegen.java.splice.dsorules.VoteRequest
 import org.lfdecentralizedtrust.splice.store.db.AcsQueries.AcsStoreId
 import org.lfdecentralizedtrust.splice.store.db.TxLogQueries.TxLogStoreId
 import org.lfdecentralizedtrust.splice.store.db.{AcsQueries, TxLogQueries}
-import org.lfdecentralizedtrust.splice.util.QualifiedName
 import slick.dbio.{Effect, NoStream}
 import slick.jdbc.canton.ActionBasedSQLInterpolation.Implicits.actionBasedSQLInterpolationCanton
 import slick.sql.SqlStreamingAction
@@ -110,10 +109,8 @@ trait DbVotesAcsStoreQueryBuilder extends AcsQueries with LimitHelpers with Name
       acsTableName,
       acsStoreId,
       domainMigrationId,
-      where = (sql""" template_id_qualified_name = ${QualifiedName(
-          VoteRequest.TEMPLATE_ID_WITH_PACKAGE_ID
-        )}
-                          and #$trackingCidColumnName in """ ++ voteRequestTrackingCidsSql).toActionBuilder,
+      VoteRequest.COMPANION,
+      where = (sql""" #$trackingCidColumnName in """ ++ voteRequestTrackingCidsSql).toActionBuilder,
       orderLimit = sql"""limit ${sqlLimit(limit)}""",
     )
   }
@@ -133,10 +130,8 @@ trait DbVotesAcsStoreQueryBuilder extends AcsQueries with LimitHelpers with Name
       acsTableName,
       acsStoreId,
       domainMigrationId,
-      where = (sql""" template_id_qualified_name = ${QualifiedName(
-          VoteRequest.TEMPLATE_ID_WITH_PACKAGE_ID
-        )}
-                       and #$trackingCidColumnName = $voteRequestCid """).toActionBuilder,
+      VoteRequest.COMPANION,
+      where = (sql""" #$trackingCidColumnName = $voteRequestCid """).toActionBuilder,
     ).headOption
   }
 

apps/common/src/main/scala/org/lfdecentralizedtrust/splice/store/MultiDomainAcsStore.scala

@@ -6,7 +6,10 @@ package org.lfdecentralizedtrust.splice.store
 import org.apache.pekko.NotUsed
 import org.apache.pekko.stream.scaladsl.Source
 import com.daml.ledger.api.v2.transaction_filter.{EventFormat, CumulativeFilter}
-import org.lfdecentralizedtrust.splice.util.Contract.Companion.Template as TemplateCompanion
+import org.lfdecentralizedtrust.splice.util.Contract.Companion.{
+  Interface,
+  Template as TemplateCompanion,
+}
 import com.daml.ledger.javaapi.data.{CreatedEvent, ExercisedEvent, Identifier, Template}
 import com.daml.ledger.javaapi.data.codegen.{ContractId, DamlRecord}
 import com.daml.metrics.api.MetricsContext
@@ -26,6 +29,7 @@ import org.lfdecentralizedtrust.splice.util.{
   Contract,
   ContractWithState,
   PackageQualifiedName,
+  QualifiedName,
   TemplateJsonDecoder,
 }
 import org.lfdecentralizedtrust.splice.util.PrettyInstances.*
@@ -171,22 +175,6 @@ trait MultiDomainAcsStore extends HasIngestionSink with AutoCloseable with Named
       traceContext: TraceContext,
   ): Future[Seq[Contract[TCid, T]]]
 
-  /** At most 1000 (`notOnDomainsTotalLimit`) contracts sorted by a hash of
-    * contract ID and participant ID.
-    *
-    * The idea is that different apps making the same migration on different
-    * participants will split the work better, while preserving determinism of a
-    * specific running app for fault-tolerance.  For the former to happen, the
-    * position of a contract on one list must have no correlation with that on
-    * another list; that is why the contract ID by itself cannot be used by
-    * itself as the source of the sort key.
-    */
-  def listAssignedContractsNotOnDomainN(
-      excludedDomain: SynchronizerId,
-      companions: Seq[ConstrainedTemplate],
-      limit: notOnDomainsTotalLimit.type = notOnDomainsTotalLimit,
-  )(implicit tc: TraceContext): Future[Seq[AssignedContract[?, ?]]]
-
   private[splice] def listExpiredFromPayloadExpiry[C, TCid <: ContractId[T], T <: Template](
       companion: C
   )(implicit
@@ -470,7 +458,7 @@ object MultiDomainAcsStore extends StoreErrors {
       TemplateFilter[TCid, T, R],
   ) =
     (
-      PackageQualifiedName.getFromResources(templateCompanion.getTemplateIdWithPackageId),
+      PackageQualifiedName.fromJavaCodegenCompanion(templateCompanion),
       TemplateFilter(
         ev => {
           val c = Contract.fromCreatedEvent(templateCompanion)(ev)
@@ -597,6 +585,8 @@ object MultiDomainAcsStore extends StoreErrors {
 
     def typeId(companion: C): Identifier
 
+    def packageQualifiedName(companion: C): PackageQualifiedName
+
     def toContractId(companion: C, contractId: String): TCid
 
     protected def fromJson(
@@ -619,6 +609,13 @@ object MultiDomainAcsStore extends StoreErrors {
       override def typeId(companion: Contract.Companion.Template[TCid, T]): Identifier =
         companion.getTemplateIdWithPackageId
 
+      override def packageQualifiedName(
+          companion: TemplateCompanion[TCid, T]
+      ): PackageQualifiedName = PackageQualifiedName(
+        companion.PACKAGE_NAME,
+        QualifiedName(companion.getTemplateIdWithPackageId),
+      )
+
       override def toContractId(companion: Companion.Template[TCid, T], contractId: String): TCid =
         companion.toContractId(new ContractId[T](contractId))
 
@@ -652,6 +649,13 @@ object MultiDomainAcsStore extends StoreErrors {
       override def typeId(companion: Contract.Companion.Interface[ICid, Marker, View]): Identifier =
         companion.getTemplateIdWithPackageId
 
+      override def packageQualifiedName(
+          companion: Interface[ICid, Marker, View]
+      ): PackageQualifiedName = PackageQualifiedName(
+        companion.PACKAGE_NAME,
+        QualifiedName(companion.getTemplateIdWithPackageId),
+      )
+
       override def toContractId(
           companion: Companion.Interface[ICid, Marker, View],
           contractId: String,

apps/common/src/main/scala/org/lfdecentralizedtrust/splice/store/db/AcsJdbcTypes.scala

@@ -218,6 +218,11 @@ trait AcsJdbcTypes {
   protected implicit val qualifiedNameGetResult: GetResult[QualifiedName] =
     GetResult.GetString.andThen { s => QualifiedName.assertFromString(s) }
 
+  protected implicit val packageQualifiedNameGetResult: GetResult[PackageQualifiedName] =
+    implicitly[GetResult[(QualifiedName, String)]].andThen { case (qualifiedName, packageName) =>
+      PackageQualifiedName(packageName, qualifiedName)
+    }
+
   protected implicit lazy val qualifiedNameJdbcType: JdbcType[QualifiedName] =
     MappedColumnType.base[QualifiedName, String](
       { _.toString }, {

apps/common/src/main/scala/org/lfdecentralizedtrust/splice/store/db/AcsQueries.scala

@@ -26,24 +26,33 @@ import scalaz.{@@, Tag}
 import slick.jdbc.canton.ActionBasedSQLInterpolation.Implicits.actionBasedSQLInterpolationCanton
 import slick.jdbc.canton.SQLActionBuilder
 import slick.jdbc.{GetResult, PositionedResult, SetParameter}
+import slick.dbio.Effect
+import slick.sql.SqlStreamingAction
 
 trait AcsQueries extends AcsJdbcTypes {
 
   /** @param tableName Must be SQL-safe, as it needs to be interpolated unsafely.
     *                  This is fine, as all calls to this method should use static string constants.
     */
-  protected def selectFromAcsTable(
+  protected def selectFromAcsTable[C, TCid <: ContractId[_], T](
       tableName: String,
       storeId: AcsStoreId,
       migrationId: Long,
-      where: SQLActionBuilder,
+      companion: C,
+      where: SQLActionBuilder = sql"true",
       orderLimit: SQLActionBuilder = sql"",
-  ) =
+  )(implicit companionClass: ContractCompanion[C, TCid, T]) = {
+    val packageQualifiedName = companionClass.packageQualifiedName(companion)
     (sql"""
        select #${SelectFromAcsTableResult.sqlColumnsCommaSeparated()}
        from #$tableName acs
-       where acs.store_id = $storeId and acs.migration_id = $migrationId and """ ++ where ++ sql"""
+       where acs.store_id = $storeId
+         and acs.migration_id = $migrationId
+         and acs.package_name = ${packageQualifiedName.packageName}
+         and acs.template_id_qualified_name = ${packageQualifiedName.qualifiedName}
+         and """ ++ where ++ sql"""
        """ ++ orderLimit).toActionBuilder.as[AcsQueries.SelectFromAcsTableResult]
+  }
 
   implicit val GetResultSelectFromAcsTable: GetResult[AcsQueries.SelectFromAcsTableResult] =
     GetResult { prs =>
@@ -55,7 +64,7 @@ trait AcsQueries extends AcsJdbcTypes {
           <<[Long],
           <<[ContractId[Any]],
           <<[String],
-          <<[QualifiedName],
+          <<[PackageQualifiedName],
           <<[Json],
           <<[Array[Byte]],
           <<[Timestamp],
@@ -65,18 +74,27 @@ trait AcsQueries extends AcsJdbcTypes {
     }
 
   /** Similar to [[selectFromAcsTable]], but also returns the contract state (i.e., the domain to which a contract is currently assigned) */
-  protected def selectFromAcsTableWithState(
+  protected def selectFromAcsTableWithState[C, TCid <: ContractId[_], T](
       tableName: String,
       storeId: AcsStoreId,
       migrationId: Long,
-      where: SQLActionBuilder,
+      companion: C,
+      additionalWhere: SQLActionBuilder = sql"",
       orderLimit: SQLActionBuilder = sql"",
-  ) =
+  )(implicit companionClass: ContractCompanion[C, TCid, T]): SqlStreamingAction[Vector[
+    SelectFromAcsTableWithStateResult
+  ], SelectFromAcsTableWithStateResult, Effect.Read] = {
+    val packageQualifiedName = companionClass.packageQualifiedName(companion)
     (sql"""
        select #${SelectFromAcsTableWithStateResult.sqlColumnsCommaSeparated()}
        from #$tableName acs
-       where acs.store_id = $storeId and acs.migration_id = $migrationId and """ ++ where ++ sql"""
+       where acs.store_id = $storeId
+         and acs.migration_id = $migrationId
+         and acs.package_name = ${packageQualifiedName.packageName}
+         and acs.template_id_qualified_name = ${packageQualifiedName.qualifiedName}
+         """ ++ additionalWhere ++ sql"""
        """ ++ orderLimit).toActionBuilder.as[AcsQueries.SelectFromAcsTableWithStateResult]
+  }
 
   implicit val GetResultSelectFromContractStateResult
       : GetResult[AcsQueries.SelectFromContractStateResult] =
@@ -104,13 +122,15 @@ trait AcsQueries extends AcsJdbcTypes {
     * This guarantees that the fetched contracts exist in the given offset,
     * whereas two separate queries (one to fetch the contract and one to fetch the offset) don't guarantee that.
     */
-  protected def selectFromAcsTableWithOffset(
+  protected def selectFromAcsTableWithOffset[C, TCid <: ContractId[_], T](
       tableName: String,
       storeId: AcsStoreId,
       migrationId: Long,
+      companion: C,
       where: SQLActionBuilder,
       orderLimit: SQLActionBuilder = sql"",
-  ) =
+  )(implicit companionClass: ContractCompanion[C, TCid, T]) = {
+    val packageQualifiedName = companionClass.packageQualifiedName(companion)
     (sql"""
        select
          acs.store_id,
@@ -120,6 +140,7 @@ trait AcsQueries extends AcsJdbcTypes {
          contract_id,
          template_id_package_id,
          template_id_qualified_name,
+         package_name,
          create_arguments,
          created_event_blob,
          created_at,
@@ -130,10 +151,13 @@ trait AcsQueries extends AcsJdbcTypes {
            left join #$tableName acs
                on o.store_id = acs.store_id
                and o.migration_id = acs.migration_id
+               and acs.package_name = ${packageQualifiedName.packageName}
+               and acs.template_id_qualified_name = ${packageQualifiedName.qualifiedName}
                and """ ++ where ++ sql"""
        where sd.id = $storeId and o.migration_id = $migrationId
        """ ++ orderLimit).toActionBuilder
       .as[AcsQueries.SelectFromAcsTableResultWithOffset]
+  }
 
   implicit val GetResultSelectFromAcsTableResultWithOffset
       : GetResult[AcsQueries.SelectFromAcsTableResultWithOffset] = { (pp: PositionedResult) =>
@@ -161,13 +185,15 @@ trait AcsQueries extends AcsJdbcTypes {
 
   /** Same as [[selectFromAcsTableWithOffset]], but also includes the contract state.
     */
-  protected def selectFromAcsTableWithStateAndOffset(
+  protected def selectFromAcsTableWithStateAndOffset[C, TCid <: ContractId[_], T](
       tableName: String,
       storeId: AcsStoreId,
       migrationId: Long,
+      companion: C,
       where: SQLActionBuilder = sql"true",
       orderLimit: SQLActionBuilder = sql"",
-  ) =
+  )(implicit companionClass: ContractCompanion[C, TCid, T]) = {
+    val packageQualifiedName = companionClass.packageQualifiedName(companion)
     (sql"""
        select
          acs.store_id,
@@ -177,6 +203,7 @@ trait AcsQueries extends AcsJdbcTypes {
          acs.contract_id,
          acs.template_id_package_id,
          acs.template_id_qualified_name,
+         acs.package_name,
          acs.create_arguments,
          acs.created_event_blob,
          acs.created_at,
@@ -194,10 +221,13 @@ trait AcsQueries extends AcsJdbcTypes {
            left join #$tableName acs
                on o.store_id = acs.store_id
                and o.migration_id = acs.migration_id
+               and acs.package_name = ${packageQualifiedName.packageName}
+               and acs.template_id_qualified_name = ${packageQualifiedName.qualifiedName}
                and """ ++ where ++ sql"""
        where sd.id = $storeId and o.migration_id = $migrationId
        """ ++ orderLimit).toActionBuilder
       .as[AcsQueries.SelectFromAcsTableResultWithStateAndOffset]
+  }
 
   implicit val GetResultSelectFromAcsTableResultWithStateOffset
       : GetResult[AcsQueries.SelectFromAcsTableResultWithStateAndOffset] = {
@@ -311,7 +341,7 @@ object AcsQueries {
       eventNumber: Long,
       contractId: ContractId[Any],
       templateIdPackageId: String,
-      templateIdQualifiedName: QualifiedName,
+      packageQualifiedName: PackageQualifiedName,
       createArguments: Json,
       createdEventBlob: Array[Byte],
       createdAt: Timestamp,
@@ -321,12 +351,22 @@ object AcsQueries {
         companionClass: ContractCompanion[C, TCId, T],
         decoder: TemplateJsonDecoder,
     ): Contract[TCId, T] = {
+      // safety check: if the PackageQualifiedNames don't match,
+      // it means that we would be returning a contract of a different template
+      // note that the packageId not matching is expected due to upgrades, but the name will be stable
+      val expectedPackageQualifiedName = companionClass.packageQualifiedName(companion)
+      if (expectedPackageQualifiedName != packageQualifiedName) {
+        throw new IllegalStateException(
+          s"Contract $contractId has a different package qualified name than expected. Expected: $expectedPackageQualifiedName - Got: $packageQualifiedName"
+        )
+      }
+
       companionClass
         .fromJson(companion)(
           new Identifier(
             templateIdPackageId,
-            templateIdQualifiedName.moduleName,
-            templateIdQualifiedName.entityName,
+            packageQualifiedName.qualifiedName.moduleName,
+            packageQualifiedName.qualifiedName.entityName,
           ),
           contractId.contractId,
           createArguments,
@@ -351,6 +391,7 @@ object AcsQueries {
           ${qualifier}contract_id,
           ${qualifier}template_id_package_id,
           ${qualifier}template_id_qualified_name,
+          ${qualifier}package_name,
           ${qualifier}create_arguments,
           ${qualifier}created_event_blob,
           ${qualifier}created_at,

apps/common/src/main/scala/org/lfdecentralizedtrust/splice/store/db/DbAppStore.scala

@@ -58,7 +58,6 @@ abstract class DbTxLogAppStore[TXE](
       acsContractFilter,
       txLogConfig,
       domainMigrationInfo,
-      participantId,
       retryProvider,
       handleIngestionSummary,
     )
@@ -98,7 +97,6 @@ abstract class DbAppStore(
       acsContractFilter,
       TxLogStore.Config.empty,
       domainMigrationInfo,
-      participantId,
       retryProvider,
       handleIngestionSummary,
     )