Skip to content

Commit 6e5e6e0

Browse files
author
Azure Pipelines Daml Build
committed
update canton to 20251030.17361.v46825b7e
tell-slack: canton
1 parent ce1b5a7 commit 6e5e6e0

File tree

290 files changed

+2661
-1589
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

290 files changed

+2661
-1589
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,9 @@ message MigrateSynchronizerResponse {}
120120
message ExportAcsOldRequest {
121121
option deprecated = true;
122122

123-
// The parties for which the ACS should be exported
124-
// Required
123+
// The parties for which the ACS should be exported.
124+
// If empty, the ACS of all parties will be exported.
125+
// Optional
125126
repeated string parties = 1;
126127

127128
// The IDs of the synchronizers to filter the contracts by

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ message ExportPartyAcsRequest {
253253

254254
// The maximum duration the service will wait to find the topology transaction that activates the party on
255255
// the target participant.
256-
// If not set, the service use will use a default timeout.
256+
// If not set, the service will use a default timeout.
257257
// Optional
258258
google.protobuf.Duration wait_for_activation_timeout = 5;
259259
}
@@ -342,7 +342,7 @@ message ClearPartyOnboardingFlagRequest {
342342

343343
// The maximum duration the service will wait to find the topology transaction
344344
// that activates the party.
345-
// If not set, the service use will use a default timeout.
345+
// If not set, the service will use a default timeout.
346346
// Optional
347347
google.protobuf.Duration wait_for_activation_timeout = 4;
348348
}

sdk/canton/community/app-base/src/main/scala/com/digitalasset/canton/console/AdminCommandRunner.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ trait AdminCommandRunner {
2323
* configured with an HTTP interface.
2424
*/
2525
protected[console] def adminCommand[Result](
26-
grpcCommand: GrpcAdminCommand[_, _, Result]
26+
grpcCommand: GrpcAdminCommand[?, ?, Result]
2727
): ConsoleCommandResult[Result]
2828

2929
protected[console] def tracedLogger: TracedLogger
@@ -58,15 +58,15 @@ object AdminCommandRunner {
5858
trait LedgerApiCommandRunner {
5959

6060
protected[console] def ledgerApiCommand[Result](
61-
command: GrpcAdminCommand[_, _, Result]
61+
command: GrpcAdminCommand[?, ?, Result]
6262
): ConsoleCommandResult[Result]
6363

6464
protected[console] def token: Option[String]
6565
}
6666

6767
trait PublicApiCommandRunner {
6868
protected[console] def publicApiCommand[Result](
69-
command: GrpcAdminCommand[_, _, Result]
69+
command: GrpcAdminCommand[?, ?, Result]
7070
): ConsoleCommandResult[Result]
7171
}
7272

sdk/canton/community/app-base/src/main/scala/com/digitalasset/canton/console/CantonHealthAdministration.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ object CantonHealthAdministration {
8989
}
9090

9191
private def statusMap[A <: InstanceReference](
92-
nodes: NodeReferences[A, _, _]
92+
nodes: NodeReferences[A, ?, ?]
9393
): Map[String, () => NodeStatus[A#Status]] =
9494
nodes.all.map(node => node.name -> (() => node.health.status)).toMap
9595
}

sdk/canton/community/app-base/src/main/scala/com/digitalasset/canton/console/ConsoleEnvironment.scala

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -397,33 +397,33 @@ class ConsoleEnvironment(
397397

398398
/** Assemble top level values with their identifier name, value binding, and help description.
399399
*/
400-
protected def topLevelValues: Seq[TopLevelValue[_]] = {
400+
protected def topLevelValues: Seq[TopLevelValue[?]] = {
401401
val nodeTopic = Seq(topicNodeReferences)
402-
val localParticipantBinds: Seq[TopLevelValue[_]] =
402+
val localParticipantBinds: Seq[TopLevelValue[?]] =
403403
participants.local.map(p =>
404404
TopLevelValue(p.name, helpText("participant", p.name), p, nodeTopic)
405405
)
406-
val remoteParticipantBinds: Seq[TopLevelValue[_]] =
406+
val remoteParticipantBinds: Seq[TopLevelValue[?]] =
407407
participants.remote.map(p =>
408408
TopLevelValue(p.name, helpText("remote participant", p.name), p, nodeTopic)
409409
)
410-
val localMediatorBinds: Seq[TopLevelValue[_]] =
410+
val localMediatorBinds: Seq[TopLevelValue[?]] =
411411
mediators.local.map(d =>
412412
TopLevelValue(d.name, helpText("local mediator", d.name), d, nodeTopic)
413413
)
414-
val remoteMediatorBinds: Seq[TopLevelValue[_]] =
414+
val remoteMediatorBinds: Seq[TopLevelValue[?]] =
415415
mediators.remote.map(d =>
416416
TopLevelValue(d.name, helpText("remote mediator", d.name), d, nodeTopic)
417417
)
418-
val localSequencerBinds: Seq[TopLevelValue[_]] =
418+
val localSequencerBinds: Seq[TopLevelValue[?]] =
419419
sequencers.local.map(d =>
420420
TopLevelValue(d.name, helpText("local sequencer", d.name), d, nodeTopic)
421421
)
422-
val remoteSequencerBinds: Seq[TopLevelValue[_]] =
422+
val remoteSequencerBinds: Seq[TopLevelValue[?]] =
423423
sequencers.remote.map(d =>
424424
TopLevelValue(d.name, helpText("remote sequencer", d.name), d, nodeTopic)
425425
)
426-
val clockBinds: Option[TopLevelValue[_]] =
426+
val clockBinds: Option[TopLevelValue[?]] =
427427
environment.simClock.map(cl =>
428428
TopLevelValue("clock", "Simulated time", new SimClockCommand(cl))
429429
)
@@ -454,7 +454,7 @@ class ConsoleEnvironment(
454454
/** Bindings for ammonite Add a reference to this instance to resolve implicit references within
455455
* the console
456456
*/
457-
lazy val bindings: Either[RuntimeException, IndexedSeq[Bind[_]]] = {
457+
lazy val bindings: Either[RuntimeException, IndexedSeq[Bind[?]]] = {
458458
import cats.syntax.traverse.*
459459
for {
460460
bindsWithoutSelfAlias <- topLevelValues.traverse(_.asBind)
@@ -463,7 +463,7 @@ class ConsoleEnvironment(
463463
} yield binds.toIndexedSeq
464464
}
465465

466-
private def validateNameUniqueness(binds: Seq[Bind[_]]) = {
466+
private def validateNameUniqueness(binds: Seq[Bind[?]]) = {
467467
val nonUniqueNames =
468468
binds.map(_.name).groupBy(identity).collect {
469469
case (name, occurrences) if occurrences.sizeIs > 1 =>
@@ -498,7 +498,7 @@ class ConsoleEnvironment(
498498

499499
/** So we can we make this available
500500
*/
501-
protected def selfAlias(): Bind[_] = Bind(ConsoleEnvironmentBinding.BindingName, this)
501+
protected def selfAlias(): Bind[?] = Bind(ConsoleEnvironmentBinding.BindingName, this)
502502

503503
override def onClosed(): Unit =
504504
LifeCycle.close(

sdk/canton/community/app-base/src/main/scala/com/digitalasset/canton/console/ConsoleMacros.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ trait ConsoleMacros extends NamedLogging with NoTracing {
334334
private def mapToLedgerApiValue(value: Any): Value = {
335335

336336
// assuming that String.toString = id, we'll just map any Map to a string map without casting
337-
def safeMapCast(map: Map[_, _]): Map[String, Any] = map.map { case (key, value) =>
337+
def safeMapCast(map: Map[?, ?]): Map[String, Any] = map.map { case (key, value) =>
338338
(key.toString, value)
339339
}
340340

@@ -351,7 +351,7 @@ trait ConsoleMacros extends NamedLogging with NoTracing {
351351
case x: Instant => Value.Sum.Timestamp(x.toEpochMilli * 1000L)
352352
case x: Option[Any] => Value.Sum.Optional(Optional(value = x.map(mapToLedgerApiValue)))
353353
case x: Value.Sum => x
354-
case x: Map[_, _] => Value.Sum.Record(buildArguments(safeMapCast(x)))
354+
case x: Map[?, ?] => Value.Sum.Record(buildArguments(safeMapCast(x)))
355355
case x: (Any, Any) => productToLedgerApiRecord(x)
356356
case x: (Any, Any, Any) => productToLedgerApiRecord(x)
357357
case _ =>
@@ -1062,7 +1062,7 @@ trait ConsoleMacros extends NamedLogging with NoTracing {
10621062
// Helper to find all HA-active nodes
10631063
private def allPrunableNodes(implicit
10641064
env: ConsoleEnvironment
1065-
): Map[String, PruningSchedulerAdministration[_]] =
1065+
): Map[String, PruningSchedulerAdministration[?]] =
10661066
(env.participants.all.collect { case p if p.health.active => p.name -> p.pruning }
10671067
++ env.sequencers.all.collect {
10681068
case s

sdk/canton/community/app-base/src/main/scala/com/digitalasset/canton/console/GrpcAdminCommandRunner.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class GrpcAdminCommandRunner(
6161

6262
def runCommandAsync[Result](
6363
instanceName: String,
64-
command: GrpcAdminCommand[_, _, Result],
64+
command: GrpcAdminCommand[?, ?, Result],
6565
clientConfig: ClientConfig,
6666
token: Option[String],
6767
)(implicit traceContext: TraceContext): (NonNegativeDuration, EitherT[Future, String, Result]) = {
@@ -121,7 +121,7 @@ class GrpcAdminCommandRunner(
121121

122122
def runCommandWithExistingTrace[Result](
123123
instanceName: String,
124-
command: GrpcAdminCommand[_, _, Result],
124+
command: GrpcAdminCommand[?, ?, Result],
125125
clientConfig: ClientConfig,
126126
token: Option[String],
127127
)(implicit traceContext: TraceContext): ConsoleCommandResult[Result] = {
@@ -138,7 +138,7 @@ class GrpcAdminCommandRunner(
138138

139139
def runCommand[Result](
140140
instanceName: String,
141-
command: GrpcAdminCommand[_, _, Result],
141+
command: GrpcAdminCommand[?, ?, Result],
142142
clientConfig: ClientConfig,
143143
token: Option[String],
144144
): ConsoleCommandResult[Result] =

sdk/canton/community/app-base/src/main/scala/com/digitalasset/canton/console/commands/ParticipantRepairAdministration.scala

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ import io.grpc.Context
3939

4040
import java.time.Instant
4141
import java.util.UUID
42-
import scala.annotation.nowarn
4342

4443
class ParticipantRepairAdministration(
4544
val consoleEnvironment: ConsoleEnvironment,
@@ -172,7 +171,8 @@ class ParticipantRepairAdministration(
172171
|
173172
|
174173
|The arguments are:
175-
|- parties: identifying contracts having at least one stakeholder from the given set
174+
|- parties: identifying contracts having at least one stakeholder from the given set.
175+
| if empty, contracts of all parties will be exported.
176176
|- partiesOffboarding: true if the parties will be offboarded (party migration)
177177
|- outputFile: the output file name where to store the data.
178178
|- filterSynchronizerId: restrict the export to a given synchronizer
@@ -187,7 +187,10 @@ class ParticipantRepairAdministration(
187187
| request.
188188
"""
189189
)
190-
@nowarn("cat=deprecation")
190+
@deprecated(
191+
"Method export_acs_old has been deprecated. Use acs_export_instead. For party replication, see participant.parties.export_acs",
192+
since = "3.4",
193+
)
191194
def export_acs_old(
192195
parties: Set[PartyId],
193196
partiesOffboarding: Boolean,
@@ -259,6 +262,10 @@ class ParticipantRepairAdministration(
259262
|DEPRECATION NOTICE: A future release removes this command, use `export_acs` instead.
260263
"""
261264
)
265+
@deprecated(
266+
"Method import_acs_old has been deprecated. Use import_acs instead. For party replication, see participant.parties.import_party_acs",
267+
since = "3.4",
268+
)
262269
def import_acs_old(
263270
inputFile: String = ParticipantRepairAdministration.ExportAcsDefaultFile,
264271
workflowIdPrefix: String = "",

sdk/canton/community/app-base/src/main/scala/com/digitalasset/canton/console/declarative/DeclarativeParticipantApi.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class DeclarativeParticipantApi(
9090
private def queryApi[Result](
9191
runner: GrpcAdminCommandRunner,
9292
cfg: ClientConfig,
93-
command: GrpcAdminCommand[_, _, Result],
93+
command: GrpcAdminCommand[?, ?, Result],
9494
)(implicit traceContext: TraceContext): Either[QueryResult, Result] = if (
9595
closeContext.context.isClosing
9696
)
@@ -107,12 +107,12 @@ class DeclarativeParticipantApi(
107107
)
108108

109109
private def queryAdminApi[Result](
110-
command: GrpcAdminCommand[_, _, Result]
110+
command: GrpcAdminCommand[?, ?, Result]
111111
)(implicit traceContext: TraceContext): Either[String, Result] =
112112
queryApi(adminApiRunner, adminApiConfig, command).leftMap(_.str)
113113

114114
private def queryLedgerApi[Result](
115-
command: GrpcAdminCommand[_, _, Result]
115+
command: GrpcAdminCommand[?, ?, Result]
116116
)(implicit traceContext: TraceContext): Either[String, Result] =
117117
queryApi(ledgerApiRunner, ledgerApiConfig, command).leftMap(_.str)
118118

@@ -125,12 +125,12 @@ class DeclarativeParticipantApi(
125125
}
126126

127127
private def queryAdminApiIfExists[Result](
128-
command: GrpcAdminCommand[_, _, Result]
128+
command: GrpcAdminCommand[?, ?, Result]
129129
)(implicit traceContext: TraceContext): Either[String, Option[Result]] =
130130
toOptionalE(queryApi(adminApiRunner, adminApiConfig, command))
131131

132132
private def queryLedgerApiIfExists[Result](
133-
command: GrpcAdminCommand[_, _, Result]
133+
command: GrpcAdminCommand[?, ?, Result]
134134
)(implicit traceContext: TraceContext): Either[String, Option[Result]] =
135135
toOptionalE(queryApi(ledgerApiRunner, ledgerApiConfig, command))
136136

sdk/canton/community/app-base/src/main/scala/com/digitalasset/canton/console/package.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ package object console {
3737

3838
/** Strip the Object suffix from the name of the provided class
3939
*/
40-
def objectClassNameWithoutSuffix(c: Class[_]): String =
40+
def objectClassNameWithoutSuffix(c: Class[?]): String =
4141
c.getName.stripSuffix("$").replace('$', '.')
4242

4343
}

0 commit comments

Comments
 (0)