Skip to content

update our Canton fork to latest release-line-3.5#6331

Draft
stephencompall-DA wants to merge 14 commits into
mainfrom
s11/canton-bump-2628
Draft

update our Canton fork to latest release-line-3.5#6331
stephencompall-DA wants to merge 14 commits into
mainfrom
s11/canton-bump-2628

Conversation

@stephencompall-DA

@stephencompall-DA stephencompall-DA commented Jul 7, 2026

Copy link
Copy Markdown
Contributor

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 an upgrade test is required, comment /upgrade_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.
  • If a logical synchronizer upgrade test is required (from canton-3.5), comment /lsu_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).

@stephencompall-DA
Undo our changes
c49ff9f 
Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
@stephencompall-DA
Bump Canton commit
926766d 
Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
@stephencompall-DA
Reapply our clean changes [skip ci]
6539aa2 
Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
@stephencompall-DA stephencompall-DA self-assigned this Jul 7, 2026
@stephencompall-DA
reapply most missed hunks, resolve un-diverging collisions [skip ci]
82ce685 
Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
@stephencompall-DA
readd Scala LF JSON codec [skip ci]
8a55df6 
Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
@stephencompall-DA
Merge remote-tracking branch 'origin/main' into s11/canton-bump-2628
dd860d4
@stephencompall-DA stephencompall-DA moved this from Todo to In Progress in splice-app-dev Jul 17, 2026
@stephencompall-DA
add traffic-enforcement [skip ci]
990f7c4 
Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
@stephencompall-DA
traffic-enforcement-component deps [skip ci]
e4c098d 
Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
@stephencompall-DA
get traffic-enforcement-api from maven [skip ci]
bcddaab 
Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
@stephencompall-DA
Revert "get traffic-enforcement-api from maven [skip ci]"
ecda9da 
Unavailable until 3.5.6 (we ask for 3.5.3)

This reverts commit bcddaab.

Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
@stephencompall-DA
Reapply "get traffic-enforcement-api from maven [skip ci]"
a2550dc 
This reverts commit ecda9da.
@stephencompall-DA
don't build ledger-api-core [skip ci]
2dd5cdb 
Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
@stephencompall-DA
try fixing util-observability fork [skip ci]
4a13f62 
Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
@stephencompall-DA
we are at least at 3.5.6 [skip ci]
ed21063 
Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@stephencompall-DA stephencompall-DA

Labels

sprint2628

Projects

splice-app-dev
Status: In Progress

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@stephencompall-DA