Timeout Linearizer

Add test
Refactor test to use clock
2025-06-25 13:35:03 +01:00 · 2025-06-25 13:28:33 +01:00 · 2025-06-25 13:28:33 +01:00 · 2025-06-25 13:28:33 +01:00
318 changed files with 4434 additions and 14303 deletions
@@ -5,7 +5,7 @@ name: Build docker images
 on:
  push:
    tags: ["v*"]
-    branches: [master, main, develop]
+    branches: [ master, main, develop ]
  workflow_dispatch:

 permissions:
@@ -14,21 +14,23 @@ permissions:
  id-token: write # needed for signing the images with GitHub OIDC Token
 jobs:
  build:
-    name: Build and push image for ${{ matrix.platform }}
-    runs-on: ${{ matrix.runs_on }}
-    strategy:
-      matrix:
-        include:
-          - platform: linux/amd64
-            runs_on: ubuntu-24.04
-            suffix: linux-amd64
-          - platform: linux/arm64
-            runs_on: ubuntu-24.04-arm
-            suffix: linux-arm64
+    runs-on: ubuntu-22.04
    steps:
+      - name: Set up QEMU
+        id: qemu
+        uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
+        with:
+          platforms: arm64
+
      - name: Set up Docker Buildx
        id: buildx
-        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
+        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
+
+      - name: Inspect builder
+        run: docker buildx inspect
+
+      - name: Install Cosign
+        uses: sigstore/cosign-installer@3454372f43399081ed03b604cb2d021dabca52bb # v3.8.2

      - name: Checkout repository
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -53,79 +55,13 @@ jobs:
          username: ${{ github.repository_owner }}
          password: ${{ secrets.GITHUB_TOKEN }}

-      - name: Build and push by digest
-        id: build
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
-        with:
-          push: true
-          labels: |
-            gitsha1=${{ github.sha }}
-            org.opencontainers.image.version=${{ env.SYNAPSE_VERSION }}
-          tags: |
-            docker.io/matrixdotorg/synapse
-            ghcr.io/element-hq/synapse
-          file: "docker/Dockerfile"
-          platforms: ${{ matrix.platform }}
-          outputs: type=image,push-by-digest=true,name-canonical=true,push=true
-
-      - name: Export digest
-        run: |
-          mkdir -p ${{ runner.temp }}/digests
-          digest="${{ steps.build.outputs.digest }}"
-          touch "${{ runner.temp }}/digests/${digest#sha256:}"
-
-      - name: Upload digest
-        uses: actions/upload-artifact@v4
-        with:
-          name: digests-${{ matrix.suffix }}
-          path: ${{ runner.temp }}/digests/*
-          if-no-files-found: error
-          retention-days: 1
-
-  merge:
-    name: Push merged images to ${{ matrix.repository }}
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        repository:
-          - docker.io/matrixdotorg/synapse
-          - ghcr.io/element-hq/synapse
-
-    needs:
-      - build
-    steps:
-      - name: Download digests
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
-        with:
-          path: ${{ runner.temp }}/digests
-          pattern: digests-*
-          merge-multiple: true
-
-      - name: Log in to DockerHub
-        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
-        if: ${{ startsWith(matrix.repository, 'docker.io') }}
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Log in to GHCR
-        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
-        if: ${{ startsWith(matrix.repository, 'ghcr.io') }}
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
-
-      - name: Install Cosign
-        uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
-
      - name: Calculate docker image tag
+        id: set-tag
        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
        with:
-          images: ${{ matrix.repository }}
+          images: |
+            docker.io/matrixdotorg/synapse
+            ghcr.io/element-hq/synapse
          flavor: |
            latest=false
          tags: |
@@ -133,23 +69,31 @@ jobs:
            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }}
            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
            type=pep440,pattern={{raw}}
-            type=sha

-      - name: Create manifest list and push
-        working-directory: ${{ runner.temp }}/digests
-        env:
-          REPOSITORY: ${{ matrix.repository }}
-        run: |
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf "$REPOSITORY@sha256:%s " *)
+      - name: Build and push all platforms
+        id: build-and-push
+        uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
+        with:
+          push: true
+          labels: |
+            gitsha1=${{ github.sha }}
+            org.opencontainers.image.version=${{ env.SYNAPSE_VERSION }}
+          tags: "${{ steps.set-tag.outputs.tags }}"
+          file: "docker/Dockerfile"
+          platforms: linux/amd64,linux/arm64

-      - name: Sign each manifest
+          # arm64 builds OOM without the git fetch setting. c.f.
+          # https://github.com/rust-lang/cargo/issues/10583
+          build-args: |
+            CARGO_NET_GIT_FETCH_WITH_CLI=true
+
+      - name: Sign the images with GitHub OIDC Token
        env:
-          REPOSITORY: ${{ matrix.repository }}
+          DIGEST: ${{ steps.build-and-push.outputs.digest }}
+          TAGS: ${{ steps.set-tag.outputs.tags }}
        run: |
-          DIGESTS=""
-          for TAG in $(echo "$DOCKER_METADATA_OUTPUT_JSON" | jq -r '.tags[]'); do
-            DIGEST="$(docker buildx imagetools inspect $TAG --format '{{json .Manifest}}' | jq -r '.digest')"
-            DIGESTS="$DIGESTS $REPOSITORY@$DIGEST"
+          images=""
+          for tag in ${TAGS}; do
+            images+="${tag}@${DIGEST} "
          done
-          cosign sign --yes $DIGESTS
+          cosign sign --yes ${images}
@@ -6,11 +6,6 @@ name: Attempt to automatically fix linting errors
 on:
  workflow_dispatch:

-env:
-  # We use nightly so that `fmt` correctly groups together imports, and
-  # clippy correctly fixes up the benchmarks.
-  RUST_VERSION: nightly-2025-06-24
-
 jobs:
  fixup:
    name: Fix up
@@ -21,11 +16,13 @@ jobs:
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Install Rust
-        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
+        uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0 # master (rust 1.85.1)
        with:
-          toolchain: ${{ env.RUST_VERSION }}
+          # We use nightly so that `fmt` correctly groups together imports, and
+          # clippy correctly fixes up the benchmarks.
+          toolchain: nightly-2022-12-01
          components: clippy, rustfmt
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8

      - name: Setup Poetry
        uses: matrix-org/setup-python-poetry@5bbf6603c5c930615ec8a29f1b5d7d258d905aa4 # v2.0.0
@@ -47,6 +44,6 @@ jobs:
      - run: cargo fmt
        continue-on-error: true

-      - uses: stefanzweifel/git-auto-commit-action@778341af668090896ca464160c2def5d1d1a3eb0 # v6.0.1
+      - uses: stefanzweifel/git-auto-commit-action@b863ae1933cb653a53c021fe36dbb774e1fb9403 # v5.2.0
        with:
          commit_message: "Attempt to fix linting"
@@ -21,9 +21,6 @@ concurrency:
  group: ${{ github.workflow }}-${{ github.ref }}
  cancel-in-progress: true

-env:
-  RUST_VERSION: 1.87.0
-
 jobs:
  check_repo:
    # Prevent this workflow from running on any fork of Synapse other than element-hq/synapse, as it is
@@ -44,10 +41,8 @@ jobs:
    steps:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - name: Install Rust
-        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
-        with:
-          toolchain: ${{ env.RUST_VERSION }}
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+        uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # stable (rust 1.85.1)
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8

      # The dev dependencies aren't exposed in the wheel metadata (at least with current
      # poetry-core versions), so we install with poetry.
@@ -60,7 +55,7 @@ jobs:
      - run: poetry run pip list > before.txt
      # Upgrade all runtime dependencies only. This is intended to mimic a fresh
      # `pip install matrix-synapse[all]` as closely as possible.
-      - run: poetry update --without dev
+      - run: poetry update --no-dev
      - run: poetry run pip list > after.txt && (diff -u before.txt after.txt || true)
      - name: Remove unhelpful options from mypy config
        run: sed -e '/warn_unused_ignores = True/d' -e '/warn_redundant_casts = True/d' -i mypy.ini
@@ -80,10 +75,8 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Install Rust
-        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
-        with:
-          toolchain: ${{ env.RUST_VERSION }}
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+        uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # stable (rust 1.85.1)
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8

      - run: sudo apt-get -qq install xmlsec1
      - name: Set up PostgreSQL ${{ matrix.postgres-version }}
@@ -155,10 +148,8 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Install Rust
-        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
-        with:
-          toolchain: ${{ env.RUST_VERSION }}
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+        uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # stable (rust 1.85.1)
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8

      - name: Ensure sytest runs `pip install`
        # Delete the lockfile so sytest will `pip install` rather than `poetry install`
@@ -30,7 +30,7 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
        with:
-          python-version: "3.x"
+          python-version: '3.x'
      - id: set-distros
        run: |
          # if we're running from a tag, get the full list of distros; otherwise just use debian:sid
@@ -61,7 +61,7 @@ jobs:

      - name: Set up Docker Buildx
        id: buildx
-        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
+        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
        with:
          install: true

@@ -76,7 +76,7 @@ jobs:
      - name: Set up python
        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
        with:
-          python-version: "3.x"
+          python-version: '3.x'

      - name: Build the packages
        # see https://github.com/docker/build-push-action/issues/252
@@ -107,15 +107,12 @@ jobs:
          path: debs/*

  build-wheels:
-    name: Build wheels on ${{ matrix.os }}
+    name: Build wheels on ${{ matrix.os }} for ${{ matrix.arch }}
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        os:
-          - ubuntu-24.04
-          - ubuntu-24.04-arm
-          - macos-13 # This uses x86-64
-          - macos-14 # This uses arm64
+        os: [ubuntu-22.04, macos-13]
+        arch: [x86_64, aarch64]
        # is_pr is a flag used to exclude certain jobs from the matrix on PRs.
        # It is not read by the rest of the workflow.
        is_pr:
@@ -125,11 +122,12 @@ jobs:
          # Don't build macos wheels on PR CI.
          - is_pr: true
            os: "macos-13"
-          - is_pr: true
-            os: "macos-14"
+          # Don't build aarch64 wheels on mac.
+          - os: "macos-13"
+            arch: aarch64
          # Don't build aarch64 wheels on PR CI.
          - is_pr: true
-            os: "ubuntu-24.04-arm"
+            arch: aarch64

    steps:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -141,11 +139,21 @@ jobs:
          python-version: "3.x"

      - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==3.0.0
+        run: python -m pip install cibuildwheel==2.23.0
+
+      - name: Set up QEMU to emulate aarch64
+        if: matrix.arch == 'aarch64'
+        uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
+        with:
+          platforms: arm64
+
+      - name: Build aarch64 wheels
+        if: matrix.arch == 'aarch64'
+        run: echo 'CIBW_ARCHS_LINUX=aarch64' >> $GITHUB_ENV

      - name: Only build a single wheel on PR
        if: startsWith(github.ref, 'refs/pull/')
-        run: echo "CIBW_BUILD="cp39-manylinux_*"" >> $GITHUB_ENV
+        run: echo "CIBW_BUILD="cp39-manylinux_${{ matrix.arch }}"" >> $GITHUB_ENV

      - name: Build wheels
        run: python -m cibuildwheel --output-dir wheelhouse
@@ -153,10 +161,13 @@ jobs:
          # Skip testing for platforms which various libraries don't have wheels
          # for, and so need extra build deps.
          CIBW_TEST_SKIP: pp3*-* *i686* *musl*
+          # Fix Rust OOM errors on emulated aarch64: https://github.com/rust-lang/cargo/issues/10583
+          CARGO_NET_GIT_FETCH_WITH_CLI: true
+          CIBW_ENVIRONMENT_PASS_LINUX: CARGO_NET_GIT_FETCH_WITH_CLI

      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
-          name: Wheel-${{ matrix.os }}
+          name: Wheel-${{ matrix.os }}-${{ matrix.arch }}
          path: ./wheelhouse/*.whl

  build-sdist:
@@ -168,7 +179,7 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
        with:
-          python-version: "3.10"
+          python-version: '3.10'

      - run: pip install build

@@ -180,6 +191,7 @@ jobs:
          name: Sdist
          path: dist/*.tar.gz

+
  # if it's a tag, create a release and attach the artifacts to it
  attach-assets:
    name: "Attach assets to release"
@@ -11,9 +11,6 @@ concurrency:
  group: ${{ github.workflow }}-${{ github.ref }}
  cancel-in-progress: true

-env:
-  RUST_VERSION: 1.87.0
-
 jobs:
  # Job to detect what has changed so we don't run e.g. Rust checks on PRs that
  # don't modify Rust code.
@@ -88,10 +85,8 @@ jobs:
    steps:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      - name: Install Rust
-        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
-        with:
-          toolchain: ${{ env.RUST_VERSION }}
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+        uses: dtolnay/rust-toolchain@c1678930c21fb233e4987c4ae12158f9125e5762 # 1.81.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - uses: matrix-org/setup-python-poetry@5bbf6603c5c930615ec8a29f1b5d7d258d905aa4 # v2.0.0
        with:
          python-version: "3.x"
@@ -154,10 +149,8 @@ jobs:
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Install Rust
-        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
-        with:
-          toolchain: ${{ env.RUST_VERSION }}
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+        uses: dtolnay/rust-toolchain@c1678930c21fb233e4987c4ae12158f9125e5762 # 1.81.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8

      - name: Setup Poetry
        uses: matrix-org/setup-python-poetry@5bbf6603c5c930615ec8a29f1b5d7d258d905aa4 # v2.0.0
@@ -217,10 +210,8 @@ jobs:
        with:
          ref: ${{ github.event.pull_request.head.sha }}
      - name: Install Rust
-        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
-        with:
-          toolchain: ${{ env.RUST_VERSION }}
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+        uses: dtolnay/rust-toolchain@c1678930c21fb233e4987c4ae12158f9125e5762 # 1.81.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - uses: matrix-org/setup-python-poetry@5bbf6603c5c930615ec8a29f1b5d7d258d905aa4 # v2.0.0
        with:
          poetry-version: "2.1.1"
@@ -236,11 +227,10 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Install Rust
-        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
+        uses: dtolnay/rust-toolchain@0d72692bcfbf448b1e2afa01a67f71b455a9dcec # 1.86.0
        with:
            components: clippy
-            toolchain: ${{ env.RUST_VERSION }}
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8

      - run: cargo clippy -- -D warnings

@@ -255,51 +245,14 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Install Rust
-        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
+        uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0 # master (rust 1.85.1)
        with:
            toolchain: nightly-2025-04-23
            components: clippy
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8

      - run: cargo clippy --all-features -- -D warnings

-  lint-rust:
-    runs-on: ubuntu-latest
-    needs: changes
-    if: ${{ needs.changes.outputs.rust == 'true' }}
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Install Rust
-        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
-        with:
-          toolchain: ${{ env.RUST_VERSION }}
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
-
-      - name: Setup Poetry
-        uses: matrix-org/setup-python-poetry@5bbf6603c5c930615ec8a29f1b5d7d258d905aa4 # v2.0.0
-        with:
-          # Install like a normal project from source with all optional dependencies
-          extras: all
-          install-project: "true"
-          poetry-version: "2.1.1"
-
-      - name: Ensure `Cargo.lock` is up to date (no stray changes after install)
-        # The `::error::` syntax is using GitHub Actions' error annotations, see
-        # https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions
-        run: |
-          if git diff --quiet Cargo.lock; then
-            echo "Cargo.lock is up to date"
-          else
-            echo "::error::Cargo.lock has uncommitted changes after install. Please run 'poetry install --extras all' and commit the Cargo.lock changes."
-            git diff --exit-code Cargo.lock
-            exit 1
-          fi
-
-  # This job is split from `lint-rust` because it requires a nightly Rust toolchain
-  # for some of the unstable options we use in `.rustfmt.toml`.
  lint-rustfmt:
    runs-on: ubuntu-latest
    needs: changes
@@ -309,13 +262,12 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Install Rust
-        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
+        uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0 # master (rust 1.85.1)
        with:
-          # We use nightly so that we can use some unstable options that we use in
-          # `.rustfmt.toml`.
+          # We use nightly so that it correctly groups together imports
          toolchain: nightly-2025-04-23
          components: rustfmt
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8

      - run: cargo fmt --check

@@ -347,7 +299,6 @@ jobs:
      - check-lockfile
      - lint-clippy
      - lint-clippy-nightly
-      - lint-rust
      - lint-rustfmt
      - lint-readme
    runs-on: ubuntu-latest
@@ -366,7 +317,6 @@ jobs:
            lint-pydantic
            lint-clippy
            lint-clippy-nightly
-            lint-rust
            lint-rustfmt
            lint-readme

@@ -412,10 +362,8 @@ jobs:
            postgres:${{ matrix.job.postgres-version }}

      - name: Install Rust
-        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
-        with:
-          toolchain: ${{ env.RUST_VERSION }}
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+        uses: dtolnay/rust-toolchain@c1678930c21fb233e4987c4ae12158f9125e5762 # 1.81.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8

      - uses: matrix-org/setup-python-poetry@5bbf6603c5c930615ec8a29f1b5d7d258d905aa4 # v2.0.0
        with:
@@ -456,10 +404,8 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Install Rust
-        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
-        with:
-          toolchain: ${{ env.RUST_VERSION }}
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+        uses: dtolnay/rust-toolchain@c1678930c21fb233e4987c4ae12158f9125e5762 # 1.81.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8

      # There aren't wheels for some of the older deps, so we need to install
      # their build dependencies
@@ -573,10 +519,8 @@ jobs:
        run: cat sytest-blacklist .ci/worker-blacklist > synapse-blacklist-with-workers

      - name: Install Rust
-        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
-        with:
-          toolchain: ${{ env.RUST_VERSION }}
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+        uses: dtolnay/rust-toolchain@c1678930c21fb233e4987c4ae12158f9125e5762 # 1.81.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8

      - name: Run SyTest
        run: /bootstrap.sh synapse
@@ -719,10 +663,8 @@ jobs:
          path: synapse

      - name: Install Rust
-        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
-        with:
-          toolchain: ${{ env.RUST_VERSION }}
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+        uses: dtolnay/rust-toolchain@c1678930c21fb233e4987c4ae12158f9125e5762 # 1.81.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8

      - name: Prepare Complement's Prerequisites
        run: synapse/.ci/scripts/setup_complement_prerequisites.sh
@@ -753,10 +695,8 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Install Rust
-        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
-        with:
-          toolchain: ${{ env.RUST_VERSION }}
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+        uses: dtolnay/rust-toolchain@c1678930c21fb233e4987c4ae12158f9125e5762 # 1.81.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8

      - run: cargo test

@@ -773,10 +713,10 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Install Rust
-        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
+        uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0 # master (rust 1.85.1)
        with:
            toolchain: nightly-2022-12-01
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8

      - run: cargo bench --no-run

@@ -20,9 +20,6 @@ concurrency:
  group: ${{ github.workflow }}-${{ github.ref }}
  cancel-in-progress: true

-env:
-  RUST_VERSION: 1.87.0
-
 jobs:
  check_repo:
    # Prevent this workflow from running on any fork of Synapse other than element-hq/synapse, as it is
@@ -46,10 +43,8 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Install Rust
-        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
-        with:
-          toolchain: ${{ env.RUST_VERSION }}
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+        uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # stable (rust 1.85.1)
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8

      - uses: matrix-org/setup-python-poetry@5bbf6603c5c930615ec8a29f1b5d7d258d905aa4 # v2.0.0
        with:
@@ -74,10 +69,8 @@ jobs:
      - run: sudo apt-get -qq install xmlsec1

      - name: Install Rust
-        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
-        with:
-          toolchain: ${{ env.RUST_VERSION }}
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+        uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # stable (rust 1.85.1)
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8

      - uses: matrix-org/setup-python-poetry@5bbf6603c5c930615ec8a29f1b5d7d258d905aa4 # v2.0.0
        with:
@@ -120,10 +113,8 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Install Rust
-        uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
-        with:
-          toolchain: ${{ env.RUST_VERSION }}
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+        uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # stable (rust 1.85.1)
+      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8

      - name: Patch dependencies
        # Note: The poetry commands want to create a virtualenv in /src/.venv/,
@@ -47,7 +47,6 @@ __pycache__/
 /.idea/
 /.ropeproject/
 /.vscode/
-/.zed/

 # build products
 !/.coveragerc
@@ -1,6 +1 @@
-# Unstable options are only available on a nightly toolchain and must be opted into
-unstable_features = true
-
-# `group_imports` is an unstable option that requires nightly Rust toolchain. Tracked by
-# https://github.com/rust-lang/rustfmt/issues/5083
 group_imports = "StdExternalCrate"
@@ -1,218 +1,3 @@
-# Synapse 1.135.1 (2025-08-11)
-
-This is the Synapse portion of the [Matrix coordinated security release](https://matrix.org/blog/2025/07/security-predisclosure/). This release includes support for [room version](https://spec.matrix.org/v1.15/rooms/) 12 which fixes a number of security vulnerabilities, including [CVE-2025-49090](https://www.cve.org/CVERecord?id=CVE-2025-49090).
-
-The default room version is not changed. Not all clients will support room version 12 immediately, and not all users will be using the latest version of their clients. Large, public rooms are advised to wait a few weeks before upgrading to room version 12 to allow users throughout the Matrix ecosystem to update their clients.
-
-Two patched Synapse releases are now available:
-
-* `1.135.1`: stable release comprised of `1.135.0` + security patches
-    * Upgrade to this release **if you are currently running 1.135.0 or below**.
-* `1.136.0rc2`: unstable release candidate comprised of `1.136.0rc1` + security patches.
-    * Upgrade to this release **only if you are on 1.136.0rc1**.
-
-### Bugfixes
-
- Fix invalidation of storage cache that was broken in 1.135.0. ([\#18786](https://github.com/element-hq/synapse/issues/18786))
-
-### Internal Changes
-
- Add a parameter to `upgrade_rooms(..)` to allow auto join local users. ([\#82](https://github.com/element-hq/synapse/issues/82))
- Speed up upgrading a room with large numbers of banned users. ([\#18574](https://github.com/element-hq/synapse/issues/18574))
-
-
-
-
-# Synapse 1.135.0 (2025-08-01)
-
-No significant changes since 1.135.0rc2.
-
-
-
-
-# Synapse 1.135.0rc2 (2025-07-30)
-
-### Bugfixes
-
- Fix user failing to deactivate with MAS when `/_synapse/mas` is handled by a worker. ([\#18716](https://github.com/element-hq/synapse/issues/18716))
-
-### Internal Changes
-
- Fix performance regression introduced in [#18238](https://github.com/element-hq/synapse/issues/18238) by adding a cache to `is_server_admin`. ([\#18747](https://github.com/element-hq/synapse/issues/18747))
-
-
-
-
-# Synapse 1.135.0rc1 (2025-07-22)
-
-### Features
-
- Add `recaptcha_private_key_path` and `recaptcha_public_key_path` config option. ([\#17984](https://github.com/element-hq/synapse/issues/17984), [\#18684](https://github.com/element-hq/synapse/issues/18684))
- Add plain-text handling for rich-text topics as per [MSC3765](https://github.com/matrix-org/matrix-spec-proposals/pull/3765). ([\#18195](https://github.com/element-hq/synapse/issues/18195))
- If enabled by the user, server admins will see [soft failed](https://spec.matrix.org/v1.13/server-server-api/#soft-failure) events over the Client-Server API. ([\#18238](https://github.com/element-hq/synapse/issues/18238))
- Add experimental support for [MSC4277: Harmonizing the reporting endpoints](https://github.com/matrix-org/matrix-spec-proposals/pull/4277). ([\#18263](https://github.com/element-hq/synapse/issues/18263))
- Add ability to limit amount of media uploaded by a user in a given time period. ([\#18527](https://github.com/element-hq/synapse/issues/18527))
- Enable workers to write directly to the device lists stream and handle device list updates, reducing load on the main process. ([\#18581](https://github.com/element-hq/synapse/issues/18581))
- Support arbitrary profile fields. Contributed by @clokep. ([\#18635](https://github.com/element-hq/synapse/issues/18635))
- Advertise support for Matrix v1.12. ([\#18647](https://github.com/element-hq/synapse/issues/18647))
- Add an option to issue redactions as an admin user via the [admin redaction endpoint](https://element-hq.github.io/synapse/latest/admin_api/user_admin_api.html#redact-all-the-events-of-a-user). ([\#18671](https://github.com/element-hq/synapse/issues/18671))
- Add experimental and incomplete support for [MSC4306: Thread Subscriptions](https://github.com/matrix-org/matrix-spec-proposals/blob/rei/msc_thread_subscriptions/proposals/4306-thread-subscriptions.md). ([\#18674](https://github.com/element-hq/synapse/issues/18674))
- Include `event_id` when getting state with `?format=event`. Contributed by @tulir @ Beeper. ([\#18675](https://github.com/element-hq/synapse/issues/18675))
-
-### Bugfixes
-
- Fix CPU and database spinning when retrying sending events to servers whilst at the same time purging those events. ([\#18499](https://github.com/element-hq/synapse/issues/18499))
- Don't allow creation of tags with names longer than 255 bytes, [as per the spec](https://spec.matrix.org/v1.15/client-server-api/#events-14). ([\#18660](https://github.com/element-hq/synapse/issues/18660))
- Fix `sliding_sync_connections`-related errors when porting from SQLite to Postgres. ([\#18677](https://github.com/element-hq/synapse/issues/18677))
- Fix the MAS integration not working when Synapse is started with `--daemonize` or using `synctl`. ([\#18691](https://github.com/element-hq/synapse/issues/18691))
-
-### Improved Documentation
-
- Document that some config options for the user directory are in violation of the Matrix spec. ([\#18548](https://github.com/element-hq/synapse/issues/18548))
- Update `rc_delayed_event_mgmt` docs to the actual nesting level. Contributed by @HarHarLinks. ([\#18692](https://github.com/element-hq/synapse/issues/18692))
-
-### Internal Changes
-
- Add a dedicated internal API for Matrix Authentication Service to Synapse communication. ([\#18520](https://github.com/element-hq/synapse/issues/18520))
- Allow user registrations to be done on workers. ([\#18552](https://github.com/element-hq/synapse/issues/18552))
- Remove unnecessary HTTP replication calls. ([\#18564](https://github.com/element-hq/synapse/issues/18564))
- Refactor `Measure` block metrics to be homeserver-scoped. ([\#18601](https://github.com/element-hq/synapse/issues/18601))
- Refactor cache metrics to be homeserver-scoped. ([\#18604](https://github.com/element-hq/synapse/issues/18604))
- Unbreak "Latest dependencies" workflow by using the `--without dev` poetry option instead of removed `--no-dev`. ([\#18617](https://github.com/element-hq/synapse/issues/18617))
- Update URL Preview code to work with `lxml` 6.0.0+. ([\#18622](https://github.com/element-hq/synapse/issues/18622))
- Use `markdown-it-py` instead of `commonmark` in the release script. ([\#18637](https://github.com/element-hq/synapse/issues/18637))
- Fix typing errors with upgraded mypy version. ([\#18653](https://github.com/element-hq/synapse/issues/18653))
- Add doc comment explaining that config files are shallowly merged. ([\#18664](https://github.com/element-hq/synapse/issues/18664))
- Minor speed up of insertion into `stream_positions` table. ([\#18672](https://github.com/element-hq/synapse/issues/18672))
- Remove unused `allow_no_prev_events` option when creating an event. ([\#18676](https://github.com/element-hq/synapse/issues/18676))
- Clean up `MetricsResource` and Prometheus hacks. ([\#18687](https://github.com/element-hq/synapse/issues/18687))
- Fix dirty `Cargo.lock` changes appearing after install (`base64`). ([\#18689](https://github.com/element-hq/synapse/issues/18689))
- Prevent dirty `Cargo.lock` changes from install. ([\#18693](https://github.com/element-hq/synapse/issues/18693))
- Correct spelling of 'Admin token used' log line. ([\#18697](https://github.com/element-hq/synapse/issues/18697))
- Reduce log spam when client stops downloading media while it is being streamed to them. ([\#18699](https://github.com/element-hq/synapse/issues/18699))
-
-
-
-### Updates to locked dependencies
-
-* Bump authlib from 1.6.0 to 1.6.1. ([\#18704](https://github.com/element-hq/synapse/issues/18704))
-* Bump base64 from 0.21.7 to 0.22.1. ([\#18666](https://github.com/element-hq/synapse/issues/18666))
-* Bump jsonschema from 4.24.0 to 4.25.0. ([\#18707](https://github.com/element-hq/synapse/issues/18707))
-* Bump lxml from 5.4.0 to 6.0.0. ([\#18631](https://github.com/element-hq/synapse/issues/18631))
-* Bump mypy from 1.13.0 to 1.16.1. ([\#18653](https://github.com/element-hq/synapse/issues/18653))
-* Bump once_cell from 1.19.0 to 1.21.3. ([\#18710](https://github.com/element-hq/synapse/issues/18710))
-* Bump phonenumbers from 9.0.8 to 9.0.9. ([\#18681](https://github.com/element-hq/synapse/issues/18681))
-* Bump ruff from 0.12.2 to 0.12.5. ([\#18683](https://github.com/element-hq/synapse/issues/18683), [\#18705](https://github.com/element-hq/synapse/issues/18705))
-* Bump serde_json from 1.0.140 to 1.0.141. ([\#18709](https://github.com/element-hq/synapse/issues/18709))
-* Bump sigstore/cosign-installer from 3.9.1 to 3.9.2. ([\#18708](https://github.com/element-hq/synapse/issues/18708))
-* Bump types-jsonschema from 4.24.0.20250528 to 4.24.0.20250708. ([\#18682](https://github.com/element-hq/synapse/issues/18682))
-
-# Synapse 1.134.0 (2025-07-15)
-
-No significant changes since 1.134.0rc1.
-
-
-
-
-# Synapse 1.134.0rc1 (2025-07-09)
-
-### Features
-
- Support for [MSC4235](https://github.com/matrix-org/matrix-spec-proposals/pull/4235): `via` query param for hierarchy endpoint. Contributed by Krishan (@kfiven). ([\#18070](https://github.com/element-hq/synapse/issues/18070))
- Add `forget_forced_upon_leave` capability as per [MSC4267](https://github.com/matrix-org/matrix-spec-proposals/pull/4267). ([\#18196](https://github.com/element-hq/synapse/issues/18196))
- Add `federated_user_may_invite` spam checker callback which receives the entire invite event. Contributed by @tulir @ Beeper. ([\#18241](https://github.com/element-hq/synapse/issues/18241))
-
-### Bugfixes
-
- Fix `KeyError` on background updates when using split main/state databases. ([\#18509](https://github.com/element-hq/synapse/issues/18509))
- Improve performance of device deletion by adding missing index. ([\#18582](https://github.com/element-hq/synapse/issues/18582))
- Fix `avatar_url` and `displayname` being sent on federation profile queries when they are not set. ([\#18593](https://github.com/element-hq/synapse/issues/18593))
- Respond with 401 & `M_USER_LOCKED` when a locked user calls `POST /login`, as per the spec. ([\#18594](https://github.com/element-hq/synapse/issues/18594))
- Ensure policy servers are not asked to scan policy server change events, allowing rooms to disable the use of a policy server while the policy server is down. ([\#18605](https://github.com/element-hq/synapse/issues/18605))
-
-### Improved Documentation
-
- Fix documentation of the Delete Room Admin API's status field. ([\#18519](https://github.com/element-hq/synapse/issues/18519))
-
-### Deprecations and Removals
-
- Stop adding the "origin" field to newly-created events (PDUs). ([\#18418](https://github.com/element-hq/synapse/issues/18418))
-
-### Internal Changes
-
- Replace `PyICU` crate with equivalent `icu_segmenter` Rust crate. ([\#18553](https://github.com/element-hq/synapse/issues/18553), [\#18646](https://github.com/element-hq/synapse/issues/18646))
- Improve docstring on `simple_upsert_many`. ([\#18573](https://github.com/element-hq/synapse/issues/18573))
- Raise poetry-core version cap to 2.1.3. ([\#18575](https://github.com/element-hq/synapse/issues/18575))
- Raise setuptools_rust version cap to 1.11.1. ([\#18576](https://github.com/element-hq/synapse/issues/18576))
- Better handling of ratelimited requests. ([\#18595](https://github.com/element-hq/synapse/issues/18595), [\#18600](https://github.com/element-hq/synapse/issues/18600))
- Update to Rust 1.87.0 in CI, and bump the pinned commit of the `dtolnay/rust-toolchain` GitHub Action to `b3b07ba8b418998c39fb20f53e8b695cdcc8de1b`. ([\#18596](https://github.com/element-hq/synapse/issues/18596))
- Speed up bulk device deletion. ([\#18602](https://github.com/element-hq/synapse/issues/18602))
- Speed up the building of arm-based wheels in CI. ([\#18618](https://github.com/element-hq/synapse/issues/18618))
- Speed up the building of Docker images in CI. ([\#18620](https://github.com/element-hq/synapse/issues/18620))
- Add `.zed/` directory to `.gitignore`. ([\#18623](https://github.com/element-hq/synapse/issues/18623))
- Log the room ID we're purging state for. ([\#18625](https://github.com/element-hq/synapse/issues/18625))
-
-
-
-### Updates to locked dependencies
-
-* Bump Swatinem/rust-cache from 2.7.8 to 2.8.0. ([\#18612](https://github.com/element-hq/synapse/issues/18612))
-* Bump attrs from 24.2.0 to 25.3.0. ([\#18649](https://github.com/element-hq/synapse/issues/18649))
-* Bump authlib from 1.5.2 to 1.6.0. ([\#18642](https://github.com/element-hq/synapse/issues/18642))
-* Bump base64 from 0.21.7 to 0.22.1. ([\#18589](https://github.com/element-hq/synapse/issues/18589))
-* Bump base64 from 0.21.7 to 0.22.1. ([\#18629](https://github.com/element-hq/synapse/issues/18629))
-* Bump docker/build-push-action from 6.17.0 to 6.18.0. ([\#18497](https://github.com/element-hq/synapse/issues/18497))
-* Bump docker/setup-buildx-action from 3.10.0 to 3.11.1. ([\#18587](https://github.com/element-hq/synapse/issues/18587))
-* Bump hiredis from 3.1.0 to 3.2.1. ([\#18638](https://github.com/element-hq/synapse/issues/18638))
-* Bump ijson from 3.3.0 to 3.4.0. ([\#18650](https://github.com/element-hq/synapse/issues/18650))
-* Bump jsonschema from 4.23.0 to 4.24.0. ([\#18630](https://github.com/element-hq/synapse/issues/18630))
-* Bump msgpack from 1.1.0 to 1.1.1. ([\#18651](https://github.com/element-hq/synapse/issues/18651))
-* Bump mypy-zope from 1.0.11 to 1.0.12. ([\#18640](https://github.com/element-hq/synapse/issues/18640))
-* Bump phonenumbers from 9.0.2 to 9.0.8. ([\#18652](https://github.com/element-hq/synapse/issues/18652))
-* Bump pillow from 11.2.1 to 11.3.0. ([\#18624](https://github.com/element-hq/synapse/issues/18624))
-* Bump prometheus-client from 0.21.0 to 0.22.1. ([\#18609](https://github.com/element-hq/synapse/issues/18609))
-* Bump pyasn1-modules from 0.4.1 to 0.4.2. ([\#18495](https://github.com/element-hq/synapse/issues/18495))
-* Bump pydantic from 2.11.4 to 2.11.7. ([\#18639](https://github.com/element-hq/synapse/issues/18639))
-* Bump reqwest from 0.12.15 to 0.12.20. ([\#18590](https://github.com/element-hq/synapse/issues/18590))
-* Bump reqwest from 0.12.20 to 0.12.22. ([\#18627](https://github.com/element-hq/synapse/issues/18627))
-* Bump ruff from 0.11.11 to 0.12.1. ([\#18645](https://github.com/element-hq/synapse/issues/18645))
-* Bump ruff from 0.12.1 to 0.12.2. ([\#18657](https://github.com/element-hq/synapse/issues/18657))
-* Bump sentry-sdk from 2.22.0 to 2.32.0. ([\#18633](https://github.com/element-hq/synapse/issues/18633))
-* Bump setuptools-rust from 1.10.2 to 1.11.1. ([\#18655](https://github.com/element-hq/synapse/issues/18655))
-* Bump sigstore/cosign-installer from 3.8.2 to 3.9.0. ([\#18588](https://github.com/element-hq/synapse/issues/18588))
-* Bump sigstore/cosign-installer from 3.9.0 to 3.9.1. ([\#18608](https://github.com/element-hq/synapse/issues/18608))
-* Bump stefanzweifel/git-auto-commit-action from 5.2.0 to 6.0.1. ([\#18607](https://github.com/element-hq/synapse/issues/18607))
-* Bump tokio from 1.45.1 to 1.46.0. ([\#18628](https://github.com/element-hq/synapse/issues/18628))
-* Bump tokio from 1.46.0 to 1.46.1. ([\#18667](https://github.com/element-hq/synapse/issues/18667))
-* Bump treq from 24.9.1 to 25.5.0. ([\#18610](https://github.com/element-hq/synapse/issues/18610))
-* Bump types-bleach from 6.2.0.20241123 to 6.2.0.20250514. ([\#18634](https://github.com/element-hq/synapse/issues/18634))
-* Bump types-jsonschema from 4.23.0.20250516 to 4.24.0.20250528. ([\#18611](https://github.com/element-hq/synapse/issues/18611))
-* Bump types-opentracing from 2.4.10.6 to 2.4.10.20250622. ([\#18586](https://github.com/element-hq/synapse/issues/18586))
-* Bump types-psycopg2 from 2.9.21.20250318 to 2.9.21.20250516. ([\#18658](https://github.com/element-hq/synapse/issues/18658))
-* Bump types-pyyaml from 6.0.12.20241230 to 6.0.12.20250516. ([\#18643](https://github.com/element-hq/synapse/issues/18643))
-* Bump types-setuptools from 75.2.0.20241019 to 80.9.0.20250529. ([\#18644](https://github.com/element-hq/synapse/issues/18644))
-* Bump typing-extensions from 4.12.2 to 4.14.0. ([\#18654](https://github.com/element-hq/synapse/issues/18654))
-* Bump typing-extensions from 4.14.0 to 4.14.1. ([\#18668](https://github.com/element-hq/synapse/issues/18668))
-* Bump urllib3 from 2.2.2 to 2.5.0. ([\#18572](https://github.com/element-hq/synapse/issues/18572))
-
-# Synapse 1.133.0 (2025-07-01)
-
-Pre-built wheels are now built using the [manylinux_2_28](https://github.com/pypa/manylinux#manylinux_2_28-almalinux-8-based) base, which is expected to be compatible with distros using glibc 2.28 or later, including:
-
- - Debian 10+
- - Ubuntu 18.10+
- - Fedora 29+
- - CentOS/RHEL 8+
-
-Previously, wheels were built using the [manylinux2014](https://github.com/pypa/manylinux#manylinux2014-centos-7-based-glibc-217) base, which was expected to be compatible with distros using glibc 2.17 or later.
-
-### Bugfixes
-
- Bump `cibuildwheel` to 3.0.0 to fix the `manylinux` wheel builds. ([\#18615](https://github.com/element-hq/synapse/issues/18615))
-
-
-
-
 # Synapse 1.133.0rc1 (2025-06-24)

 ### Features
@@ -62,9 +62,15 @@ dependencies = [
 "miniz_oxide",
 "object",
 "rustc-demangle",
- "windows-targets",
+ "windows-targets 0.52.6",
 ]

+[[package]]
+name = "base64"
+version = "0.21.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+
 [[package]]
 name = "base64"
 version = "0.22.1"
@@ -144,15 +150,6 @@ version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"

-[[package]]
-name = "core_maths"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77745e017f5edba1a9c1d854f6f3a52dac8a12dd5af5d2f54aecf61e43d80d30"
-dependencies = [
- "libm",
-]
-
 [[package]]
 name = "cpufeatures"
 version = "0.2.12"
@@ -334,7 +331,7 @@ dependencies = [
 "cfg-if",
 "libc",
 "wasi 0.13.3+wasi-0.2.2",
- "windows-targets",
+ "windows-targets 0.52.6",
 ]

 [[package]]
@@ -374,7 +371,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b3314d5adb5d94bcdf56771f2e50dbbc80bb4bdf88967526706205ac9eff24eb"
 dependencies = [
- "base64",
+ "base64 0.22.1",
 "bytes",
 "headers-core",
 "http",
@@ -490,21 +487,17 @@ dependencies = [

 [[package]]
 name = "hyper-util"
-version = "0.1.14"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc2fdfdbff08affe55bb779f33b053aa1fe5dd5b54c257343c17edfa55711bdb"
+checksum = "497bbc33a26fdd4af9ed9c70d63f61cf56a938375fbb32df34db9b1cd6d643f2"
 dependencies = [
- "base64",
 "bytes",
 "futures-channel",
- "futures-core",
 "futures-util",
 "http",
 "http-body",
 "hyper",
- "ipnet",
 "libc",
- "percent-encoding",
 "pin-project-lite",
 "socket2",
 "tokio",
@@ -519,59 +512,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
 dependencies = [
 "displaydoc",
- "yoke 0.7.5",
+ "yoke",
 "zerofrom",
- "zerovec 0.10.4",
+ "zerovec",
 ]

-[[package]]
-name = "icu_collections"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
-dependencies = [
- "displaydoc",
- "potential_utf",
- "yoke 0.8.0",
- "zerofrom",
- "zerovec 0.11.2",
-]
-
-[[package]]
-name = "icu_locale"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ae5921528335e91da1b6c695dbf1ec37df5ac13faa3f91e5640be93aa2fbefd"
-dependencies = [
- "displaydoc",
- "icu_collections 2.0.0",
- "icu_locale_core",
- "icu_locale_data",
- "icu_provider 2.0.0",
- "potential_utf",
- "tinystr 0.8.1",
- "zerovec 0.11.2",
-]
-
-[[package]]
-name = "icu_locale_core"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
-dependencies = [
- "displaydoc",
- "litemap 0.8.0",
- "tinystr 0.8.1",
- "writeable 0.6.1",
- "zerovec 0.11.2",
-]
-
-[[package]]
-name = "icu_locale_data"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fdef0c124749d06a743c69e938350816554eb63ac979166590e2b4ee4252765"
-
 [[package]]
 name = "icu_locid"
 version = "1.5.0"
@@ -579,10 +524,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
 dependencies = [
 "displaydoc",
- "litemap 0.7.5",
- "tinystr 0.7.6",
- "writeable 0.5.5",
- "zerovec 0.10.4",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
 ]

 [[package]]
@@ -594,9 +539,9 @@ dependencies = [
 "displaydoc",
 "icu_locid",
 "icu_locid_transform_data",
- "icu_provider 1.5.0",
- "tinystr 0.7.6",
- "zerovec 0.10.4",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
 ]

 [[package]]
@@ -612,15 +557,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
 dependencies = [
 "displaydoc",
- "icu_collections 1.5.0",
+ "icu_collections",
 "icu_normalizer_data",
 "icu_properties",
- "icu_provider 1.5.0",
+ "icu_provider",
 "smallvec",
 "utf16_iter",
 "utf8_iter",
 "write16",
- "zerovec 0.10.4",
+ "zerovec",
 ]

 [[package]]
@@ -636,12 +581,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
 dependencies = [
 "displaydoc",
- "icu_collections 1.5.0",
+ "icu_collections",
 "icu_locid_transform",
 "icu_properties_data",
- "icu_provider 1.5.0",
- "tinystr 0.7.6",
- "zerovec 0.10.4",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
 ]

 [[package]]
@@ -660,28 +605,11 @@ dependencies = [
 "icu_locid",
 "icu_provider_macros",
 "stable_deref_trait",
- "tinystr 0.7.6",
- "writeable 0.5.5",
- "yoke 0.7.5",
+ "tinystr",
+ "writeable",
+ "yoke",
 "zerofrom",
- "zerovec 0.10.4",
-]
-
-[[package]]
-name = "icu_provider"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
-dependencies = [
- "displaydoc",
- "icu_locale_core",
- "stable_deref_trait",
- "tinystr 0.8.1",
- "writeable 0.6.1",
- "yoke 0.8.0",
- "zerofrom",
- "zerotrie",
- "zerovec 0.11.2",
+ "zerovec",
 ]

 [[package]]
@@ -695,30 +623,6 @@ dependencies = [
 "syn",
 ]

-[[package]]
-name = "icu_segmenter"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e185fc13b6401c138cf40db12b863b35f5edf31b88192a545857b41aeaf7d3d3"
-dependencies = [
- "core_maths",
- "displaydoc",
- "icu_collections 2.0.0",
- "icu_locale",
- "icu_locale_core",
- "icu_provider 2.0.0",
- "icu_segmenter_data",
- "potential_utf",
- "utf8_iter",
- "zerovec 0.11.2",
-]
-
-[[package]]
-name = "icu_segmenter_data"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5360a2fbe97f617c4f8b944356dedb36d423f7da7f13c070995cf89e59f01220"
-
 [[package]]
 name = "idna"
 version = "1.0.3"
@@ -756,33 +660,12 @@ version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"

-[[package]]
-name = "io-uring"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b86e202f00093dcba4275d4636b93ef9dd75d025ae560d2521b45ea28ab49013"
-dependencies = [
- "bitflags",
- "cfg-if",
- "libc",
-]
-
 [[package]]
 name = "ipnet"
 version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"

-[[package]]
-name = "iri-string"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2"
-dependencies = [
- "memchr",
- "serde",
-]
-
 [[package]]
 name = "itoa"
 version = "1.0.11"
@@ -811,24 +694,12 @@ version = "0.2.172"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"

-[[package]]
-name = "libm"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
-
 [[package]]
 name = "litemap"
 version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856"

-[[package]]
-name = "litemap"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
-
 [[package]]
 name = "log"
 version = "0.4.27"
@@ -887,9 +758,9 @@ dependencies = [

 [[package]]
 name = "once_cell"
-version = "1.21.3"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"

 [[package]]
 name = "openssl-probe"
@@ -921,16 +792,6 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"

-[[package]]
-name = "potential_utf"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585"
-dependencies = [
- "serde",
- "zerovec 0.11.2",
-]
-
 [[package]]
 name = "ppv-lite86"
 version = "0.2.17"
@@ -1180,11 +1041,11 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"

 [[package]]
 name = "reqwest"
-version = "0.12.22"
+version = "0.12.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbc931937e6ca3a06e3b6c0aa7841849b160a90351d6ab467a8b9b9959767531"
+checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb"
 dependencies = [
- "base64",
+ "base64 0.22.1",
 "bytes",
 "futures-core",
 "futures-util",
@@ -1195,13 +1056,17 @@ dependencies = [
 "hyper",
 "hyper-rustls",
 "hyper-util",
+ "ipnet",
 "js-sys",
 "log",
+ "mime",
+ "once_cell",
 "percent-encoding",
 "pin-project-lite",
 "quinn",
 "rustls",
 "rustls-native-certs",
+ "rustls-pemfile",
 "rustls-pki-types",
 "serde",
 "serde_json",
@@ -1211,13 +1076,13 @@ dependencies = [
 "tokio-rustls",
 "tokio-util",
 "tower",
- "tower-http",
 "tower-service",
 "url",
 "wasm-bindgen",
 "wasm-bindgen-futures",
 "wasm-streams",
 "web-sys",
+ "windows-registry",
 ]

 [[package]]
@@ -1272,6 +1137,15 @@ dependencies = [
 "security-framework",
 ]

+[[package]]
+name = "rustls-pemfile"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
+dependencies = [
+ "rustls-pki-types",
+]
+
 [[package]]
 name = "rustls-pki-types"
 version = "1.11.0"
@@ -1355,9 +1229,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.141"
+version = "1.0.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30b9eff21ebe718216c6ec64e1d9ac57087aad11efc64e32002bce4a0d4c03d3"
+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
 dependencies = [
 "itoa",
 "memchr",
@@ -1458,7 +1332,7 @@ name = "synapse"
 version = "0.1.0"
 dependencies = [
 "anyhow",
- "base64",
+ "base64 0.21.7",
 "blake2",
 "bytes",
 "futures",
@@ -1466,11 +1340,9 @@ dependencies = [
 "hex",
 "http",
 "http-body-util",
- "icu_segmenter",
 "lazy_static",
 "log",
 "mime",
- "once_cell",
 "pyo3",
 "pyo3-log",
 "pythonize",
@@ -1536,17 +1408,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
 dependencies = [
 "displaydoc",
- "zerovec 0.10.4",
-]
-
-[[package]]
-name = "tinystr"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
-dependencies = [
- "displaydoc",
- "zerovec 0.11.2",
+ "zerovec",
 ]

 [[package]]
@@ -1566,17 +1428,15 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"

 [[package]]
 name = "tokio"
-version = "1.46.1"
+version = "1.45.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cc3a2344dafbe23a245241fe8b09735b521110d30fcefbbd5feb1797ca35d17"
+checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779"
 dependencies = [
 "backtrace",
 "bytes",
- "io-uring",
 "libc",
 "mio",
 "pin-project-lite",
- "slab",
 "socket2",
 "windows-sys 0.52.0",
 ]
@@ -1619,24 +1479,6 @@ dependencies = [
 "tower-service",
 ]

-[[package]]
-name = "tower-http"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
-dependencies = [
- "bitflags",
- "bytes",
- "futures-util",
- "http",
- "http-body",
- "iri-string",
- "pin-project-lite",
- "tower",
- "tower-layer",
- "tower-service",
-]
-
 [[package]]
 name = "tower-layer"
 version = "0.3.3"
@@ -1865,13 +1707,48 @@ dependencies = [
 "wasm-bindgen",
 ]

+[[package]]
+name = "windows-link"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
+
+[[package]]
+name = "windows-registry"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3"
+dependencies = [
+ "windows-result",
+ "windows-strings",
+ "windows-targets 0.53.0",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319"
+dependencies = [
+ "windows-link",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.52.6",
 ]

 [[package]]
@@ -1880,7 +1757,7 @@ version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.52.6",
 ]

 [[package]]
@@ -1889,14 +1766,30 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_gnullvm",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm 0.52.6",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b"
+dependencies = [
+ "windows_aarch64_gnullvm 0.53.0",
+ "windows_aarch64_msvc 0.53.0",
+ "windows_i686_gnu 0.53.0",
+ "windows_i686_gnullvm 0.53.0",
+ "windows_i686_msvc 0.53.0",
+ "windows_x86_64_gnu 0.53.0",
+ "windows_x86_64_gnullvm 0.53.0",
+ "windows_x86_64_msvc 0.53.0",
 ]

 [[package]]
@@ -1905,48 +1798,96 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"

+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"

+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"

+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"

+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"

+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"

+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"

+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"

+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+
 [[package]]
 name = "wit-bindgen-rt"
 version = "0.33.0"
@@ -1968,12 +1909,6 @@ version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"

-[[package]]
-name = "writeable"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
-
 [[package]]
 name = "yoke"
 version = "0.7.5"
@@ -1982,19 +1917,7 @@ checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
 dependencies = [
 "serde",
 "stable_deref_trait",
- "yoke-derive 0.7.5",
- "zerofrom",
-]
-
-[[package]]
-name = "yoke"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
-dependencies = [
- "serde",
- "stable_deref_trait",
- "yoke-derive 0.8.0",
+ "yoke-derive",
 "zerofrom",
 ]

@@ -2010,18 +1933,6 @@ dependencies = [
 "synstructure",
 ]

-[[package]]
-name = "yoke-derive"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "synstructure",
-]
-
 [[package]]
 name = "zerocopy"
 version = "0.8.17"
@@ -2069,35 +1980,15 @@ version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"

-[[package]]
-name = "zerotrie"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
-dependencies = [
- "displaydoc",
-]
-
 [[package]]
 name = "zerovec"
 version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
 dependencies = [
- "yoke 0.7.5",
+ "yoke",
 "zerofrom",
- "zerovec-derive 0.10.3",
-]
-
-[[package]]
-name = "zerovec"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428"
-dependencies = [
- "yoke 0.8.0",
- "zerofrom",
- "zerovec-derive 0.11.1",
+ "zerovec-derive",
 ]

 [[package]]
@@ -2110,14 +2001,3 @@ dependencies = [
 "quote",
 "syn",
 ]
-
-[[package]]
-name = "zerovec-derive"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
@@ -45,10 +45,6 @@ def make_graph(pdus: List[dict], filename_prefix: str) -> None:
    colors = {"red", "green", "blue", "yellow", "purple"}

    for pdu in pdus:
-        # TODO: The "origin" field has since been removed from events generated
-        # by Synapse. We should consider removing it here as well but since this
-        # is part of `contrib/`, it is left for the community to revise and ensure things
-        # still work correctly.
        origins.add(pdu.get("origin"))

    color_map = {color: color for color in colors if color in origins}
@@ -1,45 +1,3 @@
-matrix-synapse-py3 (1.135.1) stable; urgency=medium
-
-  * New Synapse release 1.135.1.
-
- -- Synapse Packaging team <packages@matrix.org>  Mon, 11 Aug 2025 11:13:15 -0600
-
-matrix-synapse-py3 (1.135.0) stable; urgency=medium
-
-  * New Synapse release 1.135.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Fri, 01 Aug 2025 13:12:28 +0100
-
-matrix-synapse-py3 (1.135.0~rc2) stable; urgency=medium
-
-  * New Synapse release 1.135.0rc2.
-
- -- Synapse Packaging team <packages@matrix.org>  Wed, 30 Jul 2025 12:19:14 +0100
-
-matrix-synapse-py3 (1.135.0~rc1) stable; urgency=medium
-
-  * New Synapse release 1.135.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 22 Jul 2025 12:08:37 +0100
-
-matrix-synapse-py3 (1.134.0) stable; urgency=medium
-
-  * New Synapse release 1.134.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 15 Jul 2025 14:22:50 +0100
-
-matrix-synapse-py3 (1.134.0~rc1) stable; urgency=medium
-
-  * New Synapse release 1.134.0rc1.
-
- -- Synapse Packaging team <packages@matrix.org>  Wed, 09 Jul 2025 11:27:13 +0100
-
-matrix-synapse-py3 (1.133.0) stable; urgency=medium
-
-  * New synapse release 1.133.0.
-
- -- Synapse Packaging team <packages@matrix.org>  Tue, 01 Jul 2025 13:13:24 +0000
-
 matrix-synapse-py3 (1.133.0~rc1) stable; urgency=medium

  * New Synapse release 1.133.0rc1.
@@ -54,6 +54,7 @@ if [[ -n "$SYNAPSE_COMPLEMENT_USE_WORKERS" ]]; then
    export SYNAPSE_WORKER_TYPES="\
      event_persister:2, \
      background_worker, \
+      frontend_proxy, \
      event_creator, \
      user_dir, \
      media_repository, \
@@ -64,7 +65,6 @@ if [[ -n "$SYNAPSE_COMPLEMENT_USE_WORKERS" ]]; then
      client_reader, \
      appservice, \
      pusher, \
-      device_lists:2, \
      stream_writers=account_data+presence+receipts+to_device+typing"

  fi
@@ -178,9 +178,6 @@ WORKERS_CONFIG: Dict[str, Dict[str, Any]] = {
            "^/_matrix/client/(api/v1|r0|v3|unstable)/login$",
            "^/_matrix/client/(api/v1|r0|v3|unstable)/account/3pid$",
            "^/_matrix/client/(api/v1|r0|v3|unstable)/account/whoami$",
-            "^/_matrix/client/(api/v1|r0|v3|unstable)/account/deactivate$",
-            "^/_matrix/client/(api/v1|r0|v3|unstable)/devices(/|$)",
-            "^/_matrix/client/(r0|v3)/delete_devices$",
            "^/_matrix/client/versions$",
            "^/_matrix/client/(api/v1|r0|v3|unstable)/voip/turnServer$",
            "^/_matrix/client/(r0|v3|unstable)/register$",
@@ -197,9 +194,6 @@ WORKERS_CONFIG: Dict[str, Dict[str, Any]] = {
            "^/_matrix/client/(api/v1|r0|v3|unstable)/directory/room/.*$",
            "^/_matrix/client/(r0|v3|unstable)/capabilities$",
            "^/_matrix/client/(r0|v3|unstable)/notifications$",
-            "^/_matrix/client/(api/v1|r0|v3|unstable)/keys/upload",
-            "^/_matrix/client/(api/v1|r0|v3|unstable)/keys/device_signing/upload$",
-            "^/_matrix/client/(api/v1|r0|v3|unstable)/keys/signatures/upload$",
        ],
        "shared_extra_conf": {},
        "worker_extra_conf": "",
@@ -271,6 +265,13 @@ WORKERS_CONFIG: Dict[str, Dict[str, Any]] = {
        "shared_extra_conf": {},
        "worker_extra_conf": "",
    },
+    "frontend_proxy": {
+        "app": "synapse.app.generic_worker",
+        "listener_resources": ["client", "replication"],
+        "endpoint_patterns": ["^/_matrix/client/(api/v1|r0|v3|unstable)/keys/upload"],
+        "shared_extra_conf": {},
+        "worker_extra_conf": "",
+    },
    "account_data": {
        "app": "synapse.app.generic_worker",
        "listener_resources": ["client", "replication"],
@@ -305,13 +306,6 @@ WORKERS_CONFIG: Dict[str, Dict[str, Any]] = {
        "shared_extra_conf": {},
        "worker_extra_conf": "",
    },
-    "device_lists": {
-        "app": "synapse.app.generic_worker",
-        "listener_resources": ["client", "replication"],
-        "endpoint_patterns": [],
-        "shared_extra_conf": {},
-        "worker_extra_conf": "",
-    },
    "typing": {
        "app": "synapse.app.generic_worker",
        "listener_resources": ["client", "replication"],
@@ -328,15 +322,6 @@ WORKERS_CONFIG: Dict[str, Dict[str, Any]] = {
        "shared_extra_conf": {},
        "worker_extra_conf": "",
    },
-    "thread_subscriptions": {
-        "app": "synapse.app.generic_worker",
-        "listener_resources": ["client", "replication"],
-        "endpoint_patterns": [
-            "^/_matrix/client/unstable/io.element.msc4306/.*",
-        ],
-        "shared_extra_conf": {},
-        "worker_extra_conf": "",
-    },
 }

 # Templates for sections that may be inserted multiple times in config files
@@ -427,18 +412,16 @@ def add_worker_roles_to_shared_config(
    # streams
    instance_map = shared_config.setdefault("instance_map", {})

-    # This is a list of the stream_writers.
-    stream_writers = {
+    # This is a list of the stream_writers that there can be only one of. Events can be
+    # sharded, and therefore doesn't belong here.
+    singular_stream_writers = [
        "account_data",
-        "events",
-        "device_lists",
        "presence",
        "receipts",
        "to_device",
        "typing",
        "push_rules",
-        "thread_subscriptions",
-    }
+    ]

    # Worker-type specific sharding config. Now a single worker can fulfill multiple
    # roles, check each.
@@ -448,11 +431,28 @@ def add_worker_roles_to_shared_config(
    if "federation_sender" in worker_types_set:
        shared_config.setdefault("federation_sender_instances", []).append(worker_name)

+    if "event_persister" in worker_types_set:
+        # Event persisters write to the events stream, so we need to update
+        # the list of event stream writers
+        shared_config.setdefault("stream_writers", {}).setdefault("events", []).append(
+            worker_name
+        )
+
+        # Map of stream writer instance names to host/ports combos
+        if os.environ.get("SYNAPSE_USE_UNIX_SOCKET", False):
+            instance_map[worker_name] = {
+                "path": f"/run/worker.{worker_port}",
+            }
+        else:
+            instance_map[worker_name] = {
+                "host": "localhost",
+                "port": worker_port,
+            }
    # Update the list of stream writers. It's convenient that the name of the worker
    # type is the same as the stream to write. Iterate over the whole list in case there
    # is more than one.
    for worker in worker_types_set:
-        if worker in stream_writers:
+        if worker in singular_stream_writers:
            shared_config.setdefault("stream_writers", {}).setdefault(
                worker, []
            ).append(worker_name)
@@ -876,13 +876,6 @@ def generate_worker_files(
        else:
            healthcheck_urls.append("http://localhost:%d/health" % (worker_port,))

-        # Special case for event_persister: those are just workers that write to
-        # the `events` stream. For other workers, the worker name is the same
-        # name of the stream they write to, but for some reason it is not the
-        # case for event_persister.
-        if "event_persister" in worker_types_set:
-            worker_types_set.add("events")
-
        # Update the shared config with sharding-related options if necessary
        add_worker_roles_to_shared_config(
            shared_config, worker_types_set, worker_name, worker_port
@@ -74,7 +74,6 @@
      - [Users](admin_api/user_admin_api.md)
      - [Server Version](admin_api/version_api.md)
      - [Federation](usage/administration/admin_api/federation.md)
-      - [Client-Server API Extensions](admin_api/client_server_api_extensions.md)
    - [Manhole](manhole.md)
    - [Monitoring](metrics-howto.md)
      - [Reporting Homeserver Usage Statistics](usage/administration/monitoring/reporting_homeserver_usage_statistics.md)
@@ -1,25 +0,0 @@
-# Client-Server API Extensions
-
-Server administrators can set special account data to change how the Client-Server API behaves for
-their clients. Setting the account data, or having it already set, as a non-admin has no effect.
-
-All configuration options can be set through the `io.element.synapse.admin_client_config` global 
-account data on the admin's user account. 
-
-Example:
-```
-PUT /_matrix/client/v3/user/{adminUserId}/account_data/io.element.synapse.admin_client_config
-{
-    "return_soft_failed_events": true
-}
-```
-
-## See soft failed events
-
-Learn more about soft failure from [the spec](https://spec.matrix.org/v1.14/server-server-api/#soft-failure).
-
-To receive soft failed events in APIs like `/sync` and `/messages`, set `return_soft_failed_events`
-to `true` in the admin client config. When `false`, the normal behaviour of these endpoints is to
-exclude soft failed events.
-
-Default: `false`
@@ -117,6 +117,7 @@ It returns a JSON body like the following:
        "hashes": {
            "sha256": "xK1//xnmvHJIOvbgXlkI8eEqdvoMmihVDJ9J4SNlsAw"
        },
+        "origin": "matrix.org",
        "origin_server_ts": 1592291711430,
        "prev_events": [
            "$YK4arsKKcc0LRoe700pS8DSjOvUT4NDv0HfInlMFw2M"
@@ -806,7 +806,7 @@ A response body like the following is returned:
        }, {
            "delete_id": "delete_id2",
            "room_id": "!roomid:example.com",
-            "status": "active",
+            "status": "purging",
            "shutdown_room": {
                "kicked_users": [
                    "@foobar:example.com"
@@ -843,7 +843,7 @@ A response body like the following is returned:

 ```json
 {
-    "status": "active",
+    "status": "purging",
    "delete_id": "bHkCNQpHqOaFhPtK",
    "room_id": "!roomid:example.com",
    "shutdown_room": {
@@ -876,8 +876,8 @@ The following fields are returned in the JSON response body:
  - `delete_id` - The ID for this purge
  - `room_id` - The ID of the room being deleted
  - `status` - The status will be one of:
-    - `scheduled` - The deletion is waiting to be started
-    - `active` - The process is purging the room and event data from database.
+    - `shutting_down` - The process is removing users from the room.
+    - `purging` - The process is purging the room and event data from database.
    - `complete` - The process has completed successfully.
    - `failed` - The process is aborted, an error has occurred.
  - `error` - A string that shows an error message if `status` is `failed`.
@@ -1227,7 +1227,7 @@ See also the

 ## Controlling whether a user is shadow-banned

-Shadow-banning is a useful tool for moderating malicious or egregiously abusive users. 
+Shadow-banning is a useful tool for moderating malicious or egregiously abusive users.
 A shadow-banned users receives successful responses to their client-server API requests,
 but the events are not propagated into rooms. This can be an effective tool as it
 (hopefully) takes longer for the user to realise they are being moderated before
@@ -1464,11 +1464,8 @@ _Added in Synapse 1.72.0._

 ## Redact all the events of a user

-This endpoint allows an admin to redact the events of a given user. There are no restrictions on
-redactions for a local user. By default, we puppet the user who sent the message to redact it themselves.
-Redactions for non-local users are issued using the admin user, and will fail in rooms where the
-admin user is not admin/does not have the specified power level to issue redactions. An option
-is provided to override the default and allow the admin to issue the redactions in all cases.  
+This endpoint allows an admin to redact the events of a given user. There are no restrictions on redactions for a 
+local user. By default, we puppet the user who sent the message to redact it themselves. Redactions for non-local users are issued using the admin user, and will fail in rooms where the admin user is not admin/does not have the specified power level to issue redactions. 

 The API is 
 ```
@@ -1478,7 +1475,7 @@ POST /_synapse/admin/v1/user/$user_id/redact
  "rooms": ["!roomid1", "!roomid2"]
 }
 ```
-If an empty list is provided as the key for `rooms`, all events in all the rooms the user is member of will be redacted,
+If an empty list is provided as the key for `rooms`, all events in all the rooms the user is member of will be redacted, 
 otherwise all the events in the rooms provided in the request will be redacted. 

 The API starts redaction process running, and returns immediately with a JSON body with
@@ -1504,10 +1501,7 @@ The following JSON body parameter must be provided:
 The following JSON body parameters are optional:

 - `reason` - Reason the redaction is being requested, ie "spam", "abuse", etc. This will be included in each redaction event, and be visible to users.
- `limit` - a limit on the number of the user's events to search for ones that can be redacted (events are redacted newest to oldest) in each room, defaults to 1000 if not provided.
- `use_admin` - If set to `true`, the admin user is used to issue the redactions, rather than puppeting the user. Useful
- when the admin is also the moderator of the rooms that require redactions. Note that the redactions will fail in rooms
- where the admin does not have the sufficient power level to issue the redactions.  
+- `limit` - a limit on the number of the user's events to search for ones that can be redacted (events are redacted newest to oldest) in each room, defaults to 1000 if not provided

 _Added in Synapse 1.116.0._

@@ -29,6 +29,8 @@ easiest way of installing the latest version is to use [rustup](https://rustup.r

 Synapse can connect to PostgreSQL via the [psycopg2](https://pypi.org/project/psycopg2/) Python library. Building this library from source requires access to PostgreSQL's C header files. On Debian or Ubuntu Linux, these can be installed with `sudo apt install libpq-dev`.

+Synapse has an optional, improved user search with better Unicode support. For that you need the development package of `libicu`. On Debian or Ubuntu Linux, this can be installed with `sudo apt install libicu-dev`.
+
 The source code of Synapse is hosted on GitHub. You will also need [a recent version of git](https://github.com/git-guides/install-git).

 For some tests, you will need [a recent version of Docker](https://docs.docker.com/get-docker/).
@@ -164,7 +164,10 @@ $ poetry cache clear --all .
 # including the wheel artifacts which is not covered by the above command
 # (see https://github.com/python-poetry/poetry/issues/10304)
 #
-# This is necessary in order to rebuild or fetch new wheels.
+# This is necessary in order to rebuild or fetch new wheels. For example, if you update
+# the `icu` library in on your system, you will need to rebuild the PyICU Python package
+# in order to incorporate the correct dynamically linked library locations otherwise you
+# will run into errors like: `ImportError: libicui18n.so.75: cannot open shared object file: No such file or directory`
 $ rm -rf $(poetry config cache-dir)
 ```

@@ -80,8 +80,6 @@ Called when processing an invitation, both when one is created locally or when
 receiving an invite over federation. Both inviter and invitee are represented by
 their Matrix user ID (e.g. `@alice:example.com`).

-Note that federated invites will call `federated_user_may_invite` before this callback.
-

 The callback must return one of:
  - `synapse.module_api.NOT_SPAM`, to allow the operation. Other callbacks may still 
@@ -99,34 +97,6 @@ be used. If this happens, Synapse will not call any of the subsequent implementa
 this callback.


-### `federated_user_may_invite`
-
-_First introduced in Synapse v1.133.0_
-
-```python
-async def federated_user_may_invite(event: "synapse.events.EventBase") -> Union["synapse.module_api.NOT_SPAM", "synapse.module_api.errors.Codes", bool]
-```
-
-Called when processing an invitation received over federation. Unlike `user_may_invite`,
-this callback receives the entire event, including any stripped state in the `unsigned`
-section, not just the room and user IDs.
-
-The callback must return one of:
-  - `synapse.module_api.NOT_SPAM`, to allow the operation. Other callbacks may still 
-    decide to reject it.
-  - `synapse.module_api.errors.Codes` to reject the operation with an error code. In case
-    of doubt, `synapse.module_api.errors.Codes.FORBIDDEN` is a good error code.
-
-If multiple modules implement this callback, they will be considered in order. If a
-callback returns `synapse.module_api.NOT_SPAM`, Synapse falls through to the next one.
-The value of the first callback that does not return `synapse.module_api.NOT_SPAM` will
-be used. If this happens, Synapse will not call any of the subsequent implementations of
-this callback.
-
-If all of the callbacks return `synapse.module_api.NOT_SPAM`, Synapse will also fall
-through to the `user_may_invite` callback before approving the invite.
-
-
 ### `user_may_send_3pid_invite`

 _First introduced in Synapse v1.45.0_
@@ -286,7 +286,7 @@ Installing prerequisites on Ubuntu or Debian:
 ```sh
 sudo apt install build-essential python3-dev libffi-dev \
                     python3-pip python3-setuptools sqlite3 \
-                     libssl-dev virtualenv libjpeg-dev libxslt1-dev
+                     libssl-dev virtualenv libjpeg-dev libxslt1-dev libicu-dev
 ```

 ##### ArchLinux
@@ -295,7 +295,7 @@ Installing prerequisites on ArchLinux:

 ```sh
 sudo pacman -S base-devel python python-pip \
-               python-setuptools python-virtualenv sqlite3
+               python-setuptools python-virtualenv sqlite3 icu
 ```

 ##### CentOS/Fedora
@@ -305,7 +305,8 @@ Installing prerequisites on CentOS or Fedora Linux:
 ```sh
 sudo dnf install libtiff-devel libjpeg-devel libzip-devel freetype-devel \
                 libwebp-devel libxml2-devel libxslt-devel libpq-devel \
-                 python3-virtualenv libffi-devel openssl-devel python3-devel
+                 python3-virtualenv libffi-devel openssl-devel python3-devel \
+                 libicu-devel
 sudo dnf group install "Development Tools"
 ```

@@ -332,7 +333,7 @@ dnf install python3.12 python3.12-devel
 ```
 Finally, install common prerequisites
 ```bash
-dnf install libpq5 libpq5-devel lz4 pkgconf
+dnf install libicu libicu-devel libpq5 libpq5-devel lz4 pkgconf
 dnf group install "Development Tools"
 ```
 ###### Using venv module instead of virtualenv command
@@ -364,6 +365,20 @@ xcode-select --install

 Some extra dependencies may be needed. You can use Homebrew (https://brew.sh) for them.

+You may need to install icu, and make the icu binaries and libraries accessible.
+Please follow [the official instructions of PyICU](https://pypi.org/project/PyICU/) to do so.
+
+If you're struggling to get icu discovered, and see:
+```
+  RuntimeError:
+  Please install pkg-config on your system or set the ICU_VERSION environment
+  variable to the version of ICU you have installed.
+```
+despite it being installed and having your `PATH` updated, you can omit this dependency by
+not specifying `--extras all` to `poetry`. If using postgres, you can install Synapse via
+`poetry install --extras saml2 --extras oidc --extras postgres --extras opentracing --extras redis --extras sentry`.
+ICU is not a hard dependency on getting a working installation.
+
 On ARM-based Macs you may also need to install libjpeg and libpq:
 ```sh
 brew install jpeg libpq
@@ -385,7 +400,8 @@ Installing prerequisites on openSUSE:
 ```sh
 sudo zypper in -t pattern devel_basis
 sudo zypper in python-pip python-setuptools sqlite3 python-virtualenv \
-               python-devel libffi-devel libopenssl-devel libjpeg62-devel
+               python-devel libffi-devel libopenssl-devel libjpeg62-devel \
+               libicu-devel
 ```

 ##### OpenBSD
@@ -117,21 +117,6 @@ each upgrade are complete before moving on to the next upgrade, to avoid
 stacking them up. You can monitor the currently running background updates with
 [the Admin API](usage/administration/admin_api/background_updates.html#status).

-# Upgrading to v1.135.0
-
-## `on_user_registration` module API callback may now run on any worker
-
-Previously, the `on_user_registration` callback would only run on the main
-process. Modules relying on this callback must assume that they may now be
-called from any worker, not just the main process.
-
-# Upgrading to v1.134.0
-
-## ICU bundled with Synapse
-
-Synapse now uses the Rust `icu` library for improved user search. Installing the
-native ICU library on your system is no longer required.
-
 # Upgrading to v1.130.0

 ## Documented endpoint which can be delegated to a federation worker
@@ -1925,8 +1925,9 @@ This setting has the following sub-options:
 Default configuration:
 ```yaml
 rc_delayed_event_mgmt:
-  per_second: 1.0
-  burst_count: 5.0
+  per_user:
+    per_second: 1.0
+    burst_count: 5.0
 ```

 Example configuration:
@@ -2085,23 +2086,6 @@ Example configuration:
 max_upload_size: 60M
 ```
 ---
-### `media_upload_limits`
-
-*(array)* A list of media upload limits defining how much data a given user can upload in a given time period.
-
-An empty list means no limits are applied.
-
-Defaults to `[]`.
-
-Example configuration:
-```yaml
-media_upload_limits:
- time_period: 1h
-  max_size: 100M
- time_period: 1w
-  max_size: 500M
-```
---
 ### `max_image_pixels`

 *(byte size)* Maximum number of pixels that will be thumbnailed. Defaults to `"32M"`.
@@ -2356,21 +2340,6 @@ Example configuration:
 recaptcha_public_key: YOUR_PUBLIC_KEY
 ```
 ---
-### `recaptcha_public_key_path`
-
-*(string|null)* An alternative to [`recaptcha_public_key`](#recaptcha_public_key): allows the public key to be specified in an external file.
-
-The file should be a plain text file, containing only the public key. Synapse reads the public key from the given file once at startup.
-
-_Added in Synapse 1.135.0._
-
-Defaults to `null`.
-
-Example configuration:
-```yaml
-recaptcha_public_key_path: /path/to/key/file
-```
---
 ### `recaptcha_private_key`

 *(string|null)* This homeserver's ReCAPTCHA private key. Must be specified if [`enable_registration_captcha`](#enable_registration_captcha) is enabled. Defaults to `null`.
@@ -2380,21 +2349,6 @@ Example configuration:
 recaptcha_private_key: YOUR_PRIVATE_KEY
 ```
 ---
-### `recaptcha_private_key_path`
-
-*(string|null)* An alternative to [`recaptcha_private_key`](#recaptcha_private_key): allows the private key to be specified in an external file.
-
-The file should be a plain text file, containing only the private key. Synapse reads the private key from the given file once at startup.
-
-_Added in Synapse 1.135.0._
-
-Defaults to `null`.
-
-Example configuration:
-```yaml
-recaptcha_private_key_path: /path/to/key/file
-```
---
 ### `enable_registration_captcha`

 *(boolean)* Set to `true` to require users to complete a CAPTCHA test when registering an account. Requires a valid ReCaptcha public/private key.
@@ -3807,11 +3761,7 @@ encryption_enabled_by_default_for_room_type: invite

 This setting has the following sub-options:

-* `enabled` (boolean): Defines whether users can search the user directory. If `false` then empty responses are returned to all queries.
-
-  *Warning: While the homeserver may determine which subset of users are searched, the Matrix specification requires homeservers to include (at minimum) users visible in public rooms and users sharing a room with the requester. Using `false` improves performance but violates this requirement.*
-
-  Defaults to `true`.
+* `enabled` (boolean): Defines whether users can search the user directory. If false then empty responses are returned to all queries. Defaults to `true`.

 * `search_all_users` (boolean): Defines whether to search all users visible to your homeserver at the time the search is performed. If set to true, will return all users known to the homeserver matching the search query. If false, search results will only contain users visible in public rooms and users sharing a room with the requester.

@@ -4094,7 +4044,7 @@ The default power levels for each preset are:
 "m.room.history_visibility": 100
 "m.room.canonical_alias": 50
 "m.room.avatar": 50
-"m.room.tombstone": 100 (150 if MSC4289 is used)
+"m.room.tombstone": 100
 "m.room.server_acl": 100
 "m.room.encryption": 100
 ```
@@ -4341,8 +4291,6 @@ This setting has the following sub-options:

 * `push_rules` (string): Name of a worker assigned to the `push_rules` stream.

-* `device_lists` (string): Name of a worker assigned to the `device_lists` stream.
-
 Example configuration:
 ```yaml
 stream_writers:
@@ -77,11 +77,14 @@ The user provided search term is lowercased and normalized using [NFKC](https://
 this treats the string as case-insensitive, canonicalizes different forms of the
 same text, and maps some "roughly equivalent" characters together.

-The search term is then split into segments using the [`icu_segmenter`
-Rust crate](https://crates.io/crates/icu_segmenter). This crate ships with its
-own dictionary and Long Short Term-Memory (LSTM) machine learning models
-per-language to segment words. Read more [in the crate's
-documentation](https://docs.rs/icu/latest/icu/segmenter/struct.WordSegmenter.html#method.new_auto).
+The search term is then split into words:
+
+* If [ICU](https://en.wikipedia.org/wiki/International_Components_for_Unicode) is
+  available, then the system's [default locale](https://unicode-org.github.io/icu/userguide/locale/#default-locales)
+  will be used to break the search term into words. (See the
+  [installation instructions](setup/installation.md) for how to install ICU.)
+* If unavailable, then runs of ASCII characters, numbers, underscores, and hyphens
+  are considered words.

 The queries for PostgreSQL and SQLite are detailed below, but their overall goal
 is to find matching users, preferring users who are "real" (e.g. not bots,
@@ -238,9 +238,7 @@ information.
    ^/_matrix/client/unstable/im.nheko.summary/summary/.*$
    ^/_matrix/client/(r0|v3|unstable)/account/3pid$
    ^/_matrix/client/(r0|v3|unstable)/account/whoami$
-    ^/_matrix/client/(r0|v3|unstable)/account/deactivate$
-    ^/_matrix/client/(r0|v3)/delete_devices$
-    ^/_matrix/client/(api/v1|r0|v3|unstable)/devices(/|$)
+    ^/_matrix/client/(r0|v3|unstable)/devices$
    ^/_matrix/client/versions$
    ^/_matrix/client/(api/v1|r0|v3|unstable)/voip/turnServer$
    ^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/event/
@@ -259,9 +257,7 @@ information.
    ^/_matrix/client/(r0|v3|unstable)/keys/changes$
    ^/_matrix/client/(r0|v3|unstable)/keys/claim$
    ^/_matrix/client/(r0|v3|unstable)/room_keys/
-    ^/_matrix/client/(r0|v3|unstable)/keys/upload
-    ^/_matrix/client/(api/v1|r0|v3|unstable/keys/device_signing/upload$
-    ^/_matrix/client/(api/v1|r0|v3|unstable)/keys/signatures/upload$
+    ^/_matrix/client/(r0|v3|unstable)/keys/upload$

    # Registration/login requests
    ^/_matrix/client/(api/v1|r0|v3|unstable)/login$
@@ -286,6 +282,7 @@ Additionally, the following REST endpoints can be handled for GET requests:

    ^/_matrix/client/(api/v1|r0|v3|unstable)/pushrules/
    ^/_matrix/client/unstable/org.matrix.msc4140/delayed_events
+    ^/_matrix/client/(api/v1|r0|v3|unstable)/devices/

    # Account data requests
    ^/_matrix/client/(r0|v3|unstable)/.*/tags
@@ -332,6 +329,7 @@ set to `true`), the following endpoints can be handled by the worker:
    ^/_synapse/admin/v2/users/[^/]+$
    ^/_synapse/admin/v1/username_available$
    ^/_synapse/admin/v1/users/[^/]+/_allow_cross_signing_replacement_without_uia$
+    # Only the GET method:
    ^/_synapse/admin/v1/users/[^/]+/devices$

 Note that a [HTTP listener](usage/configuration/config_documentation.md#listeners)
@@ -552,18 +550,6 @@ the stream writer for the `push_rules` stream:

    ^/_matrix/client/(api/v1|r0|v3|unstable)/pushrules/

-##### The `device_lists` stream
-
-The `device_lists` stream supports multiple writers. The following endpoints
-can be handled by any worker, but should be routed directly one of the workers
-configured as stream writer for the `device_lists` stream:
-
-    ^/_matrix/client/(r0|v3)/delete_devices$
-    ^/_matrix/client/(api/v1|r0|v3|unstable)/devices/
-    ^/_matrix/client/(r0|v3|unstable)/keys/upload
-    ^/_matrix/client/(api/v1|r0|v3|unstable/keys/device_signing/upload$
-    ^/_matrix/client/(api/v1|r0|v3|unstable)/keys/signatures/upload$
-
 #### Restrict outbound federation traffic to a specific set of workers

 The
@@ -96,6 +96,7 @@
                  gnumake

                  # Native dependencies for running Synapse.
+                  icu
                  libffi
                  libjpeg
                  libpqxx
@@ -101,7 +101,7 @@ module-name = "synapse.synapse_rust"

 [tool.poetry]
 name = "matrix-synapse"
-version = "1.135.1"
+version = "1.133.0rc1"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "AGPL-3.0-or-later"
@@ -195,9 +195,7 @@ pymacaroons = ">=0.13.0"
 msgpack = ">=0.5.2"
 phonenumbers = ">=8.2.0"
 # we use GaugeHistogramMetric, which was added in prom-client 0.4.0.
-# `prometheus_client.metrics` was added in 0.5.0, so we require that too.
-# We chose 0.6.0 as that is the current version in Debian Buster (oldstable).
-prometheus-client = ">=0.6.0"
+prometheus-client = ">=0.4.0"
 # we use `order`, which arrived in attrs 19.2.0.
 # Note: 21.1.0 broke `/sync`, see https://github.com/matrix-org/synapse/issues/9936
 attrs = ">=19.2.0,!=21.1.0"
@@ -226,7 +224,7 @@ pydantic = ">=1.7.4, <3"
 # https://github.com/python-poetry/poetry/issues/6154). Both `pip install` and
 # `poetry build` do the right thing without this explicit dependency.
 #
-# This isn't really a dev-dependency, as `poetry install --without dev` will fail,
+# This isn't really a dev-dependency, as `poetry install --no-dev` will fail,
 # but the alternative is to add it to the main list of deps where it isn't
 # needed.
 setuptools_rust = ">=1.3"
@@ -256,6 +254,7 @@ hiredis = { version = "*", optional = true }
 Pympler = { version = "*", optional = true }
 parameterized = { version = ">=0.7.4", optional = true }
 idna = { version = ">=2.5", optional = true }
+pyicu = { version = ">=2.10.2", optional = true }

 [tool.poetry.extras]
 # NB: Packages that should be part of `pip install matrix-synapse[all]` need to be specified
@@ -278,6 +277,10 @@ redis = ["txredisapi", "hiredis"]
 # Required to use experimental `caches.track_memory_usage` config option.
 cache-memory = ["pympler"]
 test = ["parameterized", "idna"]
+# Allows for better search for international characters in the user directory. This
+# requires libicu's development headers installed on the system (e.g. libicu-dev on
+# Debian-based distributions).
+user-search = ["pyicu"]

 # The duplication here is awful. I hate hate hate hate hate it. However, for now I want
 # to ensure you can still `pip install matrix-synapse[all]` like today. Two motivations:
@@ -309,6 +312,8 @@ all = [
    "txredisapi", "hiredis",
    # cache-memory
    "pympler",
+    # improved user search
+    "pyicu",
    # omitted:
    #   - test: it's useful to have this separate from dev deps in the olddeps job
    #   - systemd: this is a system-based requirement
@@ -319,7 +324,7 @@ all = [
 # failing on new releases. Keeping lower bounds loose here means that dependabot
 # can bump versions without having to update the content-hash in the lockfile.
 # This helps prevents merge conflicts when running a batch of dependabot updates.
-ruff = "0.12.4"
+ruff = "0.11.11"
 # Type checking only works with the pydantic.v1 compat module from pydantic v2
 pydantic = "^2"

@@ -328,6 +333,7 @@ lxml-stubs = ">=0.4.0"
 mypy = "*"
 mypy-zope = "*"
 types-bleach = ">=4.1.0"
+types-commonmark = ">=0.9.2"
 types-jsonschema = ">=3.2.0"
 types-netaddr = ">=0.8.0.6"
 types-opentracing = ">=2.4.2"
@@ -350,7 +356,7 @@ idna = ">=2.5"
 click = ">=8.1.3"
 # GitPython was == 3.1.14; bumped to 3.1.20, the first release with type hints.
 GitPython = ">=3.1.20"
-markdown-it-py = ">=3.0.0"
+commonmark = ">=0.9.1"
 pygithub = ">=1.55"
 # The following are executed as commands by the release script.
 twine = "*"
@@ -368,7 +374,7 @@ tomli = ">=1.2.3"
 # runtime errors caused by build system changes.
 # We are happy to raise these upper bounds upon request,
 # provided we check that it's safe to do so (i.e. that CI passes).
-requires = ["poetry-core>=1.1.0,<=2.1.3", "setuptools_rust>=1.3,<=1.11.1"]
+requires = ["poetry-core>=1.1.0,<=1.9.1", "setuptools_rust>=1.3,<=1.10.2"]
 build-backend = "poetry.core.masonry.api"


@@ -376,10 +382,13 @@ build-backend = "poetry.core.masonry.api"
 # Skip unsupported platforms (by us or by Rust).
 # See https://cibuildwheel.readthedocs.io/en/stable/options/#build-skip for the list of build targets.
 # We skip:
-#  - CPython and PyPy 3.8: EOLed
+#  - CPython 3.6, 3.7 and 3.8: EOLed
+#  - PyPy 3.7 and 3.8: we only support Python 3.9+
 #  - musllinux i686: excluded to reduce number of wheels we build.
 #    c.f. https://github.com/matrix-org/synapse/pull/12595#discussion_r963107677
-skip = "cp38* pp38* *-musllinux_i686"
+#  - PyPy on Aarch64 and musllinux on aarch64: too slow to build.
+#    c.f. https://github.com/matrix-org/synapse/pull/14259
+skip = "cp36* cp37* cp38* pp37* pp38* *-musllinux_i686 pp*aarch64 *-musllinux_aarch64"
 # Enable non-default builds.
 # "pypy" used to be included by default up until cibuildwheel 3.
 enable = "pypy"
@@ -23,7 +23,7 @@ name = "synapse.synapse_rust"

 [dependencies]
 anyhow = "1.0.63"
-base64 = "0.22.1"
+base64 = "0.21.7"
 bytes = "1.6.0"
 headers = "0.4.0"
 http = "1.1.0"
@@ -43,7 +43,6 @@ sha2 = "0.10.8"
 serde = { version = "1.0.144", features = ["derive"] }
 serde_json = "1.0.85"
 ulid = "1.1.2"
-icu_segmenter = "2.0.0"
 reqwest = { version = "0.12.15", default-features = false, features = [
    "http2",
    "stream",
@@ -52,7 +51,6 @@ reqwest = { version = "0.12.15", default-features = false, features = [
 http-body-util = "0.1.3"
 futures = "0.3.31"
 tokio = { version = "1.44.2", features = ["rt", "rt-multi-thread"] }
-once_cell = "1.18.0"

 [features]
 extension-module = ["pyo3/extension-module"]
@@ -12,149 +12,58 @@
 * <https://www.gnu.org/licenses/agpl-3.0.html>.
 */

-use std::{collections::HashMap, future::Future};
+use std::{collections::HashMap, future::Future, panic::AssertUnwindSafe, sync::LazyLock};

 use anyhow::Context;
-use futures::TryStreamExt;
-use once_cell::sync::OnceCell;
-use pyo3::{create_exception, exceptions::PyException, prelude::*};
+use futures::{FutureExt, TryStreamExt};
+use pyo3::{exceptions::PyException, prelude::*, types::PyString};
 use reqwest::RequestBuilder;
 use tokio::runtime::Runtime;

 use crate::errors::HttpResponseException;

-create_exception!(
-    synapse.synapse_rust.http_client,
-    RustPanicError,
-    PyException,
-    "A panic which happened in a Rust future"
-);
+/// The tokio runtime that we're using to run async Rust libs.
+static RUNTIME: LazyLock<Runtime> = LazyLock::new(|| {
+    tokio::runtime::Builder::new_multi_thread()
+        .worker_threads(4)
+        .enable_all()
+        .build()
+        .unwrap()
+});

-impl RustPanicError {
-    fn from_panic(panic_err: &(dyn std::any::Any + Send + 'static)) -> PyErr {
-        // Apparently this is how you extract the panic message from a panic
-        let panic_message = if let Some(str_slice) = panic_err.downcast_ref::<&str>() {
-            str_slice
-        } else if let Some(string) = panic_err.downcast_ref::<String>() {
-            string
-        } else {
-            "unknown error"
-        };
-        Self::new_err(panic_message.to_owned())
-    }
-}
+/// A reference to the `Deferred` python class.
+static DEFERRED_CLASS: LazyLock<PyObject> = LazyLock::new(|| {
+    Python::with_gil(|py| {
+        py.import("twisted.internet.defer")
+            .expect("module 'twisted.internet.defer' should be importable")
+            .getattr("Deferred")
+            .expect("module 'twisted.internet.defer' should have a 'Deferred' class")
+            .unbind()
+    })
+});

-/// This is the name of the attribute where we store the runtime on the reactor
-static TOKIO_RUNTIME_ATTR: &str = "__synapse_rust_tokio_runtime";
-
-/// A Python wrapper around a Tokio runtime.
-///
-/// This allows us to 'store' the runtime on the reactor instance, starting it
-/// when the reactor starts, and stopping it when the reactor shuts down.
-#[pyclass]
-struct PyTokioRuntime {
-    runtime: Option<Runtime>,
-}
-
-#[pymethods]
-impl PyTokioRuntime {
-    fn start(&mut self) -> PyResult<()> {
-        // TODO: allow customization of the runtime like the number of threads
-        let runtime = tokio::runtime::Builder::new_multi_thread()
-            .worker_threads(4)
-            .enable_all()
-            .build()?;
-
-        self.runtime = Some(runtime);
-
-        Ok(())
-    }
-
-    fn shutdown(&mut self) -> PyResult<()> {
-        let runtime = self
-            .runtime
-            .take()
-            .context("Runtime was already shutdown")?;
-
-        // Dropping the runtime will shut it down
-        drop(runtime);
-
-        Ok(())
-    }
-}
-
-impl PyTokioRuntime {
-    /// Get the handle to the Tokio runtime, if it is running.
-    fn handle(&self) -> PyResult<&tokio::runtime::Handle> {
-        let handle = self
-            .runtime
-            .as_ref()
-            .context("Tokio runtime is not running")?
-            .handle();
-
-        Ok(handle)
-    }
-}
-
-/// Get a handle to the Tokio runtime stored on the reactor instance, or create
-/// a new one.
-fn runtime<'a>(reactor: &Bound<'a, PyAny>) -> PyResult<PyRef<'a, PyTokioRuntime>> {
-    if !reactor.hasattr(TOKIO_RUNTIME_ATTR)? {
-        install_runtime(reactor)?;
-    }
-
-    get_runtime(reactor)
-}
-
-/// Install a new Tokio runtime on the reactor instance.
-fn install_runtime(reactor: &Bound<PyAny>) -> PyResult<()> {
-    let py = reactor.py();
-    let runtime = PyTokioRuntime { runtime: None };
-    let runtime = runtime.into_pyobject(py)?;
-
-    // Attach the runtime to the reactor, starting it when the reactor is
-    // running, stopping it when the reactor is shutting down
-    reactor.call_method1("callWhenRunning", (runtime.getattr("start")?,))?;
-    reactor.call_method1(
-        "addSystemEventTrigger",
-        ("after", "shutdown", runtime.getattr("shutdown")?),
-    )?;
-    reactor.setattr(TOKIO_RUNTIME_ATTR, runtime)?;
-
-    Ok(())
-}
-
-/// Get a reference to a Tokio runtime handle stored on the reactor instance.
-fn get_runtime<'a>(reactor: &Bound<'a, PyAny>) -> PyResult<PyRef<'a, PyTokioRuntime>> {
-    // This will raise if `TOKIO_RUNTIME_ATTR` is not set or if it is
-    // not a `Runtime`. Careful that this could happen if the user sets it
-    // manually, or if multiple versions of `pyo3-twisted` are used!
-    let runtime: Bound<PyTokioRuntime> = reactor.getattr(TOKIO_RUNTIME_ATTR)?.extract()?;
-    Ok(runtime.borrow())
-}
-
-/// A reference to the `twisted.internet.defer` module.
-static DEFER: OnceCell<PyObject> = OnceCell::new();
-
-/// Access to the `twisted.internet.defer` module.
-fn defer(py: Python<'_>) -> PyResult<&Bound<PyAny>> {
-    Ok(DEFER
-        .get_or_try_init(|| py.import("twisted.internet.defer").map(Into::into))?
-        .bind(py))
-}
+/// A reference to the twisted `reactor`.
+static TWISTED_REACTOR: LazyLock<Py<PyModule>> = LazyLock::new(|| {
+    Python::with_gil(|py| {
+        py.import("twisted.internet.reactor")
+            .expect("module 'twisted.internet.reactor' should be importable")
+            .unbind()
+    })
+});

 /// Called when registering modules with python.
 pub fn register_module(py: Python<'_>, m: &Bound<'_, PyModule>) -> PyResult<()> {
    let child_module: Bound<'_, PyModule> = PyModule::new(py, "http_client")?;
    child_module.add_class::<HttpClient>()?;

-    // Make sure we fail early if we can't load some modules
-    defer(py)?;
+    // Make sure we fail early if we can't build the lazy statics.
+    LazyLock::force(&RUNTIME);
+    LazyLock::force(&DEFERRED_CLASS);

    m.add_submodule(&child_module)?;

    // We need to manually add the module to sys.modules to make `from
-    // synapse.synapse_rust import http_client` work.
+    // synapse.synapse_rust import acl` work.
    py.import("sys")?
        .getattr("modules")?
        .set_item("synapse.synapse_rust.http_client", child_module)?;
@@ -163,24 +72,26 @@ pub fn register_module(py: Python<'_>, m: &Bound<'_, PyModule>) -> PyResult<()>
 }

 #[pyclass]
+#[derive(Clone)]
 struct HttpClient {
    client: reqwest::Client,
-    reactor: PyObject,
 }

 #[pymethods]
 impl HttpClient {
    #[new]
-    pub fn py_new(reactor: Bound<PyAny>, user_agent: &str) -> PyResult<HttpClient> {
-        // Make sure the runtime gets installed
-        let _ = runtime(&reactor)?;
+    pub fn py_new(user_agent: &str) -> PyResult<HttpClient> {
+        // The twisted reactor can only be imported after Synapse has been
+        // imported, to allow Synapse to change the twisted reactor. If we try
+        // and import the reactor too early twisted installs a default reactor,
+        // which can't be replaced.
+        LazyLock::force(&TWISTED_REACTOR);

        Ok(HttpClient {
            client: reqwest::Client::builder()
                .user_agent(user_agent)
                .build()
                .context("building reqwest client")?,
-            reactor: reactor.unbind(),
        })
    }

@@ -218,7 +129,7 @@ impl HttpClient {
        builder: RequestBuilder,
        response_limit: usize,
    ) -> PyResult<Bound<'a, PyAny>> {
-        create_deferred(py, self.reactor.bind(py), async move {
+        create_deferred(py, async move {
            let response = builder.send().await.context("sending request")?;

            let status = response.status();
@@ -248,51 +159,43 @@ impl HttpClient {
 /// tokio runtime.
 ///
 /// Does not handle deferred cancellation or contextvars.
-fn create_deferred<'py, F, O>(
-    py: Python<'py>,
-    reactor: &Bound<'py, PyAny>,
-    fut: F,
-) -> PyResult<Bound<'py, PyAny>>
+fn create_deferred<F, O>(py: Python, fut: F) -> PyResult<Bound<'_, PyAny>>
 where
    F: Future<Output = PyResult<O>> + Send + 'static,
-    for<'a> O: IntoPyObject<'a> + Send + 'static,
+    for<'a> O: IntoPyObject<'a>,
 {
-    let deferred = defer(py)?.call_method0("Deferred")?;
+    let deferred = DEFERRED_CLASS.bind(py).call0()?;
    let deferred_callback = deferred.getattr("callback")?.unbind();
    let deferred_errback = deferred.getattr("errback")?.unbind();

-    let rt = runtime(reactor)?;
-    let handle = rt.handle()?;
-    let task = handle.spawn(fut);
-
-    // Unbind the reactor so that we can pass it to the task
-    let reactor = reactor.clone().unbind();
-    handle.spawn(async move {
-        let res = task.await;
+    RUNTIME.spawn(async move {
+        // TODO: Is it safe to assert unwind safety here? I think so, as we
+        // don't use anything that could be tainted by the panic afterwards.
+        // Note that `.spawn(..)` asserts unwind safety on the future too.
+        let res = AssertUnwindSafe(fut).catch_unwind().await;

        Python::with_gil(move |py| {
            // Flatten the panic into standard python error
            let res = match res {
                Ok(r) => r,
-                Err(join_err) => match join_err.try_into_panic() {
-                    Ok(panic_err) => Err(RustPanicError::from_panic(&panic_err)),
-                    Err(err) => Err(PyException::new_err(format!("Task cancelled: {err}"))),
-                },
+                Err(panic_err) => {
+                    let panic_message = get_panic_message(&panic_err);
+                    Err(PyException::new_err(
+                        PyString::new(py, panic_message).unbind(),
+                    ))
+                }
            };

-            // Re-bind the reactor
-            let reactor = reactor.bind(py);
-
            // Send the result to the deferred, via `.callback(..)` or `.errback(..)`
            match res {
                Ok(obj) => {
-                    reactor
-                        .call_method("callFromThread", (deferred_callback, obj), None)
+                    TWISTED_REACTOR
+                        .call_method(py, "callFromThread", (deferred_callback, obj), None)
                        .expect("callFromThread should not fail"); // There's nothing we can really do with errors here
                }
                Err(err) => {
-                    reactor
-                        .call_method("callFromThread", (deferred_errback, err), None)
+                    TWISTED_REACTOR
+                        .call_method(py, "callFromThread", (deferred_errback, err), None)
                        .expect("callFromThread should not fail"); // There's nothing we can really do with errors here
                }
            }
@@ -301,3 +204,15 @@ where

    Ok(deferred)
 }
+
+/// Try and get the panic message out of the panic
+fn get_panic_message<'a>(panic_err: &'a (dyn std::any::Any + Send + 'static)) -> &'a str {
+    // Apparently this is how you extract the panic message from a panic
+    if let Some(str_slice) = panic_err.downcast_ref::<&str>() {
+        str_slice
+    } else if let Some(string) = panic_err.downcast_ref::<String>() {
+        string
+    } else {
+        "unknown error"
+    }
+}
@@ -27,7 +27,7 @@ pub enum IdentifierError {

 impl fmt::Display for IdentifierError {
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{self:?}")
+        write!(f, "{:?}", self)
    }
 }

@@ -13,7 +13,6 @@ pub mod identifier;
 pub mod matrix_const;
 pub mod push;
 pub mod rendezvous;
-pub mod segmenter;

 lazy_static! {
    static ref LOGGING_HANDLE: ResetHandle = pyo3_log::init();
@@ -54,7 +53,6 @@ fn synapse_rust(py: Python<'_>, m: &Bound<'_, PyModule>) -> PyResult<()> {
    events::register_module(py, m)?;
    http_client::register_module(py, m)?;
    rendezvous::register_module(py, m)?;
-    segmenter::register_module(py, m)?;

    Ok(())
 }
@@ -1,33 +0,0 @@
-use icu_segmenter::options::WordBreakInvariantOptions;
-use icu_segmenter::WordSegmenter;
-use pyo3::prelude::*;
-
-#[pyfunction]
-pub fn parse_words(text: &str) -> PyResult<Vec<String>> {
-    let segmenter = WordSegmenter::new_auto(WordBreakInvariantOptions::default());
-    let mut parts = Vec::new();
-    let mut last = 0usize;
-
-    // `segment_str` gives us word boundaries as a vector of indexes. Use that
-    // to build a vector of words, and return.
-    for boundary in segmenter.segment_str(text) {
-        if boundary > last {
-            parts.push(text[last..boundary].to_string());
-        }
-        last = boundary;
-    }
-    Ok(parts)
-}
-
-pub fn register_module(py: Python<'_>, m: &Bound<'_, PyModule>) -> PyResult<()> {
-    let child_module = PyModule::new(py, "segmenter")?;
-    child_module.add_function(wrap_pyfunction!(parse_words, m)?)?;
-
-    m.add_submodule(&child_module)?;
-
-    py.import("sys")?
-        .getattr("modules")?
-        .set_item("synapse.synapse_rust.segmenter", child_module)?;
-
-    Ok(())
-}
@@ -1,5 +1,5 @@
 $schema: https://element-hq.github.io/synapse/latest/schema/v1/meta.schema.json
-$id: https://element-hq.github.io/synapse/schema/synapse/v1.135/synapse-config.schema.json
+$id: https://element-hq.github.io/synapse/schema/synapse/v1.133/synapse-config.schema.json
 type: object
 properties:
  modules:
@@ -2179,8 +2179,9 @@ properties:
      with a short timeout, or restarting several different delayed events all
      at once) without the risk of being ratelimited.
    default:
-      per_second: 1.0
-      burst_count: 5.0
+      per_user:
+        per_second: 1.0
+        burst_count: 5.0
    examples:
      - per_second: 2.0
        burst_count: 20.0
@@ -2334,30 +2335,6 @@ properties:
    default: 50M
    examples:
      - 60M
-  media_upload_limits:
-    type: array
-    description: >-
-      A list of media upload limits defining how much data a given user can
-      upload in a given time period.
-
-
-      An empty list means no limits are applied.
-    default: []
-    items:
-      time_period:
-        type: "#/$defs/duration"
-        description: >-
-          The time period over which the limit applies. Required.
-      max_size:
-        type: "#/$defs/bytes"
-        description: >-
-          Amount of data that can be uploaded in the time period by the user.
-          Required.
-    examples:
-      - - time_period: 1h
-          max_size: 100M
-        - time_period: 1w
-          max_size: 500M
  max_image_pixels:
    $ref: "#/$defs/bytes"
    description: Maximum number of pixels that will be thumbnailed.
@@ -2691,21 +2668,6 @@ properties:
    default: null
    examples:
      - YOUR_PUBLIC_KEY
-  recaptcha_public_key_path:
-    type: ["string", "null"]
-    description: >-
-      An alternative to [`recaptcha_public_key`](#recaptcha_public_key): allows
-      the public key to be specified in an external file.
-
-
-      The file should be a plain text file, containing only the public key.
-      Synapse reads the public key from the given file once at startup.
-
-
-      _Added in Synapse 1.135.0._
-    default: null
-    examples:
-      - /path/to/key/file
  recaptcha_private_key:
    type: ["string", "null"]
    description: >-
@@ -2714,21 +2676,6 @@ properties:
    default: null
    examples:
      - YOUR_PRIVATE_KEY
-  recaptcha_private_key_path:
-    type: ["string", "null"]
-    description: >-
-      An alternative to [`recaptcha_private_key`](#recaptcha_private_key):
-      allows the private key to be specified in an external file.
-
-
-      The file should be a plain text file, containing only the private key.
-      Synapse reads the private key from the given file once at startup.
-
-
-      _Added in Synapse 1.135.0._
-    default: null
-    examples:
-      - /path/to/key/file
  enable_registration_captcha:
    type: boolean
    description: >-
@@ -4718,15 +4665,8 @@ properties:
      enabled:
        type: boolean
        description: >-
-          Defines whether users can search the user directory. If `false` then
+          Defines whether users can search the user directory. If false then
          empty responses are returned to all queries.
-
-
-          *Warning: While the homeserver may determine which subset of users are
-          searched, the Matrix specification requires homeservers to include (at
-          minimum) users visible in public rooms and users sharing a room with
-          the requester. Using `false` improves performance but violates this
-          requirement.*
        default: true
      search_all_users:
        type: boolean
@@ -5109,7 +5049,7 @@ properties:

      "m.room.avatar": 50

-      "m.room.tombstone": 100 (150 if MSC4289 is used)
+      "m.room.tombstone": 100

      "m.room.server_acl": 100

@@ -5383,9 +5323,6 @@ properties:
      push_rules:
        type: string
        description: Name of a worker assigned to the `push_rules` stream.
-      device_lists:
-        type: string
-        description: Name of a worker assigned to the `device_lists` stream.
    default: {}
    examples:
      - events: worker1
@@ -36,11 +36,11 @@ from typing import Any, List, Match, Optional, Union

 import attr
 import click
+import commonmark
 import git
 from click.exceptions import ClickException
 from git import GitCommandError, Repo
 from github import BadCredentialsException, Github
-from markdown_it import MarkdownIt
 from packaging import version


@@ -851,7 +851,7 @@ def get_changes_for_version(wanted_version: version.Version) -> str:

    # First we parse the changelog so that we can split it into sections based
    # on the release headings.
-    tokens = MarkdownIt().parse(changes)
+    ast = commonmark.Parser().parse(changes)

    @attr.s(auto_attribs=True)
    class VersionSection:
@@ -862,22 +862,19 @@ def get_changes_for_version(wanted_version: version.Version) -> str:
        end_line: Optional[int] = None  # Is none if its the last entry

    headings: List[VersionSection] = []
-    for i, token in enumerate(tokens):
-        # We look for level 1 headings (h1 tags).
-        if token.type != "heading_open" or token.tag != "h1":
+    for node, _ in ast.walker():
+        # We look for all text nodes that are in a level 1 heading.
+        if node.t != "text":
            continue

-        # The next token should be an inline token containing the heading text
-        if i + 1 < len(tokens) and tokens[i + 1].type == "inline":
-            heading_text = tokens[i + 1].content
-            # The map property contains [line_begin, line_end] (0-based)
-            start_line = token.map[0] if token.map else 0
+        if node.parent.t != "heading" or node.parent.level != 1:
+            continue

-            # If we have a previous heading then we update its `end_line`.
-            if headings:
-                headings[-1].end_line = start_line
+        # If we have a previous heading then we update its `end_line`.
+        if headings:
+            headings[-1].end_line = node.parent.sourcepos[0][0] - 1

-            headings.append(VersionSection(heading_text, start_line))
+        headings.append(VersionSection(node.literal, node.parent.sourcepos[0][0] - 1))

    changes_by_line = changes.split("\n")

@@ -48,7 +48,6 @@ if TYPE_CHECKING or HAS_PYDANTIC_V2:
        conint,
        constr,
        parse_obj_as,
-        root_validator,
        validator,
    )
    from pydantic.v1.error_wrappers import ErrorWrapper
@@ -69,7 +68,6 @@ else:
        conint,
        constr,
        parse_obj_as,
-        root_validator,
        validator,
    )
    from pydantic.error_wrappers import ErrorWrapper
@@ -94,5 +92,4 @@ __all__ = (
    "StrictStr",
    "ValidationError",
    "validator",
-    "root_validator",
 )
@@ -136,7 +136,6 @@ BOOLEAN_COLUMNS = {
        "has_known_state",
        "is_encrypted",
    ],
-    "thread_subscriptions": ["subscribed", "automatic"],
    "users": ["shadow_banned", "approved", "locked", "suspended"],
    "un_partial_stated_event_stream": ["rejection_status_changed"],
    "users_who_share_rooms": ["share_private"],
@@ -191,18 +190,13 @@ APPEND_ONLY_TABLES = [
    "users",
 ]

-# These tables declare their id column with "PRIMARY KEY AUTOINCREMENT" on sqlite side
-# and with "PRIMARY KEY GENERATED ALWAYS AS IDENTITY" on postgres side. This creates an
-# implicit sequence that needs its value to be migrated separately. Additionally,
-# inserting on postgres side needs to use the "OVERRIDING SYSTEM VALUE" modifier.
-AUTOINCREMENT_TABLES = {
-    "sliding_sync_connections",
-    "sliding_sync_connection_positions",
-    "sliding_sync_connection_required_state",
-    "state_groups_pending_deletion",
-}

 IGNORED_TABLES = {
+    # Porting the auto generated sequence in this table is non-trivial.
+    # None of the entries in this list are mandatory for Synapse to keep working.
+    # If state group disk space is an issue after the port, the
+    # `mark_unreferenced_state_groups_for_deletion_bg_update` background task can be run again.
+    "state_groups_pending_deletion",
    # We don't port these tables, as they're a faff and we can regenerate
    # them anyway.
    "user_directory",
@@ -290,17 +284,11 @@ class Store(
        return self.db_pool.runInteraction("execute_sql", r)

    def insert_many_txn(
-        self,
-        txn: LoggingTransaction,
-        table: str,
-        headers: List[str],
-        rows: List[Tuple],
-        override_system_value: bool = False,
+        self, txn: LoggingTransaction, table: str, headers: List[str], rows: List[Tuple]
    ) -> None:
-        sql = "INSERT INTO %s (%s) %s VALUES (%s)" % (
+        sql = "INSERT INTO %s (%s) VALUES (%s)" % (
            table,
            ", ".join(k for k in headers),
-            "OVERRIDING SYSTEM VALUE" if override_system_value else "",
            ", ".join("%s" for _ in headers),
        )

@@ -544,13 +532,7 @@ class Porter:

                def insert(txn: LoggingTransaction) -> None:
                    assert headers is not None
-                    self.postgres_store.insert_many_txn(
-                        txn,
-                        table,
-                        headers[1:],
-                        rows,
-                        override_system_value=table in AUTOINCREMENT_TABLES,
-                    )
+                    self.postgres_store.insert_many_txn(txn, table, headers[1:], rows)

                    self.postgres_store.db_pool.simple_update_one_txn(
                        txn,
@@ -902,19 +884,6 @@ class Porter:
                ],
            )

-            await self._setup_autoincrement_sequence(
-                "sliding_sync_connection_positions", "connection_position"
-            )
-            await self._setup_autoincrement_sequence(
-                "sliding_sync_connection_required_state", "required_state_id"
-            )
-            await self._setup_autoincrement_sequence(
-                "sliding_sync_connections", "connection_key"
-            )
-            await self._setup_autoincrement_sequence(
-                "state_groups_pending_deletion", "sequence_number"
-            )
-
            # Step 3. Get tables.
            self.progress.set_state("Fetching tables")
            sqlite_tables = await self.sqlite_store.db_pool.simple_select_onecol(
@@ -1247,49 +1216,6 @@ class Porter:
            "_setup_%s" % (sequence_name,), r
        )

-    async def _setup_autoincrement_sequence(
-        self,
-        sqlite_table_name: str,
-        sqlite_id_column_name: str,
-    ) -> None:
-        """Set a sequence to the correct value. Use where id column was declared with PRIMARY KEY AUTOINCREMENT."""
-        seq_name = await self._pg_get_serial_sequence(
-            sqlite_table_name, sqlite_id_column_name
-        )
-        if seq_name is None:
-            raise Exception(
-                "implicit sequence not found for table " + sqlite_table_name
-            )
-
-        seq_value = await self.sqlite_store.db_pool.simple_select_one_onecol(
-            table="sqlite_sequence",
-            keyvalues={"name": sqlite_table_name},
-            retcol="seq",
-            allow_none=True,
-        )
-        if seq_value is None:
-            return
-
-        def r(txn: LoggingTransaction) -> None:
-            sql = "ALTER SEQUENCE %s RESTART WITH" % (seq_name,)
-            txn.execute(sql + " %s", (seq_value + 1,))
-
-        await self.postgres_store.db_pool.runInteraction("_setup_%s" % (seq_name,), r)
-
-    async def _pg_get_serial_sequence(self, table: str, column: str) -> Optional[str]:
-        """Returns the name of the postgres sequence associated with a column, or NULL."""
-
-        def r(txn: LoggingTransaction) -> Optional[str]:
-            txn.execute("SELECT pg_get_serial_sequence('%s', '%s')" % (table, column))
-            result = txn.fetchone()
-            if not result:
-                return None
-            return result[0]
-
-        return await self.postgres_store.db_pool.runInteraction(
-            "_pg_get_serial_sequence", r
-        )
-
    async def _setup_auth_chain_sequence(self) -> None:
        curr_chain_id: Optional[
            int
@@ -172,7 +172,7 @@ class BaseAuth:
        """

        # It's ok if the app service is trying to use the sender from their registration
-        if app_service.sender.to_string() == user_id:
+        if app_service.sender == user_id:
            pass
        # Check to make sure the app service is allowed to control the user
        elif not app_service.is_interested_in_user(user_id):
@@ -29,7 +29,6 @@ from synapse.api.errors import (
    InvalidClientTokenError,
    MissingClientTokenError,
    UnrecognizedRequestError,
-    UserLockedError,
 )
 from synapse.http.site import SynapseRequest
 from synapse.logging.opentracing import active_span, force_tracing, start_active_span
@@ -163,7 +162,12 @@ class InternalAuth(BaseAuth):
                if not allow_locked and await self.store.get_user_locked_status(
                    requester.user.to_string()
                ):
-                    raise UserLockedError()
+                    raise AuthError(
+                        401,
+                        "User account has been locked",
+                        errcode=Codes.USER_LOCKED,
+                        additional_fields={"soft_logout": True},
+                    )

                # Deny the request if the user account has expired.
                # This check is only done for regular users, not appservice ones.
@@ -296,4 +300,4 @@ class InternalAuth(BaseAuth):
        Returns:
            True if the user is an admin
        """
-        return await self.store.is_server_admin(requester.user.to_string())
+        return await self.store.is_server_admin(requester.user)
@@ -176,7 +176,6 @@ class MSC3861DelegatedAuth(BaseAuth):
        assert self._config.client_id, "No client_id provided"
        assert auth_method is not None, "Invalid client_auth_method provided"

-        self.server_name = hs.hostname
        self._clock = hs.get_clock()
        self._http_client = hs.get_proxied_http_client()
        self._hostname = hs.hostname
@@ -184,8 +183,7 @@ class MSC3861DelegatedAuth(BaseAuth):
        self._force_tracing_for_users = hs.config.tracing.force_tracing_for_users

        self._rust_http_client = HttpClient(
-            reactor=hs.get_reactor(),
-            user_agent=self._http_client.user_agent.decode("utf8"),
+            user_agent=self._http_client.user_agent.decode("utf8")
        )

        # # Token Introspection Cache
@@ -208,9 +206,8 @@ class MSC3861DelegatedAuth(BaseAuth):
        #   In this case, the device still exists and it's not the end of the world for
        #   the old access token to continue working for a short time.
        self._introspection_cache: ResponseCache[str] = ResponseCache(
-            clock=self._clock,
-            name="token_introspection",
-            server_name=self.server_name,
+            self._clock,
+            "token_introspection",
            timeout_ms=120_000,
            # don't log because the keys are access tokens
            enable_logging=False,
@@ -369,12 +366,6 @@ class MSC3861DelegatedAuth(BaseAuth):
    async def is_server_admin(self, requester: Requester) -> bool:
        return "urn:synapse:admin:*" in requester.scope

-    def _is_access_token_the_admin_token(self, token: str) -> bool:
-        admin_token = self._admin_token()
-        if admin_token is None:
-            return False
-        return token == admin_token
-
    async def get_user_by_req(
        self,
        request: SynapseRequest,
@@ -440,7 +431,7 @@ class MSC3861DelegatedAuth(BaseAuth):
            requester = await self.get_user_by_access_token(access_token, allow_expired)

        # Do not record requests from MAS using the virtual `__oidc_admin` user.
-        if not self._is_access_token_the_admin_token(access_token):
+        if access_token != self._admin_token():
            await self._record_request(request, requester)

        if not allow_guest and requester.is_guest:
@@ -476,29 +467,17 @@ class MSC3861DelegatedAuth(BaseAuth):

            raise UnrecognizedRequestError(code=404)

-    def is_request_using_the_admin_token(self, request: SynapseRequest) -> bool:
-        """
-        Check if the request is using the admin token.
-
-        Args:
-            request: The request to check.
-
-        Returns:
-            True if the request is using the admin token, False otherwise.
-        """
-        access_token = self.get_access_token_from_request(request)
-        return self._is_access_token_the_admin_token(access_token)
-
    async def get_user_by_access_token(
        self,
        token: str,
        allow_expired: bool = False,
    ) -> Requester:
-        if self._is_access_token_the_admin_token(token):
+        admin_token = self._admin_token()
+        if admin_token is not None and token == admin_token:
            # XXX: This is a temporary solution so that the admin API can be called by
            # the OIDC provider. This will be removed once we have OIDC client
            # credentials grant support in matrix-authentication-service.
-            logger.info("Admin token used")
+            logger.info("Admin toked used")
            # XXX: that user doesn't exist and won't be provisioned.
            # This is mostly fine for admin calls, but we should also think about doing
            # requesters without a user_id.
@@ -46,9 +46,6 @@ MAX_USERID_LENGTH = 255
 # Constant value used for the pseudo-thread which is the main timeline.
 MAIN_TIMELINE: Final = "main"

-# MAX_INT + 1, so it always trumps any PL in canonical JSON.
-CREATOR_POWER_LEVEL = 2**53
-

 class Membership:
    """Represents the membership states of a user in a room."""
@@ -238,8 +235,6 @@ class EventContentFields:
    #
    # This is deprecated in MSC2175.
    ROOM_CREATOR: Final = "creator"
-    # MSC4289
-    ADDITIONAL_CREATORS: Final = "additional_creators"

    # The version of the room for `m.room.create` events.
    ROOM_VERSION: Final = "room_version"
@@ -267,11 +262,6 @@ class EventContentFields:

    TOMBSTONE_SUCCESSOR_ROOM: Final = "replacement_room"

-    # Used in m.room.topic events.
-    TOPIC: Final = "topic"
-    M_TOPIC: Final = "m.topic"
-    M_TEXT: Final = "m.text"
-

 class EventUnsignedContentFields:
    """Fields found inside the 'unsigned' data on events"""
@@ -280,13 +270,6 @@ class EventUnsignedContentFields:
    MEMBERSHIP: Final = "membership"


-class MTextFields:
-    """Fields found inside m.text content blocks."""
-
-    BODY: Final = "body"
-    MIMETYPE: Final = "mimetype"
-
-
 class RoomTypes:
    """Understood values of the room_type field of m.room.create events."""

@@ -307,9 +290,6 @@ class AccountDataTypes:
    MSC4155_INVITE_PERMISSION_CONFIG: Final = (
        "org.matrix.msc4155.invite_permission_config"
    )
-    # Synapse-specific behaviour. See "Client-Server API Extensions" documentation
-    # in Admin API for more information.
-    SYNAPSE_ADMIN_CLIENT_CONFIG: Final = "io.element.synapse.admin_client_config"


 class HistoryVisibility:
@@ -306,20 +306,6 @@ class UserDeactivatedError(SynapseError):
        )


-class UserLockedError(SynapseError):
-    """The error returned to the client when the user attempted to access an
-    authenticated endpoint, but the account has been locked.
-    """
-
-    def __init__(self) -> None:
-        super().__init__(
-            code=HTTPStatus.UNAUTHORIZED,
-            msg="User account has been locked",
-            errcode=Codes.USER_LOCKED,
-            additional_fields={"soft_logout": True},
-        )
-
-
 class FederationDeniedError(SynapseError):
    """An error raised when the server tries to federate with a server which
    is not on its federation whitelist.
@@ -541,11 +527,7 @@ class InvalidCaptchaError(SynapseError):


 class LimitExceededError(SynapseError):
-    """A client has sent too many requests and is being throttled.
-
-    Args:
-        pause: Optional time in seconds to pause before responding to the client.
-    """
+    """A client has sent too many requests and is being throttled."""

    def __init__(
        self,
@@ -553,7 +535,6 @@ class LimitExceededError(SynapseError):
        code: int = 429,
        retry_after_ms: Optional[int] = None,
        errcode: str = Codes.LIMIT_EXCEEDED,
-        pause: Optional[float] = None,
    ):
        # Use HTTP header Retry-After to enable library-assisted retry handling.
        headers = (
@@ -564,7 +545,6 @@ class LimitExceededError(SynapseError):
        super().__init__(code, "Too Many Requests", errcode, headers=headers)
        self.retry_after_ms = retry_after_ms
        self.limiter_name = limiter_name
-        self.pause = pause

    def error_dict(self, config: Optional["HomeServerConfig"]) -> "JsonDict":
        return cs_error(self.msg, self.errcode, retry_after_ms=self.retry_after_ms)
@@ -338,10 +338,12 @@ class Ratelimiter:
        )

        if not allowed:
+            if pause:
+                await self.clock.sleep(pause)
+
            raise LimitExceededError(
                limiter_name=self._limiter_name,
                retry_after_ms=int(1000 * (time_allowed - time_now_s)),
-                pause=pause,
            )


@@ -36,14 +36,12 @@ class EventFormatVersions:
    ROOM_V1_V2 = 1  # $id:server event id format: used for room v1 and v2
    ROOM_V3 = 2  # MSC1659-style $hash event id format: used for room v3
    ROOM_V4_PLUS = 3  # MSC1884-style $hash format: introduced for room v4
-    ROOM_V11_HYDRA_PLUS = 4  # MSC4291 room IDs as hashes: introduced for room HydraV11


 KNOWN_EVENT_FORMAT_VERSIONS = {
    EventFormatVersions.ROOM_V1_V2,
    EventFormatVersions.ROOM_V3,
    EventFormatVersions.ROOM_V4_PLUS,
-    EventFormatVersions.ROOM_V11_HYDRA_PLUS,
 }


@@ -52,7 +50,6 @@ class StateResolutionVersions:

    V1 = 1  # room v1 state res
    V2 = 2  # MSC1442 state res: room v2 and later
-    V2_1 = 3  # MSC4297 state res


 class RoomDisposition:
@@ -112,10 +109,6 @@ class RoomVersion:
    msc3931_push_features: Tuple[str, ...]  # values from PushRuleRoomFlag
    # MSC3757: Restricting who can overwrite a state event
    msc3757_enabled: bool
-    # MSC4289: Creator power enabled
-    msc4289_creator_power_enabled: bool
-    # MSC4291: Room IDs as hashes of the create event
-    msc4291_room_ids_as_hashes: bool


 class RoomVersions:
@@ -138,8 +131,6 @@ class RoomVersions:
        enforce_int_power_levels=False,
        msc3931_push_features=(),
        msc3757_enabled=False,
-        msc4289_creator_power_enabled=False,
-        msc4291_room_ids_as_hashes=False,
    )
    V2 = RoomVersion(
        "2",
@@ -160,8 +151,6 @@ class RoomVersions:
        enforce_int_power_levels=False,
        msc3931_push_features=(),
        msc3757_enabled=False,
-        msc4289_creator_power_enabled=False,
-        msc4291_room_ids_as_hashes=False,
    )
    V3 = RoomVersion(
        "3",
@@ -182,8 +171,6 @@ class RoomVersions:
        enforce_int_power_levels=False,
        msc3931_push_features=(),
        msc3757_enabled=False,
-        msc4289_creator_power_enabled=False,
-        msc4291_room_ids_as_hashes=False,
    )
    V4 = RoomVersion(
        "4",
@@ -204,8 +191,6 @@ class RoomVersions:
        enforce_int_power_levels=False,
        msc3931_push_features=(),
        msc3757_enabled=False,
-        msc4289_creator_power_enabled=False,
-        msc4291_room_ids_as_hashes=False,
    )
    V5 = RoomVersion(
        "5",
@@ -226,8 +211,6 @@ class RoomVersions:
        enforce_int_power_levels=False,
        msc3931_push_features=(),
        msc3757_enabled=False,
-        msc4289_creator_power_enabled=False,
-        msc4291_room_ids_as_hashes=False,
    )
    V6 = RoomVersion(
        "6",
@@ -248,8 +231,6 @@ class RoomVersions:
        enforce_int_power_levels=False,
        msc3931_push_features=(),
        msc3757_enabled=False,
-        msc4289_creator_power_enabled=False,
-        msc4291_room_ids_as_hashes=False,
    )
    V7 = RoomVersion(
        "7",
@@ -270,8 +251,6 @@ class RoomVersions:
        enforce_int_power_levels=False,
        msc3931_push_features=(),
        msc3757_enabled=False,
-        msc4289_creator_power_enabled=False,
-        msc4291_room_ids_as_hashes=False,
    )
    V8 = RoomVersion(
        "8",
@@ -292,8 +271,6 @@ class RoomVersions:
        enforce_int_power_levels=False,
        msc3931_push_features=(),
        msc3757_enabled=False,
-        msc4289_creator_power_enabled=False,
-        msc4291_room_ids_as_hashes=False,
    )
    V9 = RoomVersion(
        "9",
@@ -314,8 +291,6 @@ class RoomVersions:
        enforce_int_power_levels=False,
        msc3931_push_features=(),
        msc3757_enabled=False,
-        msc4289_creator_power_enabled=False,
-        msc4291_room_ids_as_hashes=False,
    )
    V10 = RoomVersion(
        "10",
@@ -336,8 +311,6 @@ class RoomVersions:
        enforce_int_power_levels=True,
        msc3931_push_features=(),
        msc3757_enabled=False,
-        msc4289_creator_power_enabled=False,
-        msc4291_room_ids_as_hashes=False,
    )
    MSC1767v10 = RoomVersion(
        # MSC1767 (Extensible Events) based on room version "10"
@@ -359,8 +332,6 @@ class RoomVersions:
        enforce_int_power_levels=True,
        msc3931_push_features=(PushRuleRoomFlag.EXTENSIBLE_EVENTS,),
        msc3757_enabled=False,
-        msc4289_creator_power_enabled=False,
-        msc4291_room_ids_as_hashes=False,
    )
    MSC3757v10 = RoomVersion(
        # MSC3757 (Restricting who can overwrite a state event) based on room version "10"
@@ -382,8 +353,6 @@ class RoomVersions:
        enforce_int_power_levels=True,
        msc3931_push_features=(),
        msc3757_enabled=True,
-        msc4289_creator_power_enabled=False,
-        msc4291_room_ids_as_hashes=False,
    )
    V11 = RoomVersion(
        "11",
@@ -404,8 +373,6 @@ class RoomVersions:
        enforce_int_power_levels=True,
        msc3931_push_features=(),
        msc3757_enabled=False,
-        msc4289_creator_power_enabled=False,
-        msc4291_room_ids_as_hashes=False,
    )
    MSC3757v11 = RoomVersion(
        # MSC3757 (Restricting who can overwrite a state event) based on room version "11"
@@ -427,52 +394,6 @@ class RoomVersions:
        enforce_int_power_levels=True,
        msc3931_push_features=(),
        msc3757_enabled=True,
-        msc4289_creator_power_enabled=False,
-        msc4291_room_ids_as_hashes=False,
-    )
-    HydraV11 = RoomVersion(
-        "org.matrix.hydra.11",
-        RoomDisposition.UNSTABLE,
-        EventFormatVersions.ROOM_V11_HYDRA_PLUS,
-        StateResolutionVersions.V2_1,  # Changed from v11
-        enforce_key_validity=True,
-        special_case_aliases_auth=False,
-        strict_canonicaljson=True,
-        limit_notifications_power_levels=True,
-        implicit_room_creator=True,  # Used by MSC3820
-        updated_redaction_rules=True,  # Used by MSC3820
-        restricted_join_rule=True,
-        restricted_join_rule_fix=True,
-        knock_join_rule=True,
-        msc3389_relation_redactions=False,
-        knock_restricted_join_rule=True,
-        enforce_int_power_levels=True,
-        msc3931_push_features=(),
-        msc3757_enabled=False,
-        msc4289_creator_power_enabled=True,  # Changed from v11
-        msc4291_room_ids_as_hashes=True,  # Changed from v11
-    )
-    V12 = RoomVersion(
-        "12",
-        RoomDisposition.STABLE,
-        EventFormatVersions.ROOM_V11_HYDRA_PLUS,
-        StateResolutionVersions.V2_1,  # Changed from v11
-        enforce_key_validity=True,
-        special_case_aliases_auth=False,
-        strict_canonicaljson=True,
-        limit_notifications_power_levels=True,
-        implicit_room_creator=True,  # Used by MSC3820
-        updated_redaction_rules=True,  # Used by MSC3820
-        restricted_join_rule=True,
-        restricted_join_rule_fix=True,
-        knock_join_rule=True,
-        msc3389_relation_redactions=False,
-        knock_restricted_join_rule=True,
-        enforce_int_power_levels=True,
-        msc3931_push_features=(),
-        msc3757_enabled=False,
-        msc4289_creator_power_enabled=True,  # Changed from v11
-        msc4291_room_ids_as_hashes=True,  # Changed from v11
    )


@@ -490,10 +411,8 @@ KNOWN_ROOM_VERSIONS: Dict[str, RoomVersion] = {
        RoomVersions.V9,
        RoomVersions.V10,
        RoomVersions.V11,
-        RoomVersions.V12,
        RoomVersions.MSC3757v10,
        RoomVersions.MSC3757v11,
-        RoomVersions.HydraV11,
    )
 }

@@ -286,16 +286,6 @@ def register_start(
 def listen_metrics(bind_addresses: StrCollection, port: int) -> None:
    """
    Start Prometheus metrics server.
-
-    This method runs the metrics server on a different port, in a different thread to
-    Synapse. This can make it more resilient to heavy load in Synapse causing metric
-    requests to be slow or timeout.
-
-    Even though `start_http_server_prometheus(...)` uses `threading.Thread` behind the
-    scenes (where all threads share the GIL and only one thread can execute Python
-    bytecode at a time), this still works because the metrics thread can preempt the
-    Twisted reactor thread between bytecode boundaries and the metrics thread gets
-    scheduled with roughly equal priority to the Twisted reactor thread.
    """
    from prometheus_client import start_http_server as start_http_server_prometheus

@@ -303,9 +293,32 @@ def listen_metrics(bind_addresses: StrCollection, port: int) -> None:

    for host in bind_addresses:
        logger.info("Starting metrics listener on %s:%d", host, port)
+        _set_prometheus_client_use_created_metrics(False)
        start_http_server_prometheus(port, addr=host, registry=RegistryProxy)


+def _set_prometheus_client_use_created_metrics(new_value: bool) -> None:
+    """
+    Sets whether prometheus_client should expose `_created`-suffixed metrics for
+    all gauges, histograms and summaries.
+    There is no programmatic way to disable this without poking at internals;
+    the proper way is to use an environment variable which prometheus_client
+    loads at import time.
+
+    The motivation for disabling these `_created` metrics is that they're
+    a waste of space as they're not useful but they take up space in Prometheus.
+    """
+
+    import prometheus_client.metrics
+
+    if hasattr(prometheus_client.metrics, "_use_created"):
+        prometheus_client.metrics._use_created = new_value
+    else:
+        logger.error(
+            "Can't disable `_created` metrics in prometheus_client (brittle hack broken?)"
+        )
+
+
 def listen_manhole(
    bind_addresses: StrCollection,
    port: int,
@@ -104,9 +104,6 @@ from synapse.storage.databases.main.stats import StatsStore
 from synapse.storage.databases.main.stream import StreamWorkerStore
 from synapse.storage.databases.main.tags import TagsWorkerStore
 from synapse.storage.databases.main.task_scheduler import TaskSchedulerWorkerStore
-from synapse.storage.databases.main.thread_subscriptions import (
-    ThreadSubscriptionsWorkerStore,
-)
 from synapse.storage.databases.main.transactions import TransactionWorkerStore
 from synapse.storage.databases.main.ui_auth import UIAuthWorkerStore
 from synapse.storage.databases.main.user_directory import UserDirectoryStore
@@ -121,6 +118,7 @@ class GenericWorkerStore(
    # FIXME(https://github.com/matrix-org/synapse/issues/3714): We need to add
    # UserDirectoryStore as we write directly rather than going via the correct worker.
    UserDirectoryStore,
+    StatsStore,
    UIAuthWorkerStore,
    EndToEndRoomKeyStore,
    PresenceStore,
@@ -135,7 +133,6 @@ class GenericWorkerStore(
    KeyStore,
    RoomWorkerStore,
    DirectoryWorkerStore,
-    ThreadSubscriptionsWorkerStore,
    PushRulesWorkerStore,
    ApplicationServiceTransactionWorkerStore,
    ApplicationServiceWorkerStore,
@@ -157,7 +154,6 @@ class GenericWorkerStore(
    StreamWorkerStore,
    EventsWorkerStore,
    RegistrationWorkerStore,
-    StatsStore,
    SearchStore,
    TransactionWorkerStore,
    LockStore,
@@ -78,7 +78,7 @@ class ApplicationService:
        self,
        token: str,
        id: str,
-        sender: UserID,
+        sender: str,
        url: Optional[str] = None,
        namespaces: Optional[JsonDict] = None,
        hs_token: Optional[str] = None,
@@ -96,8 +96,6 @@ class ApplicationService:
        self.hs_token = hs_token
        # The full Matrix ID for this application service's sender.
        self.sender = sender
-        # The application service user should be part of the server's domain.
-        self.server_name = sender.domain  # nb must be called this for @cached
        self.namespaces = self._check_namespaces(namespaces)
        self.id = id
        self.ip_range_whitelist = ip_range_whitelist
@@ -225,7 +223,7 @@ class ApplicationService:
        """
        return (
            # User is the appservice's configured sender_localpart user
-            user_id == self.sender.to_string()
+            user_id == self.sender
            # User is in the appservice's user namespace
            or self.is_user_in_namespace(user_id)
        )
@@ -349,7 +347,7 @@ class ApplicationService:
    def is_exclusive_user(self, user_id: str) -> bool:
        return (
            self._is_exclusive(ApplicationService.NS_USERS, user_id)
-            or user_id == self.sender.to_string()
+            or user_id == self.sender
        )

    def is_interested_in_protocol(self, protocol: str) -> bool:
@@ -126,15 +126,11 @@ class ApplicationServiceApi(SimpleHttpClient):

    def __init__(self, hs: "HomeServer"):
        super().__init__(hs)
-        self.server_name = hs.hostname
        self.clock = hs.get_clock()
        self.config = hs.config.appservice

        self.protocol_meta_cache: ResponseCache[Tuple[str, str]] = ResponseCache(
-            clock=hs.get_clock(),
-            name="as_protocol_meta",
-            server_name=self.server_name,
-            timeout_ms=HOUR_IN_MS,
+            hs.get_clock(), "as_protocol_meta", timeout_ms=HOUR_IN_MS
        )

    def _get_headers(self, service: "ApplicationService") -> Dict[bytes, List[bytes]]:
@@ -559,9 +555,6 @@ class ApplicationServiceApi(SimpleHttpClient):
                        )
                        and service.is_interested_in_user(e.state_key)
                    ),
-                    # Appservices are considered 'trusted' by the admin and should have
-                    # applicable metadata on their events.
-                    include_admin_metadata=True,
                ),
            )
            for e in events
@@ -319,7 +319,7 @@ class _ServiceQueuer:
        users: Set[str] = set()

        # The sender is always included
-        users.add(service.sender.to_string())
+        users.add(service.sender)

        # All AS users that would receive the PDUs or EDUs sent to these rooms
        # are classed as 'interesting'.
@@ -909,10 +909,7 @@ class RootConfig:


 def read_config_files(config_files: Iterable[str]) -> Dict[str, Any]:
-    """Read the config files and shallowly merge them into a dict.
-
-    Successive configurations are shallowly merged into ones provided earlier,
-    i.e., entirely replacing top-level sections of the configuration.
+    """Read the config files into a dict

    Args:
        config_files: A list of the config files to read
@@ -122,7 +122,8 @@ def _load_appservice(
    localpart = as_info["sender_localpart"]
    if urlparse.quote(localpart) != localpart:
        raise ValueError("sender_localpart needs characters which are not URL encoded.")
-    user_id = UserID(localpart, hostname)
+    user = UserID(localpart, hostname)
+    user_id = user.to_string()

    # Rate limiting for users of this AS is on by default (excludes sender)
    rate_limited = as_info.get("rate_limited")
@@ -23,17 +23,7 @@ from typing import Any

 from synapse.types import JsonDict

-from ._base import Config, ConfigError, read_file
-
-CONFLICTING_RECAPTCHA_PRIVATE_KEY_OPTS_ERROR = """\
-You have configured both `recaptcha_private_key` and
-`recaptcha_private_key_path`. These are mutually incompatible.
-"""
-
-CONFLICTING_RECAPTCHA_PUBLIC_KEY_OPTS_ERROR = """\
-You have configured both `recaptcha_public_key` and `recaptcha_public_key_path`.
-These are mutually incompatible.
-"""
+from ._base import Config, ConfigError


 class CaptchaConfig(Config):
@@ -48,13 +38,6 @@ class CaptchaConfig(Config):
                "Config options that expect an in-line secret as value are disabled",
                ("recaptcha_private_key",),
            )
-        recaptcha_private_key_path = config.get("recaptcha_private_key_path")
-        if recaptcha_private_key_path:
-            if recaptcha_private_key:
-                raise ConfigError(CONFLICTING_RECAPTCHA_PRIVATE_KEY_OPTS_ERROR)
-            recaptcha_private_key = read_file(
-                recaptcha_private_key_path, ("recaptcha_private_key_path",)
-            ).strip()
        if recaptcha_private_key is not None and not isinstance(
            recaptcha_private_key, str
        ):
@@ -67,13 +50,6 @@ class CaptchaConfig(Config):
                "Config options that expect an in-line secret as value are disabled",
                ("recaptcha_public_key",),
            )
-        recaptcha_public_key_path = config.get("recaptcha_public_key_path")
-        if recaptcha_public_key_path:
-            if recaptcha_public_key:
-                raise ConfigError(CONFLICTING_RECAPTCHA_PUBLIC_KEY_OPTS_ERROR)
-            recaptcha_public_key = read_file(
-                recaptcha_public_key_path, ("recaptcha_public_key_path",)
-            ).strip()
        if recaptcha_public_key is not None and not isinstance(
            recaptcha_public_key, str
        ):
@@ -42,9 +42,6 @@ class CasConfig(Config):
        self.cas_enabled = cas_config and cas_config.get("enabled", True)

        if self.cas_enabled:
-            if not isinstance(cas_config, dict):
-                raise ConfigError("Must be a dictionary", ("cas_config",))
-
            self.cas_server_url = cas_config["server_url"]

            # TODO Update this to a _synapse URL.
@@ -561,27 +561,11 @@ class ExperimentalConfig(Config):
        # MSC4076: Add `disable_badge_count`` to pusher configuration
        self.msc4076_enabled: bool = experimental.get("msc4076_enabled", False)

-        # MSC4277: Harmonizing the reporting endpoints
-        #
-        # If enabled, ignore the score parameter and respond with HTTP 200 on
-        # reporting requests regardless of the subject's existence.
-        self.msc4277_enabled: bool = experimental.get("msc4277_enabled", False)
-
-        # MSC4235: Add `via` param to hierarchy endpoint
-        self.msc4235_enabled: bool = experimental.get("msc4235_enabled", False)
-
        # MSC4263: Preventing MXID enumeration via key queries
        self.msc4263_limit_key_queries_to_users_who_share_rooms = experimental.get(
            "msc4263_limit_key_queries_to_users_who_share_rooms",
            False,
        )

-        # MSC4267: Automatically forgetting rooms on leave
-        self.msc4267_enabled: bool = experimental.get("msc4267_enabled", False)
-
        # MSC4155: Invite filtering
        self.msc4155_enabled: bool = experimental.get("msc4155_enabled", False)
-
-        # MSC4306: Thread Subscriptions
-        # (and MSC4308: sliding sync extension for thread subscriptions)
-        self.msc4306_enabled: bool = experimental.get("msc4306_enabled", False)
@@ -212,14 +212,11 @@ class KeyConfig(Config):
                "Config options that expect an in-line secret as value are disabled",
                ("form_secret",),
            )
-        if form_secret is not None and not isinstance(form_secret, str):
-            raise ConfigError("Config option must be a string", ("form_secret",))
-
        form_secret_path = config.get("form_secret_path", None)
        if form_secret_path:
            if form_secret:
                raise ConfigError(CONFLICTING_FORM_SECRET_OPTS_ERROR)
-            self.form_secret: Optional[str] = read_file(
+            self.form_secret = read_file(
                form_secret_path, ("form_secret_path",)
            ).strip()
        else:
@@ -119,15 +119,6 @@ def parse_thumbnail_requirements(
    }


-@attr.s(auto_attribs=True, slots=True, frozen=True)
-class MediaUploadLimit:
-    """A limit on the amount of data a user can upload in a given time
-    period."""
-
-    max_bytes: int
-    time_period_ms: int
-
-
 class ContentRepositoryConfig(Config):
    section = "media"

@@ -283,13 +274,6 @@ class ContentRepositoryConfig(Config):

        self.enable_authenticated_media = config.get("enable_authenticated_media", True)

-        self.media_upload_limits: List[MediaUploadLimit] = []
-        for limit_config in config.get("media_upload_limits", []):
-            time_period_ms = self.parse_duration(limit_config["time_period"])
-            max_bytes = self.parse_size(limit_config["max_size"])
-
-            self.media_upload_limits.append(MediaUploadLimit(max_bytes, time_period_ms))
-
    def generate_config_section(self, data_dir_path: str, **kwargs: Any) -> str:
        assert data_dir_path is not None
        media_store = os.path.join(data_dir_path, "media_store")
@@ -85,4 +85,4 @@ class RoomConfig(Config):

        # When enabled, users will forget rooms when they leave them, either via a
        # leave, kick or ban.
-        self.forget_on_leave: bool = config.get("forget_rooms_on_leave", False)
+        self.forget_on_leave = config.get("forget_rooms_on_leave", False)
@@ -27,6 +27,8 @@ from typing import Any, Dict, List, Optional, Union
 import attr

 from synapse._pydantic_compat import (
+    BaseModel,
+    Extra,
    StrictBool,
    StrictInt,
    StrictStr,
@@ -45,7 +47,6 @@ from synapse.config.server import (
    parse_listener_def,
 )
 from synapse.types import JsonDict
-from synapse.util.pydantic_models import ParseModel

 _DEPRECATED_WORKER_DUTY_OPTION_USED = """
 The '%s' configuration option is deprecated and will be removed in a future
@@ -89,7 +90,30 @@ def _instance_to_list_converter(obj: Union[str, List[str]]) -> List[str]:
    return obj


-class InstanceTcpLocationConfig(ParseModel):
+class ConfigModel(BaseModel):
+    """A custom version of Pydantic's BaseModel which
+
+     - ignores unknown fields and
+     - does not allow fields to be overwritten after construction,
+
+    but otherwise uses Pydantic's default behaviour.
+
+    For now, ignore unknown fields. In the future, we could change this so that unknown
+    config values cause a ValidationError, provided the error messages are meaningful to
+    server operators.
+
+    Subclassing in this way is recommended by
+    https://pydantic-docs.helpmanual.io/usage/model_config/#change-behaviour-globally
+    """
+
+    class Config:
+        # By default, ignore fields that we don't recognise.
+        extra = Extra.ignore
+        # By default, don't allow fields to be reassigned after parsing.
+        allow_mutation = False
+
+
+class InstanceTcpLocationConfig(ConfigModel):
    """The host and port to talk to an instance via HTTP replication."""

    host: StrictStr
@@ -105,7 +129,7 @@ class InstanceTcpLocationConfig(ParseModel):
        return f"{self.host}:{self.port}"


-class InstanceUnixLocationConfig(ParseModel):
+class InstanceUnixLocationConfig(ConfigModel):
    """The socket file to talk to an instance via HTTP replication."""

    path: StrictStr
@@ -134,47 +158,39 @@ class WriterLocations:
            can only be a single instance.
        account_data: The instances that write to the account data streams. Currently
            can only be a single instance.
-        receipts: The instances that write to the receipts stream.
+        receipts: The instances that write to the receipts stream. Currently
+            can only be a single instance.
        presence: The instances that write to the presence stream. Currently
            can only be a single instance.
        push_rules: The instances that write to the push stream. Currently
            can only be a single instance.
-        device_lists: The instances that write to the device list stream.
    """

    events: List[str] = attr.ib(
-        default=[MAIN_PROCESS_INSTANCE_NAME],
+        default=["master"],
        converter=_instance_to_list_converter,
    )
    typing: List[str] = attr.ib(
-        default=[MAIN_PROCESS_INSTANCE_NAME],
+        default=["master"],
        converter=_instance_to_list_converter,
    )
    to_device: List[str] = attr.ib(
-        default=[MAIN_PROCESS_INSTANCE_NAME],
+        default=["master"],
        converter=_instance_to_list_converter,
    )
    account_data: List[str] = attr.ib(
-        default=[MAIN_PROCESS_INSTANCE_NAME],
+        default=["master"],
        converter=_instance_to_list_converter,
    )
    receipts: List[str] = attr.ib(
-        default=[MAIN_PROCESS_INSTANCE_NAME],
+        default=["master"],
        converter=_instance_to_list_converter,
    )
    presence: List[str] = attr.ib(
-        default=[MAIN_PROCESS_INSTANCE_NAME],
+        default=["master"],
        converter=_instance_to_list_converter,
    )
    push_rules: List[str] = attr.ib(
-        default=[MAIN_PROCESS_INSTANCE_NAME],
-        converter=_instance_to_list_converter,
-    )
-    device_lists: List[str] = attr.ib(
-        default=[MAIN_PROCESS_INSTANCE_NAME],
-        converter=_instance_to_list_converter,
-    )
-    thread_subscriptions: List[str] = attr.ib(
        default=["master"],
        converter=_instance_to_list_converter,
    )
@@ -246,16 +262,10 @@ class WorkerConfig(Config):
        if worker_replication_secret_path:
            if worker_replication_secret:
                raise ConfigError(CONFLICTING_WORKER_REPLICATION_SECRET_OPTS_ERROR)
-            self.worker_replication_secret: Optional[str] = read_file(
+            self.worker_replication_secret = read_file(
                worker_replication_secret_path, ("worker_replication_secret_path",)
            ).strip()
        else:
-            if worker_replication_secret is not None and not isinstance(
-                worker_replication_secret, str
-            ):
-                raise ConfigError(
-                    "Config option must be a string", ("worker_replication_secret",)
-                )
            self.worker_replication_secret = worker_replication_secret

        self.worker_name = config.get("worker_name", self.worker_app)
@@ -366,10 +376,7 @@ class WorkerConfig(Config):
        ):
            instances = _instance_to_list_converter(getattr(self.writers, stream))
            for instance in instances:
-                if (
-                    instance != MAIN_PROCESS_INSTANCE_NAME
-                    and instance not in self.instance_map
-                ):
+                if instance != "master" and instance not in self.instance_map:
                    raise ConfigError(
                        "Instance %r is configured to write %s but does not appear in `instance_map` config."
                        % (instance, stream)
@@ -408,11 +415,6 @@ class WorkerConfig(Config):
                "Must only specify one instance to handle `push` messages."
            )

-        if len(self.writers.device_lists) == 0:
-            raise ConfigError(
-                "Must specify at least one instance to handle `device_lists` messages."
-            )
-
        self.events_shard_config = RoutableShardedWorkerHandlingConfig(
            self.writers.events
        )
@@ -435,12 +437,9 @@ class WorkerConfig(Config):
        #
        # No effort is made to ensure only a single instance of these tasks is
        # running.
-        background_tasks_instance = (
-            config.get("run_background_tasks_on") or MAIN_PROCESS_INSTANCE_NAME
-        )
+        background_tasks_instance = config.get("run_background_tasks_on") or "master"
        self.run_background_tasks = (
-            self.worker_name is None
-            and background_tasks_instance == MAIN_PROCESS_INSTANCE_NAME
+            self.worker_name is None and background_tasks_instance == "master"
        ) or self.worker_name == background_tasks_instance

        self.should_notify_appservices = self._should_this_worker_perform_duty(
@@ -512,10 +511,9 @@ class WorkerConfig(Config):
        # 'don't run here'.
        new_option_should_run_here = None
        if new_option_name in config:
-            designated_worker = config[new_option_name] or MAIN_PROCESS_INSTANCE_NAME
+            designated_worker = config[new_option_name] or "master"
            new_option_should_run_here = (
-                designated_worker == MAIN_PROCESS_INSTANCE_NAME
-                and self.worker_name is None
+                designated_worker == "master" and self.worker_name is None
            ) or designated_worker == self.worker_name

        legacy_option_should_run_here = None
@@ -612,7 +610,7 @@ class WorkerConfig(Config):
            # If no worker instances are set we check if the legacy option
            # is set, which means use the main process.
            if legacy_option:
-                worker_instances = [MAIN_PROCESS_INSTANCE_NAME]
+                worker_instances = ["master"]

            if self.worker_app == legacy_app_name:
                if legacy_option:
@@ -101,9 +101,6 @@ def compute_content_hash(
    event_dict.pop("outlier", None)
    event_dict.pop("destinations", None)

-    # N.B. no need to pop the room_id from create events in MSC4291 rooms
-    # as they shouldn't have one.
-
    event_json_bytes = encode_canonical_json(event_dict)

    hashed = hash_algorithm(event_json_bytes)
@@ -45,7 +45,6 @@ from signedjson.sign import SignatureVerifyException, verify_signed_json
 from unpaddedbase64 import decode_base64

 from synapse.api.constants import (
-    CREATOR_POWER_LEVEL,
    MAX_PDU_SIZE,
    EventContentFields,
    EventTypes,
@@ -66,7 +65,6 @@ from synapse.api.room_versions import (
    RoomVersions,
 )
 from synapse.state import CREATE_KEY
-from synapse.events import is_creator
 from synapse.storage.databases.main.events_worker import EventRedactBehaviour
 from synapse.types import (
    MutableStateMap,
@@ -263,8 +261,7 @@ async def check_state_independent_auth_rules(
                f"Event {event.event_id} has unexpected auth_event for {k}: {auth_event_id}",
            )

-        # 2.3 ... If there are entries which were themselves rejected under the checks performed on receipt
-        # of a PDU, reject.
+        # We also need to check that the auth event itself is not rejected.
        if auth_event.rejected_reason:
            raise AuthError(
                403,
@@ -274,7 +271,7 @@ async def check_state_independent_auth_rules(

        auth_dict[k] = auth_event_id

-    # 2.4. If event does not have a m.room.create in its auth_events, reject.
+    # 3. If event does not have a m.room.create in its auth_events, reject.
    creation_event = auth_dict.get((EventTypes.Create, ""), None)
    if not creation_event:
        raise AuthError(403, "No create event in auth events")
@@ -314,14 +311,13 @@ def check_state_dependent_auth_rules(

    # Later code relies on there being a create event e.g _can_federate, _is_membership_change_allowed
    # so produce a more intelligible error if we don't have one.
-    create_event = auth_dict.get(CREATE_KEY)
-    if create_event is None:
+    if auth_dict.get(CREATE_KEY) is None:
        raise AuthError(
            403, f"Event {event.event_id} is missing a create event in auth_events."
        )

    # additional check for m.federate
-    creating_domain = get_domain_from_id(create_event.sender)
+    creating_domain = get_domain_from_id(event.room_id)
    originating_domain = get_domain_from_id(event.sender)
    if creating_domain != originating_domain:
        if not _can_federate(event, auth_dict):
@@ -474,20 +470,12 @@ def _check_create(event: "EventBase") -> None:
    if event.prev_event_ids():
        raise AuthError(403, "Create event has prev events")

-    if event.room_version.msc4291_room_ids_as_hashes:
-        # 1.2 If the create event has a room_id, reject
-        if "room_id" in event:
-            raise AuthError(403, "Create event has a room_id")
-    else:
-        # 1.2 If the domain of the room_id does not match the domain of the sender,
-        # reject.
-        if not event.room_version.msc4291_room_ids_as_hashes:
-            sender_domain = get_domain_from_id(event.sender)
-            room_id_domain = get_domain_from_id(event.room_id)
-            if room_id_domain != sender_domain:
-                raise AuthError(
-                    403, "Creation event's room_id domain does not match sender's"
-                )
+    # 1.2 If the domain of the room_id does not match the domain of the sender,
+    # reject.
+    sender_domain = get_domain_from_id(event.sender)
+    room_id_domain = get_domain_from_id(event.room_id)
+    if room_id_domain != sender_domain:
+        raise AuthError(403, "Creation event's room_id domain does not match sender's")

    # 1.3 If content.room_version is present and is not a recognised version, reject
    room_version_prop = event.content.get("room_version", "1")
@@ -504,16 +492,6 @@ def _check_create(event: "EventBase") -> None:
    ):
        raise AuthError(403, "Create event lacks a 'creator' property")

-    # 1.5 If the additional_creators field is present and is not an array of strings where each
-    # string is a valid user ID, reject.
-    if (
-        event.room_version.msc4289_creator_power_enabled
-        and EventContentFields.ADDITIONAL_CREATORS in event.content
-    ):
-        check_valid_additional_creators(
-            event.content[EventContentFields.ADDITIONAL_CREATORS]
-        )
-

 def _can_federate(event: "EventBase", auth_events: StateMap["EventBase"]) -> bool:
    creation_event = auth_events.get((EventTypes.Create, ""))
@@ -555,13 +533,7 @@ def _is_membership_change_allowed(

    target_user_id = event.state_key

-    # We need the create event in order to check if we can federate or not.
-    # If it's missing, yell loudly. Previously we only did this inside the
-    # _can_federate check.
-    create_event = auth_events.get((EventTypes.Create, ""))
-    if not create_event:
-        raise AuthError(403, "Create event missing from auth_events")
-    creating_domain = get_domain_from_id(create_event.sender)
+    creating_domain = get_domain_from_id(event.room_id)
    target_domain = get_domain_from_id(target_user_id)
    if creating_domain != target_domain:
        if not _can_federate(event, auth_events):
@@ -931,32 +903,6 @@ def _check_power_levels(
        except Exception:
            raise SynapseError(400, "Not a valid power level: %s" % (v,))

-    if room_version_obj.msc4289_creator_power_enabled:
-        # Enforce the creator does not appear in the users map
-        create_event = auth_events.get((EventTypes.Create, ""))
-        if not create_event:
-            raise SynapseError(
-                400, "Cannot check power levels without a create event in auth_events"
-            )
-        if create_event.sender in user_list:
-            raise SynapseError(
-                400,
-                "Creator user %s must not appear in content.users"
-                % (create_event.sender,),
-            )
-        additional_creators = create_event.content.get(
-            EventContentFields.ADDITIONAL_CREATORS, []
-        )
-        if additional_creators:
-            creators_in_user_list = set(additional_creators).intersection(
-                set(user_list)
-            )
-            if len(creators_in_user_list) > 0:
-                raise SynapseError(
-                    400,
-                    "Additional creators users must not appear in content.users",
-                )
-
    # Reject events with stringy power levels if required by room version
    if (
        event.type == EventTypes.PowerLevels
@@ -1082,9 +1028,6 @@ def get_user_power_level(user_id: str, auth_events: StateMap["EventBase"]) -> in
        "A create event in the auth events chain is required to calculate user power level correctly,"
        " but was not found. This indicates a bug"
    )
-    if create_event.room_version.msc4289_creator_power_enabled:
-        if is_creator(create_event, user_id):
-            return CREATOR_POWER_LEVEL
    power_level_event = get_power_level_event(auth_events)
    if power_level_event:
        level = power_level_event.content.get("users", {}).get(user_id)
@@ -1245,26 +1188,3 @@ def auth_types_for_event(
                auth_types.add(key)

    return auth_types
-
-
-def check_valid_additional_creators(additional_creators: Any) -> None:
-    """Check if the additional_creators provided is valid according to MSC4289.
-
-    The additional_creators can be supplied from an m.room.create event or from an /upgrade request.
-
-    Raises:
-        AuthError if the additional_creators is invalid for some reason.
-    """
-    if type(additional_creators) is not list:
-        raise AuthError(400, "additional_creators must be an array")
-    for entry in additional_creators:
-        if type(entry) is not str:
-            raise AuthError(400, "entry in additional_creators is not a string")
-        if not UserID.is_valid(entry):
-            raise AuthError(400, "entry in additional_creators is not a valid user ID")
-        # UserID.is_valid doesn't actually validate everything, so check the rest manually.
-        if len(entry) > 255 or len(entry.encode("utf-8")) > 255:
-            raise AuthError(
-                400,
-                "entry in additional_creators too long",
-            )
@@ -41,13 +41,10 @@ from typing import (
 import attr
 from unpaddedbase64 import encode_base64

-from synapse.api.constants import EventContentFields, EventTypes, RelationTypes
+from synapse.api.constants import EventTypes, RelationTypes
 from synapse.api.room_versions import EventFormatVersions, RoomVersion, RoomVersions
 from synapse.synapse_rust.events import EventInternalMetadata
-from synapse.types import (
-    JsonDict,
-    StrCollection,
-)
+from synapse.types import JsonDict, StrCollection
 from synapse.util.caches import intern_dict
 from synapse.util.frozenutils import freeze

@@ -211,7 +208,9 @@ class EventBase(metaclass=abc.ABCMeta):
    depth: DictProperty[int] = DictProperty("depth")
    content: DictProperty[JsonDict] = DictProperty("content")
    hashes: DictProperty[Dict[str, str]] = DictProperty("hashes")
+    origin: DictProperty[str] = DictProperty("origin")
    origin_server_ts: DictProperty[int] = DictProperty("origin_server_ts")
+    room_id: DictProperty[str] = DictProperty("room_id")
    sender: DictProperty[str] = DictProperty("sender")
    # TODO state_key should be Optional[str]. This is generally asserted in Synapse
    # by calling is_state() first (which ensures it is not None), but it is hard (not possible?)
@@ -226,10 +225,6 @@ class EventBase(metaclass=abc.ABCMeta):
    def event_id(self) -> str:
        raise NotImplementedError()

-    @property
-    def room_id(self) -> str:
-        raise NotImplementedError()
-
    @property
    def membership(self) -> str:
        return self.content["membership"]
@@ -392,10 +387,6 @@ class FrozenEvent(EventBase):
    def event_id(self) -> str:
        return self._event_id

-    @property
-    def room_id(self) -> str:
-        return self._dict["room_id"]
-

 class FrozenEventV2(EventBase):
    format_version = EventFormatVersions.ROOM_V3  # All events of this type are V2
@@ -453,10 +444,6 @@ class FrozenEventV2(EventBase):
        self._event_id = "$" + encode_base64(compute_event_reference_hash(self)[1])
        return self._event_id

-    @property
-    def room_id(self) -> str:
-        return self._dict["room_id"]
-
    def prev_event_ids(self) -> List[str]:
        """Returns the list of prev event IDs. The order matches the order
        specified in the event, though there is no meaning to it.
@@ -495,67 +482,6 @@ class FrozenEventV3(FrozenEventV2):
        return self._event_id


-class FrozenEventV4(FrozenEventV3):
-    """FrozenEventV4 for MSC4291 room IDs are hashes"""
-
-    format_version = EventFormatVersions.ROOM_V11_HYDRA_PLUS
-
-    """Override the room_id for m.room.create events"""
-
-    def __init__(
-        self,
-        event_dict: JsonDict,
-        room_version: RoomVersion,
-        internal_metadata_dict: Optional[JsonDict] = None,
-        rejected_reason: Optional[str] = None,
-    ):
-        super().__init__(
-            event_dict=event_dict,
-            room_version=room_version,
-            internal_metadata_dict=internal_metadata_dict,
-            rejected_reason=rejected_reason,
-        )
-        self._room_id: Optional[str] = None
-
-    @property
-    def room_id(self) -> str:
-        # if we have calculated the room ID already, don't do it again.
-        if self._room_id:
-            return self._room_id
-
-        is_create_event = self.type == EventTypes.Create and self.get_state_key() == ""
-
-        # for non-create events: use the supplied value from the JSON, as per FrozenEventV3
-        if not is_create_event:
-            self._room_id = self._dict["room_id"]
-            assert self._room_id is not None
-            return self._room_id
-
-        # for create events: calculate the room ID
-        from synapse.crypto.event_signing import compute_event_reference_hash
-
-        self._room_id = "!" + encode_base64(
-            compute_event_reference_hash(self)[1], urlsafe=True
-        )
-        return self._room_id
-
-    def auth_event_ids(self) -> StrCollection:
-        """Returns the list of auth event IDs. The order matches the order
-        specified in the event, though there is no meaning to it.
-        Returns:
-            The list of event IDs of this event's auth_events
-            Includes the creation event ID for convenience of all the codepaths
-            which expects the auth chain to include the creator ID, even though
-            it's explicitly not included on the wire. Excludes the create event
-            for the create event itself.
-        """
-        create_event_id = "$" + self.room_id[1:]
-        assert create_event_id not in self._dict["auth_events"]
-        if self.type == EventTypes.Create and self.get_state_key() == "":
-            return self._dict["auth_events"]  # should be []
-        return self._dict["auth_events"] + [create_event_id]
-
-
 def _event_type_from_format_version(
    format_version: int,
 ) -> Type[Union[FrozenEvent, FrozenEventV2, FrozenEventV3]]:
@@ -575,8 +501,6 @@ def _event_type_from_format_version(
        return FrozenEventV2
    elif format_version == EventFormatVersions.ROOM_V4_PLUS:
        return FrozenEventV3
-    elif format_version == EventFormatVersions.ROOM_V11_HYDRA_PLUS:
-        return FrozenEventV4
    else:
        raise Exception("No event format %r" % (format_version,))

@@ -636,23 +560,6 @@ def relation_from_event(event: EventBase) -> Optional[_EventRelation]:
    return _EventRelation(parent_id, rel_type, aggregation_key)


-def is_creator(create: EventBase, user_id: str) -> bool:
-    """
-    Return true if the provided user ID is the room creator.
-
-    This includes additional creators in MSC4289.
-    """
-    assert create.type == EventTypes.Create
-    if create.sender == user_id:
-        return True
-    if create.room_version.msc4289_creator_power_enabled:
-        additional_creators = set(
-            create.content.get(EventContentFields.ADDITIONAL_CREATORS, [])
-        )
-        return user_id in additional_creators
-    return False
-
-
@attr.s(slots=True, frozen=True, auto_attribs=True)
 class StrippedStateEvent:
    """
@@ -82,8 +82,7 @@ class EventBuilder:

    room_version: RoomVersion

-    # MSC4291 makes the room ID == the create event ID. This means the create event has no room_id.
-    room_id: Optional[str]
+    room_id: str
    type: str
    sender: str

@@ -143,14 +142,7 @@ class EventBuilder:
        Returns:
            The signed and hashed event.
        """
-        # Create events always have empty auth_events.
-        if self.type == EventTypes.Create and self.is_state() and self.state_key == "":
-            auth_event_ids = []
-
-        # Calculate auth_events for non-create events
        if auth_event_ids is None:
-            # Every non-create event must have a room ID
-            assert self.room_id is not None
            state_ids = await self._state.compute_state_after_events(
                self.room_id,
                prev_event_ids,
@@ -232,31 +224,12 @@ class EventBuilder:
            "auth_events": auth_events,
            "prev_events": prev_events,
            "type": self.type,
+            "room_id": self.room_id,
            "sender": self.sender,
            "content": self.content,
            "unsigned": self.unsigned,
            "depth": depth,
        }
-        if self.room_id is not None:
-            event_dict["room_id"] = self.room_id
-
-        if self.room_version.msc4291_room_ids_as_hashes:
-            # In MSC4291: the create event has no room ID as the create event ID /is/ the room ID.
-            if (
-                self.type == EventTypes.Create
-                and self.is_state()
-                and self._state_key == ""
-            ):
-                assert self.room_id is None
-            else:
-                # All other events do not reference the create event in auth_events, as the room ID
-                # /is/ the create event. However, the rest of the code (for consistency between room
-                # versions) assume that the create event remains part of the auth events. c.f. event
-                # class which automatically adds the create event when `.auth_event_ids()` is called
-                assert self.room_id is not None
-                create_event_id = "$" + self.room_id[1:]
-                auth_event_ids.remove(create_event_id)
-                event_dict["auth_events"] = auth_event_ids

        if self.is_state():
            event_dict["state_key"] = self._state_key
@@ -312,7 +285,7 @@ class EventBuilderFactory:
            room_version=room_version,
            type=key_values["type"],
            state_key=key_values.get("state_key"),
-            room_id=key_values.get("room_id"),
+            room_id=key_values["room_id"],
            sender=key_values["sender"],
            content=key_values.get("content", {}),
            unsigned=key_values.get("unsigned", {}),
@@ -329,8 +302,8 @@ def create_local_event_from_event_dict(
    event_dict: JsonDict,
    internal_metadata_dict: Optional[JsonDict] = None,
 ) -> EventBase:
-    """Takes a fully formed event dict, ensuring that fields like
-    `origin_server_ts` have correct values for a locally produced event,
+    """Takes a fully formed event dict, ensuring that fields like `origin`
+    and `origin_server_ts` have correct values for a locally produced event,
    then signs and hashes it.
    """

@@ -346,6 +319,7 @@ def create_local_event_from_event_dict(
    if format_version == EventFormatVersions.ROOM_V1_V2:
        event_dict["event_id"] = _create_event_id(clock, hostname)

+    event_dict["origin"] = hostname
    event_dict.setdefault("origin_server_ts", time_now)

    event_dict.setdefault("unsigned", {})
@@ -176,12 +176,9 @@ def prune_event_dict(room_version: RoomVersion, event_dict: JsonDict) -> JsonDic
        if room_version.updated_redaction_rules:
            # MSC2176 rules state that create events cannot have their `content` redacted.
            new_content = event_dict["content"]
-        if not room_version.implicit_room_creator:
+        elif not room_version.implicit_room_creator:
            # Some room versions give meaning to `creator`
            add_fields("creator")
-        if room_version.msc4291_room_ids_as_hashes:
-            # room_id is not allowed on the create event as it's derived from the event ID
-            allowed_keys.remove("room_id")

    elif event_type == EventTypes.JoinRules:
        add_fields("join_rule")
@@ -424,21 +421,11 @@ class SerializeEventConfig:
    # False, that state will be removed from the event before it is returned.
    # Otherwise, it will be kept.
    include_stripped_room_state: bool = False
-    # When True, sets unsigned fields to help clients identify events which
-    # only server admins can see through other configuration. For example,
-    # whether an event was soft failed by the server.
-    include_admin_metadata: bool = False


 _DEFAULT_SERIALIZE_EVENT_CONFIG = SerializeEventConfig()


-def make_config_for_admin(existing: SerializeEventConfig) -> SerializeEventConfig:
-    # Set the options which are only available to server admins,
-    # and copy the rest.
-    return attr.evolve(existing, include_admin_metadata=True)
-
-
 def serialize_event(
    e: Union[JsonDict, EventBase],
    time_now_ms: int,
@@ -530,10 +517,6 @@ def serialize_event(
    if config.as_client_event:
        d = config.event_format(d)

-    # Ensure the room_id field is set for create events in MSC4291 rooms
-    if e.type == EventTypes.Create and e.room_version.msc4291_room_ids_as_hashes:
-        d["room_id"] = e.room_id
-
    # If the event is a redaction, the field with the redacted event ID appears
    # in a different location depending on the room version. e.redacts handles
    # fetching from the proper location; copy it to the other location for forwards-
@@ -545,9 +528,6 @@ def serialize_event(
            d["content"] = dict(d["content"])
            d["content"]["redacts"] = e.redacts

-    if config.include_admin_metadata and e.internal_metadata.is_soft_failed():
-        d["unsigned"]["io.element.synapse.soft_failed"] = True
-
    only_event_fields = config.only_event_fields
    if only_event_fields:
        if not isinstance(only_event_fields, list) or not all(
@@ -568,7 +548,6 @@ class EventClientSerializer:

    def __init__(self, hs: "HomeServer") -> None:
        self._store = hs.get_datastores().main
-        self._auth = hs.get_auth()
        self._add_extra_fields_to_unsigned_client_event_callbacks: List[
            ADD_EXTRA_FIELDS_TO_UNSIGNED_CLIENT_EVENT_CALLBACK
        ] = []
@@ -597,15 +576,6 @@ class EventClientSerializer:
        if not isinstance(event, EventBase):
            return event

-        # Force-enable server admin metadata because the only time an event with
-        # relevant metadata will be when the admin requested it via their admin
-        # client config account data. Also, it's "just" some `unsigned` fields, so
-        # shouldn't cause much in terms of problems to downstream consumers.
-        if config.requester is not None and await self._auth.is_server_admin(
-            config.requester
-        ):
-            config = make_config_for_admin(config)
-
        serialized_event = serialize_event(event, time_now, config=config)

        new_unsigned = {}
@@ -876,14 +846,6 @@ def strip_event(event: EventBase) -> JsonDict:
    Stripped state events can only have the `sender`, `type`, `state_key` and `content`
    properties present.
    """
-    # MSC4311: Ensure the create event is available on invites and knocks.
-    # TODO: Implement the rest of MSC4311
-    if (
-        event.room_version.msc4291_room_ids_as_hashes
-        and event.type == EventTypes.Create
-        and event.get_state_key() == ""
-    ):
-        return event.get_pdu_json()

    return {
        "type": event.type,
@@ -67,6 +67,7 @@ class EventValidator:
            "auth_events",
            "content",
            "hashes",
+            "origin",
            "prev_events",
            "sender",
            "type",
@@ -76,6 +77,13 @@ class EventValidator:
            if k not in event:
                raise SynapseError(400, "Event does not have key %s" % (k,))

+        # Check that the following keys have string values
+        event_strings = ["origin"]
+
+        for s in event_strings:
+            if not isinstance(getattr(event, s), str):
+                raise SynapseError(400, "'%s' not a string type" % (s,))
+
        # Depending on the room version, ensure the data is spec compliant JSON.
        if event.room_version.strict_canonicaljson:
            validate_canonicaljson(event.get_pdu_json())
@@ -183,18 +191,8 @@ class EventValidator:
        fields an event would have
        """

-        create_event_as_room_id = (
-            event.room_version.msc4291_room_ids_as_hashes
-            and event.type == EventTypes.Create
-            and hasattr(event, "state_key")
-            and event.state_key == ""
-        )
-
        strings = ["room_id", "sender", "type"]

-        if create_event_as_room_id:
-            strings.remove("room_id")
-
        if hasattr(event, "state_key"):
            strings.append("state_key")

@@ -202,14 +200,7 @@ class EventValidator:
            if not isinstance(getattr(event, s), str):
                raise SynapseError(400, "Not '%s' a string type" % (s,))

-        if not create_event_as_room_id:
-            assert event.room_id is not None
-            RoomID.from_string(event.room_id)
-            if event.room_version.msc4291_room_ids_as_hashes and not RoomID.is_valid(
-                event.room_id
-            ):
-                raise SynapseError(400, f"Invalid room ID '{event.room_id}'")
-
+        RoomID.from_string(event.room_id)
        UserID.from_string(event.sender)

        if event.type == EventTypes.Message:
@@ -322,7 +322,8 @@ def event_from_pdu_json(pdu_json: JsonDict, room_version: RoomVersion) -> EventB
        SynapseError: if the pdu is missing required fields or is otherwise
            not a valid matrix event
    """
-    # we could probably enforce a bunch of other fields here (room_id, sender, etc.)
+    # we could probably enforce a bunch of other fields here (room_id, sender,
+    # origin, etc etc)
    assert_params_in_dict(pdu_json, ("type", "depth"))

    # Strip any unauthorized values from "unsigned" if they exist
@@ -342,21 +343,6 @@ def event_from_pdu_json(pdu_json: JsonDict, room_version: RoomVersion) -> EventB
    if room_version.strict_canonicaljson:
        validate_canonicaljson(pdu_json)

-    # enforce that MSC4291 auth events don't include the create event.
-    # N.B. if they DO include a spurious create event, it'll fail auth checks elsewhere, so we don't
-    # need to do expensive DB lookups to find which event ID is the create event here.
-    if room_version.msc4291_room_ids_as_hashes:
-        room_id = pdu_json.get("room_id")
-        if room_id:
-            create_event_id = "$" + room_id[1:]
-            auth_events = pdu_json.get("auth_events")
-            if auth_events:
-                if create_event_id in auth_events:
-                    raise SynapseError(
-                        400,
-                        "auth_events must not contain the create event",
-                        Codes.BAD_JSON,
-                    )
    event = make_event_from_dict(pdu_json, room_version)
    return event

@@ -137,14 +137,13 @@ class FederationClient(FederationBase):
        self.state = hs.get_state_handler()
        self.transport_layer = hs.get_federation_transport_client()

-        self.server_name = hs.hostname
+        self.hostname = hs.hostname
        self.signing_key = hs.signing_key

        # Cache mapping `event_id` to a tuple of the event itself and the `pull_origin`
        # (which server we pulled the event from)
        self._get_pdu_cache: ExpiringCache[str, Tuple[EventBase, str]] = ExpiringCache(
            cache_name="get_pdu_cache",
-            server_name=self.server_name,
            clock=self._clock,
            max_len=1000,
            expiry_ms=120 * 1000,
@@ -163,7 +162,6 @@ class FederationClient(FederationBase):
            Tuple[JsonDict, Sequence[JsonDict], Sequence[JsonDict], Sequence[str]],
        ] = ExpiringCache(
            cache_name="get_room_hierarchy_cache",
-            server_name=self.server_name,
            clock=self._clock,
            max_len=1000,
            expiry_ms=5 * 60 * 1000,
@@ -1070,7 +1068,7 @@ class FederationClient(FederationBase):
            # there's some we never care about
            ev = builder.create_local_event_from_event_dict(
                self._clock,
-                self.server_name,
+                self.hostname,
                self.signing_key,
                room_version=room_version,
                event_dict=pdu_dict,
@@ -85,6 +85,7 @@ from synapse.logging.opentracing import (
 from synapse.metrics.background_process_metrics import wrap_as_background_process
 from synapse.replication.http.federation import (
    ReplicationFederationSendEduRestServlet,
+    ReplicationGetQueryRestServlet,
 )
 from synapse.storage.databases.main.lock import Lock
 from synapse.storage.databases.main.roommember import extract_heroes_from_room_summary
@@ -159,10 +160,7 @@ class FederationServer(FederationBase):

        # We cache results for transaction with the same ID
        self._transaction_resp_cache: ResponseCache[Tuple[str, str]] = ResponseCache(
-            clock=hs.get_clock(),
-            name="fed_txn_handler",
-            server_name=self.server_name,
-            timeout_ms=30000,
+            hs.get_clock(), "fed_txn_handler", timeout_ms=30000
        )

        self.transaction_actions = TransactionActions(self.store)
@@ -172,18 +170,10 @@ class FederationServer(FederationBase):
        # We cache responses to state queries, as they take a while and often
        # come in waves.
        self._state_resp_cache: ResponseCache[Tuple[str, Optional[str]]] = (
-            ResponseCache(
-                clock=hs.get_clock(),
-                name="state_resp",
-                server_name=self.server_name,
-                timeout_ms=30000,
-            )
+            ResponseCache(hs.get_clock(), "state_resp", timeout_ms=30000)
        )
        self._state_ids_resp_cache: ResponseCache[Tuple[str, str]] = ResponseCache(
-            clock=hs.get_clock(),
-            name="state_ids_resp",
-            server_name=self.server_name,
-            timeout_ms=30000,
+            hs.get_clock(), "state_ids_resp", timeout_ms=30000
        )

        self._federation_metrics_domains = (
@@ -1390,6 +1380,7 @@ class FederationHandlerRegistry:
        # and use them. However we have guards before we use them to ensure that
        # we don't route to ourselves, and in monolith mode that will always be
        # the case.
+        self._get_query_client = ReplicationGetQueryRestServlet.make_client(hs)
        self._send_edu = ReplicationFederationSendEduRestServlet.make_client(hs)

        self.edu_handlers: Dict[str, Callable[[str, dict], Awaitable[None]]] = {}
@@ -1478,6 +1469,10 @@ class FederationHandlerRegistry:
        if handler:
            return await handler(args)

+        # Check if we can route it somewhere else that isn't us
+        if self._instance_name == "master":
+            return await self._get_query_client(query_type=query_type, args=args)
+
        # Uh oh, no handler! Let's raise an exception so the request returns an
        # error.
        logger.warning("No handler registered for query type %s", query_type)
@@ -156,9 +156,7 @@ class FederationRemoteSendQueue(AbstractFederationSender):

    def _clear_queue_before_pos(self, position_to_delete: int) -> None:
        """Clear all the queues from before a given position"""
-        with Measure(
-            self.clock, name="send_queue._clear", server_name=self.server_name
-        ):
+        with Measure(self.clock, "send_queue._clear"):
            # Delete things out of presence maps
            keys = self.presence_destinations.keys()
            i = self.presence_destinations.bisect_left(position_to_delete)
@@ -657,11 +657,7 @@ class FederationSender(AbstractFederationSender):
                    logger.debug(
                        "Handling %i events in room %s", len(events), events[0].room_id
                    )
-                    with Measure(
-                        self.clock,
-                        name="handle_room_events",
-                        server_name=self.server_name,
-                    ):
+                    with Measure(self.clock, "handle_room_events"):
                        for event in events:
                            await handle_event(event)

@@ -129,8 +129,6 @@ class PerDestinationQueue:

        # The stream_ordering of the most recent PDU that was discarded due to
        # being in catch-up mode.
-        # Can be set to zero if no PDU has been discarded since the last time
-        # we queried for new PDUs during catch-up.
        self._catchup_last_skipped: int = 0

        # Cache of the last successfully-transmitted stream ordering for this
@@ -464,18 +462,8 @@ class PerDestinationQueue:
                # of a race condition, so we check that no new events have been
                # skipped due to us being in catch-up mode

-                if (
-                    self._catchup_last_skipped != 0
-                    and self._catchup_last_skipped > last_successful_stream_ordering
-                ):
+                if self._catchup_last_skipped > last_successful_stream_ordering:
                    # another event has been skipped because we were in catch-up mode
-                    # As an exception to this case: we can hit this branch if the
-                    # room has been purged whilst we have been looping.
-                    # In that case we avoid hot-looping by resetting the 'catch-up skipped
-                    # PDU' flag.
-                    # Then if there is still no progress to be made at the next iteration,
-                    # we can exit catch-up mode.
-                    self._catchup_last_skipped = 0
                    continue

                # we are done catching up!
@@ -58,7 +58,7 @@ class TransactionManager:
    """

    def __init__(self, hs: "synapse.server.HomeServer"):
-        self.server_name = hs.hostname  # nb must be called this for @measure_func
+        self._server_name = hs.hostname
        self.clock = hs.get_clock()  # nb must be called this for @measure_func
        self._store = hs.get_datastores().main
        self._transaction_actions = TransactionActions(self._store)
@@ -116,7 +116,7 @@ class TransactionManager:
            transaction = Transaction(
                origin_server_ts=int(self.clock.time_msec()),
                transaction_id=txn_id,
-                origin=self.server_name,
+                origin=self._server_name,
                destination=destination,
                pdus=[p.get_pdu_json() for p in pdus],
                edus=[edu.get_dict() for edu in edus],
@@ -358,7 +358,6 @@ class AdminHandler:
        user_id: str,
        rooms: list,
        requester: JsonMapping,
-        use_admin: bool,
        reason: Optional[str],
        limit: Optional[int],
    ) -> str:
@@ -369,7 +368,6 @@ class AdminHandler:
            user_id: the user ID of the user whose events should be redacted
            rooms: the rooms in which to redact the user's events
            requester: the user requesting the events
-            use_admin: whether to use the admin account to issue the redactions
            reason: reason for requesting the redaction, ie spam, etc
            limit: limit on the number of events in each room to redact

@@ -397,7 +395,6 @@ class AdminHandler:
                "rooms": rooms,
                "requester": requester,
                "user_id": user_id,
-                "use_admin": use_admin,
                "reason": reason,
                "limit": limit,
            },
@@ -429,17 +426,9 @@ class AdminHandler:
        user_id = task.params.get("user_id")
        assert user_id is not None

-        use_admin = task.params.get("use_admin", False)
-
-        # default to puppeting the user unless they are not local or it's been requested to
-        # use the admin user to issue the redactions
-        requester_id = (
-            admin.user.to_string()
-            if use_admin or not self.hs.is_mine_id(user_id)
-            else user_id
-        )
+        # puppet the user if they're ours, otherwise use admin to redact
        requester = create_requester(
-            requester_id,
+            user_id if self.hs.is_mine_id(user_id) else admin.user.to_string(),
            authenticated_entity=admin.user.to_string(),
        )

@@ -73,7 +73,6 @@ events_processed_counter = Counter("synapse_handlers_appservice_events_processed

 class ApplicationServicesHandler:
    def __init__(self, hs: "HomeServer"):
-        self.server_name = hs.hostname
        self.store = hs.get_datastores().main
        self.is_mine_id = hs.is_mine_id
        self.appservice_api = hs.get_application_service_api()
@@ -121,9 +120,7 @@ class ApplicationServicesHandler:

    @wrap_as_background_process("notify_interested_services")
    async def _notify_interested_services(self, max_token: RoomStreamToken) -> None:
-        with Measure(
-            self.clock, name="notify_interested_services", server_name=self.server_name
-        ):
+        with Measure(self.clock, "notify_interested_services"):
            self.is_processing = True
            try:
                upper_bound = -1
@@ -332,11 +329,7 @@ class ApplicationServicesHandler:
        users: Collection[Union[str, UserID]],
    ) -> None:
        logger.debug("Checking interested services for %s", stream_key)
-        with Measure(
-            self.clock,
-            name="notify_interested_services_ephemeral",
-            server_name=self.server_name,
-        ):
+        with Measure(self.clock, "notify_interested_services_ephemeral"):
            for service in services:
                if stream_key == StreamKeyType.TYPING:
                    # Note that we don't persist the token (via set_appservice_stream_type_pos)
@@ -638,8 +631,7 @@ class ApplicationServicesHandler:

        # Fetch the users who have modified their device list since then.
        users_with_changed_device_lists = await self.store.get_all_devices_changed(
-            MultiWriterStreamToken(stream=from_key),
-            to_key=MultiWriterStreamToken(stream=new_key),
+            from_key, to_key=new_key
        )

        # Filter out any users the application service is not interested in
@@ -847,7 +839,7 @@ class ApplicationServicesHandler:

        # user not found; could be the AS though, so check.
        services = self.store.get_app_services()
-        service_list = [s for s in services if s.sender.to_string() == user_id]
+        service_list = [s for s in services if s.sender == user_id]
        return len(service_list) == 0

    async def _check_user_exists(self, user_id: str) -> bool:
@@ -76,7 +76,7 @@ from synapse.storage.databases.main.registration import (
    LoginTokenLookupResult,
    LoginTokenReused,
 )
-from synapse.types import JsonDict, Requester, StrCollection, UserID
+from synapse.types import JsonDict, Requester, UserID
 from synapse.util import stringutils as stringutils
 from synapse.util.async_helpers import delay_cancellation, maybe_awaitable
 from synapse.util.msisdn import phone_number_to_msisdn
@@ -174,7 +174,6 @@ def login_id_phone_to_thirdparty(identifier: JsonDict) -> Dict[str, str]:

    # Accept both "phone" and "number" as valid keys in m.id.phone
    phone_number = identifier.get("phone", identifier["number"])
-    assert isinstance(phone_number, str)

    # Convert user-provided phone number to a consistent representation
    msisdn = phone_number_to_msisdn(identifier["country"], phone_number)
@@ -220,7 +219,6 @@ class AuthHandler:
        self._password_localdb_enabled = hs.config.auth.password_localdb_enabled
        self._third_party_rules = hs.get_module_api_callbacks().third_party_event_rules
        self._account_validity_handler = hs.get_account_validity_handler()
-        self._pusher_pool = hs.get_pusherpool()

        # Ratelimiter for failed auth during UIA. Uses same ratelimit config
        # as per `rc_login.failed_attempts`.
@@ -1549,31 +1547,6 @@ class AuthHandler:
            user_id, (token_id for _, token_id, _ in tokens_and_devices)
        )

-    async def delete_access_tokens_for_devices(
-        self,
-        user_id: str,
-        device_ids: StrCollection,
-    ) -> None:
-        """Invalidate access tokens for the devices
-
-        Args:
-            user_id:  ID of user the tokens belong to
-            device_ids:  ID of device the tokens are associated with.
-                If None, tokens associated with any device (or no device) will
-                be deleted
-        """
-        tokens_and_devices = await self.store.user_delete_access_tokens_for_devices(
-            user_id,
-            device_ids,
-        )
-
-        # see if any modules want to know about this
-        if self.password_auth_provider.on_logged_out_callbacks:
-            for token, _, device_id in tokens_and_devices:
-                await self.password_auth_provider.on_logged_out(
-                    user_id=user_id, device_id=device_id, access_token=token
-                )
-
    async def add_threepid(
        self, user_id: str, medium: str, address: str, validated_at: int
    ) -> None:
@@ -1653,7 +1626,7 @@ class AuthHandler:
        )

        if medium == "email":
-            await self._pusher_pool.remove_pusher(
+            await self.store.delete_pusher_by_app_id_pushkey_user_id(
                app_id="m.email", pushkey=address, user_id=user_id
            )

@@ -378,8 +378,7 @@ class CasHandler:

            # Arbitrarily use the first attribute found.
            display_name = cas_response.attributes.get(
-                self._cas_displayname_attribute,  # type: ignore[arg-type]
-                [None],
+                self._cas_displayname_attribute, [None]
            )[0]

            return UserAttributes(localpart=localpart, display_name=display_name)
@@ -24,10 +24,8 @@ from typing import TYPE_CHECKING, Optional

 from synapse.api.constants import Membership
 from synapse.api.errors import SynapseError
+from synapse.handlers.device import DeviceHandler
 from synapse.metrics.background_process_metrics import run_as_background_process
-from synapse.replication.http.deactivate_account import (
-    ReplicationNotifyAccountDeactivatedServlet,
-)
 from synapse.types import Codes, Requester, UserID, create_requester

 if TYPE_CHECKING:
@@ -47,7 +45,6 @@ class DeactivateAccountHandler:
        self._room_member_handler = hs.get_room_member_handler()
        self._identity_handler = hs.get_identity_handler()
        self._profile_handler = hs.get_profile_handler()
-        self._pusher_pool = hs.get_pusherpool()
        self.user_directory_handler = hs.get_user_directory_handler()
        self._server_name = hs.hostname
        self._third_party_rules = hs.get_module_api_callbacks().third_party_event_rules
@@ -56,16 +53,10 @@ class DeactivateAccountHandler:
        self._user_parter_running = False
        self._third_party_rules = hs.get_module_api_callbacks().third_party_event_rules

-        self._notify_account_deactivated_client = None
-
        # Start the user parter loop so it can resume parting users from rooms where
        # it left off (if it has work left to do).
-        if hs.config.worker.worker_app is None:
+        if hs.config.worker.run_background_tasks:
            hs.get_reactor().callWhenRunning(self._start_user_parting)
-        else:
-            self._notify_account_deactivated_client = (
-                ReplicationNotifyAccountDeactivatedServlet.make_client(hs)
-            )

        self._account_validity_enabled = (
            hs.config.account_validity.account_validity_enabled
@@ -93,6 +84,10 @@ class DeactivateAccountHandler:
        Returns:
            True if identity server supports removing threepids, otherwise False.
        """
+
+        # This can only be called on the main process.
+        assert isinstance(self._device_handler, DeviceHandler)
+
        # Check if this user can be deactivated
        if not await self._third_party_rules.check_can_deactivate_user(
            user_id, by_admin
@@ -155,7 +150,7 @@ class DeactivateAccountHandler:
        # Most of the pushers will have been deleted when we logged out the
        # associated devices above, but we still need to delete pushers not
        # associated with devices, e.g. email pushers.
-        await self._pusher_pool.delete_all_pushers_for_user(user_id)
+        await self.store.delete_all_pushers_for_user(user_id)

        # Add the user to a table of users pending deactivation (ie.
        # removal from all the rooms they're a member of)
@@ -179,6 +174,10 @@ class DeactivateAccountHandler:
            logger.info("Marking %s as erased", user_id)
            await self.store.mark_user_erased(user_id)

+        # Now start the process that goes through that list and
+        # parts users from rooms (if it isn't already running)
+        self._start_user_parting()
+
        # Reject all pending invites and knocks for the user, so that the
        # user doesn't show up in the "invited" section of rooms' members list.
        await self._reject_pending_invites_and_knocks_for_user(user_id)
@@ -193,43 +192,18 @@ class DeactivateAccountHandler:
        # Remove account data (including ignored users and push rules).
        await self.store.purge_account_data_for_user(user_id)

-        # Remove thread subscriptions for the user
-        await self.store.purge_thread_subscription_settings_for_user(user_id)
-
        # Delete any server-side backup keys
        await self.store.bulk_delete_backup_keys_and_versions_for_user(user_id)

-        # Notify modules and start the room parting process.
-        await self.notify_account_deactivated(user_id, by_admin=by_admin)
-
-        return identity_server_supports_unbinding
-
-    async def notify_account_deactivated(
-        self,
-        user_id: str,
-        by_admin: bool = False,
-    ) -> None:
-        """Notify modules and start the room parting process.
-        Goes through replication if this is not the main process.
-        """
-        if self._notify_account_deactivated_client is not None:
-            await self._notify_account_deactivated_client(
-                user_id=user_id,
-                by_admin=by_admin,
-            )
-            return
-
-        # Now start the process that goes through that list and
-        # parts users from rooms (if it isn't already running)
-        self._start_user_parting()
-
        # Let modules know the user has been deactivated.
        await self._third_party_rules.on_user_deactivation_status_changed(
            user_id,
            True,
-            by_admin=by_admin,
+            by_admin,
        )

+        return identity_server_supports_unbinding
+
    async def _reject_pending_invites_and_knocks_for_user(self, user_id: str) -> None:
        """Reject pending invites and knocks addressed to a given user ID.

@@ -54,7 +54,6 @@ logger = logging.getLogger(__name__)

 class DelayedEventsHandler:
    def __init__(self, hs: "HomeServer"):
-        self.server_name = hs.hostname
        self._store = hs.get_datastores().main
        self._storage_controllers = hs.get_storage_controllers()
        self._config = hs.config
@@ -160,9 +159,7 @@ class DelayedEventsHandler:

        # Loop round handling deltas until we're up to date
        while True:
-            with Measure(
-                self._clock, name="delayed_events_delta", server_name=self.server_name
-            ):
+            with Measure(self._clock, "delayed_events_delta"):
                room_max_stream_ordering = self._store.get_room_max_stream_ordering()
                if self._event_pos == room_max_stream_ordering:
                    return
@@ -33,6 +33,9 @@ from synapse.logging.opentracing import (
    log_kv,
    set_tag,
 )
+from synapse.replication.http.devices import (
+    ReplicationMultiUserDevicesResyncRestServlet,
+)
 from synapse.types import JsonDict, Requester, StreamKeyType, UserID, get_domain_from_id
 from synapse.util import json_encoder
 from synapse.util.stringutils import random_string
@@ -53,9 +56,9 @@ class DeviceMessageHandler:
        self.store = hs.get_datastores().main
        self.notifier = hs.get_notifier()
        self.is_mine = hs.is_mine
-        self.device_handler = hs.get_device_handler()
        if hs.config.experimental.msc3814_enabled:
            self.event_sources = hs.get_event_sources()
+            self.device_handler = hs.get_device_handler()

        # We only need to poke the federation sender explicitly if its on the
        # same instance. Other federation sender instances will get notified by
@@ -77,6 +80,18 @@ class DeviceMessageHandler:
                hs.config.worker.writers.to_device,
            )

+        # The handler to call when we think a user's device list might be out of
+        # sync. We do all device list resyncing on the master instance, so if
+        # we're on a worker we hit the device resync replication API.
+        if hs.config.worker.worker_app is None:
+            self._multi_user_device_resync = (
+                hs.get_device_handler().device_list_updater.multi_user_device_resync
+            )
+        else:
+            self._multi_user_device_resync = (
+                ReplicationMultiUserDevicesResyncRestServlet.make_client(hs)
+            )
+
        # a rate limiter for room key requests.  The keys are
        # (sending_user_id, sending_device_id).
        self._ratelimiter = Ratelimiter(
@@ -198,10 +213,7 @@ class DeviceMessageHandler:
            await self.store.mark_remote_users_device_caches_as_stale((sender_user_id,))

            # Immediately attempt a resync in the background
-            run_in_background(
-                self.device_handler.device_list_updater.multi_user_device_resync,
-                user_ids=[sender_user_id],
-            )
+            run_in_background(self._multi_user_device_resync, user_ids=[sender_user_id])

    async def send_device_message(
        self,
@@ -406,7 +406,7 @@ class DirectoryHandler:
        ]

        for service in interested_services:
-            if user_id == service.sender.to_string():
+            if user_id == service.sender:
                # this user IS the app service so they can do whatever they like
                return True
            elif service.is_exclusive_alias(alias.to_string()):
@@ -32,9 +32,10 @@ from twisted.internet import defer

 from synapse.api.constants import EduTypes
 from synapse.api.errors import CodeMessageException, Codes, NotFoundError, SynapseError
-from synapse.handlers.device import DeviceWriterHandler
+from synapse.handlers.device import DeviceHandler
 from synapse.logging.context import make_deferred_yieldable, run_in_background
 from synapse.logging.opentracing import log_kv, set_tag, tag_args, trace
+from synapse.replication.http.devices import ReplicationUploadKeysForUserRestServlet
 from synapse.types import (
    JsonDict,
    JsonMapping,
@@ -75,10 +76,8 @@ class E2eKeysHandler:

        federation_registry = hs.get_federation_registry()

-        # Only the first writer in the list should handle EDUs for signing key
-        # updates, so that we can use an in-memory linearizer instead of worker locks.
-        edu_writer = hs.config.worker.writers.device_lists[0]
-        if hs.get_instance_name() == edu_writer:
+        is_master = hs.config.worker.worker_app is None
+        if is_master:
            edu_updater = SigningKeyEduUpdater(hs)

            # Only register this edu handler on master as it requires writing
@@ -93,14 +92,11 @@ class E2eKeysHandler:
                EduTypes.UNSTABLE_SIGNING_KEY_UPDATE,
                edu_updater.incoming_signing_key_update,
            )
+
+            self.device_key_uploader = self.upload_device_keys_for_user
        else:
-            federation_registry.register_instances_for_edu(
-                EduTypes.SIGNING_KEY_UPDATE,
-                [edu_writer],
-            )
-            federation_registry.register_instances_for_edu(
-                EduTypes.UNSTABLE_SIGNING_KEY_UPDATE,
-                [edu_writer],
+            self.device_key_uploader = (
+                ReplicationUploadKeysForUserRestServlet.make_client(hs)
            )

        # doesn't really work as part of the generic query API, because the
@@ -851,7 +847,7 @@ class E2eKeysHandler:
        # TODO: Validate the JSON to make sure it has the right keys.
        device_keys = keys.get("device_keys", None)
        if device_keys:
-            await self.upload_device_keys_for_user(
+            await self.device_key_uploader(
                user_id=user_id,
                device_id=device_id,
                keys={"device_keys": device_keys},
@@ -908,6 +904,9 @@ class E2eKeysHandler:
            device_keys: the `device_keys` of an /keys/upload request.

        """
+        # This can only be called from the main process.
+        assert isinstance(self.device_handler, DeviceHandler)
+
        time_now = self.clock.time_msec()

        device_keys = keys["device_keys"]
@@ -999,6 +998,9 @@ class E2eKeysHandler:
            user_id: the user uploading the keys
            keys: the signing keys
        """
+        # This can only be called from the main process.
+        assert isinstance(self.device_handler, DeviceHandler)
+
        # if a master key is uploaded, then check it.  Otherwise, load the
        # stored master key, to check signatures on other keys
        if "master_key" in keys:
@@ -1089,6 +1091,9 @@ class E2eKeysHandler:
        Raises:
            SynapseError: if the signatures dict is not valid.
        """
+        # This can only be called from the main process.
+        assert isinstance(self.device_handler, DeviceHandler)
+
        failures = {}

        # signatures to be stored.  Each item will be a SignatureListItem
@@ -1462,6 +1467,9 @@ class E2eKeysHandler:
            A tuple of the retrieved key content, the key's ID and the matching VerifyKey.
            If the key cannot be retrieved, all values in the tuple will instead be None.
        """
+        # This can only be called from the main process.
+        assert isinstance(self.device_handler, DeviceHandler)
+
        try:
            remote_result = await self.federation.query_user_devices(
                user.domain, user.to_string()
@@ -1762,7 +1770,7 @@ class SigningKeyEduUpdater:
        self.clock = hs.get_clock()

        device_handler = hs.get_device_handler()
-        assert isinstance(device_handler, DeviceWriterHandler)
+        assert isinstance(device_handler, DeviceHandler)
        self._device_handler = device_handler

        self._remote_edu_linearizer = Linearizer(name="remote_signing_key")
@@ -23,8 +23,6 @@ from typing import TYPE_CHECKING, List, Mapping, Optional, Union

 from synapse import event_auth
 from synapse.api.constants import (
-    CREATOR_POWER_LEVEL,
-    EventContentFields,
    EventTypes,
    JoinRules,
    Membership,
@@ -143,8 +141,6 @@ class EventAuthHandler:
        Raises:
            SynapseError if no appropriate user is found.
        """
-        create_event_id = current_state_ids[(EventTypes.Create, "")]
-        create_event = await self._store.get_event(create_event_id)
        power_level_event_id = current_state_ids.get((EventTypes.PowerLevels, ""))
        invite_level = 0
        users_default_level = 0
@@ -160,28 +156,15 @@ class EventAuthHandler:

        # Find the user with the highest power level (only interested in local
        # users).
-        user_power_level = 0
-        chosen_user = None
        local_users_in_room = await self._store.get_local_users_in_room(room_id)
-        if create_event.room_version.msc4289_creator_power_enabled:
-            creators = set(
-                create_event.content.get(EventContentFields.ADDITIONAL_CREATORS, [])
-            )
-            creators.add(create_event.sender)
-            local_creators = creators.intersection(set(local_users_in_room))
-            if len(local_creators) > 0:
-                chosen_user = local_creators.pop()  # random creator
-                user_power_level = CREATOR_POWER_LEVEL
-        else:
-            chosen_user = max(
-                local_users_in_room,
-                key=lambda user: users.get(user, users_default_level),
-                default=None,
-            )
-            # Return the chosen if they can issue invites.
-            if chosen_user:
-                user_power_level = users.get(chosen_user, users_default_level)
+        chosen_user = max(
+            local_users_in_room,
+            key=lambda user: users.get(user, users_default_level),
+            default=None,
+        )

+        # Return the chosen if they can issue invites.
+        user_power_level = users.get(chosen_user, users_default_level)
        if chosen_user and user_power_level >= invite_level:
            logger.debug(
                "Found a user who can issue invites  %s with power level %d >= invite level %d",
@@ -73,6 +73,10 @@ from synapse.logging.context import nested_logging_context
 from synapse.logging.opentracing import SynapseTags, set_tag, tag_args, trace
 from synapse.metrics.background_process_metrics import run_as_background_process
 from synapse.module_api import NOT_SPAM
+from synapse.replication.http.federation import (
+    ReplicationCleanRoomRestServlet,
+    ReplicationStoreRoomOnOutlierMembershipRestServlet,
+)
 from synapse.storage.databases.main.events_worker import EventRedactBehaviour
 from synapse.storage.invite_rule import InviteRule
 from synapse.types import JsonDict, StrCollection, get_domain_from_id
@@ -159,6 +163,19 @@ class FederationHandler:
        self._notifier = hs.get_notifier()
        self._worker_locks = hs.get_worker_locks_handler()

+        self._clean_room_for_join_client = ReplicationCleanRoomRestServlet.make_client(
+            hs
+        )
+
+        if hs.config.worker.worker_app:
+            self._maybe_store_room_on_outlier_membership = (
+                ReplicationStoreRoomOnOutlierMembershipRestServlet.make_client(hs)
+            )
+        else:
+            self._maybe_store_room_on_outlier_membership = (
+                self.store.maybe_store_room_on_outlier_membership
+            )
+
        self._room_backfill = Linearizer("room_backfill")

        self._third_party_event_rules = (
@@ -630,7 +647,7 @@ class FederationHandler:
            #    room.
            # In short, the races either have an acceptable outcome or should be
            # impossible.
-            await self.store.clean_room_for_join(room_id)
+            await self._clean_room_for_join(room_id)

        try:
            # Try the host we successfully got a response to /make_join/
@@ -698,19 +715,10 @@ class FederationHandler:
                    #     We may want to reset the partial state info if it's from an
                    #     old, failed partial state join.
                    #     https://github.com/matrix-org/synapse/issues/13000
-
-                    # FIXME: Ideally, we would store the full stream token here
-                    # not just the minimum stream ID, so that we can compute an
-                    # accurate list of device changes when un-partial-ing the
-                    # room. The only side effect of this is that we may send
-                    # extra unecessary device list outbound pokes through
-                    # federation, which is harmless.
-                    device_lists_stream_id = self.store.get_device_stream_token().stream
-
                    await self.store.store_partial_state_room(
                        room_id=room_id,
                        servers=ret.servers_in_room,
-                        device_lists_stream_id=device_lists_stream_id,
+                        device_lists_stream_id=self.store.get_device_stream_token(),
                        joined_via=origin,
                    )

@@ -849,7 +857,7 @@ class FederationHandler:
        event.internal_metadata.out_of_band_membership = True

        # Record the room ID and its version so that we have a record of the room
-        await self.store.maybe_store_room_on_outlier_membership(
+        await self._maybe_store_room_on_outlier_membership(
            room_id=event.room_id, room_version=event_format_version
        )

@@ -1054,8 +1062,8 @@ class FederationHandler:
        if self.hs.config.server.block_non_admin_invites:
            raise SynapseError(403, "This server does not accept room invites")

-        spam_check = (
-            await self._spam_checker_module_callbacks.federated_user_may_invite(event)
+        spam_check = await self._spam_checker_module_callbacks.user_may_invite(
+            event.sender, event.state_key, event.room_id
        )
        if spam_check != NOT_SPAM:
            raise SynapseError(
@@ -1107,7 +1115,7 @@ class FederationHandler:
        # keep a record of the room version, if we don't yet know it.
        # (this may get overwritten if we later get a different room version in a
        # join dance).
-        await self.store.maybe_store_room_on_outlier_membership(
+        await self._maybe_store_room_on_outlier_membership(
            room_id=event.room_id, room_version=room_version
        )

@@ -1753,6 +1761,18 @@ class FederationHandler:
        if "valid" not in response or not response["valid"]:
            raise AuthError(403, "Third party certificate was invalid")

+    async def _clean_room_for_join(self, room_id: str) -> None:
+        """Called to clean up any data in DB for a given room, ready for the
+        server to join the room.
+
+        Args:
+            room_id
+        """
+        if self.config.worker.worker_app:
+            await self._clean_room_for_join_client(room_id)
+        else:
+            await self.store.clean_room_for_join(room_id)
+
    async def get_room_complexity(
        self, remote_room_hosts: List[str], room_id: str
    ) -> Optional[dict]:
@@ -77,6 +77,9 @@ from synapse.logging.opentracing import (
    trace,
 )
 from synapse.metrics.background_process_metrics import run_as_background_process
+from synapse.replication.http.devices import (
+    ReplicationMultiUserDevicesResyncRestServlet,
+)
 from synapse.replication.http.federation import (
    ReplicationFederationSendEventsRestServlet,
 )
@@ -177,7 +180,12 @@ class FederationEventHandler:
        self._ephemeral_messages_enabled = hs.config.server.enable_ephemeral_messages

        self._send_events = ReplicationFederationSendEventsRestServlet.make_client(hs)
-        self._device_list_updater = hs.get_device_handler().device_list_updater
+        if hs.config.worker.worker_app:
+            self._multi_user_device_resync = (
+                ReplicationMultiUserDevicesResyncRestServlet.make_client(hs)
+            )
+        else:
+            self._device_list_updater = hs.get_device_handler().device_list_updater

        # When joining a room we need to queue any events for that room up.
        # For each room, a list of (pdu, origin) tuples.
@@ -1536,7 +1544,12 @@ class FederationEventHandler:
            await self._store.mark_remote_users_device_caches_as_stale((sender,))

            # Immediately attempt a resync in the background
-            await self._device_list_updater.multi_user_device_resync(user_ids=[sender])
+            if self._config.worker.worker_app:
+                await self._multi_user_device_resync(user_ids=[sender])
+            else:
+                await self._device_list_updater.multi_user_device_resync(
+                    user_ids=[sender]
+                )
        except Exception:
            logger.exception("Failed to resync device for %s", sender)

@@ -60,7 +60,6 @@ logger = logging.getLogger(__name__)

 class InitialSyncHandler:
    def __init__(self, hs: "HomeServer"):
-        self.server_name = hs.hostname
        self.store = hs.get_datastores().main
        self.auth = hs.get_auth()
        self.state_handler = hs.get_state_handler()
@@ -78,11 +77,7 @@ class InitialSyncHandler:
                bool,
                bool,
            ]
-        ] = ResponseCache(
-            clock=hs.get_clock(),
-            name="initial_sync_cache",
-            server_name=self.server_name,
-        )
+        ] = ResponseCache(hs.get_clock(), "initial_sync_cache")
        self._event_serializer = hs.get_event_client_serializer()
        self._storage_controllers = hs.get_storage_controllers()
        self._state_storage_controller = self._storage_controllers.state
@@ -22,7 +22,7 @@
 import logging
 import random
 from http import HTTPStatus
-from typing import TYPE_CHECKING, Any, Dict, List, Mapping, Optional, Sequence, Tuple
+from typing import TYPE_CHECKING, Any, Dict, List, Mapping, Optional, Tuple

 from canonicaljson import encode_canonical_json

@@ -55,11 +55,7 @@ from synapse.api.urls import ConsentURIBuilder
 from synapse.event_auth import validate_event_for_room_version
 from synapse.events import EventBase, relation_from_event
 from synapse.events.builder import EventBuilder
-from synapse.events.snapshot import (
-    EventContext,
-    UnpersistedEventContext,
-    UnpersistedEventContextBase,
-)
+from synapse.events.snapshot import EventContext, UnpersistedEventContextBase
 from synapse.events.utils import SerializeEventConfig, maybe_upsert_event_field
 from synapse.events.validator import EventValidator
 from synapse.handlers.directory import DirectoryHandler
@@ -71,7 +67,6 @@ from synapse.replication.http.send_event import ReplicationSendEventRestServlet
 from synapse.replication.http.send_events import ReplicationSendEventsRestServlet
 from synapse.storage.databases.main.events_worker import EventRedactBehaviour
 from synapse.types import (
-    JsonDict,
    PersistedEventPosition,
    Requester,
    RoomAlias,
@@ -81,7 +76,13 @@ from synapse.types import (
    create_requester,
 )
 from synapse.types.state import StateFilter
-from synapse.util import json_decoder, json_encoder, log_failure, unwrapFirstError
+from synapse.util import (
+    Duration,
+    json_decoder,
+    json_encoder,
+    log_failure,
+    unwrapFirstError,
+)
 from synapse.util.async_helpers import Linearizer, gather_results
 from synapse.util.caches.expiringcache import ExpiringCache
 from synapse.util.metrics import measure_func
@@ -481,16 +482,16 @@ _DUMMY_EVENT_ROOM_EXCLUSION_EXPIRY = 7 * 24 * 60 * 60 * 1000
 class EventCreationHandler:
    def __init__(self, hs: "HomeServer"):
        self.hs = hs
-        self.validator = EventValidator()
-        self.event_builder_factory = hs.get_event_builder_factory()
-        self.server_name = hs.hostname  # nb must be called this for @measure_func
-        self.clock = hs.get_clock()  # nb must be called this for @measure_func
        self.auth_blocking = hs.get_auth_blocking()
        self._event_auth_handler = hs.get_event_auth_handler()
        self.store = hs.get_datastores().main
        self._storage_controllers = hs.get_storage_controllers()
        self.state = hs.get_state_handler()
+        self.clock = hs.get_clock()
+        self.validator = EventValidator()
        self.profile_handler = hs.get_profile_handler()
+        self.event_builder_factory = hs.get_event_builder_factory()
+        self.server_name = hs.hostname
        self.notifier = hs.get_notifier()
        self.config = hs.config
        self.require_membership_for_aliases = (
@@ -511,7 +512,13 @@ class EventCreationHandler:

        # We limit concurrent event creation for a room to 1. This prevents state resolution
        # from occurring when sending bursts of events to a local room
-        self.limiter = Linearizer(max_count=1, name="room_event_creation_limit")
+        self.limiter = Linearizer(
+            max_count=1,
+            name="room_event_creation_limit",
+            # We timeout queued requests after 90 seconds, as the client will
+            # likely have timed out by then.
+            timeout=90 * Duration.SECOND_MS,
+        )

        self._bulk_push_rule_evaluator = hs.get_bulk_push_rule_evaluator()

@@ -563,9 +570,8 @@ class EventCreationHandler:
        self._external_cache_joined_hosts_updates: Optional[ExpiringCache] = None
        if self._external_cache.is_enabled():
            self._external_cache_joined_hosts_updates = ExpiringCache(
-                cache_name="_external_cache_joined_hosts_updates",
-                server_name=self.server_name,
-                clock=self.clock,
+                "_external_cache_joined_hosts_updates",
+                self.clock,
                expiry_ms=30 * 60 * 1000,
            )

@@ -574,6 +580,7 @@ class EventCreationHandler:
        requester: Requester,
        event_dict: dict,
        txn_id: Optional[str] = None,
+        allow_no_prev_events: bool = False,
        prev_event_ids: Optional[List[str]] = None,
        auth_event_ids: Optional[List[str]] = None,
        state_event_ids: Optional[List[str]] = None,
@@ -599,6 +606,10 @@ class EventCreationHandler:
            requester
            event_dict: An entire event
            txn_id
+            allow_no_prev_events: Whether to allow this event to be created an empty
+                list of prev_events. Normally this is prohibited just because most
+                events should have a prev_event and we should only use this in special
+                cases (previously useful for MSC2716).
            prev_event_ids:
                the forward extremities to use as the prev_events for the
                new event.
@@ -679,10 +690,7 @@ class EventCreationHandler:
                    Codes.USER_ACCOUNT_SUSPENDED,
                )

-        is_create_event = (
-            event_dict["type"] == EventTypes.Create and event_dict["state_key"] == ""
-        )
-        if is_create_event:
+        if event_dict["type"] == EventTypes.Create and event_dict["state_key"] == "":
            room_version_id = event_dict["content"]["room_version"]
            maybe_room_version_obj = KNOWN_ROOM_VERSIONS.get(room_version_id)
            if not maybe_room_version_obj:
@@ -721,6 +729,7 @@ class EventCreationHandler:
        event, unpersisted_context = await self.create_new_client_event(
            builder=builder,
            requester=requester,
+            allow_no_prev_events=allow_no_prev_events,
            prev_event_ids=prev_event_ids,
            auth_event_ids=auth_event_ids,
            state_event_ids=state_event_ids,
@@ -788,7 +797,6 @@ class EventCreationHandler:
        """
        # the only thing the user can do is join the server notices room.
        if builder.type == EventTypes.Member:
-            assert builder.room_id is not None
            membership = builder.content.get("membership", None)
            if membership == Membership.JOIN:
                return await self.store.is_server_notice_room(builder.room_id)
@@ -949,6 +957,7 @@ class EventCreationHandler:
        self,
        requester: Requester,
        event_dict: dict,
+        allow_no_prev_events: bool = False,
        prev_event_ids: Optional[List[str]] = None,
        state_event_ids: Optional[List[str]] = None,
        ratelimit: bool = True,
@@ -965,6 +974,10 @@ class EventCreationHandler:
        Args:
            requester: The requester sending the event.
            event_dict: An entire event.
+            allow_no_prev_events: Whether to allow this event to be created an empty
+                list of prev_events. Normally this is prohibited just because most
+                events should have a prev_event and we should only use this in special
+                cases (previously useful for MSC2716).
            prev_event_ids:
                The event IDs to use as the prev events.
                Should normally be left as None to automatically request them
@@ -1050,6 +1063,7 @@ class EventCreationHandler:
            return await self._create_and_send_nonmember_event_locked(
                requester=requester,
                event_dict=event_dict,
+                allow_no_prev_events=allow_no_prev_events,
                prev_event_ids=prev_event_ids,
                state_event_ids=state_event_ids,
                ratelimit=ratelimit,
@@ -1063,6 +1077,7 @@ class EventCreationHandler:
        self,
        requester: Requester,
        event_dict: dict,
+        allow_no_prev_events: bool = False,
        prev_event_ids: Optional[List[str]] = None,
        state_event_ids: Optional[List[str]] = None,
        ratelimit: bool = True,
@@ -1094,6 +1109,7 @@ class EventCreationHandler:
                    requester,
                    event_dict,
                    txn_id=txn_id,
+                    allow_no_prev_events=allow_no_prev_events,
                    prev_event_ids=prev_event_ids,
                    state_event_ids=state_event_ids,
                    outlier=outlier,
@@ -1176,6 +1192,7 @@ class EventCreationHandler:
        self,
        builder: EventBuilder,
        requester: Optional[Requester] = None,
+        allow_no_prev_events: bool = False,
        prev_event_ids: Optional[List[str]] = None,
        auth_event_ids: Optional[List[str]] = None,
        state_event_ids: Optional[List[str]] = None,
@@ -1195,6 +1212,10 @@ class EventCreationHandler:
        Args:
            builder:
            requester:
+            allow_no_prev_events: Whether to allow this event to be created an empty
+                list of prev_events. Normally this is prohibited just because most
+                events should have a prev_event and we should only use this in special
+                cases (previously useful for MSC2716).
            prev_event_ids:
                the forward extremities to use as the prev_events for the
                new event.
@@ -1232,6 +1253,7 @@ class EventCreationHandler:
        if state_event_ids is not None:
            # Do a quick check to make sure that prev_event_ids is present to
            # make the type-checking around `builder.build` happy.
+            # prev_event_ids could be an empty array though.
            assert prev_event_ids is not None

            temp_event = await builder.build(
@@ -1251,49 +1273,32 @@ class EventCreationHandler:
                for_verification=False,
            )

-        if (
-            builder.room_version.msc4291_room_ids_as_hashes
-            and builder.type == EventTypes.Create
-            and builder.is_state()
-        ):
-            if builder.room_id is not None:
-                raise SynapseError(
-                    400,
-                    "Cannot resend m.room.create event",
-                    Codes.INVALID_PARAM,
-                )
-        else:
-            assert builder.room_id is not None
-
        if prev_event_ids is not None:
            assert len(prev_event_ids) <= 10, (
                "Attempting to create an event with %i prev_events"
                % (len(prev_event_ids),)
            )
        else:
-            if builder.room_id:
-                prev_event_ids = await self.store.get_prev_events_for_room(
-                    builder.room_id
-                )
-            else:
-                prev_event_ids = []  # can only happen for the create event in MSC4291 rooms
+            prev_event_ids = await self.store.get_prev_events_for_room(builder.room_id)

-        if builder.type == EventTypes.Create and builder.is_state():
-            if len(prev_event_ids) != 0:
-                raise SynapseError(
-                    400,
-                    "Cannot resend m.room.create event",
-                    Codes.INVALID_PARAM,
-                )
-
-        # We now ought to have some `prev_events` (unless it's a create event).
-        #
        # Do a quick sanity check here, rather than waiting until we've created the
        # event and then try to auth it (which fails with a somewhat confusing "No
        # create event in auth events")
-        assert builder.type == EventTypes.Create or len(prev_event_ids) > 0, (
-            "Attempting to create an event with no prev_events"
-        )
+        if allow_no_prev_events:
+            # We allow events with no `prev_events` but it better have some `auth_events`
+            assert (
+                builder.type == EventTypes.Create
+                # Allow an event to have empty list of prev_event_ids
+                # only if it has auth_event_ids.
+                or auth_event_ids
+            ), (
+                "Attempting to create a non-m.room.create event with no prev_events or auth_event_ids"
+            )
+        else:
+            # we now ought to have some prev_events (unless it's a create event).
+            assert builder.type == EventTypes.Create or prev_event_ids, (
+                "Attempting to create a non-m.room.create event with no prev_events"
+            )

        if for_batch:
            assert prev_event_ids is not None
@@ -1544,98 +1549,6 @@ class EventCreationHandler:

        return result

-    async def create_and_send_new_client_events(
-        self,
-        requester: Requester,
-        room_id: str,
-        prev_event_id: Optional[str],
-        event_dicts: Sequence[JsonDict],
-        ratelimit: bool = True,
-        ignore_shadow_ban: bool = False,
-    ) -> None:
-        """Helper to create and send a batch of new client events.
-
-        This supports sending membership events in very limited circumstances
-        (namely that the event is valid as is and doesn't need federation
-        requests or anything). Callers should prefer to use `update_membership`,
-        which correctly handles membership events in all cases. We allow
-        sending membership events here as its useful when copying e.g. bans
-        between rooms.
-
-        All other events and state events are supported.
-
-        Args:
-            requester: The requester sending the events.
-            room_id: The room ID to send the events in.
-            prev_event_id: The event ID to use as the previous event for the first
-                of the events, must have already been persisted.
-            event_dicts: A sequence of event dictionaries to create and send.
-            ratelimit: Whether to rate limit this send.
-            ignore_shadow_ban: True if shadow-banned users should be allowed to
-                send these events.
-        """
-
-        if not event_dicts:
-            # Nothing to do.
-            return
-
-        if prev_event_id is None:
-            # Pick the latest forward extremity as the previous event ID.
-            prev_event_ids = await self.store.get_forward_extremities_for_room(room_id)
-            prev_event_ids.sort(key=lambda x: x[2])  # Sort by depth.
-            prev_event_id = prev_event_ids[-1][0]
-
-        state_groups = await self._storage_controllers.state.get_state_group_for_events(
-            [prev_event_id]
-        )
-        if prev_event_id not in state_groups:
-            # This should only happen if we got passed a prev event ID that
-            # hasn't been persisted yet.
-            raise Exception("Previous event ID not found ")
-
-        current_state_group = state_groups[prev_event_id]
-        state_map = await self._storage_controllers.state.get_state_ids_for_group(
-            current_state_group
-        )
-
-        events_and_contexts_to_send = []
-        state_map = dict(state_map)
-        depth = None
-
-        for event_dict in event_dicts:
-            event, context = await self.create_event(
-                requester=requester,
-                event_dict=event_dict,
-                prev_event_ids=[prev_event_id],
-                depth=depth,
-                # Take a copy to ensure each event gets a unique copy of
-                # state_map since it is modified below.
-                state_map=dict(state_map),
-                for_batch=True,
-            )
-            events_and_contexts_to_send.append((event, context))
-
-            prev_event_id = event.event_id
-            depth = event.depth + 1
-            if event.is_state():
-                # If this is a state event, we need to update the state map
-                # so that it can be used for the next event.
-                state_map[(event.type, event.state_key)] = event.event_id
-
-        datastore = self.hs.get_datastores().state
-        events_and_context = (
-            await UnpersistedEventContext.batch_persist_unpersisted_contexts(
-                events_and_contexts_to_send, room_id, current_state_group, datastore
-            )
-        )
-
-        await self.handle_new_client_event(
-            requester,
-            events_and_context,
-            ignore_shadow_ban=ignore_shadow_ban,
-            ratelimit=ratelimit,
-        )
-
    async def _persist_events(
        self,
        requester: Requester,
@@ -2252,7 +2165,6 @@ class EventCreationHandler:
                original_event.room_version, third_party_result
            )
            self.validator.validate_builder(builder)
-            assert builder.room_id is not None
        except SynapseError as e:
            raise Exception(
                "Third party rules module created an invalid event: " + e.msg,
@@ -747,7 +747,6 @@ class WorkerPresenceHandler(BasePresenceHandler):
 class PresenceHandler(BasePresenceHandler):
    def __init__(self, hs: "HomeServer"):
        super().__init__(hs)
-        self.server_name = hs.hostname
        self.wheel_timer: WheelTimer[str] = WheelTimer()
        self.notifier = hs.get_notifier()

@@ -942,9 +941,7 @@ class PresenceHandler(BasePresenceHandler):

        now = self.clock.time_msec()

-        with Measure(
-            self.clock, name="presence_update_states", server_name=self.server_name
-        ):
+        with Measure(self.clock, "presence_update_states"):
            # NOTE: We purposefully don't await between now and when we've
            # calculated what we want to do with the new states, to avoid races.

@@ -1408,7 +1405,7 @@ class PresenceHandler(BasePresenceHandler):
        # Based on the state of each user's device calculate the new presence state.
        presence = _combine_device_states(devices.values())

-        new_fields: JsonDict = {"state": presence}
+        new_fields = {"state": presence}

        if presence == PresenceState.ONLINE or presence == PresenceState.BUSY:
            new_fields["last_active_ts"] = now
@@ -1500,9 +1497,7 @@ class PresenceHandler(BasePresenceHandler):
    async def _unsafe_process(self) -> None:
        # Loop round handling deltas until we're up to date
        while True:
-            with Measure(
-                self.clock, name="presence_delta", server_name=self.server_name
-            ):
+            with Measure(self.clock, "presence_delta"):
                room_max_stream_ordering = self.store.get_room_max_stream_ordering()
                if self._event_pos == room_max_stream_ordering:
                    return
@@ -1764,7 +1759,6 @@ class PresenceEventSource(EventSource[int, UserPresenceState]):
        # Same with get_presence_router:
        #
        #   AuthHandler -> Notifier -> PresenceEventSource -> ModuleApi -> AuthHandler
-        self.server_name = hs.hostname
        self.get_presence_handler = hs.get_presence_handler
        self.get_presence_router = hs.get_presence_router
        self.clock = hs.get_clock()
@@ -1798,9 +1792,7 @@ class PresenceEventSource(EventSource[int, UserPresenceState]):
        user_id = user.to_string()
        stream_change_cache = self.store.presence_stream_cache

-        with Measure(
-            self.clock, name="presence.get_new_events", server_name=self.server_name
-        ):
+        with Measure(self.clock, "presence.get_new_events"):
            if from_key is not None:
                from_key = int(from_key)

@@ -55,7 +55,6 @@ class ProfileHandler:
    """

    def __init__(self, hs: "HomeServer"):
-        self.server_name = hs.hostname  # nb must be called this for @cached
        self.store = hs.get_datastores().main
        self.clock = hs.get_clock()
        self.hs = hs
@@ -93,7 +92,9 @@ class ProfileHandler:

        if self.hs.is_mine(target_user):
            profileinfo = await self.store.get_profileinfo(target_user)
-            extra_fields = await self.store.get_profile_fields(target_user)
+            extra_fields = {}
+            if self.hs.config.experimental.msc4133_enabled:
+                extra_fields = await self.store.get_profile_fields(target_user)

            if (
                profileinfo.display_name is None
@@ -538,27 +539,21 @@ class ProfileHandler:
        response: JsonDict = {}
        try:
            if just_field is None or just_field == ProfileFields.DISPLAYNAME:
-                displayname = await self.store.get_profile_displayname(user)
-                # do not set the displayname field if it is None,
-                # since then we send a null in the JSON response
-                if displayname is not None:
-                    response["displayname"] = displayname
-            if just_field is None or just_field == ProfileFields.AVATAR_URL:
-                avatar_url = await self.store.get_profile_avatar_url(user)
-                # do not set the avatar_url field if it is None,
-                # since then we send a null in the JSON response
-                if avatar_url is not None:
-                    response["avatar_url"] = avatar_url
+                response["displayname"] = await self.store.get_profile_displayname(user)

-            if just_field is None:
-                response.update(await self.store.get_profile_fields(user))
-            elif just_field not in (
-                ProfileFields.DISPLAYNAME,
-                ProfileFields.AVATAR_URL,
-            ):
-                response[just_field] = await self.store.get_profile_field(
-                    user, just_field
-                )
+            if just_field is None or just_field == ProfileFields.AVATAR_URL:
+                response["avatar_url"] = await self.store.get_profile_avatar_url(user)
+
+            if self.hs.config.experimental.msc4133_enabled:
+                if just_field is None:
+                    response.update(await self.store.get_profile_fields(user))
+                elif just_field not in (
+                    ProfileFields.DISPLAYNAME,
+                    ProfileFields.AVATAR_URL,
+                ):
+                    response[just_field] = await self.store.get_profile_field(
+                        user, just_field
+                    )
        except StoreError as e:
            if e.code == 404:
                raise SynapseError(404, "Profile was not found", Codes.NOT_FOUND)
@@ -44,10 +44,12 @@ from synapse.api.errors import (
 )
 from synapse.appservice import ApplicationService
 from synapse.config.server import is_threepid_reserved
+from synapse.handlers.device import DeviceHandler
 from synapse.http.servlet import assert_params_in_dict
 from synapse.replication.http.login import RegisterDeviceReplicationServlet
 from synapse.replication.http.register import (
    ReplicationPostRegisterActionsServlet,
+    ReplicationRegisterServlet,
 )
 from synapse.spam_checker_api import RegistrationBehaviour
 from synapse.types import GUEST_USER_ID_PATTERN, RoomAlias, UserID, create_requester
@@ -118,6 +120,7 @@ class RegistrationHandler:
        self._spam_checker_module_callbacks = hs.get_module_api_callbacks().spam_checker

        if hs.config.worker.worker_app:
+            self._register_client = ReplicationRegisterServlet.make_client(hs)
            self._register_device_client = RegisterDeviceReplicationServlet.make_client(
                hs
            )
@@ -556,7 +559,7 @@ class RegistrationHandler:
                        if join_rules_event:
                            join_rule = join_rules_event.content.get("join_rule", None)
                            requires_invite = (
-                                join_rule is not None and join_rule != JoinRules.PUBLIC
+                                join_rule and join_rule != JoinRules.PUBLIC
                            )

                # Send the invite, if necessary.
@@ -735,20 +738,37 @@ class RegistrationHandler:
            shadow_banned: Whether to shadow-ban the user
            approved: Whether to mark the user as approved by an administrator
        """
-        await self.store.register_user(
-            user_id=user_id,
-            password_hash=password_hash,
-            was_guest=was_guest,
-            make_guest=make_guest,
-            appservice_id=appservice_id,
-            create_profile_with_displayname=create_profile_with_displayname,
-            admin=admin,
-            user_type=user_type,
-            shadow_banned=shadow_banned,
-            approved=approved,
-        )
+        if self.hs.config.worker.worker_app:
+            await self._register_client(
+                user_id=user_id,
+                password_hash=password_hash,
+                was_guest=was_guest,
+                make_guest=make_guest,
+                appservice_id=appservice_id,
+                create_profile_with_displayname=create_profile_with_displayname,
+                admin=admin,
+                user_type=user_type,
+                address=address,
+                shadow_banned=shadow_banned,
+                approved=approved,
+            )
+        else:
+            await self.store.register_user(
+                user_id=user_id,
+                password_hash=password_hash,
+                was_guest=was_guest,
+                make_guest=make_guest,
+                appservice_id=appservice_id,
+                create_profile_with_displayname=create_profile_with_displayname,
+                admin=admin,
+                user_type=user_type,
+                shadow_banned=shadow_banned,
+                approved=approved,
+            )

-        await self._account_validity_handler.on_user_registration(user_id)
+            # Only call the account validity module(s) on the main process, to avoid
+            # repeating e.g. database writes on all of the workers.
+            await self._account_validity_handler.on_user_registration(user_id)

    async def register_device(
        self,
@@ -839,6 +859,9 @@ class RegistrationHandler:
        refresh_token = None
        refresh_token_id = None

+        # This can only run on the main process.
+        assert isinstance(self.device_handler, DeviceHandler)
+
        registered_device_id = await self.device_handler.check_device_registered(
            user_id,
            device_id,
@@ -51,7 +51,6 @@ from synapse.api.constants import (
    HistoryVisibility,
    JoinRules,
    Membership,
-    MTextFields,
    RoomCreationPreset,
    RoomEncryptionAlgorithms,
    RoomTypes,
@@ -81,7 +80,6 @@ from synapse.types import (
    Requester,
    RoomAlias,
    RoomID,
-    RoomIdWithDomain,
    RoomStreamToken,
    StateMap,
    StrCollection,
@@ -93,9 +91,7 @@ from synapse.types import (
 from synapse.types.handlers import ShutdownRoomParams, ShutdownRoomResponse
 from synapse.types.state import StateFilter
 from synapse.util import stringutils
-from synapse.util.async_helpers import concurrently_execute
 from synapse.util.caches.response_cache import ResponseCache
-from synapse.util.iterutils import batch_iter
 from synapse.util.stringutils import parse_and_validate_server_name
 from synapse.visibility import filter_events_for_client

@@ -122,7 +118,6 @@ class EventContext:

 class RoomCreationHandler:
    def __init__(self, hs: "HomeServer"):
-        self.server_name = hs.hostname
        self.store = hs.get_datastores().main
        self._storage_controllers = hs.get_storage_controllers()
        self.auth = hs.get_auth()
@@ -179,10 +174,7 @@ class RoomCreationHandler:
        # succession, only process the first attempt and return its result to
        # subsequent requests
        self._upgrade_response_cache: ResponseCache[Tuple[str, str]] = ResponseCache(
-            clock=hs.get_clock(),
-            name="room_upgrade",
-            server_name=self.server_name,
-            timeout_ms=FIVE_MINUTES_IN_MS,
+            hs.get_clock(), "room_upgrade", timeout_ms=FIVE_MINUTES_IN_MS
        )
        self._server_notices_mxid = hs.config.servernotices.server_notices_mxid

@@ -191,13 +183,7 @@ class RoomCreationHandler:
        )

    async def upgrade_room(
-        self,
-        requester: Requester,
-        old_room_id: str,
-        new_version: RoomVersion,
-        additional_creators: Optional[List[str]],
-        auto_member: bool = False,
-        ratelimit: bool = True,
+        self, requester: Requester, old_room_id: str, new_version: RoomVersion
    ) -> str:
        """Replace a room with a new room with a different version

@@ -205,9 +191,6 @@ class RoomCreationHandler:
            requester: the user requesting the upgrade
            old_room_id: the id of the room to be replaced
            new_version: the new room version to use
-            additional_creators: additional room creators, for MSC4289.
-            auto_member: Whether to automatically join local users to the new
-                room and send out invites to remote users.

        Returns:
            the new room id
@@ -215,8 +198,7 @@ class RoomCreationHandler:
        Raises:
            ShadowBanError if the requester is shadow-banned.
        """
-        if ratelimit:
-            await self.request_ratelimiter.ratelimit(requester)
+        await self.request_ratelimiter.ratelimit(requester)

        user_id = requester.user.to_string()

@@ -237,29 +219,8 @@ class RoomCreationHandler:
        old_room = await self.store.get_room(old_room_id)
        if old_room is None:
            raise NotFoundError("Unknown room id %s" % (old_room_id,))
-        old_room_is_public, _ = old_room

-        creation_event_with_context = None
-        if new_version.msc4291_room_ids_as_hashes:
-            old_room_create_event = await self.store.get_create_event_for_room(
-                old_room_id
-            )
-            creation_content = self._calculate_upgraded_room_creation_content(
-                old_room_create_event,
-                tombstone_event_id=None,
-                new_room_version=new_version,
-                additional_creators=additional_creators,
-            )
-            creation_event_with_context = await self._generate_create_event_for_room_id(
-                requester,
-                creation_content,
-                old_room_is_public,
-                new_version,
-            )
-            (create_event, _) = creation_event_with_context
-            new_room_id = create_event.room_id
-        else:
-            new_room_id = self._generate_room_id()
+        new_room_id = self._generate_room_id()

        # Try several times, it could fail with PartialStateConflictError
        # in _upgrade_room, cf comment in except block.
@@ -308,9 +269,6 @@ class RoomCreationHandler:
                    new_version,
                    tombstone_event,
                    tombstone_context,
-                    additional_creators,
-                    creation_event_with_context,
-                    auto_member=auto_member,
                )

                return ret
@@ -334,11 +292,6 @@ class RoomCreationHandler:
        new_version: RoomVersion,
        tombstone_event: EventBase,
        tombstone_context: synapse.events.snapshot.EventContext,
-        additional_creators: Optional[List[str]],
-        creation_event_with_context: Optional[
-            Tuple[EventBase, synapse.events.snapshot.EventContext]
-        ] = None,
-        auto_member: bool = False,
    ) -> str:
        """
        Args:
@@ -350,10 +303,6 @@ class RoomCreationHandler:
            new_version: the version to upgrade the room to
            tombstone_event: the tombstone event to send to the old room
            tombstone_context: the context for the tombstone event
-            additional_creators: additional room creators, for MSC4289.
-            creation_event_with_context: The new room's create event, for room IDs as create event IDs.
-            auto_member: Whether to automatically join local users to the new
-                room and send out invites to remote users.

        Raises:
            ShadowBanError if the requester is shadow-banned.
@@ -363,16 +312,14 @@ class RoomCreationHandler:

        logger.info("Creating new room %s to replace %s", new_room_id, old_room_id)

-        # We've already stored the room if we have the create event
-        if not creation_event_with_context:
-            # create the new room. may raise a `StoreError` in the exceedingly unlikely
-            # event of a room ID collision.
-            await self.store.store_room(
-                room_id=new_room_id,
-                room_creator_user_id=user_id,
-                is_public=old_room[0],
-                room_version=new_version,
-            )
+        # create the new room. may raise a `StoreError` in the exceedingly unlikely
+        # event of a room ID collision.
+        await self.store.store_room(
+            room_id=new_room_id,
+            room_creator_user_id=user_id,
+            is_public=old_room[0],
+            room_version=new_version,
+        )

        await self.clone_existing_room(
            requester,
@@ -380,9 +327,6 @@ class RoomCreationHandler:
            new_room_id=new_room_id,
            new_room_version=new_version,
            tombstone_event_id=tombstone_event.event_id,
-            additional_creators=additional_creators,
-            creation_event_with_context=creation_event_with_context,
-            auto_member=auto_member,
        )

        # now send the tombstone
@@ -416,7 +360,6 @@ class RoomCreationHandler:
            old_room_id,
            new_room_id,
            old_room_state,
-            additional_creators,
        )

        return new_room_id
@@ -427,7 +370,6 @@ class RoomCreationHandler:
        old_room_id: str,
        new_room_id: str,
        old_room_state: StateMap[str],
-        additional_creators: Optional[List[str]],
    ) -> None:
        """Send updated power levels in both rooms after an upgrade

@@ -436,7 +378,7 @@ class RoomCreationHandler:
            old_room_id: the id of the room to be replaced
            new_room_id: the id of the replacement room
            old_room_state: the state map for the old room
-            additional_creators: Additional creators in the new room.
+
        Raises:
            ShadowBanError if the requester is shadow-banned.
        """
@@ -492,14 +434,6 @@ class RoomCreationHandler:
            except AuthError as e:
                logger.warning("Unable to update PLs in old room: %s", e)

-        new_room_version = await self.store.get_room_version(new_room_id)
-        if new_room_version.msc4289_creator_power_enabled:
-            self._remove_creators_from_pl_users_map(
-                old_room_pl_state.content.get("users", {}),
-                requester.user.to_string(),
-                additional_creators,
-            )
-
        await self.event_creation_handler.create_and_send_nonmember_event(
            requester,
            {
@@ -514,36 +448,6 @@ class RoomCreationHandler:
            ratelimit=False,
        )

-    def _calculate_upgraded_room_creation_content(
-        self,
-        old_room_create_event: EventBase,
-        tombstone_event_id: Optional[str],
-        new_room_version: RoomVersion,
-        additional_creators: Optional[List[str]],
-    ) -> JsonDict:
-        creation_content: JsonDict = {
-            "room_version": new_room_version.identifier,
-            "predecessor": {
-                "room_id": old_room_create_event.room_id,
-            },
-        }
-        if tombstone_event_id is not None:
-            creation_content["predecessor"]["event_id"] = tombstone_event_id
-        if (
-            additional_creators is not None
-            and new_room_version.msc4289_creator_power_enabled
-        ):
-            creation_content["additional_creators"] = additional_creators
-        # Check if old room was non-federatable
-        if not old_room_create_event.content.get(EventContentFields.FEDERATE, True):
-            # If so, mark the new room as non-federatable as well
-            creation_content[EventContentFields.FEDERATE] = False
-        # Copy the room type as per MSC3818.
-        room_type = old_room_create_event.content.get(EventContentFields.ROOM_TYPE)
-        if room_type is not None:
-            creation_content[EventContentFields.ROOM_TYPE] = room_type
-        return creation_content
-
    async def clone_existing_room(
        self,
        requester: Requester,
@@ -551,11 +455,6 @@ class RoomCreationHandler:
        new_room_id: str,
        new_room_version: RoomVersion,
        tombstone_event_id: str,
-        additional_creators: Optional[List[str]],
-        creation_event_with_context: Optional[
-            Tuple[EventBase, synapse.events.snapshot.EventContext]
-        ] = None,
-        auto_member: bool = False,
    ) -> None:
        """Populate a new room based on an old room

@@ -566,25 +465,24 @@ class RoomCreationHandler:
                created with _generate_room_id())
            new_room_version: the new room version to use
            tombstone_event_id: the ID of the tombstone event in the old room.
-            creation_event_with_context: The create event of the new room, if the new room supports
-            room ID as create event ID hash.
-            auto_member: Whether to automatically join local users to the new
-                room and send out invites to remote users.
        """
        user_id = requester.user.to_string()

+        creation_content: JsonDict = {
+            "room_version": new_room_version.identifier,
+            "predecessor": {"room_id": old_room_id, "event_id": tombstone_event_id},
+        }
+
+        # Check if old room was non-federatable
+
        # Get old room's create event
        old_room_create_event = await self.store.get_create_event_for_room(old_room_id)

-        if creation_event_with_context:
-            create_event, _ = creation_event_with_context
-            creation_content = create_event.content
-        else:
-            creation_content = self._calculate_upgraded_room_creation_content(
-                old_room_create_event,
-                tombstone_event_id,
-                new_room_version,
-            )
+        # Check if the create event specified a non-federatable room
+        if not old_room_create_event.content.get(EventContentFields.FEDERATE, True):
+            # If so, mark the new room as non-federatable as well
+            creation_content[EventContentFields.FEDERATE] = False
+
        initial_state = {}

        # Replicate relevant room events
@@ -600,8 +498,11 @@ class RoomCreationHandler:
            (EventTypes.PowerLevels, ""),
        ]

+        # Copy the room type as per MSC3818.
        room_type = old_room_create_event.content.get(EventContentFields.ROOM_TYPE)
        if room_type is not None:
+            creation_content[EventContentFields.ROOM_TYPE] = room_type
+
            # If the old room was a space, copy over the rooms in the space.
            if room_type == RoomTypes.SPACE:
                types_to_copy.append((EventTypes.SpaceChild, None))
@@ -673,14 +574,6 @@ class RoomCreationHandler:
        if current_power_level_int < needed_power_level:
            user_power_levels[user_id] = needed_power_level

-        if new_room_version.msc4289_creator_power_enabled:
-            # the creator(s) cannot be in the users map
-            self._remove_creators_from_pl_users_map(
-                user_power_levels,
-                user_id,
-                additional_creators,
-            )
-
        # We construct what the body of a call to /createRoom would look like for passing
        # to the spam checker. We don't include a preset here, as we expect the
        # initial state to contain everything we need.
@@ -699,7 +592,7 @@ class RoomCreationHandler:
                additional_fields=spam_check[1],
            )

-        _, last_event_id, _ = await self._send_events_for_new_room(
+        await self._send_events_for_new_room(
            requester,
            new_room_id,
            new_room_version,
@@ -709,228 +602,36 @@ class RoomCreationHandler:
            invite_list=[],
            initial_state=initial_state,
            creation_content=creation_content,
-            creation_event_with_context=creation_event_with_context,
        )

        # Transfer membership events
-        ban_event_ids = await self.store.get_ban_event_ids_in_room(old_room_id)
-        if ban_event_ids:
-            ban_events = await self.store.get_events_as_list(ban_event_ids)
-
-            # Add any banned users to the new room.
-            #
-            # Note generally we should send membership events via
-            # `update_membership`, however in this case its fine to bypass as
-            # these bans don't need any special treatment, i.e. the sender is in
-            # the room and they don't need any extra signatures, etc.
-            for batched_ban_events in batch_iter(ban_events, 1000):
-                await self.event_creation_handler.create_and_send_new_client_events(
-                    requester=requester,
-                    room_id=new_room_id,
-                    prev_event_id=last_event_id,
-                    event_dicts=[
-                        {
-                            "type": EventTypes.Member,
-                            "state_key": ban_event.state_key,
-                            "room_id": new_room_id,
-                            "sender": requester.user.to_string(),
-                            "content": ban_event.content,
-                        }
-                        for ban_event in batched_ban_events
-                    ],
-                    ratelimit=False,  # We ratelimit the entire upgrade, not individual events.
-                )
-
-        if auto_member:
-            logger.info("Joining local users to %s", new_room_id)
-
-            # 1. Copy over all joins for local
-            joined_profiles = await self.store.get_users_in_room_with_profiles(
-                old_room_id
+        old_room_member_state_ids = (
+            await self._storage_controllers.state.get_current_state_ids(
+                old_room_id, StateFilter.from_types([(EventTypes.Member, None)])
            )
+        )

-            local_user_ids = [
-                user_id for user_id in joined_profiles if self.hs.is_mine_id(user_id)
-            ]
-
-            logger.info("Local user IDs %s", local_user_ids)
-
-            for batched_local_user_ids in batch_iter(local_user_ids, 1000):
-                invites_to_send = []
-
-                # For each local user we create an invite event (from the
-                # upgrading user) plus a join event.
-                for local_user_id in batched_local_user_ids:
-                    if local_user_id == user_id:
-                        # Ignore the upgrading user, as they are already in the
-                        # new room.
-                        continue
-
-                    invites_to_send.append(
-                        {
-                            "type": EventTypes.Member,
-                            "state_key": local_user_id,
-                            "room_id": new_room_id,
-                            "sender": requester.user.to_string(),
-                            "content": {
-                                "membership": Membership.INVITE,
-                            },
-                        }
-                    )
-
-                    # If the user has profile information in the previous join,
-                    # add it to the content.
-                    #
-                    # We could instead copy over the contents from the old join
-                    # event, however a) that would require us to fetch all the
-                    # old join events (which is slow), and b) generally the join
-                    # events have no extra information in them. (We also believe
-                    # that most clients don't copy this information over either,
-                    # but we could be wrong.)
-                    content_profile = {}
-                    user_profile = joined_profiles[local_user_id]
-                    if user_profile.display_name:
-                        content_profile["displayname"] = user_profile.display_name
-                    if user_profile.avatar_url:
-                        content_profile["avatar_url"] = user_profile.avatar_url
-
-                    invites_to_send.append(
-                        {
-                            "type": EventTypes.Member,
-                            "state_key": local_user_id,
-                            "room_id": new_room_id,
-                            "sender": local_user_id,
-                            "content": {
-                                "membership": Membership.JOIN,
-                                **content_profile,
-                            },
-                        }
-                    )
-
-                await self.event_creation_handler.create_and_send_new_client_events(
-                    requester=requester,
-                    room_id=new_room_id,
-                    prev_event_id=None,
-                    event_dicts=invites_to_send,
-                    ratelimit=False,  # We ratelimit the entire upgrade, not individual events.
-                )
-
-            # Invite other users if the room is not public. If the room *is*
-            # public then users can simply directly join, and inviting them as
-            # well may lead to confusion.
-
-            join_rule_content = initial_state.get((EventTypes.JoinRules, ""), None)
-            is_public = False
-            if join_rule_content:
-                is_public = join_rule_content["join_rule"] == JoinRules.PUBLIC
-
-            if not is_public:
-                # Copy invites
-                # TODO: Copy over 3pid invites as well.
-                invited_users = await self.store.get_invited_users_in_room(
-                    room_id=old_room_id
-                )
-
-                # For local users we can just batch send the invites.
-                local_invited_users = [
-                    user_id for user_id in invited_users if self.hs.is_mine_id(user_id)
-                ]
-
-                logger.info(
-                    "Joining local user IDs %s to new room %s",
-                    local_invited_users,
+        # map from event_id to BaseEvent
+        old_room_member_state_events = await self.store.get_events(
+            old_room_member_state_ids.values()
+        )
+        for old_event in old_room_member_state_events.values():
+            # Only transfer ban events
+            if (
+                "membership" in old_event.content
+                and old_event.content["membership"] == "ban"
+            ):
+                await self.room_member_handler.update_membership(
+                    requester,
+                    UserID.from_string(old_event.state_key),
                    new_room_id,
+                    "ban",
+                    ratelimit=False,
+                    content=old_event.content,
                )

-                for batched_local_invited_users in batch_iter(
-                    local_invited_users, 1000
-                ):
-                    invites_to_send = []
-                    leaves_to_send = []
-
-                    # For each local user we create an invite event (from the
-                    # upgrading user), and reject the invite event in the old
-                    # room.
-                    #
-                    # This ensures that the user ends up with a single invite to
-                    # the new room (rather than multiple invites which may be
-                    # noisy and confusing).
-                    for local_user_id in batched_local_invited_users:
-                        leaves_to_send.append(
-                            {
-                                "type": EventTypes.Member,
-                                "state_key": local_user_id,
-                                "room_id": old_room_id,
-                                "sender": local_user_id,
-                                "content": {
-                                    "membership": Membership.LEAVE,
-                                },
-                            }
-                        )
-                        invites_to_send.append(
-                            {
-                                "type": EventTypes.Member,
-                                "state_key": local_user_id,
-                                "room_id": new_room_id,
-                                "sender": requester.user.to_string(),
-                                "content": {
-                                    "membership": Membership.INVITE,
-                                },
-                            }
-                        )
-
-                    await self.event_creation_handler.create_and_send_new_client_events(
-                        requester=requester,
-                        room_id=old_room_id,
-                        prev_event_id=None,
-                        event_dicts=leaves_to_send,
-                        ratelimit=False,  # We ratelimit the entire upgrade, not individual events.
-                    )
-                    await self.event_creation_handler.create_and_send_new_client_events(
-                        requester=requester,
-                        room_id=new_room_id,
-                        prev_event_id=None,
-                        event_dicts=invites_to_send,
-                        ratelimit=False,
-                    )
-
-                # For remote users we send invites one by one, as we need to
-                # send each one to the remote server.
-                #
-                # We also invite joined remote users who were in the old room.
-                remote_user_ids = [
-                    user_id
-                    for user_id in itertools.chain(invited_users, joined_profiles)
-                    if not self.hs.is_mine_id(user_id)
-                ]
-
-                logger.debug("Inviting remote user IDs %s", remote_user_ids)
-
-                async def remote_invite(remote_user: str) -> None:
-                    try:
-                        await self.room_member_handler.update_membership(
-                            requester,
-                            UserID.from_string(remote_user),
-                            new_room_id,
-                            Membership.INVITE,
-                            ratelimit=False,  # We ratelimit the entire upgrade, not individual events.
-                        )
-                    except SynapseError as e:
-                        # If we fail to invite a remote user, we log it but continue
-                        # on with the upgrade.
-                        logger.warning(
-                            "Failed to invite remote user %s to new room %s: %s",
-                            remote_user,
-                            new_room_id,
-                            e,
-                        )
-
-                # We do this concurrently, as it can take a while to invite
-                await concurrently_execute(
-                    remote_invite,
-                    remote_user_ids,
-                    10,
-                )
+        # XXX invites/joins
+        # XXX 3pid invites

    async def _move_aliases_to_new_room(
        self,
@@ -1184,7 +885,6 @@ class RoomCreationHandler:
        power_level_content_override = config.get("power_level_content_override")
        if (
            power_level_content_override
-            and not room_version.msc4289_creator_power_enabled  # this validation doesn't apply in MSC4289 rooms
            and "users" in power_level_content_override
            and user_id not in power_level_content_override["users"]
        ):
@@ -1201,41 +901,11 @@ class RoomCreationHandler:

        self._validate_room_config(config, visibility)

-        creation_content = config.get("creation_content", {})
-        # override any attempt to set room versions via the creation_content
-        creation_content["room_version"] = room_version.identifier
-
-        # trusted private chats have the invited users marked as additional creators
-        if (
-            room_version.msc4289_creator_power_enabled
-            and config.get("preset", None) == RoomCreationPreset.TRUSTED_PRIVATE_CHAT
-            and len(config.get("invite", [])) > 0
-        ):
-            # the other user(s) are additional creators
-            invitees = config.get("invite", [])
-            # we don't want to replace any additional_creators additionally specified, and we want
-            # to remove duplicates.
-            creation_content[EventContentFields.ADDITIONAL_CREATORS] = list(
-                set(creation_content.get(EventContentFields.ADDITIONAL_CREATORS, []))
-                | set(invitees)
-            )
-
-        creation_event_with_context = None
-        if room_version.msc4291_room_ids_as_hashes:
-            creation_event_with_context = await self._generate_create_event_for_room_id(
-                requester,
-                creation_content,
-                is_public,
-                room_version,
-            )
-            (create_event, _) = creation_event_with_context
-            room_id = create_event.room_id
-        else:
-            room_id = await self._generate_and_create_room_id(
-                creator_id=user_id,
-                is_public=is_public,
-                room_version=room_version,
-            )
+        room_id = await self._generate_and_create_room_id(
+            creator_id=user_id,
+            is_public=is_public,
+            room_version=room_version,
+        )

        # Check whether this visibility value is blocked by a third party module
        allowed_by_third_party_rules = await (
@@ -1272,6 +942,11 @@ class RoomCreationHandler:
        for val in raw_initial_state:
            initial_state[(val["type"], val.get("state_key", ""))] = val["content"]

+        creation_content = config.get("creation_content", {})
+
+        # override any attempt to set room versions via the creation_content
+        creation_content["room_version"] = room_version.identifier
+
        (
            last_stream_id,
            last_sent_event_id,
@@ -1288,7 +963,6 @@ class RoomCreationHandler:
            power_level_content_override=power_level_content_override,
            creator_join_profile=creator_join_profile,
            ignore_forced_encryption=ignore_forced_encryption,
-            creation_event_with_context=creation_event_with_context,
        )

        # we avoid dropping the lock between invites, as otherwise joins can
@@ -1354,38 +1028,6 @@ class RoomCreationHandler:

        return room_id, room_alias, last_stream_id

-    async def _generate_create_event_for_room_id(
-        self,
-        creator: Requester,
-        creation_content: JsonDict,
-        is_public: bool,
-        room_version: RoomVersion,
-    ) -> Tuple[EventBase, synapse.events.snapshot.EventContext]:
-        (
-            creation_event,
-            new_unpersisted_context,
-        ) = await self.event_creation_handler.create_event(
-            creator,
-            {
-                "content": creation_content,
-                "sender": creator.user.to_string(),
-                "type": EventTypes.Create,
-                "state_key": "",
-            },
-            prev_event_ids=[],
-            depth=1,
-            state_map={},
-            for_batch=False,
-        )
-        await self.store.store_room(
-            room_id=creation_event.room_id,
-            room_creator_user_id=creator.user.to_string(),
-            is_public=is_public,
-            room_version=room_version,
-        )
-        creation_context = await new_unpersisted_context.persist(creation_event)
-        return (creation_event, creation_context)
-
    async def _send_events_for_new_room(
        self,
        creator: Requester,
@@ -1399,9 +1041,6 @@ class RoomCreationHandler:
        power_level_content_override: Optional[JsonDict] = None,
        creator_join_profile: Optional[JsonDict] = None,
        ignore_forced_encryption: bool = False,
-        creation_event_with_context: Optional[
-            Tuple[EventBase, synapse.events.snapshot.EventContext]
-        ] = None,
    ) -> Tuple[int, str, int]:
        """Sends the initial events into a new room. Sends the room creation, membership,
        and power level events into the room sequentially, then creates and batches up the
@@ -1438,10 +1077,7 @@ class RoomCreationHandler:
                user in this room.
            ignore_forced_encryption:
                Ignore encryption forced by `encryption_enabled_by_default_for_room_type` setting.
-            creation_event_with_context:
-                Set in MSC4291 rooms where the create event determines the room ID. If provided,
-                does not create an additional create event but instead appends the remaining new
-                events onto the provided create event.
+
        Returns:
            A tuple containing the stream ID, event ID and depth of the last
            event sent to the room.
@@ -1506,26 +1142,13 @@ class RoomCreationHandler:

        preset_config, config = self._room_preset_config(room_config)

-        if creation_event_with_context is None:
-            # MSC2175 removes the creator field from the create event.
-            if not room_version.implicit_room_creator:
-                creation_content["creator"] = creator_id
-            creation_event, unpersisted_creation_context = await create_event(
-                EventTypes.Create, creation_content, False
-            )
-            creation_context = await unpersisted_creation_context.persist(
-                creation_event
-            )
-        else:
-            (creation_event, creation_context) = creation_event_with_context
-            # we had to do the above already in order to have a room ID, so just updates local vars
-            # and continue.
-            depth = 2
-            prev_event = [creation_event.event_id]
-            state_map[(creation_event.type, creation_event.state_key)] = (
-                creation_event.event_id
-            )
-
+        # MSC2175 removes the creator field from the create event.
+        if not room_version.implicit_room_creator:
+            creation_content["creator"] = creator_id
+        creation_event, unpersisted_creation_context = await create_event(
+            EventTypes.Create, creation_content, False
+        )
+        creation_context = await unpersisted_creation_context.persist(creation_event)
        logger.debug("Sending %s in new room", EventTypes.Member)
        ev = await self.event_creation_handler.handle_new_client_event(
            requester=creator,
@@ -1574,9 +1197,7 @@ class RoomCreationHandler:
            # Please update the docs for `default_power_level_content_override` when
            # updating the `events` dict below
            power_level_content: JsonDict = {
-                "users": {creator_id: 100}
-                if not room_version.msc4289_creator_power_enabled
-                else {},
+                "users": {creator_id: 100},
                "users_default": 0,
                "events": {
                    EventTypes.Name: 50,
@@ -1584,9 +1205,7 @@ class RoomCreationHandler:
                    EventTypes.RoomHistoryVisibility: 100,
                    EventTypes.CanonicalAlias: 50,
                    EventTypes.RoomAvatar: 50,
-                    EventTypes.Tombstone: 150
-                    if room_version.msc4289_creator_power_enabled
-                    else 100,
+                    EventTypes.Tombstone: 100,
                    EventTypes.ServerACL: 100,
                    EventTypes.RoomEncryption: 100,
                },
@@ -1599,13 +1218,7 @@ class RoomCreationHandler:
                "historical": 100,
            }

-            # original_invitees_have_ops is set on preset:trusted_private_chat which will already
-            # have set these users as additional_creators, hence don't set the PL for creators as
-            # that is invalid.
-            if (
-                config["original_invitees_have_ops"]
-                and not room_version.msc4289_creator_power_enabled
-            ):
+            if config["original_invitees_have_ops"]:
                for invitee in invite_list:
                    power_level_content["users"][invitee] = 100

@@ -1690,13 +1303,7 @@ class RoomCreationHandler:
            topic = room_config["topic"]
            topic_event, topic_context = await create_event(
                EventTypes.Topic,
-                {
-                    EventContentFields.TOPIC: topic,
-                    EventContentFields.M_TOPIC: {
-                        # The mimetype property defaults to `text/plain` if omitted.
-                        EventContentFields.M_TEXT: [{MTextFields.BODY: topic}]
-                    },
-                },
+                {"topic": topic},
                True,
            )
            events_to_send.append((topic_event, topic_context))
@@ -1778,19 +1385,6 @@ class RoomCreationHandler:
            )
        return preset_name, preset_config

-    def _remove_creators_from_pl_users_map(
-        self,
-        users_map: Dict[str, int],
-        creator: str,
-        additional_creators: Optional[List[str]],
-    ) -> None:
-        creators = [creator]
-        if additional_creators:
-            creators.extend(additional_creators)
-        for creator in creators:
-            # the creator(s) cannot be in the users map
-            users_map.pop(creator, None)
-
    def _generate_room_id(self) -> str:
        """Generates a random room ID.

@@ -1808,7 +1402,7 @@ class RoomCreationHandler:
            A random room ID of the form "!opaque_id:domain".
        """
        random_string = stringutils.random_string(18)
-        return RoomIdWithDomain(random_string, self.hs.hostname).to_string()
+        return RoomID(random_string, self.hs.hostname).to_string()

    async def _generate_and_create_room_id(
        self,
@@ -61,26 +61,16 @@ MAX_PUBLIC_ROOMS_IN_RESPONSE = 100

 class RoomListHandler:
    def __init__(self, hs: "HomeServer"):
-        self.server_name = hs.hostname  # nb must be called this for @cached
        self.store = hs.get_datastores().main
        self._storage_controllers = hs.get_storage_controllers()
        self.hs = hs
        self.enable_room_list_search = hs.config.roomdirectory.enable_room_list_search
        self.response_cache: ResponseCache[
            Tuple[Optional[int], Optional[str], Optional[ThirdPartyInstanceID]]
-        ] = ResponseCache(
-            clock=hs.get_clock(),
-            name="room_list",
-            server_name=self.server_name,
-        )
+        ] = ResponseCache(hs.get_clock(), "room_list")
        self.remote_response_cache: ResponseCache[
            Tuple[str, Optional[int], Optional[str], bool, Optional[str]]
-        ] = ResponseCache(
-            clock=hs.get_clock(),
-            name="remote_room_list",
-            server_name=self.server_name,
-            timeout_ms=30 * 1000,
-        )
+        ] = ResponseCache(hs.get_clock(), "remote_room_list", timeout_ms=30 * 1000)

    async def get_local_public_room_list(
        self,
@@ -42,7 +42,7 @@ from synapse.api.errors import (
 )
 from synapse.api.ratelimiting import Ratelimiter
 from synapse.event_auth import get_named_level, get_power_level_event
-from synapse.events import EventBase, is_creator
+from synapse.events import EventBase
 from synapse.events.snapshot import EventContext
 from synapse.handlers.pagination import PURGE_ROOM_ACTION_NAME
 from synapse.handlers.profile import MAX_AVATAR_URL_LEN, MAX_DISPLAYNAME_LEN
@@ -388,11 +388,11 @@ class RoomMemberHandler(metaclass=abc.ABCMeta):

    async def _local_membership_update(
        self,
-        *,
        requester: Requester,
        target: UserID,
        room_id: str,
        membership: str,
+        allow_no_prev_events: bool = False,
        prev_event_ids: Optional[List[str]] = None,
        state_event_ids: Optional[List[str]] = None,
        depth: Optional[int] = None,
@@ -414,6 +414,11 @@ class RoomMemberHandler(metaclass=abc.ABCMeta):
                desired membership event.
            room_id:
            membership:
+
+            allow_no_prev_events: Whether to allow this event to be created an empty
+                list of prev_events. Normally this is prohibited just because most
+                events should have a prev_event and we should only use this in special
+                cases (previously useful for MSC2716).
            prev_event_ids: The event IDs to use as the prev events
            state_event_ids:
                The full state at a given event. This was previously used particularly
@@ -481,6 +486,7 @@ class RoomMemberHandler(metaclass=abc.ABCMeta):
                        "origin_server_ts": origin_server_ts,
                    },
                    txn_id=txn_id,
+                    allow_no_prev_events=allow_no_prev_events,
                    prev_event_ids=prev_event_ids,
                    state_event_ids=state_event_ids,
                    depth=depth,
@@ -577,6 +583,7 @@ class RoomMemberHandler(metaclass=abc.ABCMeta):
        new_room: bool = False,
        require_consent: bool = True,
        outlier: bool = False,
+        allow_no_prev_events: bool = False,
        prev_event_ids: Optional[List[str]] = None,
        state_event_ids: Optional[List[str]] = None,
        depth: Optional[int] = None,
@@ -600,6 +607,10 @@ class RoomMemberHandler(metaclass=abc.ABCMeta):
            outlier: Indicates whether the event is an `outlier`, i.e. if
                it's from an arbitrary point and floating in the DAG as
                opposed to being inline with the current DAG.
+            allow_no_prev_events: Whether to allow this event to be created an empty
+                list of prev_events. Normally this is prohibited just because most
+                events should have a prev_event and we should only use this in special
+                cases (previously useful for MSC2716).
            prev_event_ids: The event IDs to use as the prev events
            state_event_ids:
                The full state at a given event. This was previously used particularly
@@ -669,6 +680,7 @@ class RoomMemberHandler(metaclass=abc.ABCMeta):
                            new_room=new_room,
                            require_consent=require_consent,
                            outlier=outlier,
+                            allow_no_prev_events=allow_no_prev_events,
                            prev_event_ids=prev_event_ids,
                            state_event_ids=state_event_ids,
                            depth=depth,
@@ -691,6 +703,7 @@ class RoomMemberHandler(metaclass=abc.ABCMeta):
        new_room: bool = False,
        require_consent: bool = True,
        outlier: bool = False,
+        allow_no_prev_events: bool = False,
        prev_event_ids: Optional[List[str]] = None,
        state_event_ids: Optional[List[str]] = None,
        depth: Optional[int] = None,
@@ -716,6 +729,10 @@ class RoomMemberHandler(metaclass=abc.ABCMeta):
            outlier: Indicates whether the event is an `outlier`, i.e. if
                it's from an arbitrary point and floating in the DAG as
                opposed to being inline with the current DAG.
+            allow_no_prev_events: Whether to allow this event to be created an empty
+                list of prev_events. Normally this is prohibited just because most
+                events should have a prev_event and we should only use this in special
+                cases (previously useful for MSC2716).
            prev_event_ids: The event IDs to use as the prev events
            state_event_ids:
                The full state at a given event. This was previously used particularly
@@ -916,6 +933,7 @@ class RoomMemberHandler(metaclass=abc.ABCMeta):
                    )
                # InviteRule.IGNORE is handled at the sync layer.

+        # An empty prev_events list is allowed as long as the auth_event_ids are present
        if prev_event_ids is not None:
            return await self._local_membership_update(
                requester=requester,
@@ -924,6 +942,7 @@ class RoomMemberHandler(metaclass=abc.ABCMeta):
                membership=effective_membership_state,
                txn_id=txn_id,
                ratelimit=ratelimit,
+                allow_no_prev_events=allow_no_prev_events,
                prev_event_ids=prev_event_ids,
                state_event_ids=state_event_ids,
                depth=depth,
@@ -1154,8 +1173,9 @@ class RoomMemberHandler(metaclass=abc.ABCMeta):

        elif effective_membership_state == Membership.KNOCK:
            if not is_host_in_room:
-                # we used to add the domain of the room ID to remote_room_hosts.
-                # This is not safe in MSC4291 rooms which do not have a domain.
+                # The knock needs to be sent over federation instead
+                remote_room_hosts.append(get_domain_from_id(room_id))
+
                content["membership"] = Membership.KNOCK

                try:
@@ -1914,7 +1934,7 @@ class RoomMemberMasterHandler(RoomMemberHandler):
            check_complexity
            and self.hs.config.server.limit_remote_rooms.admins_can_join
        ):
-            check_complexity = not await self.store.is_server_admin(user.to_string())
+            check_complexity = not await self.store.is_server_admin(user)

        if check_complexity:
            # Fetch the room complexity
@@ -2312,7 +2332,6 @@ def get_users_which_can_issue_invite(auth_events: StateMap[EventBase]) -> List[s

    # Check which members are able to invite by ensuring they're joined and have
    # the necessary power level.
-    create_event = auth_events[(EventTypes.Create, "")]
    for (event_type, state_key), event in auth_events.items():
        if event_type != EventTypes.Member:
            continue
@@ -2320,12 +2339,8 @@ def get_users_which_can_issue_invite(auth_events: StateMap[EventBase]) -> List[s
        if event.membership != Membership.JOIN:
            continue

-        if create_event.room_version.msc4289_creator_power_enabled and is_creator(
-            create_event, state_key
-        ):
-            result.append(state_key)
        # Check if the user has a custom power level.
-        elif users.get(state_key, users_default_level) >= invite_level:
+        if users.get(state_key, users_default_level) >= invite_level:
            result.append(state_key)

    return result
@@ -54,9 +54,6 @@ class RoomPolicyHandler:
        Returns:
            bool: True if the event is allowed in the room, False otherwise.
        """
-        if event.type == "org.matrix.msc4284.policy" and event.state_key is not None:
-            return True  # always allow policy server change events
-
        policy_event = await self._storage_controllers.state.get_current_state_event(
            event.room_id, "org.matrix.msc4284.policy", ""
        )
@@ -96,7 +96,6 @@ class RoomSummaryHandler:
    _PAGINATION_SESSION_VALIDITY_PERIOD_MS = 5 * 60 * 1000

    def __init__(self, hs: "HomeServer"):
-        self.server_name = hs.hostname
        self._event_auth_handler = hs.get_event_auth_handler()
        self._store = hs.get_datastores().main
        self._storage_controllers = hs.get_storage_controllers()
@@ -112,19 +111,10 @@ class RoomSummaryHandler:
        # If a user tries to fetch the same page multiple times in quick succession,
        # only process the first attempt and return its result to subsequent requests.
        self._pagination_response_cache: ResponseCache[
-            Tuple[
-                str,
-                str,
-                bool,
-                Optional[int],
-                Optional[int],
-                Optional[str],
-                Optional[Tuple[str, ...]],
-            ]
+            Tuple[str, str, bool, Optional[int], Optional[int], Optional[str]]
        ] = ResponseCache(
-            clock=hs.get_clock(),
-            name="get_room_hierarchy",
-            server_name=self.server_name,
+            hs.get_clock(),
+            "get_room_hierarchy",
        )
        self._msc3266_enabled = hs.config.experimental.msc3266_enabled

@@ -136,7 +126,6 @@ class RoomSummaryHandler:
        max_depth: Optional[int] = None,
        limit: Optional[int] = None,
        from_token: Optional[str] = None,
-        remote_room_hosts: Optional[Tuple[str, ...]] = None,
    ) -> JsonDict:
        """
        Implementation of the room hierarchy C-S API.
@@ -154,9 +143,6 @@ class RoomSummaryHandler:
            limit: An optional limit on the number of rooms to return per
                page. Must be a positive integer.
            from_token: An optional pagination token.
-            remote_room_hosts: An optional list of remote homeserver server names. If defined,
-                each host will be used to try and fetch the room hierarchy. Must be a tuple so
-                that it can be hashed by the `RoomSummaryHandler._pagination_response_cache`.

        Returns:
            The JSON hierarchy dictionary.
@@ -176,7 +162,6 @@ class RoomSummaryHandler:
                max_depth,
                limit,
                from_token,
-                remote_room_hosts,
            ),
            self._get_room_hierarchy,
            requester.user.to_string(),
@@ -185,7 +170,6 @@ class RoomSummaryHandler:
            max_depth,
            limit,
            from_token,
-            remote_room_hosts,
        )

    async def _get_room_hierarchy(
@@ -196,7 +180,6 @@ class RoomSummaryHandler:
        max_depth: Optional[int] = None,
        limit: Optional[int] = None,
        from_token: Optional[str] = None,
-        remote_room_hosts: Optional[Tuple[str, ...]] = None,
    ) -> JsonDict:
        """See docstring for SpaceSummaryHandler.get_room_hierarchy."""

@@ -216,7 +199,7 @@ class RoomSummaryHandler:

        if not local_room:
            room_hierarchy = await self._summarize_remote_room_hierarchy(
-                _RoomQueueEntry(requested_room_id, remote_room_hosts or ()),
+                _RoomQueueEntry(requested_room_id, ()),
                False,
            )
            root_room_entry = room_hierarchy[0]
@@ -257,7 +240,7 @@ class RoomSummaryHandler:
            processed_rooms = set(pagination_session["processed_rooms"])
        else:
            # The queue of rooms to process, the next room is last on the stack.
-            room_queue = [_RoomQueueEntry(requested_room_id, remote_room_hosts or ())]
+            room_queue = [_RoomQueueEntry(requested_room_id, ())]

            # Rooms we have already processed.
            processed_rooms = set()
@@ -197,7 +197,7 @@ class SendEmailHandler:
            additional_headers: A map of additional headers to include.
        """
        try:
-            from_string = self._from % {"app": app_name}  # type: ignore[operator]
+            from_string = self._from % {"app": app_name}
        except (KeyError, TypeError):
            from_string = self._from

@@ -21,6 +21,7 @@ import logging
 from typing import TYPE_CHECKING, Optional

 from synapse.api.errors import Codes, StoreError, SynapseError
+from synapse.handlers.device import DeviceHandler
 from synapse.types import Requester

 if TYPE_CHECKING:
@@ -35,7 +36,17 @@ class SetPasswordHandler:
    def __init__(self, hs: "HomeServer"):
        self.store = hs.get_datastores().main
        self._auth_handler = hs.get_auth_handler()
-        self._device_handler = hs.get_device_handler()
+
+        # We don't need the device handler if password changing is disabled.
+        # This allows us to instantiate the SetPasswordHandler on the workers
+        # that have admin APIs for MAS
+        if self._auth_handler.can_change_password():
+            # This can only be instantiated on the main process.
+            device_handler = hs.get_device_handler()
+            assert isinstance(device_handler, DeviceHandler)
+            self._device_handler: Optional[DeviceHandler] = device_handler
+        else:
+            self._device_handler = None

    async def set_password(
        self,
@@ -47,6 +58,9 @@ class SetPasswordHandler:
        if not self._auth_handler.can_change_password():
            raise SynapseError(403, "Password change disabled", errcode=Codes.FORBIDDEN)

+        # We should have this available only if password changing is enabled.
+        assert self._device_handler is not None
+
        try:
            await self.store.user_set_password_hash(user_id, password_hash)
        except StoreError as e:
@@ -46,6 +46,7 @@ from twisted.web.server import Request
 from synapse.api.constants import LoginType, ProfileFields
 from synapse.api.errors import Codes, NotFoundError, RedirectException, SynapseError
 from synapse.config.sso import SsoAttributeRequirement
+from synapse.handlers.device import DeviceHandler
 from synapse.handlers.register import init_counters_for_auth_provider
 from synapse.handlers.ui_auth import UIAuthSessionDataConstants
 from synapse.http import get_request_user_agent
@@ -817,13 +818,13 @@ class SsoHandler:
                server_name = avatar_url_parts[-2]
                media_id = avatar_url_parts[-1]
                if self._is_mine_server_name(server_name):
-                    media = await self._media_repo.store.get_local_media(media_id)
+                    media = await self._media_repo.store.get_local_media(media_id)  # type: ignore[has-type]
                    if media is not None and upload_name == media.upload_name:
                        logger.info("skipping saving the user avatar")
                        return True

            # store it in media repository
-            avatar_mxc_url = await self._media_repo.create_or_update_content(
+            avatar_mxc_url = await self._media_repo.create_content(
                media_type=headers[b"Content-Type"][0].decode("utf-8"),
                upload_name=upload_name,
                content=picture,
@@ -1180,6 +1181,8 @@ class SsoHandler:
    ) -> None:
        """Revoke any devices and in-flight logins tied to a provider session.

+        Can only be called from the main process.
+
        Args:
            auth_provider_id: A unique identifier for this SSO provider, e.g.
                "oidc" or "saml".
@@ -1188,6 +1191,11 @@ class SsoHandler:
                sessions belonging to other users and log an error.
        """

+        # It is expected that this is the main process.
+        assert isinstance(self._device_handler, DeviceHandler), (
+            "revoking SSO sessions can only be called on the main process"
+        )
+
        # Invalidate any running user-mapping sessions
        to_delete = []
        for session_id, session in self._username_mapping_sessions.items():
@@ -36,7 +36,6 @@ from synapse.metrics import event_processing_positions
 from synapse.metrics.background_process_metrics import run_as_background_process
 from synapse.storage.databases.main.state_deltas import StateDelta
 from synapse.types import JsonDict
-from synapse.util.events import get_plain_text_topic_from_event_content

 if TYPE_CHECKING:
    from synapse.server import HomeServer
@@ -300,9 +299,7 @@ class StatsHandler:
            elif delta.event_type == EventTypes.Name:
                room_state["name"] = event_content.get("name")
            elif delta.event_type == EventTypes.Topic:
-                room_state["topic"] = get_plain_text_topic_from_event_content(
-                    event_content
-                )
+                room_state["topic"] = event_content.get("topic")
            elif delta.event_type == EventTypes.RoomAvatar:
                room_state["avatar"] = event_content.get("url")
            elif delta.event_type == EventTypes.CanonicalAlias:
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Erik Johnston	6002debbde	Timeout Linearizer	2025-06-25 13:35:03 +01:00
Erik Johnston	4247fa48b5	Add test	2025-06-25 13:28:33 +01:00
Erik Johnston	b946b028bd	Refactor test to use clock	2025-06-25 13:28:33 +01:00
Erik Johnston	f401976fd8	Add timeout and max queue size support	2025-06-25 13:28:33 +01:00