Skip to content

Conversation

@martinflorian-da
Copy link
Contributor

@martinflorian-da martinflorian-da commented Oct 17, 2025

...and this time it looks like a real merge commit!

moritzkiefer-da and others added 21 commits October 15, 2025 12:38
[ci]

Includes the rate limits, note that they are off by default so this
does not yet enable that. @nicu-da wanted to test them on CILR and
then enable them.

Signed-off-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>
Co-authored-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>
Signed-off-by: Itai Segall <itai.segall@digitalasset.com>
* [ci] Add tests for reward automation and handle failures

Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com>
Signed-off-by: Itai Segall <itai.segall@digitalasset.com>
---------

Signed-off-by: Oriol Muñoz <oriol.munoz@digitalasset.com>
* Improve logging of ScanVerdictStoreIngestion

[ci]

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

* [ci] one more log

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

* [ci] custom assertion with more useful logging

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

* [ci] the one time Product with Serializable didn't matter

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

* Fix race condition in ScanEventStore.getEvents

[ci]

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

---------

Signed-off-by: Oriol Muñoz <oriol.munoz@digitalasset.com>
* `User-Agent` prevents us from testing this

* SuppressingLogger doesn't work here; ensure failure when fix not in place

With this test:

Found problems in log/canton_network_test.clog:
{"@timestamp":"2025-10-15T19:57:51.409Z","message":"Illegal header: Illegal 'user-agent' header: Invalid input '/', expected tchar, OWS, comment, product-or-comment or 'EOI' (line 1, column 24): OpenAPI-Generator/0.0.1/java\n                       ^",...}

* ignore-illegal-header-for user-agent

With this test:

No problems found in log/canton_network_test.clog.

---------

Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
Signed-off-by: Itai Segall <itai.segall@digitalasset.com>
#2672)

* add a psql subcommand to cncluster script for convenient DB inspection

[static]

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

* fix a hardcoded namespace in cncluster psql

[static]

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

* correct the DB name resolution in the cncluster psql command

[static]

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

* infer the schema name for search_path in cncluster psql subcommand based on application name

[static]

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

---------

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

Signed-off-by: fayi-da <fayimora.femibalogun@digitalasset.com>
This reverts what's left of #2476 / commit 80382a5.

Fixes DACH-NY/cn-test-failures#5959

Signed-off-by: Martin Florian <martin.florian@digitalasset.com>
Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com>
* Always show json for config forms
* Reset weight when sv is changed in form

part of #2550

Signed-off-by: fayi-da <fayimora.femibalogun@digitalasset.com>
Also:
- Makes the alreadyExists check more robust
- Fixes the behavior of the sanity plugin

---------

Signed-off-by: Oriol Muñoz <oriol.munoz@digitalasset.com>
Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com>
… behavior (#2738)

Fixes DACH-NY/cn-test-failures#5954,
adapting [according to bisect] to #2707.

Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
+ cleanup HDM test workaround

Part of DACH-NY/canton-network-internal#2180

[ci]

Signed-off-by: Martin Florian <martin.florian@digitalasset.com>
…setups (#2601)

Fixed validator,sv,localnet docker-compose to use localhost by default, with option to expose externally.

Added Release notes, and missing flags

Added Integration test to check if by default SV and validator bind to only localhost, when used with docker compose.

/cluster_test checked
…2744)

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

Signed-off-by: Martin Florian <martin.florian@digitalasset.com>
@martinflorian-da

This comment was marked as outdated.

@github-actions

This comment was marked as outdated.

[ci]

Signed-off-by: Martin Florian <martin.florian@digitalasset.com>
@martinflorian-da
Copy link
Contributor Author

/hdm_test

@github-actions
Copy link

Deploy HDM pipeline triggered for Commit be8ad8411fe3dc01c169b4598c9b3fa452e9a620 in , please contact a Contributor to approve it in CircleCI: https://app.circleci.com/pipelines/github/DACH-NY/canton-network-internal/36964

@martinflorian-da
Copy link
Contributor Author

@martinflorian-da martinflorian-da marked this pull request as ready for review October 20, 2025 07:36
Copy link
Contributor

@moritzkiefer-da moritzkiefer-da left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Let's make sure to not squash merge so it also stays a proper merge commit.

@martinflorian-da
Copy link
Contributor Author

Thanks! Let's make sure to not squash merge so it also stays a proper merge commit.

yes yes yes

@martinflorian-da martinflorian-da merged commit d9eed23 into canton-3.4 Oct 20, 2025
57 checks passed
@martinflorian-da martinflorian-da deleted the martinflorian-da/3.4-lets-merge-main-20251017 branch October 20, 2025 07:40
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.

10 participants