diff --git a/.cargo/config.toml b/.cargo/config.toml
index 790fb4b86..8e8e104e1 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -2,13 +2,13 @@
 runner = 'wasm-bindgen-test-runner'
 
 [alias]
-xtask = "run --package xtask --"
 b = "build"
 c = "check"
-t = "test"
 r = "run"
-xli = "run --bin xmtp_cli --"
+t = "test"
 xdbg = "run --release --bin xdbg --"
+xli = "run --bin xmtp_cli --"
+xtask = "run --package xtask --"
 
 [build]
 rustflags = ["--cfg", "tracing_unstable"]
diff --git a/.cargo/nextest.toml b/.cargo/nextest.toml
index b7afc9364..9f2c00dd4 100644
--- a/.cargo/nextest.toml
+++ b/.cargo/nextest.toml
@@ -1,3 +1,3 @@
 [profile.default]
-retries = 3
 default-filter = "not test(test_stream_all_messages_does_not_lose_messages)"
+retries = 3
diff --git a/.taplo.toml b/.taplo.toml
index 4e54f570b..442e5052b 100644
--- a/.taplo.toml
+++ b/.taplo.toml
@@ -1,2 +1,14 @@
+exclude = [".direnv/**"]
+
 [formatting]
+reorder_keys = false
+
+[[rule]]
+include = ["**/Cargo.toml"]
+keys = ["dependencies"]
+
+[rule.formatting]
 reorder_keys = true
+
+[schema]
+path = "https://json.schemastore.org/cargo.json"
diff --git a/bindings_ffi/Cargo.toml b/bindings_ffi/Cargo.toml
index fc33b5e52..fa03f4800 100644
--- a/bindings_ffi/Cargo.toml
+++ b/bindings_ffi/Cargo.toml
@@ -9,14 +9,20 @@ crate-type = ["lib", "cdylib", "staticlib"]
 
 [dependencies]
 futures.workspace = true
-tracing.workspace = true
-tracing-subscriber = { workspace = true, features = ["registry", "env-filter", "fmt", "json"] }
 parking_lot.workspace = true
 prost.workspace = true
 thiserror.workspace = true
 tokio = { workspace = true, features = ["macros"] }
+tracing.workspace = true
+tracing-subscriber = { workspace = true, features = [
+  "registry",
+  "env-filter",
+  "fmt",
+  "json",
+] }
 uniffi = { version = "0.28.0", default-features = false, features = ["tokio"] }
 xmtp_api_grpc = { path = "../xmtp_api_grpc" }
+xmtp_common.workspace = true
 xmtp_content_types = { path = "../xmtp_content_types" }
 xmtp_cryptography = { path = "../xmtp_cryptography" }
 xmtp_id = { path = "../xmtp_id" }
@@ -24,11 +30,10 @@ xmtp_mls = { path = "../xmtp_mls" }
 xmtp_proto = { path = "../xmtp_proto", features = ["proto_full"] }
 xmtp_user_preferences = { path = "../xmtp_user_preferences" }
 xmtp_v2 = { path = "../xmtp_v2" }
-xmtp_common.workspace = true
 
 # Bench
 criterion = { workspace = true, optional = true }
-fdlimit = { version = "0.3", optional = true}
+fdlimit = { version = "0.3", optional = true }
 
 
 [target.'cfg(target_os = "android")'.dependencies]
@@ -62,4 +67,3 @@ bench = ["xmtp_mls/bench", "xmtp_common/bench", "dep:criterion", "dep:fdlimit"]
 harness = false
 name = "create_client"
 required-features = ["bench"]
-
diff --git a/bindings_node/Cargo.toml b/bindings_node/Cargo.toml
index 81729585c..e2d0e8adc 100644
--- a/bindings_node/Cargo.toml
+++ b/bindings_node/Cargo.toml
@@ -18,19 +18,19 @@ napi = { version = "2.12.2", default-features = false, features = [
 napi-derive = "2.12.2"
 prost.workspace = true
 tokio = { workspace = true, features = ["sync"] }
+tracing.workspace = true
 tracing-subscriber = { workspace = true, features = [
   "env-filter",
   "fmt",
   "json",
   "chrono",
 ] }
-tracing.workspace = true
 xmtp_api_grpc = { path = "../xmtp_api_grpc" }
+xmtp_common.workspace = true
 xmtp_cryptography = { path = "../xmtp_cryptography" }
 xmtp_id = { path = "../xmtp_id" }
 xmtp_mls = { path = "../xmtp_mls" }
 xmtp_proto = { path = "../xmtp_proto", features = ["proto_full"] }
-xmtp_common.workspace = true
 
 [build-dependencies]
 napi-build = "2.0.1"
diff --git a/bindings_wasm/Cargo.toml b/bindings_wasm/Cargo.toml
index 83984d96c..6880dae4d 100644
--- a/bindings_wasm/Cargo.toml
+++ b/bindings_wasm/Cargo.toml
@@ -8,23 +8,23 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 console_error_panic_hook.workspace = true
+futures.workspace = true
 hex.workspace = true
 js-sys.workspace = true
 prost.workspace = true
-serde-wasm-bindgen = "0.6.5"
 serde.workspace = true
+serde-wasm-bindgen = "0.6.5"
+tracing.workspace = true
 tracing-subscriber = { workspace = true, features = ["env-filter", "json"] }
 tracing-web = "0.1"
-tracing.workspace = true
-wasm-bindgen-futures.workspace = true
 wasm-bindgen.workspace = true
+wasm-bindgen-futures.workspace = true
 xmtp_api_http = { path = "../xmtp_api_http" }
 xmtp_common.workspace = true
 xmtp_cryptography = { path = "../xmtp_cryptography" }
 xmtp_id = { path = "../xmtp_id" }
 xmtp_mls = { path = "../xmtp_mls", features = ["test-utils", "http-api"] }
 xmtp_proto = { path = "../xmtp_proto", features = ["proto_full"] }
-futures.workspace = true
 
 [dev-dependencies]
 wasm-bindgen-test.workspace = true
diff --git a/common/Cargo.toml b/common/Cargo.toml
index c3bbb3378..5f2d07564 100644
--- a/common/Cargo.toml
+++ b/common/Cargo.toml
@@ -5,23 +5,28 @@ version.workspace = true
 license.workspace = true
 
 [dependencies]
-web-time.workspace = true
-tracing.workspace = true
-tokio = { workspace = true, features = ["time"] }
-rand = "0.8"
 futures.workspace = true
+rand = "0.8"
+tokio = { workspace = true, features = ["time"] }
+tracing.workspace = true
+web-time.workspace = true
 xmtp_cryptography.workspace = true
 
-parking_lot = { workspace = true, optional  = true }
-tracing-subscriber = { workspace = true, features = ["fmt", "env-filter", "ansi", "json"], optional = true }
 once_cell = { workspace = true, optional = true }
+parking_lot = { workspace = true, optional = true }
 tracing-flame = { version = "0.2", optional = true }
+tracing-subscriber = { workspace = true, features = [
+  "fmt",
+  "env-filter",
+  "ansi",
+  "json",
+], optional = true }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 getrandom = { workspace = true, features = ["js"] }
 gloo-timers = { workspace = true, features = ["futures"] }
 tracing-wasm = { version = "0.2", optional = true }
-console_error_panic_hook = { version =  "0.1", optional = true }
+console_error_panic_hook = { version = "0.1", optional = true }
 js-sys.workspace = true
 web-sys = { workspace = true, features = ["Window"] }
 wasm-bindgen-futures.workspace = true
@@ -31,12 +36,27 @@ wasm-bindgen.workspace = true
 thiserror.workspace = true
 
 [target.'cfg(target_arch = "wasm32")'.dev-dependencies]
-tokio = { workspace = true, features = ["time", "macros", "rt", "sync"]}
+tokio = { workspace = true, features = ["time", "macros", "rt", "sync"] }
 wasm-bindgen-test.workspace = true
 
 [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
-tokio = { workspace = true, features = ["time", "macros", "rt-multi-thread", "sync"]}
+tokio = { workspace = true, features = [
+  "time",
+  "macros",
+  "rt-multi-thread",
+  "sync",
+] }
 
 [features]
-test-utils = ["dep:parking_lot", "dep:tracing-subscriber", "dep:tracing-wasm", "dep:console_error_panic_hook"]
-bench = ["test-utils", "dep:tracing-subscriber", "dep:once_cell", "dep:tracing-flame"]
+test-utils = [
+  "dep:parking_lot",
+  "dep:tracing-subscriber",
+  "dep:tracing-wasm",
+  "dep:console_error_panic_hook",
+]
+bench = [
+  "test-utils",
+  "dep:tracing-subscriber",
+  "dep:once_cell",
+  "dep:tracing-flame",
+]
diff --git a/deny.toml b/deny.toml
index 47268c7cf..afc336b7a 100644
--- a/deny.toml
+++ b/deny.toml
@@ -1,6 +1,6 @@
 [advisories]
 ignore = [
-    { id = "RUSTSEC-2024-0384", reason = "migration to alloy is underway which will resolve this advisory" },
+  { id = "RUSTSEC-2024-0384", reason = "migration to alloy is underway which will resolve this advisory" },
 ]
 
 # This rustsec can be added to ignore list if using mls `test_utils` for tests
@@ -10,34 +10,34 @@ ignore = [
 #  },
 [licenses]
 allow = [
-    "Apache-2.0",
-    "BSD-3-Clause",
-    "ISC",
-    "MIT",
-    "MPL-2.0",
-    "Unicode-DFS-2016",
-    "GPL-3.0",
-    "CC0-1.0",
-    "BSD-2-Clause",
-    "Unicode-3.0",
-    "Zlib",
-    "BSL-1.0"
+  "Apache-2.0",
+  "BSD-3-Clause",
+  "ISC",
+  "MIT",
+  "MPL-2.0",
+  "Unicode-DFS-2016",
+  "GPL-3.0",
+  "CC0-1.0",
+  "BSD-2-Clause",
+  "Unicode-3.0",
+  "Zlib",
+  "BSL-1.0",
 ]
 confidence-threshold = 1.0
 
 exceptions = [
-    { allow = [
-        "OpenSSL",
-    ], name = "ring", version = "*" },
-    { allow = [
-        "Unlicense",
-    ], name = "pharos", version = "0.5.3" },
-    { allow = [
-        "Unlicense",
-    ], name = "async_io_stream", version = "0.3.3" },
-    { allow = [
-        "Unlicense",
-    ], name = "ws_stream_wasm", version = "0.7.4" },
+  { allow = [
+    "OpenSSL",
+  ], name = "ring", version = "*" },
+  { allow = [
+    "Unlicense",
+  ], name = "pharos", version = "0.5.3" },
+  { allow = [
+    "Unlicense",
+  ], name = "async_io_stream", version = "0.3.3" },
+  { allow = [
+    "Unlicense",
+  ], name = "ws_stream_wasm", version = "0.7.4" },
 ]
 
 [[licenses.clarify]]
diff --git a/examples/cli/Cargo.toml b/examples/cli/Cargo.toml
index cff9a9200..5121f1c65 100644
--- a/examples/cli/Cargo.toml
+++ b/examples/cli/Cargo.toml
@@ -29,18 +29,18 @@ timeago = "0.4.1"
 tokio.workspace = true
 tracing = { workspace = true, features = ["valuable"] }
 tracing-subscriber = { workspace = true, features = [
-    "json",
-    "valuable",
-    "env-filter",
-    "ansi",
-    "chrono",
+  "json",
+  "valuable",
+  "env-filter",
+  "ansi",
+  "chrono",
 ] }
 valuable = { version = "0.1", features = ["derive"] }
 valuable-serde = "0.1"
 xmtp_api_grpc = { path = "../../xmtp_api_grpc" }
-xmtp_cryptography = { path = "../../xmtp_cryptography" }
+xmtp_common.workspace = true
 xmtp_content_types = { path = "../../xmtp_content_types" }
+xmtp_cryptography = { path = "../../xmtp_cryptography" }
 xmtp_id = { path = "../../xmtp_id" }
 xmtp_mls = { path = "../../xmtp_mls" }
 xmtp_proto = { path = "../../xmtp_proto", features = ["proto_full"] }
-xmtp_common.workspace = true
diff --git a/mls_validation_service/Cargo.toml b/mls_validation_service/Cargo.toml
index 1dd5fef2e..70bcdc00d 100644
--- a/mls_validation_service/Cargo.toml
+++ b/mls_validation_service/Cargo.toml
@@ -20,15 +20,15 @@ hex = { workspace = true }
 openmls = { workspace = true }
 openmls_rust_crypto = { workspace = true }
 thiserror.workspace = true
+tokio = { workspace = true, features = ["signal", "rt-multi-thread"] }
 tonic = { workspace = true }
-tracing-subscriber = { workspace = true, features = ["env-filter", "ansi"] }
 tracing.workspace = true
+tracing-subscriber = { workspace = true, features = ["env-filter", "ansi"] }
 warp = "0.3.6"
 xmtp_cryptography = { path = "../xmtp_cryptography" }
 xmtp_id.workspace = true
 xmtp_mls.workspace = true
 xmtp_proto = { path = "../xmtp_proto", features = ["proto_full", "convert"] }
-tokio = { workspace = true, features = ["signal", "rt-multi-thread"] }
 
 [dev-dependencies]
 anyhow.workspace = true
@@ -36,7 +36,7 @@ ethers.workspace = true
 rand = { workspace = true }
 xmtp_id = { workspace = true, features = ["test-utils"] }
 xmtp_mls = { workspace = true, features = ["test-utils"] }
-xmtp_common = { workspace = true, features = ["test-utils"]}
+xmtp_common = { workspace = true, features = ["test-utils"] }
 
 [features]
 test-utils = ["xmtp_id/test-utils"]
diff --git a/xmtp_api_grpc/Cargo.toml b/xmtp_api_grpc/Cargo.toml
index 67ea6fb16..b1470a141 100644
--- a/xmtp_api_grpc/Cargo.toml
+++ b/xmtp_api_grpc/Cargo.toml
@@ -24,16 +24,12 @@ tonic = { workspace = true, features = [
   "default",
   "tls",
   "tls-native-roots",
-  "tls-webpki-roots"
+  "tls-webpki-roots",
 ] }
 
 # Force Android + iOS to use webki
 [target.'cfg(any(target_os = "android", target_os = "ios"))'.dependencies]
-tonic = { workspace = true, features = [
-  "default",
-  "tls",
-  "tls-webpki-roots",
-] }
+tonic = { workspace = true, features = ["default", "tls", "tls-webpki-roots"] }
 
 [dev-dependencies]
 uuid = { workspace = true, features = ["v4"] }
diff --git a/xmtp_api_http/Cargo.toml b/xmtp_api_http/Cargo.toml
index b183cf9c8..20fcd93c7 100644
--- a/xmtp_api_http/Cargo.toml
+++ b/xmtp_api_http/Cargo.toml
@@ -8,16 +8,16 @@ license.workspace = true
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
+async-trait = "0.1"
+bytes = "1.9"
 futures = { workspace = true, default-features = false }
-tracing.workspace = true
+pin-project-lite = "0.2.15"
+reqwest.workspace = true
 serde = { workspace = true }
 serde_json = { workspace = true }
 thiserror.workspace = true
+tracing.workspace = true
 xmtp_proto = { path = "../xmtp_proto", features = ["proto_full"] }
-async-trait = "0.1"
-bytes = "1.9"
-pin-project-lite = "0.2.15"
-reqwest.workspace = true
 
 xmtp_common.workspace = true
 
diff --git a/xmtp_content_types/Cargo.toml b/xmtp_content_types/Cargo.toml
index 82a8f5eac..96c625137 100644
--- a/xmtp_content_types/Cargo.toml
+++ b/xmtp_content_types/Cargo.toml
@@ -5,16 +5,16 @@ version.workspace = true
 license.workspace = true
 
 [dependencies]
-thiserror = { workspace = true }
 prost = { workspace = true, features = ["prost-derive"] }
 rand = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
+thiserror = { workspace = true }
 tracing.workspace = true
 
 # XMTP/Local
-xmtp_proto = { workspace = true, features = ["convert"] }
 xmtp_common = { workspace = true }
+xmtp_proto = { workspace = true, features = ["convert"] }
 
 [dev-dependencies]
 xmtp_common = { workspace = true, features = ['test-utils'] }
diff --git a/xmtp_cryptography/Cargo.toml b/xmtp_cryptography/Cargo.toml
index 48da44634..c55ec7c99 100644
--- a/xmtp_cryptography/Cargo.toml
+++ b/xmtp_cryptography/Cargo.toml
@@ -6,26 +6,30 @@ version.workspace = true
 license.workspace = true
 
 [package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu", "wasm32-unknown-unknown", "aarch64-apple-darwin"]
+targets = [
+  "x86_64-unknown-linux-gnu",
+  "wasm32-unknown-unknown",
+  "aarch64-apple-darwin",
+]
 
 [dependencies]
-openmls_basic_credential.workspace = true
-openmls_traits.workspace = true
 curve25519-dalek = "4"
 ecdsa = "0.16.9"
+ed25519-dalek = { workspace = true, features = ["digest"] }
+ethers = { workspace = true }
+hex = { workspace = true }
 k256 = { version = "0.13.3", features = ["ecdh"] }
+openmls_basic_credential.workspace = true
+openmls_traits.workspace = true
 rand = { workspace = true }
 rand_chacha = "0.3.1"
-tracing.workspace = true
-ethers = { workspace = true }
-hex = { workspace = true }
 rustc-hex.workspace = true
 serde = { workspace = true }
 sha2.workspace = true
 sha3.workspace = true
 thiserror = { workspace = true }
 tls_codec.workspace = true
-ed25519-dalek = { workspace = true, features = ["digest"] }
+tracing.workspace = true
 zeroize.workspace = true
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
@@ -44,4 +48,3 @@ bincode.workspace = true
 
 [target.'cfg(target_arch = "wasm32")'.dev-dependencies]
 wasm-bindgen-test.workspace = true
-
diff --git a/xmtp_debug/Cargo.toml b/xmtp_debug/Cargo.toml
index 9ed97b708..dcff43aeb 100644
--- a/xmtp_debug/Cargo.toml
+++ b/xmtp_debug/Cargo.toml
@@ -9,39 +9,46 @@ license.workspace = true
 vergen-git2 = { workspace = true, features = ["build"] }
 
 [dependencies]
+chrono.workspace = true
 clap = { version = "4.5.20", features = ["derive"] }
 clap-verbosity-flag = "3.0"
-tracing = { workspace = true, features = ["valuable"] }
-tracing-subscriber = { workspace = true, features = ["time", "json", "chrono", "env-filter", "valuable", "ansi"] }
-xmtp_mls.workspace = true
-xmtp_id.workspace = true
-xmtp_cryptography = { workspace = true, features = ["exposed-keys"] }
-xmtp_api_grpc.workspace = true
-xmtp_proto.workspace = true
-openmls.workspace = true
-indicatif = "0.17"
 color-eyre = "0.6"
-tracing-logfmt.workspace = true 
-owo-colors = "4.1"
-url.workspace = true
-redb = "2.4"
-directories = "6.0"
 const_format.workspace = true
-speedy = "0.8"
-hex.workspace = true
-prost.workspace = true
-xxhash-rust = { version = "0.8", features = ["xxh3"] }
-tokio = "1.43"
+directories = "6.0"
 ecdsa = "0.16"
+ethers.workspace = true
+fdlimit.workspace = true
+fs_extra = "1.3"
+hex.workspace = true
+indicatif = "0.17"
 k256 = "0.13"
+lipsum = "0.9"
+miniserde = "0.1"
+openmls.workspace = true
+owo-colors = "4.1"
+prost.workspace = true
+rand.workspace = true
+redb = "2.4"
+speedy = "0.8"
 tempfile = "3.15"
 thiserror.workspace = true
+tokio = "1.43"
+tracing = { workspace = true, features = ["valuable"] }
 tracing-appender = "0.2"
-chrono.workspace = true
+tracing-logfmt.workspace = true
+tracing-subscriber = { workspace = true, features = [
+  "time",
+  "json",
+  "chrono",
+  "env-filter",
+  "valuable",
+  "ansi",
+] }
+url.workspace = true
 valuable = { version = "0.1", features = ["derive"] }
-rand.workspace = true
-fs_extra = "1.3"
-ethers.workspace = true
-miniserde = "0.1"
-fdlimit.workspace = true
-lipsum = "0.9"
+xmtp_api_grpc.workspace = true
+xmtp_cryptography = { workspace = true, features = ["exposed-keys"] }
+xmtp_id.workspace = true
+xmtp_mls.workspace = true
+xmtp_proto.workspace = true
+xxhash-rust = { version = "0.8", features = ["xxh3"] }
diff --git a/xmtp_id/Cargo.toml b/xmtp_id/Cargo.toml
index 2b6d44c91..b83c2d759 100644
--- a/xmtp_id/Cargo.toml
+++ b/xmtp_id/Cargo.toml
@@ -5,13 +5,17 @@ version.workspace = true
 license.workspace = true
 
 [package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu", "wasm32-unknown-unknown", "aarch64-apple-darwin"]
+targets = [
+  "x86_64-unknown-linux-gnu",
+  "wasm32-unknown-unknown",
+  "aarch64-apple-darwin",
+]
 
 [dependencies]
-url = { workspace = true, features = ["serde"] }
 async-trait.workspace = true
 chrono.workspace = true
 ed25519-dalek = { workspace = true, features = ["digest"] }
+ethers = { workspace = true, features = ["rustls"] }
 futures.workspace = true
 hex.workspace = true
 openmls_traits.workspace = true
@@ -25,11 +29,11 @@ sha2.workspace = true
 thiserror.workspace = true
 tokio = { workspace = true, features = ["macros"] }
 tracing.workspace = true
-xmtp_cryptography.workspace = true
-xmtp_proto = { workspace = true, features = ["proto_full"] }
+url = { workspace = true, features = ["serde"] }
 web-time.workspace = true
-ethers = { workspace = true, features = ["rustls"] }
 xmtp_common.workspace = true
+xmtp_cryptography.workspace = true
+xmtp_proto = { workspace = true, features = ["proto_full"] }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 openmls = { workspace = true, features = ["js"] }
diff --git a/xmtp_mls/Cargo.toml b/xmtp_mls/Cargo.toml
index 659aa426c..071a025b6 100644
--- a/xmtp_mls/Cargo.toml
+++ b/xmtp_mls/Cargo.toml
@@ -8,38 +8,38 @@ version.workspace = true
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 targets = [
-    "x86_64-unknown-linux-gnu",
-    "wasm32-unknown-unknown",
-    "aarch64-apple-darwin",
+  "x86_64-unknown-linux-gnu",
+  "wasm32-unknown-unknown",
+  "aarch64-apple-darwin",
 ]
 
 [features]
 bench = [
-    "test-utils",
-    "indicatif",
-    "tracing-subscriber",
-    "anyhow",
-    "dep:xmtp_api_grpc",
-    "criterion",
-    "dep:fdlimit",
-    "dep:ethers",
-    "dep:const_format",
-    "xmtp_common/bench"
+  "test-utils",
+  "indicatif",
+  "tracing-subscriber",
+  "anyhow",
+  "dep:xmtp_api_grpc",
+  "criterion",
+  "dep:fdlimit",
+  "dep:ethers",
+  "dep:const_format",
+  "xmtp_common/bench",
 ]
 default = ["grpc-api"]
 grpc-api = ["dep:xmtp_api_grpc"]
 http-api = ["dep:xmtp_api_http"]
 test-utils = [
-    "tracing-subscriber",
-    "dep:tracing-wasm",
-    "dep:console_error_panic_hook",
-    "xmtp_id/test-utils",
-    "xmtp_proto/test-utils",
-    "xmtp_api_http/test-utils",
-    "xmtp_api_grpc/test-utils",
-    "dep:const_format",
-    "mockall",
-    "xmtp_common/test-utils",
+  "tracing-subscriber",
+  "dep:tracing-wasm",
+  "dep:console_error_panic_hook",
+  "xmtp_id/test-utils",
+  "xmtp_proto/test-utils",
+  "xmtp_api_http/test-utils",
+  "xmtp_api_grpc/test-utils",
+  "dep:const_format",
+  "mockall",
+  "xmtp_common/test-utils",
 ]
 update-schema = ["toml"]
 
@@ -47,6 +47,7 @@ update-schema = ["toml"]
 aes-gcm = { version = "0.10.3", features = ["std"] }
 async-trait.workspace = true
 bincode.workspace = true
+bytes.workspace = true
 diesel_migrations.workspace = true
 futures = { workspace = true, features = ["alloc"] }
 hex.workspace = true
@@ -54,6 +55,7 @@ hkdf.workspace = true
 openmls_rust_crypto = { workspace = true }
 openmls_traits = { workspace = true }
 parking_lot.workspace = true
+pin-project-lite.workspace = true
 prost = { workspace = true, features = ["prost-derive"] }
 rand = { workspace = true }
 reqwest = { workspace = true }
@@ -63,14 +65,12 @@ sha2.workspace = true
 thiserror = { workspace = true }
 tls_codec = { workspace = true }
 tokio-stream = { version = "0.1", default-features = false, features = [
-    "sync",
+  "sync",
 ] }
 tracing.workspace = true
 trait-variant.workspace = true
 xmtp_common.workspace = true
 zeroize.workspace = true
-pin-project-lite.workspace = true
-bytes.workspace = true
 
 # XMTP/Local
 xmtp_content_types = { path = "../xmtp_content_types" }
@@ -94,21 +94,21 @@ hmac = "0.12.1"
 indicatif = { version = "0.17", optional = true }
 mockall = { version = "0.13.1", optional = true }
 tracing-subscriber = { workspace = true, features = [
-    "env-filter",
-    "fmt",
-    "ansi",
-    "json",
-    "registry",
+  "env-filter",
+  "fmt",
+  "ansi",
+  "json",
+  "registry",
 ], optional = true }
 
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 chrono = { workspace = true, features = ["clock"] }
 diesel = { workspace = true, features = [
-    "r2d2",
-    "returning_clauses_for_sqlite_3_35",
-    "sqlite",
-    "32-column-tables"
+  "r2d2",
+  "returning_clauses_for_sqlite_3_35",
+  "sqlite",
+  "32-column-tables",
 ] }
 dyn-clone.workspace = true
 libsqlite3-sys = { workspace = true }
@@ -116,18 +116,18 @@ openmls.workspace = true
 openssl-sys.workspace = true
 openssl.workspace = true
 tokio = { workspace = true, features = [
-    "macros",
-    "tracing",
-    "rt",
-    "rt-multi-thread",
+  "macros",
+  "tracing",
+  "rt",
+  "rt-multi-thread",
 ] }
 xmtp_api_grpc = { path = "../xmtp_api_grpc", optional = true }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 chrono = { workspace = true, features = ["wasmbind"] }
 diesel = { workspace = true, features = [
-    "r2d2",
-    "returning_clauses_for_sqlite_3_35",
+  "r2d2",
+  "returning_clauses_for_sqlite_3_35",
 ] }
 getrandom = { workspace = true, features = ["js"] }
 gloo-timers = { workspace = true, features = ["futures"] }
@@ -155,10 +155,10 @@ mockito = "1.6.1"
 openmls = { workspace = true }
 tempfile = "3.15.0"
 tracing-subscriber = { workspace = true, features = [
-    "env-filter",
-    "fmt",
-    "ansi",
-    "json",
+  "env-filter",
+  "fmt",
+  "ansi",
+  "json",
 ] }
 xmtp_api_grpc = { path = "../xmtp_api_grpc", features = ["test-utils"] }
 xmtp_api_http = { path = "../xmtp_api_http", features = ["test-utils"] }
diff --git a/xmtp_proto/Cargo.toml b/xmtp_proto/Cargo.toml
index bca5a319d..af8c1d9af 100644
--- a/xmtp_proto/Cargo.toml
+++ b/xmtp_proto/Cargo.toml
@@ -5,19 +5,24 @@ version.workspace = true
 license.workspace = true
 
 [dependencies]
+async-trait = "0.1"
 futures = { workspace = true }
-pbjson-types.workspace = true
+hex.workspace = true
+openmls_rust_crypto = { workspace = true, optional = true }
 pbjson.workspace = true
+pbjson-types.workspace = true
 prost = { workspace = true, features = ["prost-derive"] }
 serde = { workspace = true }
-async-trait = "0.1"
-hex.workspace = true
-openmls_rust_crypto = { workspace = true, optional = true }
 tracing.workspace = true
 xmtp_common.workspace = true
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-tonic = { workspace = true, features = ["codegen", "server", "channel", "prost"] }
+tonic = { workspace = true, features = [
+  "codegen",
+  "server",
+  "channel",
+  "prost",
+] }
 openmls = { workspace = true }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
@@ -34,10 +39,25 @@ test-utils = ["xmtp_common/test-utils"]
 # @@protoc_deletion_point(features)
 # This section is automatically generated by protoc-gen-prost-crate.
 # Changes in this area may be lost on regeneration.
-proto_full = ["xmtp-identity","xmtp-identity-api-v1","xmtp-identity-associations","xmtp-keystore_api-v1","xmtp-message_api-v1","xmtp-message_contents","xmtp-mls-api-v1","xmtp-mls-database","xmtp-mls-message_contents","xmtp-mls-message_contents-content_types","xmtp-mls_validation-v1","xmtp-xmtpv4-envelopes","xmtp-xmtpv4-message_api","xmtp-xmtpv4-payer_api"]
+proto_full = [
+  "xmtp-identity",
+  "xmtp-identity-api-v1",
+  "xmtp-identity-associations",
+  "xmtp-keystore_api-v1",
+  "xmtp-message_api-v1",
+  "xmtp-message_contents",
+  "xmtp-mls-api-v1",
+  "xmtp-mls-database",
+  "xmtp-mls-message_contents",
+  "xmtp-mls-message_contents-content_types",
+  "xmtp-mls_validation-v1",
+  "xmtp-xmtpv4-envelopes",
+  "xmtp-xmtpv4-message_api",
+  "xmtp-xmtpv4-payer_api",
+]
 "xmtp-identity" = []
-"xmtp-identity-api-v1" = ["xmtp-identity","xmtp-identity-associations"]
-"xmtp-identity-associations" = ["xmtp-identity","xmtp-message_contents"]
+"xmtp-identity-api-v1" = ["xmtp-identity", "xmtp-identity-associations"]
+"xmtp-identity-associations" = ["xmtp-identity", "xmtp-message_contents"]
 "xmtp-keystore_api-v1" = ["xmtp-message_contents"]
 "xmtp-message_api-v1" = ["xmtp-message_contents"]
 "xmtp-message_contents" = []
@@ -45,8 +65,14 @@ proto_full = ["xmtp-identity","xmtp-identity-api-v1","xmtp-identity-associations
 "xmtp-mls-database" = []
 "xmtp-mls-message_contents" = []
 "xmtp-mls-message_contents-content_types" = ["xmtp-mls-message_contents"]
-"xmtp-mls_validation-v1" = ["xmtp-identity-api-v1","xmtp-identity-associations"]
-"xmtp-xmtpv4-envelopes" = ["xmtp-identity-associations","xmtp-mls-api-v1"]
-"xmtp-xmtpv4-message_api" = ["xmtp-identity-associations","xmtp-xmtpv4-envelopes"]
+"xmtp-mls_validation-v1" = [
+  "xmtp-identity-api-v1",
+  "xmtp-identity-associations",
+]
+"xmtp-xmtpv4-envelopes" = ["xmtp-identity-associations", "xmtp-mls-api-v1"]
+"xmtp-xmtpv4-message_api" = [
+  "xmtp-identity-associations",
+  "xmtp-xmtpv4-envelopes",
+]
 "xmtp-xmtpv4-payer_api" = ["xmtp-xmtpv4-envelopes"]
-## @@protoc_insertion_point(features)
\ No newline at end of file
+## @@protoc_insertion_point(features)
diff --git a/xmtp_user_preferences/Cargo.toml b/xmtp_user_preferences/Cargo.toml
index ff668d026..c659bd6a7 100644
--- a/xmtp_user_preferences/Cargo.toml
+++ b/xmtp_user_preferences/Cargo.toml
@@ -13,7 +13,7 @@ xmtp_v2 = { path = "../xmtp_v2" }
 
 [dev-dependencies]
 libsecp256k1 = { version = "0.7.1", default-features = false, features = [
-    "hmac",
-    "static-context",
+  "hmac",
+  "static-context",
 ] }
 rand.workspace = true
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index af64f7772..beee35dca 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -6,6 +6,6 @@ license.workspace = true
 
 [dependencies]
 color-eyre = "0.6"
-xshell = "0.2"
-xflags = "0.3"
 spinach = "3"
+xflags = "0.3"
+xshell = "0.2"