Merge branch 'main' into 37ng/verify-1271

xmtp · Apr 2, 2024 · 45b64b2 · 45b64b2
2 parents 5a6371f + 42acd28
commit 45b64b2
Show file tree

Hide file tree

Showing 13 changed files with 346 additions and 104 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/mls_validation_service/Cargo.toml b/mls_validation_service/Cargo.toml
@@ -11,7 +11,6 @@ path = "src/main.rs"
 clap = { version = "4.4.6", features = ["derive"] }
 env_logger = "0.10.0"
 hex = { workspace = true }
-hyper = "1.1.0"
 log = { workspace = true }
 openmls = { workspace = true }
 openmls_basic_credential = { workspace = true }

diff --git a/xmtp_api_grpc/Cargo.toml b/xmtp_api_grpc/Cargo.toml
@@ -15,7 +15,6 @@ pbjson = "0.5.1"
 pbjson-types = "0.5.1"
 prost = { workspace = true, features = ["prost-derive"] }
 serde = { workspace = true, features = ["derive"] }
-serde_json.workspace = true 
 tokio = { workspace = true, features = ["macros", "rt-multi-thread", "time"] }
 tonic = { workspace = true, features = [
     "tls",

diff --git a/xmtp_id/Cargo.toml b/xmtp_id/Cargo.toml
@@ -15,7 +15,10 @@ xmtp_proto.workspace = true
 openmls_traits.workspace = true
 openmls.workspace = true
 openmls_basic_credential.workspace = true
+openmls_rust_crypto.workspace = true
 prost.workspace = true
-tls_codec.workspace = true
 chrono.workspace = true
 serde.workspace = true
+async-trait.workspace = true
+futures.workspace = true
+