v2.2: bump cargo sort to v2

Cargo.toml

@@ -1,12 +1,3 @@
-[profile.release-with-debug]
-inherits = "release"
-debug = true
-split-debuginfo = "packed"
-lto = false                # Preserve the 'thin local LTO' for this build.
-
-[profile.release]
-split-debuginfo = "unpacked"
-lto = "thin"
 
 [workspace]
 members = [
@@ -175,16 +166,18 @@ check-cfg = [
 
 [workspace.dependencies]
 Inflector = "0.11.4"
-axum = "0.7.9"
+aes-gcm-siv = "0.11.1"
 agave-banking-stage-ingress-types = { path = "banking-stage-ingress-types", version = "=2.2.17" }
+agave-cargo-registry = { path = "cargo-registry", version = "=2.2.17" }
 agave-feature-set = { path = "feature-set", version = "=2.2.17" }
+agave-geyser-plugin-interface = { path = "geyser-plugin-interface", version = "=2.2.17" }
 agave-precompiles = { path = "precompiles", version = "=2.2.17" }
 agave-reserved-account-keys = { path = "reserved-account-keys", version = "=2.2.17" }
+agave-thread-manager = { path = "thread-manager", version = "=2.2.17" }
 agave-transaction-view = { path = "transaction-view", version = "=2.2.17" }
-aquamarine = "0.6.0"
-aes-gcm-siv = "0.11.1"
 ahash = "0.8.11"
 anyhow = "1.0.95"
+aquamarine = "0.6.0"
 arbitrary = "1.4.1"
 ark-bn254 = "0.4.0"
 ark-ec = "0.4.0"
@@ -199,6 +192,7 @@ async-channel = "1.9.0"
 async-lock = "3.4.0"
 async-trait = "0.1.86"
 atty = "0.2.11"
+axum = "0.7.9"
 backoff = "0.4.0"
 base64 = "0.22.1"
 bincode = "1.3.3"
@@ -216,8 +210,8 @@ bytes = "1.10"
 bzip2 = "0.4.4"
 caps = "0.5.5"
 cargo_metadata = "0.15.4"
-cfg_eval = "0.1.2"
 cfg-if = "1.0.0"
+cfg_eval = "0.1.2"
 chrono = { version = "0.4.39", default-features = false }
 chrono-humanize = "0.2.3"
 clap = "2.33.1"
@@ -250,8 +244,8 @@ env_logger = "0.9.3"
 etcd-client = "0.11.1"
 fast-math = "0.1"
 fd-lock = "3.0.13"
-flate2 = "1.0.31"
 five8_const = "0.1.3"
+flate2 = "1.0.31"
 fnv = "1.0.7"
 fs_extra = "1.3.0"
 futures = "0.3.31"
@@ -384,8 +378,6 @@ solana-bpf-loader-program = { path = "programs/bpf_loader", version = "=2.2.17"
 solana-bucket-map = { path = "bucket_map", version = "=2.2.17" }
 solana-builtins = { path = "builtins", version = "=2.2.17" }
 solana-builtins-default-costs = { path = "builtins-default-costs", version = "=2.2.17" }
-agave-cargo-registry = { path = "cargo-registry", version = "=2.2.17" }
-agave-thread-manager = { path = "thread-manager", version = "=2.2.17" }
 solana-clap-utils = { path = "clap-utils", version = "=2.2.17" }
 solana-clap-v3-utils = { path = "clap-v3-utils", version = "=2.2.17" }
 solana-cli = { path = "cli", version = "=2.2.17" }
@@ -412,7 +404,6 @@ solana-derivation-path = "2.2.1"
 solana-download-utils = { path = "download-utils", version = "=2.2.17" }
 solana-ed25519-program = "2.2.2"
 solana-entry = { path = "entry", version = "=2.2.17" }
-solana-program-entrypoint = "2.2.1"
 solana-epoch-info = "2.2.1"
 solana-epoch-rewards = "2.2.1"
 solana-epoch-rewards-hasher = "2.2.1"
@@ -421,17 +412,15 @@ solana-example-mocks = "2.2.1"
 solana-faucet = { path = "faucet", version = "=2.2.17" }
 solana-feature-gate-client = "0.0.2"
 solana-feature-gate-interface = "2.2.2"
-solana-fee-calculator = "2.2.1"
 solana-fee = { path = "fee", version = "=2.2.17" }
+solana-fee-calculator = "2.2.1"
 solana-fee-structure = "2.2.1"
+solana-file-download = "2.2.1"
 solana-frozen-abi = "2.2.1"
 solana-frozen-abi-macro = "2.2.1"
-solana-tps-client = { path = "tps-client", version = "=2.2.17" }
-solana-file-download = "2.2.1"
 solana-genesis = { path = "genesis", version = "=2.2.17" }
 solana-genesis-config = "2.2.1"
 solana-genesis-utils = { path = "genesis-utils", version = "=2.2.17" }
-agave-geyser-plugin-interface = { path = "geyser-plugin-interface", version = "=2.2.17" }
 solana-geyser-plugin-manager = { path = "geyser-plugin-manager", version = "=2.2.17" }
 solana-gossip = { path = "gossip", version = "=2.2.17" }
 solana-hard-forks = "2.2.1"
@@ -474,6 +463,7 @@ solana-poseidon = { path = "poseidon", version = "=2.2.17" }
 solana-precompile-error = "2.2.1"
 solana-presigner = "2.2.1"
 solana-program = { version = "2.2.1", default-features = false }
+solana-program-entrypoint = "2.2.1"
 solana-program-error = "2.2.1"
 solana-program-memory = "2.2.1"
 solana-program-option = "2.2.1"
@@ -490,38 +480,33 @@ solana-rent = "2.2.1"
 solana-rent-collector = "2.2.1"
 solana-rent-debits = "2.2.1"
 solana-reward-info = "2.2.1"
-solana-sanitize = "2.2.1"
-solana-secp256r1-program = "2.2.2"
-solana-seed-derivable = "2.2.1"
-solana-seed-phrase = "2.2.1"
-solana-serde = "2.2.1"
-solana-serde-varint = "2.2.1"
-solana-serialize-utils = "2.2.1"
-solana-sha256-hasher = "2.2.1"
-solana-signature = { version = "2.2.1", default-features = false }
-solana-signer = "2.2.1"
-solana-slot-hashes = "2.2.1"
-solana-slot-history = "2.2.1"
-solana-time-utils = "2.2.1"
-solana-timings = { path = "timings", version = "=2.2.17" }
-solana-tls-utils = { path = "tls-utils", version = "=2.2.17" }
-solana-unified-scheduler-logic = { path = "unified-scheduler-logic", version = "=2.2.17" }
-solana-unified-scheduler-pool = { path = "unified-scheduler-pool", version = "=2.2.17" }
 solana-rpc = { path = "rpc", version = "=2.2.17" }
 solana-rpc-client = { path = "rpc-client", version = "=2.2.17", default-features = false }
 solana-rpc-client-api = { path = "rpc-client-api", version = "=2.2.17" }
 solana-rpc-client-nonce-utils = { path = "rpc-client-nonce-utils", version = "=2.2.17" }
 solana-runtime = { path = "runtime", version = "=2.2.17" }
 solana-runtime-transaction = { path = "runtime-transaction", version = "=2.2.17" }
+solana-sanitize = "2.2.1"
 solana-sbpf = "=0.10.1"
 solana-sdk = "2.2.2"
 solana-sdk-ids = "2.2.1"
 solana-sdk-macro = "2.2.1"
 solana-secp256k1-program = "2.2.1"
 solana-secp256k1-recover = "2.2.1"
+solana-secp256r1-program = "2.2.2"
+solana-seed-derivable = "2.2.1"
+solana-seed-phrase = "2.2.1"
 solana-send-transaction-service = { path = "send-transaction-service", version = "=2.2.17" }
+solana-serde = "2.2.1"
+solana-serde-varint = "2.2.1"
+solana-serialize-utils = "2.2.1"
+solana-sha256-hasher = "2.2.1"
 solana-short-vec = "2.2.1"
 solana-shred-version = "2.2.1"
+solana-signature = { version = "2.2.1", default-features = false }
+solana-signer = "2.2.1"
+solana-slot-hashes = "2.2.1"
+solana-slot-history = "2.2.1"
 solana-stable-layout = "2.2.1"
 solana-stake-interface = { version = "1.2.1" }
 solana-stake-program = { path = "programs/stake", version = "=2.2.17" }
@@ -539,17 +524,23 @@ solana-sysvar = "2.2.1"
 solana-sysvar-id = "2.2.1"
 solana-test-validator = { path = "test-validator", version = "=2.2.17" }
 solana-thin-client = { path = "thin-client", version = "=2.2.17" }
-solana-transaction = "2.2.2"
-solana-transaction-error = "2.2.1"
+solana-time-utils = "2.2.1"
+solana-timings = { path = "timings", version = "=2.2.17" }
+solana-tls-utils = { path = "tls-utils", version = "=2.2.17" }
+solana-tps-client = { path = "tps-client", version = "=2.2.17" }
 solana-tpu-client = { path = "tpu-client", version = "=2.2.17", default-features = false }
 solana-tpu-client-next = { path = "tpu-client-next", version = "=2.2.17" }
+solana-transaction = "2.2.2"
 solana-transaction-context = { path = "transaction-context", version = "=2.2.17", features = [ "bincode", "debug-signature" ] }
+solana-transaction-error = "2.2.1"
+solana-transaction-metrics-tracker = { path = "transaction-metrics-tracker", version = "=2.2.17" }
 solana-transaction-status = { path = "transaction-status", version = "=2.2.17" }
 solana-transaction-status-client-types = { path = "transaction-status-client-types", version = "=2.2.17" }
-solana-transaction-metrics-tracker = { path = "transaction-metrics-tracker", version = "=2.2.17" }
 solana-turbine = { path = "turbine", version = "=2.2.17" }
 solana-type-overrides = { path = "type-overrides", version = "=2.2.17" }
 solana-udp-client = { path = "udp-client", version = "=2.2.17" }
+solana-unified-scheduler-logic = { path = "unified-scheduler-logic", version = "=2.2.17" }
+solana-unified-scheduler-pool = { path = "unified-scheduler-pool", version = "=2.2.17" }
 solana-validator-exit = "2.2.1"
 solana-version = { path = "version", version = "=2.2.17" }
 solana-vote = { path = "vote", version = "=2.2.17" }
@@ -610,6 +601,15 @@ x509-parser = "0.14.0"
 # See "zeroize versioning issues" below if you are updating this version.
 zeroize = { version = "1.7", default-features = false }
 zstd = "0.13.2"
+[profile.release-with-debug]
+inherits = "release"
+debug = true
+split-debuginfo = "packed"
+lto = false                # Preserve the 'thin local LTO' for this build.
+
+[profile.release]
+split-debuginfo = "unpacked"
+lto = "thin"
 
 # curve25519-dalek uses the simd backend by default in v4 if possible,
 # which has very slow performance on some platforms with opt-level 0,

account-decoder-client-types/Cargo.toml

@@ -9,6 +9,14 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+all-features = true
+rustdoc-args = ["--cfg=docsrs"]
+
+[features]
+zstd = ["dep:zstd"]
+
 [dependencies]
 base64 = { workspace = true }
 bs58 = { workspace = true, features = ["std"] }
@@ -18,11 +26,3 @@ serde_json = { workspace = true }
 solana-account = { workspace = true }
 solana-pubkey = { workspace = true }
 zstd = { workspace = true, optional = true }
-
-[features]
-zstd = ["dep:zstd"]
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-all-features = true
-rustdoc-args = ["--cfg=docsrs"]

account-decoder/Cargo.toml

@@ -9,6 +9,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dependencies]
 Inflector = { workspace = true }
 base64 = { workspace = true }
@@ -49,8 +52,5 @@ solana-program = { workspace = true, default-features = false }
 solana-pubkey = { workspace = true, features = ["rand"] }
 spl-pod = { workspace = true }
 
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
 [lints]
 workspace = true

accounts-bench/Cargo.toml

@@ -8,6 +8,12 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[features]
+dev-context-only-utils = []
+
 [dependencies]
 clap = { workspace = true }
 log = { workspace = true }
@@ -17,9 +23,3 @@ solana-logger = { workspace = true }
 solana-measure = { workspace = true }
 solana-sdk = { workspace = true }
 solana-version = { workspace = true }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[features]
-dev-context-only-utils = []

accounts-cluster-bench/Cargo.toml

@@ -8,6 +8,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
 [dependencies]
 clap = { workspace = true }
 log = { workspace = true }
@@ -38,6 +41,3 @@ solana-faucet = { workspace = true }
 solana-local-cluster = { workspace = true }
 solana-runtime = { workspace = true, features = ["dev-context-only-utils"] }
 solana-test-validator = { workspace = true }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]

accounts-db/Cargo.toml

@@ -9,6 +9,27 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+crate-type = ["lib"]
+name = "solana_accounts_db"
+
+[features]
+dev-context-only-utils = [
+    "dep:qualifier_attr",
+    "dep:solana-stake-program",
+    "dep:solana-vote-program",
+    "solana-pubkey/rand",
+]
+frozen-abi = [
+    "dep:solana-frozen-abi",
+    "dep:solana-frozen-abi-macro",
+    "solana-sdk/frozen-abi",
+    "solana-vote-program/frozen-abi",
+]
+
 [dependencies]
 ahash = { workspace = true }
 bincode = { workspace = true }
@@ -62,10 +83,6 @@ tar = { workspace = true }
 tempfile = { workspace = true }
 thiserror = { workspace = true }
 
-[lib]
-crate-type = ["lib"]
-name = "solana_accounts_db"
-
 [dev-dependencies]
 assert_matches = { workspace = true }
 criterion = { workspace = true }
@@ -83,23 +100,6 @@ strum = { workspace = true, features = ["derive"] }
 strum_macros = { workspace = true }
 test-case = { workspace = true }
 
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[features]
-dev-context-only-utils = [
-    "dep:qualifier_attr",
-    "dep:solana-stake-program",
-    "dep:solana-vote-program",
-    "solana-pubkey/rand",
-]
-frozen-abi = [
-    "dep:solana-frozen-abi",
-    "dep:solana-frozen-abi-macro",
-    "solana-sdk/frozen-abi",
-    "solana-vote-program/frozen-abi",
-]
-
 [[bench]]
 name = "bench_accounts_file"
 harness = false

accounts-db/accounts-hash-cache-tool/Cargo.toml

@@ -9,6 +9,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[features]
+dev-context-only-utils = []
+
 [dependencies]
 ahash = { workspace = true }
 anyhow = { workspace = true }
@@ -20,6 +23,3 @@ solana-accounts-db = { workspace = true }
 solana-clap-utils = { workspace = true }
 solana-pubkey = { workspace = true }
 solana-version = { workspace = true }
-
-[features]
-dev-context-only-utils = []

accounts-db/store-histogram/Cargo.toml

@@ -9,9 +9,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[features]
+dev-context-only-utils = []
+
 [dependencies]
 clap = { workspace = true }
 solana-version = { workspace = true }
-
-[features]
-dev-context-only-utils = []

accounts-db/store-tool/Cargo.toml

@@ -9,6 +9,9 @@ homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 
+[features]
+dev-context-only-utils = []
+
 [dependencies]
 ahash = { workspace = true }
 clap = { workspace = true }
@@ -18,6 +21,3 @@ solana-accounts-db = { workspace = true, features = ["dev-context-only-utils"] }
 solana-pubkey = { workspace = true }
 solana-system-interface = { workspace = true }
 solana-version = { workspace = true }
-
-[features]
-dev-context-only-utils = []