diff --git a/xmtp_mls/Cargo.toml b/xmtp_mls/Cargo.toml index b25eddc58..63dc5b126 100644 --- a/xmtp_mls/Cargo.toml +++ b/xmtp_mls/Cargo.toml @@ -11,10 +11,9 @@ path = "src/bin/update-schema.rs" [features] default = ["native"] grpc = ["xmtp_proto/grpc"] -native = ["libsqlite3-sys/bundled-sqlcipher-vendored-openssl", "diesel_migrations/sqlite", "diesel/sqlite", "diesel/returning_clauses_for_sqlite_3_35", "tokio/rt-multi-thread", "tokio/macros"] +native = ["libsqlite3-sys/bundled-sqlcipher-vendored-openssl"] test-utils = ["xmtp_api_grpc"] bench = ["test-utils", "indicatif", "tracing-subscriber", "anyhow", "tracing-flame", "once_cell"] -web = ["openmls/js", "tokio/macros"] [dependencies] aes = "0.8.4" @@ -22,13 +21,19 @@ aes-gcm = { version = "0.10.3", features = ["std"] } async-trait.workspace = true bincode = "1.3.3" chrono = { workspace = true } -diesel = { git = "https://github.com/xmtp/diesel", branch = "insipx/wasm-backend", features = ["r2d2"] } -diesel_migrations = { git = "https://github.com/xmtp/diesel", branch = "insipx/wasm-backend" } +diesel = { version = "2.2.2", features = [ + "sqlite", + "r2d2", + "returning_clauses_for_sqlite_3_35", +] } +diesel_migrations = { version = "2.2.0", features = ["sqlite"] } ed25519-dalek = "2.1.1" ethers.workspace = true ethers-core.workspace = true futures.workspace = true +parking_lot = "0.12.3" hex.workspace = true +libsqlite3-sys = { version = "0.29.0", optional = true } log.workspace = true tracing.workspace = true openmls = { workspace = true, features = ["test-utils"] } @@ -45,7 +50,7 @@ sha2.workspace = true smart-default = "0.7.1" thiserror = { workspace = true } tls_codec = { workspace = true } -tokio = { workspace = true, default-features = false } +tokio = { workspace = true, features = ["rt-multi-thread"] } tokio-stream = { version = "0.1", features = ["sync"] } toml = "0.8.4" xmtp_cryptography = { workspace = true } @@ -53,9 +58,6 @@ xmtp_id = { path = "../xmtp_id" } xmtp_proto = { workspace = true, features = ["proto_full", "convert"] } xmtp_v2 = { path = "../xmtp_v2" } -# Native -libsqlite3-sys = { version = "0.28.0", optional = true } - # Test/Bench Utils xmtp_api_grpc = { path = "../xmtp_api_grpc", optional = true } tracing-subscriber = { workspace = true, optional = true } @@ -70,6 +72,8 @@ flume = "0.11" mockall = "0.11.4" mockito = "1.4.0" tempfile = "3.5.0" +tracing.workspace = true +tracing-subscriber.workspace = true tracing-log = "0.2.0" tracing-test = "0.2.4" xmtp_api_grpc = { path = "../xmtp_api_grpc" }