diff --git a/Cargo.lock b/Cargo.lock index ef21edb91bc030..0a08d2c65155a4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5876,7 +5876,6 @@ dependencies = [ "solana-program-pack", "solana-pubkey", "solana-rent", - "solana-sdk", "solana-sdk-ids", "solana-slot-hashes", "solana-slot-history", diff --git a/account-decoder/Cargo.toml b/account-decoder/Cargo.toml index 6e5c9b73b56745..a37968a2169d3e 100644 --- a/account-decoder/Cargo.toml +++ b/account-decoder/Cargo.toml @@ -31,7 +31,6 @@ solana-program = { workspace = true } solana-program-pack = { workspace = true } solana-pubkey = { workspace = true } solana-rent = { workspace = true } -solana-sdk = { workspace = true } solana-sdk-ids = { workspace = true } solana-slot-hashes = { workspace = true } solana-slot-history = { workspace = true } diff --git a/account-decoder/src/parse_account_data.rs b/account-decoder/src/parse_account_data.rs index f290d62b3b82b9..5f251760b2b917 100644 --- a/account-decoder/src/parse_account_data.rs +++ b/account-decoder/src/parse_account_data.rs @@ -166,7 +166,7 @@ mod test { state::{Data, State}, versions::Versions, }, - solana_sdk::vote::{ + solana_program::vote::{ program::id as vote_program_id, state::{VoteState, VoteStateVersions}, }, diff --git a/account-decoder/src/parse_bpf_loader.rs b/account-decoder/src/parse_bpf_loader.rs index ab795134ee5725..235586a09620cf 100644 --- a/account-decoder/src/parse_bpf_loader.rs +++ b/account-decoder/src/parse_bpf_loader.rs @@ -5,8 +5,8 @@ use { }, base64::{prelude::BASE64_STANDARD, Engine}, bincode::{deserialize, serialized_size}, + solana_program::bpf_loader_upgradeable::UpgradeableLoaderState, solana_pubkey::Pubkey, - solana_sdk::bpf_loader_upgradeable::UpgradeableLoaderState, }; pub fn parse_bpf_upgradeable_loader( diff --git a/account-decoder/src/parse_config.rs b/account-decoder/src/parse_config.rs index 384a9da6e73c48..89a2cc2176eaed 100644 --- a/account-decoder/src/parse_config.rs +++ b/account-decoder/src/parse_config.rs @@ -6,10 +6,10 @@ use { bincode::deserialize, serde_json::Value, solana_config_program::{get_config_data, ConfigKeys}, - solana_pubkey::Pubkey, - solana_sdk::stake::config::{ + solana_program::stake::config::{ Config as StakeConfig, {self as stake_config}, }, + solana_pubkey::Pubkey, }; pub fn parse_config(data: &[u8], pubkey: &Pubkey) -> Result { @@ -68,7 +68,7 @@ pub struct UiConfigKey { #[deprecated( since = "1.16.7", - note = "Please use `solana_sdk::stake::state::warmup_cooldown_rate()` instead" + note = "Please use `solana_program::stake::state::warmup_cooldown_rate()` instead" )] #[derive(Debug, Serialize, Deserialize, PartialEq)] #[serde(rename_all = "camelCase")] diff --git a/account-decoder/src/parse_stake.rs b/account-decoder/src/parse_stake.rs index e2636c7471aa3c..5a5d8fec002c51 100644 --- a/account-decoder/src/parse_stake.rs +++ b/account-decoder/src/parse_stake.rs @@ -5,7 +5,7 @@ use { }, bincode::deserialize, solana_clock::{Epoch, UnixTimestamp}, - solana_sdk::stake::state::{Authorized, Delegation, Lockup, Meta, Stake, StakeStateV2}, + solana_program::stake::state::{Authorized, Delegation, Lockup, Meta, Stake, StakeStateV2}, }; pub fn parse_stake(data: &[u8]) -> Result { @@ -119,7 +119,7 @@ pub struct UiDelegation { pub deactivation_epoch: StringAmount, #[deprecated( since = "1.16.7", - note = "Please use `solana_sdk::stake::stake::warmup_cooldown_rate()` instead" + note = "Please use `solana_program::stake::stake::warmup_cooldown_rate()` instead" )] pub warmup_cooldown_rate: f64, } @@ -139,7 +139,7 @@ impl From for UiDelegation { #[cfg(test)] mod test { - use {super::*, bincode::serialize, solana_sdk::stake::stake_flags::StakeFlags}; + use {super::*, bincode::serialize, solana_program::stake::stake_flags::StakeFlags}; #[test] #[allow(deprecated)] diff --git a/account-decoder/src/parse_vote.rs b/account-decoder/src/parse_vote.rs index afe82b6c241908..6036c1f73c4745 100644 --- a/account-decoder/src/parse_vote.rs +++ b/account-decoder/src/parse_vote.rs @@ -1,8 +1,8 @@ use { crate::{parse_account_data::ParseAccountError, StringAmount}, solana_clock::{Epoch, Slot}, + solana_program::vote::state::{BlockTimestamp, Lockout, VoteState}, solana_pubkey::Pubkey, - solana_sdk::vote::state::{BlockTimestamp, Lockout, VoteState}, }; pub fn parse_vote(data: &[u8]) -> Result { @@ -121,7 +121,7 @@ struct UiEpochCredits { #[cfg(test)] mod test { - use {super::*, solana_sdk::vote::state::VoteStateVersions}; + use {super::*, solana_program::vote::state::VoteStateVersions}; #[test] fn test_parse_vote() { diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock index 74aa056ec3b25d..1bd2eeae041e46 100644 --- a/programs/sbf/Cargo.lock +++ b/programs/sbf/Cargo.lock @@ -4934,7 +4934,6 @@ dependencies = [ "solana-program-pack", "solana-pubkey", "solana-rent", - "solana-sdk", "solana-sdk-ids", "solana-slot-hashes", "solana-slot-history", diff --git a/svm/examples/Cargo.lock b/svm/examples/Cargo.lock index 776936c1dd427e..b7722bae3b82b3 100644 --- a/svm/examples/Cargo.lock +++ b/svm/examples/Cargo.lock @@ -4785,7 +4785,6 @@ dependencies = [ "solana-program-pack", "solana-pubkey", "solana-rent", - "solana-sdk", "solana-sdk-ids", "solana-slot-hashes", "solana-slot-history",