Merge pull request #249 from matrix-org/rav/sdk_cef1f8c5c

Bump to SDK cef1f8c5c

Author: richvdh

CHANGELOG.md

@@ -1,6 +1,8 @@
 # UNRELEASED
 
--   Update matrix-rust-sdk to `6ab11a032`.
+-   Update matrix-rust-sdk to `cef1f8c5`, which includes:
+
+    -   Add support for received room key bundle data, as required by encrypted history sharing ((MSC4268)[https://github.com/matrix-org/matrix-spec-proposals/pull/4268)). ([#5276](https://github.com/matrix-org/matrix-rust-sdk/pull/5276))
 
 -   Add a new error code for `MegolmDecryptionError`, `DecryptionErrorCode::MismatchedSender`, indicating that the sender of the event does not match the owner of the device that established the Megolm session. ([#248](https://github.com/matrix-org/matrix-rust-sdk-crypto-wasm/pull/248))
 

Cargo.lock

@@ -64,9 +64,9 @@ futures-util = "0.3.27"
 getrandom = { version = "0.3.0", features = ["wasm_js"] }
 http = "1.1.0"
 js-sys = "0.3.49"
-matrix-sdk-common = { git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "6ab11a032", features = ["js"] }
-matrix-sdk-indexeddb = { git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "6ab11a032", default-features = false, features = ["e2e-encryption"] }
-matrix-sdk-qrcode = { git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "6ab11a032", optional = true }
+matrix-sdk-common = { git = "https://github.com/matrix-org/matrix-rust-sdk", branch = "main", features = ["js"] }
+matrix-sdk-indexeddb = { git = "https://github.com/matrix-org/matrix-rust-sdk", branch = "main", default-features = false, features = ["e2e-encryption"] }
+matrix-sdk-qrcode = { git = "https://github.com/matrix-org/matrix-rust-sdk", branch = "main", optional = true }
 serde = "1.0.91"
 serde_json = "1.0.91"
 serde-wasm-bindgen = "0.6.5"
@@ -84,7 +84,7 @@ vergen-gitcl = { version = "1.0.0", features = ["build"] }
 
 [dependencies.matrix-sdk-crypto]
 git = "https://github.com/matrix-org/matrix-rust-sdk"
-rev = "6ab11a032"
+branch = "main"
 default-features = false
 features = ["js", "automatic-room-key-forwarding"]
 

Cargo.toml

@@ -492,10 +492,13 @@ impl InvalidToDeviceEvent {
 /// If the event cannot be mapped into one of those types, we instead return
 /// `None`, indicating the event should be discarded.
 pub fn processed_to_device_event_to_js_value(
-    processed_to_device_event: matrix_sdk_crypto::types::ProcessedToDeviceEvent,
+    processed_to_device_event: matrix_sdk_common::deserialized_responses::ProcessedToDeviceEvent,
 ) -> Option<JsValue> {
     let result = match processed_to_device_event {
-        matrix_sdk_crypto::types::ProcessedToDeviceEvent::Decrypted { raw, encryption_info } => {
+        matrix_sdk_common::deserialized_responses::ProcessedToDeviceEvent::Decrypted {
+            raw,
+            encryption_info,
+        } => {
             match encryption_info.try_into() {
                 Ok(encryption_info) => {
                     DecryptedToDeviceEvent { raw_event: raw.json().get().into(), encryption_info }
@@ -513,13 +516,13 @@ pub fn processed_to_device_event_to_js_value(
                 }
             }
         }
-        matrix_sdk_crypto::types::ProcessedToDeviceEvent::UnableToDecrypt(utd) => {
+        matrix_sdk_common::deserialized_responses::ProcessedToDeviceEvent::UnableToDecrypt(utd) => {
             UTDToDeviceEvent { raw_event: utd.json().get().into() }.into()
         }
-        matrix_sdk_crypto::types::ProcessedToDeviceEvent::PlainText(plain) => {
+        matrix_sdk_common::deserialized_responses::ProcessedToDeviceEvent::PlainText(plain) => {
             PlainTextToDeviceEvent { raw_event: plain.json().get().into() }.into()
         }
-        matrix_sdk_crypto::types::ProcessedToDeviceEvent::Invalid(invalid) => {
+        matrix_sdk_common::deserialized_responses::ProcessedToDeviceEvent::Invalid(invalid) => {
             InvalidToDeviceEvent { raw_event: invalid.json().get().into() }.into()
         }
     };

src/types.rs

@@ -111,7 +111,7 @@ describe(OlmMachine.name, () => {
         expect(databases).toHaveLength(2);
         expect(databases).toStrictEqual([
             { name: `${storeName}::matrix-sdk-crypto-meta`, version: 1 },
-            { name: `${storeName}::matrix-sdk-crypto`, version: 12 },
+            { name: `${storeName}::matrix-sdk-crypto`, version: 13 },
         ]);
 
         // Creating a new Olm machine, with the stored state.
@@ -230,7 +230,7 @@ describe(OlmMachine.name, () => {
         expect(databases).toHaveLength(2);
         expect(databases).toStrictEqual([
             { name: `${storeName}::matrix-sdk-crypto-meta`, version: 1 },
-            { name: `${storeName}::matrix-sdk-crypto`, version: 12 },
+            { name: `${storeName}::matrix-sdk-crypto`, version: 13 },
         ]);
 
         // Let's force to close the `OlmMachine`.