missing frozen-abi support

anza-xyz · Sep 5, 2024 · e02b542 · e02b542
1 parent d3c76d1
commit e02b542
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 1 deletion.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml
@@ -42,6 +42,7 @@ frozen-abi = [
     "dep:solana-frozen-abi-macro",
     "solana-program/frozen-abi",
     "solana-short-vec/frozen-abi",
+    "solana-feature-set/frozen-abi"
 ]
 
 [dependencies]

diff --git a/sdk/feature-set/Cargo.toml b/sdk/feature-set/Cargo.toml
@@ -11,7 +11,19 @@ edition = { workspace = true }
 
 [dependencies]
 lazy_static = { workspace = true }
+solana-frozen-abi = { workspace = true, optional = true }
+solana-frozen-abi-macro = { workspace = true, optional = true }
 solana-program = { workspace = true }
 
+[build-dependencies]
+rustc_version = { workspace = true, optional = true }
+
+[features]
+frozen-abi = [
+    "dep:rustc_version",
+    "dep:solana-frozen-abi",
+    "dep:solana-frozen-abi-macro",
+]
+
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/sdk/feature-set/build.rs b/sdk/feature-set/build.rs
@@ -0,0 +1 @@
+../../frozen-abi/build.rs
diff --git a/sdk/feature-set/src/lib.rs b/sdk/feature-set/src/lib.rs
@@ -17,6 +17,7 @@
 //! 3. Add desired logic to check for and switch on feature availability.
 //!
 //! For more information on how features are picked up, see comments for `Feature`.
+#![cfg_attr(RUSTC_WITH_SPECIALIZATION, feature(min_specialization))]
 
 use {
     lazy_static::lazy_static,
@@ -1110,7 +1111,7 @@ lazy_static! {
 }
 
 /// `FeatureSet` holds the set of currently active/inactive runtime features
-#[cfg_attr(feature = "frozen-abi", derive(AbiExample))]
+#[cfg_attr(feature = "frozen-abi", derive(solana_frozen_abi_macro::AbiExample))]
 #[derive(Debug, Clone, Eq, PartialEq)]
 pub struct FeatureSet {
     pub active: HashMap<Pubkey, Slot>,