Only include stakeholder contracts in result of query (#7291)

* Only include stakeholder contracts in result of query

This fixes a bug in the script service. We need to filter out divulged
contracts since this should behave exactly like the ACS endpoint on
the ledger API.

changelog_begin
changelog_end

* Update daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/scenario/ScenarioLedger.scala

Co-authored-by: Remy <[email protected]>

* Update daml-script/runner/src/main/scala/com/digitalasset/daml/lf/engine/script/LedgerInteraction.scala

Co-authored-by: Remy <[email protected]>

* fmt

changelog_begin
changelog_end

Co-authored-by: Remy <[email protected]>

Author: cocreature

compiler/damlc/tests/src/DA/Test/ScriptService.hs

@@ -281,6 +281,17 @@ main =
                         "  where",
                         "    signatory p1",
                         "    observer p2",
+                        "template Divulger",
+                        "  with",
+                        "    divulgee : Party",
+                        "    sig : Party",
+                        "  where",
+                        "    signatory divulgee",
+                        "    observer sig",
+                        "    nonconsuming choice Divulge : T1",
+                        "      with cid : ContractId T1",
+                        "      controller sig",
+                        "      do fetch cid",
                         "testQueryInactive = do",
                         "  p <- allocateParty \"p\"",
                         "  cid1_1 <- submit p (createCmd (T1 p 42))",
@@ -300,6 +311,7 @@ main =
                         "testQueryVisibility = do",
                         "  p1 <- allocateParty \"p1\"",
                         "  p2 <- allocateParty \"p2\"",
+                        "  divulger <- submit p2 (createCmd (Divulger p2 p1))",
                         "  cidT1p1 <- submit p1 (createCmd (T1 p1 42))",
                         "  cidT1p2 <- submit p2 (createCmd (T1 p2 23))",
                         "  cidSharedp1 <- submit p1 (createCmd (TShared p1 p2))",
@@ -308,6 +320,10 @@ main =
                         "  t1p1 === [(cidT1p1, T1 p1 42)]",
                         "  t1p2 <- query @T1 p2",
                         "  t1p2 === [(cidT1p2, T1 p2 23)]",
+                        -- Divulgence should not influence query result
+                        "  submit p1 $ exerciseCmd divulger (Divulge cidT1p1)",
+                        "  t1p2 <- query @T1 p2",
+                        "  t1p2 === [(cidT1p2, T1 p2 23)]",
                         "  sharedp1 <- query @TShared p1",
                         "  sharedp1 === [(cidSharedp1, TShared p1 p2), (cidSharedp2, TShared p2 p1)]",
                         "  sharedp2 <- query @TShared p2",
@@ -316,7 +332,7 @@ main =
                   expectScriptSuccess rs (vr "testQueryInactive") $ \r ->
                     matchRegex r "Active contracts:  #2:0, #0:0\n\n"
                   expectScriptSuccess rs (vr "testQueryVisibility") $ \r ->
-                    matchRegex r "Active contracts:  #0:0, #1:0, #2:0, #3:0\n\n"
+                    matchRegex r "Active contracts:  #4:0, #3:0, #2:0, #0:0, #1:0\n\n"
                   pure (),
               testCase "submitMustFail" $ do
                   rs <-

daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/scenario/ScenarioLedger.scala

@@ -593,11 +593,12 @@ case class ScenarioLedger(
 
   def query(
       view: View,
-      effectiveAt: Time.Timestamp): Seq[(ContractId, ContractInst[Tx.Value[ContractId]])] = {
+      effectiveAt: Time.Timestamp,
+  ): Seq[LookupOk] = {
     ledgerData.activeContracts.toList
       .map(cid => lookupGlobalContract(view, effectiveAt, cid))
       .collect {
-        case LookupOk(cid, coinst, _) => (cid, coinst)
+        case l @ LookupOk(_, _, _) => l
       }
   }
 

daml-script/runner/src/main/scala/com/digitalasset/daml/lf/engine/script/LedgerInteraction.scala

@@ -364,9 +364,10 @@ class IdeClient(val compiledPackages: CompiledPackages) extends ScriptLedgerClie
     val acs = scenarioRunner.ledger.query(
       view = ScenarioLedger.ParticipantView(party.value),
       effectiveAt = scenarioRunner.ledger.currentTime)
-    // Filter to contracts of the given template id.
     val filtered = acs.collect {
-      case (cid, Value.ContractInst(tpl, arg, _)) if tpl == templateId => (cid, arg)
+      case ScenarioLedger.LookupOk(cid, Value.ContractInst(tpl, arg, _), stakeholders)
+          if tpl == templateId && stakeholders.contains(party.value) =>
+        (cid, arg)
     }
     Future.successful(filtered.map {
       case (cid, c) => ScriptLedgerClient.ActiveContract(templateId, cid, c.value)