Upgrade Ruma

Author: jplatte

crates/matrix-qrcode/Cargo.toml

@@ -29,4 +29,8 @@ thiserror = "1.0.25"
 
 [dependencies.ruma-identifiers]
 git = "https://github.com/ruma/ruma/"
-rev = "fdbc4d6d1dd273c8a6ac95b329943ed8c68df70d"
+rev = "37095f88553b311e7a70adaaabe39976fb8ff71c"
+
+[dependencies.ruma-serde]
+git = "https://github.com/ruma/ruma/"
+rev = "37095f88553b311e7a70adaaabe39976fb8ff71c"

crates/matrix-qrcode/src/types.rs

@@ -22,6 +22,7 @@ use byteorder::{BigEndian, ReadBytesExt};
 use image::{DynamicImage, GenericImage, GenericImageView, ImageBuffer, Luma};
 use qrcode::QrCode;
 use ruma_identifiers::EventId;
+use ruma_serde::Base64;
 
 #[cfg(feature = "decode_image")]
 use crate::utils::decode_qr;
@@ -312,7 +313,7 @@ impl QrVerificationData {
         let first_key = base_64_encode(&first_key);
         let second_key = base_64_encode(&second_key);
         let flow_id = String::from_utf8(flow_id)?;
-        let shared_secret = base_64_encode(&shared_secret);
+        let shared_secret = Base64::new(shared_secret);
 
         match mode {
             VerificationData::QR_MODE => {
@@ -360,7 +361,7 @@ impl QrVerificationData {
     }
 
     /// Get the secret of this `QrVerificationData`.
-    pub fn secret(&self) -> &str {
+    pub fn secret(&self) -> &Base64 {
         match self {
             QrVerificationData::Verification(v) => &v.shared_secret,
             QrVerificationData::SelfVerification(v) => &v.shared_secret,
@@ -378,7 +379,7 @@ pub struct VerificationData {
     event_id: Box<EventId>,
     first_master_key: String,
     second_master_key: String,
-    shared_secret: String,
+    shared_secret: Base64,
 }
 
 impl VerificationData {
@@ -401,7 +402,7 @@ impl VerificationData {
         event_id: Box<EventId>,
         first_key: String,
         second_key: String,
-        shared_secret: String,
+        shared_secret: Base64,
     ) -> Self {
         Self { event_id, first_master_key: first_key, second_master_key: second_key, shared_secret }
     }
@@ -477,7 +478,7 @@ pub struct SelfVerificationData {
     transaction_id: String,
     master_key: String,
     device_key: String,
-    shared_secret: String,
+    shared_secret: Base64,
 }
 
 impl SelfVerificationData {
@@ -504,7 +505,7 @@ impl SelfVerificationData {
         transaction_id: String,
         master_key: String,
         device_key: String,
-        shared_secret: String,
+        shared_secret: Base64,
     ) -> Self {
         Self { transaction_id, master_key, device_key, shared_secret }
     }
@@ -580,7 +581,7 @@ pub struct SelfVerificationNoMasterKey {
     transaction_id: String,
     device_key: String,
     master_key: String,
-    shared_secret: String,
+    shared_secret: Base64,
 }
 
 impl SelfVerificationNoMasterKey {
@@ -607,7 +608,7 @@ impl SelfVerificationNoMasterKey {
         transaction_id: String,
         device_key: String,
         master_key: String,
-        shared_secret: String,
+        shared_secret: Base64,
     ) -> Self {
         Self { transaction_id, device_key, master_key, shared_secret }
     }

crates/matrix-qrcode/src/utils.rs

@@ -18,6 +18,7 @@ use base64::{decode_config, encode_config, STANDARD_NO_PAD};
 #[cfg(feature = "decode_image")]
 use image::{GenericImage, GenericImageView, Luma};
 use qrcode::{bits::Bits, EcLevel, QrCode, Version};
+use ruma_serde::Base64;
 
 #[cfg(feature = "decode_image")]
 use crate::error::DecodingError;
@@ -41,14 +42,13 @@ pub(crate) fn to_bytes(
     flow_id: &str,
     first_key: &str,
     second_key: &str,
-    shared_secret: &str,
+    shared_secret: &Base64,
 ) -> Result<Vec<u8>, EncodingError> {
     let flow_id_len: u16 = flow_id.len().try_into()?;
     let flow_id_len = flow_id_len.to_be_bytes();
 
     let first_key = base64_decode(first_key)?;
     let second_key = base64_decode(second_key)?;
-    let shared_secret = base64_decode(shared_secret)?;
 
     let data = [
         HEADER,
@@ -58,7 +58,7 @@ pub(crate) fn to_bytes(
         flow_id.as_bytes(),
         &first_key,
         &second_key,
-        &shared_secret,
+        shared_secret.as_bytes(),
     ]
     .concat();
 
@@ -70,7 +70,7 @@ pub(crate) fn to_qr_code(
     flow_id: &str,
     first_key: &str,
     second_key: &str,
-    shared_secret: &str,
+    shared_secret: &Base64,
 ) -> Result<QrCode, EncodingError> {
     let data = to_bytes(mode, flow_id, first_key, second_key, shared_secret)?;
 

crates/matrix-sdk-appservice/Cargo.toml

@@ -38,7 +38,7 @@ warp = { version = "0.3.1", optional = true, default-features = false }
 
 [dependencies.ruma]
 git = "https://github.com/ruma/ruma/"
-rev = "fdbc4d6d1dd273c8a6ac95b329943ed8c68df70d"
+rev = "37095f88553b311e7a70adaaabe39976fb8ff71c"
 features = ["client-api-c", "appservice-api-s", "unstable-pre-spec"]
 
 [dev-dependencies]

crates/matrix-sdk-base/Cargo.toml

@@ -50,7 +50,7 @@ zeroize = { version = "1.3.0", features = ["zeroize_derive"] }
 
 [dependencies.ruma]
 git = "https://github.com/ruma/ruma/"
-rev = "fdbc4d6d1dd273c8a6ac95b329943ed8c68df70d"
+rev = "37095f88553b311e7a70adaaabe39976fb8ff71c"
 features = ["client-api-c", "unstable-pre-spec"]
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies.tokio]

crates/matrix-sdk-base/src/client.rs

@@ -24,6 +24,8 @@ use std::{
     sync::Arc,
 };
 
+#[cfg(feature = "encryption")]
+use matrix_sdk_common::locks::Mutex;
 use matrix_sdk_common::{
     deserialized_responses::{
         AmbiguityChanges, JoinedRoom, LeftRoom, MemberEvent, MembersResponse, Rooms,
@@ -33,8 +35,6 @@ use matrix_sdk_common::{
     locks::RwLock,
 };
 #[cfg(feature = "encryption")]
-use matrix_sdk_common::{locks::Mutex, uuid::Uuid};
-#[cfg(feature = "encryption")]
 use matrix_sdk_crypto::{
     store::{CryptoStore, CryptoStoreError},
     Device, EncryptionSettings, IncomingResponse, MegolmError, OlmError, OlmMachine,
@@ -47,7 +47,7 @@ use ruma::{
         room::{encrypted::RoomEncryptedEventContent, history_visibility::HistoryVisibility},
         AnySyncMessageEvent, MessageEventContent,
     },
-    DeviceId,
+    DeviceId, TransactionId,
 };
 use ruma::{
     api::client::r0::{self as api, push::get_notifications::Notification},
@@ -1038,7 +1038,7 @@ impl BaseClient {
     #[cfg(feature = "encryption")]
     pub async fn mark_request_as_sent<'a>(
         &self,
-        request_id: &Uuid,
+        request_id: &TransactionId,
         response: impl Into<IncomingResponse<'a>>,
     ) -> Result<()> {
         let olm = self.olm.lock().await;
@@ -1056,7 +1056,7 @@ impl BaseClient {
     pub async fn get_missing_sessions(
         &self,
         users: impl Iterator<Item = &UserId>,
-    ) -> Result<Option<(Uuid, KeysClaimRequest)>> {
+    ) -> Result<Option<(Box<TransactionId>, KeysClaimRequest)>> {
         let olm = self.olm.lock().await;
 
         match &*olm {

crates/matrix-sdk-common/Cargo.toml

@@ -17,15 +17,9 @@ serde = "1.0.126"
 
 [dependencies.ruma]
 git = "https://github.com/ruma/ruma/"
-rev = "fdbc4d6d1dd273c8a6ac95b329943ed8c68df70d"
+rev = "37095f88553b311e7a70adaaabe39976fb8ff71c"
 features = ["client-api-c"]
 
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-uuid = { version = "0.8.2", default-features = false, features = [
-    "v4",
-    "serde",
-] }
-
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies.tokio]
 version = "1.7.1"
 default-features = false
@@ -43,8 +37,3 @@ features = ["now"]
 async-lock = "2.4.0"
 futures-util = { version = "0.3.15", default-features = false, features = ["channel"] }
 wasm-bindgen-futures = "0.4.24"
-uuid = { version = "0.8.2", default-features = false, features = [
-    "v4",
-    "wasm-bindgen",
-    "serde",
-] }

crates/matrix-sdk-common/src/lib.rs

@@ -10,7 +10,6 @@
 
 pub use async_trait::async_trait;
 pub use instant;
-pub use uuid;
 
 pub mod deserialized_responses;
 pub mod executor;

crates/matrix-sdk-crypto/Cargo.toml

@@ -48,7 +48,7 @@ zeroize = { version = "1.3.0", features = ["zeroize_derive"] }
 
 [dependencies.ruma]
 git = "https://github.com/ruma/ruma/"
-rev = "fdbc4d6d1dd273c8a6ac95b329943ed8c68df70d"
+rev = "37095f88553b311e7a70adaaabe39976fb8ff71c"
 features = ["client-api-c", "unstable-pre-spec"]
 
 [dev-dependencies]

crates/matrix-sdk-crypto/benches/crypto_bench.rs

@@ -1,7 +1,6 @@
-use std::{ops::Deref, sync::Arc};
+use std::ops::Deref;
 
 use criterion::*;
-use matrix_sdk_common::uuid::Uuid;
 use matrix_sdk_crypto::{EncryptionSettings, OlmMachine};
 use matrix_sdk_test::response_from_file;
 use ruma::{
@@ -12,7 +11,7 @@ use ruma::{
         },
         IncomingResponse,
     },
-    device_id, room_id, user_id, DeviceId, UserId,
+    device_id, room_id, user_id, DeviceId, TransactionId, UserId,
 };
 use serde_json::Value;
 use tokio::runtime::Builder;
@@ -51,7 +50,7 @@ pub fn keys_query(c: &mut Criterion) {
     let runtime = Builder::new_multi_thread().build().expect("Can't create runtime");
     let machine = OlmMachine::new(alice_id(), alice_device_id());
     let response = keys_query_response();
-    let uuid = Uuid::new_v4();
+    let txn_id = TransactionId::new();
 
     let count = response.device_keys.values().fold(0, |acc, d| acc + d.len())
         + response.master_keys.len()
@@ -65,7 +64,7 @@ pub fn keys_query(c: &mut Criterion) {
 
     group.bench_with_input(BenchmarkId::new("memory store", &name), &response, |b, response| {
         b.to_async(&runtime)
-            .iter(|| async { machine.mark_request_as_sent(&uuid, response).await.unwrap() })
+            .iter(|| async { machine.mark_request_as_sent(&txn_id, response).await.unwrap() })
     });
 
     let dir = tempfile::tempdir().unwrap();
@@ -80,17 +79,17 @@ pub fn keys_query(c: &mut Criterion) {
 
     group.bench_with_input(BenchmarkId::new("sled store", &name), &response, |b, response| {
         b.to_async(&runtime)
-            .iter(|| async { machine.mark_request_as_sent(&uuid, response).await.unwrap() })
+            .iter(|| async { machine.mark_request_as_sent(&txn_id, response).await.unwrap() })
     });
 
     group.finish()
 }
 
 pub fn keys_claiming(c: &mut Criterion) {
-    let runtime = Arc::new(Builder::new_multi_thread().build().expect("Can't create runtime"));
+    let runtime = Builder::new_multi_thread().build().expect("Can't create runtime");
 
     let keys_query_response = keys_query_response();
-    let uuid = Uuid::new_v4();
+    let txn_id = TransactionId::new();
 
     let response = keys_claim_response();
 
@@ -106,12 +105,12 @@ pub fn keys_claiming(c: &mut Criterion) {
             || {
                 let machine = OlmMachine::new(alice_id(), alice_device_id());
                 runtime
-                    .block_on(machine.mark_request_as_sent(&uuid, &keys_query_response))
+                    .block_on(machine.mark_request_as_sent(&txn_id, &keys_query_response))
                     .unwrap();
-                (machine, runtime.clone())
+                (machine, &runtime, &txn_id)
             },
-            move |(machine, runtime)| {
-                runtime.block_on(machine.mark_request_as_sent(&uuid, response)).unwrap()
+            move |(machine, runtime, txn_id)| {
+                runtime.block_on(machine.mark_request_as_sent(txn_id, response)).unwrap()
             },
             BatchSize::SmallInput,
         )
@@ -130,12 +129,12 @@ pub fn keys_claiming(c: &mut Criterion) {
                     ))
                     .unwrap();
                 runtime
-                    .block_on(machine.mark_request_as_sent(&uuid, &keys_query_response))
+                    .block_on(machine.mark_request_as_sent(&txn_id, &keys_query_response))
                     .unwrap();
-                (machine, runtime.clone())
+                (machine, &runtime, &txn_id)
             },
-            move |(machine, runtime)| {
-                runtime.block_on(machine.mark_request_as_sent(&uuid, response)).unwrap()
+            move |(machine, runtime, txn_id)| {
+                runtime.block_on(machine.mark_request_as_sent(txn_id, response)).unwrap()
             },
             BatchSize::SmallInput,
         )
@@ -148,7 +147,7 @@ pub fn room_key_sharing(c: &mut Criterion) {
     let runtime = Builder::new_multi_thread().build().expect("Can't create runtime");
 
     let keys_query_response = keys_query_response();
-    let uuid = Uuid::new_v4();
+    let txn_id = TransactionId::new();
     let response = keys_claim_response();
     let room_id = room_id!("!test:localhost");
 
@@ -158,8 +157,8 @@ pub fn room_key_sharing(c: &mut Criterion) {
     let count = response.one_time_keys.values().fold(0, |acc, d| acc + d.len());
 
     let machine = OlmMachine::new(alice_id(), alice_device_id());
-    runtime.block_on(machine.mark_request_as_sent(&uuid, &keys_query_response)).unwrap();
-    runtime.block_on(machine.mark_request_as_sent(&uuid, &response)).unwrap();
+    runtime.block_on(machine.mark_request_as_sent(&txn_id, &keys_query_response)).unwrap();
+    runtime.block_on(machine.mark_request_as_sent(&txn_id, &response)).unwrap();
 
     let mut group = c.benchmark_group("Room key sharing");
     group.throughput(Throughput::Elements(count as u64));
@@ -195,8 +194,8 @@ pub fn room_key_sharing(c: &mut Criterion) {
             None,
         ))
         .unwrap();
-    runtime.block_on(machine.mark_request_as_sent(&uuid, &keys_query_response)).unwrap();
-    runtime.block_on(machine.mark_request_as_sent(&uuid, &response)).unwrap();
+    runtime.block_on(machine.mark_request_as_sent(&txn_id, &keys_query_response)).unwrap();
+    runtime.block_on(machine.mark_request_as_sent(&txn_id, &response)).unwrap();
 
     group.bench_function(BenchmarkId::new("sled store", &name), |b| {
         b.to_async(&runtime).iter(|| async {
@@ -227,7 +226,7 @@ pub fn devices_missing_sessions_collecting(c: &mut Criterion) {
 
     let machine = OlmMachine::new(alice_id(), alice_device_id());
     let response = huge_keys_query_response();
-    let uuid = Uuid::new_v4();
+    let txn_id = TransactionId::new();
     let users: Vec<Box<UserId>> = response.device_keys.keys().cloned().collect();
 
     let count = response.device_keys.values().fold(0, |acc, d| acc + d.len());
@@ -237,7 +236,7 @@ pub fn devices_missing_sessions_collecting(c: &mut Criterion) {
 
     let name = format!("{} devices", count);
 
-    runtime.block_on(machine.mark_request_as_sent(&uuid, &response)).unwrap();
+    runtime.block_on(machine.mark_request_as_sent(&txn_id, &response)).unwrap();
 
     group.bench_function(BenchmarkId::new("memory store", &name), |b| {
         b.to_async(&runtime).iter_with_large_drop(|| async {
@@ -255,7 +254,7 @@ pub fn devices_missing_sessions_collecting(c: &mut Criterion) {
         ))
         .unwrap();
 
-    runtime.block_on(machine.mark_request_as_sent(&uuid, &response)).unwrap();
+    runtime.block_on(machine.mark_request_as_sent(&txn_id, &response)).unwrap();
 
     group.bench_function(BenchmarkId::new("sled store", &name), |b| {
         b.to_async(&runtime).iter(|| async {