Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix normalization and value translation of LF1.15 values in 1.17 contexts #20473

Merged
merged 13 commits into from
Dec 16, 2024
Merged

Fix normalization and value translation of LF1.15 values in 1.17 contexts #20473

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a72d16a
wip
remyhaemmerle-da Dec 12, 2024
d3e818b
Much value translator plumbing
samuel-williams-da Dec 12, 2024
14285ba
Change SBuiltinBeginExercise node version
samuel-williams-da Dec 13, 2024
79dcde5
Format
samuel-williams-da Dec 13, 2024
3dc448c
Update version test to new logic and ignore coimplements in 1.17
samuel-williams-da Dec 13, 2024
5839ad8
Fix missing translateValue call
samuel-williams-da Dec 13, 2024
d393f96
Fix enrichment and substituted in translator before optional check
samuel-williams-da Dec 13, 2024
e5e6780
Fix various tests
samuel-williams-da Dec 13, 2024
167fc7f
Update security
samuel-williams-da Dec 13, 2024
9b7ee5b
Apply suggestions from code review
samuel-williams-da Dec 13, 2024
a72209c
Remove unused import
samuel-williams-da Dec 16, 2024
c993358
fix test
remyhaemmerle-da Dec 16, 2024
302187e
Fix test attempt 2
samuel-williams-da Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions sdk/daml-lf/engine/src/main/scala/com/digitalasset/daml/lf/engine/ValueEnricher.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,20 +152,22 @@ final class ValueEnricher(
)

def enrichChoiceResult(
choicePackageId: PackageId,
templatePackageId: PackageId,
qualifiedTemplateName: QualifiedName,
interfaceId: Option[Identifier],
choiceName: Name,
value: Value,
): Result[Value] = for {
choice <- handleLookup(
pkgInterface.lookupChoice(
Identifier(choicePackageId, qualifiedTemplateName),
Identifier(templatePackageId, qualifiedTemplateName),
interfaceId,
choiceName,
)
)
pkg <- handleLookup(pkgInterface.lookupPackage(choicePackageId))
pkg <- handleLookup(
pkgInterface.lookupPackage(interfaceId.fold(templatePackageId)(_.packageId))
)
enrichedValue <- enrichValue(choice.returnType, pkg.upgradable, value)
} yield enrichedValue

Expand Down
2 changes: 1 addition & 1 deletion ...ne/src/main/scala/com/digitalasset/daml/lf/engine/preprocessing/CommandPreprocessor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ private[lf] final class CommandPreprocessor(
key.contractKey,
)
val ckTtype = handleLookup(pkgInterface.lookupTemplateKey(templateId)).typ
val preprocessedKey = translateArg(ckTtype, key.contractKey)
val preprocessedKey = translateArg(ckTtype, upgradable(templateId), key.contractKey)

speedy.Speedy.Machine
.globalKey(pkgInterface, templateId, preprocessedKey)
Expand Down
10 changes: 6 additions & 4 deletions ...engine/src/main/scala/com/digitalasset/daml/lf/engine/preprocessing/ValueTranslator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import com.daml.lf.value.Value._
import scala.annotation.tailrec

private[lf] final class ValueTranslator(
pkgInterface: language.PackageInterface,
val pkgInterface: language.PackageInterface,
checkV1ContractIdSuffixes: Boolean,
) {

Expand Down Expand Up @@ -197,8 +197,11 @@ private[lf] final class ValueTranslator(
case ValueRecord(mbId, sourceElements) =>
checkUserTypeId(upgradable, tyCon, mbId)
val lookupResult = handleLookup(pkgInterface.lookupDataRecord(tyCon))
val targetFieldsAndTypes = lookupResult.dataRecord.fields
val subst = lookupResult.subst(tyArgs)
val targetFieldsAndTypes =
lookupResult.dataRecord.fields.map { case (lbl, typ) =>
lbl -> AstUtil.substitute(typ, subst)
}

def addMissingField(lbl: Ref.Name, ty: Type): (Option[Ref.Name], Value) =
ty match {
Expand Down Expand Up @@ -279,8 +282,7 @@ private[lf] final class ValueTranslator(

// Recursive substitution
val translatedCorrectFields = correctFields.map { case (lbl, v, typ) =>
val replacedTyp = AstUtil.substitute(typ, subst)
lbl -> go(replacedTyp, v, newNesting)
lbl -> go(typ, v, newNesting)
}

extraFields.foreach {
Expand Down
13 changes: 10 additions & 3 deletions sdk/daml-lf/engine/src/test/scala/com/digitalasset/daml/lf/engine/EngineTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,7 @@ class EngineTest(langVersion: LanguageVersion)
"translate empty list" in {
val list = ValueNil
val res = preprocessor
.translateValue(TList(TBuiltin(BTInt64)), list)
.translateValue(TList(TBuiltin(BTInt64)), false, list)
.consume(lookupContract, lookupPackage, lookupKey)

res shouldEqual Right(SList(FrontStack.empty))
Expand All @@ -892,7 +892,7 @@ class EngineTest(langVersion: LanguageVersion)
"translate singleton" in {
val list = ValueList(FrontStack(ValueInt64(1)))
val res = preprocessor
.translateValue(TList(TBuiltin(BTInt64)), list)
.translateValue(TList(TBuiltin(BTInt64)), false, list)
.consume(lookupContract, lookupPackage, lookupKey)

res shouldEqual Right(SList(FrontStack(SInt64(1))))
Expand All @@ -903,7 +903,7 @@ class EngineTest(langVersion: LanguageVersion)
FrontStack(ValueInt64(1), ValueInt64(2), ValueInt64(3), ValueInt64(4), ValueInt64(5))
)
val res = preprocessor
.translateValue(TList(TBuiltin(BTInt64)), list)
.translateValue(TList(TBuiltin(BTInt64)), false, list)
.consume(lookupContract, lookupPackage, lookupKey)

res shouldEqual Right(
Expand All @@ -918,6 +918,7 @@ class EngineTest(langVersion: LanguageVersion)
preprocessor
.translateValue(
TTyConApp(TypeConName(basicTestsPkgId, "BasicTests:Nesting0"), ImmArray.Empty),
false,
nested,
)
.consume(lookupContract, lookupPackage, lookupKey)
Expand Down Expand Up @@ -951,6 +952,7 @@ class EngineTest(langVersion: LanguageVersion)
val res = preprocessor
.translateValue(
TTyConApp(Identifier(basicTestsPkgId, "BasicTests:MyNestedRec"), ImmArray.Empty),
false,
rec,
)
.consume(lookupContract, lookupPackage, lookupKey)
Expand All @@ -973,6 +975,7 @@ class EngineTest(langVersion: LanguageVersion)
val res = preprocessor
.translateValue(
TTyConApp(Identifier(basicTestsPkgId, "BasicTests:TypeWithParameters"), ImmArray.Empty),
false,
rec,
)
.consume(lookupContract, lookupPackage, lookupKey)
Expand All @@ -996,6 +999,7 @@ class EngineTest(langVersion: LanguageVersion)
val res = preprocessor
.translateValue(
TTyConApp(Identifier(basicTestsPkgId, "BasicTests:TypeWithParameters"), ImmArray.Empty),
false,
rec,
)
.consume(lookupContract, lookupPackage, lookupKey)
Expand All @@ -1016,6 +1020,7 @@ class EngineTest(langVersion: LanguageVersion)
val res = preprocessor
.translateValue(
TTyConApp(Identifier(basicTestsPkgId, "BasicTests:TypeWithParameters"), ImmArray.Empty),
false,
rec,
)
.consume(lookupContract, lookupPackage, lookupKey)
Expand All @@ -1038,6 +1043,7 @@ class EngineTest(langVersion: LanguageVersion)
val res = preprocessor
.translateValue(
TTyConApp(Identifier(basicTestsPkgId, "BasicTests:TypeWithParameters"), ImmArray.Empty),
false,
rec,
)
.consume(lookupContract, lookupPackage, lookupKey)
Expand All @@ -1058,6 +1064,7 @@ class EngineTest(langVersion: LanguageVersion)
val res = preprocessor
.translateValue(
TTyConApp(Identifier(basicTestsPkgId, "BasicTests:TypeWithParameters"), ImmArray.Empty),
false,
rec,
)
.consume(lookupContract, lookupPackage, lookupKey)
Expand Down
Loading
Loading