Merge main into canton-3.4 #1323

moritzkiefer-da · 2025-07-04T06:07:19Z

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).

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

* Cache SV node state based queries [ci] fixes #1141 Signed-off-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org> * fix cache metrics [ci] Signed-off-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org> * review [ci] Signed-off-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org> * fix [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: Julien Tinguely <julien.tinguely@digitalasset.com>

…re failing (#1151) --------- Signed-off-by: Oriol Muñoz <oriol.munoz@digitalasset.com>

* split off script * support create/delete, invoke script from pulumi * incorporate #1136 gcloud login/logging changes * set -u and better quoting --------- Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>

Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>

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

[ci] fixes #1170 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>

…#1135) * [ci] Track active_parties in scan aggregation for better performance. Signed-off-by: Raymond Roestenburg <raymond.roestenburg@digitalasset.com> * [ci] Added tests. Signed-off-by: Raymond Roestenburg <raymond.roestenburg@digitalasset.com> * Update apps/scan/src/test/scala/org/lfdecentralizedtrust/splice/store/db/ScanAggregatorTest.scala Co-authored-by: moritzkiefer-da <45630097+moritzkiefer-da@users.noreply.github.com> Signed-off-by: Raymond Roestenburg <98821776+ray-roestenburg-da@users.noreply.github.com> * [ci]review, upsert instead. Signed-off-by: Raymond Roestenburg <raymond.roestenburg@digitalasset.com> * [ci] review: added test where parties are active, not active, active again for a few rounds. Signed-off-by: Raymond Roestenburg <raymond.roestenburg@digitalasset.com> --------- Signed-off-by: Raymond Roestenburg <raymond.roestenburg@digitalasset.com> Signed-off-by: Raymond Roestenburg <98821776+ray-roestenburg-da@users.noreply.github.com> Co-authored-by: DA Automation <splice-maintainers@digitalasset.com> Co-authored-by: moritzkiefer-da <45630097+moritzkiefer-da@users.noreply.github.com>

Signed-off-by: Robert Autenrieth <robert.autenrieth@digitalasset.com>

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

…has exceeded the maximum allowed cardinality (1999)" (#1183) --------- Signed-off-by: Oriol Muñoz <oriol.munoz@digitalasset.com>

Signed-off-by: Raymond Roestenburg <raymond.roestenburg@digitalasset.com>

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

* Limit cometbft load balancer ports to only those actually used [static] Signed-off-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org> * fix sv runbook [static] 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>

* Always expose sv runbook cometbft port fixes DACH-NY/cn-test-failures#4702 [static] Probably could be more clever here but doesn't seem worth the complexity and potential breakage. Signed-off-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org> * Add missing dependency on splice-pulumi-common-sv [static] I hope this makes the pulumi operator happy again and fixes this ``` src/istio.ts(4,52): error TS2307: Cannot find module 'splice-pulumi-common-sv' or its corresponding type declarations. ``` Signed-off-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org> * fmt [static] 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>

* Undo our changes Signed-off-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org> * Bump Canton commit Signed-off-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org> * Reapply our changes Signed-off-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org> * Resolve conflicts [ci] Signed-off-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org> * bump commit [ci] Signed-off-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org> * add headers [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>

* Revert "Always expose sv runbook cometbft port (#1198)" This reverts commit 0c2232a. Signed-off-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org> * Revert "Limit cometbft load balancer ports to only those actually used (#1190)" This reverts commit d54f7c6. Signed-off-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org> * Only filter cometbft ports by migrations Changing the dependency structure is too much of a mess and this seems good enough. [static] 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>

…Tool (#1172) Signed-off-by: cathyjung-da <cathy.jung@digitalasset.com>

…1210) - also removes some trailing spaces Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>

…idators (#1209)

Signed-off-by: Peter Kvokacka <peter.kvokacka@digitalasset.com>

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

Signed-off-by: Peter Kvokacka <peter.kvokacka@digitalasset.com>

* dataset and table renames * remove CALLs * cleanup unusable local variables * stricter json types * fix ambiguity when >2 migration_id args are present * reindent --------- Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>

Addresses Quantstamp issue CC-5; and all of their auditor suggestions from S-2 that we want to address. See the release notes for details. [ci] Signed-off-by: Simon Meier <simon@digitalasset.com>

…1290) Otherwise it seems like we're added back as assignees whenever a PR is edited. I prefer to unassign myself from PRs that are already shepherded by someone, so they stop showing up in my `gh status` and other overviews. [static] Signed-off-by: Martin Florian <martin.florian@digitalasset.com>

So that expired ones or unwanted ones do not stay arund forever. Addresses Quanstamp S-4. [ci] Signed-off-by: Simon Meier <simon@digitalasset.com>

* Enforce topup interval >= polling interval fixes #1138 [ci] Signed-off-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org> * Actually commit the test [ci] Signed-off-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org> * . [static] 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>

Addresses CC-4 [ci] Signed-off-by: Simon Meier <simon@digitalasset.com>

in favor of calling the specific consuming choices implementing the desired logic. Addresses Quantstamp S-3. [ci] Signed-off-by: Simon Meier <simon@digitalasset.com>

Addresses Quantstamp S-7. [ci] Signed-off-by: Simon Meier <simon@digitalasset.com>

These are necessary to be able to run the `start-canton.sh` script on a system having an existing postgres running on port 5432.

Both for votes on a VoteRequest and for updating an SVs AmuletPriceVote. Addresses Quanstamp CC-1. [ci] Signed-off-by: Simon Meier <simon@digitalasset.com> Signed-off-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>

…n dump (#1297) Fixes DACH-NY/canton-network-internal#730 Signed-off-by: Martin Florian <martin.florian@digitalasset.com>

Addresses Quantstamp S-8 albeit only deprecating the AmuletRules_(Add|Remove|Update)FutureAmuletConfigSchdule. Full removal of these choices will follow as part of #925 [ci] Signed-off-by: Simon Meier <simon@digitalasset.com>

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

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

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

@moritzkiefer-da

#1244) * initial transfer participants extraction for scan bigquery * splat outputs, retrieve receivers, uniquify * unify senders and receivers - suggested by @moritzkiefer-da; thanks * daml_record_path * change all the total supply calls to use it * SELECT can't occur in a JSONPath calculation * copy utilities to transfer-participants --------- Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>

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

moritzkiefer-da · 2025-07-04T06:11:35Z

This is failing the DCO check as people seem to remove that when merging to main. Most practical option seem to be to temporarily make that a non-required check to merge this. I don't want to cleanup 50 commits.

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

julientinguely-da and others added 30 commits June 17, 2025 14:03

Bump check timeout in DisabledWalletTimeBasedIntegrationTest (#1142)

c0cd93f

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

fix development readme (#1152)

b3dc3fd

Fix ValidatorPreflightIntegrationTest (#1157)

73f51f8

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

Avoid refreshing BftScanConnection too often when less than f scans a…

ae01265

…re failing (#1151) --------- Signed-off-by: Oriol Muñoz <oriol.munoz@digitalasset.com>

external script for publication/replication slots (#1117)

ec95f03

* split off script * support create/delete, invoke script from pulumi * incorporate #1136 gcloud login/logging changes * set -u and better quoting --------- Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>

use denormalized columns throughout bigqueries (#1155)

d323414

Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>

Fix BFT refresh retry loop (#1162)

34fb459

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

Make JWKS connection timeouts configurable (#1146)

2100cb1

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

Support overwriting bootstrap scripts (#1174)

1e59217

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

Add feature flag for import update backfilling (#1165)

4d71356

Signed-off-by: Robert Autenrieth <robert.autenrieth@digitalasset.com>

[static] Use latest secret version when reading dns secret (#1175)

44f49aa

Make scan optional in cluster config (#1179)

ed86c4b

Signed-off-by: Robert Autenrieth <robert.autenrieth@digitalasset.com>

Upgrade Canton to include extra debug options (#1182)

2da437f

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

Fwd-port: Ignore "Instrument splice.trigger.latency.duration.seconds …

964cc50

…has exceeded the maximum allowed cardinality (1999)" (#1183) --------- Signed-off-by: Oriol Muñoz <oriol.munoz@digitalasset.com>

[static] Update release notes. (#1184)

ca030a1

Signed-off-by: Raymond Roestenburg <raymond.roestenburg@digitalasset.com>

Bump version and latest_release following 0.4.2 release (#1186)

a726258

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

[static] Increase pulumi workspace termination seconds (#1188)

5cb8121

Add new community contribution: Automated Helm/Kubernetes Templating …

ac6f0d5

…Tool (#1172) Signed-off-by: cathyjung-da <cathy.jung@digitalasset.com>

fix rst warning in docs/bundle helm-kubernetes-templating-tool.rst (#…

9fce57c

…1210) - also removes some trailing spaces Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>

[static] Remove custom versions for the pulumi operator and multi val…

420bb94

…idators (#1209)

- remove devnet support from Splice LocalNet[ci] (#1212)

a350d25

Signed-off-by: Peter Kvokacka <peter.kvokacka@digitalasset.com>

[static] Remove charts version and override version (#1218)

bd0c6c4

Fix dns secret version (#1220)

7357b68

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

- fix splice-localnet-compose.sh [ci] (#1222)

4e69254

Signed-off-by: Peter Kvokacka <peter.kvokacka@digitalasset.com>

isegall-da and others added 23 commits July 1, 2025 14:29

Fix docker-compose docs re migrating to auth (#1266)

04d1ab1

daml: add more input validation (#1276)

139ee12

Addresses Quantstamp issue CC-5; and all of their auditor suggestions from S-2 that we want to address. See the release notes for details. [ci] Signed-off-by: Simon Meier <simon@digitalasset.com>

[static] Add dashboard for caches (#1294)

004cfde

daml: allow withdraw and reject for ExternalPartySetupProposal (#1295)

bb80f48

So that expired ones or unwanted ones do not stay arund forever. Addresses Quanstamp S-4. [ci] Signed-off-by: Simon Meier <simon@digitalasset.com>

daml: add missing expiry checks (#1275)

dab0bb4

Addresses CC-4 [ci] Signed-off-by: Simon Meier <simon@digitalasset.com>

Support a nix env with no artifactory access (#1283)

edfb6bc

daml: avoid unneccesary direct archive (#1302)

079a028

in favor of calling the specific consuming choices implementing the desired logic. Addresses Quantstamp S-3. [ci] Signed-off-by: Simon Meier <simon@digitalasset.com>

daml: check dso party in executeConfirmedAction (#1292)

82713d0

Addresses Quantstamp S-7. [ci] Signed-off-by: Simon Meier <simon@digitalasset.com>

[ci] fix beneficiary unvetting test (#1298)

05ca517

Fixes to postgres.sh, start-canton, frontends scripts (#1285)

80f5f8b

These are necessary to be able to run the `start-canton.sh` script on a system having an existing postgres running on port 5432.

daml: rate limit casting votes (#1273)

af17abb

Both for votes on a VoteRequest and for updating an SVs AmuletPriceVote. Addresses Quanstamp CC-1. [ci] Signed-off-by: Simon Meier <simon@digitalasset.com> Signed-off-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>

[ci] Fix daml compat integration tests (#1305)

94f4d9c

Fail hard if migration ID incremented without restoring from migratio…

03c0173

…n dump (#1297) Fixes DACH-NY/canton-network-internal#730 Signed-off-by: Martin Florian <martin.florian@digitalasset.com>

[ci] Cleanup caching in scan store to prep for multiple caches (#1308)

7241a60

Prep release notes for 0.4.4 release (#1310)

1fe2f08

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

Bump version and latest release (#1318)

4afd009

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

Upload actual token standard test data for debugging (#1307)

957a008

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

Merge remote-tracking branch 'origin/main' into canton-3.4

5ad3a93

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

moritzkiefer-da requested a review from nicu-da July 4, 2025 06:07

nicu-da approved these changes Jul 4, 2025

View reviewed changes

Remove sequencer-api-limits section as it is not forward-ported yet

344ea31

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

moritzkiefer-da force-pushed the cocreature/3.4-main branch from 0e9bfe7 to 344ea31 Compare July 4, 2025 06:42

moritzkiefer-da merged commit d85a101 into canton-3.4 Jul 4, 2025
56 of 58 checks passed

moritzkiefer-da deleted the cocreature/3.4-main branch July 4, 2025 07:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge main into canton-3.4 #1323

Merge main into canton-3.4 #1323

Uh oh!

moritzkiefer-da commented Jul 4, 2025

Uh oh!

moritzkiefer-da commented Jul 4, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

17 participants

Merge main into canton-3.4 #1323

Merge main into canton-3.4 #1323

Uh oh!

Conversation

moritzkiefer-da commented Jul 4, 2025

Pull Request Checklist

Cluster Testing

PR Guidelines

Merge Guidelines

Uh oh!

moritzkiefer-da commented Jul 4, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

17 participants