update canton to dc96c4ab (#20604)

* sync the code drop to canton dc96c4aba3ca2cb14bd3ca480cfe638646464486

* fix fmt.sh

* fix pre-commit config

* fix canton/BUILD.bazel

Author: paulbrauner-da

Diff for: ci/copy-canton.sh

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+# Copyright (c) 2024 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+set -euo pipefail
+
+DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+
+if [ "$#" -ne 1 ]; then
+  echo "Usage: $0 <canton_directory>"
+  exit 1
+else
+  canton_dir=$1
+fi
+
+code_drop_dir=$DIR/../sdk/canton
+for path in community daml-common-staging README.md; do
+  rm -rf $code_drop_dir/$path
+  for f in  $(git -C "$canton_dir" ls-files $path); do
+    # we're only interested in copying files, not directories, as git-ls has
+    # explicitly expanded all directories
+    if [[ -f $canton_dir/$f ]]; then
+      # we create the parent directories of f under canton/ if they don't exist
+      mkdir -p $code_drop_dir/$(dirname $f)
+      cp $canton_dir/$f $code_drop_dir/$f
+    fi
+  done
+  git add $code_drop_dir/$path
+done

Diff for: sdk/.pre-commit-config.yaml

@@ -4,21 +4,21 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 
-exclude: '^canton/'
+exclude: '^sdk/canton/'
 repos:
 - repo: local
   hooks:
     - id: hlint
       name: hlint
       language: system
-      entry: "hlint -j"
+      entry: "hlint -j --hint=sdk/.hlint.yaml"
       require_serial: true
       types: [haskell]
     - id: scalafmt
       name: scalafmt
       language: system
       require_serial: true
-      entry: "scalafmt -c sdk/.scalafmt.conf --respect-project-filters"
+      entry: "scalafmt --config=sdk/.scalafmt.conf --respect-project-filters"
       types: [scala]
     - id: javafmt
       name: javafmt
@@ -30,19 +30,19 @@ repos:
       name: buildifier
       language: system
       require_serial: true
-      entry: "bazel run //:buildifier-pre-commit -- -mode=fix -v=true"
+      entry: "bash -c 'cd sdk/; bazel run //:buildifier-pre-commit -- -mode=fix -v=true'"
       types: [bazel]
     - id: pprettier
       name: pprettier
       language: system
       require_serial: true
       # NB: we need to pass a single argument which ends up in $0 when invoking bash -c
-      entry: "bash -c 'yarn install --silent && yarn run pprettier --write \"$@\"' bash"
+      entry: "bash -c 'yarn install --silent && files=(\"$@\") && yarn run --cwd=sdk pprettier --write ${files[@]##sdk/}' bash"
       types_or: [ts, tsx]
     - id: copyrights
       name: copyright headers
       description: Idempotently add DA copyright headers to source files.
       language: system
       pass_filenames: false
-      entry: "dade-copyright-headers update"
+      entry: "bash -c 'unset GIT_DIR; dade-copyright-headers update'"
       types: [text]

Diff for: sdk/canton/BUILD.bazel

@@ -267,12 +267,12 @@ scala_library(
     ],
 )
 
-### community/common ###
+### community/base ###
 
 proto_library(
-    name = "community_common_proto",
-    srcs = glob(["community/common/src/main/protobuf/**/*.proto"]),
-    strip_import_prefix = "community/common/src/main/protobuf",
+    name = "community_base_proto",
+    srcs = glob(["community/base/src/main/protobuf/**/*.proto"]),
+    strip_import_prefix = "community/base/src/main/protobuf",
     deps = [
         "@com_google_protobuf//:duration_proto",
         "@com_google_protobuf//:empty_proto",
@@ -284,8 +284,8 @@ proto_library(
 )
 
 proto_gen(
-    name = "community_common_proto_scala",
-    srcs = [":community_common_proto"],
+    name = "community_base_proto_scala",
+    srcs = [":community_base_proto"],
     plugin_exec = "//scala-protoc-plugins/scalapb:protoc-gen-scalapb",
     plugin_name = "scalapb",
     plugin_options = [
@@ -295,11 +295,11 @@ proto_gen(
 )
 
 scala_library(
-    name = "community_common",
-    srcs = glob(["community/common/src/main/scala/**/*.scala"]) + [":community_common_proto_scala"],
+    name = "community_base",
+    srcs = glob(["community/base/src/main/scala/**/*.scala"]) + [":community_base_proto_scala"],
     plugins = [kind_projector_plugin],
-    resource_strip_prefix = "canton/community/common/src/main/resources",
-    resources = glob(["community/common/src/main/resources/**"]),
+    resource_strip_prefix = "/canton/community/base/src/main/resources",
+    resources = glob(["community/base/src/main/resources/**"]),
     scalacopts = [
         "-Xsource:3",
         "-language:postfixOps",
@@ -313,16 +313,12 @@ scala_library(
         ":pekko-stream-minus-patched-classes",
         "//canton:community_buildinfo",
         "//canton:community_ledger_ledger-common",
-        "//canton:community_lib_Blake2b",
         "//canton:community_lib_slick_slick-fork",
         "//canton:community_lib_wartremover",
         "//canton:community_util-external",
         "//canton:community_util-logging",
         "//canton:daml-common-staging_daml-errors",
-        "//daml-lf/archive:daml_lf_archive_reader",
         "//daml-lf/data",
-        "//daml-lf/interpreter",
-        "//daml-lf/language",
         "//daml-lf/transaction",
         "//daml-lf/transaction:transaction_proto_java",
         "//daml-lf/transaction:value_proto_java",
@@ -341,7 +337,6 @@ scala_library(
         "//libs-scala/rs-grpc-pekko",
         "//libs-scala/scala-utils",
         "//observability/metrics",
-        "//observability/tracing",
         "@canton_maven//:org_flywaydb_flyway_core",
         "@maven//:ch_qos_logback_logback_classic",
         "@maven//:ch_qos_logback_logback_core",
@@ -350,7 +345,6 @@ scala_library(
         "@maven//:com_github_blemale_scaffeine_2_13",
         "@maven//:com_github_pathikrit_better_files_2_13",
         "@maven//:com_github_pureconfig_pureconfig_core_2_13",
-        "@maven//:com_github_pureconfig_pureconfig_generic_2_13",
         "@maven//:com_google_crypto_tink_tink",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
@@ -378,15 +372,91 @@ scala_library(
         "@maven//:io_opentelemetry_opentelemetry_api",
         "@maven//:io_opentelemetry_opentelemetry_context",
         "@maven//:io_scalaland_chimney_2_13",
-        "@maven//:junit_junit",
-        "@maven//:net_logstash_logback_logstash_logback_encoder",
-        "@maven//:org_apache_logging_log4j_log4j_core",
         "@maven//:org_apache_pekko_pekko_actor_2_13",
         "@maven//:org_bouncycastle_bcpkix_jdk15on",
         "@maven//:org_bouncycastle_bcprov_jdk15on",
         "@maven//:org_postgresql_postgresql",
         "@maven//:org_scala_lang_modules_scala_collection_compat_2_13",
         "@maven//:org_scala_lang_modules_scala_collection_contrib_2_13",
+        "@maven//:org_scalaz_scalaz_core_2_13",
+        "@maven//:org_slf4j_slf4j_api",
+        "@maven//:org_typelevel_cats_core_2_13",
+        "@maven//:org_typelevel_cats_kernel_2_13",
+    ],
+)
+
+### community/common ###
+
+scala_library(
+    name = "community_common",
+    srcs = glob(["community/common/src/main/scala/**/*.scala"]),
+    plugins = [kind_projector_plugin],
+    resource_strip_prefix = "canton/community/common/src/main/resources",
+    resources = glob(["community/common/src/main/resources/**"]),
+    scalacopts = [
+        "-Xsource:3",
+        "-language:postfixOps",
+    ],
+    unused_dependency_checker_mode = "error",
+    runtime_deps = [
+        #  not used at compile time, but required by com.digitalasset.canton.util.PekkoUtil.createActorSystem
+        "@maven//:org_apache_pekko_pekko_slf4j_2_13",
+    ],
+    deps = [
+        ":pekko-stream-minus-patched-classes",
+        "//canton:community_base",
+        "//canton:community_buildinfo",
+        "//canton:community_ledger_ledger-common",
+        "//canton:community_lib_Blake2b",
+        "//canton:community_lib_slick_slick-fork",
+        "//canton:community_lib_wartremover",
+        "//canton:community_util-external",
+        "//canton:community_util-logging",
+        "//canton:daml-common-staging_daml-errors",
+        "//daml-lf/archive:daml_lf_archive_reader",
+        "//daml-lf/data",
+        "//daml-lf/interpreter",
+        "//daml-lf/language",
+        "//daml-lf/transaction",
+        "//daml-lf/transaction:transaction_proto_java",
+        "//language-support/java/bindings:bindings-java",
+        "//language-support/scala/bindings",
+        "//language-support/scala/bindings-pekko",
+        "//ledger-api/grpc-definitions:ledger_api_proto_scala",
+        "//libs-scala/concurrent",
+        "//libs-scala/contextualized-logging",
+        "//libs-scala/executors",
+        "//libs-scala/nameof",
+        "//libs-scala/nonempty",
+        "//observability/metrics",
+        "//observability/tracing",
+        "@maven//:ch_qos_logback_logback_classic",
+        "@maven//:ch_qos_logback_logback_core",
+        "@maven//:com_github_pathikrit_better_files_2_13",
+        "@maven//:com_github_pureconfig_pureconfig_generic_2_13",
+        "@maven//:com_google_crypto_tink_tink",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_protobuf_protobuf_java",
+        "@maven//:com_lihaoyi_pprint_2_13",
+        "@maven//:com_thesamet_scalapb_scalapb_runtime_2_13",
+        "@maven//:com_typesafe_config",
+        "@maven//:com_typesafe_scala_logging_scala_logging_2_13",
+        "@maven//:com_typesafe_slick_slick_2_13",
+        "@maven//:dev_optics_monocle_core_2_13",
+        "@maven//:dev_optics_monocle_macro_2_13",
+        "@maven//:io_circe_circe_core_2_13",
+        "@maven//:io_grpc_grpc_api",
+        "@maven//:io_grpc_grpc_netty",
+        "@maven//:io_grpc_grpc_services",
+        "@maven//:io_grpc_grpc_stub",
+        "@maven//:io_netty_netty_handler",
+        "@maven//:io_opentelemetry_opentelemetry_api",
+        "@maven//:io_scalaland_chimney_2_13",
+        "@maven//:junit_junit",
+        "@maven//:net_logstash_logback_logstash_logback_encoder",
+        "@maven//:org_apache_logging_log4j_log4j_core",
+        "@maven//:org_apache_pekko_pekko_actor_2_13",
+        "@maven//:org_bouncycastle_bcprov_jdk15on",
         "@maven//:org_scala_lang_scala_reflect",
         "@maven//:org_scalaz_scalaz_core_2_13",
         "@maven//:org_slf4j_slf4j_api",
@@ -438,6 +508,7 @@ scala_library(
     deps = [
         ":pekko-stream-minus-patched-classes",
         ":pekko-stream-patch",
+        "//canton:community_base",
         "//canton:community_common",
         "//canton:community_ledger_ledger-common",
         "//canton:community_ledger_ledger-common_configuration_proto_java",
@@ -539,7 +610,7 @@ scala_library(
     unused_dependency_checker_mode = "error",
     deps = [
         ":pekko-stream-minus-patched-classes",
-        "//canton:community_common",
+        "//canton:community_base",
         "//canton:community_ledger_ledger-api-core",
         "//canton:community_ledger_ledger-common",
         "//canton:community_util-logging",
@@ -602,7 +673,7 @@ proto_library(
     srcs = glob(["community/domain/src/main/protobuf/**/*.proto"]),
     strip_import_prefix = "community/domain/src/main/protobuf",
     deps = [
-        "//canton:community_common_proto",
+        "//canton:community_base_proto",
         "@com_google_protobuf//:duration_proto",
         "@com_google_protobuf//:empty_proto",
         "@com_google_protobuf//:timestamp_proto",
@@ -635,6 +706,7 @@ scala_library(
     deps = [
         ":pekko-stream-minus-patched-classes",
         ":pekko-stream-patch",
+        "//canton:community_base",
         "//canton:community_common",
         "//canton:community_ledger_ledger-common",
         "//canton:community_lib_slick_slick-fork",
@@ -716,7 +788,7 @@ proto_library(
     srcs = glob(["community/participant/src/main/protobuf/**/*.proto"]),
     strip_import_prefix = "community/participant/src/main/protobuf",
     deps = [
-        "//canton:community_common_proto",
+        "//canton:community_base_proto",
         "@com_google_protobuf//:duration_proto",
         "@com_google_protobuf//:empty_proto",
         "@com_google_protobuf//:timestamp_proto",
@@ -810,6 +882,7 @@ scala_library(
     deps = [
         ":community_participant_admin-workflows-with-vacuuming_java.jar",
         ":pekko-stream-minus-patched-classes",
+        "//canton:community_base",
         "//canton:community_common",
         "//canton:community_ledger_ledger-api-core",
         "//canton:community_ledger_ledger-common",
@@ -893,6 +966,7 @@ scala_library(
     unused_dependency_checker_mode = "error",
     deps = [
         ":pekko-stream-minus-patched-classes",
+        "//canton:community_base",
         "//canton:community_buildinfo",
         "//canton:community_common",
         "//canton:community_domain",
@@ -990,6 +1064,7 @@ scala_library(
     deps = [
         ":pekko-stream-minus-patched-classes",
         "//canton:community_app-base",
+        "//canton:community_base",
         "//canton:community_buildinfo",
         "//canton:community_common",
         "//canton:community_domain",
@@ -1006,7 +1081,6 @@ scala_library(
         "//libs-scala/jwt",
         "//libs-scala/nonempty",
         "//libs-scala/rs-grpc-bridge",
-        "//observability/metrics",
         "@maven//:ch_qos_logback_logback_classic",
         "@maven//:ch_qos_logback_logback_core",
         "@maven//:com_github_pathikrit_better_files_2_13",

Diff for: sdk/canton/community/app-base/src/main/scala/com/digitalasset/canton/admin/api/client/commands/LedgerApiV2Commands.scala

@@ -570,6 +570,7 @@ object LedgerApiV2Commands {
         parties: Set[LfPartyId],
         limit: PositiveInt,
         templateFilter: Seq[TemplateId] = Seq.empty,
+        activeAtOffset: String = "",
         verbose: Boolean = true,
         timeout: FiniteDuration,
         includeCreatedEventBlob: Boolean = false,
@@ -595,6 +596,7 @@ object LedgerApiV2Commands {
           GetActiveContractsRequest(
             filter = Some(TransactionFilter(parties.map((_, filter)).toMap)),
             verbose = verbose,
+            activeAtOffset = activeAtOffset,
           )
         )
       }