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.

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 20241231.14867.v56840c42 #20540

Closed
Closed
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ message MediatorStatusResponse {

message MediatorStatusResponseStatus {
com.digitalasset.canton.admin.health.v30.Status common_status = 1;
string domain_id = 2;
string synchronizer_id = 2;
int32 protocol_version = 3;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ message SequencerStatusResponse {
// required - status of the sequencer component it is running
SequencerHealthStatus sequencer = 4;

string domain_id = 5;
string synchronizer_id = 5;

SequencerAdminStatus admin = 6;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ message ActiveContract {

// The ID of the domain where the contract was assigned at the time of the export
// Required
string domain_id = 1;
string synchronizer_id = 1;
// The contract and its associated metadata
// Required
Contract contract = 2;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ service DomainConnectivityService {
// list registered domains
rpc ListRegisteredDomains(ListRegisteredDomainsRequest) returns (ListRegisteredDomainsResponse);

// Get the domain id of the given domain alias
rpc GetDomainId(GetDomainIdRequest) returns (GetDomainIdResponse);
// Get the synchronizer id of the given domain alias
rpc GetSynchronizerId(GetSynchronizerIdRequest) returns (GetSynchronizerIdResponse);
}

message DomainConnectionConfig {
Expand All @@ -53,8 +53,8 @@ message DomainConnectionConfig {
com.digitalasset.canton.admin.domain.v30.SequencerConnections sequencer_connections = 2;
// if false, then domain needs to be manually connected to (default false)
bool manual_connect = 3;
// optional domainId (if TLS isn't to be trusted)
string domain_id = 4;
// optional synchronizer id (if TLS isn't to be trusted)
string synchronizer_id = 4;
// optional. Influences whether the participant submits to this domain, if several domains are eligible
int32 priority = 5;
// initial delay before an attempt to reconnect to the sequencer
Expand Down Expand Up @@ -160,18 +160,18 @@ message ListConnectedDomainsRequest {}
message ListConnectedDomainsResponse {
message Result {
string domain_alias = 1;
string domain_id = 2;
string synchronizer_id = 2;
bool healthy = 3;
}
repeated Result connected_domains = 1;
}

message GetDomainIdRequest {
message GetSynchronizerIdRequest {
string domain_alias = 1;
}

message GetDomainIdResponse {
string domain_id = 2;
message GetSynchronizerIdResponse {
string synchronizer_id = 2;
}

message LogoutRequest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ message OpenCommitment {
message Request {
// the commitment to be opened
bytes commitment = 1;
string domain_id = 2;
string synchronizer_id = 2;
// the participant for whom the receiving participant computed the commitment
string computed_for_counter_participant_uid = 3;
// interval end tick which the commitment corresponds to
Expand All @@ -88,7 +88,7 @@ message InspectCommitmentContracts {
// the contracts whose state and payload we want to retrieve
repeated bytes cids = 1;
// the domain on which we expect the contracts to be active
string expected_domain_id = 2;
string expected_synchronizer_id = 2;
// timestamp at which we retrieve the state of the contracts on the expected domain
google.protobuf.Timestamp timestamp = 3;
// whether to retrieve the payload of the contracts
Expand All @@ -113,7 +113,7 @@ message ContractState {

message DomainState {
option (scalapb.message).companion_extends = "com.digitalasset.canton.version.AlphaProtoVersion";
string domain_id = 1;
string synchronizer_id = 1;
// The Canton ACS has a few more states, e.g., "purged". However, we do not include them because they will likely
// not be accessible over the ledger API when we switch to that.
oneof state {
Expand Down Expand Up @@ -141,7 +141,7 @@ message ContractState {

message Unassigned {
option (scalapb.message).companion_extends = "com.digitalasset.canton.version.AlphaProtoVersion";
string target_domain_id = 1;
string target_synchronizer_id = 1;
int64 reassignment_counter_src = 2;
ReassignmentId reassignment_id = 3;
}
Expand All @@ -153,7 +153,7 @@ message ContractState {

message ReassignmentId {
option (scalapb.message).companion_extends = "com.digitalasset.canton.version.AlphaProtoVersion";
string source_domain_id = 1;
string source_synchronizer_id = 1;
google.protobuf.Timestamp unassign_timestamp = 2;
}
}
Expand Down Expand Up @@ -199,7 +199,7 @@ message TimeRange {
}

message DomainTimeRange {
string domain_id = 1;
string synchronizer_id = 1;
// optional; if not given, the latest reconciliation period the participant knows of for that domain is considered
optional TimeRange interval = 2;
}
Expand All @@ -226,7 +226,7 @@ message ReceivedAcsCommitment {
}

message ReceivedAcsCommitmentPerDomain {
string domain_id = 1;
string synchronizer_id = 1;
repeated ReceivedAcsCommitment received = 2;
}

Expand Down Expand Up @@ -257,7 +257,7 @@ message SentAcsCommitment {
}

message SentAcsCommitmentPerDomain {
string domain_id = 1;
string synchronizer_id = 1;
repeated SentAcsCommitment sent = 2;
}

Expand Down Expand Up @@ -315,7 +315,7 @@ threshold_distinguished & threshold_default are overwritten, distinguished_parti
*/
message SlowCounterParticipantDomainConfig {
// the domains for which we apply the settings below
repeated string domain_ids = 1;
repeated string synchronizer_ids = 1;
// all non-distinguished counter-participants are implicitly part of the group "default"
repeated string distinguished_participant_uids = 2;
// the number of reconciliation intervals for a distinguished counter-participant to be considered slow
Expand All @@ -329,7 +329,7 @@ message SlowCounterParticipantDomainConfig {
message SetConfigForSlowCounterParticipants {
message Request {
// we can specify multiple configurations, each being applied to one or more domains
// if the domain IDs in the different configs overlap, the latest config in the order of the "configs" takes precedence
// if the synchronizer ids in the different configs overlap, the latest config in the order of the "configs" takes precedence
repeated SlowCounterParticipantDomainConfig configs = 1;
}
message Response {}
Expand All @@ -338,7 +338,7 @@ message SetConfigForSlowCounterParticipants {
message GetConfigForSlowCounterParticipants {
message Request {
// filters by domains
repeated string domain_ids = 2;
repeated string synchronizer_ids = 2;
}
message Response {
repeated SlowCounterParticipantDomainConfig configs = 1;
Expand All @@ -349,7 +349,7 @@ message GetIntervalsBehindForCounterParticipants {

message CounterParticipantInfo {
string counter_participant_uid = 1;
string domain_id = 2;
string synchronizer_id = 2;
// MaxInt(2147483647) means that the counter-participant never sent a commitment
uint64 intervals_behind = 3;
// how long time the corresponding intervals correlate to (Timestamp in the future means it has never sent a commitment)
Expand All @@ -366,7 +366,7 @@ message GetIntervalsBehindForCounterParticipants {
// if empty, all counter-participants are considered
repeated string counter_participant_uids = 1;
// if empty, all domains are considered
repeated string domain_ids = 2;
repeated string synchronizer_ids = 2;
// if set, only counter-participants that are behind by at least this number of intervals are returned
optional uint64 threshold = 3;
}
Expand All @@ -379,7 +379,7 @@ message GetIntervalsBehindForCounterParticipants {
message CountInFlight {
message Request {
// the domain to query for pending submissions and in-flight transactions
string domain_id = 1;
string synchronizer_id = 1;
}

message Response {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ message MigrateDomainResponse {}
message ExportAcsRequest {
message TargetDomain {
// The ID of the domain where the contract is supposed to be assigned when the export is being imported
string domain_id = 1;
string synchronizer_id = 1;
// The protocol version associated to the domain where the contract is supposed to be assigned when the contracts snapshot is being imported
int32 protocol_version = 2;
}
Expand All @@ -85,18 +85,18 @@ message ExportAcsRequest {

// The IDs of the domains to filter the contracts by
// Optional, if set the contracts will be filtered by the exact match of the ID of the domain to which it's assigned
string filter_domain_id = 2; // optional; exact match if set
string filter_synchronizer_id = 2; // optional; exact match if set

// The timestamp at which the ACS should be valid. If provided, it will be checked that the ACS is
// available at the given timestamp (i.e. the timestamp is considered clean and the ACS has not been
// pruned).
// Optional, if missing the latest clean timestamp will be used
google.protobuf.Timestamp timestamp = 3;

// Mapping from one domain ID and protocol version. If provided, the contracts currently assigned to the domain
// ID in the key will be assigned to the domain ID and protocol version in the value. This is not a proper domain
// Mapping from one synchronizer id and protocol version. If provided, the contracts currently assigned to the domain
// ID in the key will be assigned to the synchronizer id and protocol version in the value. This is not a proper domain
// migration of contracts and it's supposed to be used only in exceptional cases.
// Optional, if not provided the contracts will be exported with the same domain id as they are currently assigned
// Optional, if not provided the contracts will be exported with the same synchronizer id as they are currently assigned
map<string, TargetDomain> contract_domain_renames = 4;

// If true, do not check whether the provided timestamp is clean (see `timestamp` field).
Expand All @@ -122,7 +122,7 @@ message ImportAcsRequest {
// The raw binary of the ACS snapshot to be imported
// Required
bytes acs_snapshot = 1;
// The domain id prefix to be used for the imported contracts
// The synchronizer id prefix to be used for the imported contracts
// Optional, if not provided the service will generate a prefix
string workflow_id_prefix = 2;
// If false, the service will fail if any contract ID suffix doesn't match the scheme
Expand All @@ -145,7 +145,7 @@ message PurgeDeactivatedDomainRequest {
message PurgeDeactivatedDomainResponse {}

message IgnoreEventsRequest {
string domain_id = 1;
string synchronizer_id = 1;
// sequencer counter of the first event to ignore
int64 from_inclusive = 2;
// sequencer counter of the last event to ignore
Expand All @@ -157,7 +157,7 @@ message IgnoreEventsRequest {
message IgnoreEventsResponse {}

message UnignoreEventsRequest {
string domain_id = 1;
string synchronizer_id = 1;
// sequencer counter of the first event to unignore
int64 from_inclusive = 2;
// sequencer counter of the last event to unignore
Expand All @@ -176,12 +176,12 @@ message RollbackUnassignmentRequest {
string unassign_id = 1;

// The ID of the source domain
// Must be a valid domain ID
// Must be a valid synchronizer id
// Required
string source = 2;

// The ID of the target domain
// Must be a valid domain ID
// Must be a valid synchronizer id
// Required
string target = 3;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ message ConnectedDomain {
HEALTH_UNHEALTHY = 2;
}

string domain_id = 1;
string synchronizer_id = 1;
Health health = 2;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ message PingRequest {
repeated string validators = 2;
google.protobuf.Duration timeout = 3;
uint32 levels = 4;
string domain_id = 5; // optional
string synchronizer_id = 5; // optional
string workflow_id = 6; // optional
string id = 7; // optional UUID to be used for ping test
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ service TrafficControlService {
}

message TrafficControlStateRequest {
string domain_id = 1; // Domain id for which to retrieve the traffic state
string synchronizer_id = 1; // Synchronizer id for which to retrieve the traffic state
}

message TrafficControlStateResponse {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,14 @@ message LocatePruningTimestamp {
}

// overwrites previous no-wait-configuration on the given domains for the given counter participants
// the request will fail if the counter_participant_uids or domain_ids is invalid format, or if duplicates are present in the repeated strings
// the request will fail if the counter_participant_uids or synchronizer_ids is invalid format, or if duplicates are present in the repeated strings
message SetNoWaitCommitmentsFrom {
message Request {
// ignore the given participants; an empty list has no effect
repeated string counter_participant_uids = 1;
// ignore the given participants on these domains
// an empty list has no effect
repeated string domain_ids = 2;
repeated string synchronizer_ids = 2;
}

message Response {}
Expand All @@ -105,15 +105,15 @@ message ResetNoWaitCommitmentsFrom {
// an empty list has no effect
repeated string counter_participant_uids = 1;
// an empty list has no effect
repeated string domain_ids = 2;
repeated string synchronizer_ids = 2;
}

message Response {}
}


message Domains {
repeated string domain_ids = 1;
repeated string synchronizer_ids = 1;
}

// Returns the state of no-wait-config at the time the request executes, with optional filtering on domains and
Expand All @@ -127,7 +127,7 @@ message Domains {
// includes them if they are known to the participant or specified in the arguments.
message GetNoWaitCommitmentsFrom {
message Request {
repeated string domain_ids = 1;
repeated string synchronizer_ids = 1;
repeated string participant_uids = 2;
}

Expand All @@ -141,5 +141,5 @@ message GetNoWaitCommitmentsFrom {

message WaitCommitmentsSetup {
string counter_participant_uid = 1;
Domains domain_ids = 2;
Domains domains = 2;
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import com.digitalasset.canton.time.{
FetchTimeResponse,
NonNegativeFiniteDuration,
}
import com.digitalasset.canton.topology.DomainId
import com.digitalasset.canton.topology.SynchronizerId
import io.grpc.ManagedChannel

import scala.concurrent.Future
Expand All @@ -32,13 +32,13 @@ object DomainTimeCommands {
}

final case class FetchTime(
domainIdO: Option[DomainId],
synchronizerIdO: Option[SynchronizerId],
freshnessBound: NonNegativeFiniteDuration,
timeout: NonNegativeDuration,
) extends BaseDomainTimeCommand[FetchTimeRequest, v30.FetchTimeResponse, FetchTimeResponse] {

override protected def createRequest(): Either[String, FetchTimeRequest] =
Right(FetchTimeRequest(domainIdO, freshnessBound))
Right(FetchTimeRequest(synchronizerIdO, freshnessBound))

override protected def submitRequest(
service: DomainTimeServiceStub,
Expand All @@ -55,13 +55,13 @@ object DomainTimeCommands {
}

final case class AwaitTime(
domainIdO: Option[DomainId],
synchronizerIdO: Option[SynchronizerId],
time: CantonTimestamp,
timeout: NonNegativeDuration,
) extends BaseDomainTimeCommand[AwaitTimeRequest, v30.AwaitTimeResponse, Unit] {

override protected def createRequest(): Either[String, AwaitTimeRequest] =
Right(AwaitTimeRequest(domainIdO, time))
Right(AwaitTimeRequest(synchronizerIdO, time))

override protected def submitRequest(
service: DomainTimeServiceStub,
Expand Down
Loading
Loading