Repository navigation
Merge release/10.0.0 into main - #40
Merged
Merged
Conversation
Disable removal and key rotation for Quiet protocol 4
Brings the 10.0.0 release line back into main: the protocol 4 removal and key rotation gate (b59a210), the admission and key delivery checks retained under that gate (6f534c8, the commit Quiet 10.0.0 pins), and PR #37. No conflicts and nothing to reconcile. #36 merged release/9.0.0 into main as a real two-parent merge, so git's merge base here is 742ea3d - release/9.0.0's tip - which is honest. main carries nothing of its own beyond that release, so the result is exactly the release/10.0.0 tree. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Brings the fixed tests workflow into this PR's merge ref so the Tests check runs with node 20 + pnpm 10. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.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
1 participant
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.
Merges
release/10.0.0back intomain.This one is clean. No conflicts, nothing to reconcile, no hand-built merge. #36 merged
release/9.0.0intomainas a real two-parent merge, so git's merge base here is742ea3d—release/9.0.0's tip — which is honest.maincarries nothing of its ownbeyond that release, so
git mergeproduces exactly therelease/10.0.0tree on its own.Three commits come across:
b59a210— disable removal and key rotation in protocol 46f534c89— retain admission and key delivery checks under that removal gate (this is thecommit Quiet 10.0.0 and QSS 3.0.0 both pin)
4660383— PR Disable removal and key rotation for Quiet protocol 4 #37,fix/9.1-disable-removal-rotation43 files, +839/−210, mostly
packages/auth/src/teamand its tests, including the newremovalRotationGate.test.ts.Still worth merging with a merge commit rather than squashing
Not a problem here — it's a request for next time. Squashing this would drop the ancestry link
to
release/10.0.0and leave the next release merge computing a stale base. That is exactlywhat happened in quiet-storage-service (see TryQuiet/quiet-storage-service#61, which had to be
built by hand against 2.0.2) and in the Quiet client (TryQuiet/quiet#3551). Keeping #36's
two-parent pattern is what has kept this repo easy.
🤖 Generated with Claude Code