Remove duplicate vote transaction (anza-xyz#4732)

carllin · web-flow · commit d71b1697f6ce · 2025-02-11T20:24:00.000-05:00
Move VoteTransaction to vote crate
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/benches/banking_stage.rs b/core/benches/banking_stage.rs
@@ -7,7 +7,8 @@ use {
         banking_trace::Channels,
         validator::{BlockProductionMethod, TransactionStructure},
     },
-    solana_vote_program::{vote_state::TowerSync, vote_transaction::new_tower_sync_transaction},
+    solana_vote::vote_transaction::new_tower_sync_transaction,
+    solana_vote_program::vote_state::TowerSync,
 };
 
 extern crate test;
diff --git a/core/src/banking_stage.rs b/core/src/banking_stage.rs
@@ -888,9 +888,8 @@ mod tests {
             transaction::{SanitizedTransaction, Transaction},
         },
         solana_streamer::socket::SocketAddrSpace,
-        solana_vote_program::{
-            vote_state::TowerSync, vote_transaction::new_tower_sync_transaction,
-        },
+        solana_vote::vote_transaction::new_tower_sync_transaction,
+        solana_vote_program::vote_state::TowerSync,
         std::{
             sync::atomic::{AtomicBool, Ordering},
             thread::sleep,
diff --git a/core/src/banking_stage/latest_unprocessed_votes.rs b/core/src/banking_stage/latest_unprocessed_votes.rs
@@ -532,9 +532,8 @@ mod tests {
             epoch_schedule::MINIMUM_SLOTS_PER_EPOCH, genesis_config::GenesisConfig, hash::Hash,
             signature::Signer, system_transaction::transfer,
         },
-        solana_vote_program::{
-            vote_state::TowerSync, vote_transaction::new_tower_sync_transaction,
-        },
+        solana_vote::vote_transaction::new_tower_sync_transaction,
+        solana_vote_program::vote_state::TowerSync,
         std::{sync::Arc, thread::Builder},
     };
 
diff --git a/core/src/banking_stage/qos_service.rs b/core/src/banking_stage/qos_service.rs
@@ -618,7 +618,8 @@ mod tests {
             signature::{Keypair, Signer},
             system_transaction,
         },
-        solana_vote_program::{vote_state::TowerSync, vote_transaction},
+        solana_vote::vote_transaction,
+        solana_vote_program::vote_state::TowerSync,
         std::sync::Arc,
     };
 
diff --git a/core/src/banking_stage/unprocessed_packet_batches.rs b/core/src/banking_stage/unprocessed_packet_batches.rs
@@ -305,7 +305,8 @@ mod tests {
             system_instruction, system_transaction,
             transaction::Transaction,
         },
-        solana_vote_program::{vote_state::TowerSync, vote_transaction},
+        solana_vote::vote_transaction,
+        solana_vote_program::vote_state::TowerSync,
     };
 
     fn simple_deserialized_packet() -> DeserializedPacket {
diff --git a/core/src/banking_stage/unprocessed_transaction_storage.rs b/core/src/banking_stage/unprocessed_transaction_storage.rs
@@ -1005,9 +1005,8 @@ mod tests {
             system_transaction,
             transaction::Transaction,
         },
-        solana_vote_program::{
-            vote_state::TowerSync, vote_transaction::new_tower_sync_transaction,
-        },
+        solana_vote::vote_transaction::new_tower_sync_transaction,
+        solana_vote_program::vote_state::TowerSync,
         std::error::Error,
     };
 
diff --git a/core/src/cluster_info_vote_listener.rs b/core/src/cluster_info_vote_listener.rs
@@ -749,10 +749,8 @@ mod tests {
             pubkey::Pubkey,
             signature::{Keypair, Signature, Signer},
         },
-        solana_vote_program::{
-            vote_state::{TowerSync, Vote, MAX_LOCKOUT_HISTORY},
-            vote_transaction,
-        },
+        solana_vote::vote_transaction,
+        solana_vote_program::vote_state::{TowerSync, Vote, MAX_LOCKOUT_HISTORY},
         std::{
             collections::BTreeSet,
             iter::repeat_with,
diff --git a/core/src/commitment_service.rs b/core/src/commitment_service.rs
@@ -273,12 +273,9 @@ mod tests {
         },
         solana_sdk::{account::Account, pubkey::Pubkey, signature::Signer},
         solana_stake_program::stake_state,
-        solana_vote_program::{
-            vote_state::{
-                self, process_slot_vote_unchecked, TowerSync, VoteStateVersions,
-                MAX_LOCKOUT_HISTORY,
-            },
-            vote_transaction,
+        solana_vote::vote_transaction,
+        solana_vote_program::vote_state::{
+            self, process_slot_vote_unchecked, TowerSync, VoteStateVersions, MAX_LOCKOUT_HISTORY,
         },
     };
 
diff --git a/core/src/consensus.rs b/core/src/consensus.rs
@@ -34,13 +34,13 @@ use {
         signature::Keypair,
         slot_history::{Check, SlotHistory},
     },
-    solana_vote::vote_account::VoteAccountsHashMap,
+    solana_vote::{vote_account::VoteAccountsHashMap, vote_transaction::VoteTransaction},
     solana_vote_program::{
         vote_error::VoteError,
         vote_instruction,
         vote_state::{
             process_slot_vote_unchecked, BlockTimestamp, Lockout, TowerSync, Vote,
-            VoteState1_14_11, VoteStateUpdate, VoteTransaction, MAX_LOCKOUT_HISTORY,
+            VoteState1_14_11, VoteStateUpdate, MAX_LOCKOUT_HISTORY,
         },
     },
     std::{
diff --git a/core/src/consensus/tower1_14_11.rs b/core/src/consensus/tower1_14_11.rs
@@ -1,15 +1,14 @@
 use {
     crate::consensus::{BlockhashStatus, SwitchForkDecision},
     solana_sdk::{clock::Slot, pubkey::Pubkey},
-    solana_vote_program::vote_state::{
-        vote_state_1_14_11::VoteState1_14_11, BlockTimestamp, VoteTransaction,
-    },
+    solana_vote::vote_transaction::VoteTransaction,
+    solana_vote_program::vote_state::{vote_state_1_14_11::VoteState1_14_11, BlockTimestamp},
 };
 
 #[cfg_attr(
     feature = "frozen-abi",
     derive(AbiExample),
-    frozen_abi(digest = "6Z9SDTJAihx2mVbdcifTvNN96keT4DyJ9BKGazgVUkzD")
+    frozen_abi(digest = "CV9vH427g44yTRqdcCMB8ZToWbm19enEd87x7Fif9JNf")
 )]
 #[derive(Clone, Serialize, Deserialize, Debug, PartialEq)]
 pub struct Tower1_14_11 {
diff --git a/core/src/consensus/tower_storage.rs b/core/src/consensus/tower_storage.rs
@@ -381,9 +381,9 @@ pub mod test {
             BlockhashStatus, Tower,
         },
         solana_sdk::{hash::Hash, signature::Keypair},
+        solana_vote::vote_transaction::VoteTransaction,
         solana_vote_program::vote_state::{
-            BlockTimestamp, LandedVote, Vote, VoteState, VoteState1_14_11, VoteTransaction,
-            MAX_LOCKOUT_HISTORY,
+            BlockTimestamp, LandedVote, Vote, VoteState, VoteState1_14_11, MAX_LOCKOUT_HISTORY,
         },
         tempfile::TempDir,
     };
diff --git a/core/src/replay_stage.rs b/core/src/replay_stage.rs
@@ -77,7 +77,7 @@ use {
         transaction::Transaction,
     },
     solana_timings::ExecuteTimings,
-    solana_vote_program::vote_state::VoteTransaction,
+    solana_vote::vote_transaction::VoteTransaction,
     std::{
         collections::{HashMap, HashSet},
         num::NonZeroUsize,
@@ -4331,10 +4331,8 @@ pub(crate) mod tests {
         solana_streamer::socket::SocketAddrSpace,
         solana_tpu_client::tpu_client::{DEFAULT_TPU_CONNECTION_POOL_SIZE, DEFAULT_VOTE_USE_QUIC},
         solana_transaction_status::VersionedTransactionWithStatusMeta,
-        solana_vote_program::{
-            vote_state::{self, TowerSync, VoteStateVersions},
-            vote_transaction,
-        },
+        solana_vote::vote_transaction,
+        solana_vote_program::vote_state::{self, TowerSync, VoteStateVersions},
         std::{
             fs::remove_dir_all,
             iter,
diff --git a/core/src/vote_simulator.rs b/core/src/vote_simulator.rs
@@ -26,10 +26,8 @@ use {
         },
     },
     solana_sdk::{clock::Slot, hash::Hash, pubkey::Pubkey, signature::Signer},
-    solana_vote_program::{
-        vote_state::{process_vote_unchecked, Lockout, TowerSync},
-        vote_transaction,
-    },
+    solana_vote::vote_transaction,
+    solana_vote_program::vote_state::{process_vote_unchecked, Lockout, TowerSync},
     std::{
         collections::{HashMap, HashSet, VecDeque},
         sync::{Arc, RwLock},
diff --git a/cost-model/Cargo.toml b/cost-model/Cargo.toml
@@ -40,6 +40,7 @@ solana-svm-transaction = { workspace = true }
 solana-system-interface = { workspace = true }
 solana-transaction = { workspace = true, optional = true }
 solana-transaction-error = { workspace = true }
+solana-vote = { workspace = true }
 solana-vote-program = { workspace = true }
 
 [lib]
diff --git a/cost-model/src/transaction_cost.rs b/cost-model/src/transaction_cost.rs
@@ -298,7 +298,8 @@ mod tests {
         solana_reserved_account_keys::ReservedAccountKeys,
         solana_runtime_transaction::runtime_transaction::RuntimeTransaction,
         solana_transaction::{sanitized::MessageHash, versioned::VersionedTransaction},
-        solana_vote_program::{vote_state::TowerSync, vote_transaction},
+        solana_vote::vote_transaction,
+        solana_vote_program::vote_state::TowerSync,
     };
 
     #[test]
diff --git a/gossip/src/crds_value.rs b/gossip/src/crds_value.rs
@@ -251,7 +251,8 @@ mod test {
             timing::timestamp,
             vote::state::TowerSync,
         },
-        solana_vote_program::{vote_state::Lockout, vote_transaction::new_tower_sync_transaction},
+        solana_vote::vote_transaction::new_tower_sync_transaction,
+        solana_vote_program::vote_state::Lockout,
         std::str::FromStr,
     };
 
diff --git a/ledger/src/blockstore_processor.rs b/ledger/src/blockstore_processor.rs
@@ -2411,11 +2411,10 @@ pub mod tests {
             transaction_processing_result::ProcessedTransaction,
             transaction_processor::ExecutionRecordingConfig,
         },
-        solana_vote::vote_account::VoteAccount,
+        solana_vote::{vote_account::VoteAccount, vote_transaction},
         solana_vote_program::{
             self,
             vote_state::{TowerSync, VoteState, VoteStateVersions, MAX_LOCKOUT_HISTORY},
-            vote_transaction,
         },
         std::{collections::BTreeSet, slice, sync::RwLock},
         test_case::{test_case, test_matrix},
diff --git a/local-cluster/src/cluster_tests.rs b/local-cluster/src/cluster_tests.rs
@@ -37,8 +37,8 @@ use {
     },
     solana_streamer::socket::SocketAddrSpace,
     solana_tpu_client::tpu_client::{TpuClient, TpuClientConfig, TpuSenderError},
-    solana_vote::vote_transaction::VoteTransaction,
-    solana_vote_program::{vote_state::TowerSync, vote_transaction},
+    solana_vote::vote_transaction::{self, VoteTransaction},
+    solana_vote_program::vote_state::TowerSync,
     std::{
         collections::{HashMap, HashSet, VecDeque},
         net::{SocketAddr, TcpListener},
diff --git a/local-cluster/tests/local_cluster.rs b/local-cluster/tests/local_cluster.rs
@@ -83,8 +83,8 @@ use {
         broadcast_duplicates_run::{BroadcastDuplicatesConfig, ClusterPartition},
         BroadcastStageType,
     },
-    solana_vote::vote_parser,
-    solana_vote_program::{vote_state::MAX_LOCKOUT_HISTORY, vote_transaction},
+    solana_vote::{vote_parser, vote_transaction},
+    solana_vote_program::vote_state::MAX_LOCKOUT_HISTORY,
     std::{
         collections::{BTreeSet, HashMap, HashSet},
         fs,
diff --git a/perf/Cargo.toml b/perf/Cargo.toml
@@ -43,6 +43,7 @@ solana-system-interface = { workspace = true, optional = true }
 solana-system-transaction = { workspace = true, optional = true }
 solana-time-utils = { workspace = true }
 solana-transaction = { workspace = true, optional = true }
+solana-vote = { workspace = true, optional = true }
 solana-vote-program = { workspace = true, optional = true }
 
 [target."cfg(target_os = \"linux\")".dependencies]
@@ -69,6 +70,7 @@ dev-context-only-utils = [
     "dep:solana-system-transaction",
     "dep:solana-transaction",
     "dep:solana-vote-program",
+    "dep:solana-vote",
 ]
 frozen-abi = [
     "dep:solana-frozen-abi",
diff --git a/perf/src/test_tx.rs b/perf/src/test_tx.rs
@@ -8,7 +8,8 @@ use {
     solana_signer::Signer,
     solana_system_interface::instruction::SystemInstruction,
     solana_transaction::Transaction,
-    solana_vote_program::{vote_state::TowerSync, vote_transaction},
+    solana_vote::vote_transaction,
+    solana_vote_program::vote_state::TowerSync,
 };
 
 pub fn test_tx() -> Transaction {
diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/programs/vote/src/lib.rs b/programs/vote/src/lib.rs
@@ -2,13 +2,11 @@
 
 pub mod vote_processor;
 pub mod vote_state;
-pub mod vote_transaction;
 
 #[cfg_attr(feature = "metrics", macro_use)]
 #[cfg(feature = "metrics")]
 extern crate solana_metrics;
 
-#[cfg_attr(feature = "frozen-abi", macro_use)]
 #[cfg(feature = "frozen-abi")]
 extern crate solana_frozen_abi_macro;
 
diff --git a/programs/vote/src/vote_state/mod.rs b/programs/vote/src/vote_state/mod.rs
diff --git a/programs/vote/src/vote_transaction.rs b/programs/vote/src/vote_transaction.rs
diff --git a/runtime/src/bank/partitioned_epoch_rewards/mod.rs b/runtime/src/bank/partitioned_epoch_rewards/mod.rs
diff --git a/svm/examples/Cargo.lock b/svm/examples/Cargo.lock
diff --git a/vote/Cargo.toml b/vote/Cargo.toml
diff --git a/vote/src/lib.rs b/vote/src/lib.rs
diff --git a/vote/src/vote_transaction.rs b/vote/src/vote_transaction.rs
diff --git a/wen-restart/Cargo.toml b/wen-restart/Cargo.toml
diff --git a/wen-restart/src/wen_restart.rs b/wen-restart/src/wen_restart.rs
