v2.2: Migrate from solana-feature-set to agave-feature-set (backport of #5520) (#5537)

Cargo.lock

@@ -204,6 +204,7 @@ dependencies = [
 name = "agave-ledger-tool"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "agave-reserved-account-keys",
  "assert_cmd",
  "bs58",
@@ -234,7 +235,6 @@ dependencies = [
  "solana-core",
  "solana-cost-model",
  "solana-entry",
- "solana-feature-set",
  "solana-geyser-plugin-manager",
  "solana-gossip",
  "solana-ledger",
@@ -265,6 +265,7 @@ dependencies = [
 name = "agave-precompiles"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "bincode",
  "bytemuck",
  "digest 0.10.7",
@@ -276,7 +277,6 @@ dependencies = [
  "rand 0.7.3",
  "sha3",
  "solana-ed25519-program",
- "solana-feature-set",
  "solana-instruction",
  "solana-keccak-hasher",
  "solana-logger",
@@ -292,8 +292,8 @@ dependencies = [
 name = "agave-reserved-account-keys"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "lazy_static",
- "solana-feature-set",
  "solana-frozen-abi",
  "solana-frozen-abi-macro",
  "solana-message",
@@ -3764,9 +3764,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.169"
+version = "0.2.170"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828"
 
 [[package]]
 name = "libloading"
@@ -5760,9 +5760,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.138"
+version = "1.0.139"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
+checksum = "44f86c3acccc9c65b153fe1b85a3be07fe5515274ec9f0653b4a0875731c72a6"
 dependencies = [
  "itoa",
  "memchr",
@@ -6319,6 +6319,7 @@ dependencies = [
 name = "solana-address-lookup-table-program"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "bincode",
  "bytemuck",
  "log",
@@ -6327,7 +6328,6 @@ dependencies = [
  "solana-address-lookup-table-interface",
  "solana-bincode",
  "solana-clock",
- "solana-feature-set",
  "solana-instruction",
  "solana-log-collector",
  "solana-packet",
@@ -6342,12 +6342,12 @@ dependencies = [
 name = "solana-address-lookup-table-program-tests"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "assert_matches",
  "bincode",
  "criterion",
  "solana-account",
  "solana-address-lookup-table-program",
- "solana-feature-set",
  "solana-instruction",
  "solana-program-runtime",
  "solana-program-test",
@@ -6425,12 +6425,12 @@ dependencies = [
 name = "solana-banks-server"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "bincode",
  "crossbeam-channel",
  "futures 0.3.31",
  "solana-banks-interface",
  "solana-client",
- "solana-feature-set",
  "solana-runtime",
  "solana-runtime-transaction",
  "solana-sdk",
@@ -6456,6 +6456,7 @@ dependencies = [
 name = "solana-bench-tps"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "chrono",
  "clap 2.33.3",
  "crossbeam-channel",
@@ -6473,7 +6474,6 @@ dependencies = [
  "solana-connection-cache",
  "solana-core",
  "solana-faucet",
- "solana-feature-set",
  "solana-genesis",
  "solana-gossip",
  "solana-local-cluster",
@@ -6600,6 +6600,7 @@ dependencies = [
 name = "solana-bpf-loader-program"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "agave-precompiles",
  "assert_matches",
  "bincode",
@@ -6621,7 +6622,6 @@ dependencies = [
  "solana-curve25519",
  "solana-epoch-rewards",
  "solana-epoch-schedule",
- "solana-feature-set",
  "solana-fee-calculator",
  "solana-hash",
  "solana-instruction",
@@ -6692,11 +6692,11 @@ dependencies = [
 name = "solana-builtins"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "solana-address-lookup-table-program",
  "solana-bpf-loader-program",
  "solana-compute-budget-program",
  "solana-config-program",
- "solana-feature-set",
  "solana-loader-v4-program",
  "solana-program-runtime",
  "solana-pubkey",
@@ -6712,6 +6712,7 @@ dependencies = [
 name = "solana-builtins-default-costs"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "ahash 0.8.11",
  "lazy_static",
  "log",
@@ -6722,7 +6723,6 @@ dependencies = [
  "solana-builtins-default-costs",
  "solana-compute-budget-program",
  "solana-config-program",
- "solana-feature-set",
  "solana-frozen-abi",
  "solana-loader-v4-program",
  "solana-pubkey",
@@ -6832,6 +6832,7 @@ dependencies = [
 name = "solana-cli"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "assert_matches",
  "bincode",
  "bs58",
@@ -6871,7 +6872,6 @@ dependencies = [
  "solana-faucet",
  "solana-feature-gate-client",
  "solana-feature-gate-interface",
- "solana-feature-set",
  "solana-hash",
  "solana-instruction",
  "solana-keypair",
@@ -7129,6 +7129,7 @@ dependencies = [
 name = "solana-compute-budget-instruction"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "bincode",
  "criterion",
  "log",
@@ -7137,7 +7138,6 @@ dependencies = [
  "solana-builtins-default-costs",
  "solana-compute-budget",
  "solana-compute-budget-interface",
- "solana-feature-set",
  "solana-hash",
  "solana-instruction",
  "solana-keypair",
@@ -7179,12 +7179,12 @@ dependencies = [
 name = "solana-compute-budget-program-bench"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "criterion",
  "solana-compute-budget",
  "solana-compute-budget-instruction",
  "solana-compute-budget-interface",
  "solana-compute-budget-program",
- "solana-feature-set",
  "solana-message",
  "solana-sdk-ids",
  "solana-svm-transaction",
@@ -7245,6 +7245,7 @@ name = "solana-core"
 version = "2.2.6"
 dependencies = [
  "agave-banking-stage-ingress-types",
+ "agave-feature-set",
  "agave-reserved-account-keys",
  "agave-transaction-view",
  "ahash 0.8.11",
@@ -7294,7 +7295,6 @@ dependencies = [
  "solana-core",
  "solana-cost-model",
  "solana-entry",
- "solana-feature-set",
  "solana-fee",
  "solana-frozen-abi",
  "solana-frozen-abi-macro",
@@ -7354,6 +7354,7 @@ dependencies = [
 name = "solana-cost-model"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "agave-reserved-account-keys",
  "ahash 0.8.11",
  "itertools 0.12.1",
@@ -7369,7 +7370,6 @@ dependencies = [
  "solana-compute-budget-interface",
  "solana-compute-budget-program",
  "solana-cost-model",
- "solana-feature-set",
  "solana-fee-structure",
  "solana-frozen-abi",
  "solana-frozen-abi-macro",
@@ -7511,6 +7511,7 @@ dependencies = [
 name = "solana-ed25519-program-tests"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "assert_matches",
  "ed25519-dalek",
  "rand 0.8.5",
@@ -7718,7 +7719,7 @@ dependencies = [
 name = "solana-fee"
 version = "2.2.6"
 dependencies = [
- "solana-feature-set",
+ "agave-feature-set",
  "solana-fee-structure",
  "solana-svm-transaction",
 ]
@@ -7795,6 +7796,7 @@ dependencies = [
 name = "solana-genesis"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "base64 0.22.1",
  "bincode",
  "clap 2.33.3",
@@ -7895,6 +7897,7 @@ dependencies = [
 name = "solana-gossip"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "assert_matches",
  "bincode",
  "bs58",
@@ -7925,7 +7928,6 @@ dependencies = [
  "solana-client",
  "solana-connection-cache",
  "solana-entry",
- "solana-feature-set",
  "solana-frozen-abi",
  "solana-frozen-abi-macro",
  "solana-ledger",
@@ -8126,6 +8128,7 @@ dependencies = [
 name = "solana-ledger"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "agave-reserved-account-keys",
  "assert_matches",
  "bincode",
@@ -8166,7 +8169,6 @@ dependencies = [
  "solana-bpf-loader-program",
  "solana-cost-model",
  "solana-entry",
- "solana-feature-set",
  "solana-frozen-abi",
  "solana-frozen-abi-macro",
  "solana-logger",
@@ -8340,13 +8342,15 @@ dependencies = [
 
 [[package]]
 name = "solana-logger"
-version = "2.2.1"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "593dbcb81439d37b02757e90bd9ab56364de63f378c55db92a6fbd6a2e47ab36"
+checksum = "db8e777ec1afd733939b532a42492d888ec7c88d8b4127a5d867eb45c6eb5cd5"
 dependencies = [
  "env_logger",
  "lazy_static",
+ "libc",
  "log",
+ "signal-hook",
 ]
 
 [[package]]
@@ -8839,6 +8843,7 @@ dependencies = [
 name = "solana-program-runtime"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "agave-precompiles",
  "assert_matches",
  "base64 0.22.1",
@@ -8854,7 +8859,6 @@ dependencies = [
  "solana-compute-budget",
  "solana-epoch-rewards",
  "solana-epoch-schedule",
- "solana-feature-set",
  "solana-frozen-abi",
  "solana-frozen-abi-macro",
  "solana-hash",
@@ -8882,6 +8886,7 @@ dependencies = [
 name = "solana-program-test"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "assert_matches",
  "async-trait",
  "base64 0.22.1",
@@ -8896,7 +8901,6 @@ dependencies = [
  "solana-banks-server",
  "solana-bpf-loader-program",
  "solana-compute-budget",
- "solana-feature-set",
  "solana-inline-spl",
  "solana-instruction",
  "solana-log-collector",
@@ -9117,6 +9121,7 @@ dependencies = [
 name = "solana-rpc"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "agave-reserved-account-keys",
  "base64 0.22.1",
  "bincode",
@@ -9143,7 +9148,6 @@ dependencies = [
  "solana-client",
  "solana-entry",
  "solana-faucet",
- "solana-feature-set",
  "solana-gossip",
  "solana-inline-spl",
  "solana-ledger",
@@ -9329,6 +9333,7 @@ dependencies = [
 name = "solana-runtime"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "agave-precompiles",
  "agave-reserved-account-keys",
  "agave-transaction-view",
@@ -9383,7 +9388,6 @@ dependencies = [
  "solana-compute-budget-instruction",
  "solana-config-program",
  "solana-cost-model",
- "solana-feature-set",
  "solana-fee",
  "solana-frozen-abi",
  "solana-frozen-abi-macro",
@@ -9431,6 +9435,7 @@ dependencies = [
 name = "solana-runtime-transaction"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "agave-reserved-account-keys",
  "agave-transaction-view",
  "bincode",
@@ -9440,7 +9445,6 @@ dependencies = [
  "solana-compute-budget",
  "solana-compute-budget-instruction",
  "solana-compute-budget-interface",
- "solana-feature-set",
  "solana-hash",
  "solana-instruction",
  "solana-keypair",
@@ -9485,9 +9489,9 @@ dependencies = [
 
 [[package]]
 name = "solana-sdk"
-version = "2.2.1"
+version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4808e8d7f3c931657e615042d4176b423e66f64dc99e3dc3c735a197e512029b"
+checksum = "e8af90d2ce445440e0548fa4a5f96fe8b265c22041a68c942012ffadd029667d"
 dependencies = [
  "bincode",
  "bs58",
@@ -9832,6 +9836,7 @@ dependencies = [
 name = "solana-stake-program"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "assert_matches",
  "bincode",
  "criterion",
@@ -9844,7 +9849,6 @@ dependencies = [
  "solana-config-program",
  "solana-epoch-rewards",
  "solana-epoch-schedule",
- "solana-feature-set",
  "solana-genesis-config",
  "solana-instruction",
  "solana-log-collector",
@@ -9869,9 +9873,9 @@ dependencies = [
 name = "solana-stake-program-tests"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "assert_matches",
  "bincode",
- "solana-feature-set",
  "solana-program-test",
  "solana-sdk",
  "solana-vote-program",
@@ -9999,6 +10003,7 @@ dependencies = [
 name = "solana-svm"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "agave-precompiles",
  "agave-reserved-account-keys",
  "ahash 0.8.11",
@@ -10026,7 +10031,6 @@ dependencies = [
  "solana-compute-budget-program",
  "solana-ed25519-program",
  "solana-epoch-schedule",
- "solana-feature-set",
  "solana-fee-calculator",
  "solana-fee-structure",
  "solana-frozen-abi",
@@ -10123,6 +10127,7 @@ dependencies = [
 name = "solana-system-program"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "assert_matches",
  "bincode",
  "criterion",
@@ -10132,7 +10137,6 @@ dependencies = [
  "solana-account",
  "solana-bincode",
  "solana-compute-budget",
- "solana-feature-set",
  "solana-hash",
  "solana-instruction",
  "solana-log-collector",
@@ -10220,6 +10224,7 @@ dependencies = [
 name = "solana-test-validator"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "base64 0.22.1",
  "bincode",
  "crossbeam-channel",
@@ -10230,7 +10235,6 @@ dependencies = [
  "solana-cli-output",
  "solana-compute-budget",
  "solana-core",
- "solana-feature-set",
  "solana-geyser-plugin-manager",
  "solana-gossip",
  "solana-ledger",
@@ -10434,9 +10438,9 @@ dependencies = [
 
 [[package]]
 name = "solana-transaction"
-version = "2.2.1"
+version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "753b3e9afed170e4cfc0ea1e87b5dfdc6d4a50270869414edd24c6ea1f529b29"
+checksum = "abec848d081beb15a324c633cd0e0ab33033318063230389895cae503ec9b544"
 dependencies = [
  "bincode",
  "serde",
@@ -10452,7 +10456,6 @@ dependencies = [
  "solana-message",
  "solana-precompiles",
  "solana-pubkey",
- "solana-reserved-account-keys",
  "solana-sanitize",
  "solana-sdk-ids",
  "solana-short-vec",
@@ -10605,6 +10608,7 @@ dependencies = [
 name = "solana-turbine"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "assert_matches",
  "bincode",
  "bs58",
@@ -10621,7 +10625,6 @@ dependencies = [
  "rayon",
  "rustls 0.23.22",
  "solana-entry",
- "solana-feature-set",
  "solana-geyser-plugin-manager",
  "solana-gossip",
  "solana-ledger",
@@ -10738,10 +10741,10 @@ checksum = "7bbf6d7a3c0b28dd5335c52c0e9eae49d0ae489a8f324917faf0ded65a812c1d"
 name = "solana-version"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "semver 1.0.25",
  "serde",
  "serde_derive",
- "solana-feature-set",
  "solana-frozen-abi",
  "solana-frozen-abi-macro",
  "solana-sanitize",
@@ -10851,6 +10854,7 @@ dependencies = [
 name = "solana-vote-program"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "assert_matches",
  "bincode",
  "criterion",
@@ -10863,7 +10867,6 @@ dependencies = [
  "solana-bincode",
  "solana-clock",
  "solana-epoch-schedule",
- "solana-feature-set",
  "solana-frozen-abi",
  "solana-frozen-abi-macro",
  "solana-hash",
@@ -10996,12 +10999,12 @@ dependencies = [
 name = "solana-zk-token-proof-program"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "bytemuck",
  "criterion",
  "curve25519-dalek 4.1.3",
  "num-derive",
  "num-traits",
- "solana-feature-set",
  "solana-instruction",
  "solana-log-collector",
  "solana-program-runtime",

Cargo.toml

@@ -286,7 +286,7 @@ jsonrpc-ipc-server = "18.0.0"
 jsonrpc-pubsub = "18.0.0"
 lazy-lru = "0.1.3"
 lazy_static = "1.5.0"
-libc = "0.2.169"
+libc = "0.2.170"
 libloading = "0.7.4"
 libsecp256k1 = { version = "0.6.0", default-features = false, features = [
     "std",
@@ -347,7 +347,7 @@ serde = "1.0.217" # must match the serde_derive version, see https://github.com/
 serde-big-array = "0.5.1"
 serde_bytes = "0.11.15"
 serde_derive = "1.0.217" # must match the serde version, see https://github.com/serde-rs/serde/issues/2584#issuecomment-1685252251
-serde_json = "1.0.138"
+serde_json = "1.0.139"
 serde_with = { version = "3.12.0", default-features = false }
 serde_yaml = "0.9.34"
 serial_test = "2.0.0"
@@ -421,7 +421,6 @@ solana-example-mocks = "=2.2.1"
 solana-faucet = { path = "faucet", version = "=2.2.6" }
 solana-feature-gate-client = "0.0.2"
 solana-feature-gate-interface = "=2.2.1"
-solana-feature-set = "=2.2.4" # will be removed
 solana-fee-calculator = "=2.2.1"
 solana-fee = { path = "fee", version = "=2.2.6" }
 solana-fee-structure = "=2.2.1"
@@ -452,7 +451,7 @@ solana-loader-v4-interface = "=2.2.1"
 solana-loader-v4-program = { path = "programs/loader-v4", version = "=2.2.6" }
 solana-local-cluster = { path = "local-cluster", version = "=2.2.6" }
 solana-log-collector = { path = "log-collector", version = "=2.2.6" }
-solana-logger = "=2.2.1"
+solana-logger = "=2.3.1"
 solana-measure = { path = "measure", version = "=2.2.6" }
 solana-merkle-tree = { path = "merkle-tree", version = "=2.2.6" }
 solana-message = "=2.2.1"
@@ -515,7 +514,7 @@ solana-rpc-client-nonce-utils = { path = "rpc-client-nonce-utils", version = "=2
 solana-runtime = { path = "runtime", version = "=2.2.6" }
 solana-runtime-transaction = { path = "runtime-transaction", version = "=2.2.6" }
 solana-sbpf = "=0.10.0"
-solana-sdk = "=2.2.1"
+solana-sdk = "=2.2.2"
 solana-sdk-ids = "=2.2.1"
 solana-sdk-macro = "=2.2.1"
 solana-secp256k1-program = "=2.2.1"
@@ -540,7 +539,7 @@ solana-sysvar = "=2.2.1"
 solana-sysvar-id = "=2.2.1"
 solana-test-validator = { path = "test-validator", version = "=2.2.6" }
 solana-thin-client = { path = "thin-client", version = "=2.2.6" }
-solana-transaction = "=2.2.1"
+solana-transaction = "=2.2.2"
 solana-transaction-error = "=2.2.1"
 solana-tpu-client = { path = "tpu-client", version = "=2.2.6", default-features = false }
 solana-tpu-client-next = { path = "tpu-client-next", version = "=2.2.6" }

banks-server/Cargo.toml

@@ -10,12 +10,12 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
+agave-feature-set = { workspace = true }
 bincode = { workspace = true }
 crossbeam-channel = { workspace = true }
 futures = { workspace = true }
 solana-banks-interface = { workspace = true }
 solana-client = { workspace = true }
-solana-feature-set = { workspace = true }
 solana-runtime = { workspace = true }
 solana-runtime-transaction = { workspace = true }
 solana-sdk = { workspace = true }

banks-server/src/banks_server.rs

@@ -1,4 +1,5 @@
 use {
+    agave_feature_set::{move_precompile_verification_to_svm, FeatureSet},
     bincode::{deserialize, serialize},
     crossbeam_channel::{unbounded, Receiver, Sender},
     futures::{future, prelude::stream::StreamExt},
@@ -8,7 +9,6 @@ use {
         TransactionSimulationDetails, TransactionStatus,
     },
     solana_client::connection_cache::ConnectionCache,
-    solana_feature_set::{move_precompile_verification_to_svm, FeatureSet},
     solana_runtime::{
         bank::{Bank, TransactionSimulationResult},
         bank_forks::BankForks,

bench-tps/Cargo.toml

@@ -47,8 +47,8 @@ spl-instruction-padding = { workspace = true }
 thiserror = { workspace = true }
 
 [dev-dependencies]
+agave-feature-set = { workspace = true }
 serial_test = { workspace = true }
-solana-feature-set = { workspace = true }
 solana-local-cluster = { workspace = true }
 solana-runtime = { workspace = true, features = ["dev-context-only-utils"] }
 solana-test-validator = { workspace = true }

bench-tps/src/bench.rs

@@ -1224,7 +1224,7 @@ pub fn fund_keypairs<T: 'static + TpsClient + Send + Sync + ?Sized>(
 mod tests {
     use {
         super::*,
-        solana_feature_set::FeatureSet,
+        agave_feature_set::FeatureSet,
         solana_runtime::{bank::Bank, bank_client::BankClient, bank_forks::BankForks},
         solana_sdk::{
             commitment_config::CommitmentConfig,

builtins-default-costs/Cargo.toml

@@ -10,6 +10,7 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
+agave-feature-set = { workspace = true }
 ahash = { workspace = true }
 lazy_static = { workspace = true }
 log = { workspace = true }
@@ -18,7 +19,6 @@ solana-address-lookup-table-program = { workspace = true }
 solana-bpf-loader-program = { workspace = true, features = ["svm-internal"] }
 solana-compute-budget-program = { workspace = true, features = ["svm-internal"] }
 solana-config-program = { workspace = true }
-solana-feature-set = { workspace = true }
 solana-frozen-abi = { workspace = true, optional = true, features = [
     "frozen-abi",
 ] }

builtins-default-costs/benches/builtin_instruction_costs.rs

@@ -1,9 +1,9 @@
 #![feature(test)]
 extern crate test;
 use {
+    agave_feature_set::FeatureSet,
     rand::Rng,
     solana_builtins_default_costs::get_builtin_instruction_cost,
-    solana_feature_set::FeatureSet,
     solana_pubkey::Pubkey,
     solana_sdk_ids::{
         address_lookup_table, bpf_loader, bpf_loader_deprecated, bpf_loader_upgradeable,

builtins-default-costs/src/lib.rs

@@ -3,9 +3,9 @@
 #[cfg(feature = "svm-internal")]
 use qualifier_attr::qualifiers;
 use {
+    agave_feature_set::{self as feature_set, FeatureSet},
     ahash::AHashMap,
     lazy_static::lazy_static,
-    solana_feature_set::{self as feature_set, FeatureSet},
     solana_pubkey::Pubkey,
     solana_sdk_ids::{
         address_lookup_table, bpf_loader, bpf_loader_deprecated, bpf_loader_upgradeable,

builtins/Cargo.toml

@@ -13,11 +13,11 @@ edition = { workspace = true }
 dev-context-only-utils = []
 
 [dependencies]
+agave-feature-set = { workspace = true }
 solana-address-lookup-table-program = { workspace = true }
 solana-bpf-loader-program = { workspace = true }
 solana-compute-budget-program = { workspace = true }
 solana-config-program = { workspace = true }
-solana-feature-set = { workspace = true }
 solana-loader-v4-program = { workspace = true }
 solana-program-runtime = { workspace = true }
 solana-pubkey = { workspace = true }

builtins/src/lib.rs

@@ -17,7 +17,7 @@ use {
         core_bpf_migration::{CoreBpfMigrationConfig, CoreBpfMigrationTargetType},
         prototype::{BuiltinPrototype, StatelessBuiltinPrototype},
     },
-    solana_feature_set as feature_set,
+    agave_feature_set as feature_set,
     solana_sdk_ids::{bpf_loader, bpf_loader_deprecated, bpf_loader_upgradeable},
 };
 
@@ -68,7 +68,7 @@ pub static BUILTINS: &[BuiltinPrototype] = &[
         core_bpf_migration_config: Some(CoreBpfMigrationConfig {
             source_buffer_address: buffer_accounts::stake_program::id(),
             upgrade_authority_address: None,
-            feature_id: solana_feature_set::migrate_stake_program_to_core_bpf::id(),
+            feature_id: agave_feature_set::migrate_stake_program_to_core_bpf::id(),
             migration_target: CoreBpfMigrationTargetType::Builtin,
             datapoint_name: "migrate_builtin_to_core_bpf_stake_program",
         }),
@@ -81,7 +81,7 @@ pub static BUILTINS: &[BuiltinPrototype] = &[
         core_bpf_migration_config: Some(CoreBpfMigrationConfig {
             source_buffer_address: buffer_accounts::config_program::id(),
             upgrade_authority_address: None,
-            feature_id: solana_feature_set::migrate_config_program_to_core_bpf::id(),
+            feature_id: agave_feature_set::migrate_config_program_to_core_bpf::id(),
             migration_target: CoreBpfMigrationTargetType::Builtin,
             datapoint_name: "migrate_builtin_to_core_bpf_config_program",
         }),
@@ -122,7 +122,7 @@ pub static BUILTINS: &[BuiltinPrototype] = &[
         core_bpf_migration_config: Some(CoreBpfMigrationConfig {
             source_buffer_address: buffer_accounts::address_lookup_table_program::id(),
             upgrade_authority_address: None,
-            feature_id: solana_feature_set::migrate_address_lookup_table_program_to_core_bpf::id(),
+            feature_id: agave_feature_set::migrate_address_lookup_table_program_to_core_bpf::id(),
             migration_target: CoreBpfMigrationTargetType::Builtin,
             datapoint_name: "migrate_builtin_to_core_bpf_address_lookup_table_program",
         }),
@@ -158,7 +158,7 @@ pub static STATELESS_BUILTINS: &[StatelessBuiltinPrototype] = &[StatelessBuiltin
     core_bpf_migration_config: Some(CoreBpfMigrationConfig {
         source_buffer_address: buffer_accounts::feature_gate_program::id(),
         upgrade_authority_address: None,
-        feature_id: solana_feature_set::migrate_feature_gate_program_to_core_bpf::id(),
+        feature_id: agave_feature_set::migrate_feature_gate_program_to_core_bpf::id(),
         migration_target: CoreBpfMigrationTargetType::Stateless,
         datapoint_name: "migrate_stateless_to_core_bpf_feature_gate_program",
     }),

cli/Cargo.toml

@@ -10,6 +10,7 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
+agave-feature-set = { workspace = true }
 bincode = { workspace = true }
 bs58 = { workspace = true }
 clap = { workspace = true }
@@ -47,7 +48,6 @@ solana-decode-error = { workspace = true }
 solana-epoch-schedule = { workspace = true }
 solana-feature-gate-client = { workspace = true }
 solana-feature-gate-interface = { workspace = true }
-solana-feature-set = { workspace = true }
 solana-hash = { workspace = true }
 solana-instruction = { workspace = true }
 solana-keypair = { workspace = true }

cli/src/cluster_query.rs

@@ -1897,7 +1897,7 @@ pub fn process_show_stakes(
     })?;
     let new_rate_activation_epoch = get_feature_activation_epoch(
         rpc_client,
-        &solana_feature_set::reduce_stake_warmup_cooldown::id(),
+        &agave_feature_set::reduce_stake_warmup_cooldown::id(),
     )?;
     stake_account_progress_bar.finish_and_clear();
 

cli/src/feature.rs

@@ -6,6 +6,7 @@ use {
         },
         spend_utils::{resolve_spend_tx_and_check_account_balance, SpendAmount},
     },
+    agave_feature_set::FEATURE_NAMES,
     clap::{value_t_or_exit, App, AppSettings, Arg, ArgMatches, SubCommand},
     console::style,
     serde::{Deserialize, Serialize},
@@ -22,7 +23,6 @@ use {
         errors::SolanaFeatureGateError, instructions::RevokePendingActivation,
     },
     solana_feature_gate_interface::{activate_with_lamports, from_account, Feature},
-    solana_feature_set::FEATURE_NAMES,
     solana_message::Message,
     solana_pubkey::Pubkey,
     solana_remote_wallet::remote_wallet::RemoteWalletManager,

cli/src/program.rs

@@ -11,6 +11,7 @@ use {
         },
         feature::{status_from_account, CliFeatureStatus},
     },
+    agave_feature_set::{FeatureSet, FEATURE_NAMES},
     bip39::{Language, Mnemonic, MnemonicType, Seed},
     clap::{App, AppSettings, Arg, ArgMatches, SubCommand},
     log::*,
@@ -42,7 +43,6 @@ use {
     },
     solana_commitment_config::CommitmentConfig,
     solana_compute_budget::compute_budget::ComputeBudget,
-    solana_feature_set::{FeatureSet, FEATURE_NAMES},
     solana_instruction::{error::InstructionError, Instruction},
     solana_keypair::{keypair_from_seed, read_keypair_file, Keypair},
     solana_loader_v3_interface::{
@@ -1387,11 +1387,11 @@ fn process_program_deploy(
     };
 
     if !skip_feature_verification {
-        if feature_set.is_active(&solana_feature_set::enable_loader_v4::id()) {
+        if feature_set.is_active(&agave_feature_set::enable_loader_v4::id()) {
             warn!("Loader-v4 is available now. Please migrate your program.");
         }
         if do_initial_deploy
-            && feature_set.is_active(&solana_feature_set::disable_new_loader_v3_deployments::id())
+            && feature_set.is_active(&agave_feature_set::disable_new_loader_v3_deployments::id())
         {
             return Err("No new programs can be deployed on loader-v3. Please use the program-v4 subcommand instead.".into());
         }

cli/src/program_v4.rs

@@ -8,6 +8,7 @@ use {
         feature::{status_from_account, CliFeatureStatus},
         program::calculate_max_chunk_size,
     },
+    agave_feature_set::{FeatureSet, FEATURE_NAMES},
     clap::{value_t, App, AppSettings, Arg, ArgMatches, SubCommand},
     log::*,
     solana_account::Account,
@@ -30,7 +31,6 @@ use {
         tpu_client::{TpuClient, TpuClientConfig},
     },
     solana_compute_budget::compute_budget::ComputeBudget,
-    solana_feature_set::{FeatureSet, FEATURE_NAMES},
     solana_instruction::Instruction,
     solana_loader_v4_interface::{
         instruction,

cli/src/stake.rs

@@ -2642,7 +2642,7 @@ pub fn process_show_stake_account(
             })?;
             let new_rate_activation_epoch = get_feature_activation_epoch(
                 rpc_client,
-                &solana_feature_set::reduce_stake_warmup_cooldown::id(),
+                &agave_feature_set::reduce_stake_warmup_cooldown::id(),
             )?;
 
             let mut state = build_stake_state(

cli/src/vote.rs

@@ -1298,7 +1298,7 @@ pub fn process_show_vote_account(
 
     let epoch_schedule = rpc_client.get_epoch_schedule()?;
     let tvc_activation_slot =
-        rpc_client.get_feature_activation_slot(&solana_feature_set::timely_vote_credits::id())?;
+        rpc_client.get_feature_activation_slot(&agave_feature_set::timely_vote_credits::id())?;
     let tvc_activation_epoch = tvc_activation_slot.map(|s| epoch_schedule.get_epoch(s));
 
     let mut votes: Vec<CliLandedVote> = vec![];

cli/tests/program.rs

@@ -3,6 +3,7 @@
 #![allow(clippy::items_after_test_module)]
 
 use {
+    agave_feature_set::{disable_new_loader_v3_deployments, enable_alt_bn128_syscall},
     assert_matches::assert_matches,
     serde_json::Value,
     solana_cli::{
@@ -15,7 +16,6 @@ use {
     solana_client::rpc_config::RpcSendTransactionConfig,
     solana_commitment_config::CommitmentConfig,
     solana_faucet::faucet::run_local_faucet,
-    solana_feature_set::{disable_new_loader_v3_deployments, enable_alt_bn128_syscall},
     solana_message::Message,
     solana_rpc::rpc::JsonRpcConfig,
     solana_rpc_client::rpc_client::{GetConfirmedSignaturesForAddress2Config, RpcClient},

compute-budget-instruction/Cargo.toml

@@ -10,12 +10,12 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
+agave-feature-set = { workspace = true }
 log = { workspace = true }
 solana-borsh = { workspace = true }
 solana-builtins-default-costs = { workspace = true, features = ["svm-internal"] }
 solana-compute-budget = { workspace = true }
 solana-compute-budget-interface = { workspace = true, features = ["borsh"] }
-solana-feature-set = { workspace = true }
 solana-instruction = { workspace = true }
 solana-packet = { workspace = true }
 solana-pubkey = { workspace = true }

compute-budget-instruction/benches/process_compute_budget_instructions.rs

@@ -1,8 +1,8 @@
 use {
+    agave_feature_set::FeatureSet,
     criterion::{black_box, criterion_group, criterion_main, Criterion, Throughput},
     solana_compute_budget_instruction::instructions_processor::process_compute_budget_instructions,
     solana_compute_budget_interface::ComputeBudgetInstruction,
-    solana_feature_set::FeatureSet,
     solana_instruction::Instruction,
     solana_keypair::Keypair,
     solana_message::Message,

compute-budget-instruction/src/builtin_programs_filter.rs

@@ -64,8 +64,8 @@ impl BuiltinProgramsFilter {
 #[cfg(test)]
 mod test {
     use {
-        super::*, solana_builtins_default_costs::get_migration_feature_position,
-        solana_feature_set as feature_set,
+        super::*, agave_feature_set as feature_set,
+        solana_builtins_default_costs::get_migration_feature_position,
     };
 
     const DUMMY_PROGRAM_ID: &str = "dummmy1111111111111111111111111111111111111";

compute-budget-instruction/src/compute_budget_instruction_details.rs

@@ -3,11 +3,11 @@ use {
         builtin_programs_filter::{BuiltinProgramsFilter, ProgramKind},
         compute_budget_program_id_filter::ComputeBudgetProgramIdFilter,
     },
+    agave_feature_set::{self as feature_set, FeatureSet},
     solana_borsh::v1::try_from_slice_unchecked,
     solana_builtins_default_costs::{get_migration_feature_id, MIGRATING_BUILTINS_COSTS},
     solana_compute_budget::compute_budget_limits::*,
     solana_compute_budget_interface::ComputeBudgetInstruction,
-    solana_feature_set::{self as feature_set, FeatureSet},
     solana_instruction::error::InstructionError,
     solana_pubkey::Pubkey,
     solana_svm_transaction::instruction::SVMInstruction,

compute-budget-instruction/src/instructions_processor.rs

@@ -1,6 +1,6 @@
 use {
-    crate::compute_budget_instruction_details::*, solana_compute_budget::compute_budget_limits::*,
-    solana_feature_set::FeatureSet, solana_pubkey::Pubkey,
+    crate::compute_budget_instruction_details::*, agave_feature_set::FeatureSet,
+    solana_compute_budget::compute_budget_limits::*, solana_pubkey::Pubkey,
     solana_svm_transaction::instruction::SVMInstruction,
     solana_transaction_error::TransactionError,
 };

core/Cargo.toml

@@ -15,6 +15,7 @@ codecov = { repository = "solana-labs/solana", branch = "master", service = "git
 
 [dependencies]
 agave-banking-stage-ingress-types = { workspace = true }
+agave-feature-set = { workspace = true }
 agave-transaction-view = { workspace = true }
 ahash = { workspace = true }
 anyhow = { workspace = true }
@@ -57,7 +58,6 @@ solana-compute-budget-instruction = { workspace = true }
 solana-connection-cache = { workspace = true }
 solana-cost-model = { workspace = true }
 solana-entry = { workspace = true }
-solana-feature-set = { workspace = true }
 solana-fee = { workspace = true }
 solana-frozen-abi = { workspace = true, optional = true, features = [
     "frozen-abi",

core/src/banking_stage/consumer.rs

@@ -11,8 +11,8 @@ use {
         unprocessed_transaction_storage::{ConsumeScannerPayload, UnprocessedTransactionStorage},
         BankingStageStats,
     },
+    agave_feature_set as feature_set,
     itertools::Itertools,
-    solana_feature_set as feature_set,
     solana_fee::FeeFeatures,
     solana_ledger::token_balances::collect_token_balances,
     solana_measure::{measure::Measure, measure_us},

core/src/banking_stage/forward_packet_batches_by_accounts.rs

@@ -1,12 +1,12 @@
 use {
     super::immutable_deserialized_packet::ImmutableDeserializedPacket,
+    agave_feature_set::FeatureSet,
     core::num::NonZeroU64,
     solana_cost_model::{
         block_cost_limits,
         cost_model::CostModel,
         cost_tracker::{CostTracker, UpdatedCosts},
     },
-    solana_feature_set::FeatureSet,
     solana_perf::packet::Packet,
     solana_runtime_transaction::transaction_with_meta::TransactionWithMeta,
     std::sync::Arc,
@@ -167,7 +167,7 @@ mod tests {
     use {
         super::*,
         crate::banking_stage::unprocessed_packet_batches::DeserializedPacket,
-        solana_feature_set::FeatureSet,
+        agave_feature_set::FeatureSet,
         solana_runtime_transaction::runtime_transaction::RuntimeTransaction,
         solana_sdk::{
             compute_budget::ComputeBudgetInstruction,

core/src/banking_stage/forwarder.rs

@@ -11,9 +11,9 @@ use {
         },
         next_leader::{next_leader, next_leader_tpu_vote},
     },
+    agave_feature_set::FeatureSet,
     solana_client::connection_cache::ConnectionCache,
     solana_connection_cache::client_connection::ClientConnection as TpuConnection,
-    solana_feature_set::FeatureSet,
     solana_measure::measure_us,
     solana_net_utils::bind_to_unspecified,
     solana_perf::{data_budget::DataBudget, packet::Packet},

core/src/banking_stage/immutable_deserialized_packet.rs

@@ -1,5 +1,6 @@
 use {
     super::packet_filter::PacketFilterFailure,
+    agave_feature_set::FeatureSet,
     solana_compute_budget::compute_budget_limits::ComputeBudgetLimits,
     solana_compute_budget_instruction::instructions_processor::process_compute_budget_instructions,
     solana_perf::packet::Packet,
@@ -8,7 +9,6 @@ use {
     solana_sanitize::SanitizeError,
     solana_sdk::{
         clock::Slot,
-        feature_set::FeatureSet,
         hash::Hash,
         message::{v0::LoadedAddresses, AddressLoaderError, Message, SimpleAddressLoader},
         pubkey::Pubkey,

core/src/banking_stage/latest_unprocessed_votes.rs

@@ -3,6 +3,7 @@ use {
         forward_packet_batches_by_accounts::ForwardPacketBatchesByAccounts,
         immutable_deserialized_packet::{DeserializedPacketError, ImmutableDeserializedPacket},
     },
+    agave_feature_set as feature_set,
     itertools::Itertools,
     rand::{thread_rng, Rng},
     solana_perf::packet::Packet,
@@ -10,7 +11,6 @@ use {
     solana_sdk::{
         account::from_account,
         clock::{Slot, UnixTimestamp},
-        feature_set::{self},
         hash::Hash,
         program_utils::limited_deserialize,
         pubkey::Pubkey,

core/src/banking_stage/packet_filter.rs

@@ -1,10 +1,9 @@
 use {
     super::immutable_deserialized_packet::ImmutableDeserializedPacket,
+    agave_feature_set::FeatureSet,
     lazy_static::lazy_static,
     solana_builtins_default_costs::get_builtin_instruction_cost,
-    solana_sdk::{
-        ed25519_program, feature_set::FeatureSet, saturating_add_assign, secp256k1_program,
-    },
+    solana_sdk::{ed25519_program, saturating_add_assign, secp256k1_program},
     solana_sdk_ids::secp256r1_program,
     thiserror::Error,
 };

core/src/banking_stage/qos_service.rs

@@ -5,10 +5,10 @@
 
 use {
     super::{committer::CommitTransactionDetails, BatchedTransactionDetails},
+    agave_feature_set::FeatureSet,
     solana_cost_model::{
         cost_model::CostModel, cost_tracker::UpdatedCosts, transaction_cost::TransactionCost,
     },
-    solana_feature_set::FeatureSet,
     solana_measure::measure::Measure,
     solana_runtime::bank::Bank,
     solana_runtime_transaction::transaction_with_meta::TransactionWithMeta,

core/src/banking_stage/unprocessed_transaction_storage.rs

@@ -15,10 +15,10 @@ use {
         },
         BankingStageStats, FilterForwardingResults, ForwardOption,
     },
+    agave_feature_set::FeatureSet,
     itertools::Itertools,
     min_max_heap::MinMaxHeap,
     solana_accounts_db::account_locks::validate_account_locks,
-    solana_feature_set::FeatureSet,
     solana_measure::measure_us,
     solana_runtime::bank::Bank,
     solana_runtime_transaction::runtime_transaction::RuntimeTransaction,

core/src/consensus.rs

@@ -626,7 +626,7 @@ impl Tower {
             bank.slot(),
             bank.hash(),
             bank.feature_set
-                .is_active(&solana_feature_set::enable_tower_sync_ix::id()),
+                .is_active(&agave_feature_set::enable_tower_sync_ix::id()),
             block_id,
         )
     }

core/src/repair/serve_repair.rs

@@ -1449,7 +1449,7 @@ mod tests {
     use {
         super::*,
         crate::repair::repair_response,
-        solana_feature_set::FeatureSet,
+        agave_feature_set::FeatureSet,
         solana_gossip::{contact_info::ContactInfo, socketaddr, socketaddr_any},
         solana_ledger::{
             blockstore::make_many_slot_entries,

core/src/replay_stage.rs

@@ -3719,7 +3719,7 @@ impl ReplayStage {
                 .get_hash(last_voted_slot)
                 .expect("Must exist for us to have frozen descendant"),
             bank.feature_set
-                .is_active(&solana_feature_set::enable_tower_sync_ix::id()),
+                .is_active(&agave_feature_set::enable_tower_sync_ix::id()),
             block_id,
         );
         // Since we are updating our tower we need to update associated caches for previously computed

core/src/shred_fetch_stage.rs

@@ -2,10 +2,10 @@
 
 use {
     crate::repair::{repair_service::OutstandingShredRepairs, serve_repair::ServeRepair},
+    agave_feature_set::{self as feature_set, FeatureSet},
     bytes::Bytes,
     crossbeam_channel::{unbounded, Receiver, RecvTimeoutError, Sender},
     itertools::Itertools,
-    solana_feature_set::{self as feature_set, FeatureSet},
     solana_gossip::cluster_info::ClusterInfo,
     solana_ledger::shred::{self, should_discard_shred, ShredFetchStats},
     solana_perf::packet::{

core/src/window_service.rs

@@ -15,11 +15,11 @@ use {
         },
         result::{Error, Result},
     },
+    agave_feature_set as feature_set,
     assert_matches::debug_assert_matches,
     bytes::Bytes,
     crossbeam_channel::{unbounded, Receiver, RecvTimeoutError, Sender},
     rayon::{prelude::*, ThreadPool},
-    solana_feature_set as feature_set,
     solana_gossip::cluster_info::ClusterInfo,
     solana_ledger::{
         blockstore::{Blockstore, BlockstoreInsertionMetrics, PossibleDuplicateShred},

core/tests/epoch_accounts_hash.rs

@@ -3,6 +3,7 @@
 
 use {
     crate::snapshot_utils::create_tmp_accounts_dir_for_tests,
+    agave_feature_set as feature_set,
     log::*,
     solana_accounts_db::{
         accounts_db::CalcAccountsHashDataSource, accounts_hash::CalcAccountsHashConfig,
@@ -30,7 +31,6 @@ use {
     solana_sdk::{
         clock::Slot,
         epoch_schedule::EpochSchedule,
-        feature_set,
         native_token::LAMPORTS_PER_SOL,
         pubkey::Pubkey,
         signature::{Keypair, Signer},

core/tests/scheduler_cost_adjustment.rs

@@ -1,10 +1,10 @@
 #![cfg(test)]
 use {
+    agave_feature_set as feature_set,
     solana_compute_budget::compute_budget_limits::{
         DEFAULT_INSTRUCTION_COMPUTE_UNIT_LIMIT, MAX_BUILTIN_ALLOCATION_COMPUTE_UNIT_LIMIT,
     },
     solana_cost_model::cost_model::CostModel,
-    solana_feature_set::{self as feature_set},
     solana_runtime::{bank::Bank, bank_forks::BankForks},
     solana_runtime_transaction::runtime_transaction::RuntimeTransaction,
     solana_sdk::{

cost-model/Cargo.toml

@@ -10,6 +10,7 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
+agave-feature-set = { workspace = true }
 ahash = { workspace = true }
 lazy_static = { workspace = true }
 log = { workspace = true }
@@ -20,7 +21,6 @@ solana-clock = { workspace = true }
 solana-compute-budget = { workspace = true }
 solana-compute-budget-instruction = { workspace = true }
 solana-compute-budget-interface = { workspace = true }
-solana-feature-set = { workspace = true }
 solana-fee-structure = { workspace = true }
 solana-frozen-abi = { workspace = true, optional = true, features = [
     "frozen-abi",

cost-model/benches/cost_model.rs

@@ -1,8 +1,8 @@
 #![feature(test)]
 extern crate test;
 use {
+    agave_feature_set::FeatureSet,
     solana_cost_model::cost_model::CostModel,
-    solana_feature_set::FeatureSet,
     solana_hash::Hash,
     solana_keypair::Keypair,
     solana_message::Message,

cost-model/src/cost_model.rs

@@ -7,6 +7,7 @@
 
 use {
     crate::{block_cost_limits::*, transaction_cost::*},
+    agave_feature_set::{self as feature_set, FeatureSet},
     solana_bincode::limited_deserialize,
     solana_borsh::v1::try_from_slice_unchecked,
     solana_builtins_default_costs::get_builtin_instruction_cost,
@@ -14,7 +15,6 @@ use {
         DEFAULT_HEAP_COST, DEFAULT_INSTRUCTION_COMPUTE_UNIT_LIMIT, MAX_COMPUTE_UNIT_LIMIT,
     },
     solana_compute_budget_interface::ComputeBudgetInstruction,
-    solana_feature_set::{self as feature_set, FeatureSet},
     solana_fee_structure::FeeStructure,
     solana_pubkey::Pubkey,
     solana_runtime_transaction::{

cost-model/src/transaction_cost.rs

@@ -291,8 +291,8 @@ mod tests {
     use {
         super::*,
         crate::cost_model::CostModel,
+        agave_feature_set::FeatureSet,
         agave_reserved_account_keys::ReservedAccountKeys,
-        solana_feature_set::FeatureSet,
         solana_hash::Hash,
         solana_keypair::Keypair,
         solana_message::SimpleAddressLoader,

fee/Cargo.toml

@@ -10,6 +10,6 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
-solana-feature-set = { workspace = true }
+agave-feature-set = { workspace = true }
 solana-fee-structure = { workspace = true }
 solana-svm-transaction = { workspace = true }

fee/src/lib.rs

@@ -1,5 +1,5 @@
 use {
-    solana_feature_set::{enable_secp256r1_precompile, FeatureSet},
+    agave_feature_set::{enable_secp256r1_precompile, FeatureSet},
     solana_fee_structure::FeeDetails,
     solana_svm_transaction::svm_message::SVMMessage,
 };

genesis/Cargo.toml

@@ -10,6 +10,7 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
+agave-feature-set = { workspace = true }
 base64 = { workspace = true }
 bincode = { workspace = true }
 clap = { workspace = true }

genesis/src/main.rs

@@ -2,6 +2,7 @@
 #![allow(clippy::arithmetic_side_effects)]
 
 use {
+    agave_feature_set::FEATURE_NAMES,
     base64::{prelude::BASE64_STANDARD, Engine},
     clap::{crate_description, crate_name, value_t, value_t_or_exit, App, Arg, ArgMatches},
     itertools::Itertools,
@@ -30,7 +31,6 @@ use {
         commitment_config::CommitmentConfig,
         epoch_schedule::EpochSchedule,
         feature,
-        feature_set::FEATURE_NAMES,
         fee_calculator::FeeRateGovernor,
         genesis_config::{ClusterType, GenesisConfig},
         inflation::Inflation,

gossip/Cargo.toml

@@ -10,6 +10,7 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
+agave-feature-set = { workspace = true }
 assert_matches = { workspace = true }
 bincode = { workspace = true }
 bv = { workspace = true, features = ["serde"] }
@@ -34,7 +35,6 @@ solana-clap-utils = { workspace = true }
 solana-client = { workspace = true }
 solana-connection-cache = { workspace = true }
 solana-entry = { workspace = true }
-solana-feature-set = { workspace = true }
 solana-frozen-abi = { workspace = true, optional = true, features = [
     "frozen-abi",
 ] }

ledger-tool/Cargo.toml

@@ -10,6 +10,7 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
+agave-feature-set = { workspace = true }
 agave-reserved-account-keys = { workspace = true }
 bs58 = { workspace = true }
 chrono = { workspace = true, features = ["default"] }
@@ -37,7 +38,6 @@ solana-compute-budget = { workspace = true }
 solana-core = { workspace = true, features = ["dev-context-only-utils"] }
 solana-cost-model = { workspace = true }
 solana-entry = { workspace = true }
-solana-feature-set = { workspace = true }
 solana-geyser-plugin-manager = { workspace = true }
 solana-gossip = { workspace = true }
 solana-ledger = { workspace = true, features = ["dev-context-only-utils"] }

ledger-tool/src/main.rs

@@ -12,6 +12,7 @@ use {
         },
         program::*,
     },
+    agave_feature_set::{self as feature_set, FeatureSet},
     agave_reserved_account_keys::ReservedAccountKeys,
     clap::{
         crate_description, crate_name, value_t, value_t_or_exit, values_t_or_exit, App,
@@ -37,7 +38,6 @@ use {
         validator::{BlockProductionMethod, BlockVerificationMethod, TransactionStructure},
     },
     solana_cost_model::{cost_model::CostModel, cost_tracker::CostTracker},
-    solana_feature_set::{self as feature_set, FeatureSet},
     solana_ledger::{
         blockstore::{banking_trace_path, create_new_ledger, Blockstore},
         blockstore_options::{AccessType, LedgerColumnOptions},

ledger/Cargo.toml

@@ -10,6 +10,7 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
+agave-feature-set = { workspace = true }
 agave-reserved-account-keys = { workspace = true }
 assert_matches = { workspace = true }
 bincode = { workspace = true }
@@ -47,7 +48,6 @@ solana-accounts-db = { workspace = true }
 solana-bpf-loader-program = { workspace = true }
 solana-cost-model = { workspace = true }
 solana-entry = { workspace = true }
-solana-feature-set = { workspace = true }
 solana-frozen-abi = { workspace = true, optional = true, features = [
     "frozen-abi",
 ] }

ledger/benches/blockstore_processor.rs

@@ -2,11 +2,11 @@
 #![feature(test)]
 
 use {
+    agave_feature_set::apply_cost_tracker_during_replay,
     rayon::{
         iter::IndexedParallelIterator,
         prelude::{IntoParallelIterator, IntoParallelRefIterator, ParallelIterator},
     },
-    solana_feature_set::apply_cost_tracker_during_replay,
     solana_ledger::{
         blockstore_processor::{execute_batch, TransactionBatchWithIndexes},
         genesis_utils::{create_genesis_config, GenesisConfigInfo},

ledger/src/blockstore.rs

@@ -22,6 +22,7 @@ use {
         slot_stats::{ShredSource, SlotsStats},
         transaction_address_lookup_table_scanner::scan_transaction,
     },
+    agave_feature_set::FeatureSet,
     assert_matches::debug_assert_matches,
     bincode::{deserialize, serialize},
     crossbeam_channel::{bounded, Receiver, Sender, TrySendError},
@@ -43,7 +44,6 @@ use {
         account::ReadableAccount,
         address_lookup_table::state::AddressLookupTable,
         clock::{Slot, UnixTimestamp, DEFAULT_TICKS_PER_SECOND},
-        feature_set::FeatureSet,
         genesis_config::{GenesisConfig, DEFAULT_GENESIS_ARCHIVE, DEFAULT_GENESIS_FILE},
         hash::Hash,
         pubkey::Pubkey,

ledger/src/blockstore_processor.rs

@@ -317,7 +317,7 @@ fn check_block_cost_limits_if_enabled(
 ) -> Result<()> {
     let (check_block_cost_limits_result, check_block_cost_limits_us) = measure_us!(if bank
         .feature_set
-        .is_active(&solana_feature_set::apply_cost_tracker_during_replay::id())
+        .is_active(&agave_feature_set::apply_cost_tracker_during_replay::id())
     {
         check_block_cost_limits(bank, processing_results, batch.sanitized_transactions())
     } else {

precompiles/Cargo.toml

@@ -10,6 +10,7 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
+agave-feature-set = { workspace = true }
 bincode = { workspace = true }
 bytemuck = { workspace = true }
 digest = { workspace = true }
@@ -19,7 +20,6 @@ libsecp256k1 = { workspace = true }
 openssl = { workspace = true }
 sha3 = { workspace = true }
 solana-ed25519-program = { workspace = true }
-solana-feature-set = { workspace = true }
 solana-message = { workspace = true }
 solana-precompile-error = { workspace = true }
 solana-pubkey = { workspace = true }

precompiles/src/ed25519.rs

@@ -1,10 +1,10 @@
 use {
+    agave_feature_set::{ed25519_precompile_verify_strict, FeatureSet},
     ed25519_dalek::{ed25519::signature::Signature, Verifier},
     solana_ed25519_program::{
         Ed25519SignatureOffsets, PUBKEY_SERIALIZED_SIZE, SIGNATURE_OFFSETS_SERIALIZED_SIZE,
         SIGNATURE_OFFSETS_START, SIGNATURE_SERIALIZED_SIZE,
     },
-    solana_feature_set::{ed25519_precompile_verify_strict, FeatureSet},
     solana_precompile_error::PrecompileError,
 };
 
@@ -120,7 +120,6 @@ pub mod tests {
         solana_ed25519_program::{
             new_ed25519_instruction, offsets_to_ed25519_instruction, DATA_START,
         },
-        solana_feature_set::FeatureSet,
         solana_instruction::Instruction,
     };
 

precompiles/src/lib.rs

@@ -1,7 +1,7 @@
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
 use {
+    agave_feature_set::{enable_secp256r1_precompile, FeatureSet},
     lazy_static::lazy_static,
-    solana_feature_set::{enable_secp256r1_precompile, FeatureSet},
     solana_message::compiled_instruction::CompiledInstruction,
     solana_precompile_error::PrecompileError,
     solana_pubkey::Pubkey,

precompiles/src/secp256k1.rs

@@ -1,6 +1,6 @@
 use {
+    agave_feature_set::FeatureSet,
     digest::Digest,
-    solana_feature_set::FeatureSet,
     solana_precompile_error::PrecompileError,
     solana_secp256k1_program::{
         construct_eth_pubkey, SecpSignatureOffsets, HASHED_PUBKEY_SERIALIZED_SIZE,
@@ -131,7 +131,6 @@ pub mod tests {
     use {
         super::*,
         rand0_7::{thread_rng, Rng},
-        solana_feature_set::FeatureSet,
         solana_keccak_hasher as keccak,
         solana_secp256k1_program::{new_secp256k1_instruction, DATA_START},
     };
@@ -307,7 +306,7 @@ pub mod tests {
         let secp_privkey = libsecp256k1::SecretKey::random(&mut thread_rng());
         let message_arr = b"hello";
         let mut instruction = new_secp256k1_instruction(&secp_privkey, message_arr);
-        let feature_set = solana_feature_set::FeatureSet::all_enabled();
+        let feature_set = FeatureSet::all_enabled();
         assert!(verify(&instruction.data, &[&instruction.data], &feature_set).is_ok());
 
         let index = thread_rng().gen_range(0, instruction.data.len());

precompiles/src/secp256r1.rs

@@ -1,4 +1,5 @@
 use {
+    agave_feature_set::FeatureSet,
     openssl::{
         bn::{BigNum, BigNumContext},
         ec::{EcGroup, EcKey, EcPoint},
@@ -6,7 +7,6 @@ use {
         pkey::PKey,
         sign::Verifier,
     },
-    solana_feature_set::FeatureSet,
     solana_precompile_error::PrecompileError,
     solana_secp256r1_program::{
         Secp256r1SignatureOffsets, COMPRESSED_PUBKEY_SERIALIZED_SIZE, FIELD_SIZE,
@@ -168,7 +168,6 @@ mod tests {
     use {
         super::*,
         bytemuck::bytes_of,
-        solana_feature_set::FeatureSet,
         solana_secp256r1_program::{new_secp256r1_instruction, DATA_START, SECP256R1_ORDER},
     };
 

program-runtime/Cargo.toml

@@ -10,6 +10,7 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
+agave-feature-set = { workspace = true }
 agave-precompiles = { workspace = true }
 base64 = { workspace = true }
 bincode = { workspace = true }
@@ -24,7 +25,6 @@ solana-clock = { workspace = true }
 solana-compute-budget = { workspace = true }
 solana-epoch-rewards = { workspace = true }
 solana-epoch-schedule = { workspace = true }
-solana-feature-set = { workspace = true }
 solana-frozen-abi = { workspace = true, optional = true, features = [
     "frozen-abi",
 ] }

program-runtime/src/invoke_context.rs

@@ -7,15 +7,15 @@ use {
         stable_log,
         sysvar_cache::SysvarCache,
     },
+    agave_feature_set::{
+        lift_cpi_caller_restriction, move_precompile_verification_to_svm,
+        remove_accounts_executable_flag_checks, FeatureSet,
+    },
     agave_precompiles::Precompile,
     solana_account::{create_account_shared_data_for_test, AccountSharedData},
     solana_clock::Slot,
     solana_compute_budget::compute_budget::ComputeBudget,
     solana_epoch_schedule::EpochSchedule,
-    solana_feature_set::{
-        lift_cpi_caller_restriction, move_precompile_verification_to_svm,
-        remove_accounts_executable_flag_checks, FeatureSet,
-    },
     solana_hash::Hash,
     solana_instruction::{error::InstructionError, AccountMeta},
     solana_log_collector::{ic_msg, LogCollector},
@@ -716,8 +716,8 @@ macro_rules! with_mock_invoke_context {
         $transaction_accounts:expr $(,)?
     ) => {
         use {
+            agave_feature_set::FeatureSet,
             solana_compute_budget::compute_budget::ComputeBudget,
-            solana_feature_set::FeatureSet,
             solana_log_collector::LogCollector,
             solana_type_overrides::sync::Arc,
             $crate::{

program-test/Cargo.toml

@@ -9,6 +9,7 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
+agave-feature-set = { workspace = true }
 assert_matches = { workspace = true }
 async-trait = { workspace = true }
 base64 = { workspace = true }
@@ -23,7 +24,6 @@ solana-banks-interface = { workspace = true }
 solana-banks-server = { workspace = true }
 solana-bpf-loader-program = { workspace = true }
 solana-compute-budget = { workspace = true }
-solana-feature-set = { workspace = true }
 solana-inline-spl = { workspace = true }
 solana-instruction = { workspace = true }
 solana-log-collector = { workspace = true }

program-test/src/lib.rs

@@ -4,6 +4,7 @@
 // Export tokio for test clients
 pub use tokio;
 use {
+    agave_feature_set::FEATURE_NAMES,
     async_trait::async_trait,
     base64::{prelude::BASE64_STANDARD, Engine},
     chrono_humanize::{Accuracy, HumanTime, Tense},
@@ -13,7 +14,6 @@ use {
     solana_banks_server::banks_server::start_local_server,
     solana_bpf_loader_program::serialization::serialize_parameters,
     solana_compute_budget::compute_budget::ComputeBudget,
-    solana_feature_set::FEATURE_NAMES,
     solana_instruction::{error::InstructionError, Instruction},
     solana_log_collector::ic_msg,
     solana_program_runtime::{

program-test/src/programs.rs

@@ -1,10 +1,12 @@
-use solana_sdk::{
-    account::{Account, AccountSharedData},
-    bpf_loader,
-    bpf_loader_upgradeable::{self, get_program_data_address, UpgradeableLoaderState},
-    feature_set,
-    pubkey::Pubkey,
-    rent::Rent,
+use {
+    agave_feature_set as feature_set,
+    solana_sdk::{
+        account::{Account, AccountSharedData},
+        bpf_loader,
+        bpf_loader_upgradeable::{self, get_program_data_address, UpgradeableLoaderState},
+        pubkey::Pubkey,
+        rent::Rent,
+    },
 };
 
 mod spl_memo_1_0 {

program-test/tests/bpf.rs

@@ -1,7 +1,8 @@
 use {
+    agave_feature_set as feature_set,
     solana_program_test::ProgramTest,
     solana_sdk::{
-        bpf_loader, feature_set,
+        bpf_loader,
         instruction::{AccountMeta, Instruction},
         pubkey::Pubkey,
         signature::Signer,

programs/address-lookup-table-tests/Cargo.toml

@@ -12,12 +12,12 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dev-dependencies]
+agave-feature-set = { workspace = true }
 assert_matches = { workspace = true }
 bincode = { workspace = true }
 criterion = { workspace = true }
 solana-account = { workspace = true }
 solana-address-lookup-table-program = { workspace = true }
-solana-feature-set = { workspace = true }
 solana-instruction = { workspace = true }
 solana-program-runtime = { workspace = true }
 solana-program-test = { workspace = true }

programs/address-lookup-table/Cargo.toml

@@ -10,6 +10,7 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
+agave-feature-set = { workspace = true }
 bincode = { workspace = true }
 bytemuck = { workspace = true }
 log = { workspace = true }
@@ -19,7 +20,6 @@ solana-address-lookup-table-interface = { workspace = true, features = [
     "bincode",
     "bytemuck",
 ] }
-solana-feature-set = { workspace = true }
 thiserror = { workspace = true }
 
 [target.'cfg(not(target_os = "solana"))'.dependencies]

programs/bpf_loader/Cargo.toml

@@ -10,6 +10,7 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
+agave-feature-set = { workspace = true }
 agave-precompiles = { workspace = true }
 bincode = { workspace = true }
 libsecp256k1 = { workspace = true }
@@ -25,7 +26,6 @@ solana-clock = { workspace = true }
 solana-compute-budget = { workspace = true }
 solana-cpi = { workspace = true }
 solana-curve25519 = { workspace = true }
-solana-feature-set = { workspace = true }
 solana-hash = { workspace = true }
 solana-instruction = { workspace = true }
 solana-keccak-hasher = { workspace = true }

programs/bpf_loader/src/lib.rs

@@ -7,15 +7,15 @@ pub mod syscalls;
 #[cfg(feature = "svm-internal")]
 use qualifier_attr::qualifiers;
 use {
-    solana_account::WritableAccount,
-    solana_bincode::limited_deserialize,
-    solana_clock::Slot,
-    solana_compute_budget::compute_budget::MAX_INSTRUCTION_STACK_DEPTH,
-    solana_feature_set::{
+    agave_feature_set::{
         bpf_account_data_direct_mapping, disable_new_loader_v3_deployments,
         enable_bpf_loader_set_authority_checked_ix, enable_loader_v4,
         remove_accounts_executable_flag_checks,
     },
+    solana_account::WritableAccount,
+    solana_bincode::limited_deserialize,
+    solana_clock::Slot,
+    solana_compute_budget::compute_budget::MAX_INSTRUCTION_STACK_DEPTH,
     solana_instruction::{error::InstructionError, AccountMeta},
     solana_loader_v3_interface::{
         instruction::UpgradeableLoaderInstruction, state::UpgradeableLoaderState,
@@ -1656,7 +1656,7 @@ fn execute<'a, 'b: 'a>(
             ProgramResult::Err(mut error) => {
                 if invoke_context
                     .get_feature_set()
-                    .is_active(&solana_feature_set::deplete_cu_meter_on_vm_failure::id())
+                    .is_active(&agave_feature_set::deplete_cu_meter_on_vm_failure::id())
                     && !matches!(error, EbpfError::SyscallError(_))
                 {
                     // when an exception is thrown during the execution of a

programs/bpf_loader/src/syscalls/cpi.rs

@@ -1,8 +1,8 @@
 use {
     super::*,
     crate::serialization::account_data_region_memory_state,
+    agave_feature_set::enable_bpf_loader_set_authority_checked_ix,
     scopeguard::defer,
-    solana_feature_set::{self as feature_set, enable_bpf_loader_set_authority_checked_ix},
     solana_loader_v3_interface::instruction as bpf_loader_upgradeable,
     solana_measure::measure::Measure,
     solana_program_runtime::invoke_context::SerializedAccountMetadata,
@@ -1615,10 +1615,10 @@ mod tests {
     use {
         super::*,
         crate::mock_create_vm,
+        agave_feature_set::bpf_account_data_direct_mapping,
         assert_matches::assert_matches,
         solana_account::{Account, AccountSharedData, ReadableAccount},
         solana_clock::Epoch,
-        solana_feature_set::bpf_account_data_direct_mapping,
         solana_instruction::Instruction,
         solana_program_runtime::{
             invoke_context::SerializedAccountMetadata, with_mock_invoke_context,

programs/bpf_loader/src/syscalls/mem_ops.rs

@@ -71,7 +71,7 @@ declare_builtin_function!(
 
         if invoke_context
             .get_feature_set()
-            .is_active(&solana_feature_set::bpf_account_data_direct_mapping::id())
+            .is_active(&agave_feature_set::bpf_account_data_direct_mapping::id())
         {
             let cmp_result = translate_type_mut::<i32>(
                 memory_mapping,
@@ -129,7 +129,7 @@ declare_builtin_function!(
 
         if invoke_context
             .get_feature_set()
-            .is_active(&solana_feature_set::bpf_account_data_direct_mapping::id())
+            .is_active(&agave_feature_set::bpf_account_data_direct_mapping::id())
         {
             let syscall_context = invoke_context.get_syscall_context()?;
 
@@ -156,7 +156,7 @@ fn memmove(
 ) -> Result<u64, Error> {
     if invoke_context
         .get_feature_set()
-        .is_active(&solana_feature_set::bpf_account_data_direct_mapping::id())
+        .is_active(&agave_feature_set::bpf_account_data_direct_mapping::id())
     {
         let syscall_context = invoke_context.get_syscall_context()?;
 

programs/bpf_loader/src/syscalls/mod.rs

@@ -12,6 +12,17 @@ pub use self::{
 };
 #[allow(deprecated)]
 use {
+    agave_feature_set::{
+        self as feature_set, abort_on_invalid_curve, blake3_syscall_enabled,
+        bpf_account_data_direct_mapping, curve25519_syscall_enabled,
+        disable_deploy_of_alloc_free_syscall, disable_fees_sysvar, disable_sbpf_v0_execution,
+        enable_alt_bn128_compression_syscall, enable_alt_bn128_syscall, enable_big_mod_exp_syscall,
+        enable_get_epoch_stake_syscall, enable_poseidon_syscall,
+        enable_sbpf_v1_deployment_and_execution, enable_sbpf_v2_deployment_and_execution,
+        enable_sbpf_v3_deployment_and_execution, get_sysvar_syscall_enabled,
+        last_restart_slot_sysvar, reenable_sbpf_v0_execution,
+        remaining_compute_units_syscall_enabled, FeatureSet,
+    },
     agave_precompiles::is_precompile,
     solana_account_info::AccountInfo,
     solana_big_mod_exp::{big_mod_exp, BigModExpParams},
@@ -24,17 +35,6 @@ use {
     },
     solana_compute_budget::compute_budget::ComputeBudget,
     solana_cpi::MAX_RETURN_DATA,
-    solana_feature_set::{
-        self as feature_set, abort_on_invalid_curve, blake3_syscall_enabled,
-        bpf_account_data_direct_mapping, curve25519_syscall_enabled,
-        disable_deploy_of_alloc_free_syscall, disable_fees_sysvar, disable_sbpf_v0_execution,
-        enable_alt_bn128_compression_syscall, enable_alt_bn128_syscall, enable_big_mod_exp_syscall,
-        enable_get_epoch_stake_syscall, enable_poseidon_syscall,
-        enable_sbpf_v1_deployment_and_execution, enable_sbpf_v2_deployment_and_execution,
-        enable_sbpf_v3_deployment_and_execution, get_sysvar_syscall_enabled,
-        last_restart_slot_sysvar, reenable_sbpf_v0_execution,
-        remaining_compute_units_syscall_enabled, FeatureSet,
-    },
     solana_hash::Hash,
     solana_instruction::{error::InstructionError, AccountMeta, ProcessedSiblingInstruction},
     solana_keccak_hasher as keccak,

programs/compute-budget-bench/Cargo.toml

@@ -9,12 +9,12 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
+agave-feature-set = { workspace = true }
 criterion = { workspace = true }
 solana-compute-budget = { workspace = true }
 solana-compute-budget-instruction = { workspace = true }
 solana-compute-budget-interface = { workspace = true }
 solana-compute-budget-program = { workspace = true }
-solana-feature-set = { workspace = true }
 solana-message = { workspace = true }
 solana-sdk-ids = { workspace = true }
 solana-svm-transaction = { workspace = true }

programs/compute-budget-bench/benches/compute_budget.rs

@@ -1,9 +1,9 @@
 use {
+    agave_feature_set::FeatureSet,
     criterion::{black_box, criterion_group, criterion_main, Criterion},
     solana_compute_budget::compute_budget_limits::ComputeBudgetLimits,
     solana_compute_budget_instruction::instructions_processor::process_compute_budget_instructions,
     solana_compute_budget_interface::ComputeBudgetInstruction,
-    solana_feature_set::FeatureSet,
     solana_message::compiled_instruction::CompiledInstruction,
     solana_svm_transaction::instruction::SVMInstruction,
     std::num::NonZero,

programs/ed25519-tests/Cargo.toml

@@ -9,6 +9,7 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dev-dependencies]
+agave-feature-set = { workspace = true }
 assert_matches = { workspace = true }
 ed25519-dalek = { workspace = true }
 rand = { workspace = true }

programs/ed25519-tests/tests/process_transaction.rs

@@ -1,9 +1,9 @@
 use {
+    agave_feature_set as feature_set,
     assert_matches::assert_matches,
     solana_program_test::*,
     solana_sdk::{
         ed25519_instruction::new_ed25519_instruction,
-        feature_set,
         instruction::InstructionError,
         precompiles::PrecompileError,
         signature::Signer,

programs/sbf/Cargo.lock

@@ -71,6 +71,18 @@ dependencies = [
  "solana-perf",
 ]
 
+[[package]]
+name = "agave-feature-set"
+version = "2.2.6"
+dependencies = [
+ "ahash 0.8.11",
+ "solana-epoch-schedule",
+ "solana-feature-set-interface",
+ "solana-hash",
+ "solana-pubkey",
+ "solana-sha256-hasher",
+]
+
 [[package]]
 name = "agave-geyser-plugin-interface"
 version = "2.2.6"
@@ -87,6 +99,7 @@ dependencies = [
 name = "agave-precompiles"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "bincode",
  "bytemuck",
  "digest 0.10.7",
@@ -96,7 +109,6 @@ dependencies = [
  "openssl",
  "sha3",
  "solana-ed25519-program",
- "solana-feature-set",
  "solana-message",
  "solana-precompile-error",
  "solana-pubkey",
@@ -109,8 +121,8 @@ dependencies = [
 name = "agave-reserved-account-keys"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "lazy_static",
- "solana-feature-set",
  "solana-pubkey",
  "solana-sdk-ids",
 ]
@@ -2932,9 +2944,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.169"
+version = "0.2.171"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
 
 [[package]]
 name = "libloading"
@@ -4790,9 +4802,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.138"
+version = "1.0.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
 dependencies = [
  "itoa",
  "memchr",
@@ -5182,6 +5194,7 @@ dependencies = [
 name = "solana-address-lookup-table-program"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "bincode",
  "bytemuck",
  "log",
@@ -5190,7 +5203,6 @@ dependencies = [
  "solana-address-lookup-table-interface",
  "solana-bincode",
  "solana-clock",
- "solana-feature-set",
  "solana-instruction",
  "solana-log-collector",
  "solana-packet",
@@ -5241,12 +5253,12 @@ dependencies = [
 name = "solana-banks-server"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "bincode",
  "crossbeam-channel",
  "futures 0.3.31",
  "solana-banks-interface",
  "solana-client",
- "solana-feature-set",
  "solana-runtime",
  "solana-runtime-transaction",
  "solana-sdk",
@@ -5334,6 +5346,7 @@ dependencies = [
 name = "solana-bpf-loader-program"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "agave-precompiles",
  "bincode",
  "libsecp256k1 0.6.0",
@@ -5349,7 +5362,6 @@ dependencies = [
  "solana-compute-budget",
  "solana-cpi",
  "solana-curve25519",
- "solana-feature-set",
  "solana-hash",
  "solana-instruction",
  "solana-keccak-hasher",
@@ -5399,11 +5411,11 @@ dependencies = [
 name = "solana-builtins"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "solana-address-lookup-table-program",
  "solana-bpf-loader-program",
  "solana-compute-budget-program",
  "solana-config-program",
- "solana-feature-set",
  "solana-loader-v4-program",
  "solana-program-runtime",
  "solana-pubkey",
@@ -5419,6 +5431,7 @@ dependencies = [
 name = "solana-builtins-default-costs"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "ahash 0.8.11",
  "lazy_static",
  "log",
@@ -5427,7 +5440,6 @@ dependencies = [
  "solana-bpf-loader-program",
  "solana-compute-budget-program",
  "solana-config-program",
- "solana-feature-set",
  "solana-loader-v4-program",
  "solana-pubkey",
  "solana-sdk-ids",
@@ -5629,12 +5641,12 @@ dependencies = [
 name = "solana-compute-budget-instruction"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "log",
  "solana-borsh",
  "solana-builtins-default-costs",
  "solana-compute-budget",
  "solana-compute-budget-interface",
- "solana-feature-set",
  "solana-instruction",
  "solana-packet",
  "solana-pubkey",
@@ -5714,6 +5726,7 @@ name = "solana-core"
 version = "2.2.6"
 dependencies = [
  "agave-banking-stage-ingress-types",
+ "agave-feature-set",
  "agave-transaction-view",
  "ahash 0.8.11",
  "anyhow",
@@ -5756,7 +5769,6 @@ dependencies = [
  "solana-connection-cache",
  "solana-cost-model",
  "solana-entry",
- "solana-feature-set",
  "solana-fee",
  "solana-geyser-plugin-manager",
  "solana-gossip",
@@ -5805,6 +5817,7 @@ dependencies = [
 name = "solana-cost-model"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "ahash 0.8.11",
  "lazy_static",
  "log",
@@ -5815,7 +5828,6 @@ dependencies = [
  "solana-compute-budget",
  "solana-compute-budget-instruction",
  "solana-compute-budget-interface",
- "solana-feature-set",
  "solana-fee-structure",
  "solana-metrics",
  "solana-packet",
@@ -6064,11 +6076,21 @@ dependencies = [
  "solana-sha256-hasher",
 ]
 
+[[package]]
+name = "solana-feature-set-interface"
+version = "4.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02007757246e40f10aa936dae4fa27efbf8dbd6a59575a12ccc802c1aea6e708"
+dependencies = [
+ "ahash 0.8.11",
+ "solana-pubkey",
+]
+
 [[package]]
 name = "solana-fee"
 version = "2.2.6"
 dependencies = [
- "solana-feature-set",
+ "agave-feature-set",
  "solana-fee-structure",
  "solana-svm-transaction",
 ]
@@ -6183,6 +6205,7 @@ dependencies = [
 name = "solana-gossip"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "assert_matches",
  "bincode",
  "bv",
@@ -6207,7 +6230,6 @@ dependencies = [
  "solana-client",
  "solana-connection-cache",
  "solana-entry",
- "solana-feature-set",
  "solana-ledger",
  "solana-logger",
  "solana-measure",
@@ -6370,6 +6392,7 @@ dependencies = [
 name = "solana-ledger"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "agave-reserved-account-keys",
  "assert_matches",
  "bincode",
@@ -6408,7 +6431,6 @@ dependencies = [
  "solana-bpf-loader-program",
  "solana-cost-model",
  "solana-entry",
- "solana-feature-set",
  "solana-measure",
  "solana-metrics",
  "solana-perf",
@@ -6518,13 +6540,15 @@ dependencies = [
 
 [[package]]
 name = "solana-logger"
-version = "2.2.1"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "593dbcb81439d37b02757e90bd9ab56364de63f378c55db92a6fbd6a2e47ab36"
+checksum = "db8e777ec1afd733939b532a42492d888ec7c88d8b4127a5d867eb45c6eb5cd5"
 dependencies = [
  "env_logger",
  "lazy_static",
+ "libc",
  "log",
+ "signal-hook",
 ]
 
 [[package]]
@@ -6922,6 +6946,7 @@ dependencies = [
 name = "solana-program-runtime"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "agave-precompiles",
  "base64 0.22.1",
  "bincode",
@@ -6936,7 +6961,6 @@ dependencies = [
  "solana-compute-budget",
  "solana-epoch-rewards",
  "solana-epoch-schedule",
- "solana-feature-set",
  "solana-hash",
  "solana-instruction",
  "solana-last-restart-slot",
@@ -6961,6 +6985,7 @@ dependencies = [
 name = "solana-program-test"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "assert_matches",
  "async-trait",
  "base64 0.22.1",
@@ -6975,7 +7000,6 @@ dependencies = [
  "solana-banks-server",
  "solana-bpf-loader-program",
  "solana-compute-budget",
- "solana-feature-set",
  "solana-inline-spl",
  "solana-instruction",
  "solana-log-collector",
@@ -7179,6 +7203,7 @@ dependencies = [
 name = "solana-rpc"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "base64 0.22.1",
  "bincode",
  "bs58",
@@ -7203,7 +7228,6 @@ dependencies = [
  "solana-client",
  "solana-entry",
  "solana-faucet",
- "solana-feature-set",
  "solana-gossip",
  "solana-inline-spl",
  "solana-ledger",
@@ -7320,6 +7344,7 @@ dependencies = [
 name = "solana-runtime"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "agave-precompiles",
  "agave-reserved-account-keys",
  "ahash 0.8.11",
@@ -7367,7 +7392,6 @@ dependencies = [
  "solana-compute-budget-instruction",
  "solana-config-program",
  "solana-cost-model",
- "solana-feature-set",
  "solana-fee",
  "solana-inline-spl",
  "solana-lattice-hash",
@@ -7433,6 +7457,7 @@ checksum = "61f1bc1357b8188d9c4a3af3fc55276e56987265eb7ad073ae6f8180ee54cecf"
 name = "solana-sbf-programs"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "agave-reserved-account-keys",
  "agave-validator",
  "bincode",
@@ -7449,7 +7474,6 @@ dependencies = [
  "solana-cli-output",
  "solana-compute-budget",
  "solana-compute-budget-instruction",
- "solana-feature-set",
  "solana-fee",
  "solana-ledger",
  "solana-log-collector",
@@ -7949,9 +7973,9 @@ dependencies = [
 
 [[package]]
 name = "solana-sdk"
-version = "2.2.1"
+version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4808e8d7f3c931657e615042d4176b423e66f64dc99e3dc3c735a197e512029b"
+checksum = "e8af90d2ce445440e0548fa4a5f96fe8b265c22041a68c942012ffadd029667d"
 dependencies = [
  "bincode",
  "bs58",
@@ -8273,13 +8297,13 @@ dependencies = [
 name = "solana-stake-program"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "bincode",
  "log",
  "solana-account",
  "solana-bincode",
  "solana-clock",
  "solana-config-program",
- "solana-feature-set",
  "solana-genesis-config",
  "solana-instruction",
  "solana-log-collector",
@@ -8408,6 +8432,7 @@ dependencies = [
 name = "solana-svm"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "agave-precompiles",
  "ahash 0.8.11",
  "itertools 0.12.1",
@@ -8421,7 +8446,6 @@ dependencies = [
  "solana-clock",
  "solana-compute-budget",
  "solana-compute-budget-instruction",
- "solana-feature-set",
  "solana-fee-structure",
  "solana-hash",
  "solana-instruction",
@@ -8574,6 +8598,7 @@ dependencies = [
 name = "solana-test-validator"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "base64 0.22.1",
  "bincode",
  "crossbeam-channel",
@@ -8584,7 +8609,6 @@ dependencies = [
  "solana-cli-output",
  "solana-compute-budget",
  "solana-core",
- "solana-feature-set",
  "solana-geyser-plugin-manager",
  "solana-gossip",
  "solana-ledger",
@@ -8688,9 +8712,9 @@ dependencies = [
 
 [[package]]
 name = "solana-transaction"
-version = "2.2.1"
+version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "753b3e9afed170e4cfc0ea1e87b5dfdc6d4a50270869414edd24c6ea1f529b29"
+checksum = "abec848d081beb15a324c633cd0e0ab33033318063230389895cae503ec9b544"
 dependencies = [
  "bincode",
  "serde",
@@ -8703,7 +8727,6 @@ dependencies = [
  "solana-message",
  "solana-precompiles",
  "solana-pubkey",
- "solana-reserved-account-keys",
  "solana-sanitize",
  "solana-sdk-ids",
  "solana-short-vec",
@@ -8821,6 +8844,7 @@ dependencies = [
 name = "solana-turbine"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "bincode",
  "bytes",
  "crossbeam-channel",
@@ -8835,7 +8859,6 @@ dependencies = [
  "rayon",
  "rustls 0.23.22",
  "solana-entry",
- "solana-feature-set",
  "solana-geyser-plugin-manager",
  "solana-gossip",
  "solana-ledger",
@@ -8929,10 +8952,10 @@ checksum = "7bbf6d7a3c0b28dd5335c52c0e9eae49d0ae489a8f324917faf0ded65a812c1d"
 name = "solana-version"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "semver",
  "serde",
  "serde_derive",
- "solana-feature-set",
  "solana-sanitize",
  "solana-serde-varint",
 ]
@@ -8988,6 +9011,7 @@ dependencies = [
 name = "solana-vote-program"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "bincode",
  "log",
  "num-derive",
@@ -8998,7 +9022,6 @@ dependencies = [
  "solana-bincode",
  "solana-clock",
  "solana-epoch-schedule",
- "solana-feature-set",
  "solana-hash",
  "solana-instruction",
  "solana-keypair",
@@ -9094,10 +9117,10 @@ dependencies = [
 name = "solana-zk-token-proof-program"
 version = "2.2.6"
 dependencies = [
+ "agave-feature-set",
  "bytemuck",
  "num-derive",
  "num-traits",
- "solana-feature-set",
  "solana-instruction",
  "solana-log-collector",
  "solana-program-runtime",

programs/sbf/Cargo.toml

@@ -15,6 +15,7 @@ check-cfg = [
 ]
 
 [workspace.dependencies]
+agave-feature-set = { path = "../../feature-set", version = "=2.2.6" }
 agave-reserved-account-keys = { path = "../../reserved-account-keys", version = "=2.2.6" }
 array-bytes = "=1.4.1"
 bincode = { version = "1.1.4", default-features = false }
@@ -43,11 +44,10 @@ solana-compute-budget = { path = "../../compute-budget", version = "=2.2.6" }
 solana-compute-budget-instruction = { path = "../../compute-budget-instruction", version = "=2.2.6" }
 solana-curve25519 = { path = "../../curves/curve25519", version = "=2.2.6" }
 solana-decode-error = "=2.2.1"
-solana-feature-set = "=2.2.4" # will be removed
 solana-fee = { path = "../../fee", version = "=2.2.6" }
 solana-ledger = { path = "../../ledger", version = "=2.2.6" }
 solana-log-collector = { path = "../../log-collector", version = "=2.2.6" }
-solana-logger = "=2.2.1"
+solana-logger = "=2.3.1"
 solana-measure = { path = "../../measure", version = "=2.2.6" }
 solana-poseidon = { path = "../../poseidon/", version = "=2.2.6" }
 solana-program = "=2.2.1"
@@ -62,7 +62,7 @@ solana-sbf-rust-mem-dep = { path = "rust/mem_dep", version = "=2.2.6" }
 solana-sbf-rust-param-passing-dep = { path = "rust/param_passing_dep", version = "=2.2.6" }
 solana-sbf-rust-realloc-dep = { path = "rust/realloc_dep", version = "=2.2.6" }
 solana-sbf-rust-realloc-invoke-dep = { path = "rust/realloc_invoke_dep", version = "=2.2.6" }
-solana-sdk = "=2.2.1"
+solana-sdk = "=2.2.2"
 solana-sbpf = "=0.10.0"
 solana-secp256k1-recover = "=2.2.1"
 solana-svm = { path = "../../svm", version = "=2.2.6" }
@@ -103,6 +103,7 @@ dummy-for-ci-check = ["sbf_c", "sbf_rust"]
 frozen-abi = []
 
 [dev-dependencies]
+agave-feature-set = { workspace = true }
 agave-reserved-account-keys = { workspace = true }
 agave-validator = { workspace = true }
 bincode = { workspace = true }
@@ -121,7 +122,6 @@ solana-compute-budget = { workspace = true }
 solana-compute-budget-instruction = { workspace = true, features = [
     "dev-context-only-utils",
 ] }
-solana-feature-set = { workspace = true }
 solana-fee = { workspace = true }
 solana-ledger = { workspace = true }
 solana-log-collector = { workspace = true }

programs/sbf/benches/bpf_loader.rs

@@ -8,20 +8,20 @@
 )]
 
 use {
-    solana_feature_set::bpf_account_data_direct_mapping, solana_sbpf::memory_region::MemoryState,
+    agave_feature_set::bpf_account_data_direct_mapping, solana_sbpf::memory_region::MemoryState,
     solana_sdk::signer::keypair::Keypair, std::slice,
 };
 
 extern crate test;
 
 use {
+    agave_feature_set::FeatureSet,
     byteorder::{ByteOrder, LittleEndian, WriteBytesExt},
     solana_bpf_loader_program::{
         create_vm, serialization::serialize_parameters,
         syscalls::create_program_runtime_environment_v1,
     },
     solana_compute_budget::compute_budget::ComputeBudget,
-    solana_feature_set::FeatureSet,
     solana_measure::measure::Measure,
     solana_program_runtime::invoke_context::InvokeContext,
     solana_runtime::{

programs/sbf/tests/programs.rs

@@ -9,11 +9,11 @@
 
 #[cfg(feature = "sbf_rust")]
 use {
+    agave_feature_set::{self as feature_set, FeatureSet},
     agave_reserved_account_keys::ReservedAccountKeys,
     borsh::{from_slice, to_vec, BorshDeserialize, BorshSerialize},
     solana_compute_budget::compute_budget::ComputeBudget,
     solana_compute_budget_instruction::instructions_processor::process_compute_budget_instructions,
-    solana_feature_set::{self as feature_set, FeatureSet},
     solana_program_runtime::invoke_context::mock_process_instruction,
     solana_runtime::{
         bank::Bank,
@@ -231,7 +231,7 @@ fn test_program_sbf_loader_deprecated() {
         } = create_genesis_config(50);
         genesis_config
             .accounts
-            .remove(&solana_feature_set::disable_deploy_of_alloc_free_syscall::id())
+            .remove(&agave_feature_set::disable_deploy_of_alloc_free_syscall::id())
             .unwrap();
         let (bank, bank_forks) = Bank::new_with_bank_forks_for_tests(&genesis_config);
         let program_id = create_program(&bank, &bpf_loader_deprecated::id(), program);
@@ -1908,7 +1908,7 @@ fn test_program_sbf_disguised_as_sbf_loader() {
             ..
         } = create_genesis_config(50);
         let mut bank = Bank::new_for_tests(&genesis_config);
-        bank.deactivate_feature(&solana_feature_set::remove_bpf_loader_incorrect_program_id::id());
+        bank.deactivate_feature(&agave_feature_set::remove_bpf_loader_incorrect_program_id::id());
         let (bank, bank_forks) = bank.wrap_with_bank_forks_for_tests();
         let mut bank_client = BankClient::new_shared(bank);
         let authority_keypair = Keypair::new();

programs/sbf/tests/sysvar.rs

@@ -1,7 +1,7 @@
 #![cfg(feature = "sbf_rust")]
 
 use {
-    solana_feature_set::disable_fees_sysvar,
+    agave_feature_set::disable_fees_sysvar,
     solana_runtime::{
         bank::Bank,
         bank_client::BankClient,

programs/stake-tests/Cargo.toml

@@ -12,9 +12,9 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dev-dependencies]
+agave-feature-set = { workspace = true }
 assert_matches = { workspace = true }
 bincode = { workspace = true }
-solana-feature-set = { workspace = true }
 solana-program-test = { workspace = true }
 solana-sdk = { workspace = true }
 solana-vote-program = { workspace = true }

programs/stake-tests/tests/test_move_stake_and_lamports.rs

@@ -6,7 +6,7 @@
 // in other words the utility functions in this file should not be broken out into modules or used elsewhere
 
 use {
-    solana_feature_set::{
+    agave_feature_set::{
         move_stake_and_move_lamports_ixs, stake_raise_minimum_delegation_to_1_sol,
     },
     solana_program_test::*,

programs/stake/Cargo.toml

@@ -10,13 +10,13 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
+agave-feature-set = { workspace = true }
 bincode = { workspace = true }
 log = { workspace = true }
 solana-account = { workspace = true }
 solana-bincode = { workspace = true }
 solana-clock = { workspace = true }
 solana-config-program = { workspace = true }
-solana-feature-set = { workspace = true }
 solana-genesis-config = { workspace = true }
 solana-instruction = { workspace = true }
 solana-log-collector = { workspace = true }

programs/stake/benches/stake.rs

@@ -1,9 +1,9 @@
 use {
+    agave_feature_set::FeatureSet,
     bincode::serialize,
     criterion::{black_box, criterion_group, criterion_main, Criterion},
     solana_account::{create_account_shared_data_for_test, AccountSharedData, WritableAccount},
     solana_clock::{Clock, Epoch},
-    solana_feature_set::FeatureSet,
     solana_instruction::AccountMeta,
     solana_program_runtime::invoke_context::mock_process_instruction,
     solana_pubkey::Pubkey,

programs/stake/src/lib.rs

@@ -6,7 +6,7 @@
 )]
 pub use solana_sdk_ids::stake::{check_id, id};
 use {
-    solana_feature_set::{self as feature_set, FeatureSet},
+    agave_feature_set::{self as feature_set, FeatureSet},
     solana_genesis_config::GenesisConfig,
     solana_native_token::LAMPORTS_PER_SOL,
 };

programs/stake/src/stake_instruction.rs

@@ -339,7 +339,7 @@ declare_process_instruction!(Entrypoint, DEFAULT_COMPUTE_UNITS, |invoke_context|
         StakeInstruction::MoveStake(lamports) => {
             if invoke_context
                 .get_feature_set()
-                .is_active(&solana_feature_set::move_stake_and_move_lamports_ixs::id())
+                .is_active(&agave_feature_set::move_stake_and_move_lamports_ixs::id())
             {
                 instruction_context.check_number_of_instruction_accounts(3)?;
                 move_stake(
@@ -358,7 +358,7 @@ declare_process_instruction!(Entrypoint, DEFAULT_COMPUTE_UNITS, |invoke_context|
         StakeInstruction::MoveLamports(lamports) => {
             if invoke_context
                 .get_feature_set()
-                .is_active(&solana_feature_set::move_stake_and_move_lamports_ixs::id())
+                .is_active(&agave_feature_set::move_stake_and_move_lamports_ixs::id())
             {
                 instruction_context.check_number_of_instruction_accounts(3)?;
                 move_lamports(
@@ -388,6 +388,7 @@ mod tests {
                 stake_from, Delegation, Meta, Stake, StakeStateV2,
             },
         },
+        agave_feature_set::FeatureSet,
         assert_matches::assert_matches,
         bincode::serialize,
         solana_account::{
@@ -397,7 +398,6 @@ mod tests {
         solana_clock::{Clock, Epoch, UnixTimestamp},
         solana_epoch_rewards::EpochRewards,
         solana_epoch_schedule::EpochSchedule,
-        solana_feature_set::FeatureSet,
         solana_instruction::{AccountMeta, Instruction},
         solana_program_runtime::invoke_context::mock_process_instruction,
         solana_pubkey::Pubkey,
@@ -437,7 +437,7 @@ mod tests {
         let mut feature_set = feature_set_all_enabled();
         Arc::get_mut(&mut feature_set)
             .unwrap()
-            .deactivate(&solana_feature_set::stake_raise_minimum_delegation_to_1_sol::id());
+            .deactivate(&agave_feature_set::stake_raise_minimum_delegation_to_1_sol::id());
         feature_set
     }
 

programs/stake/src/stake_state.rs

@@ -9,9 +9,9 @@
 )]
 pub use solana_stake_interface::state::*;
 use {
+    agave_feature_set::FeatureSet,
     solana_account::{state_traits::StateMut, AccountSharedData, ReadableAccount},
     solana_clock::{Clock, Epoch},
-    solana_feature_set::FeatureSet,
     solana_instruction::error::InstructionError,
     solana_log_collector::ic_msg,
     solana_program_runtime::invoke_context::InvokeContext,

programs/system/Cargo.toml

@@ -30,10 +30,10 @@ solana-transaction-context = { workspace = true, features = ["bincode"] }
 solana-type-overrides = { workspace = true }
 
 [dev-dependencies]
+agave-feature-set = { workspace = true }
 assert_matches = { workspace = true }
 criterion = { workspace = true }
 solana-compute-budget = { workspace = true }
-solana-feature-set = { workspace = true }
 solana-hash = { workspace = true }
 solana-logger = { workspace = true }
 solana-nonce-account = { workspace = true }

programs/vote/Cargo.toml

@@ -10,6 +10,7 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
+agave-feature-set = { workspace = true }
 bincode = { workspace = true }
 log = { workspace = true }
 num-derive = { workspace = true }
@@ -20,7 +21,6 @@ solana-account = { workspace = true }
 solana-bincode = { workspace = true }
 solana-clock = { workspace = true }
 solana-epoch-schedule = { workspace = true }
-solana-feature-set = { workspace = true }
 solana-frozen-abi = { workspace = true, optional = true, features = [
     "frozen-abi",
 ] }

programs/vote/benches/process_vote.rs

@@ -3,9 +3,9 @@
 extern crate test;
 
 use {
+    agave_feature_set::{deprecate_legacy_vote_ixs, FeatureSet},
     solana_account::{create_account_for_test, Account, AccountSharedData},
     solana_clock::{Clock, Slot},
-    solana_feature_set::{deprecate_legacy_vote_ixs, FeatureSet},
     solana_hash::Hash,
     solana_instruction::AccountMeta,
     solana_program_runtime::invoke_context::mock_process_instruction,

programs/vote/src/vote_processor.rs

@@ -2,9 +2,9 @@
 
 use {
     crate::vote_state,
+    agave_feature_set as feature_set,
     log::*,
     solana_bincode::limited_deserialize,
-    solana_feature_set as feature_set,
     solana_instruction::error::InstructionError,
     solana_program_runtime::{
         declare_process_instruction, invoke_context::InvokeContext,

programs/vote/src/vote_state/mod.rs

@@ -2,12 +2,12 @@
 //! Receive and processes votes from validators
 pub use solana_vote_interface::state::{vote_state_versions::*, *};
 use {
+    agave_feature_set::{self as feature_set, FeatureSet},
     log::*,
     serde_derive::{Deserialize, Serialize},
     solana_account::{AccountSharedData, ReadableAccount, WritableAccount},
     solana_clock::{Clock, Epoch, Slot, UnixTimestamp},
     solana_epoch_schedule::EpochSchedule,
-    solana_feature_set::{self as feature_set, FeatureSet},
     solana_hash::Hash,
     solana_instruction::error::InstructionError,
     solana_pubkey::Pubkey,

programs/zk-token-proof/Cargo.toml

@@ -9,10 +9,10 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
+agave-feature-set = { workspace = true }
 bytemuck = { workspace = true }
 num-derive = { workspace = true }
 num-traits = { workspace = true }
-solana-feature-set = { workspace = true }
 solana-instruction = { workspace = true }
 solana-log-collector = { workspace = true }
 solana-program-runtime = { workspace = true }

programs/zk-token-proof/src/lib.rs

@@ -1,8 +1,8 @@
 #![forbid(unsafe_code)]
 
 use {
+    agave_feature_set as feature_set,
     bytemuck::Pod,
-    solana_feature_set as feature_set,
     solana_instruction::{error::InstructionError, TRANSACTION_LEVEL_STACK_HEIGHT},
     solana_log_collector::ic_msg,
     solana_program_runtime::{declare_process_instruction, invoke_context::InvokeContext},

reserved-account-keys/Cargo.toml

@@ -10,8 +10,8 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
+agave-feature-set = { workspace = true }
 lazy_static = { workspace = true }
-solana-feature-set = { workspace = true }
 solana-frozen-abi = { workspace = true, optional = true, features = [
     "frozen-abi",
 ] }

reserved-account-keys/src/lib.rs

@@ -4,8 +4,8 @@
 #![cfg_attr(feature = "frozen-abi", feature(min_specialization))]
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
 use {
+    agave_feature_set::{self as feature_set, FeatureSet},
     lazy_static::lazy_static,
-    solana_feature_set::{self as feature_set, FeatureSet},
     solana_pubkey::Pubkey,
     solana_sdk_ids::{
         address_lookup_table, bpf_loader, bpf_loader_deprecated, bpf_loader_upgradeable,
@@ -230,7 +230,7 @@ mod tests {
 
         // Updating the active set with an activated feature should also activate
         // the corresponding reserved key from inactive to active
-        feature_set.active.insert(feature_ids[0], 0);
+        feature_set.active_mut().insert(feature_ids[0], 0);
         reserved_account_keys.update_active_set(&feature_set);
 
         assert!(reserved_account_keys.is_reserved(&active_reserved_key));
@@ -239,7 +239,7 @@ mod tests {
 
         // Update the active set again to ensure that the inactive map is
         // properly retained
-        feature_set.active.insert(feature_ids[1], 0);
+        feature_set.active_mut().insert(feature_ids[1], 0);
         reserved_account_keys.update_active_set(&feature_set);
 
         assert!(reserved_account_keys.is_reserved(&active_reserved_key));

rpc/Cargo.toml

@@ -10,6 +10,7 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
+agave-feature-set = { workspace = true }
 base64 = { workspace = true }
 bincode = { workspace = true }
 bs58 = { workspace = true }
@@ -34,7 +35,6 @@ solana-accounts-db = { workspace = true }
 solana-client = { workspace = true }
 solana-entry = { workspace = true }
 solana-faucet = { workspace = true }
-solana-feature-set = { workspace = true }
 solana-gossip = { workspace = true }
 solana-inline-spl = { workspace = true }
 solana-ledger = { workspace = true }

rpc/src/rpc.rs

@@ -7,6 +7,7 @@ use {
         optimistically_confirmed_bank_tracker::OptimisticallyConfirmedBank,
         parsed_token_accounts::*, rpc_cache::LargestAccountsCache, rpc_health::*,
     },
+    agave_feature_set as feature_set,
     base64::{prelude::BASE64_STANDARD, Engine},
     bincode::{config::Options, serialize},
     crossbeam_channel::{unbounded, Receiver, Sender},
@@ -29,7 +30,6 @@ use {
     solana_client::connection_cache::Protocol,
     solana_entry::entry::Entry,
     solana_faucet::faucet::request_airdrop_transaction,
-    solana_feature_set as feature_set,
     solana_gossip::cluster_info::ClusterInfo,
     solana_inline_spl::{
         token::{SPL_TOKEN_ACCOUNT_MINT_OFFSET, SPL_TOKEN_ACCOUNT_OWNER_OFFSET},