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

update canton to 20241213.12399.0.v362c9044/2.10.0-snapshot.20241213.12399.0.v362c9044 in main-2.x #20479

Merged
merged 1 commit into from
Dec 16, 2024
Merged

update canton to 20241213.12399.0.v362c9044/2.10.0-snapshot.20241213.12399.0.v362c9044 in main-2.x #20479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion sdk/canton/community/app/src/pack/examples/06-messaging/contact/daml.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sdk-version: 2.10.0-snapshot.20241210.13134.0.vad20cd7e
sdk-version: 2.10.0-snapshot.20241212.13139.0.vc8e37fa5
sandbox-options:
- --wall-clock-time
name: contact
Expand Down
2 changes: 1 addition & 1 deletion sdk/canton/community/app/src/pack/examples/06-messaging/message/daml.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sdk-version: 2.10.0-snapshot.20241210.13134.0.vad20cd7e
sdk-version: 2.10.0-snapshot.20241212.13139.0.vc8e37fa5
sandbox-options:
- --wall-clock-time
name: message
Expand Down
3 changes: 2 additions & 1 deletion ...nton/community/base/src/main/scala/com/digitalasset/canton/data/ViewParticipantData.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,8 @@ final case class ViewParticipantData private (
} else {
LfFetchCommand(templateId = templateId, interfaceId = interfaceId, coid = inputContractId)
}
val packageIdPreference = interfaceId.map(_ => templateId.packageId).toList.toSet
val packageIdPreference =
if (interfaceId.isDefined) Set(templateId.packageId) else Set.empty[LfPackageId]
RootAction(cmd, actors, failed = false, packageIdPreference = packageIdPreference)

case LookupByKeyActionDescription(key, _version) =>
Expand Down
2 changes: 1 addition & 1 deletion sdk/canton/community/common/src/main/daml/CantonExamples/daml.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sdk-version: 2.10.0-snapshot.20241210.13134.0.vad20cd7e
sdk-version: 2.10.0-snapshot.20241212.13139.0.vc8e37fa5
build-options:
- --target=1.14
name: CantonExamples
Expand Down
2 changes: 1 addition & 1 deletion sdk/canton/community/demo/src/main/daml/ai-analysis/daml.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sdk-version: 2.10.0-snapshot.20241210.13134.0.vad20cd7e
sdk-version: 2.10.0-snapshot.20241212.13139.0.vc8e37fa5
name: ai-analysis
source: AIAnalysis.daml
init-script: AIAnalysis:setup
Expand Down
2 changes: 1 addition & 1 deletion sdk/canton/community/demo/src/main/daml/bank/daml.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sdk-version: 2.10.0-snapshot.20241210.13134.0.vad20cd7e
sdk-version: 2.10.0-snapshot.20241212.13139.0.vc8e37fa5
name: bank
source: Bank.daml
init-script: Bank:setup
Expand Down
2 changes: 1 addition & 1 deletion sdk/canton/community/demo/src/main/daml/doctor/daml.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sdk-version: 2.10.0-snapshot.20241210.13134.0.vad20cd7e
sdk-version: 2.10.0-snapshot.20241212.13139.0.vc8e37fa5
name: doctor
source: Doctor.daml
init-script: Doctor:setup
Expand Down
2 changes: 1 addition & 1 deletion sdk/canton/community/demo/src/main/daml/health-insurance/daml.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sdk-version: 2.10.0-snapshot.20241210.13134.0.vad20cd7e
sdk-version: 2.10.0-snapshot.20241212.13139.0.vc8e37fa5
name: health-insurance
source: HealthInsurance.daml
init-script: HealthInsurance:setup
Expand Down
2 changes: 1 addition & 1 deletion sdk/canton/community/demo/src/main/daml/medical-records/daml.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sdk-version: 2.10.0-snapshot.20241210.13134.0.vad20cd7e
sdk-version: 2.10.0-snapshot.20241212.13139.0.vc8e37fa5
name: medical-records
source: MedicalRecord.daml
init-script: MedicalRecord:setup
Expand Down
2 changes: 1 addition & 1 deletion sdk/canton/community/ledger/ledger-json-api/src/test/daml/daml.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sdk-version: 2.10.0-snapshot.20241210.13134.0.vad20cd7e
sdk-version: 2.10.0-snapshot.20241212.13139.0.vc8e37fa5
build-options:
- --target=1.14
name: JsonEncodingTest
Expand Down
2 changes: 1 addition & 1 deletion sdk/canton/community/participant/src/main/daml/daml.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sdk-version: 2.10.0-snapshot.20241210.13134.0.vad20cd7e
sdk-version: 2.10.0-snapshot.20241212.13139.0.vc8e37fa5
name: AdminWorkflows
source: AdminWorkflows.daml
version: 2.10.0
Expand Down
2 changes: 1 addition & 1 deletion sdk/canton/community/participant/src/main/daml/ping-pong-vacuum/daml.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sdk-version: 2.10.0-snapshot.20241210.13134.0.vad20cd7e
sdk-version: 2.10.0-snapshot.20241212.13139.0.vc8e37fa5
build-options:
- --target=1.14
name: AdminWorkflowsWithVacuuming
Expand Down
6 changes: 3 additions & 3 deletions sdk/test-common/canton/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ if [ "{local}" = "true" ]; then
exit 0
fi

CANTON_ENTERPRISE_VERSION=2.10.0-snapshot.20241212.12393.0.v1dfea2f3
CANTON_ENTERPRISE_SHA=e07c9a1d530d98309495877113dc207da99bd228dd3ec5a5f69bf76d5efb2a22
CANTON_ENTERPRISE_URL=https://digitalasset.jfrog.io/artifactory/assembly/daml/canton-backup/2.10.0-snapshot.20241212.12393.0.v1dfea2f3/e07c9a1d530d98309495877113dc207da99bd228dd3ec5a5f69bf76d5efb2a22/canton-enterprise-2.10.0-snapshot.20241212.12393.0.v1dfea2f3.tar.gz
CANTON_ENTERPRISE_VERSION=2.10.0-snapshot.20241213.12399.0.v362c9044
CANTON_ENTERPRISE_SHA=a941ae53ddc68d5fed18a849390dd1eac13721391630ef201ff5d2efd39e0144
CANTON_ENTERPRISE_URL=https://digitalasset.jfrog.io/artifactory/assembly/daml/canton-backup/2.10.0-snapshot.20241213.12399.0.v362c9044/a941ae53ddc68d5fed18a849390dd1eac13721391630ef201ff5d2efd39e0144/canton-enterprise-2.10.0-snapshot.20241213.12399.0.v362c9044.tar.gz

url=$$CANTON_ENTERPRISE_URL

Expand Down