Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.10.3-SNAPSHOT
2.10.4-SNAPSHOT
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sdk-version: 2.10.3-snapshot.20251208.13193.0.v87a05e21
sdk-version: 2.10.3
sandbox-options:
- --wall-clock-time
name: contact
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sdk-version: 2.10.3-snapshot.20251208.13193.0.v87a05e21
sdk-version: 2.10.3
sandbox-options:
- --wall-clock-time
name: message
Expand Down
4 changes: 2 additions & 2 deletions community/common/src/main/daml/CantonExamples/daml.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
sdk-version: 2.10.3-snapshot.20251208.13193.0.v87a05e21
sdk-version: 2.10.3
build-options:
- --target=1.14
name: CantonExamples
source: .
version: 2.10.3
version: 2.10.4
dependencies:
- daml-prim
- daml-stdlib
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
sdk-version: 2.10.3-snapshot.20251208.13193.0.v87a05e21
sdk-version: 2.10.3
build-options:
- --target=1.14
name: CantonExamplesDependency
data-dependencies:
- ../../../target/scala-2.13/resource_managed/main/CantonExamples.dar
source: .
version: 2.10.3
version: 2.10.4
dependencies:
- daml-prim
- daml-stdlib
Expand Down
4 changes: 2 additions & 2 deletions community/demo/src/main/daml/ai-analysis/daml.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
sdk-version: 2.10.3-snapshot.20251208.13193.0.v87a05e21
sdk-version: 2.10.3
name: ai-analysis
source: AIAnalysis.daml
init-script: AIAnalysis:setup
version: 2.10.3
version: 2.10.4
dependencies:
- daml-prim
- daml-stdlib
Expand Down
4 changes: 2 additions & 2 deletions community/demo/src/main/daml/bank/daml.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
sdk-version: 2.10.3-snapshot.20251208.13193.0.v87a05e21
sdk-version: 2.10.3
name: bank
source: Bank.daml
init-script: Bank:setup
version: 2.10.3
version: 2.10.4
dependencies:
- daml-prim
- daml-stdlib
Expand Down
4 changes: 2 additions & 2 deletions community/demo/src/main/daml/doctor/daml.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
sdk-version: 2.10.3-snapshot.20251208.13193.0.v87a05e21
sdk-version: 2.10.3
name: doctor
source: Doctor.daml
init-script: Doctor:setup
version: 2.10.3
version: 2.10.4
dependencies:
- daml-prim
- daml-stdlib
Expand Down
4 changes: 2 additions & 2 deletions community/demo/src/main/daml/health-insurance/daml.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
sdk-version: 2.10.3-snapshot.20251208.13193.0.v87a05e21
sdk-version: 2.10.3
name: health-insurance
source: HealthInsurance.daml
init-script: HealthInsurance:setup
version: 2.10.3
version: 2.10.4
dependencies:
- daml-prim
- daml-stdlib
Expand Down
4 changes: 2 additions & 2 deletions community/demo/src/main/daml/medical-records/daml.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
sdk-version: 2.10.3-snapshot.20251208.13193.0.v87a05e21
sdk-version: 2.10.3
name: medical-records
source: MedicalRecord.daml
init-script: MedicalRecord:setup
version: 2.10.3
version: 2.10.4
dependencies:
- daml-prim
- daml-stdlib
Expand Down
4 changes: 2 additions & 2 deletions community/ledger/ledger-json-api/src/test/daml/daml.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
sdk-version: 2.10.3-snapshot.20251208.13193.0.v87a05e21
sdk-version: 2.10.3
build-options:
- --target=1.14
name: JsonEncodingTest
source: JsonEncodingTest.daml
version: 2.10.3
version: 2.10.4
dependencies:
- daml-prim
- daml-stdlib
Expand Down
4 changes: 2 additions & 2 deletions community/participant/src/main/daml/daml.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
sdk-version: 2.10.3-snapshot.20251208.13193.0.v87a05e21
sdk-version: 2.10.3
name: AdminWorkflows
source: AdminWorkflows.daml
version: 2.10.3
version: 2.10.4
dependencies:
- daml-prim
- daml-stdlib
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
sdk-version: 2.10.3-snapshot.20251208.13193.0.v87a05e21
sdk-version: 2.10.3
build-options:
- --target=1.14
name: AdminWorkflowsWithVacuuming
data-dependencies:
- ../../../src/main/resources/dar/AdminWorkflows.dar
source: PingPongVacuum.daml
version: 2.10.3
version: 2.10.4
dependencies:
- daml-prim
- daml-stdlib
Expand Down
2 changes: 1 addition & 1 deletion daml
Submodule daml updated 30 files
+1 −1 sdk/bazel-java-deps.bzl
+1 −1 sdk/canton/VERSION
+1 −1 sdk/canton/community/app/src/pack/examples/06-messaging/contact/daml.yaml
+1 −1 sdk/canton/community/app/src/pack/examples/06-messaging/message/daml.yaml
+12 −9 sdk/canton/community/base/src/main/scala/com/digitalasset/canton/crypto/provider/jce/JcePureCrypto.scala
+14 −9 sdk/canton/community/base/src/main/scala/com/digitalasset/canton/crypto/provider/tink/TinkJavaConverter.scala
+8 −4 ...ommunity/base/src/main/scala/com/digitalasset/canton/sequencing/client/ResilientSequencerSubscription.scala
+2 −2 sdk/canton/community/common/src/main/daml/CantonExamples/daml.yaml
+2 −2 sdk/canton/community/common/src/main/daml/CantonExamplesDependency/daml.yaml
+22 −12 ...canton/community/common/src/main/scala/com/digitalasset/canton/crypto/provider/tink/TinkPrivateCrypto.scala
+4 −2 sdk/canton/community/common/src/main/scala/com/digitalasset/canton/crypto/provider/tink/TinkPureCrypto.scala
+2 −0 sdk/canton/community/common/src/main/scala/com/digitalasset/canton/environment/CantonNodeBootstrap.scala
+2 −0 sdk/canton/community/common/src/main/scala/com/digitalasset/canton/health/GrpcHealthServer.scala
+2 −2 sdk/canton/community/demo/src/main/daml/ai-analysis/daml.yaml
+2 −2 sdk/canton/community/demo/src/main/daml/bank/daml.yaml
+2 −2 sdk/canton/community/demo/src/main/daml/doctor/daml.yaml
+2 −2 sdk/canton/community/demo/src/main/daml/health-insurance/daml.yaml
+2 −2 sdk/canton/community/demo/src/main/daml/medical-records/daml.yaml
+5 −2 ...unity/domain/src/main/scala/com/digitalasset/canton/domain/sequencing/service/GrpcManagedSubscription.scala
+8 −1 sdk/canton/community/domain/src/main/scala/com/digitalasset/canton/domain/server/DynamicDomainGrpcServer.scala
+2 −0 ...ommunity/ledger/ledger-api-core/src/main/scala/com/digitalasset/canton/platform/apiserver/ApiServices.scala
+2 −0 ...re/src/test/scala/com/digitalasset/canton/platform/apiserver/ratelimiting/RateLimitingInterceptorSpec.scala
+2 −2 sdk/canton/community/ledger/ledger-json-api/src/test/daml/daml.yaml
+2 −2 sdk/canton/community/participant/src/main/daml/daml.yaml
+2 −2 sdk/canton/community/participant/src/main/daml/ping-pong-vacuum/daml.yaml
+30 −10 ...community/participant/src/main/scala/com/digitalasset/canton/participant/domain/DomainRegistryHelpers.scala
+2 −2 ...community/participant/src/main/scala/com/digitalasset/canton/participant/protocol/Phase37Synchronizer.scala
+1 −0 ...n/community/participant/src/main/scala/com/digitalasset/canton/participant/protocol/ProtocolProcessor.scala
+1 −1 sdk/canton/ref
+96 −94 sdk/maven_install_2.13.json
4 changes: 3 additions & 1 deletion project/BuildCommon.scala
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,8 @@ object BuildCommon {
case "META-INF/versions/9/module-info.class" => MergeStrategy.discard
case path if path.contains("module-info.class") => MergeStrategy.discard
case PathList("org", "jline", _ @_*) => MergeStrategy.first
case "META-INF/FastDoubleParser-LICENSE" => MergeStrategy.first
case PathList("META-INF", "FastDoubleParser-LICENSE") => MergeStrategy.first
case PathList("META-INF", "FastDoubleParser-NOTICE") => MergeStrategy.first
case x => oldStrategy(x)
}

Expand Down Expand Up @@ -1250,6 +1251,7 @@ object BuildCommon {
postgres,
h2,
flyway,
flyway_oracle,
oracle,
anorm,
scalapb_runtime_grpc,
Expand Down
6 changes: 4 additions & 2 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,11 @@ object Dependencies {
lazy val checkerFramework_version = "3.28.0"
lazy val chimney_version = "0.6.1"
lazy val circe_version = "0.14.2"
lazy val circe_yaml_version = "1.15.0" // added to override snakeYaml vulnerability
lazy val concurrency_limits_version = "0.3.6"
lazy val dropwizard_version = "4.2.25"
lazy val fabric_sdk_version = "2.2.13"
lazy val flyway_version = "9.15.2"
lazy val flyway_version = "9.22.3"
lazy val gcp_kms_version = "2.55.0"
lazy val h2_version = "2.1.210"
lazy val janino_version = "3.1.4"
Expand Down Expand Up @@ -118,6 +119,7 @@ object Dependencies {
lazy val h2 = "com.h2database" % "h2" % h2_version
lazy val postgres = "org.postgresql" % "postgresql" % postgres_version
lazy val flyway = "org.flywaydb" % "flyway-core" % flyway_version
lazy val flyway_oracle = "org.flywaydb" % "flyway-database-oracle" % flyway_version
lazy val oracle = "com.oracle.database.jdbc" % "ojdbc8" % oracle_version

// Picked up automatically by the scalapb compiler. Contains common dependencies such as protocol buffers like google/protobuf/timestamp.proto
Expand Down Expand Up @@ -217,7 +219,7 @@ object Dependencies {
lazy val circe_generic_extras =
"io.circe" %% "circe-generic-extras" % circe_version exclude ("com.chuusai", s"shapeless_$scala_version_short")
lazy val circe_parser = "io.circe" %% "circe-parser" % circe_version
lazy val circe_yaml = "io.circe" %% "circe-yaml" % circe_version
lazy val circe_yaml = "io.circe" %% "circe-yaml" % circe_yaml_version

lazy val tink = "com.google.crypto.tink" % "tink" % tink_version excludeAll (
ExclusionRule(
Expand Down
2 changes: 1 addition & 1 deletion project/project/DamlVersions.scala
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ object DamlVersions {
/** The version of the daml compiler (and in most cases of the daml libraries as well).
*/
// after changing version, run `sbt updateDamlProjectVersions` to update the `daml.yaml` project files.
val version: String = "2.10.3-snapshot.20251208.13193.0.v87a05e21"
val version: String = "2.10.3"

/** Custom Daml artifacts override version.
*/
Expand Down
2 changes: 1 addition & 1 deletion version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ThisBuild / version := "2.10.3-SNAPSHOT"
ThisBuild / version := "2.10.4-SNAPSHOT"