From f716891be54129a02d4095d81bb3bf1c5f9396e2 Mon Sep 17 00:00:00 2001 From: "azure-pipelines[bot]" <36771401+azure-pipelines[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2024 11:19:50 +0000 Subject: [PATCH] update canton to 20241112.12333.0.v11bdc29a/2.10.0-snapshot.20241112.12333.0.v11bdc29a in main-2.x (#20292) tell-slack: canton Co-authored-by: Azure Pipelines Daml Build --- .../examples/06-messaging/contact/daml.yaml | 2 +- .../examples/06-messaging/message/daml.yaml | 2 +- .../src/main/daml/CantonExamples/daml.yaml | 2 +- .../demo/src/main/daml/ai-analysis/daml.yaml | 2 +- .../demo/src/main/daml/bank/daml.yaml | 2 +- .../demo/src/main/daml/doctor/daml.yaml | 2 +- .../src/main/daml/health-insurance/daml.yaml | 2 +- .../src/main/daml/medical-records/daml.yaml | 2 +- .../StoreBackedCommandExecutorSpec.scala | 4 +-- .../error/groups/CommandExecutionErrors.scala | 27 ++++++++++--------- .../ledger-json-api/src/test/daml/daml.yaml | 2 +- .../participant/src/main/daml/daml.yaml | 2 +- .../src/main/daml/ping-pong-vacuum/daml.yaml | 2 +- sdk/test-common/canton/BUILD.bazel | 6 ++--- 14 files changed, 31 insertions(+), 28 deletions(-) diff --git a/sdk/canton/community/app/src/pack/examples/06-messaging/contact/daml.yaml b/sdk/canton/community/app/src/pack/examples/06-messaging/contact/daml.yaml index 77ef0667164a..5051c391b48c 100644 --- a/sdk/canton/community/app/src/pack/examples/06-messaging/contact/daml.yaml +++ b/sdk/canton/community/app/src/pack/examples/06-messaging/contact/daml.yaml @@ -1,4 +1,4 @@ -sdk-version: 2.10.0-snapshot.20241101.13047.0.v1e6d5c93 +sdk-version: 2.10.0-snapshot.20241108.13063.0.v98eb7dfe sandbox-options: - --wall-clock-time name: contact diff --git a/sdk/canton/community/app/src/pack/examples/06-messaging/message/daml.yaml b/sdk/canton/community/app/src/pack/examples/06-messaging/message/daml.yaml index 9e97cc2e2c38..36f759081a11 100644 --- a/sdk/canton/community/app/src/pack/examples/06-messaging/message/daml.yaml +++ b/sdk/canton/community/app/src/pack/examples/06-messaging/message/daml.yaml @@ -1,4 +1,4 @@ -sdk-version: 2.10.0-snapshot.20241101.13047.0.v1e6d5c93 +sdk-version: 2.10.0-snapshot.20241108.13063.0.v98eb7dfe sandbox-options: - --wall-clock-time name: message diff --git a/sdk/canton/community/common/src/main/daml/CantonExamples/daml.yaml b/sdk/canton/community/common/src/main/daml/CantonExamples/daml.yaml index 6c05a1bda059..fc4d6ba2a43b 100644 --- a/sdk/canton/community/common/src/main/daml/CantonExamples/daml.yaml +++ b/sdk/canton/community/common/src/main/daml/CantonExamples/daml.yaml @@ -1,4 +1,4 @@ -sdk-version: 2.10.0-snapshot.20241101.13047.0.v1e6d5c93 +sdk-version: 2.10.0-snapshot.20241108.13063.0.v98eb7dfe build-options: - --target=1.14 name: CantonExamples diff --git a/sdk/canton/community/demo/src/main/daml/ai-analysis/daml.yaml b/sdk/canton/community/demo/src/main/daml/ai-analysis/daml.yaml index dc18494d2558..8765cc4eb297 100644 --- a/sdk/canton/community/demo/src/main/daml/ai-analysis/daml.yaml +++ b/sdk/canton/community/demo/src/main/daml/ai-analysis/daml.yaml @@ -1,4 +1,4 @@ -sdk-version: 2.10.0-snapshot.20241101.13047.0.v1e6d5c93 +sdk-version: 2.10.0-snapshot.20241108.13063.0.v98eb7dfe name: ai-analysis source: AIAnalysis.daml init-script: AIAnalysis:setup diff --git a/sdk/canton/community/demo/src/main/daml/bank/daml.yaml b/sdk/canton/community/demo/src/main/daml/bank/daml.yaml index 1fcbc041187c..f6227f41ac4b 100644 --- a/sdk/canton/community/demo/src/main/daml/bank/daml.yaml +++ b/sdk/canton/community/demo/src/main/daml/bank/daml.yaml @@ -1,4 +1,4 @@ -sdk-version: 2.10.0-snapshot.20241101.13047.0.v1e6d5c93 +sdk-version: 2.10.0-snapshot.20241108.13063.0.v98eb7dfe name: bank source: Bank.daml init-script: Bank:setup diff --git a/sdk/canton/community/demo/src/main/daml/doctor/daml.yaml b/sdk/canton/community/demo/src/main/daml/doctor/daml.yaml index a88eddc24d60..0e20ca02992a 100644 --- a/sdk/canton/community/demo/src/main/daml/doctor/daml.yaml +++ b/sdk/canton/community/demo/src/main/daml/doctor/daml.yaml @@ -1,4 +1,4 @@ -sdk-version: 2.10.0-snapshot.20241101.13047.0.v1e6d5c93 +sdk-version: 2.10.0-snapshot.20241108.13063.0.v98eb7dfe name: doctor source: Doctor.daml init-script: Doctor:setup diff --git a/sdk/canton/community/demo/src/main/daml/health-insurance/daml.yaml b/sdk/canton/community/demo/src/main/daml/health-insurance/daml.yaml index fa62cf1ffb27..42f9c91df8e8 100644 --- a/sdk/canton/community/demo/src/main/daml/health-insurance/daml.yaml +++ b/sdk/canton/community/demo/src/main/daml/health-insurance/daml.yaml @@ -1,4 +1,4 @@ -sdk-version: 2.10.0-snapshot.20241101.13047.0.v1e6d5c93 +sdk-version: 2.10.0-snapshot.20241108.13063.0.v98eb7dfe name: health-insurance source: HealthInsurance.daml init-script: HealthInsurance:setup diff --git a/sdk/canton/community/demo/src/main/daml/medical-records/daml.yaml b/sdk/canton/community/demo/src/main/daml/medical-records/daml.yaml index 8e3b00d62da5..e56a6157ea28 100644 --- a/sdk/canton/community/demo/src/main/daml/medical-records/daml.yaml +++ b/sdk/canton/community/demo/src/main/daml/medical-records/daml.yaml @@ -1,4 +1,4 @@ -sdk-version: 2.10.0-snapshot.20241101.13047.0.v1e6d5c93 +sdk-version: 2.10.0-snapshot.20241108.13063.0.v98eb7dfe name: medical-records source: MedicalRecord.daml init-script: MedicalRecord:setup diff --git a/sdk/canton/community/ledger/ledger-api-core/src/test/scala/com/digitalasset/canton/platform/apiserver/execution/StoreBackedCommandExecutorSpec.scala b/sdk/canton/community/ledger/ledger-api-core/src/test/scala/com/digitalasset/canton/platform/apiserver/execution/StoreBackedCommandExecutorSpec.scala index 6c843ea86ed1..b3b05a34da50 100644 --- a/sdk/canton/community/ledger/ledger-api-core/src/test/scala/com/digitalasset/canton/platform/apiserver/execution/StoreBackedCommandExecutorSpec.scala +++ b/sdk/canton/community/ledger/ledger-api-core/src/test/scala/com/digitalasset/canton/platform/apiserver/execution/StoreBackedCommandExecutorSpec.scala @@ -437,7 +437,7 @@ class StoreBackedCommandExecutorSpec "disallow unauthorized disclosed contracts" in { val expected = - s"Upgrading contract with $disclosedContractId failed authentication check with error: Not authorized. The following upgrading checks failed: ['signatories mismatch: Set(unexpectedSig) vs Set(signatory)', 'observers mismatch: Set(unexpectedObs) vs Set(observer)', 'key maintainers mismatch: Set(unexpectedSig) vs Set(signatory)', 'key value mismatch: Some(GlobalKey(p:m:n, ValueBool(true))) vs Some(GlobalKey(p:m:n, ValueRecord(None,ImmArray((None,ValueParty(signatory)),(None,ValueText(some key))))))']" + s"Upgrading contract with $disclosedContractId failed authentication check with error: Not authorized. The following upgrading checks failed: ['signatories mismatch: Set(unexpectedSig) vs Set(signatory)', 'observers mismatch: Set(unexpectedObs) vs Set(observer)', 'key maintainers mismatch: Set(unexpectedSig) vs Set(signatory)', 'key value mismatch: Some(GlobalKey($pvPackageName, p:m:n, ValueBool(true))) vs Some(GlobalKey($pvPackageName, p:m:n, ValueRecord(None,ImmArray((None,ValueParty(signatory)),(None,ValueText(some key))))))']" doTest( Some(disclosedContractId), Some(Some(expected)), @@ -448,7 +448,7 @@ class StoreBackedCommandExecutorSpec "disallow unauthorized stakeholder contracts" in { val errorMessage = "Not authorized" val expected = - s"Upgrading contract with $stakeholderContractId failed authentication check with error: Not authorized. The following upgrading checks failed: ['signatories mismatch: Set(unexpectedSig) vs Set(signatory)', 'observers mismatch: Set() vs Set(observer)', 'key maintainers mismatch: Set() vs Set(signatory)', 'key value mismatch: None vs Some(GlobalKey(p:m:n, ValueRecord(None,ImmArray((None,ValueParty(signatory)),(None,ValueText(some key))))))']" + s"Upgrading contract with $stakeholderContractId failed authentication check with error: Not authorized. The following upgrading checks failed: ['signatories mismatch: Set(unexpectedSig) vs Set(signatory)', 'observers mismatch: Set() vs Set(observer)', 'key maintainers mismatch: Set() vs Set(signatory)', 'key value mismatch: None vs Some(GlobalKey($pvPackageName, p:m:n, ValueRecord(None,ImmArray((None,ValueParty(signatory)),(None,ValueText(some key))))))']" doTest( Some(stakeholderContractId), Some(Some(expected)), diff --git a/sdk/canton/community/ledger/ledger-common/src/main/scala/com/digitalasset/canton/ledger/error/groups/CommandExecutionErrors.scala b/sdk/canton/community/ledger/ledger-common/src/main/scala/com/digitalasset/canton/ledger/error/groups/CommandExecutionErrors.scala index c520f016d6e8..e25fc3719d37 100644 --- a/sdk/canton/community/ledger/ledger-common/src/main/scala/com/digitalasset/canton/ledger/error/groups/CommandExecutionErrors.scala +++ b/sdk/canton/community/ledger/ledger-common/src/main/scala/com/digitalasset/canton/ledger/error/groups/CommandExecutionErrors.scala @@ -651,19 +651,22 @@ object CommandExecutionErrors extends CommandExecutionErrorGroup { // TODO https://github.com/digital-asset/daml/issues/18616: use a non-Dev based error code @Explanation("Upgrade validation fails when trying to upgrade the contract") - @Resolution("Verify that neither the signatories, nor the observers, nor the contract key, nor the key's maintainers have changed") - object UpgradeError extends ErrorCode( - id = "INTERPRETATION_UPGRADE_ERROR", - ErrorCategory.InvalidGivenCurrentSystemStateOther, - ) { + @Resolution( + "Verify that neither the signatories, nor the observers, nor the contract key, nor the key's maintainers have changed" + ) + object UpgradeError + extends ErrorCode( + id = "INTERPRETATION_UPGRADE_ERROR", + ErrorCategory.InvalidGivenCurrentSystemStateOther, + ) { final case class Reject( - override val cause: String, - err: LfInterpretationError.Upgrade.Error, - )(implicit - loggingContext: ContextualizedErrorLogger - ) extends DamlErrorWithDefiniteAnswer( - cause = cause - ) { + override val cause: String, + err: LfInterpretationError.Upgrade.Error, + )(implicit + loggingContext: ContextualizedErrorLogger + ) extends DamlErrorWithDefiniteAnswer( + cause = cause + ) { override def resources: Seq[(ErrorResource, String)] = Seq( diff --git a/sdk/canton/community/ledger/ledger-json-api/src/test/daml/daml.yaml b/sdk/canton/community/ledger/ledger-json-api/src/test/daml/daml.yaml index b6c54e34ecdd..2af76133ca52 100644 --- a/sdk/canton/community/ledger/ledger-json-api/src/test/daml/daml.yaml +++ b/sdk/canton/community/ledger/ledger-json-api/src/test/daml/daml.yaml @@ -1,4 +1,4 @@ -sdk-version: 2.10.0-snapshot.20241101.13047.0.v1e6d5c93 +sdk-version: 2.10.0-snapshot.20241108.13063.0.v98eb7dfe build-options: - --target=1.14 name: JsonEncodingTest diff --git a/sdk/canton/community/participant/src/main/daml/daml.yaml b/sdk/canton/community/participant/src/main/daml/daml.yaml index de88238925dc..b483998b5906 100644 --- a/sdk/canton/community/participant/src/main/daml/daml.yaml +++ b/sdk/canton/community/participant/src/main/daml/daml.yaml @@ -1,4 +1,4 @@ -sdk-version: 2.10.0-snapshot.20241101.13047.0.v1e6d5c93 +sdk-version: 2.10.0-snapshot.20241108.13063.0.v98eb7dfe name: AdminWorkflows source: AdminWorkflows.daml version: 2.10.0 diff --git a/sdk/canton/community/participant/src/main/daml/ping-pong-vacuum/daml.yaml b/sdk/canton/community/participant/src/main/daml/ping-pong-vacuum/daml.yaml index 8188f61e08fa..bcd014874130 100644 --- a/sdk/canton/community/participant/src/main/daml/ping-pong-vacuum/daml.yaml +++ b/sdk/canton/community/participant/src/main/daml/ping-pong-vacuum/daml.yaml @@ -1,4 +1,4 @@ -sdk-version: 2.10.0-snapshot.20241101.13047.0.v1e6d5c93 +sdk-version: 2.10.0-snapshot.20241108.13063.0.v98eb7dfe build-options: - --target=1.14 name: AdminWorkflowsWithVacuuming diff --git a/sdk/test-common/canton/BUILD.bazel b/sdk/test-common/canton/BUILD.bazel index 1b6d9ca23d4e..d5823f52c8e4 100644 --- a/sdk/test-common/canton/BUILD.bazel +++ b/sdk/test-common/canton/BUILD.bazel @@ -24,9 +24,9 @@ if [ "{local}" = "true" ]; then exit 0 fi -CANTON_ENTERPRISE_VERSION=2.10.0-snapshot.20241108.12332.0.v1b37d87e -CANTON_ENTERPRISE_SHA=361ee176e9c6ccb2258040c1ad934315189491ec3f4d16cdf9e2d671744add3f -CANTON_ENTERPRISE_URL=https://digitalasset.jfrog.io/artifactory/assembly/daml/canton-backup/2.10.0-snapshot.20241108.12332.0.v1b37d87e/361ee176e9c6ccb2258040c1ad934315189491ec3f4d16cdf9e2d671744add3f/canton-enterprise-2.10.0-snapshot.20241108.12332.0.v1b37d87e.tar.gz +CANTON_ENTERPRISE_VERSION=2.10.0-snapshot.20241112.12333.0.v11bdc29a +CANTON_ENTERPRISE_SHA=3fcc5ce0aa9607ac92268900b539798272f214536addba2cdd445de57f82fb85 +CANTON_ENTERPRISE_URL=https://digitalasset.jfrog.io/artifactory/assembly/daml/canton-backup/2.10.0-snapshot.20241112.12333.0.v11bdc29a/3fcc5ce0aa9607ac92268900b539798272f214536addba2cdd445de57f82fb85/canton-enterprise-2.10.0-snapshot.20241112.12333.0.v11bdc29a.tar.gz url=$$CANTON_ENTERPRISE_URL