Skip to content

chore: sync main with upstream splice main - #102

Merged
sadiq1971 merged 123 commits into
mainfrom
chore/sync-main-upstream-0.10.2
Nov 9, 2026
Merged

sadiq1971 merged 123 commits into
mainfrom
chore/sync-main-upstream-0.10.2

Conversation

@sadiq1971

Copy link
Copy Markdown
Collaborator

Refs ChainSafe/canton-extending-mainnet#114

Summary: Merges upstream canton-network/splice main (97df2c439, 122 commits since our last sync) into main: Canton 3.7.2, LATEST_RELEASE 0.10.1 and the _V2 CI secret names that the frontend and GCP test jobs now need. Our Daml packages keep their versions and are rebuilt on upstream's 0.10.1 sources. Please merge with a merge commit, not squash, so main keeps upstream's history.

mrdziuban and others added 30 commits October 28, 2026 18:56
Signed-off-by: Matt Dziuban <mrdziuban@gmail.com>
Signed-off-by: Jagath Weerasinghe <jagath.weerasinghe@digitalasset.com>
…ton-network#8025)

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Paweł Perek <pawel.perek@digitalasset.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Paweł Perek <pawel.perek@digitalasset.com>
Signed-off-by: Itai Segall <itai.segall@digitalasset.com>
…n-allocation-request (canton-network#8101)

Signed-off-by: Julien Tinguely <julien.tinguely@digitalasset.com>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Paweł Perek <pawel.perek@digitalasset.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Paweł Perek <pawel.perek@digitalasset.com>
…8041)

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Paweł Perek <pawel.perek@digitalasset.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Paweł Perek <pawel.perek@digitalasset.com>
Signed-off-by: krzysztofczyz-da <krzysztof.czyz@digitalasset.com>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Paweł Perek <pawel.perek@digitalasset.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Paweł Perek <pawel.perek@digitalasset.com>
…cript (canton-network#8119)

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

Signed-off-by: pasindutennage-da <pasindu.tennage@digitalasset.com>

Signed-off-by: Pasindu Tennage <pasindu.tennage@digitalasset.com>
* fix permissions

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

* [force] empty

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

---------

Signed-off-by: krzysztofczyz-da <krzysztof.czyz@digitalasset.com>
…canton-network#8124)

Signed-off-by: Raymond Roestenburg <raymond.roestenburg@digitalasset.com>
…work#8126)

Signed-off-by: Robert Autenrieth <robert.autenrieth@digitalasset.com>
Signed-off-by: Raymond Roestenburg <raymond.roestenburg@digitalasset.com>
Signed-off-by: Matt Dziuban <mrdziuban@gmail.com>
…canton-network#8125)

* Bootstrap the SV1 synchronizer topology in a temporary topology store

fixes DACH-NY/cn-test-failures#10844

Slightly unsure about keeping the test forever but it is useful for
testing the change (it fails without the fix and works with).

Fixes any pv incompatibility issues around use of the authorized store
while avoiding pitfalls from genereateOnboardingTransactions for
sequencer and mediator.

[ci]

Signed-off-by: moritz.kiefer@digitalasset.com <moritz.kiefer@purelyfunctional.org>

* fix log files

[ci]

Signed-off-by: moritz.kiefer@digitalasset.com <moritz.kiefer@purelyfunctional.org>

---------

Signed-off-by: moritz.kiefer@digitalasset.com <moritz.kiefer@purelyfunctional.org>
Co-authored-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>
…n SV (canton-network#8129)

[ci]

Signed-off-by: moritz.kiefer@digitalasset.com <moritz.kiefer@purelyfunctional.org>
Co-authored-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>
…-network#7982)

scan_party_monitor.py watches a Scan instance for activity of a
configured set of tracked parties and reports:

- transfers of Amulet from a tracked party to a party that is not one of
  its expected recipients, and
- for tracked parties with alert_confirmations set, every transaction in
  which the party is a confirming party.

Matches are printed to stdout as one JSON object per transaction, and
optionally posted to a Slack channel through an incoming webhook.

The script only needs Python 3 and its standard library.

Assisted-by: Claude:claude-5.5-opus
Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
…anton-network#8023)

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Paweł Perek <pawel.perek@digitalasset.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Paweł Perek <pawel.perek@digitalasset.com>
- runs with [ci], but in no other mode
- scripts/check-python-types.sh: run mypy typechecks with proper
  settings, default is repo-wide configured locations
- scripts/run-python-tests.sh: run unittest; default repo-wide
  configured locations as well
- scripts/python-locations.sh: the locations typed/tested (update as
  Python is added)

Assisted-by: Claude:claude-5.5-sonnet
Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
Signed-off-by: Simon Meier <simon@digitalasset.com>
…ton-network#8054)

Signed-off-by: Rashad Gover <phantomtype@protonmail.com>
…canton-network#8024)

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Paweł Perek <pawel.perek@digitalasset.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Paweł Perek <pawel.perek@digitalasset.com>
…ton-network#8027)

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Paweł Perek <pawel.perek@digitalasset.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Paweł Perek <pawel.perek@digitalasset.com>
to remove the limit on transfer description sizes.

Fixes canton-network#7991 [ci]

Signed-off-by: Simon Meier <simon@digitalasset.com>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Paweł Perek <pawel.perek@digitalasset.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Paweł Perek <pawel.perek@digitalasset.com>
…etwork#8137)

Signed-off-by: Oriol Muñoz <oriol.munoz@digitalasset.com>
…integration tests (canton-network#7026)

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

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Paweł Perek <pawel.perek@digitalasset.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Paweł Perek <pawel.perek@digitalasset.com>
martinflorian-da and others added 26 commits November 4, 2026 19:04
Signed-off-by: Martin Florian <martin.florian@digitalasset.com>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Paweł Perek <pawel.perek@digitalasset.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Paweł Perek <pawel.perek@digitalasset.com>
…where (canton-network#8219)

- new migration target: V074__string_interning.sql
- backfillNone is always set on datastream
- bigquery-cloudsql.sh behaves better under concurrent updates (common
  for both streams to trigger it in parallel)
- improve `cncluster reset` a bit on nets with BigQuery deployed
- needs backfill follow-ups

Assisted-by: Claude:claude-5.5-opus
Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
…k#8169)

Signed-off-by: DA Automation <splice-maintainers@digitalasset.com>
Co-authored-by: DA Automation <splice-maintainers@digitalasset.com>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Paweł Perek <pawel.perek@digitalasset.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Paweł Perek <pawel.perek@digitalasset.com>
…d record

Signed-off-by: Robert Autenrieth <robert.autenrieth@digitalasset.com>
…anton-network#8197)

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Paweł Perek <pawel.perek@digitalasset.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Paweł Perek <pawel.perek@digitalasset.com>
Signed-off-by: JYC11 <jaeyoon.c@gmail.com>
Signed-off-by: Jaeyoon Cho <jaeyoon.c@gmail.com>
Co-authored-by: Simon Meier <simon@digitalasset.com>
Signed-off-by: Julien Tinguely <julien.tinguely@digitalasset.com>
…anton-network#8265)

Adds excludedHostPrefixes to the WAF rule groups: per-node host prefix
regexes (e.g. sequencer-[0-9]+) that the group skips, on top of the
global wafRules.excludedHostPrefixes. The body inspecting signatures
scan the binary protobuf payload of gRPC requests as text and produce
mostly false positives there, while signatures that only look at the
request metadata can stay on those hosts.

Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com>
…rk#8271)

[static]

Allows silencing the alert for a specific job.

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

Signed-off-by: Madalena Lourenco <madalena.lourenco@digitalasset.com>

* Trigger ci [ci]

Signed-off-by: Madalena Lourenco <madalena.lourenco@digitalasset.com>

---------

Signed-off-by: Madalena Lourenco <madalena.lourenco@digitalasset.com>
Signed-off-by: krzysztofczyz-da <krzysztof.czyz@digitalasset.com>
Signed-off-by: Jagath Weerasinghe <jagath.weerasinghe@digitalasset.com>
…anton-network#8218)

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Paweł Perek <pawel.perek@digitalasset.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Paweł Perek <pawel.perek@digitalasset.com>
---------

Signed-off-by: krzysztofczyz-da <krzysztof.czyz@digitalasset.com>
…ork#8325)

Signed-off-by: Paweł Perek <pawel.perek@digitalasset.com>
Signed-off-by: Madalena Lourenco <madalena.lourenco@digitalasset.com>
…age of healthy members (canton-network#8238)

Signed-off-by: Robert Autenrieth <robert.autenrieth@digitalasset.com>
…step (canton-network#8319)

Signed-off-by: Raymond Roestenburg <raymond.roestenburg@digitalasset.com>
…instead of forked source (canton-network#8257)

- clean up `CantonDependencies.scala` as well
- universal `community-base` exclusion
  as we still have fork changes there
- Remove unreferenced CantonDependencies entries

Assisted-by: Claude:claude-5.5-sonnet
Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
* Undo our changes

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

* Bump Canton commit

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

* Reapply our changes

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

* Bump Canton commit

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

* Align grpc, bouncycastle, circe, OpenTelemetry, jackson-core and protobuf with Canton 3.7

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

* Adapt to the Canton 3.7.1 fork: Vault commands without serverVersion, enableKeyDownload

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

* [ci] Bump the Canton fork to 3.7.1 for grpc 1.85 and drop the pins it makes redundant

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

* [ci] Pin okhttp 4 users to okhttp 5.5.0 so splice-node.jar has a single okhttp

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

---------

Signed-off-by: Raymond Roestenburg <raymond.roestenburg@digitalasset.com>
…#8347)

Signed-off-by: Simon Meier <simon@digitalasset.com>
Signed-off-by: Paweł Perek <pawel.perek@digitalasset.com>
Signed-off-by: Jagath Weerasinghe <jagath.weerasinghe@digitalasset.com>
Merges upstream main at 97df2c4 (0.10.2 dev, latest release 0.10.1,
Canton 3.7.2) into main.

Conflict resolution:
- dars.lock and DarResources: upstream changed our base Daml packages and
  released them in 0.10.1 at unchanged versions (amulet 0.1.25,
  dso-governance 0.1.31 and their dependents). Released versions keep
  upstream's hashes. Our versions (amulet 0.1.26, ANS 0.1.27,
  dso-governance 0.1.32, wallet 0.1.27, wallet-payments 0.1.26,
  splitwell 0.1.27 and their test packages) are already past upstream's,
  so they keep their numbers; their checked-in DARs, lock entries and
  DarResources are rebuilt on the merged sources.
- SV frontend: upstream's dependency bump (canton-network#8023) made form validation
  settle asynchronously, and upstream's form tests now wait for the
  submit button to re-enable. The register synchronizer form test waits
  the same way, like our other synchronizer registration form tests.

Signed-off-by: sadiq1971 <sadiqurr8@gmail.com>

@isegall-da isegall-da left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Thanks

@sadiq1971
sadiq1971 merged commit af6c1a1 into main Nov 9, 2026
79 of 83 checks passed
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.