diff --git a/Cargo.lock b/Cargo.lock
index f7c0905f54..79d906aa92 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -507,12 +507,6 @@ version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
 
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
 [[package]]
 name = "bytes"
 version = "1.5.0"
@@ -665,16 +659,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
-[[package]]
-name = "colored"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8"
-dependencies = [
- "lazy_static",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "concurrent-queue"
 version = "2.4.0"
@@ -804,12 +788,6 @@ dependencies = [
  "syn 2.0.58",
 ]
 
-[[package]]
-name = "data-encoding"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
-
 [[package]]
 name = "der"
 version = "0.7.8"
@@ -1776,10 +1754,8 @@ dependencies = [
  "libstackerdb 0.0.1",
  "mutants",
  "rand 0.8.5",
- "rand_core 0.6.4",
  "serde",
  "serde_json",
- "sha2 0.10.8",
  "slog",
  "stacks-common 0.0.1",
  "stackslib 0.0.1",
@@ -1823,7 +1799,6 @@ name = "libstackerdb"
 version = "0.0.1"
 dependencies = [
  "clarity 0.0.1",
- "secp256k1",
  "serde",
  "sha2 0.10.8",
  "stacks-common 0.0.1",
@@ -1979,7 +1954,6 @@ checksum = "09b34bd91b9e5c5b06338d392463e1318d683cf82ec3d3af4014609be6e2108d"
 dependencies = [
  "assert-json-diff 2.0.2",
  "bytes",
- "colored",
  "futures-util",
  "http 1.1.0",
  "http-body 1.0.1",
@@ -1995,24 +1969,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "multer"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01acbdc23469fd8fe07ab135923371d5f5a422fbf9c522158677c8eb15bc51c2"
-dependencies = [
- "bytes",
- "encoding_rs",
- "futures-util",
- "http 0.2.11",
- "httparse",
- "log",
- "memchr",
- "mime",
- "spin 0.9.8",
- "version_check",
-]
-
 [[package]]
 name = "mutants"
 version = "0.0.3"
@@ -2364,7 +2320,6 @@ dependencies = [
  "cfg-if 0.1.10",
  "fnv",
  "lazy_static",
- "protobuf",
  "spin 0.5.2",
  "thiserror",
 ]
@@ -2389,12 +2344,6 @@ dependencies = [
  "unarray",
 ]
 
-[[package]]
-name = "protobuf"
-version = "2.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94"
-
 [[package]]
 name = "psm"
 version = "0.1.21"
@@ -2957,8 +2906,6 @@ version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b258109f244e1d6891bf1053a55d63a5cd4f8f4c30cf9a1280989f80e7a1fa9"
 dependencies = [
- "futures",
- "log",
  "once_cell",
  "parking_lot",
  "scc",
@@ -3244,7 +3191,6 @@ dependencies = [
  "base64 0.12.3",
  "chrono",
  "clarity 0.0.1",
- "hashbrown 0.15.2",
  "http-types",
  "lazy_static",
  "libc",
@@ -3295,25 +3241,21 @@ dependencies = [
  "lazy_static",
  "libsigner 0.0.1",
  "libstackerdb 0.0.1",
- "num-traits",
  "prometheus",
  "rand 0.8.5",
  "rand_core 0.6.4",
  "reqwest",
  "rusqlite",
- "secp256k1",
  "serde",
  "serde_json",
  "slog",
  "slog-json",
- "slog-term",
  "stacks-common 0.0.1",
  "stackslib 0.0.1",
  "stdext",
  "thiserror",
  "tiny_http",
  "toml",
- "tracing",
  "tracing-subscriber",
  "url",
 ]
@@ -3361,21 +3303,18 @@ dependencies = [
  "libstackerdb 0.0.1",
  "mio 0.6.23",
  "mutants",
- "nix",
  "percent-encoding",
  "pox-locking 2.4.0",
  "prometheus",
  "proptest",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
- "rand_core 0.6.4",
  "regex",
  "ripemd",
  "rlimit",
  "rstest",
  "rstest_reuse",
  "rusqlite",
- "secp256k1",
  "serde",
  "serde_derive",
  "serde_json",
@@ -3390,7 +3329,6 @@ dependencies = [
  "time 0.3.41",
  "toml",
  "url",
- "winapi 0.3.9",
 ]
 
 [[package]]
@@ -3778,18 +3716,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "tokio-tungstenite"
-version = "0.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c"
-dependencies = [
- "futures-util",
- "log",
- "tokio",
- "tungstenite",
-]
-
 [[package]]
 name = "tokio-util"
 version = "0.7.10"
@@ -3887,25 +3813,6 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
-[[package]]
-name = "tungstenite"
-version = "0.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9"
-dependencies = [
- "byteorder",
- "bytes",
- "data-encoding",
- "http 0.2.11",
- "httparse",
- "log",
- "rand 0.8.5",
- "sha1 0.10.6",
- "thiserror",
- "url",
- "utf-8",
-]
-
 [[package]]
 name = "typenum"
 version = "1.17.0"
@@ -3966,12 +3873,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "utf-8"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
-
 [[package]]
 name = "utf8parse"
 version = "0.2.1"
@@ -3986,9 +3887,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
 [[package]]
 name = "value-bag"
-version = "1.7.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "126e423afe2dd9ac52142e7e9d5ce4135d7e13776c529d27fd6bc49f19e3280b"
+checksum = "943ce29a8a743eb10d6082545d861b24f9d1b160b7d741e0f2cdf726bec909c5"
 
 [[package]]
 name = "vcpkg"
@@ -4041,7 +3942,6 @@ dependencies = [
  "log",
  "mime",
  "mime_guess",
- "multer",
  "percent-encoding",
  "pin-project",
  "rustls-pemfile",
@@ -4051,7 +3951,6 @@ dependencies = [
  "serde_urlencoded",
  "tokio",
  "tokio-stream",
- "tokio-tungstenite",
  "tokio-util",
  "tower-service",
  "tracing",
diff --git a/Cargo.toml b/Cargo.toml
index 72b167a3d4..45fd6871da 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,34 +1,100 @@
 [workspace]
-resolver = "2"
+resolver = "3"
 members = [
-    "stackslib",
-    "stacks-common",
-    "pox-locking",
-    "clarity-serialization",
     "clarity",
-    "stx-genesis",
-    "libstackerdb",
+    "clarity-serialization",
+    "contrib/tools/config-docs-generator",
     "libsigner",
-    "stacks-signer",
+    "libstackerdb",
+    "pox-locking",
+    "stacks-common",
     "stacks-node",
-    "contrib/tools/config-docs-generator"]
+    "stacks-signer",
+    "stackslib",
+    "stx-genesis",
+]
 
-# Dependencies we want to keep the same between workspace members
 [workspace.dependencies]
+# Local Crates
+clarity = { path = "./clarity", default-features = false }
+clarity-serialization = { path = "./clarity-serialization", default-features = false }
+libsigner = { path = "./libsigner", default-features = false }
+libstackerdb = { path = "./libstackerdb", default-features = false }
+pox-locking = { path = "./pox-locking", default-features = false }
+stacks = { package = "stackslib", path = "./stackslib", default-features = false }  # Alias for stackslib
+stacks-common = { path = "./stacks-common", default-features = false }
+stacks-signer = { path = "./stacks-signer", default-features = false }
+stackslib = { path = "./stackslib", default-features = false }
+stx-genesis = { path = "./stx-genesis", default-features = false }
+
+# Stacks' dependencies
+madhouse = { git = "https://github.com/stacks-network/madhouse-rs.git", default-features = false, tag = "0.2.0" }
+pinny = { git = "https://github.com/BitcoinL2-Labs/pinny-rs.git", default-features = false, rev = "54ba9d533a7b84525a5e65a3eae1a3ae76b9ea49" } #v0.0.2
+
+# Crates.io
+async-h1 = { version = "2.3.2", default-features = false }
+async-std = { version = "1.6", features = ["attributes"] }  # requires default features
+backoff = { version = "0.4", default-features = false }
+backtrace = { version = "0.3.50", default-features = false, features = ["std"] }
+base64 = { version = "0.12.0", default-features = false, features = ["std"] }
+chrono = { version = "0.4.41", default-features = false }
+clap = { version = "4.1.1", features = ["derive", "env"] }
+curve25519-dalek = { version = "4.1.3", default-features = false, features = ["serde"] }
 ed25519-dalek = { version = "2.1.1", default-features = false }
+getrandom = { version = "0.2", default-features = false }
 hashbrown = { version = "0.15.2", features = ["serde"] }
-lazy_static = "1.4.0"
-rand_core = "0.6.4"
-rand = "0.8"
-rand_chacha = "0.3.1"
-serde = "1"
-serde_derive = "1"
-serde_json = { version = "1.0", features = ["arbitrary_precision", "unbounded_depth"] }
-slog = { version = "2.5.2", features = [ "max_level_trace" ] }
-rusqlite = { version = "0.31.0", features = ["blob", "serde_json", "i128_blob", "bundled", "trace"] }
-tikv-jemallocator = "0.5.4"
-thiserror = "1.0.65"
-toml = "0.5.6"
+http-types = { version = "2.12", default-features = false }
+integer-sqrt = { version = "0.1.3", default-features = false }
+lazy_static = { version = "1.4.0", default-features = false }
+libc = { version = "0.2.151", default-features = false }
+libflate = { version = "1.0.3", default-features = false }
+libsecp256k1 = { version = "0.7.0", default-features = false, features = ["hmac"] }
+mio = { version = "0.6", default-features = false }
+nix = { version = "0.23", default-features = false }
+percent-encoding = { version = "2.1.0", default-features = false }
+pico-args = { version = "0.5.0", default-features = false }
+prometheus = { version = "0.9", default-features = false }
+rand = { version = "0.8", default-features = false }
+rand_chacha = { version = "0.3.1", default-features = false }
+regex = { version = "1", default-features = false }
+reqwest = { version = "0.11.22", default-features = false, features = ["blocking", "json", "rustls-tls"] }
+ripemd = { version = "0.1.1", default-features = false }
+rusqlite = { version = "0.31.0", default-features = false, features = ["blob", "serde_json", "i128_blob", "bundled", "trace"] }
+secp256k1 = { version = "0.24.3", default-features = false, features = ["std","serde", "recovery"] }
+serde = { version = "1", default-features = false }
+serde_derive = { version = "1", default-features = false }
+serde_json = { version = "1.0", default-features = false }
+serde_stacker = { version = "0.1", default-features = false }
+sha2 = { version = "0.10", default-features = false, features = ["std"] }
+sha3 = { version = "0.10.1", default-features = false }
+siphasher = { version = "0.3.7", default-features = false }
+slog = { version = "2.5.2", default-features = false, features = [ "max_level_trace" ] }
+slog-json = { version = "2.3.0", default-features = false }
+slog-term = { version = "2.6.0", default-features = false }
+thiserror = { version = "1.0.65", default-features = false }
+tikv-jemallocator = { version = "0.5.4", default-features = false }
+time = { version = "0.3.41", default-features = false }
+tiny_http = { version = "0.12.0", default-features = false }
+toml = { version = "0.5.6", default-features = false }
+tracing = { version = "0.1.37", default-features = false }
+tracing-subscriber = { version = "0.3.17", default-features = false, features = ["env-filter"] }
+url = { version = "2.1.0", default-features = false }
+winapi = { version = "0.3", default-features = false }
+
+# Tests-only
+assert-json-diff = { version = "1.0.0", default-features = false }
+mockito = { version = "1.5", default-features = false }
+mutants = { version = "0.0.3", default-features = false }
+proptest = { version = "1.6.*", default-features = false, features = ["std"] }
+rand_core = { version = "0.6.4", default-features = false }
+rlimit = { version = "0.10.2", default-features = false }
+rstest = { version = "0.17.0", default-features = false }
+rstest_reuse = { version = "0.5.0", default-features = false }
+serial_test = { version = "3.2.0", default-features = false }
+stdext = { version = "0.3.1", default-features = false }
+tempfile = { version = "3.3", default-features = false }
+tokio = { version = "1.15", default-features = false }
+warp = { version = "0.3.5", default-features = false }
 
 # Use a bit more than default optimization for
 # dev builds to speed up test execution
diff --git a/clarity-serialization/Cargo.toml b/clarity-serialization/Cargo.toml
index 341d8c0c29..d20a6e788c 100644
--- a/clarity-serialization/Cargo.toml
+++ b/clarity-serialization/Cargo.toml
@@ -6,21 +6,20 @@ description = "Serialization and deserialization for Stacks Clarity smart contra
 license = "GPLv3"
 homepage = "https://github.com/stacks-network/stacks-core"
 repository = "https://github.com/stacks-network/stacks-core"
-keywords = [ "stacks", "stx", "bitcoin", "crypto", "blockstack", "decentralized", "dapps", "blockchain" ]
+keywords = [
+    "stacks",
+    "stx",
+    "bitcoin",
+    "crypto",
+    "blockstack",
+    "decentralized",
+    "dapps",
+    "blockchain",
+]
 readme = "README.md"
 
-[dependencies]
-lazy_static = { workspace = true }
-regex = { version = "1", default-features = false }
-serde = { workspace = true }
-serde_derive = { workspace = true }
-slog = { workspace = true }
-stacks_common = { package = "stacks-common", path = "../stacks-common", default-features = false }
-thiserror = { workspace = true }
-
-[dev-dependencies]
-mutants = "0.0.3"
-rstest = "0.17.0"
+[package.metadata.cargo-machete]
+ignored = ["slog"]
 
 [features]
 default = []
@@ -30,3 +29,16 @@ slog_json = ["stacks_common/slog_json"]
 # Wasm-specific features for easier configuration
 wasm-web = ["stacks_common/wasm-web"]
 wasm-deterministic = ["stacks_common/wasm-deterministic"]
+
+[dependencies]
+lazy_static.workspace = true
+regex.workspace = true
+serde.workspace = true
+serde_derive.workspace = true
+slog.workspace = true
+stacks_common = { package = "stacks-common", path = "../stacks-common", default-features = false }
+thiserror.workspace = true
+
+[dev-dependencies]
+mutants.workspace = true
+rstest.workspace = true
diff --git a/clarity/Cargo.toml b/clarity/Cargo.toml
index bd03934a1f..35e656c49f 100644
--- a/clarity/Cargo.toml
+++ b/clarity/Cargo.toml
@@ -1,51 +1,33 @@
 [package]
 name = "clarity"
 version = "0.0.1"
-authors = [ "Jude Nelson <jude@stacks.org>",
-            "Aaron Blankstein <aaron@blockstack.com>",
-            "Ludo Galabru <ludovic@blockstack.com>" ]
+authors = [
+    "Jude Nelson <jude@stacks.org>",
+    "Aaron Blankstein <aaron@blockstack.com>",
+    "Ludo Galabru <ludovic@blockstack.com>",
+]
 license = "GPLv3"
 homepage = "https://github.com/blockstack/stacks-blockchain"
 repository = "https://github.com/blockstack/stacks-blockchain"
 description = "Reference implementation of the Stacks 2.0 Blockchain"
-keywords = [ "stacks", "stx", "bitcoin", "crypto", "blockstack", "decentralized", "dapps", "blockchain" ]
+keywords = [
+    "stacks",
+    "stx",
+    "bitcoin",
+    "crypto",
+    "blockstack",
+    "decentralized",
+    "dapps",
+    "blockchain",
+]
 readme = "README.md"
 edition = "2021"
-resolver = "2"
+resolver = "3"
 
 [lib]
 name = "clarity"
 path = "./src/libclarity.rs"
 
-[dependencies]
-serde = "1"
-serde_derive = "1"
-regex = "1"
-lazy_static = "1.4.0"
-integer-sqrt = "0.1.3"
-slog = { version = "2.5.2", features = [ "max_level_trace" ] }
-stacks_common = { package = "stacks-common", path = "../stacks-common", default-features = false }
-rstest = { version = "0.17.0", optional = true }
-rstest_reuse = { version = "0.5.0", optional = true }
-hashbrown = { workspace = true }
-rusqlite = { workspace = true, optional = true }
-
-[dependencies.serde_json]
-version = "1.0"
-features = ["arbitrary_precision", "unbounded_depth"]
-
-[dev-dependencies]
-assert-json-diff = "1.0.0"
-mutants = "0.0.3"
-rstest = { version = "0.17.0" }
-rstest_reuse = { version = "0.5.0" }
-# a nightly rustc regression (35dbef235 2021-03-02) prevents criterion from compiling
-#  but it isn't necessary for tests: only benchmarks. therefore, commenting out for now.
-# criterion = "0.3"
-
-[target.'cfg(not(target_family = "wasm"))'.dependencies]
-serde_stacker = "0.1"
-
 [features]
 default = ["rusqlite"]
 developer-mode = ["stacks_common/developer-mode"]
@@ -56,3 +38,29 @@ devtools = []
 rollback_value_check = []
 disable-costs = []
 wasm-web = ["stacks_common/wasm-web"]
+
+[dependencies]
+hashbrown.workspace = true
+integer-sqrt.workspace = true
+lazy_static.workspace = true
+regex.workspace = true
+rstest = { workspace = true, optional = true }
+rstest_reuse = { workspace = true, optional = true }
+rusqlite = { workspace = true, optional = true }
+serde.workspace = true
+serde_derive.workspace = true
+serde_json = { workspace = true, features = ["std", "arbitrary_precision", "unbounded_depth"] }
+slog.workspace = true
+stacks_common = { package = "stacks-common", path = "../stacks-common", default-features = false }
+# a nightly rustc regression (35dbef235 2021-03-02) prevents criterion from compiling
+#  but it isn't necessary for tests: only benchmarks. therefore, commenting out for now.
+# criterion = "0.3"
+
+[target.'cfg(not(target_family = "wasm"))'.dependencies]
+serde_stacker.workspace = true
+
+[dev-dependencies]
+assert-json-diff.workspace = true
+mutants.workspace = true
+rstest.workspace = true
+rstest_reuse.workspace = true
diff --git a/clarity/fuzz/Cargo.toml b/clarity/fuzz/Cargo.toml
index 5dcdded047..53030fc5d9 100644
--- a/clarity/fuzz/Cargo.toml
+++ b/clarity/fuzz/Cargo.toml
@@ -8,16 +8,10 @@ edition = "2021"
 cargo-fuzz = true
 
 [dependencies]
-libfuzzer-sys = "0.4"
+libfuzzer-sys = { version = "0.4", default-features = false }
 # clarity_2_1 = { git = "https://github.com/stacks-network/stacks-blockchain.git", tag = "2.1.0.0.0", package="clarity"}
-
-[dependencies.clarity]
-path = ".."
-features = ["testing"]
-
-[dependencies.stacks-common]
-path = "../../stacks-common"
-features = ["testing"]
+clarity = { path = "..", features = ["testing"] }
+stacks-common = { path = "../../stacks-common", features = ["testing"] }
 
 # Prevent this from interfering with workspaces
 [workspace]
diff --git a/contrib/tools/config-docs-generator/Cargo.toml b/contrib/tools/config-docs-generator/Cargo.toml
index ccf1cdbb80..2b6e0a39dd 100644
--- a/contrib/tools/config-docs-generator/Cargo.toml
+++ b/contrib/tools/config-docs-generator/Cargo.toml
@@ -11,20 +11,20 @@ path = "src/extract_docs.rs"
 name = "generate-markdown"
 path = "src/generate_markdown.rs"
 
-# Add integration test configuration
-[[test]]
-name = "integration"
-path = "tests/integration.rs"
-
 [dependencies]
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-clap = { version = "4.0", features = ["derive"] }
-regex = "1.0"
 anyhow = "1.0"
+clap = { version = "4.0", features = ["derive"] }
 once_cell = "1.18"
+regex = "1.0"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
 
 # Add test dependencies
 [dev-dependencies]
-tempfile = "3.0"
 assert_cmd = "2.0"
+tempfile = "3.0"
+
+# Add integration test configuration
+[[test]]
+name = "integration"
+path = "tests/integration.rs"
diff --git a/libsigner/Cargo.toml b/libsigner/Cargo.toml
index 404e443b31..ef5443e735 100644
--- a/libsigner/Cargo.toml
+++ b/libsigner/Cargo.toml
@@ -1,46 +1,44 @@
 [package]
 name = "libsigner"
 version = "0.0.1"
-authors = [ "Jude Nelson <jude@stacks.org>" ]
+authors = ["Jude Nelson <jude@stacks.org>"]
 license = "GPLv3"
 homepage = "https://github.com/blockstack/stacks-blockchain"
 repository = "https://github.com/blockstack/stacks-blockchain"
 description = "Library for Stacks signer daemons"
-keywords = [ "stacks", "stx", "bitcoin", "crypto", "blockstack", "decentralized", "dapps", "blockchain" ]
+keywords = [
+    "stacks",
+    "stx",
+    "bitcoin",
+    "crypto",
+    "blockstack",
+    "decentralized",
+    "dapps",
+    "blockchain",
+]
 readme = "README.md"
-resolver = "2"
 edition = "2021"
+resolver = "3"
 
 [lib]
 name = "libsigner"
 path = "./src/libsigner.rs"
 
 [dependencies]
-clarity = { path = "../clarity" }
-hashbrown = { workspace = true }
-lazy_static = "1.4.0"
-libc = "0.2"
-libstackerdb = { path = "../libstackerdb" }
-serde = "1"
-slog = { version = "2.5.2", features = [ "max_level_trace" ] }
-stacks-common = { path = "../stacks-common" }
-stackslib = { path = "../stackslib"}
-thiserror = { workspace = true }
-tiny_http = "0.12"
+clarity.workspace = true
+hashbrown.workspace = true
+lazy_static.workspace = true
+libc.workspace = true
+libstackerdb.workspace = true
+serde.workspace = true
+serde_json = { workspace = true, features = ["arbitrary_precision", "unbounded_depth"] }
+slog.workspace = true
+stacks-common = { workspace = true, features = ["ctrlc-handler"] }
+stackslib.workspace = true
+thiserror.workspace = true
+tiny_http.workspace = true
 
 [dev-dependencies]
-mutants = "0.0.3"
-rand_core = { workspace = true }
-rand = { workspace = true }
-stacks-common = { path = "../stacks-common", features = ["testing"] }
-
-
-[dependencies.serde_json]
-version = "1.0"
-features = ["arbitrary_precision", "unbounded_depth"]
-
-[target.'cfg(all(any(target_arch = "x86_64", target_arch = "x86", target_arch = "aarch64"), not(any(target_os="windows"))))'.dependencies]
-sha2 = { version = "0.10", features = ["asm"] }
-
-[target.'cfg(any(not(any(target_arch = "x86_64", target_arch = "x86", target_arch = "aarch64")), any(target_os = "windows")))'.dependencies]
-sha2 = { version = "0.10" }
+mutants.workspace = true
+rand.workspace = true
+stacks-common = { workspace = true, features = ["testing"] }
diff --git a/libstackerdb/Cargo.toml b/libstackerdb/Cargo.toml
index c4910a7d25..2e759aed88 100644
--- a/libstackerdb/Cargo.toml
+++ b/libstackerdb/Cargo.toml
@@ -1,31 +1,35 @@
 [package]
 name = "libstackerdb"
 version = "0.0.1"
-authors = [ "Jude Nelson <jude@stacks.org>" ]
+edition = "2024"
+authors = ["Jude Nelson <jude@stacks.org>"]
 license = "GPLv3"
 homepage = "https://github.com/blockstack/stacks-blockchain"
 repository = "https://github.com/blockstack/stacks-blockchain"
 description = "Client library for the StackerDB subsystem"
-keywords = [ "stacks", "stx", "bitcoin", "crypto", "blockstack", "decentralized", "dapps", "blockchain" ]
+keywords = [
+    "stacks",
+    "stx",
+    "bitcoin",
+    "crypto",
+    "blockstack",
+    "decentralized",
+    "dapps",
+    "blockchain",
+]
 readme = "README.md"
-resolver = "2"
-edition = "2021"
 
 [lib]
 name = "libstackerdb"
 path = "./src/libstackerdb.rs"
 
-[dependencies]
-serde = "1"
-stacks-common = { path = "../stacks-common" }
-clarity = { path = "../clarity" }
-
-[dependencies.secp256k1]
-version = "0.24.3"
-features = ["serde", "recovery"]
-
 [target.'cfg(all(any(target_arch = "x86_64", target_arch = "x86", target_arch = "aarch64"), not(any(target_os="windows"))))'.dependencies]
-sha2 = { version = "0.10", features = ["asm"] }
+sha2 = { workspace = true, features = ["asm"] }
+
+[dependencies]
+clarity.workspace = true
+serde.workspace = true
+stacks-common.workspace = true
 
 [target.'cfg(any(not(any(target_arch = "x86_64", target_arch = "x86", target_arch = "aarch64")), any(target_os = "windows")))'.dependencies]
-sha2 = { version = "0.10" }
+sha2.workspace = true
diff --git a/libstackerdb/src/libstackerdb.rs b/libstackerdb/src/libstackerdb.rs
index 44d51b6d7f..3ba518803a 100644
--- a/libstackerdb/src/libstackerdb.rs
+++ b/libstackerdb/src/libstackerdb.rs
@@ -26,11 +26,11 @@ use clarity::vm::types::QualifiedContractIdentifier;
 use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha512_256};
 use stacks_common::codec::{
-    read_next, read_next_at_most, write_next, Error as CodecError, StacksMessageCodec,
+    Error as CodecError, StacksMessageCodec, read_next, read_next_at_most, write_next,
 };
-use stacks_common::types::chainstate::{StacksAddress, StacksPrivateKey, StacksPublicKey};
 use stacks_common::types::PrivateKey;
-use stacks_common::util::hash::{hex_bytes, to_hex, Hash160, Sha512Trunc256Sum};
+use stacks_common::types::chainstate::{StacksAddress, StacksPrivateKey, StacksPublicKey};
+use stacks_common::util::hash::{Hash160, Sha512Trunc256Sum, hex_bytes, to_hex};
 use stacks_common::util::secp256k1::MessageSignature;
 
 /// maximum chunk size (16 MB; same as MAX_PAYLOAD_SIZE)
diff --git a/pox-locking/Cargo.toml b/pox-locking/Cargo.toml
index 9863c2b5c4..4169485a74 100644
--- a/pox-locking/Cargo.toml
+++ b/pox-locking/Cargo.toml
@@ -1,31 +1,45 @@
 [package]
 name = "pox-locking"
 version = "2.4.0"
-authors = [ "Jude Nelson <jude@stacks.org>",
-            "Aaron Blankstein <aaron@blockstack.com>",
-            "Ludo Galabru <ludovic@blockstack.com>" ]
+authors = [
+    "Jude Nelson <jude@stacks.org>",
+    "Aaron Blankstein <aaron@blockstack.com>",
+    "Ludo Galabru <ludovic@blockstack.com>",
+]
 license = "GPLv3"
 homepage = "https://github.com/blockstack/stacks-blockchain"
 repository = "https://github.com/blockstack/stacks-blockchain"
 description = "Contract call result handler for applying PoX lock operations"
-keywords = [ "stacks", "stx", "bitcoin", "crypto", "blockstack", "decentralized", "dapps", "blockchain" ]
+keywords = [
+    "stacks",
+    "stx",
+    "bitcoin",
+    "crypto",
+    "blockstack",
+    "decentralized",
+    "dapps",
+    "blockchain",
+]
 readme = "README.md"
-resolver = "2"
+resolver = "3"
 edition = "2021"
 rust-version = "1.61"
 
+[package.metadata.cargo-machete]
+ignored = ["slog"]
+
 [lib]
 name = "pox_locking"
 path = "src/lib.rs"
 
-[dependencies]
-clarity = { package = "clarity", path = "../clarity", default-features = false}
-stacks_common = { package = "stacks-common", path = "../stacks-common", default-features = false}
-slog = { version = "2.5.2", features = [ "max_level_trace" ] }
-
-[dev-dependencies]
-mutants = "0.0.3"
-
 [features]
 slog_json = ["stacks_common/slog_json", "clarity/slog_json"]
 testing = []
+
+[dependencies]
+clarity.workspace = true
+slog.workspace = true
+stacks_common = { package = "stacks-common", path = "../stacks-common", default-features = false }
+
+[dev-dependencies]
+mutants.workspace = true
diff --git a/stacks-common/Cargo.toml b/stacks-common/Cargo.toml
index 4b2c96d3bb..65b65d2518 100644
--- a/stacks-common/Cargo.toml
+++ b/stacks-common/Cargo.toml
@@ -21,73 +21,24 @@ keywords = [
     "blockchain",
 ]
 readme = "README.md"
-resolver = "2"
+resolver = "3"
 edition = "2021"
 build = "build.rs"
 
+[package.metadata.cargo-machete]
+ignored = ["getrandom", "toml"]
+
 [lib]
 name = "stacks_common"
 path = "./src/libcommon.rs"
 
-[dependencies]
-chrono = { version = "0.4.41", default-features = false, features = ["clock"] }
-curve25519-dalek = { version = "4.1.3", default-features = false, features = ["serde"] }
-ed25519-dalek = { workspace = true }
-hashbrown = { workspace = true }
-lazy_static = { workspace = true }
-ripemd = { version = "0.1.1", default-features = false }
-serde = { workspace = true , features = ["derive"] }
-serde_derive = { workspace = true }
-serde_json = { workspace = true }
-sha3 = { version = "0.10.1", default-features = false }
-slog = { workspace = true }
-slog-term = { version = "2.6.0", default-features = false }
-
-# Optional dependencies
-getrandom = { version = "0.2", default-features = false, optional = true }
-rand = { workspace = true, optional = true }
-slog-json = { version = "2.3.0", default-features = false, optional = true }
-
-[target.'cfg(unix)'.dependencies]
-nix = {version = "0.23", default-features = false, optional = true}
-
-[target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3", features = [
-    "consoleapi",
-    "handleapi",
-    "synchapi",
-    "winbase",
-], optional = true }
-
-[target.'cfg(not(target_family = "wasm"))'.dependencies]
-secp256k1 = { version = "0.24.3", default-features = false, features = ["std","serde", "recovery"] }
-rusqlite = { workspace = true, optional = true }
-
-[target.'cfg(target_family = "wasm")'.dependencies]
-libsecp256k1 = { version = "0.7.0", default-features = false, features = ["hmac"] }
-
-[target.'cfg(all(any(target_arch = "x86_64", target_arch = "x86", target_arch = "aarch64"), not(any(target_os="windows"))))'.dependencies]
-sha2 = { version = "0.10", features = ["asm"] }
-
-[target.'cfg(any(not(any(target_arch = "x86_64", target_arch = "x86", target_arch = "aarch64")), any(target_os="windows")))'.dependencies]
-sha2 = { version = "0.10" }
-
-[dev-dependencies]
-proptest = "1.6.0"
-
-[target.'cfg(windows)'.dev-dependencies]
-winapi = { version = "0.3", features = ["fileapi", "processenv", "winnt"] }
-
-[build-dependencies]
-toml = { workspace = true }
-
 [features]
 default = ["developer-mode", "ctrlc-handler", "rand"]
 developer-mode = []
 # Enables graceful shutdown handling for Ctrl+C (SIGINT) signals.
 # This pulls in the `nix` or `winapi` dependency.
 ctrlc-handler = ["dep:nix", "dep:winapi"]
-slog_json = ["slog-json"]
+slog_json = ["dep:slog-json"]
 rusqlite = ["dep:rusqlite", "rand"]
 # Enables the rand module. This flag must be off on deterministic
 # platforms such as CosmWasm
@@ -98,5 +49,57 @@ bech32_std = []
 bech32_strict = []
 
 # Wasm-specific features for easier configuration
-wasm-web = ["rand", "getrandom/js", "libsecp256k1/static-context"]
+wasm-web = ["rand", "getrandom/js", "libsecp256k1/static-context", "serde_json/std"]
 wasm-deterministic = ["getrandom/custom"]
+
+[target.'cfg(all(any(target_arch = "x86_64", target_arch = "x86", target_arch = "aarch64"), not(any(target_os="windows"))))'.dependencies]
+sha2 = { workspace = true, features = ["asm"] }
+
+[target.'cfg(not(target_family = "wasm"))'.dependencies]
+rusqlite = { workspace = true, optional = true }
+secp256k1.workspace = true
+
+[target.'cfg(target_family = "wasm")'.dependencies]
+libsecp256k1.workspace = true
+
+[target.'cfg(any(not(any(target_arch = "x86_64", target_arch = "x86", target_arch = "aarch64")), any(target_os="windows")))'.dependencies]
+sha2.workspace = true
+
+[target.'cfg(unix)'.dependencies]
+nix = { workspace = true, optional = true }
+
+[target.'cfg(windows)'.dependencies]
+winapi = { workspace = true, features = [
+    "consoleapi",
+    "handleapi",
+    "synchapi",
+    "winbase",
+], optional = true }
+
+[dependencies]
+chrono = { workspace = true, features = ["clock"] }
+curve25519-dalek.workspace = true
+ed25519-dalek.workspace = true
+hashbrown.workspace = true
+lazy_static.workspace = true
+ripemd.workspace = true
+serde = { workspace = true, features = ["derive"] }
+serde_derive.workspace = true
+serde_json = { workspace = true, features = ["std", "arbitrary_precision", "unbounded_depth"] }
+sha3.workspace = true
+slog.workspace = true
+slog-term.workspace = true
+
+# Optional dependencies
+getrandom = { workspace = true, optional = true }
+rand = { workspace = true, optional = true, features = ["std", "std_rng"] }
+slog-json = { workspace = true, optional = true }
+
+[build-dependencies]
+toml.workspace = true
+
+[target.'cfg(windows)'.dev-dependencies]
+winapi = { workspace = true, features = ["fileapi", "processenv", "winnt"] }
+
+[dev-dependencies]
+proptest.workspace = true
diff --git a/stacks-node/Cargo.toml b/stacks-node/Cargo.toml
index d2b8e916b9..1fa62ec62d 100644
--- a/stacks-node/Cargo.toml
+++ b/stacks-node/Cargo.toml
@@ -1,65 +1,23 @@
 [package]
 name = "stacks-node"
 version = "0.1.0"
-authors = ["Jude Nelson <jude@stacks.org>", "Aaron Blankstein <aaron@blockstack.com>", "Ludo Galabru <ludovic@blockstack.com>"]
+authors = [
+    "Jude Nelson <jude@stacks.org>",
+    "Aaron Blankstein <aaron@blockstack.com>",
+    "Ludo Galabru <ludovic@blockstack.com>",
+]
 edition = "2021"
-resolver = "2"
+resolver = "3"
 rust-version = "1.61"
 
-[dependencies]
-lazy_static = "1.4.0"
-pico-args = "0.5.0"
-serde = "1"
-serde_derive = "1"
-serde_json = { version = "1.0", features = ["arbitrary_precision", "raw_value"] }
-stacks = { package = "stackslib", path = "../stackslib" }
-stx-genesis = { path = "../stx-genesis"}
-base64 = "0.12.0"
-backtrace = "0.3.50"
-libc = "0.2.151"
-slog = { version = "2.5.2", features = [ "max_level_trace" ] }
-clarity = { path = "../clarity" }
-stacks-common = { path = "../stacks-common" }
-chrono = "0.4.19"
-regex = "1"
-libsigner = { path = "../libsigner" }
-url = "2.1.0"
-rand = { workspace = true }
-hashbrown = { workspace = true }
-rusqlite = { workspace = true }
-async-h1 = { version = "2.3.2", optional = true }
-async-std = { version = "1.6", optional = true, features = ["attributes"] }
-http-types = { version = "2.12", default-features = false, optional = true }
-thiserror = { workspace = true }
+[package.metadata.cargo-machete]
+ignored = ["stdext"]
 
-# This dependency is used for the multiversion integration tests which live behind the build-v3-1-0-0-13 feature flag
-signer_v3_1_0_0_13 = { package = "stacks-signer", git = "https://github.com/stacks-network/stacks-core.git", rev="8a79aaa7df0f13dfc5ab0d0d0bcb8201c90bcba2", optional = true, features = ["testing", "default"]}
-libsigner_v3_1_0_0_13 = { package = "libsigner", git = "https://github.com/stacks-network/stacks-core.git", rev="8a79aaa7df0f13dfc5ab0d0d0bcb8201c90bcba2", optional = true}
-stacks_v3_1_00_13 = { package = "stackslib", git = "https://github.com/stacks-network/stacks-core.git", rev="8a79aaa7df0f13dfc5ab0d0d0bcb8201c90bcba2", optional = true, features = ["testing", "default"]}
-stacks_common_v3_1_00_13 = { package = "stacks-common", git = "https://github.com/stacks-network/stacks-core.git", rev="8a79aaa7df0f13dfc5ab0d0d0bcb8201c90bcba2", optional = true, features = ["testing", "default"]}
-[target.'cfg(not(any(target_os = "macos", target_os="windows", target_arch = "arm")))'.dependencies]
-tikv-jemallocator = {workspace = true}
+[package.metadata.pinny]
+allowed = ["bitcoind", "flaky", "slow"]
 
-[dev-dependencies]
-warp = "0.3.5"
-tokio = "1.15"
-reqwest = { version = "0.11", default-features = false, features = ["blocking", "json", "rustls", "rustls-tls"] }
-clarity = { path = "../clarity", features = ["default", "testing"]}
-stacks-common = { path = "../stacks-common", features = ["default", "testing"] }
-stacks = { package = "stackslib", path = "../stackslib", features = ["default", "testing"] }
-stacks-signer = { path = "../stacks-signer", features = ["testing"] }
-tracing = "0.1.37"
-tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
-mutants = "0.0.3"
-tiny_http = "0.12.0"
-http-types =  { version = "2.12", default-features = false }
-tempfile = "3.3"
-mockito = "1.5"
-serial_test = "3.2.0"
-pinny = { git = "https://github.com/BitcoinL2-Labs/pinny-rs.git", rev = "54ba9d533a7b84525a5e65a3eae1a3ae76b9ea49" } #v0.0.2
-madhouse = { git = "https://github.com/stacks-network/madhouse-rs.git", tag = "0.2.0" }
-proptest = "1.6.*"
-stdext = "0.3.1"
+[target.'cfg(not(any(target_os = "macos", target_os="windows", target_arch = "arm")))'.dependencies]
+tikv-jemallocator.workspace = true
 
 [[bin]]
 name = "stacks-node"
@@ -75,7 +33,61 @@ slog_json = ["stacks/slog_json", "stacks-common/slog_json", "clarity/slog_json"]
 prod-genesis-chainstate = []
 default = []
 testing = ["stacks-common/testing", "stacks/testing", "clarity/testing"]
-build-signer-v3-1-0-0-13 = ["signer_v3_1_0_0_13", "libsigner_v3_1_0_0_13", "stacks_v3_1_00_13", "stacks_common_v3_1_00_13"]
+build-signer-v3-1-0-0-13 = [
+    "signer_v3_1_0_0_13",
+    "libsigner_v3_1_0_0_13",
+    "stacks_v3_1_00_13",
+    "stacks_common_v3_1_00_13",
+]
 
-[package.metadata.pinny]
-allowed = ["bitcoind", "flaky", "slow"]
+[dependencies]
+async-h1 = { workspace = true, optional = true }
+async-std = { workspace = true, optional = true }
+backtrace.workspace = true
+base64.workspace = true
+chrono.workspace = true
+clarity.workspace = true
+http-types = { workspace = true, optional = true }
+lazy_static.workspace = true
+libc.workspace = true
+libsigner.workspace = true
+pico-args.workspace = true
+rand.workspace = true
+regex.workspace = true
+rusqlite.workspace = true
+serde.workspace = true
+serde_derive.workspace = true
+serde_json = { workspace = true, features = ["arbitrary_precision", "raw_value"] }
+slog.workspace = true
+stacks.workspace = true
+stacks-common.workspace = true
+stx-genesis.workspace = true
+thiserror.workspace = true
+url.workspace = true
+
+# This dependency is used for the multiversion integration tests which live behind the build-v3-1-0-0-13 feature flag
+libsigner_v3_1_0_0_13 = { package = "libsigner", git = "https://github.com/stacks-network/stacks-core.git", rev = "8a79aaa7df0f13dfc5ab0d0d0bcb8201c90bcba2", optional = true }
+signer_v3_1_0_0_13 = { package = "stacks-signer", git = "https://github.com/stacks-network/stacks-core.git", rev = "8a79aaa7df0f13dfc5ab0d0d0bcb8201c90bcba2", optional = true, features = ["testing", "default"] }
+stacks_common_v3_1_00_13 = { package = "stacks-common", git = "https://github.com/stacks-network/stacks-core.git", rev = "8a79aaa7df0f13dfc5ab0d0d0bcb8201c90bcba2", optional = true, features = ["testing", "default"] }
+stacks_v3_1_00_13 = { package = "stackslib", git = "https://github.com/stacks-network/stacks-core.git", rev = "8a79aaa7df0f13dfc5ab0d0d0bcb8201c90bcba2", optional = true, features = ["testing", "default"] }
+
+[dev-dependencies]
+clarity = { workspace = true, features = ["rusqlite", "testing"] }
+http-types.workspace = true
+madhouse.workspace = true
+mockito.workspace = true
+mutants.workspace = true
+pinny.workspace = true
+proptest.workspace = true
+reqwest = { workspace = true, features = ["rustls"] }
+serial_test.workspace = true
+stacks = { workspace = true, features = ["default", "testing"] }
+stacks-common = { workspace = true, features = ["testing"] }
+stacks-signer = { workspace = true, features = ["testing"] }
+stdext.workspace = true
+tempfile.workspace = true
+tiny_http.workspace = true
+tokio.workspace = true
+tracing.workspace = true
+tracing-subscriber.workspace = true
+warp.workspace = true
diff --git a/stacks-signer/Cargo.toml b/stacks-signer/Cargo.toml
index 347be5731f..e020179c1e 100644
--- a/stacks-signer/Cargo.toml
+++ b/stacks-signer/Cargo.toml
@@ -1,16 +1,28 @@
 [package]
 name = "stacks-signer"
 version = "0.0.1"
-authors = [ "Jude Nelson <jude@stacks.org>" ]
+authors = ["Jude Nelson <jude@stacks.org>"]
 license = "GPLv3"
 homepage = "https://github.com/blockstack/stacks-blockchain"
 repository = "https://github.com/blockstack/stacks-blockchain"
 description = "Stacker signer binary"
-keywords = [ "stacks", "stx", "bitcoin", "crypto", "blockstack", "decentralized", "dapps", "blockchain" ]
+keywords = [
+    "stacks",
+    "stx",
+    "bitcoin",
+    "crypto",
+    "blockstack",
+    "decentralized",
+    "dapps",
+    "blockchain",
+]
 readme = "README.md"
-resolver = "2"
+resolver = "3"
 edition = "2021"
 
+[package.metadata.cargo-machete]
+ignored = ["stdext"]
+
 [lib]
 name = "stacks_signer"
 path = "src/lib.rs"
@@ -19,47 +31,37 @@ path = "src/lib.rs"
 name = "stacks-signer"
 path = "src/main.rs"
 
-[dependencies]
-backoff = "0.4"
-clarity = { path = "../clarity" }
-clap = { version = "4.1.1", features = ["derive", "env"] }
-hashbrown = { workspace = true }
-lazy_static = "1.4.0"
-libsigner = { path = "../libsigner" }
-libstackerdb = { path = "../libstackerdb" }
-prometheus = { version = "0.9", optional = true }
-rand_core = "0.6"
-reqwest = { version = "0.11.22", default-features = false, features = ["blocking", "json", "rustls-tls"] }
-serde = "1"
-slog = { version = "2.5.2", features = [ "max_level_trace" ] }
-slog-json = { version = "2.3.0", optional = true }
-slog-term = "2.6.0"
-stacks-common = { path = "../stacks-common" }
-stackslib = { path = "../stackslib" }
-thiserror = { workspace = true }
-tiny_http = { version = "0.12", optional = true }
-toml = { workspace = true }
-tracing = "0.1.37"
-tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
-rand = { workspace = true }
-url = "2.1.0"
-rusqlite = { workspace = true, features = ["functions"] }
-
-[dev-dependencies]
-clarity = { path = "../clarity", features = ["testing"] }
-stacks-common = { path = "../stacks-common", features = ["testing"] }
-num-traits = "0.2.18"
-stdext = "0.3.1"
-
-[dependencies.serde_json]
-version = "1.0"
-features = ["arbitrary_precision", "unbounded_depth"]
-
-[dependencies.secp256k1]
-version = "0.24.3"
-features = ["serde", "recovery"]
-
 [features]
 default = []
 monitoring_prom = ["prometheus", "tiny_http"]
 testing = ["stacks-common/testing"]
+
+[dependencies]
+backoff.workspace = true
+clap.workspace = true
+clarity.workspace = true
+hashbrown.workspace = true
+lazy_static.workspace = true
+libsigner.workspace = true
+libstackerdb.workspace = true
+prometheus = { workspace = true, optional = true }
+rand.workspace = true
+reqwest.workspace = true
+rusqlite = { workspace = true, features = ["functions"] }
+serde.workspace = true
+serde_json = { workspace = true, features = ["arbitrary_precision", "unbounded_depth"] }
+slog.workspace = true
+slog-json = { workspace = true, optional = true }
+stacks-common.workspace = true
+stackslib.workspace = true
+thiserror.workspace = true
+tiny_http = { workspace = true, optional = true }
+toml.workspace = true
+tracing-subscriber = { workspace = true, features = ["registry", "fmt", "std", "env-filter"] }
+url.workspace = true
+
+[dev-dependencies]
+clarity = { workspace = true, features = ["rusqlite", "testing"] }
+rand_core.workspace = true
+stacks-common = { workspace = true, features = ["testing"] }
+stdext.workspace = true
diff --git a/stackslib/Cargo.toml b/stackslib/Cargo.toml
index 4ae68eb746..6c54464e8c 100644
--- a/stackslib/Cargo.toml
+++ b/stackslib/Cargo.toml
@@ -1,19 +1,33 @@
 [package]
 name = "stackslib"
 version = "0.0.1"
-authors = [ "Jude Nelson <jude@stacks.org>",
-            "Aaron Blankstein <aaron@blockstack.com>",
-            "Ludo Galabru <ludovic@blockstack.com>" ]
+edition = "2021"
+resolver = "3"
+authors = [
+    "Jude Nelson <jude@stacks.org>",
+    "Aaron Blankstein <aaron@blockstack.com>",
+    "Ludo Galabru <ludovic@blockstack.com>",
+]
 license = "GPLv3"
 homepage = "https://github.com/blockstack/stacks-blockchain"
 repository = "https://github.com/blockstack/stacks-blockchain"
 description = "Reference implementation of the Stacks 2.0 Blockchain"
-keywords = [ "stacks", "stx", "bitcoin", "crypto", "blockstack", "decentralized", "dapps", "blockchain" ]
+keywords = [
+    "stacks",
+    "stx",
+    "bitcoin",
+    "crypto",
+    "blockstack",
+    "decentralized",
+    "dapps",
+    "blockchain",
+]
 readme = "README.md"
-resolver = "2"
-edition = "2021"
 rust-version = "1.80"
 
+[package.metadata.cargo-machete]
+ignored = ["stdext"]
+
 [lib]
 name = "blockstack_lib"
 path = "src/lib.rs"
@@ -30,68 +44,6 @@ path = "src/clarity_cli_main.rs"
 name = "blockstack-cli"
 path = "src/blockstack_cli.rs"
 
-[dependencies]
-rand = { workspace = true }
-rand_core = { workspace = true }
-rand_chacha = { workspace = true }
-serde = "1"
-serde_derive = "1"
-ripemd = "0.1.1"
-regex = "1"
-mio = "0.6"
-lazy_static = "1.4.0"
-url = "2.1.0"
-percent-encoding = "2.1.0"
-prometheus = { version = "0.9", optional = true }
-slog = { version = "2.5.2", features = [ "max_level_trace" ] }
-chrono = { version = "0.4.19", optional = true }
-clarity = { path = "../clarity" }
-stacks-common = { path = "../stacks-common" }
-pox-locking = { path = "../pox-locking" }
-libstackerdb = { path = "../libstackerdb" }
-siphasher = "0.3.7"
-hashbrown = { workspace = true }
-rusqlite = { workspace = true }
-time = "0.3.41"
-toml = { workspace = true }
-
-[target.'cfg(not(any(target_os = "macos",target_os="windows", target_arch = "arm" )))'.dependencies]
-tikv-jemallocator = {workspace = true}
-
-[target.'cfg(unix)'.dependencies]
-nix = "0.23"
-
-[target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3", features = ["consoleapi", "handleapi", "synchapi", "winbase"] }
-
-[target.'cfg(windows)'.dev-dependencies]
-winapi = { version = "0.3", features = ["fileapi", "processenv", "winnt"] }
-
-[dependencies.serde_json]
-version = "1.0"
-features = ["arbitrary_precision", "unbounded_depth"]
-
-[dependencies.secp256k1]
-version = "0.24.3"
-features = ["serde", "recovery"]
-
-[dependencies.ed25519-dalek]
-workspace = true
-
-[dev-dependencies]
-assert-json-diff = "1.0.0"
-stdext = "0.3.1"
-stx-genesis = { path = "../stx-genesis"}
-clarity = { features = ["default", "testing"], path = "../clarity" }
-stacks-common = { features = ["default", "testing"], path = "../stacks-common" }
-rstest = "0.17.0"
-rstest_reuse = "0.5.0"
-mutants = "0.0.3"
-rlimit = "0.10.2"
-chrono = "0.4.19"
-tempfile = "3.3"
-proptest = { version = "1.6.0", default-features = false, features = ["std"] }
-
 [features]
 default = []
 profile-sqlite = []
@@ -102,7 +54,50 @@ slog_json = ["stacks-common/slog_json", "clarity/slog_json", "pox-locking/slog_j
 testing = ["chrono", "stacks-common/testing", "clarity/testing"]
 
 [target.'cfg(all(any(target_arch = "x86_64", target_arch = "x86", target_arch = "aarch64"), not(any(target_os="windows"))))'.dependencies]
-sha2 = { version = "0.10", features = ["asm"] }
+sha2 = { workspace = true, features = ["asm"] }
+
+[target.'cfg(not(any(target_os = "macos",target_os="windows", target_arch = "arm" )))'.dependencies]
+tikv-jemallocator.workspace = true
 
 [target.'cfg(any(not(any(target_arch = "x86_64", target_arch = "x86", target_arch = "aarch64")), any(target_os="windows")))'.dependencies]
-sha2 = { version = "0.10" }
+sha2.workspace = true
+
+[dependencies]
+chrono = { workspace = true, optional = true }
+clarity = { workspace = true, features = ["rusqlite"] }
+ed25519-dalek.workspace = true
+hashbrown.workspace = true
+lazy_static.workspace = true
+libstackerdb.workspace = true
+mio.workspace = true
+percent-encoding.workspace = true
+pox-locking.workspace = true
+prometheus = { workspace = true, optional = true }
+rand.workspace = true
+rand_chacha.workspace = true
+regex.workspace = true
+ripemd.workspace = true
+rusqlite.workspace = true
+serde.workspace = true
+serde_derive.workspace = true
+serde_json = { workspace = true, features = ["arbitrary_precision", "unbounded_depth"] }
+siphasher.workspace = true
+slog.workspace = true
+stacks-common.workspace = true
+time.workspace = true
+toml.workspace = true
+url.workspace = true
+
+[dev-dependencies]
+assert-json-diff.workspace = true
+chrono.workspace = true
+clarity = { workspace = true, features = ["rusqlite", "testing"] }
+mutants.workspace = true
+proptest.workspace = true
+rlimit.workspace = true
+rstest.workspace = true
+rstest_reuse.workspace = true
+stacks-common = { workspace = true, features = ["testing"] }
+stdext.workspace = true
+stx-genesis.workspace = true
+tempfile.workspace = true
diff --git a/stackslib/src/net/mod.rs b/stackslib/src/net/mod.rs
index dff1812593..8a7bfdd8b1 100644
--- a/stackslib/src/net/mod.rs
+++ b/stackslib/src/net/mod.rs
@@ -2432,9 +2432,9 @@ pub mod test {
 
     /// make a TCP server and a pair of TCP client sockets
     pub fn make_tcp_sockets() -> (
-        mio::tcp::TcpListener,
-        mio::tcp::TcpStream,
-        mio::tcp::TcpStream,
+        mio::net::TcpListener,
+        mio::net::TcpStream,
+        mio::net::TcpStream,
     ) {
         let mut rng = rand::thread_rng();
         let (std_listener, port) = {
@@ -2465,14 +2465,14 @@ pub mod test {
                 .unwrap(),
         )
         .unwrap();
-        let sock_1 = mio::tcp::TcpStream::from_stream(std_sock_1).unwrap();
+        let sock_1 = mio::net::TcpStream::from_stream(std_sock_1).unwrap();
         let (std_sock_2, _) = std_listener.accept().unwrap();
-        let sock_2 = mio::tcp::TcpStream::from_stream(std_sock_2).unwrap();
+        let sock_2 = mio::net::TcpStream::from_stream(std_sock_2).unwrap();
 
         sock_1.set_nodelay(true).unwrap();
         sock_2.set_nodelay(true).unwrap();
 
-        let listener = mio::tcp::TcpListener::from_std(std_listener).unwrap();
+        let listener = mio::net::TcpListener::from_std(std_listener).unwrap();
 
         (listener, sock_1, sock_2)
     }
diff --git a/stx-genesis/Cargo.toml b/stx-genesis/Cargo.toml
index 39e97465ce..5d59bc90f6 100644
--- a/stx-genesis/Cargo.toml
+++ b/stx-genesis/Cargo.toml
@@ -1,17 +1,19 @@
 [package]
 name = "stx-genesis"
 version = "0.1.0"
+edition = "2024"
 authors = ["Matthew Little <matthew@blockstack.com>"]
-edition = "2018"
-resolver = "2"
 
-[dependencies]
-libflate = "1.0.3"
+[package.metadata.cargo-machete]
+ignored = ["sha2"]
 
 [lib]
 name = "stx_genesis"
 path = "src/lib.rs"
 
+[dependencies]
+libflate.workspace = true
+
 [build-dependencies]
-libflate = "1.0.3"
-sha2 = { version = "0.10" }
+libflate.workspace = true
+sha2.workspace = true