Merge branch 'release-v1.113' into develop

20 files changed, 51 insertions, 18 deletions

diff --git a/CHANGES.md b/CHANGES.md
index b4fddc3e5c..c40c11f98c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,47 @@
+# Synapse 1.113.0rc1 (2024-08-06)
+
+### Features
+
+- Track which rooms have been sent to clients in the experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint. ([\#17447](https://github.com/element-hq/synapse/issues/17447))
+- Add Account Data extension support to experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint. ([\#17477](https://github.com/element-hq/synapse/issues/17477))
+- Add receipts extension support to experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint. ([\#17489](https://github.com/element-hq/synapse/issues/17489))
+- Add typing notification extension support to experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint. ([\#17505](https://github.com/element-hq/synapse/issues/17505))
+
+### Bugfixes
+
+- Update experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint to handle invite/knock rooms when filtering. ([\#17450](https://github.com/element-hq/synapse/issues/17450))
+- Fix a bug introduced in v1.110.0 which caused `/keys/query` to return incomplete results, leading to high network activity and CPU usage on Matrix clients. ([\#17499](https://github.com/element-hq/synapse/issues/17499))
+
+### Improved Documentation
+
+- Update the [`allowed_local_3pids`](https://element-hq.github.io/synapse/v1.112/usage/configuration/config_documentation.html#allowed_local_3pids) config option's msisdn address to a working example. ([\#17476](https://github.com/element-hq/synapse/issues/17476))
+
+### Internal Changes
+
+- Change sliding sync to use their own token format in preparation for storing per-connection state. ([\#17452](https://github.com/element-hq/synapse/issues/17452))
+- Ensure we don't send down negative `bump_stamp` in experimental sliding sync endpoint. ([\#17478](https://github.com/element-hq/synapse/issues/17478))
+- Do not send down empty room entries down experimental sliding sync endpoint. ([\#17479](https://github.com/element-hq/synapse/issues/17479))
+- Refactor Sliding Sync tests to better utilize the `SlidingSyncBase`. ([\#17481](https://github.com/element-hq/synapse/issues/17481), [\#17482](https://github.com/element-hq/synapse/issues/17482))
+- Add some opentracing tags and logging to the experimental sliding sync implementation. ([\#17501](https://github.com/element-hq/synapse/issues/17501))
+- Split and move Sliding Sync tests so we have some more sane test file sizes. ([\#17504](https://github.com/element-hq/synapse/issues/17504))
+- Update the `limited` field description in the Sliding Sync response to accurately describe what it actually represents. ([\#17507](https://github.com/element-hq/synapse/issues/17507))
+- Easier to understand `timeline` assertions in Sliding Sync tests. ([\#17511](https://github.com/element-hq/synapse/issues/17511))
+- Reset the sliding sync connection if we don't recognize the per-connection state position. ([\#17529](https://github.com/element-hq/synapse/issues/17529))
+
+
+
+### Updates to locked dependencies
+
+* Bump bcrypt from 4.1.3 to 4.2.0. ([\#17495](https://github.com/element-hq/synapse/issues/17495))
+* Bump black from 24.4.2 to 24.8.0. ([\#17522](https://github.com/element-hq/synapse/issues/17522))
+* Bump phonenumbers from 8.13.39 to 8.13.42. ([\#17521](https://github.com/element-hq/synapse/issues/17521))
+* Bump ruff from 0.5.4 to 0.5.5. ([\#17494](https://github.com/element-hq/synapse/issues/17494))
+* Bump serde_json from 1.0.120 to 1.0.121. ([\#17493](https://github.com/element-hq/synapse/issues/17493))
+* Bump serde_json from 1.0.121 to 1.0.122. ([\#17525](https://github.com/element-hq/synapse/issues/17525))
+* Bump towncrier from 23.11.0 to 24.7.1. ([\#17523](https://github.com/element-hq/synapse/issues/17523))
+* Bump types-pyopenssl from 24.1.0.20240425 to 24.1.0.20240722. ([\#17496](https://github.com/element-hq/synapse/issues/17496))
+* Bump types-setuptools from 70.1.0.20240627 to 71.1.0.20240726. ([\#17497](https://github.com/element-hq/synapse/issues/17497))
+
 # Synapse 1.112.0 (2024-07-30)
 
 This security release is to update our locked dependency on Twisted to 24.7.0rc1, which includes a security fix for [CVE-2024-41671 / GHSA-c8m8-j448-xjx7: Disordered HTTP pipeline response in twisted.web, again](https://github.com/twisted/twisted/security/advisories/GHSA-c8m8-j448-xjx7).
diff --git a/changelog.d/17447.feature b/changelog.d/17447.feature
deleted file mode 100644
index 6f80e298ae..0000000000
--- a/changelog.d/17447.feature
+++ /dev/null
@@ -1 +0,0 @@
-Track which rooms have been sent to clients in the experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint.
diff --git a/changelog.d/17450.bugfix b/changelog.d/17450.bugfix
deleted file mode 100644
index 01a521da38..0000000000
--- a/changelog.d/17450.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Update experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint to handle invite/knock rooms when filtering.
diff --git a/changelog.d/17452.misc b/changelog.d/17452.misc
deleted file mode 100644
index 4fd07f617b..0000000000
--- a/changelog.d/17452.misc
+++ /dev/null
@@ -1 +0,0 @@
-Change sliding sync to use their own token format in preparation for storing per-connection state.
diff --git a/changelog.d/17476.doc b/changelog.d/17476.doc
deleted file mode 100644
index 89d8d490bb..0000000000
--- a/changelog.d/17476.doc
+++ /dev/null
@@ -1 +0,0 @@
-Update the [`allowed_local_3pids`](https://element-hq.github.io/synapse/v1.112/usage/configuration/config_documentation.html#allowed_local_3pids) config option's msisdn address to a working example.
diff --git a/changelog.d/17477.feature b/changelog.d/17477.feature
deleted file mode 100644
index 9785a2ef7b..0000000000
--- a/changelog.d/17477.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add Account Data extension support to experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint.
diff --git a/changelog.d/17478.misc b/changelog.d/17478.misc
deleted file mode 100644
index 5406c82742..0000000000
--- a/changelog.d/17478.misc
+++ /dev/null
@@ -1 +0,0 @@
-Ensure we don't send down negative `bump_stamp` in experimental sliding sync endpoint.
diff --git a/changelog.d/17479.misc b/changelog.d/17479.misc
deleted file mode 100644
index 4502f71662..0000000000
--- a/changelog.d/17479.misc
+++ /dev/null
@@ -1 +0,0 @@
-Do not send down empty room entries down experimental sliding sync endpoint.
diff --git a/changelog.d/17481.misc b/changelog.d/17481.misc
deleted file mode 100644
index ac55538424..0000000000
--- a/changelog.d/17481.misc
+++ /dev/null
@@ -1 +0,0 @@
-Refactor Sliding Sync tests to better utilize the `SlidingSyncBase`.
diff --git a/changelog.d/17482.misc b/changelog.d/17482.misc
deleted file mode 100644
index ac55538424..0000000000
--- a/changelog.d/17482.misc
+++ /dev/null
@@ -1 +0,0 @@
-Refactor Sliding Sync tests to better utilize the `SlidingSyncBase`.
diff --git a/changelog.d/17489.feature b/changelog.d/17489.feature
deleted file mode 100644
index 5ace1e675e..0000000000
--- a/changelog.d/17489.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add receipts extension support to experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint.
diff --git a/changelog.d/17499.bugfix b/changelog.d/17499.bugfix
deleted file mode 100644
index 5cb7b3c30e..0000000000
--- a/changelog.d/17499.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug introduced in v1.110.0 which caused `/keys/query` to return incomplete results, leading to high network activity and CPU usage on Matrix clients.
diff --git a/changelog.d/17501.misc b/changelog.d/17501.misc
deleted file mode 100644
index ba96472acb..0000000000
--- a/changelog.d/17501.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add some opentracing tags and logging to the experimental sliding sync implementation.
diff --git a/changelog.d/17504.misc b/changelog.d/17504.misc
deleted file mode 100644
index 4ab892843d..0000000000
--- a/changelog.d/17504.misc
+++ /dev/null
@@ -1 +0,0 @@
-Split and move Sliding Sync tests so we have some more sane test file sizes.
diff --git a/changelog.d/17505.feature b/changelog.d/17505.feature
deleted file mode 100644
index ca0c2bd70f..0000000000
--- a/changelog.d/17505.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add typing notification extension support to experimental [MSC3575](https://github.com/matrix-org/matrix-spec-proposals/pull/3575) Sliding Sync `/sync` endpoint.
diff --git a/changelog.d/17507.misc b/changelog.d/17507.misc
deleted file mode 100644
index 82c4d263be..0000000000
--- a/changelog.d/17507.misc
+++ /dev/null
@@ -1 +0,0 @@
-Update the `limited` field description in the Sliding Sync response to accurately describe what it actually represents.
diff --git a/changelog.d/17511.misc b/changelog.d/17511.misc
deleted file mode 100644
index abc7be44ba..0000000000
--- a/changelog.d/17511.misc
+++ /dev/null
@@ -1 +0,0 @@
-Easier to understand `timeline` assertions in Sliding Sync tests.
diff --git a/changelog.d/17529.misc b/changelog.d/17529.misc
deleted file mode 100644
index 37b2ee07a4..0000000000
--- a/changelog.d/17529.misc
+++ /dev/null
@@ -1 +0,0 @@
-Reset the sliding sync connection if we don't recognize the per-connection state position.
diff --git a/debian/changelog b/debian/changelog
index e35750a35f..e89fdb98dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.113.0~rc1) stable; urgency=medium
+
+  * New Synapse release 1.113.0rc1.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 06 Aug 2024 12:23:23 +0100
+
 matrix-synapse-py3 (1.112.0) stable; urgency=medium
 
   * New Synapse release 1.112.0.
diff --git a/pyproject.toml b/pyproject.toml
index c8373c6dbc..c29d1534fb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -97,7 +97,7 @@ module-name = "synapse.synapse_rust"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.112.0"
+version = "1.113.0rc1"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "AGPL-3.0-or-later"