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 <support@digitalasset.com>
digital-asset · Nov 13, 2024 · f716891 · f716891
1 parent c4a4a38
commit f716891
Show file tree

Hide file tree

Showing 14 changed files with 31 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...com/digitalasset/canton/platform/apiserver/execution/StoreBackedCommandExecutorSpec.scala b/...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/...n/src/main/scala/com/digitalasset/canton/ledger/error/groups/CommandExecutionErrors.scala b/...n/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
@@ -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
@@ -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
@@ -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
@@ -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