Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Plaintext Header for SQLite #1054

Merged
merged 18 commits into from
Sep 12, 2024
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 1 addition & 19 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

81 changes: 5 additions & 76 deletions bindings_ffi/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions bindings_ffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,13 @@ version = "0.0.1"
crate-type = ["lib", "cdylib", "staticlib"]

[dependencies]
env_logger = "0.11.3"
futures = "0.3.28"
log = { version = "0.4", features = ["std"] }
parking_lot = "0.12.3"
thiserror = "1.0"
thread-id = "4.2.1"
tokio = { version = "1.28.1", features = ["macros"] }
uniffi = { version = "0.28.0", features = ["tokio", "cli"] }
uniffi_macros = "0.28.0"
xmtp_api_grpc = { path = "../xmtp_api_grpc" }
xmtp_cryptography = { path = "../xmtp_cryptography" }
xmtp_id = { path = "../xmtp_id" }
Expand All @@ -24,8 +22,7 @@ xmtp_proto = { path = "../xmtp_proto", features = ["proto_full"] }
xmtp_user_preferences = { path = "../xmtp_user_preferences" }
xmtp_v2 = { path = "../xmtp_v2" }

tracing-subscriber = { version = "0.3", features = ["env-filter"] }
# NOTE: A regression in openssl-sys exists where libatomic is dynamically linked
# NOTE: A regression in openssl-sys exists where libatomic is dynamically linked
# for i686-linux-android targets. https://github.com/sfackler/rust-openssl/issues/2163
#
# This is fixed in the openssl-sys fork at
Expand All @@ -50,6 +47,7 @@ tokio-test = "0.4"
tracing-subscriber = "0.3"
uniffi = { version = "0.28.0", features = ["bindgen-tests"] }
uuid = { version = "1.9", features = ["v4", "fast-rng"] }
xmtp_mls = { path = "../xmtp_mls", features = ["native", "test-utils"] }

# NOTE: The release profile reduces bundle size from 230M to 41M - may have performance impliciations
# https://stackoverflow.com/a/54842093
Expand Down
2 changes: 1 addition & 1 deletion bindings_ffi/src/mls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1720,7 +1720,7 @@ mod tests {
xmtp_api_grpc::LOCALHOST_ADDRESS.to_string(),
false,
Some(tmp_path()),
None,
Some(xmtp_mls::storage::EncryptedMessageStore::generate_enc_key().into()),
&inbox_id,
ffi_inbox_owner.get_address(),
nonce,
Expand Down
3 changes: 0 additions & 3 deletions examples/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ path = "cli-client.rs"
clap = { version = "4.4.6", features = ["derive"] }
ethers = "2.0.4"
femme = "2.2.1"
futures = "0.3.28"
hex = "0.4.3"
kv-log-macro = "1.0.7"
log = { workspace = true, features = [
Expand All @@ -30,8 +29,6 @@ serde_json.workspace = true
thiserror.workspace = true
timeago = "0.4.1"
tokio = "1.28.1"
tokio-stream = "0.1.15"
url = "2.3.1"
xmtp_api_grpc = { path = "../../xmtp_api_grpc" }
xmtp_cryptography = { path = "../../xmtp_cryptography" }
xmtp_id = { path = "../../xmtp_id" }
Expand Down
3 changes: 0 additions & 3 deletions xmtp_api_grpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ async-stream.workspace = true
base64 = "0.22"
futures.workspace = true
hex.workspace = true
log = { workspace = true, features = ["std"] }
pbjson-types.workspace = true
pbjson.workspace = true
prost = { workspace = true, features = ["prost-derive"] }
serde = { workspace = true, features = ["derive"] }
tokio = { workspace = true, features = ["macros", "rt-multi-thread", "time"] }
Expand Down
2 changes: 0 additions & 2 deletions xmtp_api_http/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ serde = { workspace = true }
serde_json = { workspace = true }
thiserror = "1.0"
tokio = { workspace = true, features = ["sync", "rt", "macros"] }
tokio-stream = { version = "0.1", default-features = false }
tracing.workspace = true
xmtp_proto = { path = "../xmtp_proto", features = ["proto_full"] }

[dev-dependencies]
Expand Down
Loading