Acquired interface query/subscription filters

sdk/canton/community/ledger/ledger-api-core/src/main/scala/com/digitalasset/canton/platform/apiserver/services/RejectionGenerators.scala

@@ -152,9 +152,6 @@ object RejectionGenerators {
             ) =>
           CommandExecutionErrors.Interpreter.UpgradeError.DowngradeDropDefinedField
             .Reject(renderedMessage, error)
-        case LfInterpretationError.Upgrade(error: LfInterpretationError.Upgrade.ViewMismatch) =>
-          CommandExecutionErrors.Interpreter.UpgradeError.ViewMismatch
-            .Reject(renderedMessage, error)
         case LfInterpretationError.Upgrade(
               error: LfInterpretationError.Upgrade.DowngradeFailed
             ) =>

sdk/canton/community/ledger/ledger-api-core/src/main/scala/com/digitalasset/canton/platform/index/IndexServiceImpl.scala

@@ -741,7 +741,7 @@ object IndexServiceImpl {
       eventFormat: EventFormat,
       alwaysPopulateArguments: Boolean,
   )(implicit
-      contextualizedErrorLogger: ContextualizedErrorLogger
+      contextualizedErrorLogger: ContextualizedErrorLogger,
   ): () => Option[(TemplatePartiesFilter, EventProjectionProperties)] = {
     @volatile var metadata: PackageMetadata = null
     @volatile var filters: Option[(TemplatePartiesFilter, EventProjectionProperties)] = None
@@ -777,7 +777,7 @@ object IndexServiceImpl {
       val eventProjectionProperties = EventProjectionProperties(
         eventFormat = eventFormat,
         interfaceImplementedBy =
-          interfaceId => metadata.interfacesImplementedBy.getOrElse(interfaceId, Set.empty),
+          interfaceId => interfacesImplementedByWithUpgrades(metadata, interfaceId),
         resolveTypeConRef = metadata.resolveTypeConRef,
         alwaysPopulateArguments = alwaysPopulateArguments,
       )
@@ -793,14 +793,22 @@ object IndexServiceImpl {
     }
   }
 
+  private def interfacesImplementedByWithUpgrades(metadata: PackageMetadata, interfaceId: Ref.Identifier): Set[(Ref.Identifier, Ref.Identifier)] =
+    for {
+      originalImplementor <- metadata.interfacesImplementedBy.getOrElse(interfaceId, Set.empty)
+      (packageName, _) <- metadata.packageIdVersionMap.get(originalImplementor.packageId).toSet
+      implementor <- metadata.resolveTypeConRef(Ref.TypeConRef(Ref.PackageRef.Name(packageName), originalImplementor.qualifiedName))
+    } yield (originalImplementor, implementor)
+
+
   private def templateIds(
       metadata: PackageMetadata,
       cumulativeFilter: CumulativeFilter,
   ): Set[Identifier] = {
     val fromInterfacesDefs = cumulativeFilter.interfaceFilters.view
       .map(_.interfaceTypeRef)
       .flatMap(metadata.resolveTypeConRef(_))
-      .flatMap(metadata.interfacesImplementedBy.getOrElse(_, Set.empty).view)
+      .flatMap(interfacesImplementedByWithUpgrades(metadata, _).map(_._2).view)
       .toSet
 
     val fromTemplateDefs = cumulativeFilter.templateFilters.view

sdk/canton/community/ledger/ledger-api-core/src/main/scala/com/digitalasset/canton/platform/store/dao/EventProjectionProperties.scala

@@ -1,4 +1,4 @@
-// Copyright (c) 2025 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
+// Copyright (c) 2025 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved
 // SPDX-License-Identifier: Apache-2.0
 
 package com.digitalasset.canton.platform.store.dao
@@ -52,7 +52,7 @@ final case class EventProjectionProperties(
 object EventProjectionProperties {
 
   final case class Projection(
-      interfaces: Set[Identifier] = Set.empty,
+      interfaces: Set[(Identifier, Identifier)] = Set.empty,
       createdEventBlob: Boolean = false,
       contractArguments: Boolean = false,
   ) {
@@ -75,10 +75,10 @@ object EventProjectionProperties {
     */
   def apply(
       eventFormat: EventFormat,
-      interfaceImplementedBy: Identifier => Set[Identifier],
+      interfaceImplementedBy: Identifier => Set[(Identifier, Identifier)],
       resolveTypeConRef: TypeConRef => Set[Identifier],
       alwaysPopulateArguments: Boolean,
-  ): EventProjectionProperties =
+  ): EventProjectionProperties = {
     EventProjectionProperties(
       verbose = eventFormat.verbose,
       templateWildcardWitnesses = templateWildcardWitnesses(eventFormat, alwaysPopulateArguments),
@@ -90,6 +90,7 @@ object EventProjectionProperties {
         resolveTypeConRef,
       ),
     )
+  }
 
   private def templateWildcardWitnesses(
       apiTransactionFilter: EventFormat,
@@ -141,7 +142,7 @@ object EventProjectionProperties {
 
   private def witnessTemplateProjections(
       apiEventFormat: EventFormat,
-      interfaceImplementedBy: Identifier => Set[Identifier],
+      interfaceImplementedBy: Identifier => Set[(Identifier, Identifier)],
       resolveTypeConRef: TypeConRef => Set[Identifier],
   ): Map[Option[String], Map[Identifier, Projection]] = {
     val partyFilterPairs =
@@ -155,9 +156,9 @@ object EventProjectionProperties {
       val interfaceFilterProjections = for {
         interfaceFilter <- cumulativeFilter.interfaceFilters.view
         interfaceId <- resolveTypeConRef(interfaceFilter.interfaceTypeRef)
-        implementor <- interfaceImplementedBy(interfaceId).view
+        (originalImplementor, implementor) <- interfaceImplementedBy(interfaceId).view
       } yield implementor -> Projection(
-        interfaces = if (interfaceFilter.includeView) Set(interfaceId) else Set.empty,
+        interfaces = if (interfaceFilter.includeView) Set((originalImplementor, interfaceId)) else Set.empty,
         createdEventBlob = interfaceFilter.includeCreatedEventBlob,
         contractArguments = false,
       )

sdk/canton/community/ledger/ledger-api-core/src/main/scala/com/digitalasset/canton/platform/store/dao/events/LfValueTranslation.scala

@@ -438,13 +438,13 @@ final class LfValueTranslation(
         .map(toContractKeyApi(verbose))
     )
     def asyncInterfaceViews =
-      MonadUtil.sequentialTraverse(renderResult.interfaces.toList)(interfaceId =>
+      MonadUtil.sequentialTraverse(renderResult.interfaces.toList)({ case (originalImplementorTemplateId, interfaceId) =>
         computeInterfaceView(
-          templateId,
+          originalImplementorTemplateId,
           value.unversioned,
           interfaceId,
         ).flatMap(toInterfaceView(eventProjectionProperties.verbose, interfaceId))
-      )
+      })
 
     def asyncCreatedEventBlob = condFuture(renderResult.createdEventBlob) {
       (for {

sdk/canton/community/ledger/ledger-common/src/main/scala/com/digitalasset/canton/ledger/error/groups/CommandExecutionErrors.scala

@@ -802,34 +802,6 @@ object CommandExecutionErrors extends CommandExecutionErrorGroup {
         }
       }
 
-      @Explanation("View mismatch when trying to upgrade the contract")
-      @Resolution(
-        "Verify that the interface views of the contract have not changed"
-      )
-      object ViewMismatch
-          extends ErrorCode(
-            id = "INTERPRETATION_UPGRADE_ERROR_VIEW_MISMATCH",
-            ErrorCategory.InvalidGivenCurrentSystemStateOther,
-          ) {
-        final case class Reject(
-            override val cause: String,
-            err: LfInterpretationError.Upgrade.ViewMismatch,
-        )(implicit
-            loggingContext: ContextualizedErrorLogger
-        ) extends DamlErrorWithDefiniteAnswer(
-              cause = cause
-            ) {
-
-          override def resources: Seq[(ErrorResource, String)] =
-            Seq(
-              (ErrorResource.ContractId, err.coid.coid),
-              (ErrorResource.InterfaceId, err.iterfaceId.toString),
-              (ErrorResource.TemplateId, err.srcTemplateId.toString),
-              (ErrorResource.TemplateId, err.dstTemplateId.toString),
-            )
-        }
-      }
-
       @Explanation(
         "An optional contract field with a value of Some may not be dropped during downgrading"
       )

sdk/compiler/daml-lf-tools/src/DA/Daml/LF/TypeChecker/Error.hs

@@ -225,7 +225,6 @@ data UnwarnableError
   | EUpgradeTemplateAddedKey !TypeConName !TemplateKey
   | EUpgradeTriedToUpgradeIface !TypeConName
   | EUpgradeMissingImplementation !TypeConName !TypeConName
-  | EForbiddenNewImplementation !TypeConName !TypeConName
   | EUpgradeDependenciesFormACycle ![(PackageId, PackageMetadata)]
   | EUpgradeMultiplePackagesWithSameNameAndVersion !PackageName !RawPackageVersion ![PackageId]
   | EUpgradeTriedToUpgradeException !TypeConName
@@ -259,6 +258,7 @@ data ErrorOrWarning
   | WETemplateInterfaceDependsOnScript !(PackageId, PackageMetadata)
     -- ^ We want to recommend not uploading daml-script to ledger, but it's not a strict requirement
     -- This we make it a warning on packages that define "engine entry points", i.e. templates or interfaces
+  | WEForbiddenNewImplementation !TypeConName !TypeConName
   deriving (Eq, Show)
 
 instance Pretty ErrorOrWarning where
@@ -317,6 +317,11 @@ instance Pretty ErrorOrWarning where
         , "It is recommended that scripts/tests are defined in a separate package to your templates, and that"
         , "you remove `" <> pprintDep dep <> "` from the dependencies in your daml.yaml"
         ]
+    WEForbiddenNewImplementation tpl iface ->
+      vcat
+        [ "Implementation of interface " <> pPrint iface <> " by template " <> pPrint tpl <> " is defined in this package, but not in the package that is being upgraded."
+        , "Only turn off this error if you know what you're doing."
+        ]
     where
     withMismatchInfo :: [Mismatch UpgradeMismatchReason] -> Doc ann -> Doc ann
     withMismatchInfo [] doc = doc
@@ -346,6 +351,7 @@ damlWarningFlagParserTypeChecker = DamlWarningFlagParser
       , (unusedDependencyName, unusedDependencyFlag)
       , (ownUpgradeDependencyName, ownUpgradeDependencyFlag)
       , (templateInterfaceDependsOnScriptName, templateInterfaceDependsOnScriptFlag)
+      , (templateHasNewInterfaceInstanceName, templateHasNewInterfaceInstanceFlag)
       ]
   , dwfpDefault = \case
       WEUpgradeShouldDefineIfacesAndTemplatesSeparately {} -> AsError
@@ -366,6 +372,7 @@ damlWarningFlagParserTypeChecker = DamlWarningFlagParser
       WEUnusedDependency {} -> AsWarning
       WEOwnUpgradeDependency {} -> AsError
       WETemplateInterfaceDependsOnScript {} -> AsWarning
+      WEForbiddenNewImplementation {} -> AsError
   }
 
 filterNameForErrorOrWarning :: ErrorOrWarning -> Maybe String
@@ -378,6 +385,7 @@ filterNameForErrorOrWarning err | couldNotExtractUpgradedExpressionFilter err =
 filterNameForErrorOrWarning err | unusedDependencyFilter err = Just unusedDependencyName
 filterNameForErrorOrWarning err | ownUpgradeDependencyFilter err = Just ownUpgradeDependencyName
 filterNameForErrorOrWarning err | templateInterfaceDependsOnScriptFilter err = Just templateInterfaceDependsOnScriptName
+filterNameForErrorOrWarning err | templateHasNewInterfaceInstanceFilter err = Just templateHasNewInterfaceInstanceName
 filterNameForErrorOrWarning _ = Nothing
 
 upgradedTemplateChangedFlag :: DamlWarningFlagStatus -> DamlWarningFlag ErrorOrWarning
@@ -497,6 +505,18 @@ templateInterfaceDependsOnScriptFilter =
         WETemplateInterfaceDependsOnScript {} -> True
         _ -> False
 
+templateHasNewInterfaceInstanceFlag :: DamlWarningFlagStatus -> DamlWarningFlag ErrorOrWarning
+templateHasNewInterfaceInstanceFlag status = RawDamlWarningFlag templateHasNewInterfaceInstanceName status templateHasNewInterfaceInstanceFilter
+
+templateHasNewInterfaceInstanceName :: String
+templateHasNewInterfaceInstanceName = "template-has-new-interface-instance"
+
+templateHasNewInterfaceInstanceFilter :: ErrorOrWarning -> Bool
+templateHasNewInterfaceInstanceFilter =
+    \case
+        WEForbiddenNewImplementation {} -> True
+        _ -> False
+
 data PackageUpgradeOrigin = UpgradingPackage | UpgradedPackage
   deriving (Eq, Ord, Show)
 
@@ -935,7 +955,6 @@ instance Pretty UnwarnableError where
     EUpgradeTemplateAddedKey template _key -> "The upgraded template " <> pPrint template <> " cannot add a key where it didn't have one previously."
     EUpgradeTriedToUpgradeIface iface -> "Tried to upgrade interface " <> pPrint iface <> ", but interfaces cannot be upgraded. They should be removed whenever a package is being upgraded."
     EUpgradeMissingImplementation tpl iface -> "Implementation of interface " <> pPrint iface <> " by template " <> pPrint tpl <> " appears in package that is being upgraded, but does not appear in this package."
-    EForbiddenNewImplementation tpl iface -> "Implementation of interface " <> pPrint iface <> " by template " <> pPrint tpl <> " appears in this package, but does not appear in package that is being upgraded."
     EUpgradeDependenciesFormACycle deps ->
       vcat
         [ "Dependencies from the `upgrades:` field and dependencies defined on the current package form a cycle:"

sdk/compiler/daml-lf-tools/src/DA/Daml/LF/TypeChecker/Upgrade.hs

@@ -546,13 +546,13 @@ checkAddedInstances ::
     Module ->
     HMS.HashMap (TypeConName, Qualified TypeConName) (Template, TemplateImplements) ->
     TcUpgradeM ()
-checkAddedInstances module_ instances = throwIfNonEmpty handleError instances
+checkAddedInstances module_ instances = throwIfNonEmpty mkWarning instances
   where
-    handleError ::
-        (Template, TemplateImplements) -> (Maybe Context, UnwarnableError)
-    handleError (tpl, impl) =
+    mkWarning ::
+        (Template, TemplateImplements) -> (Maybe Context, ErrorOrWarning)
+    mkWarning (tpl, impl) =
         ( Just (ContextTemplate module_ tpl TPWhole)
-        , EForbiddenNewImplementation (NM.name tpl) (LF.qualObject (NM.name impl))
+        , WEForbiddenNewImplementation (NM.name tpl) (LF.qualObject (NM.name impl))
         )
 
 -- It is always invalid to keep an interface in an upgrade

sdk/compiler/damlc/tests/BUILD.bazel

@@ -455,10 +455,9 @@ da_haskell_test(
         "//test-common:upgrades-FailsWhenATopLevelVariantAddsAFieldToAConstructorsType-v2.dar",
         "//test-common:upgrades-FailsWhenATopLevelVariantRemovesAConstructor-v1.dar",
         "//test-common:upgrades-FailsWhenATopLevelVariantRemovesAConstructor-v2.dar",
-        "//test-common:upgrades-FailsWhenAnInstanceIsAddedSeparateDep-v1.dar",
-        "//test-common:upgrades-FailsWhenAnInstanceIsAddedSeparateDep-v2.dar",
-        "//test-common:upgrades-FailsWhenAnInstanceIsAddedUpgradedPackage-v1.dar",
-        "//test-common:upgrades-FailsWhenAnInstanceIsAddedUpgradedPackage-v2.dar",
+        "//test-common:upgrades-SucceedsWhenAnInstanceIsAddedSeparateDep-files",
+        "//test-common:upgrades-SucceedsWhenAnInstanceIsAddedSeparateDep-dep.dar",
+        "//test-common:upgrades-SucceedsWhenAnInstanceIsAddedUpgradedPackage-files",
         "//test-common:upgrades-FailsWhenAnInstanceIsDropped-v1.dar",
         "//test-common:upgrades-FailsWhenAnInstanceIsDropped-v2.dar",
         "//test-common:upgrades-FailsWhenAnInterfaceIsDefinedInAnUpgradingPackageWhenItWasAlreadyInThePriorPackage-v1.dar",