3.4: Bump Canton binary+fork and sync up with main #2664
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
as of 22582e9 Skip all changes to `canton`. Resolve conflicts as good as possible. Doesn't compile; probably because of outdated `canton`. Signed-off-by: Martin Florian <[email protected]>
Not sure if I broke all of that, but seems right to fix... Signed-off-by: Martin Florian <[email protected]>
why not break things even more Signed-off-by: Martin Florian <[email protected]>
Signed-off-by: Martin Florian <[email protected]>
…es and the like) Signed-off-by: Martin Florian <[email protected]>
Signed-off-by: Martin Florian <[email protected]>
…config That option doesn't exist anymore: DACH-NY/canton#27442 Signed-off-by: Martin Florian <[email protected]>
Signed-off-by: Martin Florian <[email protected]>
Reverts (a small) part of DACH-NY/canton#27917 Seems easier than reinvent it somehow / rewrite all the places we use it for converting things. Signed-off-by: Martin Florian <[email protected]>
Signed-off-by: Martin Florian <[email protected]>
…where #2666 to allow us to override defaults Signed-off-by: Martin Florian <[email protected]>
We don't do this anyway and this way the code is easier to reason about IMO (also yes it needed fixes to compile)
Signed-off-by: Martin Florian <[email protected]>
...because I might have misunderstood what `representativePackageId` is... I meant it looks right to me but that probably shouldn't mean much shrug `¯\_(ツ)_/¯` Signed-off-by: Martin Florian <[email protected]>
Signed-off-by: Martin Florian <[email protected]>
…where It moved into `StaticSynchronizerParameters`: DACH-NY/canton#27933 We now only care for this once, when we init simtime networks. Signed-off-by: Martin Florian <[email protected]>
Signed-off-by: Martin Florian <[email protected]>
[ci] Signed-off-by: Martin Florian <[email protected]>
|
@moritzkiefer-da FYI current state
(Will fix DCO once I'm closer to merging... this is what you get for copy pasting from READMEs) |
[ci] Signed-off-by: Martin Florian <[email protected]>
I somehow thought we ignore that folder - but I guess not? [ci] Signed-off-by: Martin Florian <[email protected]>
[ci] Signed-off-by: Moritz Kiefer <[email protected]>
[ci] Signed-off-by: Moritz Kiefer <[email protected]>
[ci] Signed-off-by: Moritz Kiefer <[email protected]>
[ci] Signed-off-by: Moritz Kiefer <[email protected]>
Signed-off-by: Martin Florian <[email protected]>
Signed-off-by: Martin Florian <[email protected]>
[ci] Signed-off-by: Moritz Kiefer <[email protected]>
Signed-off-by: Martin Florian <[email protected]>
[ci] Signed-off-by: Moritz Kiefer <[email protected]>
[ci] Signed-off-by: Moritz Kiefer <[email protected]>
[ci] Signed-off-by: Moritz Kiefer <[email protected]>
moritzkiefer-da
force-pushed
the
martinflorian-da/hls-2074-merge-main-take-2
branch
from
63f990b to
b6049af
Compare
[ci] Signed-off-by: Moritz Kiefer <[email protected]>
[ci] Signed-off-by: Martin Florian <[email protected]>
[ci] Signed-off-by: Moritz Kiefer <[email protected]>
[ci] Signed-off-by: Moritz Kiefer <[email protected]>
[ci] Signed-off-by: Moritz Kiefer <[email protected]>
[ci] Signed-off-by: Moritz Kiefer <[email protected]>
[ci] Signed-off-by: Moritz Kiefer <[email protected]>
[ci] Signed-off-by: Moritz Kiefer <[email protected]>
[ci] Signed-off-by: Moritz Kiefer <[email protected]>
[ci] Signed-off-by: Moritz Kiefer <[email protected]>
[ci] Signed-off-by: Moritz Kiefer <[email protected]>
[ci] Signed-off-by: Moritz Kiefer <[email protected]>
This reverts commit 2030865. Signed-off-by: Moritz Kiefer <[email protected]>
[ci] Signed-off-by: Moritz Kiefer <[email protected]>
[ci] fixes #1324 Signed-off-by: Moritz Kiefer <[email protected]>
[ci] Signed-off-by: Moritz Kiefer <[email protected]>
[ci] Signed-off-by: Moritz Kiefer <[email protected]>
moritzkiefer-da
changed the title
moritzkiefer-da
approved these changes
Oct 15, 2025
There was a problem hiding this comment.
Thanks a lot @martinflorian-da for doing the bulk of the work on this! Glad we have this working now
moritzkiefer-da
deleted the
martinflorian-da/hls-2074-merge-main-take-2
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Work in progress, still not compiling.
Commit log might be nicer to look at than diff.