use highest staked node as bootstrap leader, remove bootstrap_leader from genesis_block (#4635)

* use highest staked node as bootstrap leader, remove bootstrap_leader from genesis_block

* clippy

* fixup

* fixup

runtime/src/bank.rs

@@ -345,8 +345,8 @@ impl Bank {
         bank
     }
 
-    pub fn collector_id(&self) -> Pubkey {
-        self.collector_id
+    pub fn collector_id(&self) -> &Pubkey {
+        &self.collector_id
     }
 
     pub fn slot(&self) -> u64 {
@@ -473,13 +473,19 @@ impl Bank {
 
     fn process_genesis_block(&mut self, genesis_block: &GenesisBlock) {
         // Bootstrap leader collects fees until `new_from_parent` is called.
-        self.collector_id = genesis_block.bootstrap_leader_pubkey;
         self.fee_calculator = genesis_block.fee_calculator.clone();
         self.update_fees();
 
         for (pubkey, account) in genesis_block.accounts.iter() {
             self.store(pubkey, account);
         }
+        // highest staked node is the first collector
+        self.collector_id = self
+            .stakes
+            .read()
+            .unwrap()
+            .highest_staked_node()
+            .unwrap_or_default();
 
         self.blockhash_queue
             .write()

runtime/src/genesis_utils.rs

@@ -39,7 +39,6 @@ pub fn create_genesis_block_with_leader(
     );
 
     let genesis_block = GenesisBlock::new(
-        &bootstrap_leader_pubkey,
         &[
             // the mint
             (

runtime/src/stakes.rs

@@ -3,6 +3,7 @@
 use solana_sdk::account::Account;
 use solana_sdk::pubkey::Pubkey;
 use solana_stake_api::stake_state::StakeState;
+use solana_vote_api::vote_state::VoteState;
 use std::collections::HashMap;
 
 #[derive(Default, Clone, PartialEq, Debug, Deserialize, Serialize)]
@@ -84,6 +85,14 @@ impl Stakes {
     pub fn vote_accounts(&self) -> &HashMap<Pubkey, (u64, Account)> {
         &self.vote_accounts
     }
+
+    pub fn highest_staked_node(&self) -> Option<Pubkey> {
+        self.vote_accounts
+            .iter()
+            .max_by(|(_ak, av), (_bk, bv)| av.0.cmp(&bv.0))
+            .and_then(|(_k, (_stake, account))| VoteState::from(account))
+            .map(|vote_state| vote_state.node_pubkey)
+    }
 }
 
 #[cfg(test)]
@@ -153,6 +162,29 @@ mod tests {
         }
     }
 
+    #[test]
+    fn test_stakes_highest() {
+        let mut stakes = Stakes::default();
+
+        assert_eq!(stakes.highest_staked_node(), None);
+
+        let ((vote_pubkey, vote_account), (stake_pubkey, stake_account)) =
+            create_staked_node_accounts(10);
+
+        stakes.store(&vote_pubkey, &vote_account);
+        stakes.store(&stake_pubkey, &stake_account);
+
+        let ((vote11_pubkey, vote11_account), (stake11_pubkey, stake11_account)) =
+            create_staked_node_accounts(11);
+
+        stakes.store(&vote11_pubkey, &vote11_account);
+        stakes.store(&stake11_pubkey, &stake11_account);
+
+        let vote11_node_pubkey = VoteState::from(&vote11_account).unwrap().node_pubkey;
+
+        assert_eq!(stakes.highest_staked_node(), Some(vote11_node_pubkey))
+    }
+
     #[test]
     fn test_stakes_vote_account_disappear_reappear() {
         let mut stakes = Stakes::default();