update canton to 20241010.12284.0.vb1ef62ff/2.10.0-snapshot.20241010.…

…12284.0.vb1ef62ff in main-2.x (#20085) * update canton to 20241010.12284.0.vb1ef62ff/2.10.0-snapshot.20241010.12284.0.vb1ef62ff in main-2.x tell-slack: canton * reapply canton change from (#20069) --------- Co-authored-by: Azure Pipelines Daml Build <[email protected]> Co-authored-by: Remy <[email protected]>
digital-asset · Oct 11, 2024 · fda4285 · fda4285
1 parent b79a1d3
commit fda4285
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 14 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.20241008.12998.0.v085a1a73
+sdk-version: 2.10.0-snapshot.20241009.13001.0.v44d905ca
 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.20241008.12998.0.v085a1a73
+sdk-version: 2.10.0-snapshot.20241009.13001.0.v44d905ca
 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.20241008.12998.0.v085a1a73
+sdk-version: 2.10.0-snapshot.20241009.13001.0.v44d905ca
 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.20241008.12998.0.v085a1a73
+sdk-version: 2.10.0-snapshot.20241009.13001.0.v44d905ca
 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.20241008.12998.0.v085a1a73
+sdk-version: 2.10.0-snapshot.20241009.13001.0.v44d905ca
 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.20241008.12998.0.v085a1a73
+sdk-version: 2.10.0-snapshot.20241009.13001.0.v44d905ca
 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.20241008.12998.0.v085a1a73
+sdk-version: 2.10.0-snapshot.20241009.13001.0.v44d905ca
 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.20241008.12998.0.v085a1a73
+sdk-version: 2.10.0-snapshot.20241009.13001.0.v44d905ca
 name: medical-records
 source: MedicalRecord.daml
 init-script: MedicalRecord:setup

diff --git a/sdk/canton/community/ledger-api/docs/rst_mmd.tmpl b/sdk/canton/community/ledger-api/docs/rst_mmd.tmpl
@@ -36,7 +36,11 @@ Message has no fields.
 {{else -}}
 {{range $message.Fields}}{{$field := . -}}
 
+{{if $field.IsOneof -}}
+.. _{{$message.FullName}}.{{$field.OneofDecl}}.{{$field.Name}}:
+{{- else -}}
 .. _{{$message.FullName}}.{{$field.Name}}:
+{{- end}}
 
 ``{{if $field.IsOneof -}}oneof {{$field.OneofDecl}}.{{end -}}
 {{$field.Name}}`` : :ref:`{{$field.LongType}} <{{$field.FullType}}>`

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.20241008.12998.0.v085a1a73
+sdk-version: 2.10.0-snapshot.20241009.13001.0.v44d905ca
 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.20241008.12998.0.v085a1a73
+sdk-version: 2.10.0-snapshot.20241009.13001.0.v44d905ca
 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.20241008.12998.0.v085a1a73
+sdk-version: 2.10.0-snapshot.20241009.13001.0.v44d905ca
 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.20241009.12280.0.vea0cd639
-CANTON_ENTERPRISE_SHA=941b44e366c084c25d544561faa854c9ed3f103afa62121daadc9b7da0eab314
-CANTON_ENTERPRISE_URL=https://digitalasset.jfrog.io/artifactory/assembly/daml/canton-backup/2.10.0-snapshot.20241009.12280.0.vea0cd639/941b44e366c084c25d544561faa854c9ed3f103afa62121daadc9b7da0eab314/canton-enterprise-2.10.0-snapshot.20241009.12280.0.vea0cd639.tar.gz
+CANTON_ENTERPRISE_VERSION=2.10.0-snapshot.20241010.12284.0.vb1ef62ff
+CANTON_ENTERPRISE_SHA=72129398016fe988d2738b7b16e8f587a31b1eda1531f9c0ca79d918c692b0fb
+CANTON_ENTERPRISE_URL=https://digitalasset.jfrog.io/artifactory/assembly/daml/canton-backup/2.10.0-snapshot.20241010.12284.0.vb1ef62ff/72129398016fe988d2738b7b16e8f587a31b1eda1531f9c0ca79d918c692b0fb/canton-enterprise-2.10.0-snapshot.20241010.12284.0.vb1ef62ff.tar.gz
 
 url=$$CANTON_ENTERPRISE_URL