diff --git a/Cargo.lock b/Cargo.lock index b018f55fc1a365..8be944bcb267a5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10352,7 +10352,6 @@ dependencies = [ "solana-instruction", "solana-keypair", "solana-packet", - "solana-program", "solana-pubkey", "solana-sdk-ids", "solana-sha256-hasher", @@ -10360,6 +10359,7 @@ dependencies = [ "solana-signer", "solana-svm-transaction", "solana-transaction", + "solana-vote-interface", "thiserror 2.0.11", ] diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock index 088475fa4be053..19f47560597e5e 100644 --- a/programs/sbf/Cargo.lock +++ b/programs/sbf/Cargo.lock @@ -8560,12 +8560,12 @@ dependencies = [ "solana-hash", "solana-instruction", "solana-packet", - "solana-program", "solana-pubkey", "solana-sdk-ids", "solana-signature", "solana-svm-transaction", "solana-transaction", + "solana-vote-interface", "thiserror 2.0.11", ] diff --git a/svm/examples/Cargo.lock b/svm/examples/Cargo.lock index 62c12a624076a9..0bf6b980647d00 100644 --- a/svm/examples/Cargo.lock +++ b/svm/examples/Cargo.lock @@ -7906,12 +7906,12 @@ dependencies = [ "solana-hash", "solana-instruction", "solana-packet", - "solana-program", "solana-pubkey", "solana-sdk-ids", "solana-signature", "solana-svm-transaction", "solana-transaction", + "solana-vote-interface", "thiserror 2.0.11", ] diff --git a/vote/Cargo.toml b/vote/Cargo.toml index 9ea95b72841a95..05c6e40cf387b3 100644 --- a/vote/Cargo.toml +++ b/vote/Cargo.toml @@ -27,12 +27,12 @@ solana-frozen-abi-macro = { workspace = true, optional = true, features = [ solana-hash = { workspace = true } solana-instruction = { workspace = true } solana-packet = { workspace = true } -solana-program = { workspace = true } solana-pubkey = { workspace = true } solana-sdk-ids = { workspace = true } solana-signature = { workspace = true } solana-svm-transaction = { workspace = true } solana-transaction = { workspace = true } +solana-vote-interface = { workspace = true, features = ["bincode"] } thiserror = { workspace = true } [lib] diff --git a/vote/benches/vote_account.rs b/vote/benches/vote_account.rs index 1f2b07e29605b9..47f7c8a7881d7f 100644 --- a/vote/benches/vote_account.rs +++ b/vote/benches/vote_account.rs @@ -4,9 +4,9 @@ extern crate test; use { rand::Rng, solana_account::AccountSharedData, - solana_program::vote::state::{VoteInit, VoteState, VoteStateVersions}, solana_pubkey::Pubkey, solana_vote::vote_account::VoteAccount, + solana_vote_interface::state::{VoteInit, VoteState, VoteStateVersions}, test::Bencher, }; diff --git a/vote/src/vote_account.rs b/vote/src/vote_account.rs index 18fffa5ddf5465..b119778b2386ad 100644 --- a/vote/src/vote_account.rs +++ b/vote/src/vote_account.rs @@ -6,8 +6,8 @@ use { }, solana_account::{AccountSharedData, ReadableAccount}, solana_instruction::error::InstructionError, - solana_program::vote::state::VoteState, solana_pubkey::Pubkey, + solana_vote_interface::state::VoteState, std::{ cmp::Ordering, collections::{hash_map::Entry, HashMap}, @@ -97,7 +97,7 @@ impl VoteAccount { use { rand::Rng as _, solana_clock::Clock, - solana_program::vote::state::{VoteInit, VoteStateVersions}, + solana_vote_interface::state::{VoteInit, VoteStateVersions}, }; let mut rng = rand::thread_rng(); @@ -483,8 +483,8 @@ mod tests { rand::Rng, solana_account::WritableAccount, solana_clock::Clock, - solana_program::vote::state::{VoteInit, VoteStateVersions}, solana_pubkey::Pubkey, + solana_vote_interface::state::{VoteInit, VoteStateVersions}, std::iter::repeat_with, }; diff --git a/vote/src/vote_parser.rs b/vote/src/vote_parser.rs index b64657f268c6fe..55fc07222c12e4 100644 --- a/vote/src/vote_parser.rs +++ b/vote/src/vote_parser.rs @@ -1,8 +1,8 @@ use { crate::vote_transaction::VoteTransaction, solana_bincode::limited_deserialize, - solana_hash::Hash, solana_program::vote::instruction::VoteInstruction, solana_pubkey::Pubkey, - solana_signature::Signature, solana_svm_transaction::svm_transaction::SVMTransaction, - solana_transaction::Transaction, + solana_hash::Hash, solana_pubkey::Pubkey, solana_signature::Signature, + solana_svm_transaction::svm_transaction::SVMTransaction, solana_transaction::Transaction, + solana_vote_interface::instruction::VoteInstruction, }; pub type ParsedVote = (Pubkey, VoteTransaction, Option, Signature); @@ -82,9 +82,9 @@ mod test { super::*, solana_clock::Slot, solana_keypair::Keypair, - solana_program::vote::{instruction as vote_instruction, state::Vote}, solana_sha256_hasher::hash, solana_signer::Signer, + solana_vote_interface::{instruction as vote_instruction, state::Vote}, }; // Reimplemented locally from Vote program. diff --git a/vote/src/vote_transaction.rs b/vote/src/vote_transaction.rs index c88ea0a2f7ea35..8c6346ec371b65 100644 --- a/vote/src/vote_transaction.rs +++ b/vote/src/vote_transaction.rs @@ -1,7 +1,7 @@ use { solana_clock::{Slot, UnixTimestamp}, solana_hash::Hash, - solana_program::vote::state::{TowerSync, Vote, VoteStateUpdate}, + solana_vote_interface::state::{TowerSync, Vote, VoteStateUpdate}, }; #[derive(Debug, PartialEq, Eq, Clone)]