extract feature crate

Cargo.toml

@@ -113,6 +113,7 @@ members = [
     "sdk/decode-error",
     "sdk/derivation-path",
     "sdk/epoch-schedule",
+    "sdk/feature",
     "sdk/feature-set",
     "sdk/fee-calculator",
     "sdk/gen-headers",
@@ -422,6 +423,7 @@ solana-entry = { path = "entry", version = "=2.1.0" }
 solana-program-entrypoint = { path = "sdk/program-entrypoint", version = "=2.1.0" }
 solana-epoch-schedule = { path = "sdk/epoch-schedule", version = "=2.1.0" }
 solana-faucet = { path = "faucet", version = "=2.1.0" }
+solana-feature = { path = "sdk/feature", version = "=2.1.0" }
 solana-feature-set = { path = "sdk/feature-set", version = "=2.1.0" }
 solana-fee-calculator = { path = "sdk/fee-calculator", version = "=2.1.0" }
 solana-fee = { path = "fee", version = "=2.1.0" }

sdk/feature/Cargo.toml

@@ -0,0 +1,43 @@
+[package]
+name = "solana-feature"
+description = "Solana runtime features."
+documentation = "https://docs.rs/solana-feature"
+version = { workspace = true }
+authors = { workspace = true }
+repository = { workspace = true }
+homepage = { workspace = true }
+license = { workspace = true }
+edition = { workspace = true }
+
+[dependencies]
+bincode = { workspace = true, optional = true }
+serde = { workspace = true, optional = true }
+serde_derive = { workspace = true, optional = true }
+solana-account-info = { workspace = true, optional = true }
+solana-instruction = { workspace = true, optional = true }
+solana-program-error = { workspace = true, optional = true }
+solana-pubkey = { workspace = true }
+solana-rent = { workspace = true, optional = true }
+solana-system-instruction = { workspace = true, optional = true }
+
+[dev-dependencies]
+solana-feature = { path = ".", features = ["dev-context-only-utils"] }
+
+[features]
+bincode = [
+    "dep:bincode",
+    "dep:solana-account-info",
+    "dep:solana-instruction",
+    "dep:solana-program-error",
+    "dep:solana-rent",
+    "dep:solana-system-instruction",
+    "serde",
+]
+dev-context-only-utils = ["bincode"]
+serde = ["dep:serde", "dep:serde_derive"]
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lints]
+workspace = true

sdk/program/src/feature.rs → sdk/feature/src/lib.rs

@@ -11,26 +11,30 @@
 //! 2. When the next epoch is entered the runtime will check for new activation requests and
 //!    active them.  When this occurs, the activation slot is recorded in the feature account
 
+#[cfg(feature = "bincode")]
 use {
-    crate::{
-        account_info::AccountInfo, instruction::Instruction, program_error::ProgramError,
-        pubkey::Pubkey, rent::Rent, system_instruction,
-    },
-    solana_clock::Slot,
+    solana_account_info::AccountInfo, solana_instruction::Instruction,
+    solana_program_error::ProgramError, solana_pubkey::Pubkey, solana_rent::Rent,
+    solana_system_instruction as system_instruction,
 };
 
-crate::declare_id!("Feature111111111111111111111111111111111111");
+solana_pubkey::declare_id!("Feature111111111111111111111111111111111111");
 
-#[derive(Default, Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[cfg_attr(
+    feature = "serde",
+    derive(serde_derive::Deserialize, serde_derive::Serialize)
+)]
+#[derive(Default, Debug, PartialEq, Eq)]
 pub struct Feature {
-    pub activated_at: Option<Slot>,
+    pub activated_at: Option<u64>,
 }
 
 impl Feature {
     pub const fn size_of() -> usize {
         9 // see test_feature_size_of.
     }
 
+    #[cfg(feature = "bincode")]
     pub fn from_account_info(account_info: &AccountInfo) -> Result<Self, ProgramError> {
         if *account_info.owner != id() {
             return Err(ProgramError::InvalidAccountOwner);
@@ -40,6 +44,7 @@ impl Feature {
     }
 }
 
+#[cfg(feature = "bincode")]
 /// Activate a feature
 pub fn activate(feature_id: &Pubkey, funding_address: &Pubkey, rent: &Rent) -> Vec<Instruction> {
     activate_with_lamports(
@@ -49,6 +54,7 @@ pub fn activate(feature_id: &Pubkey, funding_address: &Pubkey, rent: &Rent) -> V
     )
 }
 
+#[cfg(feature = "bincode")]
 pub fn activate_with_lamports(
     feature_id: &Pubkey,
     funding_address: &Pubkey,
@@ -83,7 +89,7 @@ mod test {
                 activated_at: Some(0),
             },
             Feature {
-                activated_at: Some(Slot::MAX),
+                activated_at: Some(u64::MAX),
             },
         ];
         for feature in &features {

sdk/program/Cargo.toml

@@ -40,6 +40,7 @@ solana-clock = { workspace = true, features = ["serde"] }
 solana-cpi = { workspace = true }
 solana-decode-error = { workspace = true }
 solana-epoch-schedule = { workspace = true, features = ["serde"] }
+solana-feature = { workspace = true, features = ["bincode"] }
 solana-fee-calculator = { workspace = true, features = ["serde"] }
 solana-frozen-abi = { workspace = true, optional = true, features = ["frozen-abi"] }
 solana-frozen-abi-macro = { workspace = true, optional = true, features = ["frozen-abi"] }

sdk/program/src/lib.rs

@@ -481,7 +481,6 @@ pub mod entrypoint_deprecated;
 pub mod epoch_rewards;
 pub mod epoch_schedule;
 pub mod epoch_stake;
-pub mod feature;
 pub mod hash;
 pub mod incinerator;
 pub mod instruction;
@@ -519,6 +518,8 @@ pub use solana_borsh::v0_10 as borsh0_10;
 #[cfg(feature = "borsh")]
 #[deprecated(since = "2.1.0", note = "Use `solana-borsh` crate instead")]
 pub use solana_borsh::v1 as borsh1;
+#[deprecated(since = "2.1.0", note = "Use `solana-feature` crate instead")]
+pub use solana_feature as feature;
 #[deprecated(since = "2.1.0", note = "Use `solana-fee-calculator` crate instead")]
 pub use solana_fee_calculator as fee_calculator;
 #[deprecated(since = "2.1.0", note = "Use `solana-program-memory` crate instead")]