Skip to content

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

Merged
OriolMunoz-da merged 84 commits into
token-standard-v2-upcomingfrom
oriol/main-to-stdv2-220626
Jun 22, 2026
Merged

Merge latest main onto token-standard-v2-upcoming#6076
OriolMunoz-da merged 84 commits into
token-standard-v2-upcomingfrom
oriol/main-to-stdv2-220626

Conversation

@OriolMunoz-da

@OriolMunoz-da OriolMunoz-da commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

Last one before the merge
Pay special attention to the files I commented, as they had merge conflicts and I might've messed them up

ORIOL: DO NOT SQUASH MERGE

nicu-da and others added 30 commits June 15, 2026 11:30
Also include alerts

[ci]

Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com>
…ial (#5947)

The root of the info endpoint exposes only configured values.
`info.json` will show the actual runtime values.

Signed-off-by: Stanislav German-Evtushenko <ginermail@gmail.com>
[ci]

Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com>
Signed-off-by: Itai Segall <itai.segall@digitalasset.com>
Signed-off-by: Mateusz Błażejewski <mateusz.blazejewski@digitalasset.com>
)

[ci]

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

---------

Signed-off-by: moritz.kiefer@digitalasset.com <moritz.kiefer@purelyfunctional.org>
Co-authored-by: Simon Meier <simon@digitalasset.com>
Co-authored-by: moritz.kiefer@digitalasset.com <moritz.kiefer@purelyfunctional.org>
Part of #5958

[ci]

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

Signed-off-by: Pasindu Tennage <pasindu.tennage@digitalasset.com>
Signed-off-by: pasindutennage-da <pasindu.tennage@digitalasset.com>
Signed-off-by: Itai Segall <itai.segall@digitalasset.com>
Signed-off-by: Itai Segall <itai.segall@digitalasset.com>
---------

Signed-off-by: moritz.kiefer@digitalasset.com <moritz.kiefer@purelyfunctional.org>
Co-authored-by: moritz.kiefer@digitalasset.com <moritz.kiefer@purelyfunctional.org>
Consumes DACH-NY/canton#33500, so fixes #5958

I opted against mentioning it in the release notes as it seems like we haven't mentioned similar updates in the past. The change is essentially just an upgrade of grpc-health-probe.

[ci]

Signed-off-by: Martin Florian <martin.florian@digitalasset.com>
…o Pulumi or Nix packages (#5976)

[static]

Signed-off-by: Mateusz Błażejewski <mateusz.blazejewski@digitalasset.com>
Trigger for 5 continous minutes of unhealthy state not unhealthy at any point in the last 5 minutes

[static]

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

[static]

Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com>
- add NOT_CONNECTED_TO_ANY_SYNCHRONIZER grpc code to conflict error codes
- this ensures downstream services, like validators, keep retrying for this upstream error

Signed-off-by: Jagath Weerasinghe <jagath.weerasinghe@digitalasset.com>
[ci]

fixes #5962

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

Signed-off-by: Simon Meier <simon@digitalasset.com>
Signed-off-by: Sam Davies <sam@avrofi.com>
Signed-off-by: Paweł Perek <pawel.perek@digitalasset.com>
#5903)

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>
* helm, splice-info: Switch to unprivileged NGINX image

Before: Standard Debian-based NGINX docker image.
After: Unprivileged Alpine-based (slim variant) NGINX docker image.

Signed-off-by: Stanislav German-Evtushenko <ginermail@gmail.com>

* helm, info: Fix spelling in comment

Signed-off-by: Stanislav German-Evtushenko <ginermail@gmail.com>

---------

Signed-off-by: Stanislav German-Evtushenko <ginermail@gmail.com>
fixes DACH-NY/canton-network-internal#5690

[static]

Signed-off-by: moritz.kiefer@digitalasset.com <moritz.kiefer@purelyfunctional.org>
Co-authored-by: moritz.kiefer@digitalasset.com <moritz.kiefer@purelyfunctional.org>
Ensures that you don't end up not producing a heap dump because one
already exists.

Will do the Canton config change separately as I first need to
upstream the entrypoint change.

Confirmed on scratch that the substitution works fine.

[static]

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: Pasindu Tennage <pasindu.tennage@digitalasset.com>
Signed-off-by: pasindutennage-da <pasindu.tennage@digitalasset.com>
* Account for synchronizer status when modifying the connections

[ci]

Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com>
Fixes #6010. [static]

Signed-off-by: Simon Meier <simon@digitalasset.com>
ray-roestenburg-da and others added 17 commits June 19, 2026 17:44
Signed-off-by: Robert Autenrieth <robert.autenrieth@digitalasset.com>
…he authors (#6068)

[static]

Signed-off-by: Mateusz Błażejewski <mateusz.blazejewski@digitalasset.com>
Add missing arm64 case to lnav.nix for isLinux && isAarch64

Signed-off-by: Raymond Roestenburg <raymond.roestenburg@digitalasset.com>
Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 4.1.1 to 4.2.0.
- [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodeca/js-yaml/commits)

---
updated-dependencies:
- dependency-name: js-yaml
  dependency-version: 4.2.0
  dependency-type: indirect
...

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 /load-tester directory: [bignumber.js](https://github.com/MikeMcl/bignumber.js).


Updates `bignumber.js` from 11.1.2 to 11.1.4
- [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.2...v11.1.4)

---
updated-dependencies:
- dependency-name: bignumber.js
  dependency-version: 11.1.3
  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 [esbuild](https://github.com/evanw/esbuild) from 0.28.0 to 0.28.1.
- [Release notes](https://github.com/evanw/esbuild/releases)
- [Changelog](https://github.com/evanw/esbuild/blob/main/CHANGELOG.md)
- [Commits](evanw/esbuild@v0.28.0...v0.28.1)

---
updated-dependencies:
- dependency-name: esbuild
  dependency-version: 0.28.1
  dependency-type: direct:development
...

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

Bumps the development-dependencies group with 3 updates in the /load-tester directory: [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node), [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) and [prettier](https://github.com/prettier/prettier).


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

Updates `@typescript-eslint/eslint-plugin` from 8.60.1 to 8.61.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.61.0/packages/eslint-plugin)

Updates `@typescript-eslint/parser` from 8.60.1 to 8.61.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.61.1/packages/parser)

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

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.9.4
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-version: 8.61.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: development-dependencies
- dependency-name: "@typescript-eslint/parser"
  dependency-version: 8.61.1
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: development-dependencies
- dependency-name: prettier
  dependency-version: 3.8.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 [shell-quote](https://github.com/ljharb/shell-quote) from 1.8.1 to 1.8.4.
- [Changelog](https://github.com/ljharb/shell-quote/blob/main/CHANGELOG.md)
- [Commits](ljharb/shell-quote@v1.8.1...v1.8.4)

---
updated-dependencies:
- dependency-name: shell-quote
  dependency-version: 1.8.4
  dependency-type: indirect
...

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

Signed-off-by: Divam <dfordivam@gmail.com>
Signed-off-by: Paweł Perek <pawel.perek@digitalasset.com>
…3 updates (#5944)

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


Updates `@typescript-eslint/eslint-plugin` from 8.60.0 to 8.61.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.61.0/packages/eslint-plugin)

Updates `@typescript-eslint/parser` from 8.60.0 to 8.61.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.61.1/packages/parser)

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

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-version: 8.60.1
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
- dependency-name: "@typescript-eslint/parser"
  dependency-version: 8.61.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: development-dependencies
- dependency-name: prettier
  dependency-version: 3.8.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  and [form-data](https://github.com/form-data/form-data). These dependencies needed to be updated together.

Updates `form-data` from 2.5.5 to 2.5.6
- [Changelog](https://github.com/form-data/form-data/blob/master/CHANGELOG.md)
- [Commits](form-data/form-data@v2.5.5...v2.5.6)

Updates `form-data` from 4.0.5 to 4.0.6
- [Changelog](https://github.com/form-data/form-data/blob/master/CHANGELOG.md)
- [Commits](form-data/form-data@v2.5.5...v2.5.6)

---
updated-dependencies:
- dependency-name: form-data
  dependency-version: 2.5.6
  dependency-type: indirect
- dependency-name: form-data
  dependency-version: 4.0.6
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Oriol Muñoz <oriol.munoz@digitalasset.com>
Signed-off-by: Oriol Muñoz <oriol.munoz@digitalasset.com>
Signed-off-by: Oriol Muñoz <oriol.munoz@digitalasset.com>
Signed-off-by: Oriol Muñoz <oriol.munoz@digitalasset.com>
@canton-network-da

Copy link
Copy Markdown
Contributor

[backport] Reminder

Please consider backporting to the following branches:

  • main
  • release-line-0.6.9
  • release-line-0.6.8
  • release-line-0.6.7
  • release-line-0.6.6

▶️ Please check the boxes for branches that you wish to backport to and backport PRs will
automatically be created when you merge this PR.

And your PR is currently against base branch: token-standard-v2-upcoming.

Note: Any PR comment containing [backport] will be considered for auto-backporting upon merge,
you can always add those manually for PRs that did not get these reminders. You can also edit
this comment manually and add more branches that this should be backported to.

@github-actions

Copy link
Copy Markdown

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

Comment thread daml/dars.lock

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

ran damlBumpPackageVersions, lgtm but better to have another pair of eyes

Comment thread daml/splice-amulet/daml/Splice/AmuletRules.daml
Comment thread daml/splice-amulet-test/daml/Splice/Scripts/TestExternalParty.daml
@OriolMunoz-da
OriolMunoz-da marked this pull request as ready for review June 22, 2026 13:04
@OriolMunoz-da
OriolMunoz-da requested a review from meiersi-da June 22, 2026 13:04
meiersi-da and others added 2 commits June 22, 2026 14:32
[ci]

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

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

Thanks. Let's fix the /daml/dars and dars.lock. There the merge seems to have gone wrong.

Comment thread daml/splice-amulet/daml/Splice/AmuletRules.daml
Comment thread daml/dars.lock
splice-amulet-name-service 0.1.2 711a2974d65e6ebd149704da75f3f71234798687ab895b92f066c865dbdeeabb
splice-amulet-name-service 0.1.20 0b6748de2e613f5bc9a108b2496b85d2d661b7344c6c55eada9c0a0bf8efe0a5
splice-amulet-name-service 0.1.21 1b9a7ee63af6e3f54b53d97e4a61beeed036d1812e48536cd0880517cbebbb9f
splice-amulet-name-service 0.1.21 b342bbbd425902283c20eb5011eeab90cc9f69b4c534b8b757fd51b8ca7be589

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.

this doesn't look right. We don't want to change the hashes of the files on main. I suggest to checkout dars.lock from main again, and then update them again. Same for the /daml/dars file.

Comment thread daml/splice-amulet-test/daml/Splice/Scripts/TestExternalParty.daml
Signed-off-by: Oriol Muñoz <oriol.munoz@digitalasset.com>

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

Thanks a lot.

Signed-off-by: Oriol Muñoz <oriol.munoz@digitalasset.com>
@OriolMunoz-da
OriolMunoz-da merged commit caa7b3b into token-standard-v2-upcoming Jun 22, 2026
65 checks passed
@OriolMunoz-da
OriolMunoz-da deleted the oriol/main-to-stdv2-220626 branch June 22, 2026 19:17
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.