Speedy: check contract type after checking if they are consumed (digi…

…tal-asset#12691) Missed in digital-asset#12527. CHANGELOG_BEGIN CHANGELOG_END
TuranDev · Feb 1, 2022 · aa2494f · aa2494f
1 parent 183f936
commit aa2494f
Show file tree

Hide file tree

Showing 3 changed files with 189 additions and 178 deletions.
diff --git a/daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/speedy/SBuiltin.scala b/daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/speedy/SBuiltin.scala
@@ -1032,11 +1032,11 @@ private[lf] object SBuiltin {
       val coid = getSContractId(args, 0)
       onLedger.cachedContracts.get(coid) match {
         case Some(cached) =>
-          if (cached.templateId != templateId)
-            throw SErrorDamlException(IE.WronglyTypedContract(coid, templateId, cached.templateId))
           onLedger.ptx.consumedBy
             .get(coid)
             .foreach(nid => throw SErrorDamlException(IE.ContractNotActive(coid, templateId, nid)))
+          if (cached.templateId != templateId)
+            throw SErrorDamlException(IE.WronglyTypedContract(coid, templateId, cached.templateId))
           machine.returnValue = cached.value
         case None =>
           throw SpeedyHungry(