Merge branch 'main' into roger/package-reftable

Author: roger-bosman-da

sdk/LATEST

@@ -1,4 +1,4 @@
-911aea04b957b05bc756c68a1c80df30aca22d1e 3.4.0-snapshot.20250905.14180.0.v911aea04 SPLIT_RELEASE
+d91c46d8ec02b78dee968b3ed232a119854ff8b4 3.4.0-snapshot.20250908.14185.0.vd91c46d8 SPLIT_RELEASE
 a77a3d96abde9c36c56d42ae4e2b8fec88f7ee35 3.4.0-adhoc.20250828.14144.0.va77a3d96 SPLIT_RELEASE
 c5be9bb3108a2687580bea0961c08da8b3998e81 3.3.0-snapshot.20250814.13842.0.vc5be9bb3 SPLIT_RELEASE
 e23b19ba88f3b01e07dadcf7e9607d524ab32bc9 3.2.0-snapshot.20250206.13406.0.ve23b19ba SPLIT_RELEASE

sdk/canton/BUILD.bazel

@@ -1049,6 +1049,7 @@ scala_library(
         "@maven//:io_grpc_grpc_services",
         "@maven//:io_grpc_grpc_stub",
         "@maven//:io_opentelemetry_opentelemetry_api",
+        "@maven//:io_opentelemetry_opentelemetry_context",
         "@maven//:io_scalaland_chimney_2_13",
         "@maven//:junit_junit",
         "@maven//:org_apache_pekko_pekko_actor_2_13",
@@ -1217,6 +1218,7 @@ scala_library(
         "@maven//:io_grpc_grpc_stub",
         "@maven//:io_opentelemetry_instrumentation_opentelemetry_grpc_1_6",
         "@maven//:io_opentelemetry_opentelemetry_api",
+        "@maven//:io_opentelemetry_opentelemetry_context",
         "@maven//:io_scalaland_chimney_2_13",
         "@maven//:io_scalaland_chimney_macro_commons_2_13",
         "@maven//:junit_junit",
@@ -1414,6 +1416,7 @@ scala_library(
         "@maven//:io_grpc_grpc_stub",
         "@maven//:io_opentelemetry_instrumentation_opentelemetry_runtime_telemetry_java8",
         "@maven//:io_opentelemetry_opentelemetry_api",
+        "@maven//:io_opentelemetry_opentelemetry_context",
         "@maven//:io_opentelemetry_opentelemetry_exporter_common",
         "@maven//:io_opentelemetry_opentelemetry_exporter_otlp_common",
         "@maven//:io_opentelemetry_opentelemetry_exporter_prometheus",

sdk/canton/community/admin-api/src/main/protobuf/com/digitalasset/canton/admin/participant/v30/participant_inspection_service.proto

@@ -22,9 +22,7 @@ service ParticipantInspectionService {
   rpc LookupOffsetByTime(LookupOffsetByTimeRequest) returns (LookupOffsetByTimeResponse);
   // Request metadata about shared contracts used in commitment computation at a specific time
   // Subject to the data still being available on the participant
-  // TODO(#9557) R2
   rpc OpenCommitment(OpenCommitmentRequest) returns (stream OpenCommitmentResponse);
-  // TODO(#9557) R2
   rpc InspectCommitmentContracts(InspectCommitmentContractsRequest) returns (stream InspectCommitmentContractsResponse);
   // Look up the ACS commitments computed and sent by a participant
   rpc LookupSentAcsCommitments(LookupSentAcsCommitmentsRequest) returns (LookupSentAcsCommitmentsResponse);

sdk/canton/community/admin-api/src/main/protobuf/com/digitalasset/canton/admin/participant/v30/participant_repair_service.proto

@@ -9,9 +9,13 @@ import "com/digitalasset/canton/admin/participant/v30/synchronizer_connectivity.
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 
-// Perform participant repair operations, including exporting and importing ACS, purging
-// contracts, and migrating synchronizers. These operations directly act on the internal state of the participant
-// and should be used with caution.
+/**
+ * Perform participant repair operations, including exporting and importing ACS, purging
+ * contracts, and migrating synchronizers. These operations directly act on the internal state of the participant
+ * and should be used with caution.
+ *
+ * Note that ACS refers to Active Contract Set.
+ */
 service ParticipantRepairService {
   // Export the ACS for the given parties from the participant
   // DEPRECATED: Use ExportAcs in the party_management_service.proto instead
@@ -21,6 +25,9 @@ service ParticipantRepairService {
   // DEPRECATED: Use ImportAcs in this proto file
   rpc ImportAcsOld(stream ImportAcsOldRequest) returns (ImportAcsOldResponse); // TODO(#24610) - Remove, replaced with ImportAcs below
 
+  // Export the ACS from the participant.
+  rpc ExportAcs(ExportAcsRequest) returns (stream ExportAcsResponse);
+
   // Import an existing export into the participant
   rpc ImportAcs(stream ImportAcsRequest) returns (ImportAcsResponse);
 
@@ -169,6 +176,53 @@ message ImportAcsOldResponse {
   map<string, string> contract_id_mapping = 1;
 }
 
+message ExportAcsTargetSynchronizer {
+  // The identifier of the synchronizer to which contracts should be assigned upon exporting the
+  // Active Contract Set (ACS).
+  // Required.
+  string target_synchronizer_id = 1;
+}
+
+message ExportAcsRequest {
+  // The identifiers of the parties for which the Active Contract Set (ACS) will be exported.
+  // This field must contain at least one party ID.
+  // Required
+  repeated string party_ids = 1;
+
+  // The identifier of the synchronizer to filter contracts.
+  // Optional. If provided, only contracts assigned to a synchronizer with this exact ID will be included
+  // in the exported ACS. If not set (empty string), all contracts for the specified parties will be included.
+  string synchronizer_id = 2; // Optional; filters by exact synchronizer ID if set
+
+  // The ledger offset at which the ACS snapshot should be taken. This determines the point in the
+  // ledger history from which the active contracts will be retrieved.
+  // Required
+  int64 ledger_offset = 3;
+
+  // A mapping to modify the synchronizer assignment of contracts in the exported ACS.
+  // Note: This mapping is not a proper contract reassignment. That is no actual reassignment happens, and thus
+  // the reassignment counter is not increased.
+  // Optional. If not provided (empty map), the contracts in the exported ACS will retain their
+  // original synchronizer assignments.
+  map<string, ExportAcsTargetSynchronizer> contract_synchronizer_renames = 4;
+
+  // A list of party IDs to exclude from the export.
+  // Any contract that has one or more of these parties as a stakeholder will be omitted from the ACS snapshot.
+  // Optional
+  repeated string excluded_stakeholder_ids = 5;
+}
+
+message ExportAcsResponse {
+  // A chunk of the Active Contract Set (ACS) snapshot. This response is streamed, with each
+  // message containing a portion of the complete ACS data.
+  // The raw binary data within each chunk consists of Ledger API active contract messages, specifically wrapped
+  // in `v30.active_contract.ActiveContract` messages. However, a single chunk does not necessarily contain
+  // exactly one complete message.
+  // This field will be populated in each streamed response.
+  // Required
+  bytes chunk = 1;
+}
+
 enum ContractIdImportMode {
   CONTRACT_ID_IMPORT_MODE_UNSPECIFIED = 0;
   // The contract ID neither gets validated nor recomputed.
@@ -195,6 +249,10 @@ message ImportAcsRequest {
   // How contract ID should be evaluated upon import
   // Required
   ContractIdImportMode contract_id_suffix_recomputation_mode = 3;
+  // A list of party IDs to exclude from the import.
+  // Any contract that has one or more of these parties as a stakeholder will be omitted during the import.
+  // Optional
+  repeated string excluded_stakeholder_ids = 4;
 }
 
 message ImportAcsResponse {

sdk/canton/community/admin-api/src/main/protobuf/com/digitalasset/canton/admin/participant/v30/party_management_service.proto

@@ -5,11 +5,14 @@ syntax = "proto3";
 
 package com.digitalasset.canton.admin.participant.v30;
 
+import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 import "scalapb/scalapb.proto";
 
 /**
  * The PartyManagementService allows modifying party hosting on participants.
+ *
+ * Note that ACS refers to Active Contract Set.
  */
 service PartyManagementService {
   // Initiate adding a party already hosted on one or more source participants to this
@@ -34,11 +37,8 @@ service PartyManagementService {
   // successfully.
   rpc GetAddPartyStatus(GetAddPartyStatusRequest) returns (GetAddPartyStatusResponse);
 
-  // Export the ACS for the given parties from the participant.
-  rpc ExportAcs(ExportAcsRequest) returns (stream ExportAcsResponse);
-
-  // Export the ACS for the given parties at a timestamp (that is the effective time of a topology transaction).
-  rpc ExportAcsAtTimestamp(ExportAcsAtTimestampRequest) returns (stream ExportAcsAtTimestampResponse);
+  // Export the party's ACS to replicate it onto the target participant.
+  rpc ExportPartyAcs(ExportPartyAcsRequest) returns (stream ExportPartyAcsResponse);
 
   // For a given timestamp, find the highest ledger offset among all events that have record time <= timestamp.
   //
@@ -185,72 +185,47 @@ enum ParticipantPermission {
   PARTICIPANT_PERMISSION_OBSERVATION = 3;
 }
 
-message ExportAcsTargetSynchronizer {
-  // The identifier of the synchronizer to which contracts should be assigned upon exporting the
-  // Active Contract Set (ACS).
-  // Required.
-  string target_synchronizer_id = 1;
-}
-
-message ExportAcsRequest {
-  // The identifiers of the parties for which the Active Contract Set (ACS) will be exported.
-  // This field must contain at least one party ID.
-  // Required
-  repeated string party_ids = 1;
-
-  // The identifier of the synchronizer to filter contracts.
-  // Optional. If provided, only contracts assigned to a synchronizer with this exact ID will be included
-  // in the exported ACS. If not set (empty string), all contracts for the specified parties will be included.
-  string synchronizer_id = 2; // Optional; filters by exact synchronizer ID if set
-
-  // The ledger offset at which the ACS snapshot should be taken. This determines the point in the
-  // ledger history from which the active contracts will be retrieved.
+// Exports the ACS for a given party to facilitate its replication from a source to a target participant.
+//
+// This request uses the party's most recent activation on the target participant to determine the precise
+// historical state of the ACS to export from the source participant.
+//
+// "Activation" on the target participant means the new hosting arrangement has been authorized by both
+// the party itself and the target participant via party-to-participant topology transactions.
+//
+// This request will fail if the party has not yet been activated on the target participant.
+message ExportPartyAcsRequest {
+  // The identifier of the party being replicated. This party must already be active on the target participant
+  // for the ACS export to succeed.
   // Required
-  int64 ledger_offset = 3;
-
-  // A mapping to modify the synchronizer assignment of contracts in the exported ACS.
-  // Note: This mapping is not a proper contract reassignment. That is no actual reassignment happens, and thus
-  // the reassignment counter is not increased.
-  // Optional. If not provided (empty map), the contracts in the exported ACS will retain their
-  // original synchronizer assignments.
-  map<string, ExportAcsTargetSynchronizer> contract_synchronizer_renames = 4;
-}
+  string party_id = 1;
 
-message ExportAcsResponse {
-  // A chunk of the Active Contract Set (ACS) snapshot. This response is streamed, with each
-  // message containing a portion of the complete ACS data.
-  // The raw binary data within each chunk consists of Ledger API active contract messages, specifically wrapped
-  // in `v30.active_contract.ActiveContract` messages. However, a single chunk does not necessarily contain
-  // exactly one complete message.
-  // This field will be populated in each streamed response.
+  // The identifier of the synchronizer managing the contract to be exported. This scopes the ACS export to only
+  // contracts assigned to this synchronizer.
   // Required
-  bytes chunk = 1;
-}
+  string synchronizer_id = 2;
 
-message ExportAcsAtTimestampRequest {
-  // The identifiers of the parties for which the Active Contract Set (ACS) will be exported.
-  // This field must contain at least one party ID.
+  // The unique identifier of the target participant where the party will be replicated.
   // Required
-  repeated string party_ids = 1;
+  string target_participant_uid = 3;
 
-  // The identifier of the synchronizer. This is used to filter contracts and topology
-  // transactions on the ledger.
+  // The exclusive ledger offset used as starting point to find the party's most recent activation on the target
+  // participant.
   // Required
-  string synchronizer_id = 2;
+  int64 begin_offset_exclusive = 4;
 
-  // The effective time of a specific topology transaction. The system will locate the
-  // topology transaction on the ledger with this effective time and the synchronizer
-  // identifier. And then take an ACS snapshot at the corresponding ledger offset.
-  // Required
-  google.protobuf.Timestamp topology_transaction_effective_time = 3;
+  // The maximum duration the service will wait to find the topology transaction that activates the party on
+  // the target participant.
+  // If not set, the service use will use a default timeout.
+  // Optional
+  google.protobuf.Duration wait_for_activation_timeout = 5;
 }
 
-message ExportAcsAtTimestampResponse {
-  // A chunk of the Active Contract Set (ACS) snapshot. This response is streamed, with each
-  // message containing a portion of the complete ACS data.
-  // The raw binary data within each chunk consists of Ledger API active contract messages, specifically wrapped
-  // in `v30.active_contract.ActiveContract` messages. However, a single chunk does not necessarily contain
-  // exactly one complete message.
+message ExportPartyAcsResponse {
+  // A chunk of the ACS snapshot. This response is streamed, with each message containing a portion of the
+  // complete ACS data. The raw binary data within each chunk consists of Ledger API active contract messages,
+  // specifically wrapped in `v30.active_contract.ActiveContract` messages. However, a single chunk does not
+  // necessarily contain exactly one complete message.
   // This field will be populated in each streamed response.
   // Required
   bytes chunk = 1;