Skip to content

merge main into canton 3.5#4397

Open
nicu-da wants to merge 50 commits intocanton-3.5from
nicuda/canton-3.5/merge_main
Open

merge main into canton 3.5#4397
nicu-da wants to merge 50 commits intocanton-3.5from
nicuda/canton-3.5/merge_main

Conversation

@nicu-da
Copy link
Contributor

@nicu-da nicu-da commented Mar 12, 2026

Pull Request Checklist

Cluster Testing

  • If a cluster test is required, comment /cluster_test on this PR to request it, and ping someone with access to the DA-internal system to approve it.
  • If a hard-migration test is required (from the latest release), comment /hdm_test on this PR to request it, and ping someone with access to the DA-internal system to approve it.

PR Guidelines

  • Include any change that might be observable by our partners or affect their deployment in the release notes.
  • Specify fixed issues with Fixes #n, and mention issues worked on using #n
  • Include a screenshot for frontend-related PRs - see README or use your favorite screenshot tool

Merge Guidelines

  • Make the git commit message look sensible when squash-merging on GitHub (most likely: just copy your PR description).

mblaze-da and others added 30 commits March 6, 2026 10:17
Signed-off-by: Mateusz Błażejewski <mateusz.blazejewski@digitalasset.com>
* [skip ci] add pulumi package

Signed-off-by: krzysztofczyz-da <krzysztof.czyz@digitalasset.com>

* [ci] ci

Signed-off-by: krzysztofczyz-da <krzysztof.czyz@digitalasset.com>

* [ci] ci

Signed-off-by: krzysztofczyz-da <krzysztof.czyz@digitalasset.com>

* [ci] ci

Signed-off-by: krzysztofczyz-da <krzysztof.czyz@digitalasset.com>

---------

Signed-off-by: krzysztofczyz-da <krzysztof.czyz@digitalasset.com>
Signed-off-by: Itai Segall <itai.segall@digitalasset.com>
[static]

Signed-off-by: Mateusz Błażejewski <mateusz.blazejewski@digitalasset.com>
… updates (#4258)

* [ci] Bump the production-dependencies group

Bumps the production-dependencies group in /cluster/pulumi with 8 updates:

| Package | From | To |
| --- | --- | --- |
| [@google-cloud/sql](https://github.com/googleapis/google-cloud-node/tree/HEAD/packages/google-cloud-sql) | `0.20.1` | `0.24.0` |
| [@pulumi/command](https://github.com/pulumi/pulumi-command) | `1.1.3` | `1.2.0` |
| [@pulumi/gcp](https://github.com/pulumi/pulumi-gcp) | `9.10.0` | `9.13.0` |
| [@pulumi/kubernetes](https://github.com/pulumi/pulumi-kubernetes) | `4.25.0` | `4.26.0` |
| [@pulumi/pulumi](https://github.com/pulumi/pulumi/tree/HEAD/sdk/nodejs) | `3.220.0` | `3.223.0` |
| [@pulumi/random](https://github.com/pulumi/pulumi-random) | `4.19.0` | `4.19.1` |
| [@pulumi/std](https://github.com/pulumi/pulumi-std) | `2.2.0` | `2.3.2` |
| [@pulumi/auth0](https://github.com/pulumi/pulumi-auth0) | `3.36.0` | `3.38.0` |


Updates `@google-cloud/sql` from 0.20.1 to 0.24.0
- [Release notes](https://github.com/googleapis/google-cloud-node/releases)
- [Changelog](https://github.com/googleapis/google-cloud-node/blob/main/packages/google-cloud-sql/CHANGELOG.md)
- [Commits](https://github.com/googleapis/google-cloud-node/commits/v0.24.0/packages/google-cloud-sql)

Updates `@pulumi/command` from 1.1.3 to 1.2.0
- [Release notes](https://github.com/pulumi/pulumi-command/releases)
- [Commits](pulumi/pulumi-command@v1.1.3...v1.2.0)

Updates `@pulumi/gcp` from 9.10.0 to 9.13.0
- [Release notes](https://github.com/pulumi/pulumi-gcp/releases)
- [Changelog](https://github.com/pulumi/pulumi-gcp/blob/master/CHANGELOG_OLD.md)
- [Commits](pulumi/pulumi-gcp@v9.10.0...v9.13.0)

Updates `@pulumi/kubernetes` from 4.25.0 to 4.26.0
- [Release notes](https://github.com/pulumi/pulumi-kubernetes/releases)
- [Changelog](https://github.com/pulumi/pulumi-kubernetes/blob/master/CHANGELOG.md)
- [Commits](pulumi/pulumi-kubernetes@v4.25.0...v4.26.0)

Updates `@pulumi/pulumi` from 3.220.0 to 3.223.0
- [Release notes](https://github.com/pulumi/pulumi/releases)
- [Changelog](https://github.com/pulumi/pulumi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pulumi/pulumi/commits/v3.223.0/sdk/nodejs)

Updates `@pulumi/random` from 4.19.0 to 4.19.1
- [Release notes](https://github.com/pulumi/pulumi-random/releases)
- [Changelog](https://github.com/pulumi/pulumi-random/blob/master/CHANGELOG_OLD.md)
- [Commits](pulumi/pulumi-random@v4.19.0...v4.19.1)

Updates `@pulumi/std` from 2.2.0 to 2.3.2
- [Release notes](https://github.com/pulumi/pulumi-std/releases)
- [Changelog](https://github.com/pulumi/pulumi-std/blob/master/CHANGELOG.md)
- [Commits](pulumi/pulumi-std@v2.2.0...v2.3.2)

Updates `@pulumi/auth0` from 3.36.0 to 3.38.0
- [Release notes](https://github.com/pulumi/pulumi-auth0/releases)
- [Changelog](https://github.com/pulumi/pulumi-auth0/blob/master/CHANGELOG_OLD.md)
- [Commits](pulumi/pulumi-auth0@v3.36.0...v3.38.0)

---
updated-dependencies:
- dependency-name: "@google-cloud/sql"
  dependency-version: 0.24.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: "@pulumi/command"
  dependency-version: 1.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: "@pulumi/gcp"
  dependency-version: 9.13.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: "@pulumi/kubernetes"
  dependency-version: 4.26.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: "@pulumi/pulumi"
  dependency-version: 3.223.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: "@pulumi/random"
  dependency-version: 4.19.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: "@pulumi/std"
  dependency-version: 2.3.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: "@pulumi/auth0"
  dependency-version: 3.38.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump pulumi

Signed-off-by: krzysztofczyz-da <krzysztof.czyz@digitalasset.com>

* Bump pulumi

Signed-off-by: krzysztofczyz-da <krzysztof.czyz@digitalasset.com>

* Fix tests

Signed-off-by: krzysztofczyz-da <krzysztof.czyz@digitalasset.com>

* [ci] Change package-lockl

Signed-off-by: krzysztofczyz-da <krzysztof.czyz@digitalasset.com>

* [ci] update expected

Signed-off-by: krzysztofczyz-da <krzysztof.czyz@digitalasset.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: krzysztofczyz-da <krzysztof.czyz@digitalasset.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: krzysztofczyz-da <krzysztof.czyz@digitalasset.com>
* Apply vetting split to expired amulet triggers

part of #4251

[ci]

I can't quite convince myself that setting up integration tests for
this only to then have some log assertions or something like that is
worth it but happy to be convinced it is.

Signed-off-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>

* review

[ci]

Signed-off-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>

---------

Signed-off-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>
Co-authored-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>
Signed-off-by: Robert Autenrieth <robert.autenrieth@digitalasset.com>
[static]

Signed-off-by: Julien Tinguely <julien.tinguely@digitalasset.com>
…5 updates (#4257)

* [ci] Bump the development-dependencies group across 1 directory with 5 updates

Bumps the development-dependencies group with 5 updates in the /cluster/pulumi directory:

| Package | From | To |
| --- | --- | --- |
| [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) | `2.29.1` | `2.32.0` |
| [minimatch](https://github.com/isaacs/minimatch) | `10.2.2` | `10.2.4` |
| [prettier](https://github.com/prettier/prettier) | `3.4.2` | `3.8.1` |
| [@types/lodash](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/lodash) | `4.17.23` | `4.17.24` |
| [dedent](https://github.com/dmnd/dedent) | `1.7.1` | `1.7.2` |



Updates `eslint-plugin-import` from 2.29.1 to 2.32.0
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases)
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md)
- [Commits](import-js/eslint-plugin-import@v2.29.1...v2.32.0)

Updates `minimatch` from 10.2.2 to 10.2.4
- [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md)
- [Commits](isaacs/minimatch@v10.2.2...v10.2.4)

Updates `prettier` from 3.4.2 to 3.8.1
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](prettier/prettier@3.4.2...3.8.1)

Updates `@types/lodash` from 4.17.23 to 4.17.24
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/lodash)

Updates `dedent` from 1.7.1 to 1.7.2
- [Release notes](https://github.com/dmnd/dedent/releases)
- [Changelog](https://github.com/dmnd/dedent/blob/main/CHANGELOG.md)
- [Commits](dmnd/dedent@v1.7.1...v1.7.2)

---
updated-dependencies:
- dependency-name: eslint-plugin-import
  dependency-version: 2.32.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: development-dependencies
- dependency-name: minimatch
  dependency-version: 10.2.4
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
- dependency-name: prettier
  dependency-version: 3.8.1
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: development-dependencies
- dependency-name: "@types/lodash"
  dependency-version: 4.17.24
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
- dependency-name: dedent
  dependency-version: 1.7.2
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

* [ci]run npm update to readd peer groups

Signed-off-by: krzysztofczyz-da <krzysztof.czyz@digitalasset.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: krzysztofczyz-da <krzysztof.czyz@digitalasset.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: krzysztofczyz-da <krzysztof.czyz@digitalasset.com>
Confirmation requests are not particularly useful for seeing where
traffic comes from in a lot of cases since they just show the
wallet. Confirmation responses allow us to attribute it to specific
apps.

[static]

Signed-off-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>
Co-authored-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>
Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.1.2 to 3.1.5.
- [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md)
- [Commits](isaacs/minimatch@v3.1.2...v3.1.5)

---
updated-dependencies:
- dependency-name: minimatch
  dependency-version: 3.1.5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Improve the existing sequencer-rate-limits Grafana dashboard:
- Fix bug in Topology TPS panel (wrong metric name)
- Separate global usage and per-member caps into distinct panels
- Add circuit breaker state panel
- Add throughput cap rejection rate panel with member/rejection_type labels
- Organize panels into collapsible row sections
- Add axis labels and improve legends

Add new alerting rules:
- Throughput cap rejection rate > 0 (warning, 5m)
- Circuit breaker open state (critical, 5m)

Signed-off-by: Martin Florian <martin.florian@digitalasset.com>
…v0/events (#4263)

Signed-off-by: Tim Emiola <adetokunbo@emio.la>
Co-authored-by: Divam <681060+dfordivam@users.noreply.github.com>
Signed-off-by: krzysztofczyz-da <krzysztof.czyz@digitalasset.com>
Signed-off-by: Itai Segall <itai.segall@digitalasset.com>
Co-authored-by: Raymond Roestenburg <98821776+ray-roestenburg-da@users.noreply.github.com>
Signed-off-by: Itai Segall <itai.segall@digitalasset.com>
Signed-off-by: Itai Segall <itai.segall@digitalasset.com>
Signed-off-by: Itai Segall <itai.segall@digitalasset.com>
This reverts commit 0419d7b.

[ci]

Signed-off-by: Robert Autenrieth <robert.autenrieth@digitalasset.com>
See release notes here
https://github.com/prometheus/prometheus/releases/tag/v3.9.0

[static]

Will backport to 0.5.14. Testing on a scratch that I get working
histograms again with that fix.

Signed-off-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>
Co-authored-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>
Signed-off-by: krzysztofczyz-da <krzysztof.czyz@digitalasset.com>
[ci]

Signed-off-by: Pasindu Tennage <pasindu.tennage@digitalasset.com>
Signed-off-by: Itai Segall <itai.segall@digitalasset.com>
[static]

Signed-off-by: Oriol Muñoz <oriol.munoz@digitalasset.com>
This alert is no longer useful now that sequencer caps (#4315) handle per-member rate limiting at the protocol level.

Fixes #2917

[static]

Signed-off-by: Martin Florian <martin.florian@digitalasset.com>
[static]

Signed-off-by: Mateusz Błażejewski <mateusz.blazejewski@digitalasset.com>
---------

Signed-off-by: Oriol Muñoz <oriol.munoz@digitalasset.com>
[ci]

Signed-off-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>
Co-authored-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>
[static] 

Signed-off-by: Julien Tinguely <julien.tinguely@digitalasset.com>
[ci]

Signed-off-by: Pasindu Tennage <pasindu.tennage@digitalasset.com>
OriolMunoz-da and others added 8 commits March 11, 2026 16:24
[static]

Signed-off-by: Oriol Muñoz <oriol.munoz@digitalasset.com>
[ci]

Signed-off-by: Oriol Muñoz <oriol.munoz@digitalasset.com>
[ci]

Signed-off-by: Julien Tinguely <julien.tinguely@digitalasset.com>
Signed-off-by: Itai Segall <itai.segall@digitalasset.com>
[static]

Signed-off-by: Julien Tinguely <julien.tinguely@digitalasset.com>
…lice docs (#4387)

* Extend the wallet UI to manage DevelopmentFundCoupons using WalletAPI
* Make the development coupon history visible to the beneficiary
* Add development fund management section to Splice docs

---------

Signed-off-by: Jose Velasco <jose.velasco@intellecteu.com>
Signed-off-by: Roman Matsuiev <roman.matsuiev@intellecteu.com>
Signed-off-by: Paweł Perek <pawel.perek@digitalasset.com>
Co-authored-by: Simon Meier <simon@digitalasset.com>
Co-authored-by: Roman Matsuiev <roman.matsuiev@intellecteu.com>
Co-authored-by: Paweł Perek <pawel.perek@digitalasset.com>
* add rejections per member to the rate limit dashboard

[static]

Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com>
# Conflicts:
#	apps/common/src/main/scala/org/lfdecentralizedtrust/splice/environment/PackageVettingLookupService.scala
#	cluster/deployment/scratchnetb/config.yaml
#	cluster/deployment/scratchnetc/config.yaml
#	cluster/pulumi/package-lock.json
#	nix/canton-sources.json

[ci]

Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com>
@mblaze-da
Copy link
Contributor

martinflorian-da and others added 3 commits March 12, 2026 16:04
Testing for hyperledger-labs/splice-shared-gha#7

Will clean this up in the end but apparently I need to merge to main so I can dispatch.

Signed-off-by: Martin Florian <martin.florian@digitalasset.com>
[static]

Signed-off-by: Mateusz Błażejewski <mateusz.blazejewski@digitalasset.com>
Follow-up to #4394 after hyperledger-labs/splice-shared-gha#7 got merged.

[static]

Signed-off-by: Martin Florian <martin.florian@digitalasset.com>
@nicu-da nicu-da force-pushed the nicuda/canton-3.5/merge_main branch from c8e8e55 to f316f55 Compare March 13, 2026 09:11
moritzkiefer-da and others added 4 commits March 13, 2026 09:26
fixes #4251

[ci]

Similar argument as in
#4304 for testing.

Signed-off-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>
Co-authored-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>
bump canton [ci]

Signed-off-by: Julien Tinguely <julien.tinguely@digitalasset.com>
#4255)" (#4407)

This reverts commit aae4f8b.

[static]

Signed-off-by: Martin Florian <martin.florian@digitalasset.com>
[static]

Signed-off-by: Julien Tinguely <julien.tinguely@digitalasset.com>
@nicu-da nicu-da force-pushed the nicuda/canton-3.5/merge_main branch 2 times, most recently from 956ef82 to e0010c3 Compare March 13, 2026 13:29
… 0.5.16 (#4411)

[ci]

Signed-off-by: Julien Tinguely <julien.tinguely@digitalasset.com>
@nicu-da nicu-da force-pushed the nicuda/canton-3.5/merge_main branch 2 times, most recently from ff542b5 to 8ce5982 Compare March 13, 2026 14:48
nicu-da added 3 commits March 13, 2026 15:01
[ci]

Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com>
this ensures that all the SVs can remove the successors

[ci]

Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com>
… response type json

This prevents failures on the client side as the default 404 returns text/plain

[ci]

Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com>
@nicu-da nicu-da force-pushed the nicuda/canton-3.5/merge_main branch from 8ce5982 to 2ac6a66 Compare March 13, 2026 15:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.