Skip to content

Conversation

kaylendog
Copy link
Contributor

@kaylendog kaylendog commented Aug 12, 2025

  • Add EncryptionState::StateEncrypted to represent the encryption state of rooms supporting state event encryption.

@kaylendog kaylendog self-assigned this Aug 12, 2025
@kaylendog kaylendog force-pushed the kaylendog/msc3414/encyption-state branch 2 times, most recently from 697aab6 to 751f635 Compare August 12, 2025 17:20
@kaylendog kaylendog marked this pull request as ready for review August 12, 2025 17:25
@kaylendog kaylendog requested a review from a team as a code owner August 12, 2025 17:25
@kaylendog kaylendog requested review from Hywan, andybalaam and richvdh and removed request for a team and Hywan August 12, 2025 17:25
Copy link

codspeed-hq bot commented Aug 12, 2025

CodSpeed Performance Report

Merging #5523 will not alter performance

Comparing kaylendog:kaylendog/msc3414/encyption-state (18b5679) with main (4f0415d)

Summary

✅ 31 untouched benchmarks

Copy link

codecov bot commented Aug 12, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 88.59%. Comparing base (4f0415d) to head (18b5679).
⚠️ Report is 3 commits behind head on main.
✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #5523   +/-   ##
=======================================
  Coverage   88.59%   88.59%           
=======================================
  Files         340      340           
  Lines       93836    93836           
  Branches    93836    93836           
=======================================
+ Hits        83133    83135    +2     
+ Misses       6572     6571    -1     
+ Partials     4131     4130    -1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Member

@Hywan Hywan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the patch!

I believe these is a design issue with the new StateEncrypted variant. See my comment.

@kaylendog kaylendog force-pushed the kaylendog/msc3414/encyption-state branch from 751f635 to 7345c02 Compare August 14, 2025 12:55
@kaylendog kaylendog requested review from Hywan and removed request for andybalaam and richvdh August 14, 2025 12:55
@kaylendog kaylendog force-pushed the kaylendog/msc3414/encyption-state branch from 7345c02 to cfd8166 Compare August 14, 2025 12:57
@kaylendog
Copy link
Contributor Author

kaylendog commented Aug 14, 2025

Looks like this breaks the Go FFI bindings in complement-crypto

@kaylendog kaylendog changed the title feat(base): Add EncryptionState::StateEncrypted feat(base): Add EncryptionState::Encrypted { encrypt_state_events } Aug 14, 2025
@Hywan
Copy link
Member

Hywan commented Aug 18, 2025

Looks like this breaks the Go FFI bindings in complement-crypto

Yes, you may need to update Complement Crypto. Ideally, you can open a branch on Complement Crypto with the same name as your branch here, to trigger a special build that will help tests both PR at the same time.

@kaylendog kaylendog force-pushed the kaylendog/msc3414/encyption-state branch from cfd8166 to 18b5679 Compare August 18, 2025 13:50
@kaylendog kaylendog changed the title feat(base): Add EncryptionState::Encrypted { encrypt_state_events } feat(base): Add EncryptionState::StateEncrypted Aug 18, 2025
@kaylendog kaylendog changed the title feat(base): Add EncryptionState::StateEncrypted feat(base): Add EncryptionState::StateEncrypted Aug 18, 2025
@kaylendog
Copy link
Contributor Author

Reverted back to the enum variant after the discussion with @richvdh.

@kaylendog kaylendog requested a review from Hywan August 18, 2025 13:53
Copy link
Member

@Hywan Hywan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I continue to believe the changes I've recommended before are the way to go, but @richvdh brought a pretty relevant argument in favor of the current solution I'm about the approve. My solution is a breaking change, the new solution isn't a breaking change. Knowing this is an experimental feature, avoiding a breaking change is definitely better. We can still refactor later once it's stablised.

@Hywan Hywan enabled auto-merge (rebase) August 18, 2025 14:52
@Hywan Hywan disabled auto-merge August 18, 2025 15:46
@Hywan Hywan merged commit 9601624 into matrix-org:main Aug 18, 2025
52 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants