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

Pb/oh no #20096

Closed
wants to merge 7 commits into from
Closed

Pb/oh no #20096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1dff53d
test for local contract upgrade
paulbrauner-da Oct 1, 2024
8f74a24
fix fetchAny for local contracts
paulbrauner-da Oct 1, 2024
8817903
add ex and ex by key tests
paulbrauner-da Oct 2, 2024
5930a5a
add local contract tests to ExceptionsTest
paulbrauner-da Oct 2, 2024
d411980
add fetch by key test
paulbrauner-da Oct 2, 2024
27ca9be
wip
paulbrauner-da Oct 14, 2024
bf24650
should not succeed
paulbrauner-da Oct 14, 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
119 changes: 64 additions & 55 deletions sdk/daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/speedy/SBuiltin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2397,13 +2397,68 @@ private[lf] object SBuiltin {
}
}

// This is the core function which fetches a contract given it's coid.
// This is the core function which fetches a contract given its coid.
// Regardless of it being a local, disclosed or global contract
private def fetchAny(
machine: UpdateMachine,
optTargetTemplateId: Option[TypeConName],
coid: V.ContractId,
)(f: (Option[Ref.PackageName], SValue) => Control[Question.Update]): Control[Question.Update] = {

def importContract(coinst: V.ContractInstance) = {
val V.ContractInstance(_, srcTmplId, coinstArg) = coinst
val (upgradingIsEnabled, dstTmplId) = optTargetTemplateId match {
case Some(tycon) if coinst.upgradable =>
(true, tycon)
case _ =>
(false, srcTmplId) // upgrading not enabled; import at source type
}
if (srcTmplId.qualifiedName != dstTmplId.qualifiedName) {
Control.Error(
IE.WronglyTypedContract(coid, dstTmplId, srcTmplId)
)
} else
machine.ensurePackageIsLoaded(
dstTmplId.packageId,
language.Reference.Template(dstTmplId),
) { () =>
importValue(machine, dstTmplId, coinstArg) { templateArg =>
getContractInfo(
machine,
coid,
dstTmplId,
templateArg,
allowCatchingContractInfoErrors = false,
) { contract =>
ensureContractActive(machine, coid, contract.templateId) {

machine.checkContractVisibility(coid, contract)
machine.enforceLimitAddInputContract()
machine.enforceLimitSignatoriesAndObservers(coid, contract)

// In Validation mode, we always call validateContractInfo
// In Submission mode, we only call validateContractInfo when src != dest
val needValidationCall: Boolean =
if (machine.validating) {
upgradingIsEnabled
} else {
// we already check qualified names match
upgradingIsEnabled && (srcTmplId.packageId != dstTmplId.packageId)
}
if (needValidationCall) {

validateContractInfo(machine, coid, srcTmplId, contract) { () =>
f(contract.packageName, contract.any)
}
} else {
f(contract.packageName, contract.any)
}
}
}
}
}
}

machine.getLocalContract(coid) match {
case Some((templateId, templateArg)) =>
ensureContractActive(machine, coid, templateId) {
Expand All @@ -2414,63 +2469,17 @@ private[lf] object SBuiltin {
templateArg,
allowCatchingContractInfoErrors = false,
) { contract =>
f(contract.packageName, SValue.SAnyContract(templateId, templateArg))
if (optTargetTemplateId.forall(_ == templateId)) {
// If the local contract has the same package ID as the target template ID, then we don't need to
// import its value and validate its contract info again.
f(contract.packageName, SValue.SAnyContract(templateId, templateArg))
} else {
importContract(V.ContractInstance(contract.packageName, templateId, contract.arg))
}
}
}
case None =>
machine.lookupGlobalContract(coid) {
case coinst @ V.ContractInstance(_, srcTmplId, coinstArg) =>
val (upgradingIsEnabled, dstTmplId) = optTargetTemplateId match {
case Some(tycon) if coinst.upgradable =>
(true, tycon)
case _ =>
(false, srcTmplId) // upgrading not enabled; import at source type
}
if (srcTmplId.qualifiedName != dstTmplId.qualifiedName) {
Control.Error(
IE.WronglyTypedContract(coid, dstTmplId, srcTmplId)
)
} else
machine.ensurePackageIsLoaded(
dstTmplId.packageId,
language.Reference.Template(dstTmplId),
) { () =>
importValue(machine, dstTmplId, coinstArg) { templateArg =>
getContractInfo(
machine,
coid,
dstTmplId,
templateArg,
allowCatchingContractInfoErrors = false,
) { contract =>
ensureContractActive(machine, coid, contract.templateId) {

machine.checkContractVisibility(coid, contract)
machine.enforceLimitAddInputContract()
machine.enforceLimitSignatoriesAndObservers(coid, contract)

// In Validation mode, we always call validateContractInfo
// In Submission mode, we only call validateContractInfo when src != dest
val needValidationCall: Boolean =
if (machine.validating) {
upgradingIsEnabled
} else {
// we already check qualified names match
upgradingIsEnabled && (srcTmplId.packageId != dstTmplId.packageId)
}
if (needValidationCall) {

validateContractInfo(machine, coid, srcTmplId, contract) { () =>
f(contract.packageName, contract.any)
}
} else {
f(contract.packageName, contract.any)
}
}
}
}
}
}
machine.lookupGlobalContract(coid)(importContract)
}
}

Expand Down
Loading
Loading