Repository navigation
chore: sync main with upstream splice main - #44
Merged
Merged
Conversation
fixes canton-network#3934 [ci] Signed-off-by: moritz.kiefer@digitalasset.com <moritz.kiefer@purelyfunctional.org>
- validate RewardConfig to address Quantstamp CC-4 - remove duplicate validation of lockHolderFee to address Quantstamp S-1 [ci] Signed-off-by: Simon Meier <simon@digitalasset.com>
[static] Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com>
* Actually enable ci for staging bases [static] Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com>
…on-network#6793) Resolves the Daml part of canton-network#6722. [ci] Signed-off-by: Zhe Li <linuxcity.jn@gmail.com>
…etwork#6859) [ci] --------- 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: moritz.kiefer@digitalasset.com <moritz.kiefer@purelyfunctional.org>
[ci] Signed-off-by: moritz.kiefer@digitalasset.com <moritz.kiefer@purelyfunctional.org> Co-authored-by: moritz.kiefer@digitalasset.com <moritz.kiefer@purelyfunctional.org>
Wanted for the the follow-up PR to canton-network#6957 (see DACH-NY/canton-network-internal#2106) [ci] Signed-off-by: Martin Florian <martin.florian@digitalasset.com>
Signed-off-by: Martin Florian <martin.florian@digitalasset.com>
…etwork#7025) [ci] Signed-off-by: moritz.kiefer@digitalasset.com <moritz.kiefer@purelyfunctional.org> Co-authored-by: moritz.kiefer@digitalasset.com <moritz.kiefer@purelyfunctional.org>
* Add ability to override rate limiter per IP CIDR [ci] Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com>
- Bump resources - Filter for metrics (a bit faster and uses less memory) I have tested the metrics query using `curl`. I haven't tested the full chart yet. My plan was to get this reviewed and merged and then try a helm upgrade to a snapshot temporarily to try it out before the release to make sure nothing goes wrong. [static] Signed-off-by: moritz.kiefer@digitalasset.com <moritz.kiefer@purelyfunctional.org> Co-authored-by: moritz.kiefer@digitalasset.com <moritz.kiefer@purelyfunctional.org>
Fixes DACH-NY/canton-network-internal#2106 (last bit) [ci] Signed-off-by: Martin Florian <martin.florian@digitalasset.com>
[ci] Signed-off-by: moritz.kiefer@digitalasset.com <moritz.kiefer@purelyfunctional.org>
Signed-off-by: Matt Dziuban <mrdziuban@gmail.com>
…k#7036) Signed-off-by: Tim Emiola <adetokunbo@emio.la>
--------- Signed-off-by: JYC11 <jaeyoon.c@gmail.com> Co-authored-by: Divam <dfordivam@gmail.com>
* Simplify istio rate limits By default only have a global rate limit [static] Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com>
[ci] I can't come up with a sensible reason why this should be a warning, we also don't warn if you only have old unusable versions vetted. Looking at history it seems like this probably got preserved before we had party ignores so imho totally fine to just not warn. Signed-off-by: moritz.kiefer@digitalasset.com <moritz.kiefer@purelyfunctional.org>
[ci] Signed-off-by: moritz.kiefer@digitalasset.com <moritz.kiefer@purelyfunctional.org>
Fixes canton-network#6800 Signed-off-by: Stephane Loeuillet <stephane.loeuillet@kaiko.com> Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
* Persist all command output to `compose.log`. This ensures `docker compose` output is included as well. Signed-off-by: Matt Dziuban <mrdziuban@gmail.com>
Previously we had the global limit and the per ip limit, but a request would consume only from one bucket which made us vulnerable We now have the following limits, mimicking the apps: - global limit for all clients, always consumed - global limit per client ip (with overrides) - ability to configure global limit per endpoint for all the clients - ability to configure global limit per endpoint per client ip (with overrides) these 4 rate limiters all apply at the same time and all must hold Extend metrics and logs: - logs now inlude the external address and the masked address - metrics are distinguished for each filter and we have a relabelng rule to add a label with the filter name so we know which ones are enforced [static] fixes DACH-NY/canton-network-internal#2115 Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com>
Signed-off-by: Robert Autenrieth <robert.autenrieth@digitalasset.com> Signed-off-by: Stephen Compall <stephen.compall@digitalasset.com> Co-authored-by: Stephen Compall <stephen.compall@digitalasset.com>
…lay (canton-network#6944) Signed-off-by: Zhe Li <linuxcity.jn@gmail.com>
…network#7057) [ci] Signed-off-by: Mateusz Błażejewski <mateusz.blazejewski@digitalasset.com>
…etwork#7264) [ci] Signed-off-by: moritz.kiefer@digitalasset.com <moritz.kiefer@purelyfunctional.org> Co-authored-by: moritz.kiefer@digitalasset.com <moritz.kiefer@purelyfunctional.org>
…shboard (canton-network#7267) They also apply to mediator (and even sequencer which has an internal sequencer client as well) so having them be limited to the participant makes no sense. [static] Signed-off-by: moritz.kiefer@digitalasset.com <moritz.kiefer@purelyfunctional.org> Co-authored-by: moritz.kiefer@digitalasset.com <moritz.kiefer@purelyfunctional.org>
[static] Signed-off-by: Jagath Weerasinghe <jagath.weerasinghe@digitalasset.com>
Signed-off-by: Julien Tinguely <julien.tinguely@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: Paweł Perek <pawel.perek@digitalasset.com>
Signed-off-by: Paweł Perek <pawel.perek@digitalasset.com>
[static] Signed-off-by: moritz.kiefer@digitalasset.com <moritz.kiefer@purelyfunctional.org> Co-authored-by: moritz.kiefer@digitalasset.com <moritz.kiefer@purelyfunctional.org>
…twork#7274) * Add alerts for waf rejections and remove default waf rules waf now rejects with 502 default rules are removed and we declare them per cluster add alert when waf rules actually reject something [static] Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com> * delete before replace [static] Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com> --------- Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com>
Signed-off-by: Paweł Perek <pawel.perek@digitalasset.com>
…ork#7268) Fixes canton-network#6991 [ci] Signed-off-by: Zhe Li <linuxcity.jn@gmail.com>
…on-network#7281) Signed-off-by: Paweł Perek <pawel.perek@digitalasset.com>
…7299) fixes DACH-NY/cn-test-failures#9965 (comment) [ci] Signed-off-by: moritz.kiefer@digitalasset.com <moritz.kiefer@purelyfunctional.org> Co-authored-by: moritz.kiefer@digitalasset.com <moritz.kiefer@purelyfunctional.org>
* fix waf gcp alert [static] Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com> * switch to metric log based [static] Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com> * . [static] Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com> --------- Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com>
Signed-off-by: Raymond Roestenburg <raymond.roestenburg@digitalasset.com> --------- Signed-off-by: Raymond Roestenburg <raymond.roestenburg@digitalasset.com> Signed-off-by: Raymond Roestenburg <98821776+ray-roestenburg-da@users.noreply.github.com> Co-authored-by: Stephen Compall <stephen.compall@digitalasset.com>
Merges upstream main at abe7f49 (0.9.0 dev, latest release 0.8.1, Canton 3.6.0 snapshot) into main. Conflict resolution: - Daml: keep our constructors and records and derive Serializable on them, as upstream's explicit serializability requires. - Validator: drop the deprecated transfer command support that upstream removed; the global synchronizer alias keeps coming from the fork's synchronizer config. - Rate limits: take upstream's simplified istio rate limits, which no longer list scan endpoints, so our unlimited entry for /api/scan/v0/synchronizers goes. - Tests: keep both new SpliceConfigTest groups; take upstream's TrafficBasedRewards test and pass the two optional StartProcessingRewardsV2 fields; pass the expander field in the shared ProcessRewardsV2 fixture. - Renumber our Flyway migrations to V075 and V076 behind upstream's V074. Signed-off-by: sadiq1971 <sadiqurr8@gmail.com>
Upstream released the versions our Daml changes were carried at, with different content. Bumps every affected package one patch above upstream via damlBumpPackageVersions upstream/main, keeps upstream's checked-in DARs at the released versions, and regenerates dars.lock, DarResources and the npm lock. Signed-off-by: sadiq1971 <sadiqurr8@gmail.com>
|
the title is off right? this is not syncing with 0.8.1 but with splice main? |
moritzkiefer-da
approved these changes
Sep 15, 2026
moritzkiefer-da
left a comment
moritzkiefer-da
left a comment
There was a problem hiding this comment.
thx make sure to do a proper merge and not a squash merge
sadiq1971
changed the title
Signed-off-by: sadiq1971 <sadiqurr8@gmail.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 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.
Refs ChainSafe/canton-extending-mainnet#114
Summary: Merges the latest upstream
canton-network/splicemain (abe7f497d, 132 commits since our last sync) intomain, keeping the dedicated-synchronizer work intact. Bumps the 18 Daml packages whose versions now collide with upstream one patch past upstream.