Skip to content

Change default room version to 11. implements MSC4239 - #18680

Merged
MadLittleMods merged 16 commits into
element-hq:developfrom
ShadowRZ:shadowrz/msc4239-bump-room-version-to-11
Jul 16, 2026
Merged

Change default room version to 11. implements MSC4239#18680
MadLittleMods merged 16 commits into
element-hq:developfrom
ShadowRZ:shadowrz/msc4239-bump-room-version-to-11

Conversation

@ShadowRZ

@ShadowRZ ShadowRZ commented Jul 14, 2025 •
edited by MadLittleMods
Loading

Copy link
Copy Markdown
Contributor

Closes: #18530

Complement test changes: matrix-org/complement#858

SyTest changes: matrix-org/sytest#1422

Pull Request Checklist

  • Pull request is based on the develop branch
  • Pull request includes a changelog file. The entry should:
    • Be a short description of your change which makes sense to users. "Fixed a bug that prevented receiving messages from other servers." instead of "Moved X method from EventStore to EventWorkerStore.".
    • Use markdown where necessary, mostly for code blocks.
    • End with either a period (.) or an exclamation mark (!).
    • Start with a capital letter.
    • Feel free to credit yourself, by adding a sentence "Contributed by @github_username." or "Contributed by [Your Name]." to the end of the entry.
  • Code style is correct (run the linters)

@ShadowRZ
ShadowRZ requested a review from a team as a code owner July 14, 2025 04:59
reivilibre
reivilibre reviewed Jul 15, 2025
View reviewed changes
Comment thread changelog.d/18680.feature Outdated
@reivilibre
reivilibre self-requested a review July 15, 2025 10:37
@reivilibre
reivilibre enabled auto-merge (squash) July 15, 2025 10:37
@reivilibre

reivilibre commented Jul 15, 2025

Copy link
Copy Markdown
Contributor

Part of #18531

@github-actions
github-actions Bot deployed to PR Documentation Preview July 15, 2025 10:38 Active
@reivilibre
reivilibre disabled auto-merge July 15, 2025 10:41
@reivilibre
reivilibre enabled auto-merge (squash) July 15, 2025 10:42
@reivilibre reivilibre mentioned this pull request Jul 15, 2025
Open
30 tasks
@github-actions
github-actions Bot deployed to PR Documentation Preview July 15, 2025 10:42 Active
reivilibre
reivilibre requested changes Jul 15, 2025
View reviewed changes

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

looks like this breaks a few tests, sadly; those will need sorting out before merging

auto-merge was automatically disabled July 16, 2025 08:03

Head branch was pushed to by a user without write access

ShadowRZ
ShadowRZ commented Jul 16, 2025
View reviewed changes

@ShadowRZ ShadowRZ left a comment

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.

SyTest and Complement also needs to be updated to account for the lack of creator field in m.room.create event in v11 rooms.

@github-actions
github-actions Bot deployed to PR Documentation Preview July 30, 2025 16:09 Active
@anoadragon453

anoadragon453 commented Jul 31, 2025

Copy link
Copy Markdown
Member

SyTest and Complement also needs to be updated to account for the lack of creator field in m.room.create event in v11 rooms.

@ShadowRZ are you able to create PRs for Sytest and Complement to address that? Or would you prefer someone else take that on?

@ShadowRZ

ShadowRZ commented Aug 3, 2025

Copy link
Copy Markdown
Contributor Author

are you able to create PRs for Sytest and Complement to address that? Or would you prefer someone else take that on?

@anoadragon453 I'd prefer that someone else to take that, as I'm not familar with Perl (for SyTest) / Go (for Complement).

@anoadragon453

anoadragon453 commented Aug 5, 2025

Copy link
Copy Markdown
Member

No worries. I've added it to our internal Maintainer queue 🙂

@MadLittleMods MadLittleMods changed the title Change default room version to 11. implments MSC4239 Change default room version to 11. implements MSC4239 Aug 5, 2025
This was referenced Apr 16, 2026
Merged
Merged
MadLittleMods
MadLittleMods reviewed Jul 8, 2026
View reviewed changes
Comment thread tests/storage/databases/main/test_room.py
@ShadowRZ
ShadowRZ requested a review from MadLittleMods July 10, 2026 14:08
MadLittleMods
MadLittleMods reviewed Jul 10, 2026
View reviewed changes
Comment thread changelog.d/18680.feature
@ShadowRZ
ShadowRZ requested a review from MadLittleMods July 11, 2026 01:06
@MadLittleMods
MadLittleMods removed their request for review July 13, 2026 15:40
@ShadowRZ
ShadowRZ requested a review from MadLittleMods July 14, 2026 13:15
@ShadowRZ
Add per test room version in RoomBackgroundUpdateStoreTestCase
68fde18 
Also use room version 10 for test_background_populate_rooms_creator_column.
MadLittleMods
MadLittleMods reviewed Jul 15, 2026
View reviewed changes
Comment thread tests/storage/databases/main/test_room.py Outdated
Comment thread tests/storage/databases/main/test_room.py Outdated
Comment thread tests/rest/client/test_redactions.py
@MadLittleMods
MadLittleMods merged commit 5ed830b into element-hq:develop Jul 16, 2026
114 of 118 checks passed
@MadLittleMods MadLittleMods mentioned this pull request Jul 16, 2026
Open
3 tasks
@MadLittleMods

MadLittleMods commented Jul 16, 2026

Copy link
Copy Markdown
Contributor

Thanks for driving the default room version support forward @ShadowRZ 🦑

@ShadowRZ
ShadowRZ deleted the shadowrz/msc4239-bump-room-version-to-11 branch July 16, 2026 23:09
@MadLittleMods MadLittleMods mentioned this pull request Jul 28, 2026
Merged
3 tasks
MadLittleMods added a commit that referenced this pull request Jul 29, 2026
@MadLittleMods
Fix RemoteJoinHelper signing events with the default room version (…
fba1435 
…room version mismatch) (#20015)

Fix `RemoteJoinHelper` signing events with mismatched room version
compared to the `room_version` arg. The default room version on
`develop` is `11` but the `RemoteJoinHelper` `room_version` arg defaults
to `10` (room version mismatch). This mismatch wasn't present where this
fix was developed
(element-hq/synapse-private#136) as the default
room version was only recently bumped to `11` via
#18680 (not even in a release
yet).

Fixes the CI being broken on `develop` ❌:

```
[ERROR]
Traceback (most recent call last):
  File "/home/runner/work/synapse/synapse/tests/federation/test_federation_join_upgraded_room.py", line 298, in test_no_transfer_when_tombstone_does_not_match
    join_helper.join(local_user_id, local_user_tok)
  File "/home/runner/work/synapse/synapse/tests/federation/_remote_join.py", line 350, in join
    self._test_case.helper.join(remote_room_id, local_user_id, tok=local_user_tok)
  File "/home/runner/work/synapse/synapse/tests/rest/client/utils.py", line 195, in join
    return self.change_membership(
  File "/home/runner/work/synapse/synapse/tests/rest/client/utils.py", line 333, in change_membership
    assert channel.code == expect_code, (
builtins.AssertionError: Expected: 200, got: 400, PUT /_matrix/client/r0/rooms/!remote-room:other.example.com/state/m.room.member/@user1:test?access_token=syt_dXNlcjE_JSEarRndiAGqtydnrdLn_33qlLD -> resp: b'{"errcode":"M_UNKNOWN","error":"No create event in state"}'

tests.federation.test_federation_join_upgraded_room.FederationJoinUpgradedRoomTestCase.test_no_transfer_when_tombstone_does_not_match
```

These tests were originally introduced
element-hq/synapse-private#136 (developed
private as this was part of the Synapse security release) and introduced
into the public codebase via
cbc6934
@MadLittleMods MadLittleMods mentioned this pull request Aug 3, 2026
Merged
3 tasks
netbsd-srcmastr pushed a commit to NetBSD/pkgsrc that referenced this pull request Aug 7, 2026
gdt
chat/matrix-synapse: Update to 1.158.0
c6512c0 
Tested on NetBSD 10 amd64 with 2026Q2 environment.

# Synapse 1.158.0 (2026-08-04)

## Features

- Change default room version to 11, implementing [MSC4239](matrix-org/matrix-spec-proposals#4239) as part of Matrix v1.14. ([\#18680](element-hq/synapse#18680))
- Add animation support to the media thumbnailer, gated behind the `animated` query parameter on the thumbnail endpoint (defaults to off). ([\#18831](element-hq/synapse#18831))
- Return `M_USER_LIMIT_EXCEEDED` error code for media upload limits from [MSC4335](matrix-org/matrix-spec-proposals#4335). ([\#18876](element-hq/synapse#18876))
- Add Synapse Module API hook that notifies modules when events are delivered over federation (`register_federation_callbacks(...)`). ([\#20019](element-hq/synapse#20019))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MadLittleMods MadLittleMods MadLittleMods left review comments
@reivilibre reivilibre reivilibre requested changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Room version default does not match the specification.

4 participants

@ShadowRZ @reivilibre @anoadragon453 @MadLittleMods