v3.0: core: Adjust vote-storage handling (backport of #9898) (#9901)

Co-authored-by: steviez <[email protected]>
Co-authored-by: OliverNChalk <[email protected]>

Author: 3 people

core/src/banking_stage/latest_validator_vote_packet.rs

@@ -23,6 +23,7 @@ pub struct LatestValidatorVotePacket {
     vote_source: VoteSource,
     vote_pubkey: Pubkey,
     vote: Option<Arc<ImmutableDeserializedPacket>>,
+    authorized_voter_pubkey: Pubkey,
     slot: Slot,
     hash: Hash,
     timestamp: Option<UnixTimestamp>,
@@ -55,17 +56,29 @@ impl LatestValidatorVotePacket {
             Ok(vote_state_update_instruction)
                 if instruction_filter(&vote_state_update_instruction) =>
             {
-                let vote_account_index = instruction
-                    .accounts
-                    .first()
-                    .copied()
-                    .ok_or(DeserializedPacketError::VoteTransactionError)?;
-                let vote_pubkey = message
-                    .message
-                    .static_account_keys()
-                    .get(vote_account_index as usize)
-                    .copied()
-                    .ok_or(DeserializedPacketError::VoteTransactionError)?;
+                let ix_key = |offset: usize| {
+                    let index = instruction
+                        .accounts
+                        .get(offset)
+                        .copied()
+                        .ok_or(DeserializedPacketError::VoteTransactionError)?;
+                    let pubkey = message
+                        .message
+                        .static_account_keys()
+                        .get(index as usize)
+                        .copied()
+                        .ok_or(DeserializedPacketError::VoteTransactionError)?;
+                    let signed = message.message.is_signer(index as usize);
+
+                    Ok::<(Pubkey, bool), DeserializedPacketError>((pubkey, signed))
+                };
+
+                let (vote_pubkey, _) = ix_key(0)?;
+                let (authorized_voter_pubkey, authorized_voter_signed) = ix_key(1)?;
+                if !authorized_voter_signed {
+                    return Err(DeserializedPacketError::VoteTransactionError);
+                }
+
                 let slot = vote_state_update_instruction.last_voted_slot().unwrap_or(0);
                 let hash = vote_state_update_instruction.hash();
                 let timestamp = vote_state_update_instruction.timestamp();
@@ -75,6 +88,7 @@ impl LatestValidatorVotePacket {
                     slot,
                     hash,
                     vote_pubkey,
+                    authorized_voter_pubkey,
                     vote_source,
                     timestamp,
                 })
@@ -101,6 +115,10 @@ impl LatestValidatorVotePacket {
         self.vote_pubkey
     }
 
+    pub fn authorized_voter_pubkey(&self) -> Pubkey {
+        self.authorized_voter_pubkey
+    }
+
     pub fn slot(&self) -> Slot {
         self.slot
     }

core/src/banking_stage/vote_storage.rs

@@ -214,6 +214,16 @@ impl VoteStorage {
             {
                 continue;
             }
+
+            if self
+                .cached_epoch_stakes
+                .epoch_authorized_voters()
+                .get(&vote.vote_pubkey())
+                .is_none_or(|authorized| authorized != &vote.authorized_voter_pubkey())
+            {
+                continue;
+            }
+
             if let Some(vote) = self.update_latest_vote(vote, should_replenish_taken_votes) {
                 match vote.source() {
                     VoteSource::Gossip => num_dropped_gossip += 1,
@@ -344,13 +354,12 @@ mod tests {
         solana_epoch_schedule::MINIMUM_SLOTS_PER_EPOCH,
         solana_genesis_config::GenesisConfig,
         solana_hash::Hash,
-        solana_keypair::Keypair,
         solana_perf::packet::{BytesPacket, PacketFlags},
         solana_runtime::genesis_utils::{self, ValidatorVoteKeypairs},
         solana_signer::Signer,
         solana_vote::vote_transaction::new_tower_sync_transaction,
         solana_vote_program::vote_state::TowerSync,
-        std::error::Error,
+        std::{error::Error, sync::Arc},
     };
 
     fn packet_from_slots(
@@ -389,26 +398,14 @@ mod tests {
 
     #[test]
     fn test_reinsert_packets() -> Result<(), Box<dyn Error>> {
-        let node_keypair = Keypair::new();
+        let keypair = ValidatorVoteKeypairs::new_rand();
         let genesis_config =
-            genesis_utils::create_genesis_config_with_leader(100, &node_keypair.pubkey(), 200)
+            genesis_utils::create_genesis_config_with_vote_accounts(100, &[&keypair], vec![200])
                 .genesis_config;
         let (bank, _bank_forks) = Bank::new_with_bank_forks_for_tests(&genesis_config);
-        let vote_keypair = Keypair::new();
-        let mut vote = BytesPacket::from_data(
-            None,
-            new_tower_sync_transaction(
-                TowerSync::default(),
-                Hash::new_unique(),
-                &node_keypair,
-                &vote_keypair,
-                &vote_keypair,
-                None,
-            ),
-        )?;
-        vote.meta_mut().flags.set(PacketFlags::SIMPLE_VOTE_TX, true);
-
-        let mut vote_storage = VoteStorage::new_for_tests(&[vote_keypair.pubkey()]);
+
+        let vote = packet_from_slots(vec![(0, 1)], &keypair, None);
+        let mut vote_storage = VoteStorage::new(&bank);
         vote_storage.insert_batch(
             VoteSource::Tpu,
             std::iter::once(ImmutableDeserializedPacket::new(vote.as_ref())?),
@@ -421,6 +418,7 @@ mod tests {
 
         // All packets should remain in the transaction storage
         assert_eq!(1, vote_storage.len());
+
         Ok(())
     }