Skip to content

Merge latest main onto token-standard-v2-upcoming#5851

Merged
OriolMunoz-da merged 48 commits into
token-standard-v2-upcomingfrom
oriol/main-to-stdv2-080626
Jun 8, 2026
Merged

Merge latest main onto token-standard-v2-upcoming#5851
OriolMunoz-da merged 48 commits into
token-standard-v2-upcomingfrom
oriol/main-to-stdv2-080626

Conversation

@OriolMunoz-da

Copy link
Copy Markdown
Contributor

Another Monday another merge

ORIOL: DO NOT SQUASH MERGE

krzysztofczyz-da and others added 30 commits June 1, 2026 11:21
* Make sure that we can run CI on infra teams' runners

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

* add CCI and GHA logic

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

* Update build-tools/cncluster

Co-authored-by: Martin Florian <martin.florian@digitalasset.com>
Signed-off-by: krzysztofczyz-da <krzysztof.czyz@digitalasset.com>

---------

Signed-off-by: krzysztofczyz-da <krzysztof.czyz@digitalasset.com>
Co-authored-by: Martin Florian <martin.florian@digitalasset.com>
Bumps the production-dependencies group with 1 update in the /load-tester directory: [bignumber.js](https://github.com/MikeMcl/bignumber.js).


Updates `bignumber.js` from 11.0.0 to 11.1.1
- [Release notes](https://github.com/MikeMcl/bignumber.js/releases)
- [Changelog](https://github.com/MikeMcl/bignumber.js/blob/main/CHANGELOG.md)
- [Commits](MikeMcl/bignumber.js@v11.0.0...v11.1.1)

---
updated-dependencies:
- dependency-name: bignumber.js
  dependency-version: 11.1.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps the development-dependencies group with 1 update in the /load-tester directory: [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin).


Updates `@typescript-eslint/eslint-plugin` from 8.59.2 to 8.59.4
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.59.4/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-version: 8.59.4
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [ws](https://github.com/websockets/ws) from 8.18.3 to 8.21.0.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](websockets/ws@8.18.3...8.21.0)

---
updated-dependencies:
- dependency-name: ws
  dependency-version: 8.20.1
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [tmp](https://github.com/raszi/node-tmp) from 0.2.5 to 0.2.7.
- [Changelog](https://github.com/raszi/node-tmp/blob/master/CHANGELOG.md)
- [Commits](raszi/node-tmp@v0.2.5...v0.2.7)

---
updated-dependencies:
- dependency-name: tmp
  dependency-version: 0.2.7
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…5664)

Bumps [@tootallnate/once](https://github.com/TooTallNate/once) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/TooTallNate/once/releases)
- [Changelog](https://github.com/TooTallNate/once/blob/v2.0.1/CHANGELOG.md)
- [Commits](TooTallNate/once@2.0.0...v2.0.1)

---
updated-dependencies:
- dependency-name: "@tootallnate/once"
  dependency-version: 2.0.1
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Fixes DACH-NY/cn-test-failures#8444

[ci]

Theory: After bobValidator reconnects, its participant's topology store can still lag behind the party-to-participant change aliceValidator authorized while bob was disconnected. "Clear the onboarding flags" possibly races with catching up to topology and therefore gets rejected with TOPOLOGY_SERIAL_MISMATCH.

The best smoking gun I have for this from the logs is that reconnect finishes at `2026-05-18T06:52:39.586Z `, then we try the propose at `2026-05-18T06:52:39.631`. This is very short time... 

So either this really fixes it or we have better proof that somehow a topology transaction disappears again (if this is what happens).

Signed-off-by: Martin Florian <martin.florian@digitalasset.com>
Among other things, this gives us

- DACH-NY/canton#33227
- DACH-NY/canton#33236

[ci]

Signed-off-by: Martin Florian <martin.florian@digitalasset.com>
…5747)

Signed-off-by: Julien Tinguely <julien.tinguely@digitalasset.com>
Signed-off-by: krzysztofczyz-da <krzysztof.czyz@digitalasset.com>
[static]

Signed-off-by: Mateusz Błażejewski <mateusz.blazejewski@digitalasset.com>
Signed-off-by: Jagath Weerasinghe <jagath.weerasinghe@digitalasset.com>
* [ci] bump base images to 1.0.8

Signed-off-by: Itai Segall <itai.segall@digitalasset.com>

* [static] not canton

Signed-off-by: Itai Segall <itai.segall@digitalasset.com>

* [ci]

Signed-off-by: Itai Segall <itai.segall@digitalasset.com>

---------

Signed-off-by: Itai Segall <itai.segall@digitalasset.com>
* Undo SvDsoStore version bump
* Add warning messages about bumping acs stores

Signed-off-by: Robert Autenrieth <robert.autenrieth@digitalasset.com>
…ityMarkerTrigger and ExpireRewardCouponsTrigger (#5780)

Signed-off-by: Julien Tinguely <julien.tinguely@digitalasset.com>
…per version (#5788)

[static]

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

and rename everything to synchronzier

[ci]

Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com>
Happened recently on a PR of mine: https://github.com/canton-network/splice/actions/runs/26763634790/job/78883939482?pr=5763

[ci]

Couldn't find a matching issue...

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

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

Signed-off-by: Pasindu Tennage <pasindu.tennage@digitalasset.com>
* [ci] Bump the production-dependencies group across 1 directory with 11 updates

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

| Package | From | To |
| --- | --- | --- |
| [@google-cloud/sql](https://github.com/googleapis/google-cloud-node/tree/HEAD/packages/google-cloud-sql) | `0.24.0` | `0.24.1` |
| [@dotenvx/dotenvx](https://github.com/dotenvx/dotenvx) | `1.61.0` | `1.68.1` |
| [@pulumi/gcp](https://github.com/pulumi/pulumi-gcp) | `9.18.0` | `9.25.0` |
| [@pulumi/kubernetes](https://github.com/pulumi/pulumi-kubernetes) | `4.28.0` | `4.31.1` |
| [@pulumi/pulumi](https://github.com/pulumi/pulumi/tree/HEAD/sdk/nodejs) | `3.230.0` | `3.243.0` |
| [@pulumi/random](https://github.com/pulumi/pulumi-random) | `4.19.2` | `4.21.0` |
| [@pulumi/github](https://github.com/pulumi/pulumi-github) | `6.13.1` | `6.14.0` |
| [auth0](https://github.com/auth0/node-auth0) | `5.6.0` | `5.10.0` |
| [zod](https://github.com/colinhacks/zod) | `4.3.6` | `4.4.3` |
| [@pulumi/auth0](https://github.com/pulumi/pulumi-auth0) | `3.39.0` | `3.44.0` |
| [@pulumi/policy](https://github.com/pulumi/pulumi-policy) | `1.20.0` | `1.21.0` |



Updates `@google-cloud/sql` from 0.24.0 to 0.24.1
- [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.1/packages/google-cloud-sql)

Updates `@dotenvx/dotenvx` from 1.61.0 to 1.68.1
- [Release notes](https://github.com/dotenvx/dotenvx/releases)
- [Changelog](https://github.com/dotenvx/dotenvx/blob/main/CHANGELOG.md)
- [Commits](dotenvx/dotenvx@v1.61.0...v1.68.1)

Updates `@pulumi/gcp` from 9.18.0 to 9.25.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.18.0...v9.25.0)

Updates `@pulumi/kubernetes` from 4.28.0 to 4.31.1
- [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.28.0...v4.31.1)

Updates `@pulumi/pulumi` from 3.230.0 to 3.243.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.243.0/sdk/nodejs)

Updates `@pulumi/random` from 4.19.2 to 4.21.0
- [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.2...v4.21.0)

Updates `@pulumi/github` from 6.13.1 to 6.14.0
- [Release notes](https://github.com/pulumi/pulumi-github/releases)
- [Changelog](https://github.com/pulumi/pulumi-github/blob/master/CHANGELOG_OLD.md)
- [Commits](pulumi/pulumi-github@v6.13.1...v6.14.0)

Updates `auth0` from 5.6.0 to 5.10.0
- [Release notes](https://github.com/auth0/node-auth0/releases)
- [Changelog](https://github.com/auth0/node-auth0/blob/master/CHANGELOG.md)
- [Commits](auth0/node-auth0@v5.6.0...v5.10.0)

Updates `zod` from 4.3.6 to 4.4.3
- [Release notes](https://github.com/colinhacks/zod/releases)
- [Commits](colinhacks/zod@v4.3.6...v4.4.3)

Updates `@pulumi/auth0` from 3.39.0 to 3.44.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.39.0...v3.44.0)

Updates `@pulumi/policy` from 1.20.0 to 1.21.0
- [Changelog](https://github.com/pulumi/pulumi-policy/blob/main/CHANGELOG.md)
- [Commits](pulumi/pulumi-policy@v1.20.0...v1.21.0)

---
updated-dependencies:
- dependency-name: "@dotenvx/dotenvx"
  dependency-version: 1.67.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: "@google-cloud/sql"
  dependency-version: 0.24.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: "@pulumi/auth0"
  dependency-version: 3.43.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: "@pulumi/gcp"
  dependency-version: 9.25.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: "@pulumi/github"
  dependency-version: 6.14.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: "@pulumi/kubernetes"
  dependency-version: 4.31.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: "@pulumi/policy"
  dependency-version: 1.21.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: "@pulumi/pulumi"
  dependency-version: 3.243.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: "@pulumi/random"
  dependency-version: 4.21.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: auth0
  dependency-version: 5.10.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: zod
  dependency-version: 4.4.3
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
...

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

* [ci] add packages

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

* [ci] update expected files

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

* [ci] update nix

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

* [ci] fix nix

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

* [ci] fix: add helm-unittest platform symlinks for v1.1.0 compat

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

* [ci] update the jwt problem line

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

* [ci] Change auth message

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

* [ci] test commit

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

* [ci] test commit

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>
#5783)

Bumps the development-dependencies group in /load-tester with 2 updates: [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) and [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser).


Updates `@typescript-eslint/eslint-plugin` from 8.59.4 to 8.60.0
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.60.0/packages/eslint-plugin)

Updates `@typescript-eslint/parser` from 8.59.4 to 8.60.1
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.60.1/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-version: 8.60.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: development-dependencies
- dependency-name: "@typescript-eslint/parser"
  dependency-version: 8.60.1
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: development-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
#5782)

Bumps the production-dependencies group in /load-tester with 1 update: [bignumber.js](https://github.com/MikeMcl/bignumber.js).


Updates `bignumber.js` from 11.1.1 to 11.1.2
- [Release notes](https://github.com/MikeMcl/bignumber.js/releases)
- [Changelog](https://github.com/MikeMcl/bignumber.js/blob/main/CHANGELOG.md)
- [Commits](MikeMcl/bignumber.js@v11.1.1...v11.1.2)

---
updated-dependencies:
- dependency-name: bignumber.js
  dependency-version: 11.1.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps the production-dependencies group with 1 update in the /cluster/pulumi directory: [@dotenvx/dotenvx](https://github.com/dotenvx/dotenvx).


Updates `@dotenvx/dotenvx` from 1.68.1 to 1.69.1
- [Release notes](https://github.com/dotenvx/dotenvx/releases)
- [Changelog](https://github.com/dotenvx/dotenvx/blob/main/CHANGELOG.md)
- [Commits](dotenvx/dotenvx@v1.68.1...v1.69.1)

---
updated-dependencies:
- dependency-name: "@dotenvx/dotenvx"
  dependency-version: 1.69.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps the development-dependencies group in /cluster/pulumi with 1 update: [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin).


Updates `@typescript-eslint/eslint-plugin` from 8.59.4 to 8.60.0
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.60.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-version: 8.60.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: development-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
We double check that the PSId is the same to avoid trying to downgrade

[ci]

Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com>
Even if we check that preapprovals exists, we would need to check all the scans to ensure it will always succeed, so we just retry the transfer on failures

[ci]

Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com>
Signed-off-by: Julien Tinguely <julien.tinguely@digitalasset.com>
* [ci] Revert "Update nix&pulumi (#5761)"

This reverts commit 3d744e3.

* [ci] fix issues

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

---------

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

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

[ci]

Signed-off-by: Pasindu Tennage <pasindu.tennage@digitalasset.com>
Signed-off-by: pasindutennage-da <pasindu.tennage@digitalasset.com>
isegall-da and others added 14 commits June 3, 2026 16:08
Signed-off-by: Itai Segall <itai.segall@digitalasset.com>
Signed-off-by: Itai Segall <itai.segall@digitalasset.com>
Signed-off-by: Jagath Weerasinghe <jagath.weerasinghe@digitalasset.com>
deploymentDetails:
- Add synchronizerSerialId
- Rename active to current and staging to successor

runtimeDetails:
- Use synchronizerSerialId to fetch metrics
- Make scanUrl optional in runtimeDetails

Signed-off-by: Stanislav German-Evtushenko <ginermail@gmail.com>
Signed-off-by: Robert Autenrieth <robert.autenrieth@digitalasset.com>
Signed-off-by: Robert Autenrieth <robert.autenrieth@digitalasset.com>
Fetch Serial ID at runtime from
`$SCAN_URL/api/scan/v0/active-synchronizer-serial` unless
SEQUENCER_METRICS_URL is explicitly specified. Fallback to SERIAL_ID
environment variable when unable to fetch it. This makes `status.sh`
work after logical synchronizer upgrade without any configuration
change.

Signed-off-by: Stanislav German-Evtushenko <ginermail@gmail.com>
…ional in scan (#5762)

[ci]

Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com>
Signed-off-by: Oriol Muñoz <oriol.munoz@digitalasset.com>
fixes #4862

---------

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

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

Signed-off-by: Divam <dfordivam@gmail.com>
Signed-off-by: Divam <681060+dfordivam@users.noreply.github.com>
Co-authored-by: Simon Meier <simon@digitalasset.com>
[ci]

Signed-off-by: Oriol Muñoz <oriol.munoz@digitalasset.com>
@OriolMunoz-da OriolMunoz-da requested a review from meiersi-da June 8, 2026 06:54
@OriolMunoz-da OriolMunoz-da changed the base branch from main to token-standard-v2-upcoming June 8, 2026 06:54

@meiersi-da meiersi-da left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

ty

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

Signed-off-by: Oriol Muñoz <oriol.munoz@digitalasset.com>
@OriolMunoz-da OriolMunoz-da merged commit c9ab045 into token-standard-v2-upcoming Jun 8, 2026
122 of 124 checks passed
@OriolMunoz-da OriolMunoz-da deleted the oriol/main-to-stdv2-080626 branch June 8, 2026 14:38
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.