diff --git a/Cargo.toml b/Cargo.toml
index 604abf8fc6..d11c2046b6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,29 +1,30 @@
 [workspace]
 members = [
+    "account-decoder",
+    "accounts-bench",
+    "accounts-cluster-bench",
     "accountsdb-plugin-interface",
     "accountsdb-plugin-manager",
-    "accounts-cluster-bench",
-    "bench-streamer",
-    "bench-tps",
-    "accounts-bench",
     "banking-bench",
     "banks-client",
     "banks-interface",
     "banks-server",
-    "bucket_map",
+    "bench-streamer",
+    "bench-tps",
     "bloom",
+    "bucket_map",
     "clap-utils",
+    "cli",
     "cli-config",
     "cli-output",
     "client",
+    "client-test",
     "core",
     "dos",
     "download-utils",
     "entry",
     "faucet",
     "frozen-abi",
-    "perf",
-    "validator",
     "genesis",
     "genesis-utils",
     "gossip",
@@ -32,32 +33,36 @@ members = [
     "ledger",
     "ledger-tool",
     "local-cluster",
-    "logger",
     "log-analyzer",
+    "logger",
+    "measure",
     "merkle-root-bench",
     "merkle-tree",
-    "storage-bigtable",
-    "storage-proto",
-    "streamer",
-    "measure",
     "metrics",
     "net-shaper",
+    "net-utils",
     "notifier",
+    "perf",
     "poh",
     "poh-bench",
     "program-test",
     "programs/address-lookup-table",
     "programs/address-lookup-table-tests",
-    "programs/ed25519-tests",
     "programs/bpf_loader",
     "programs/bpf_loader/gen-syscall-list",
     "programs/compute-budget",
     "programs/config",
+    "programs/ed25519-tests",
     "programs/stake",
     "programs/vote",
+    "programs/zk-token-proof",
+    "rayon-threadlimit",
     "rbpf-cli",
     "remote-wallet",
+    "replica-lib",
+    "replica-node",
     "rpc",
+    "rpc-test",
     "runtime",
     "runtime/store-tool",
     "sdk",
@@ -65,24 +70,19 @@ members = [
     "sdk/cargo-test-bpf",
     "send-transaction-service",
     "stake-accounts",
+    "storage-bigtable",
+    "storage-proto",
+    "streamer",
     "sys-tuner",
+    "test-validator",
     "tokens",
     "transaction-dos",
     "transaction-status",
-    "account-decoder",
     "upload-perf",
-    "net-utils",
+    "validator",
     "version",
-    "cli",
-    "rayon-threadlimit",
     "watchtower",
-    "replica-node",
-    "replica-lib",
-    "test-validator",
-    "rpc-test",
-    "client-test",
     "zk-token-sdk",
-    "programs/zk-token-proof",
 ]
 
 exclude = [
diff --git a/account-decoder/Cargo.toml b/account-decoder/Cargo.toml
index c444645b4e..3b97f86a2c 100644
--- a/account-decoder/Cargo.toml
+++ b/account-decoder/Cargo.toml
@@ -10,11 +10,11 @@ license = "Apache-2.0"
 edition = "2021"
 
 [dependencies]
+Inflector = "0.11.4"
 base64 = "0.12.3"
 bincode = "1.3.3"
 bs58 = "0.4.0"
 bv = "0.11.1"
-Inflector = "0.11.4"
 lazy_static = "1.4.0"
 serde = "1.0.136"
 serde_derive = "1.0.103"
diff --git a/accounts-bench/Cargo.toml b/accounts-bench/Cargo.toml
index 3b57ad47aa..1c95e9672d 100644
--- a/accounts-bench/Cargo.toml
+++ b/accounts-bench/Cargo.toml
@@ -9,14 +9,14 @@ homepage = "https://solana.com/"
 publish = false
 
 [dependencies]
+clap = "2.33.1"
 log = "0.4.14"
 rayon = "1.5.1"
 solana-logger = { path = "../logger", version = "=1.10.2" }
-solana-runtime = { path = "../runtime", version = "=1.10.2" }
 solana-measure = { path = "../measure", version = "=1.10.2" }
+solana-runtime = { path = "../runtime", version = "=1.10.2" }
 solana-sdk = { path = "../sdk", version = "=1.10.2" }
 solana-version = { path = "../version", version = "=1.10.2" }
-clap = "2.33.1"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/accountsdb-plugin-interface/Cargo.toml b/accountsdb-plugin-interface/Cargo.toml
index f2646c6b65..dfc8c0f8dc 100644
--- a/accountsdb-plugin-interface/Cargo.toml
+++ b/accountsdb-plugin-interface/Cargo.toml
@@ -11,9 +11,9 @@ documentation = "https://docs.rs/solana-accountsdb-plugin-interface"
 
 [dependencies]
 log = "0.4.11"
-thiserror = "1.0.30"
 solana-sdk = { path = "../sdk", version = "=1.10.2" }
 solana-transaction-status = { path = "../transaction-status", version = "=1.10.2" }
+thiserror = "1.0.30"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/banking-bench/Cargo.toml b/banking-bench/Cargo.toml
index fac64f8c8c..97909b9d6f 100644
--- a/banking-bench/Cargo.toml
+++ b/banking-bench/Cargo.toml
@@ -22,8 +22,8 @@ solana-measure = { path = "../measure", version = "=1.10.2" }
 solana-perf = { path = "../perf", version = "=1.10.2" }
 solana-poh = { path = "../poh", version = "=1.10.2" }
 solana-runtime = { path = "../runtime", version = "=1.10.2" }
-solana-streamer = { path = "../streamer", version = "=1.10.2" }
 solana-sdk = { path = "../sdk", version = "=1.10.2" }
+solana-streamer = { path = "../streamer", version = "=1.10.2" }
 solana-version = { path = "../version", version = "=1.10.2" }
 
 [package.metadata.docs.rs]
diff --git a/banks-client/Cargo.toml b/banks-client/Cargo.toml
index 21f5fc41f0..fa262b02d8 100644
--- a/banks-client/Cargo.toml
+++ b/banks-client/Cargo.toml
@@ -21,8 +21,8 @@ tokio = { version = "1", features = ["full"] }
 tokio-serde = { version = "0.8", features = ["bincode"] }
 
 [dev-dependencies]
-solana-runtime = { path = "../runtime", version = "=1.10.2" }
 solana-banks-server = { path = "../banks-server", version = "=1.10.2" }
+solana-runtime = { path = "../runtime", version = "=1.10.2" }
 
 [lib]
 crate-type = ["lib"]
diff --git a/bench-streamer/Cargo.toml b/bench-streamer/Cargo.toml
index e3e7c2af86..4d47893fa2 100644
--- a/bench-streamer/Cargo.toml
+++ b/bench-streamer/Cargo.toml
@@ -9,10 +9,10 @@ homepage = "https://solana.com/"
 publish = false
 
 [dependencies]
-crossbeam-channel = "0.5"
 clap = "2.33.1"
-solana-streamer = { path = "../streamer", version = "=1.10.2" }
+crossbeam-channel = "0.5"
 solana-net-utils = { path = "../net-utils", version = "=1.10.2" }
+solana-streamer = { path = "../streamer", version = "=1.10.2" }
 solana-version = { path = "../version", version = "=1.10.2" }
 
 [package.metadata.docs.rs]
diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml
index 5416676fa7..a4761cf3fc 100644
--- a/bench-tps/Cargo.toml
+++ b/bench-tps/Cargo.toml
@@ -15,14 +15,14 @@ log = "0.4.14"
 rayon = "1.5.1"
 serde_json = "1.0.79"
 serde_yaml = "0.8.23"
-solana-core = { path = "../core", version = "=1.10.2" }
-solana-genesis = { path = "../genesis", version = "=1.10.2" }
 solana-client = { path = "../client", version = "=1.10.2" }
+solana-core = { path = "../core", version = "=1.10.2" }
 solana-faucet = { path = "../faucet", version = "=1.10.2" }
+solana-genesis = { path = "../genesis", version = "=1.10.2" }
 solana-gossip = { path = "../gossip", version = "=1.10.2" }
 solana-logger = { path = "../logger", version = "=1.10.2" }
-solana-metrics = { path = "../metrics", version = "=1.10.2" }
 solana-measure = { path = "../measure", version = "=1.10.2" }
+solana-metrics = { path = "../metrics", version = "=1.10.2" }
 solana-net-utils = { path = "../net-utils", version = "=1.10.2" }
 solana-runtime = { path = "../runtime", version = "=1.10.2" }
 solana-sdk = { path = "../sdk", version = "=1.10.2" }
diff --git a/bloom/Cargo.toml b/bloom/Cargo.toml
index 3ad5a2a152..2aaa3cb6c6 100644
--- a/bloom/Cargo.toml
+++ b/bloom/Cargo.toml
@@ -12,14 +12,14 @@ edition = "2021"
 [dependencies]
 bv = { version = "0.11.1", features = ["serde"] }
 fnv = "1.0.7"
+log = "0.4.14"
 rand = "0.7.0"
-serde = { version = "1.0.136", features = ["rc"] }
 rayon = "1.5.1"
+serde = { version = "1.0.136", features = ["rc"] }
 serde_derive = "1.0.103"
 solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.2" }
 solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.2" }
 solana-sdk = { path = "../sdk", version = "=1.10.2" }
-log = "0.4.14"
 
 [lib]
 crate-type = ["lib"]
diff --git a/bucket_map/Cargo.toml b/bucket_map/Cargo.toml
index fb90b6d92e..d8d1e4e308 100644
--- a/bucket_map/Cargo.toml
+++ b/bucket_map/Cargo.toml
@@ -11,13 +11,13 @@ license = "Apache-2.0"
 edition = "2021"
 
 [dependencies]
-solana-sdk = { path = "../sdk", version = "=1.10.2" }
-memmap2 = "0.5.3"
 log = { version = "0.4.11" }
-solana-measure = { path = "../measure", version = "=1.10.2" }
-rand = "0.7.0"
-tempfile = "3.3.0"
+memmap2 = "0.5.3"
 modular-bitfield = "0.11.2"
+rand = "0.7.0"
+solana-measure = { path = "../measure", version = "=1.10.2" }
+solana-sdk = { path = "../sdk", version = "=1.10.2" }
+tempfile = "3.3.0"
 
 [dev-dependencies]
 fs_extra = "1.2.0"
diff --git a/clap-utils/Cargo.toml b/clap-utils/Cargo.toml
index a8ed365b4b..ffccf83ec4 100644
--- a/clap-utils/Cargo.toml
+++ b/clap-utils/Cargo.toml
@@ -10,16 +10,16 @@ documentation = "https://docs.rs/solana-clap-utils"
 edition = "2021"
 
 [dependencies]
+chrono = "0.4"
 clap = "2.33.0"
 rpassword = "5.0"
 solana-perf = { path = "../perf", version = "=1.10.2" }
-solana-remote-wallet = { path = "../remote-wallet", version = "=1.10.2", default-features = false}
+solana-remote-wallet = { path = "../remote-wallet", version = "=1.10.2", default-features = false }
 solana-sdk = { path = "../sdk", version = "=1.10.2" }
 thiserror = "1.0.30"
 tiny-bip39 = "0.8.2"
 uriparse = "0.6.3"
 url = "2.2.2"
-chrono = "0.4"
 
 [dev-dependencies]
 tempfile = "3.3.0"
diff --git a/cli-output/Cargo.toml b/cli-output/Cargo.toml
index a715096466..28734b75fc 100644
--- a/cli-output/Cargo.toml
+++ b/cli-output/Cargo.toml
@@ -10,12 +10,12 @@ homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-cli-output"
 
 [dependencies]
+Inflector = "0.11.4"
 base64 = "0.13.0"
 chrono = { version = "0.4.11", features = ["serde"] }
 clap = "2.33.0"
 console = "0.15.0"
 humantime = "2.0.1"
-Inflector = "0.11.4"
 indicatif = "0.16.2"
 serde = "1.0.136"
 serde_json = "1.0.79"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 0eda188233..185b5bf894 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -13,13 +13,13 @@ documentation = "https://docs.rs/solana-cli"
 bincode = "1.3.3"
 bs58 = "0.4.0"
 clap = "2.33.1"
-criterion-stats = "0.3.0"
-ctrlc = { version = "3.2.1", features = ["termination"] }
 console = "0.15.0"
 const_format = "0.2.22"
+criterion-stats = "0.3.0"
 crossbeam-channel = "0.5"
-log = "0.4.14"
+ctrlc = { version = "3.2.1", features = ["termination"] }
 humantime = "2.0.1"
+log = "0.4.14"
 num-traits = "0.2"
 pretty-hex = "0.2.1"
 reqwest = { version = "0.11.9", default-features = false, features = ["blocking", "rustls-tls", "json"] }
@@ -37,12 +37,12 @@ solana-config-program = { path = "../programs/config", version = "=1.10.2" }
 solana-faucet = { path = "../faucet", version = "=1.10.2" }
 solana-logger = { path = "../logger", version = "=1.10.2" }
 solana-program-runtime = { path = "../program-runtime", version = "=1.10.2" }
-solana_rbpf = "=0.2.24"
 solana-remote-wallet = { path = "../remote-wallet", version = "=1.10.2" }
 solana-sdk = { path = "../sdk", version = "=1.10.2" }
 solana-transaction-status = { path = "../transaction-status", version = "=1.10.2" }
 solana-version = { path = "../version", version = "=1.10.2" }
 solana-vote-program = { path = "../programs/vote", version = "=1.10.2" }
+solana_rbpf = "=0.2.24"
 spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
 thiserror = "1.0.30"
 tiny-bip39 = "0.8.2"
diff --git a/client/Cargo.toml b/client/Cargo.toml
index 3e9412718c..34c00555f0 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -35,8 +35,8 @@ serde_json = "1.0.79"
 solana-account-decoder = { path = "../account-decoder", version = "=1.10.2" }
 solana-clap-utils = { path = "../clap-utils", version = "=1.10.2" }
 solana-faucet = { path = "../faucet", version = "=1.10.2" }
-solana-net-utils = { path = "../net-utils", version = "=1.10.2" }
 solana-measure = { path = "../measure", version = "=1.10.2" }
+solana-net-utils = { path = "../net-utils", version = "=1.10.2" }
 solana-sdk = { path = "../sdk", version = "=1.10.2" }
 solana-transaction-status = { path = "../transaction-status", version = "=1.10.2" }
 solana-version = { path = "../version", version = "=1.10.2" }
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 211e6468d6..e1624a0658 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -21,7 +21,7 @@ bs58 = "0.4.0"
 chrono = { version = "0.4.11", features = ["serde"] }
 crossbeam-channel = "0.5"
 dashmap = { version = "4.0.2", features = ["rayon", "raw-api"] }
-etcd-client = { version = "0.8.4", features = ["tls"]}
+etcd-client = { version = "0.8.4", features = ["tls"] }
 fs_extra = "1.2.0"
 histogram = "0.6.9"
 itertools = "0.10.3"
@@ -33,11 +33,13 @@ rayon = "1.5.1"
 retain_mut = "0.1.7"
 serde = "1.0.136"
 serde_derive = "1.0.103"
+solana-accountsdb-plugin-manager = { path = "../accountsdb-plugin-manager", version = "=1.10.2" }
 solana-address-lookup-table-program = { path = "../programs/address-lookup-table", version = "=1.10.2" }
 solana-bloom = { path = "../bloom", version = "=1.10.2" }
-solana-accountsdb-plugin-manager = { path = "../accountsdb-plugin-manager", version = "=1.10.2" }
 solana-client = { path = "../client", version = "=1.10.2" }
 solana-entry = { path = "../entry", version = "=1.10.2" }
+solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.2" }
+solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.2" }
 solana-gossip = { path = "../gossip", version = "=1.10.2" }
 solana-ledger = { path = "../ledger", version = "=1.10.2" }
 solana-measure = { path = "../measure", version = "=1.10.2" }
@@ -46,20 +48,18 @@ solana-net-utils = { path = "../net-utils", version = "=1.10.2" }
 solana-perf = { path = "../perf", version = "=1.10.2" }
 solana-poh = { path = "../poh", version = "=1.10.2" }
 solana-program-runtime = { path = "../program-runtime", version = "=1.10.2" }
-solana-rpc = { path = "../rpc", version = "=1.10.2" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.2" }
 solana-replica-lib = { path = "../replica-lib", version = "=1.10.2" }
+solana-rpc = { path = "../rpc", version = "=1.10.2" }
 solana-runtime = { path = "../runtime", version = "=1.10.2" }
 solana-sdk = { path = "../sdk", version = "=1.10.2" }
-solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.2" }
-solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.2" }
 solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.10.2" }
 solana-streamer = { path = "../streamer", version = "=1.10.2" }
 solana-transaction-status = { path = "../transaction-status", version = "=1.10.2" }
 solana-vote-program = { path = "../programs/vote", version = "=1.10.2" }
+sys-info = "0.9.1"
 tempfile = "3.3.0"
 thiserror = "1.0"
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.2" }
-sys-info = "0.9.1"
 tokio = { version = "1", features = ["full"] }
 trees = "0.4.2"
 
diff --git a/dos/Cargo.toml b/dos/Cargo.toml
index d375c12558..9611de860c 100644
--- a/dos/Cargo.toml
+++ b/dos/Cargo.toml
@@ -13,6 +13,7 @@ bincode = "1.3.3"
 clap = "2.33.1"
 log = "0.4.14"
 rand = "0.7.0"
+solana-client = { path = "../client", version = "=1.10.2" }
 solana-core = { path = "../core", version = "=1.10.2" }
 solana-gossip = { path = "../gossip", version = "=1.10.2" }
 solana-logger = { path = "../logger", version = "=1.10.2" }
@@ -21,7 +22,6 @@ solana-perf = { path = "../perf", version = "=1.10.2" }
 solana-sdk = { path = "../sdk", version = "=1.10.2" }
 solana-streamer = { path = "../streamer", version = "=1.10.2" }
 solana-version = { path = "../version", version = "=1.10.2" }
-solana-client = { path = "../client", version = "=1.10.2" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/download-utils/Cargo.toml b/download-utils/Cargo.toml
index a14966f99e..746b9386ba 100644
--- a/download-utils/Cargo.toml
+++ b/download-utils/Cargo.toml
@@ -14,8 +14,8 @@ console = "0.15.0"
 indicatif = "0.16.2"
 log = "0.4.14"
 reqwest = { version = "0.11.9", default-features = false, features = ["blocking", "rustls-tls", "json"] }
-solana-sdk = { path = "../sdk", version = "=1.10.2" }
 solana-runtime = { path = "../runtime", version = "=1.10.2" }
+solana-sdk = { path = "../sdk", version = "=1.10.2" }
 
 [lib]
 crate-type = ["lib"]
diff --git a/entry/Cargo.toml b/entry/Cargo.toml
index d5b48c5c0d..1960e5d9d7 100644
--- a/entry/Cargo.toml
+++ b/entry/Cargo.toml
@@ -10,6 +10,7 @@ documentation = "https://docs.rs/solana-poh"
 edition = "2021"
 
 [dependencies]
+bincode = "1.3.3"
 crossbeam-channel = "0.5"
 dlopen = "0.1.8"
 dlopen_derive = "0.1.4"
@@ -23,7 +24,6 @@ solana-metrics = { path = "../metrics", version = "=1.10.2" }
 solana-perf = { path = "../perf", version = "=1.10.2" }
 solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.2" }
 solana-sdk = { path = "../sdk", version = "=1.10.2" }
-bincode = "1.3.3"
 
 [dev-dependencies]
 matches = "0.1.9"
diff --git a/frozen-abi/Cargo.toml b/frozen-abi/Cargo.toml
index 14e7cd660d..a67ef6e413 100644
--- a/frozen-abi/Cargo.toml
+++ b/frozen-abi/Cargo.toml
@@ -20,7 +20,7 @@ solana-frozen-abi-macro = { path = "macro", version = "=1.10.2" }
 thiserror = "1.0"
 
 [target.'cfg(not(target_arch = "bpf"))'.dependencies]
-generic-array = { version = "0.14.5", default-features = false, features = ["serde", "more_lengths"]}
+generic-array = { version = "0.14.5", default-features = false, features = ["serde", "more_lengths"] }
 memmap2 = "0.5.3"
 
 [target.'cfg(not(target_arch = "bpf"))'.dev-dependencies]
diff --git a/genesis-utils/Cargo.toml b/genesis-utils/Cargo.toml
index e8a8800fb7..594fc27219 100644
--- a/genesis-utils/Cargo.toml
+++ b/genesis-utils/Cargo.toml
@@ -10,9 +10,9 @@ documentation = "https://docs.rs/solana-download-utils"
 edition = "2021"
 
 [dependencies]
-solana-sdk = { path = "../sdk", version = "=1.10.2" }
 solana-download-utils = { path = "../download-utils", version = "=1.10.2" }
 solana-runtime = { path = "../runtime", version = "=1.10.2" }
+solana-sdk = { path = "../sdk", version = "=1.10.2" }
 
 [lib]
 crate-type = ["lib"]
diff --git a/gossip/Cargo.toml b/gossip/Cargo.toml
index 02e3b22f05..939d38461a 100644
--- a/gossip/Cargo.toml
+++ b/gossip/Cargo.toml
@@ -27,6 +27,7 @@ rayon = "1.5.1"
 serde = "1.0.136"
 serde_bytes = "0.11"
 serde_derive = "1.0.103"
+solana-bloom = { path = "../bloom", version = "=1.10.2" }
 solana-clap-utils = { path = "../clap-utils", version = "=1.10.2" }
 solana-client = { path = "../client", version = "=1.10.2" }
 solana-entry = { path = "../entry", version = "=1.10.2" }
@@ -39,10 +40,9 @@ solana-metrics = { path = "../metrics", version = "=1.10.2" }
 solana-net-utils = { path = "../net-utils", version = "=1.10.2" }
 solana-perf = { path = "../perf", version = "=1.10.2" }
 solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.2" }
-solana-bloom = { path = "../bloom", version = "=1.10.2" }
 solana-runtime = { path = "../runtime", version = "=1.10.2" }
-solana-streamer = { path = "../streamer", version = "=1.10.2" }
 solana-sdk = { path = "../sdk", version = "=1.10.2" }
+solana-streamer = { path = "../streamer", version = "=1.10.2" }
 solana-version = { path = "../version", version = "=1.10.2" }
 solana-vote-program = { path = "../programs/vote", version = "=1.10.2" }
 thiserror = "1.0"
diff --git a/install/Cargo.toml b/install/Cargo.toml
index d9c7d71bd7..1deaee1e18 100644
--- a/install/Cargo.toml
+++ b/install/Cargo.toml
@@ -16,13 +16,14 @@ bzip2 = "0.4.3"
 chrono = { version = "0.4.11", features = ["serde"] }
 clap = { version = "2.33.1" }
 console = "0.15.0"
-ctrlc = { version = "3.2.1", features = ["termination"] }
 crossbeam-channel = "0.5"
+ctrlc = { version = "3.2.1", features = ["termination"] }
 dirs-next = "2.0.0"
 indicatif = "0.16.2"
 lazy_static = "1.4.0"
 nix = "0.23.1"
 reqwest = { version = "0.11.9", default-features = false, features = ["blocking", "rustls-tls", "json"] }
+semver = "1.0.6"
 serde = { version = "1.0.136", features = ["derive"] }
 serde_yaml = "0.8.23"
 solana-clap-utils = { path = "../clap-utils", version = "=1.10.2" }
@@ -31,7 +32,6 @@ solana-config-program = { path = "../programs/config", version = "=1.10.2" }
 solana-logger = { path = "../logger", version = "=1.10.2" }
 solana-sdk = { path = "../sdk", version = "=1.10.2" }
 solana-version = { path = "../version", version = "=1.10.2" }
-semver = "1.0.6"
 tar = "0.4.38"
 tempfile = "3.3.0"
 url = "2.2.2"
diff --git a/ledger-tool/Cargo.toml b/ledger-tool/Cargo.toml
index 6f4a7b90d8..11d5097128 100644
--- a/ledger-tool/Cargo.toml
+++ b/ledger-tool/Cargo.toml
@@ -38,7 +38,7 @@ solana-vote-program = { path = "../programs/vote", version = "=1.10.2" }
 tokio = { version = "1", features = ["full"] }
 
 [target.'cfg(not(target_env = "msvc"))'.dependencies]
-jemallocator = {package = "tikv-jemallocator", version = "0.4.1", features = ["unprefixed_malloc_on_supported_platforms"]}
+jemallocator = { package = "tikv-jemallocator", version = "0.4.1", features = ["unprefixed_malloc_on_supported_platforms"] }
 
 [dev-dependencies]
 assert_cmd = "2.0"
diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml
index ea91f8a395..9a921294e6 100644
--- a/ledger/Cargo.toml
+++ b/ledger/Cargo.toml
@@ -28,6 +28,7 @@ prost = "0.9.0"
 rand = "0.7.0"
 rand_chacha = "0.2.2"
 rayon = "1.5.1"
+reed-solomon-erasure = { version = "5.0.1", features = ["simd-accel"] }
 serde = "1.0.136"
 serde_bytes = "0.11.5"
 sha2 = "0.10.2"
@@ -35,23 +36,22 @@ solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.10.
 solana-entry = { path = "../entry", version = "=1.10.2" }
 solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.2" }
 solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.2" }
-solana-transaction-status = { path = "../transaction-status", version = "=1.10.2" }
 solana-measure = { path = "../measure", version = "=1.10.2" }
 solana-metrics = { path = "../metrics", version = "=1.10.2" }
-solana-program-runtime = { path = "../program-runtime", version = "=1.10.2" }
 solana-perf = { path = "../perf", version = "=1.10.2" }
+solana-program-runtime = { path = "../program-runtime", version = "=1.10.2" }
 solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.2" }
 solana-runtime = { path = "../runtime", version = "=1.10.2" }
 solana-sdk = { path = "../sdk", version = "=1.10.2" }
 solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.10.2" }
 solana-storage-proto = { path = "../storage-proto", version = "=1.10.2" }
+solana-transaction-status = { path = "../transaction-status", version = "=1.10.2" }
 solana-vote-program = { path = "../programs/vote", version = "=1.10.2" }
 tempfile = "3.3.0"
 thiserror = "1.0"
 tokio = { version = "1", features = ["full"] }
 tokio-stream = "0.1"
 trees = "0.4.2"
-reed-solomon-erasure = { version = "5.0.1", features = ["simd-accel"] }
 
 [dependencies.rocksdb]
 # Avoid the vendored bzip2 within rocksdb-sys that can cause linker conflicts
diff --git a/local-cluster/Cargo.toml b/local-cluster/Cargo.toml
index a005f38720..d6102d91e1 100644
--- a/local-cluster/Cargo.toml
+++ b/local-cluster/Cargo.toml
@@ -11,14 +11,14 @@ documentation = "https://docs.rs/solana-local-cluster"
 
 [dependencies]
 crossbeam-channel = "0.5"
-itertools = "0.10.3"
 fs_extra = "1.2.0"
+itertools = "0.10.3"
 log = "0.4.14"
 rand = "0.7.0"
 rayon = "1.5.1"
+solana-client = { path = "../client", version = "=1.10.2" }
 solana-config-program = { path = "../programs/config", version = "=1.10.2" }
 solana-core = { path = "../core", version = "=1.10.2" }
-solana-client = { path = "../client", version = "=1.10.2" }
 solana-entry = { path = "../entry", version = "=1.10.2" }
 solana-gossip = { path = "../gossip", version = "=1.10.2" }
 solana-ledger = { path = "../ledger", version = "=1.10.2" }
diff --git a/merkle-root-bench/Cargo.toml b/merkle-root-bench/Cargo.toml
index a8603b5de7..4338745a88 100644
--- a/merkle-root-bench/Cargo.toml
+++ b/merkle-root-bench/Cargo.toml
@@ -9,13 +9,13 @@ homepage = "https://solana.com/"
 publish = false
 
 [dependencies]
+clap = "2.33.1"
 log = "0.4.14"
 solana-logger = { path = "../logger", version = "=1.10.2" }
-solana-runtime = { path = "../runtime", version = "=1.10.2" }
 solana-measure = { path = "../measure", version = "=1.10.2" }
+solana-runtime = { path = "../runtime", version = "=1.10.2" }
 solana-sdk = { path = "../sdk", version = "=1.10.2" }
 solana-version = { path = "../version", version = "=1.10.2" }
-clap = "2.33.1"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/merkle-tree/Cargo.toml b/merkle-tree/Cargo.toml
index c7eaf3c127..a3cf4cabb6 100644
--- a/merkle-tree/Cargo.toml
+++ b/merkle-tree/Cargo.toml
@@ -10,8 +10,8 @@ documentation = "https://docs.rs/solana-merkle-tree"
 edition = "2021"
 
 [dependencies]
-solana-program = { path = "../sdk/program", version = "=1.10.2" }
 fast-math = "0.1"
+solana-program = { path = "../sdk/program", version = "=1.10.2" }
 
 # This can go once the BPF toolchain target Rust 1.42.0+
 [target.bpfel-unknown-unknown.dependencies]
diff --git a/net-shaper/Cargo.toml b/net-shaper/Cargo.toml
index 1c6b15e5bd..322594228f 100644
--- a/net-shaper/Cargo.toml
+++ b/net-shaper/Cargo.toml
@@ -11,10 +11,10 @@ publish = false
 
 [dependencies]
 clap = "2.33.1"
+rand = "0.7.0"
 serde = "1.0.136"
 serde_json = "1.0.79"
 solana-logger = { path = "../logger", version = "=1.10.2" }
-rand = "0.7.0"
 
 [[bin]]
 name = "solana-net-shaper"
diff --git a/perf/Cargo.toml b/perf/Cargo.toml
index 38f0e664d5..99e79146bf 100644
--- a/perf/Cargo.toml
+++ b/perf/Cargo.toml
@@ -12,20 +12,20 @@ edition = "2021"
 [dependencies]
 ahash = "0.7.6"
 bincode = "1.3.3"
+bv = { version = "0.11.1", features = ["serde"] }
 curve25519-dalek = { version = "3" }
 dlopen = "0.1.8"
 dlopen_derive = "0.1.4"
-lazy_static = "1.4.0"
-bv = { version = "0.11.1", features = ["serde"] }
 fnv = "1.0.7"
+lazy_static = "1.4.0"
 log = "0.4.14"
 rand = "0.7.0"
 rayon = "1.5.1"
 serde = "1.0.136"
 solana-metrics = { path = "../metrics", version = "=1.10.2" }
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.2" }
 solana-sdk = { path = "../sdk", version = "=1.10.2" }
 solana-vote-program = { path = "../programs/vote", version = "=1.10.2" }
-solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.2" }
 
 [target."cfg(target_os = \"linux\")".dependencies]
 caps = "0.5.3"
diff --git a/poh-bench/Cargo.toml b/poh-bench/Cargo.toml
index fd325e6a23..c3188a458f 100644
--- a/poh-bench/Cargo.toml
+++ b/poh-bench/Cargo.toml
@@ -14,12 +14,12 @@ clap = "2.33.1"
 log = "0.4.14"
 rand = "0.7.0"
 rayon = "1.5.1"
-solana-logger = { path = "../logger", version = "=1.10.2" }
 solana-entry = { path = "../entry", version = "=1.10.2" }
-solana-sdk = { path = "../sdk", version = "=1.10.2" }
+solana-logger = { path = "../logger", version = "=1.10.2" }
 solana-measure = { path = "../measure", version = "=1.10.2" }
-solana-version = { path = "../version", version = "=1.10.2" }
 solana-perf = { path = "../perf", version = "=1.10.2" }
+solana-sdk = { path = "../sdk", version = "=1.10.2" }
+solana-version = { path = "../version", version = "=1.10.2" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/programs/bpf_loader/Cargo.toml b/programs/bpf_loader/Cargo.toml
index 4dadf4ffc5..6ea026b91f 100644
--- a/programs/bpf_loader/Cargo.toml
+++ b/programs/bpf_loader/Cargo.toml
@@ -12,8 +12,8 @@ edition = "2021"
 [dependencies]
 bincode = "1.3.3"
 byteorder = "1.4.3"
-log = "0.4.14"
 libsecp256k1 = "0.6.0"
+log = "0.4.14"
 solana-measure = { path = "../../measure", version = "=1.10.2" }
 solana-metrics = { path = "../../metrics", version = "=1.10.2" }
 solana-program-runtime = { path = "../../program-runtime", version = "=1.10.2" }
diff --git a/programs/stake/Cargo.toml b/programs/stake/Cargo.toml
index 4f5031feb5..f2a7d1150e 100644
--- a/programs/stake/Cargo.toml
+++ b/programs/stake/Cargo.toml
@@ -16,13 +16,13 @@ num-derive = "0.3"
 num-traits = "0.2"
 serde = "1.0.136"
 serde_derive = "1.0.103"
+solana-config-program = { path = "../config", version = "=1.10.2" }
 solana-frozen-abi = { path = "../../frozen-abi", version = "=1.10.2" }
 solana-frozen-abi-macro = { path = "../../frozen-abi/macro", version = "=1.10.2" }
 solana-metrics = { path = "../../metrics", version = "=1.10.2" }
 solana-program-runtime = { path = "../../program-runtime", version = "=1.10.2" }
 solana-sdk = { path = "../../sdk", version = "=1.10.2" }
 solana-vote-program = { path = "../vote", version = "=1.10.2" }
-solana-config-program = { path = "../config", version = "=1.10.2" }
 thiserror = "1.0"
 
 [dev-dependencies]
diff --git a/rayon-threadlimit/Cargo.toml b/rayon-threadlimit/Cargo.toml
index 726d76ac9e..84364f0795 100644
--- a/rayon-threadlimit/Cargo.toml
+++ b/rayon-threadlimit/Cargo.toml
@@ -11,8 +11,8 @@ license = "Apache-2.0"
 edition = "2021"
 
 [dependencies]
-num_cpus = "1.13.1"
 lazy_static = "1.4.0"
+num_cpus = "1.13.1"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/remote-wallet/Cargo.toml b/remote-wallet/Cargo.toml
index 6a15551b68..43b2a3d7c0 100644
--- a/remote-wallet/Cargo.toml
+++ b/remote-wallet/Cargo.toml
@@ -12,7 +12,7 @@ documentation = "https://docs.rs/solana-remote-wallet"
 [dependencies]
 console = "0.15.0"
 dialoguer = "0.10.0"
-hidapi = { version = "1.3.4", default-features = false, optional = true}
+hidapi = { version = "1.3.4", default-features = false, optional = true }
 log = "0.4.14"
 num-derive = { version = "0.3" }
 num-traits = { version = "0.2" }
diff --git a/replica-node/Cargo.toml b/replica-node/Cargo.toml
index 2533bd5d57..0fda8fb275 100644
--- a/replica-node/Cargo.toml
+++ b/replica-node/Cargo.toml
@@ -21,14 +21,14 @@ solana-gossip = { path = "../gossip", version = "=1.10.2" }
 solana-ledger = { path = "../ledger", version = "=1.10.2" }
 solana-logger = { path = "../logger", version = "=1.10.2" }
 solana-net-utils = { path = "../net-utils", version = "=1.10.2" }
-solana-rpc = { path = "../rpc", version = "=1.10.2" }
 solana-replica-lib = { path = "../replica-lib", version = "=1.10.2" }
+solana-rpc = { path = "../rpc", version = "=1.10.2" }
 solana-runtime = { path = "../runtime", version = "=1.10.2" }
 solana-sdk = { path = "../sdk", version = "=1.10.2" }
 solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.10.2" }
 solana-streamer = { path = "../streamer", version = "=1.10.2" }
-solana-version = { path = "../version", version = "=1.10.2" }
 solana-validator = { path = "../validator", version = "=1.10.2" }
+solana-version = { path = "../version", version = "=1.10.2" }
 
 [dev-dependencies]
 serial_test = "0.6.0"
@@ -36,7 +36,6 @@ solana-core = { path = "../core", version = "=1.10.2" }
 solana-local-cluster = { path = "../local-cluster", version = "=1.10.2" }
 tempfile = "3.3.0"
 
-
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
 
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index c57a6996ba..5e4fd44e60 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -43,8 +43,8 @@ solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.2"
 solana-runtime = { path = "../runtime", version = "=1.10.2" }
 solana-sdk = { path = "../sdk", version = "=1.10.2" }
 solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.10.2" }
-solana-streamer = { path = "../streamer", version = "=1.10.2" }
 solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.10.2" }
+solana-streamer = { path = "../streamer", version = "=1.10.2" }
 solana-transaction-status = { path = "../transaction-status", version = "=1.10.2" }
 solana-version = { path = "../version", version = "=1.10.2" }
 solana-vote-program = { path = "../programs/vote", version = "=1.10.2" }
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
index be18f0ae12..b5469c3990 100644
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -17,8 +17,8 @@ bv = { version = "0.11.1", features = ["serde"] }
 bytemuck = "1.8.0"
 byteorder = "1.4.3"
 bzip2 = "0.4.3"
-dashmap = { version = "4.0.2", features = ["rayon", "raw-api"] }
 crossbeam-channel = "0.5"
+dashmap = { version = "4.0.2", features = ["rayon", "raw-api"] }
 dir-diff = "0.3.2"
 flate2 = "1.0.22"
 fnv = "1.0.7"
@@ -27,9 +27,9 @@ itertools = "0.10.3"
 lazy_static = "1.4.0"
 log = "0.4.14"
 memmap2 = "0.5.3"
-num_cpus = "1.13.1"
 num-derive = { version = "0.3" }
 num-traits = { version = "0.2" }
+num_cpus = "1.13.1"
 ouroboros = "0.14.2"
 rand = "0.7.0"
 rayon = "1.5.1"
diff --git a/runtime/store-tool/Cargo.toml b/runtime/store-tool/Cargo.toml
index e91f2858a2..00156c1a78 100644
--- a/runtime/store-tool/Cargo.toml
+++ b/runtime/store-tool/Cargo.toml
@@ -10,11 +10,11 @@ homepage = "https://solana.com/"
 publish = false
 
 [dependencies]
+clap = "2.33.1"
 log = { version = "0.4.14" }
 solana-logger = { path = "../../logger", version = "=1.10.2" }
-solana-version = { path = "../../version", version = "=1.10.2" }
 solana-runtime = { path = "..", version = "=1.10.2" }
-clap = "2.33.1"
+solana-version = { path = "../../version", version = "=1.10.2" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml
index b8538b4fe0..1778e0f048 100644
--- a/sdk/Cargo.toml
+++ b/sdk/Cargo.toml
@@ -38,12 +38,12 @@ full = [
 
 [dependencies]
 assert_matches = { version = "1.5.0", optional = true }
+base64 = "0.13"
 bincode = "1.3.3"
 bitflags = "1.3.1"
-bytemuck = { version = "1.8.0", features = ["derive"] }
 borsh = "0.9.3"
-base64 = "0.13"
 bs58 = "0.4.0"
+bytemuck = { version = "1.8.0", features = ["derive"] }
 byteorder = { version = "1.4.3", optional = true }
 chrono = { default-features = false, features = ["alloc"], version = "0.4", optional = true }
 curve25519-dalek = { version = "3.2.1", optional = true }
@@ -71,9 +71,9 @@ serde_derive = "1.0.103"
 serde_json = { version = "1.0.79", optional = true }
 sha2 = "0.10.2"
 sha3 = { version = "0.10.0", optional = true }
-solana-logger = { path = "../logger", version = "=1.10.2", optional = true }
 solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.2" }
 solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.2" }
+solana-logger = { path = "../logger", version = "=1.10.2", optional = true }
 solana-program = { path = "program", version = "=1.10.2" }
 solana-sdk-macro = { path = "macro", version = "=1.10.2" }
 thiserror = "1.0"
diff --git a/sdk/cargo-build-bpf/Cargo.toml b/sdk/cargo-build-bpf/Cargo.toml
index 1512cc75a5..124a3716c3 100644
--- a/sdk/cargo-build-bpf/Cargo.toml
+++ b/sdk/cargo-build-bpf/Cargo.toml
@@ -11,11 +11,11 @@ publish = false
 
 [dependencies]
 bzip2 = "0.4.3"
-clap = {version = "3.1.5", features = ["cargo", "env"]}
-regex = "1.5.4"
 cargo_metadata = "0.14.2"
-solana-sdk = { path = "..", version = "=1.10.2" }
+clap = { version = "3.1.5", features = ["cargo", "env"] }
+regex = "1.5.4"
 solana-download-utils = { path = "../../download-utils", version = "=1.10.2" }
+solana-sdk = { path = "..", version = "=1.10.2" }
 tar = "0.4.38"
 
 [dev-dependencies]
diff --git a/sdk/cargo-test-bpf/Cargo.toml b/sdk/cargo-test-bpf/Cargo.toml
index 756a3839cc..16da6ab947 100644
--- a/sdk/cargo-test-bpf/Cargo.toml
+++ b/sdk/cargo-test-bpf/Cargo.toml
@@ -10,8 +10,8 @@ edition = "2021"
 publish = false
 
 [dependencies]
-clap = { version = "3.1.5", features = ["cargo"] }
 cargo_metadata = "0.14.2"
+clap = { version = "3.1.5", features = ["cargo"] }
 
 [[bin]]
 name = "cargo-test-bpf"
diff --git a/streamer/Cargo.toml b/streamer/Cargo.toml
index d1a4c44a4f..9448e92a9f 100644
--- a/streamer/Cargo.toml
+++ b/streamer/Cargo.toml
@@ -17,19 +17,18 @@ itertools = "0.10.3"
 libc = "0.2.119"
 log = "0.4.14"
 nix = "0.23.1"
+pem = "1.0.2"
+pkcs8 = { version = "0.8.0", features = ["alloc"] }
 quinn = "0.8.1"
 rand = "0.7.0"
 rcgen = "0.9.2"
 rustls = { version = "0.20.4", features = ["dangerous_configuration"] }
-pem = "1.0.2"
-pkcs8 = { version = "0.8.0", features = ["alloc"] }
 solana-metrics = { path = "../metrics", version = "=1.10.2" }
-solana-sdk = { path = "../sdk", version = "=1.10.2" }
 solana-perf = { path = "../perf", version = "=1.10.2" }
+solana-sdk = { path = "../sdk", version = "=1.10.2" }
 thiserror = "1.0"
 tokio = { version = "1", features = ["full"] }
 
-
 [dev-dependencies]
 solana-logger = { path = "../logger", version = "=1.10.2" }
 
diff --git a/sys-tuner/Cargo.toml b/sys-tuner/Cargo.toml
index 3dda4e0ba7..d344114646 100644
--- a/sys-tuner/Cargo.toml
+++ b/sys-tuner/Cargo.toml
@@ -12,8 +12,8 @@ publish = true
 
 [dependencies]
 clap = "2.33.1"
-log = "0.4.14"
 libc = "0.2.119"
+log = "0.4.14"
 solana-logger = { path = "../logger", version = "=1.10.2" }
 solana-version = { path = "../version", version = "=1.10.2" }
 
diff --git a/transaction-dos/Cargo.toml b/transaction-dos/Cargo.toml
index eef9721c0e..32323e88b8 100644
--- a/transaction-dos/Cargo.toml
+++ b/transaction-dos/Cargo.toml
@@ -14,8 +14,8 @@ clap = "2.33.1"
 log = "0.4.14"
 rand = "0.7.0"
 rayon = "1.5.1"
-solana-cli = { path = "../cli", version = "=1.10.2" }
 solana-clap-utils = { path = "../clap-utils", version = "=1.10.2" }
+solana-cli = { path = "../cli", version = "=1.10.2" }
 solana-client = { path = "../client", version = "=1.10.2" }
 solana-core = { path = "../core", version = "=1.10.2" }
 solana-faucet = { path = "../faucet", version = "=1.10.2" }
diff --git a/transaction-status/Cargo.toml b/transaction-status/Cargo.toml
index bbdde5c10d..339504fe47 100644
--- a/transaction-status/Cargo.toml
+++ b/transaction-status/Cargo.toml
@@ -10,10 +10,10 @@ license = "Apache-2.0"
 edition = "2021"
 
 [dependencies]
+Inflector = "0.11.4"
 base64 = "0.12.3"
 bincode = "1.3.3"
 bs58 = "0.4.0"
-Inflector = "0.11.4"
 lazy_static = "1.4.0"
 log = "0.4.14"
 serde = "1.0.136"
diff --git a/upload-perf/Cargo.toml b/upload-perf/Cargo.toml
index 081f1bcc8e..11b8113918 100644
--- a/upload-perf/Cargo.toml
+++ b/upload-perf/Cargo.toml
@@ -17,6 +17,5 @@ solana-metrics = { path = "../metrics", version = "=1.10.2" }
 name = "solana-upload-perf"
 path = "src/upload-perf.rs"
 
-
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/validator/Cargo.toml b/validator/Cargo.toml
index 861f860e58..5c4258859c 100644
--- a/validator/Cargo.toml
+++ b/validator/Cargo.toml
@@ -22,7 +22,7 @@ jsonrpc-core = "18.0.0"
 jsonrpc-core-client = { version = "18.0.0", features = ["ipc"] }
 jsonrpc-derive = "18.0.0"
 jsonrpc-ipc-server = "18.0.0"
-jsonrpc-server-utils= "18.0.0"
+jsonrpc-server-utils = "18.0.0"
 log = "0.4.14"
 num_cpus = "1.13.1"
 rand = "0.7.0"
@@ -55,7 +55,7 @@ solana-vote-program = { path = "../programs/vote", version = "=1.10.2" }
 symlink = "0.1.0"
 
 [target.'cfg(not(target_env = "msvc"))'.dependencies]
-jemallocator = {package = "tikv-jemallocator", version = "0.4.1", features = ["unprefixed_malloc_on_supported_platforms"]}
+jemallocator = { package = "tikv-jemallocator", version = "0.4.1", features = ["unprefixed_malloc_on_supported_platforms"] }
 
 [target."cfg(unix)".dependencies]
 libc = "0.2.119"
diff --git a/watchtower/Cargo.toml b/watchtower/Cargo.toml
index 8d1bf8d1f5..63a4aedc18 100644
--- a/watchtower/Cargo.toml
+++ b/watchtower/Cargo.toml
@@ -11,8 +11,8 @@ documentation = "https://docs.rs/solana-watchtower"
 
 [dependencies]
 clap = "2.33.1"
-log = "0.4.14"
 humantime = "2.0.1"
+log = "0.4.14"
 solana-clap-utils = { path = "../clap-utils", version = "=1.10.2" }
 solana-cli-config = { path = "../cli-config", version = "=1.10.2" }
 solana-cli-output = { path = "../cli-output", version = "=1.10.2" }
diff --git a/zk-token-sdk/Cargo.toml b/zk-token-sdk/Cargo.toml
index de0131d687..eaea053292 100644
--- a/zk-token-sdk/Cargo.toml
+++ b/zk-token-sdk/Cargo.toml
@@ -20,7 +20,7 @@ arrayref = "0.3.6"
 bincode = "1"
 byteorder = "1"
 cipher = "0.4"
-curve25519-dalek = { version = "3.2.1", features = ["serde"]}
+curve25519-dalek = { version = "3.2.1", features = ["serde"] }
 getrandom = { version = "0.1", features = ["dummy"] }
 lazy_static = "1.4.0"
 merlin = "3"