Skip to content

Commit 8a89728

Browse files
[main] Update 2025-11-25.22 (#406)
Reference commit: 1102a62c41
1 parent 025cdcf commit 8a89728

File tree

320 files changed

+10158
-12742
lines changed

Some content is hidden

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

320 files changed

+10158
-12742
lines changed

.gitignore

Lines changed: 60 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,62 @@
1+
*.pyc
2+
log
3+
log.txt
4+
.idea/*
5+
!.idea/runConfigurations
6+
.bin
7+
*.swp
8+
.ensime*
9+
.DS_Store
10+
/.sbt
11+
/.ivy2
12+
/test-reports
13+
/.ci_credentials
14+
*~
15+
tmp
16+
gen-*.conf
17+
.circleci/_config.yml
18+
canton-dump-*.zip
19+
.daml
20+
.direnv
21+
todo-out
22+
.test_demo
23+
*.swo
24+
project/metals.sbt
25+
/theory/merkle-tree/src/output
26+
/theory/merkle-tree/paper/output
27+
benchmark*.dat
28+
/enterprise/synchronizer/out/
29+
/docker_eth_log/
30+
/docker_fabric_log/
31+
canton-performance.tar.gz
32+
sbt_output
33+
test-full-class-names.log
34+
classpath.txt
35+
/docs-open/src/replication/workdir
36+
canton_repo_paths
37+
embed_reference.json
38+
39+
# PerformanceRunnerRecorder
40+
/replay
41+
/replay-*
42+
43+
# nightly performance tests
44+
/nightly-tests
45+
/data
46+
47+
# Memory usage recording
48+
/track
49+
50+
# BSP
51+
.bsp
52+
.envrc.private
53+
54+
# VS Code
55+
.vscode/settings.json
56+
57+
# tests
58+
dars
59+
160
# IDE specific files
261
.metals/
362
.vscode/
@@ -9,6 +68,4 @@ metals.sbt
968

1069
# sbt build artifacts
1170
project/project/project/
12-
project/project/target/
13-
project/target/
14-
target/
71+
target/

UNRELEASED.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ Template for a bigger topic
2727
- Additional config options added: `debugInProcessRequests`, `prefixGrpcAddresses`
2828
- ParticipantRepairService.ExportAcsOld and ImportAcsOld are deprecated. Instead use ParticipantRepairService.ExportAcs and ImportAcs respectively as a direct replacement. For party replication use PartyManagementService.ExportPartyAcs and ImportPartyAcs instead.
2929
- Removed `packageDependencyCache` from `caching` configuration.
30+
- The `generateExternalPartyTopology` endpoint on the Ledger API now returns a single `PartyToParticipant` topology transaction to onboard the party.
31+
The transaction contains signing threshold and signing keys. This effectively deprecate the usage of `PartyToKeyMapping`.
32+
For parties with signing keys both in `PartyToParticipant` and `PartyToKeyMapping`, the keys from `PartyToParticipant` take precedence.
33+
- Batching configuration now allows setting different parallelism for pruning (currently only for Sequencer pruning):
34+
New option `canton.sequencers.sequencer.parameters.batching.pruning-parallelism` (defaults to `2`) can be used
35+
separately from the general `canton.sequencers.sequencer.parameters.batching.parallelism` setting.
3036

3137
### Preview Features
3238
- preview feature

base/util-external/src/main/scala/com/digitalasset/canton/config/RequireTypes.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ object RequireTypes {
8888

8989
def map[U](f: T => U)(implicit num: Numeric[U]) = NonNegativeNumeric.tryCreate(f(value))
9090
def increment: PositiveNumeric[T] = PositiveNumeric.tryCreate(value + num.one)
91+
def toPositiveNumeric: Option[PositiveNumeric[T]] = PositiveNumeric.create(value).toOption
9192

9293
def +(other: NonNegativeNumeric[T]): NonNegativeNumeric[T] =
9394
NonNegativeNumeric.tryCreate(value + other.value)

community-build.sbt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@ lazy val `daml-script-tests` = CommunityProjects.`daml-script-tests`
1616
lazy val microbench = CommunityProjects.microbench
1717
lazy val `performance-driver` = CommunityProjects.`performance-driver`
1818
lazy val performance = CommunityProjects.performance
19-
lazy val demo = CommunityProjects.demo
2019
lazy val blake2b = CommunityProjects.blake2b
2120
lazy val `slick-fork` = CommunityProjects.`slick-fork`
22-
lazy val `pekko-fork` = CommunityProjects.`pekko-fork`
2321
lazy val `magnolify-addon` = CommunityProjects.`magnolify-addon`
2422
lazy val `scalatest-addon` = CommunityProjects.`scalatest-addon`
2523
lazy val `util-external` = CommunityProjects.`util-external`

community/app-base/src/main/scala/com/digitalasset/canton/admin/api/client/data/Topology.scala

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,12 @@ import com.digitalasset.canton.topology.*
1111
import com.digitalasset.canton.topology.admin.v30
1212
import com.digitalasset.canton.topology.transaction.*
1313

14-
final case class ListPartiesResult(party: PartyId, participants: Seq[ParticipantSynchronizers])
14+
final case class ListPartiesResult(
15+
partyResult: Party,
16+
participants: Seq[ParticipantSynchronizers],
17+
) {
18+
def party: PartyId = partyResult.partyId
19+
}
1520

1621
object ListPartiesResult {
1722
final case class SynchronizerPermission(

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,15 @@ class ConsoleEnvironment(
8383

8484
def consoleLogger: Logger = super.noTracingLogger
8585

86+
private lazy val health_ = new CantonHealthAdministration(this)
8687
@Help.Summary("Environment health inspection")
8788
@Help.Group("Health")
88-
private lazy val health_ = new CantonHealthAdministration(this)
8989
def health: CantonHealthAdministration = health_
9090

91-
@Help.Summary("Global secret operations")
92-
@Help.Group("Secret keys")
9391
protected lazy val global_secret_ = new GlobalSecretKeyAdministration(this, loggerFactory)
9492
// Overridden in TestEnvironment
93+
@Help.Summary("Global secret operations")
94+
@Help.Group("Secret keys")
9595
private[canton] def global_secret: GlobalSecretKeyAdministration = throw new RuntimeException(
9696
"Supported only in tests"
9797
)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ trait ConsoleMacros extends NamedLogging with NoTracing {
341341
val x: Value.Sum = value match {
342342
case x: Int => Value.Sum.Int64(x.toLong)
343343
case x: Long => Value.Sum.Int64(x)
344-
case x: PartyId => Value.Sum.Party(x.toLf)
344+
case x: Party => Value.Sum.Party(x.toLf)
345345
case x: Float => Value.Sum.Numeric(s"$x")
346346
case x: Double => Value.Sum.Numeric(s"$x")
347347
case x: String => Value.Sum.Text(x)

0 commit comments

Comments
 (0)