Extract feature-set crate (anza-xyz#2172)

* extract feature-set crate * update feature_set dependents * re-export with deprecation notice * fix path after rebase * fmt * fmt after rebase * fixes after rebase * unused import * fix import * unused import * post-rebase fixes * fix path * missing frozen-abi support * update lock file * use workspace lints * fix paths * fix import * remove unused import * remove unused deps * consolidate imports * add back dep (not unused after all)
abklabs · Nov 27, 2024 · d5bdc7f · d5bdc7f
1 parent abcf6a7
commit d5bdc7f
Show file tree

Hide file tree

Showing 105 changed files with 488 additions and 381 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -107,6 +107,7 @@ members = [
     "sdk/clock",
     "sdk/decode-error",
     "sdk/derivation-path",
+    "sdk/feature-set",
     "sdk/gen-headers",
     "sdk/hash",
     "sdk/macro",
@@ -388,6 +389,7 @@ solana-derivation-path = { path = "sdk/derivation-path", version = "=2.1.0" }
 solana-download-utils = { path = "download-utils", version = "=2.1.0" }
 solana-entry = { path = "entry", version = "=2.1.0" }
 solana-faucet = { path = "faucet", version = "=2.1.0" }
+solana-feature-set = { path = "sdk/feature-set", version = "=2.1.0" }
 solana-fee = { path = "fee", version = "=2.1.0" }
 solana-frozen-abi = { path = "frozen-abi", version = "=2.1.0" }
 solana-frozen-abi-macro = { path = "frozen-abi/macro", version = "=2.1.0" }

diff --git a/banks-server/Cargo.toml b/banks-server/Cargo.toml
@@ -15,6 +15,7 @@ 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-sdk = { workspace = true }
 solana-send-transaction-service = { workspace = true }

diff --git a/banks-server/src/banks_server.rs b/banks-server/src/banks_server.rs
@@ -8,6 +8,7 @@ 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,
@@ -17,7 +18,6 @@ use {
         account::Account,
         clock::Slot,
         commitment_config::CommitmentLevel,
-        feature_set::{self, FeatureSet},
         hash::Hash,
         message::{Message, SanitizedMessage},
         pubkey::Pubkey,
@@ -165,7 +165,7 @@ fn verify_transaction(
     transaction.verify()?;
 
     let move_precompile_verification_to_svm =
-        feature_set.is_active(&feature_set::move_precompile_verification_to_svm::id());
+        feature_set.is_active(&move_precompile_verification_to_svm::id());
     if !move_precompile_verification_to_svm {
         transaction.verify_precompiles(feature_set)?;
     }

diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml
@@ -48,6 +48,7 @@ thiserror = { workspace = true }
 
 [dev-dependencies]
 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 }

diff --git a/bench-tps/src/bench.rs b/bench-tps/src/bench.rs
@@ -1224,10 +1224,10 @@ pub fn fund_keypairs<T: 'static + TpsClient + Send + Sync + ?Sized>(
 mod tests {
     use {
         super::*,
+        solana_feature_set::FeatureSet,
         solana_runtime::{bank::Bank, bank_client::BankClient, bank_forks::BankForks},
         solana_sdk::{
             commitment_config::CommitmentConfig,
-            feature_set::FeatureSet,
             fee_calculator::FeeRateGovernor,
             genesis_config::{create_genesis_config, GenesisConfig},
             native_token::sol_to_lamports,

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -38,6 +38,7 @@ solana-compute-budget = { workspace = true }
 solana-config-program = { workspace = true }
 solana-connection-cache = { workspace = true }
 solana-decode-error = { workspace = true }
+solana-feature-set = { workspace = true }
 solana-loader-v4-program = { workspace = true }
 solana-logger = { workspace = true }
 solana-program-runtime = { workspace = true }

diff --git a/cli/src/cluster_query.rs b/cli/src/cluster_query.rs
@@ -46,7 +46,6 @@ use {
         clock::{self, Clock, Slot},
         commitment_config::CommitmentConfig,
         epoch_schedule::Epoch,
-        feature_set,
         hash::Hash,
         message::Message,
         native_token::lamports_to_sol,
@@ -1898,8 +1897,10 @@ pub fn process_show_stakes(
     let stake_history = from_account(&stake_history_account).ok_or_else(|| {
         CliError::RpcRequestError("Failed to deserialize stake history".to_string())
     })?;
-    let new_rate_activation_epoch =
-        get_feature_activation_epoch(rpc_client, &feature_set::reduce_stake_warmup_cooldown::id())?;
+    let new_rate_activation_epoch = get_feature_activation_epoch(
+        rpc_client,
+        &solana_feature_set::reduce_stake_warmup_cooldown::id(),
+    )?;
     stake_account_progress_bar.finish_and_clear();
 
     let mut stake_accounts: Vec<CliKeyedStakeState> = vec![];

diff --git a/cli/src/feature.rs b/cli/src/feature.rs
@@ -14,6 +14,7 @@ use {
         input_validators::*, keypair::*,
     },
     solana_cli_output::{cli_version::CliVersion, QuietDisplay, VerboseDisplay},
+    solana_feature_set::FEATURE_NAMES,
     solana_remote_wallet::remote_wallet::RemoteWalletManager,
     solana_rpc_client::rpc_client::RpcClient,
     solana_rpc_client_api::{
@@ -25,7 +26,6 @@ use {
         clock::Slot,
         epoch_schedule::EpochSchedule,
         feature::{self, Feature},
-        feature_set::FEATURE_NAMES,
         genesis_config::ClusterType,
         message::Message,
         pubkey::Pubkey,

diff --git a/cli/src/program.rs b/cli/src/program.rs
@@ -40,6 +40,7 @@ use {
         tpu_client::{TpuClient, TpuClientConfig},
     },
     solana_compute_budget::compute_budget::ComputeBudget,
+    solana_feature_set::{FeatureSet, FEATURE_NAMES},
     solana_program_runtime::invoke_context::InvokeContext,
     solana_rbpf::{elf::Executable, verifier::RequisiteVerifier},
     solana_remote_wallet::remote_wallet::RemoteWalletManager,
@@ -58,7 +59,6 @@ use {
         bpf_loader_upgradeable::{self, get_program_data_address, UpgradeableLoaderState},
         commitment_config::CommitmentConfig,
         compute_budget,
-        feature_set::{FeatureSet, FEATURE_NAMES},
         instruction::{Instruction, InstructionError},
         message::Message,
         packet::PACKET_DATA_SIZE,

diff --git a/cli/src/stake.rs b/cli/src/stake.rs
@@ -43,7 +43,6 @@ use {
         clock::{Clock, UnixTimestamp, SECONDS_PER_DAY},
         commitment_config::CommitmentConfig,
         epoch_schedule::EpochSchedule,
-        feature_set,
         message::Message,
         native_token::Sol,
         pubkey::Pubkey,
@@ -2567,7 +2566,7 @@ pub fn process_show_stake_account(
             })?;
             let new_rate_activation_epoch = get_feature_activation_epoch(
                 rpc_client,
-                &feature_set::reduce_stake_warmup_cooldown::id(),
+                &solana_feature_set::reduce_stake_warmup_cooldown::id(),
             )?;
 
             let mut state = build_stake_state(

diff --git a/cli/tests/program.rs b/cli/tests/program.rs
@@ -12,6 +12,7 @@ use {
     },
     solana_cli_output::{parse_sign_only_reply_string, OutputFormat},
     solana_faucet::faucet::run_local_faucet,
+    solana_feature_set::enable_alt_bn128_syscall,
     solana_rpc::rpc::JsonRpcConfig,
     solana_rpc_client::rpc_client::{GetConfirmedSignaturesForAddress2Config, RpcClient},
     solana_rpc_client_api::config::RpcTransactionConfig,
@@ -23,7 +24,6 @@ use {
         bpf_loader_upgradeable::{self, UpgradeableLoaderState},
         commitment_config::CommitmentConfig,
         compute_budget::{self, ComputeBudgetInstruction},
-        feature_set::enable_alt_bn128_syscall,
         fee_calculator::FeeRateGovernor,
         pubkey::Pubkey,
         rent::Rent,

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -52,6 +52,7 @@ solana-compute-budget = { 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 }
 solana-frozen-abi-macro = { workspace = true, optional = true }