deps: Bump sdk v3 crates (#79)

* sysvar: Move stake-history implementation from sdk

* error: Fixup post-upgrade

* Remove borsh 0.10 support

* Use solana-sdk-ids instead

* Bump the crates

* Add anyhow and example-mocks for doctests

Author: joncinque

Cargo.lock

@@ -28,6 +28,3 @@ build = "1.86.0"
 format = "nightly-2025-02-16"
 lint = "nightly-2025-02-16"
 test = "nightly-2025-02-16"
-
-[patch.crates-io]
-solana-stake-interface = { path = "interface" }

Cargo.toml

@@ -8,6 +8,7 @@ repository = { workspace = true }
 homepage = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
+rust-version = "1.81.0"
 
 [lib]
 crate-type = ["rlib"]
@@ -17,27 +18,30 @@ program-id = "Stake11111111111111111111111111111111111111"
 
 [dependencies]
 borsh = { version = "1.5.1", features = ["derive", "unstable__schema"], optional = true }
-borsh0-10 = { package = "borsh", version = "0.10.3", optional = true }
 num-traits = "0.2"
 serde = { version = "1.0.210", optional = true }
 serde_derive = { version = "1.0.210", optional = true }
-solana-decode-error = "2.2.1"
-solana-clock = "2.2.1"
-solana-cpi = { version = "2.2.1", optional = true }
-solana-frozen-abi = { version = "2.2.1", features = ["frozen-abi"], optional = true }
-solana-frozen-abi-macro = { version = "2.2.1", features = ["frozen-abi"], optional = true }
-solana-instruction = "2.2.1"
-solana-program-error = "2.2.1"
-solana-pubkey = { version = "2.2.1", default-features = false }
-solana-system-interface = "1.0.0"
-solana-sysvar-id = "2.2.1"
+solana-clock = "3.0.0"
+solana-cpi = { version = "3.0.0", optional = true }
+solana-frozen-abi = { version = "3.0.0", features = ["frozen-abi"], optional = true }
+solana-frozen-abi-macro = { version = "3.0.0", features = ["frozen-abi"], optional = true }
+solana-instruction = "3.0.0"
+solana-program-error = "3.0.0"
+solana-pubkey = { version = "3.0.0", default-features = false }
+solana-system-interface = "2.0.0"
+solana-sysvar = { version = "3.0.0", optional = true }
+solana-sysvar-id = { version = "3.0.0", optional = true }
 
 [dev-dependencies]
+anyhow = "1"
 assert_matches = "1.5.0"
 bincode = "1.3.3"
-solana-account = {version = "2.2.1", features = ["bincode"] }
-solana-borsh = "2.2.1"
-solana-program = { version = "2.2.1", default-features = false }
+serial_test = "2.0.0"
+solana-account = {version = "3.0.0", features = ["bincode"] }
+solana-borsh = "3.0.0"
+solana-example-mocks = "3.0.0"
+solana-sdk-ids = "3.0.0"
+solana-stake-interface = { path = ".", features = ["bincode", "borsh", "sysvar"] }
 static_assertions = "1.1.0"
 strum = "0.24"
 strum_macros = "0.24"
@@ -54,11 +58,11 @@ bincode = [
     "solana-instruction/bincode",
     "solana-instruction/serde",
     "solana-system-interface/bincode",
+    "solana-sysvar/bincode",
     "serde"
 ]
 borsh = [
     "dep:borsh",
-    "dep:borsh0-10",
     "solana-instruction/borsh",
     "solana-program-error/borsh",
     "solana-pubkey/borsh"
@@ -67,6 +71,8 @@ frozen-abi = [
     "dep:solana-frozen-abi",
     "dep:solana-frozen-abi-macro",
     "solana-instruction/frozen-abi",
-    "solana-pubkey/frozen-abi"
+    "solana-pubkey/frozen-abi",
+    "solana-sysvar/frozen-abi",
 ]
-serde = ["dep:serde", "dep:serde_derive", "solana-pubkey/serde"]
+serde = ["dep:serde", "dep:serde_derive", "solana-pubkey/serde", "solana-sysvar/serde"]
+sysvar = ["dep:solana-sysvar", "dep:solana-sysvar-id"]

interface/Cargo.toml

@@ -1,6 +1,5 @@
 use {
     num_traits::{FromPrimitive, ToPrimitive},
-    solana_decode_error::DecodeError,
     solana_program_error::ProgramError,
 };
 
@@ -157,7 +156,7 @@ impl ToPrimitive for StakeError {
     }
 }
 
-impl std::error::Error for StakeError {}
+impl core::error::Error for StakeError {}
 
 impl core::fmt::Display for StakeError {
     fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
@@ -204,18 +203,9 @@ impl core::fmt::Display for StakeError {
     }
 }
 
-impl<E> DecodeError<E> for StakeError {
-    fn type_of() -> &'static str {
-        "StakeError"
-    }
-}
-
 #[cfg(test)]
 mod tests {
-    use {
-        super::StakeError, num_traits::FromPrimitive, solana_decode_error::DecodeError,
-        solana_instruction::error::InstructionError, strum::IntoEnumIterator,
-    };
+    use {super::StakeError, num_traits::FromPrimitive, strum::IntoEnumIterator};
 
     #[test]
     fn test_stake_error_from_primitive_exhaustive() {
@@ -227,30 +217,4 @@ mod tests {
             );
         }
     }
-
-    #[test]
-    fn test_custom_error_decode() {
-        use num_traits::FromPrimitive;
-        fn pretty_err<T>(err: InstructionError) -> String
-        where
-            T: 'static + std::error::Error + DecodeError<T> + FromPrimitive,
-        {
-            if let InstructionError::Custom(code) = err {
-                let specific_error: T = T::decode_custom_error_to_enum(code).unwrap();
-                format!(
-                    "{:?}: {}::{:?} - {}",
-                    err,
-                    T::type_of(),
-                    specific_error,
-                    specific_error,
-                )
-            } else {
-                "".to_string()
-            }
-        }
-        assert_eq!(
-            "Custom(0): StakeError::NoCreditsToRedeem - not enough credits to redeem",
-            pretty_err::<StakeError>(StakeError::NoCreditsToRedeem.into())
-        )
-    }
 }

interface/src/error.rs

@@ -909,12 +909,12 @@ mod tests {
     #[test]
     fn test_constants() {
         // Ensure that the constants are in sync with the solana program.
-        assert_eq!(CLOCK_ID, solana_program::sysvar::clock::ID);
+        assert_eq!(CLOCK_ID, solana_sdk_ids::sysvar::clock::ID);
 
         // Ensure that the constants are in sync with the solana program.
-        assert_eq!(STAKE_HISTORY_ID, solana_program::sysvar::stake_history::ID);
+        assert_eq!(STAKE_HISTORY_ID, solana_sdk_ids::sysvar::stake_history::ID);
 
         // Ensure that the constants are in sync with the solana rent.
-        assert_eq!(RENT_ID, solana_program::sysvar::rent::ID);
+        assert_eq!(RENT_ID, solana_sdk_ids::sysvar::rent::ID);
     }
 }

interface/src/instruction.rs

@@ -10,6 +10,8 @@ pub mod instruction;
 pub mod stake_flags;
 pub mod stake_history;
 pub mod state;
+#[cfg(feature = "sysvar")]
+pub mod sysvar;
 pub mod tools;
 
 pub mod program {

interface/src/lib.rs

@@ -17,55 +17,6 @@ pub struct StakeFlags {
     bits: u8,
 }
 
-#[cfg(feature = "borsh")]
-impl borsh0_10::de::BorshDeserialize for StakeFlags {
-    fn deserialize_reader<R: borsh0_10::maybestd::io::Read>(
-        reader: &mut R,
-    ) -> ::core::result::Result<Self, borsh0_10::maybestd::io::Error> {
-        Ok(Self {
-            bits: borsh0_10::BorshDeserialize::deserialize_reader(reader)?,
-        })
-    }
-}
-
-#[cfg(feature = "borsh")]
-impl borsh0_10::BorshSchema for StakeFlags {
-    fn declaration() -> borsh0_10::schema::Declaration {
-        "StakeFlags".to_string()
-    }
-    fn add_definitions_recursively(
-        definitions: &mut borsh0_10::maybestd::collections::HashMap<
-            borsh0_10::schema::Declaration,
-            borsh0_10::schema::Definition,
-        >,
-    ) {
-        let fields = borsh0_10::schema::Fields::NamedFields(<[_]>::into_vec(
-            borsh0_10::maybestd::boxed::Box::new([(
-                "bits".to_string(),
-                <u8 as borsh0_10::BorshSchema>::declaration(),
-            )]),
-        ));
-        let definition = borsh0_10::schema::Definition::Struct { fields };
-        Self::add_definition(
-            <Self as borsh0_10::BorshSchema>::declaration(),
-            definition,
-            definitions,
-        );
-        <u8 as borsh0_10::BorshSchema>::add_definitions_recursively(definitions);
-    }
-}
-
-#[cfg(feature = "borsh")]
-impl borsh0_10::ser::BorshSerialize for StakeFlags {
-    fn serialize<W: borsh0_10::maybestd::io::Write>(
-        &self,
-        writer: &mut W,
-    ) -> ::core::result::Result<(), borsh0_10::maybestd::io::Error> {
-        borsh0_10::BorshSerialize::serialize(&self.bits, writer)?;
-        Ok(())
-    }
-}
-
 /// Currently, only bit 1 is used. The other 7 bits are reserved for future usage.
 impl StakeFlags {
     ///  Stake must be fully activated before deactivation is allowed (bit 1).

interface/src/stake_flags.rs

@@ -3,7 +3,7 @@
 //! [sv]: https://docs.solanalabs.com/runtime/sysvars#stakehistory
 
 pub use solana_clock::Epoch;
-use {solana_sysvar_id::declare_sysvar_id, std::ops::Deref};
+use std::ops::Deref;
 
 pub const MAX_ENTRIES: usize = 512; // it should never take as many as 512 epochs to warm up or cool down
 
@@ -65,8 +65,6 @@ impl std::ops::Add for StakeHistoryEntry {
 #[derive(Debug, PartialEq, Eq, Default, Clone)]
 pub struct StakeHistory(Vec<(Epoch, StakeHistoryEntry)>);
 
-declare_sysvar_id!("SysvarStakeHistory1111111111111111111111111", StakeHistory);
-
 impl StakeHistory {
     pub fn get(&self, epoch: Epoch) -> Option<&StakeHistoryEntry> {
         self.binary_search_by(|probe| epoch.cmp(&probe.0))
@@ -135,7 +133,7 @@ mod tests {
     fn test_id() {
         assert_eq!(
             StakeHistory::id(),
-            solana_program::sysvar::stake_history::id()
+            solana_sdk_ids::sysvar::stake_history::id()
         );
     }
 }