Add MEV commission getter/setter for runtime changes

martinsander00 · martinsander00 · commit bff934ee808f · 2025-09-17T00:09:22.000-05:00
- Add getMevCommission and setMevCommission RPC methods
- Share TipManager between TPU and Admin RPC for runtime updates
diff --git a/core/src/admin_rpc_post_init.rs b/core/src/admin_rpc_post_init.rs
@@ -3,6 +3,7 @@ use {
         cluster_slots_service::cluster_slots::ClusterSlots,
         proxy::{block_engine_stage::BlockEngineConfig, relayer_stage::RelayerConfig},
         repair::{outstanding_requests::OutstandingRequests, serve_repair::ShredRepairType},
+        tip_manager::TipManager,
     },
     arc_swap::ArcSwap,
     solana_gossip::{cluster_info::ClusterInfo, node::NodeMultihoming},
@@ -85,4 +86,5 @@ pub struct AdminRpcRequestMetadataPostInit {
     pub relayer_config: Arc<Mutex<RelayerConfig>>,
     pub shred_receiver_address: Arc<ArcSwap<Option<SocketAddr>>>,
     pub shred_retransmit_receiver_address: Arc<ArcSwap<Option<SocketAddr>>>,
+    pub tip_manager: Arc<Mutex<TipManager>>,
 }
diff --git a/core/src/tip_manager.rs b/core/src/tip_manager.rs
@@ -607,6 +607,16 @@ impl TipManager {
             }))
         }
     }
+
+    /// Updates the MEV commission for this tip manager
+    pub fn set_commission_bps(&mut self, new_commission_bps: u16) {
+        self.tip_distribution_account_config.commission_bps = new_commission_bps;
+    }
+
+    /// Gets the current MEV commission
+    pub fn get_commission_bps(&self) -> u16 {
+        self.tip_distribution_account_config.commission_bps
+    }
 }
 
 pub fn derive_tip_distribution_account_address(
diff --git a/core/src/tpu.rs b/core/src/tpu.rs
@@ -26,7 +26,7 @@ use {
         sigverify::TransactionSigVerifier,
         sigverify_stage::SigVerifyStage,
         staked_nodes_updater_service::StakedNodesUpdaterService,
-        tip_manager::{TipManager, TipManagerConfig},
+        tip_manager::TipManager,
         tpu_entry_notifier::TpuEntryNotifier,
         validator::{BlockProductionMethod, GeneratorConfig, TransactionStructure},
         vortexor_receiver_adapter::VortexorReceiverAdapter,
@@ -186,7 +186,7 @@ impl Tpu {
         key_notifiers: Arc<RwLock<KeyUpdaters>>,
         block_engine_config: Arc<Mutex<BlockEngineConfig>>,
         relayer_config: Arc<Mutex<RelayerConfig>>,
-        tip_manager_config: TipManagerConfig,
+        tip_manager: Arc<Mutex<TipManager>>,
         shred_receiver_address: Arc<ArcSwap<Option<SocketAddr>>>,
         preallocated_bundle_cost: u64,
     ) -> Self {
@@ -401,8 +401,6 @@ impl Tpu {
             duplicate_confirmed_slot_sender,
         );
 
-        let tip_manager = TipManager::new(tip_manager_config);
-
         let bundle_account_locker = BundleAccountLocker::default();
 
         // The tip program can't be used in BankingStage to avoid someone from stealing tips mid-slot.
@@ -416,7 +414,7 @@ impl Tpu {
             .saturating_div(10);
 
         let mut blacklisted_accounts = HashSet::new();
-        blacklisted_accounts.insert(tip_manager.tip_payment_program_id());
+        blacklisted_accounts.insert(tip_manager.lock().unwrap().tip_payment_program_id());
 
         let banking_stage = BankingStage::new_num_threads(
             block_production_method,
@@ -464,7 +462,7 @@ impl Tpu {
             replay_vote_sender,
             log_messages_bytes_limit,
             exit.clone(),
-            tip_manager,
+            tip_manager.lock().unwrap().clone(),
             bundle_account_locker,
             &block_builder_fee_info,
             prioritization_fee_cache,
diff --git a/core/src/validator.rs b/core/src/validator.rs
@@ -27,7 +27,7 @@ use {
         system_monitor_service::{
             verify_net_stats_access, SystemMonitorService, SystemMonitorStatsReportConfig,
         },
-        tip_manager::TipManagerConfig,
+        tip_manager::{TipManager, TipManagerConfig},
         tpu::{ForwardingClientOption, Tpu, TpuSockets, DEFAULT_TPU_COALESCE},
         tvu::{Tvu, TvuConfig, TvuSockets},
     },
@@ -1632,6 +1632,9 @@ impl Validator {
                 cancel_tpu_client_next,
             ))
         };
+        // Create shared TipManager for both TPU and AdminRPC
+        let shared_tip_manager = Arc::new(Mutex::new(TipManager::new(config.tip_manager_config.clone())));
+
         let tpu = Tpu::new_with_client(
             &cluster_info,
             &poh_recorder,
@@ -1687,7 +1690,7 @@ impl Validator {
             key_notifiers.clone(),
             config.block_engine_config.clone(),
             config.relayer_config.clone(),
-            config.tip_manager_config.clone(),
+            shared_tip_manager.clone(),
             config.shred_receiver_address.clone(),
             config.preallocated_bundle_cost,
         );
@@ -1728,6 +1731,7 @@ impl Validator {
             relayer_config: config.relayer_config.clone(),
             shred_receiver_address: config.shred_receiver_address.clone(),
             shred_retransmit_receiver_address: config.shred_retransmit_receiver_address.clone(),
+            tip_manager: shared_tip_manager.clone(),
         });
 
         Ok(Self {
diff --git a/validator/src/admin_rpc_service.rs b/validator/src/admin_rpc_service.rs
@@ -17,6 +17,7 @@ use {
             relayer_stage::{RelayerConfig, RelayerStage},
         },
         repair::repair_service,
+        tip_manager::TipManager,
         validator::ValidatorStartProgress,
     },
     solana_geyser_plugin_manager::GeyserPluginManagerRequest,
@@ -36,7 +37,7 @@ use {
         str::FromStr,
         sync::{
             atomic::{AtomicBool, Ordering},
-            Arc, RwLock,
+            Arc, RwLock, Mutex,
         },
         thread::{self, Builder},
         time::{Duration, SystemTime},
@@ -56,6 +57,7 @@ pub struct AdminRpcRequestMetadata {
     pub staked_nodes_overrides: Arc<RwLock<HashMap<Pubkey, u64>>>,
     pub post_init: Arc<RwLock<Option<AdminRpcRequestMetadataPostInit>>>,
     pub rpc_to_plugin_manager_sender: Option<Sender<GeyserPluginManagerRequest>>,
+    pub tip_manager: Arc<Mutex<TipManager>>,
 }
 
 impl Metadata for AdminRpcRequestMetadata {}
@@ -292,6 +294,12 @@ pub trait AdminRpc {
         meta: Self::Metadata,
         addr: String,
     ) -> Result<()>;
+
+    #[rpc(meta, name = "getMevCommission")]
+    fn get_mev_commission(&self, meta: Self::Metadata) -> Result<u16>;
+
+    #[rpc(meta, name = "setMevCommission")]
+    fn set_mev_commission(&self, meta: Self::Metadata, commission_bps: u16) -> Result<()>;
 }
 
 pub struct AdminRpcImpl;
@@ -871,6 +879,26 @@ impl AdminRpc for AdminRpcImpl {
             Ok(())
         })
     }
+
+    fn get_mev_commission(&self, meta: Self::Metadata) -> Result<u16> {
+        debug!("get_mev_commission request received");
+        let tip_manager = meta.tip_manager.lock().unwrap();
+        Ok(tip_manager.get_commission_bps())
+    }
+
+    fn set_mev_commission(&self, meta: Self::Metadata, commission_bps: u16) -> Result<()> {
+        debug!("set_mev_commission request received");
+
+        if commission_bps > 10000 {
+            return Err(jsonrpc_core::error::Error::invalid_params(
+                "Commission bps cannot be larger than 100%",
+            ))
+        }
+
+        let mut tip_manager = meta.tip_manager.lock().unwrap();
+        tip_manager.set_commission_bps(commission_bps);
+        Ok(())
+    }
 }
 
 impl AdminRpcImpl {
@@ -1070,6 +1098,7 @@ mod tests {
         solana_core::{
             admin_rpc_post_init::{KeyUpdaterType, KeyUpdaters},
             consensus::tower_storage::NullTowerStorage,
+            tip_manager::TipManagerConfig,
             validator::{Validator, ValidatorConfig, ValidatorTpuConfig},
         },
         solana_gossip::{cluster_info::ClusterInfo, node::Node},
@@ -1144,6 +1173,7 @@ mod tests {
             let relayer_config = Arc::new(Mutex::new(RelayerConfig::default()));
             let shred_receiver_address = Arc::new(ArcSwap::default());
             let shred_retransmit_receiver_address = Arc::new(ArcSwap::default());
+            let shared_tip_manager = Arc::new(Mutex::new(TipManager::new(TipManagerConfig::default())));
             let meta = AdminRpcRequestMetadata {
                 rpc_addr: None,
                 start_time: SystemTime::now(),
@@ -1170,9 +1200,11 @@ mod tests {
                     relayer_config,
                     shred_receiver_address,
                     shred_retransmit_receiver_address,
+                    tip_manager: shared_tip_manager.clone(),
                 }))),
                 staked_nodes_overrides: Arc::new(RwLock::new(HashMap::new())),
                 rpc_to_plugin_manager_sender: None,
+                tip_manager: shared_tip_manager,
             };
             let mut io = MetaIoHandler::default();
             io.extend_with(AdminRpcImpl.to_delegate());
@@ -1593,6 +1625,7 @@ mod tests {
                 post_init: post_init.clone(),
                 staked_nodes_overrides: Arc::new(RwLock::new(HashMap::new())),
                 rpc_to_plugin_manager_sender: None,
+                tip_manager: Arc::new(Mutex::new(TipManager::new(TipManagerConfig::default()))),
             };
 
             let _validator = Validator::new(
@@ -1699,4 +1732,105 @@ mod tests {
                 .expect("actual response deserialization");
         assert_eq!(actual_parsed_response, expected_parsed_response);
     }
+
+    #[test]
+    fn test_get_mev_commission() {
+        let test_validator = TestValidatorWithAdminRpc::new();
+        
+        // Test getting initial commission (should be 0 by default)
+        let request = r#"{"jsonrpc":"2.0","id":1,"method":"getMevCommission","params":[]}"#;
+        let response = test_validator.handle_request(&request);
+        let parsed_response: Value = serde_json::from_str(&response.expect("response")).expect("parse");
+        
+        // Should return 0 (default commission)
+        assert_eq!(parsed_response["result"], 0);
+        assert_eq!(parsed_response["id"], 1);
+    }
+
+    #[test]
+    fn test_set_mev_commission_valid() {
+        let test_validator = TestValidatorWithAdminRpc::new();
+        
+        // Test setting valid commission (50% = 5000 bps)
+        let request = r#"{"jsonrpc":"2.0","id":1,"method":"setMevCommission","params":[5000]}"#;
+        let response = test_validator.handle_request(&request);
+        let parsed_response: Value = serde_json::from_str(&response.expect("response")).expect("parse");
+        
+        // Should succeed
+        assert_eq!(parsed_response["result"], Value::Null);
+        assert_eq!(parsed_response["id"], 1);
+        
+        // Verify the commission was actually set by getting it
+        let get_request = r#"{"jsonrpc":"2.0","id":2,"method":"getMevCommission","params":[]}"#;
+        let get_response = test_validator.handle_request(&get_request);
+        let get_parsed: Value = serde_json::from_str(&get_response.expect("response")).expect("parse");
+        
+        assert_eq!(get_parsed["result"], 5000);
+    }
+
+    #[test]
+    fn test_set_mev_commission_max_valid() {
+        let test_validator = TestValidatorWithAdminRpc::new();
+        
+        // Test setting maximum valid commission (100% = 10000 bps)
+        let request = r#"{"jsonrpc":"2.0","id":1,"method":"setMevCommission","params":[10000]}"#;
+        let response = test_validator.handle_request(&request);
+        let parsed_response: Value = serde_json::from_str(&response.expect("response")).expect("parse");
+        
+        // Should succeed
+        assert_eq!(parsed_response["result"], Value::Null);
+        
+        // Verify it was set
+        let get_request = r#"{"jsonrpc":"2.0","id":2,"method":"getMevCommission","params":[]}"#;
+        let get_response = test_validator.handle_request(&get_request);
+        let get_parsed: Value = serde_json::from_str(&get_response.expect("response")).expect("parse");
+        
+        assert_eq!(get_parsed["result"], 10000);
+    }
+
+    #[test]
+    fn test_set_mev_commission_invalid_too_high() {
+        let test_validator = TestValidatorWithAdminRpc::new();
+        
+        // Test setting invalid commission (>100% = >10000 bps)
+        let request = r#"{"jsonrpc":"2.0","id":1,"method":"setMevCommission","params":[10001]}"#;
+        let response = test_validator.handle_request(&request);
+        let parsed_response: Value = serde_json::from_str(&response.expect("response")).expect("parse");
+        
+        // Should return error
+        assert!(parsed_response["error"].is_object());
+        assert_eq!(parsed_response["error"]["code"], -32602); // Invalid params error code
+        assert!(parsed_response["error"]["message"].as_str().unwrap().contains("Commission bps cannot be larger than 100%"));
+        
+        // Verify commission wasn't changed (should still be 0)
+        let get_request = r#"{"jsonrpc":"2.0","id":2,"method":"getMevCommission","params":[]}"#;
+        let get_response = test_validator.handle_request(&get_request);
+        let get_parsed: Value = serde_json::from_str(&get_response.expect("response")).expect("parse");
+        
+        assert_eq!(get_parsed["result"], 0);
+    }
+
+    #[test]
+    fn test_set_mev_commission_zero() {
+        let test_validator = TestValidatorWithAdminRpc::new();
+        
+        // First set to non-zero
+        let set_request = r#"{"jsonrpc":"2.0","id":1,"method":"setMevCommission","params":[2500]}"#;
+        test_validator.handle_request(&set_request);
+        
+        // Then set back to zero
+        let zero_request = r#"{"jsonrpc":"2.0","id":2,"method":"setMevCommission","params":[0]}"#;
+        let response = test_validator.handle_request(&zero_request);
+        let parsed_response: Value = serde_json::from_str(&response.expect("response")).expect("parse");
+        
+        // Should succeed
+        assert_eq!(parsed_response["result"], Value::Null);
+        
+        // Verify it was set to zero
+        let get_request = r#"{"jsonrpc":"2.0","id":3,"method":"getMevCommission","params":[]}"#;
+        let get_response = test_validator.handle_request(&get_request);
+        let get_parsed: Value = serde_json::from_str(&get_response.expect("response")).expect("parse");
+        
+        assert_eq!(get_parsed["result"], 0);
+    }
 }
diff --git a/validator/src/bin/solana-test-validator.rs b/validator/src/bin/solana-test-validator.rs
@@ -38,7 +38,7 @@ use {
         net::{IpAddr, Ipv4Addr, SocketAddr},
         path::{Path, PathBuf},
         process::exit,
-        sync::{Arc, RwLock},
+        sync::{Arc, Mutex, RwLock},
         time::{Duration, SystemTime, UNIX_EPOCH},
     },
 };
@@ -431,6 +431,7 @@ fn main() {
             post_init: admin_service_post_init,
             tower_storage: tower_storage.clone(),
             rpc_to_plugin_manager_sender,
+            tip_manager: Arc::new(Mutex::new(solana_core::tip_manager::TipManager::new(solana_core::tip_manager::TipManagerConfig::default()))),
         },
     );
     let dashboard = if output == Output::Dashboard {
diff --git a/validator/src/commands/run/execute.rs b/validator/src/commands/run/execute.rs
@@ -32,7 +32,7 @@ use {
         repair::repair_handler::RepairHandlerType,
         snapshot_packager_service::SnapshotPackagerService,
         system_monitor_service::SystemMonitorService,
-        tip_manager::{TipDistributionAccountConfig, TipManagerConfig},
+        tip_manager::{TipDistributionAccountConfig, TipManager, TipManagerConfig},
         validator::{
             is_snapshot_config_valid, BlockProductionMethod, BlockVerificationMethod,
             TransactionStructure, Validator, ValidatorConfig, ValidatorError,
@@ -748,7 +748,7 @@ pub fn execute(
         block_engine_config,
         shred_receiver_address,
         shred_retransmit_receiver_address,
-        tip_manager_config,
+        tip_manager_config: tip_manager_config.clone(),
         preallocated_bundle_cost: value_of(matches, "preallocated_bundle_cost")
             .expect("preallocated_bundle_cost set as default"),
     };
@@ -844,6 +844,7 @@ pub fn execute(
             tower_storage: validator_config.tower_storage.clone(),
             staked_nodes_overrides,
             rpc_to_plugin_manager_sender,
+            tip_manager: Arc::new(Mutex::new(TipManager::new(tip_manager_config.clone()))),
         },
     );
 

Original file line number	Diff line number	Diff line change
`@@ -607,6 +607,16 @@ impl TipManager {`
`607`	`607`	`}))`
`608`	`608`	`}`
`609`	`609`	`}`
	`610`	`+`
	`611`	`+ /// Updates the MEV commission for this tip manager`
	`612`	`+ pub fn set_commission_bps(&mut self, new_commission_bps: u16) {`
	`613`	`+ self.tip_distribution_account_config.commission_bps = new_commission_bps;`
	`614`	`+ }`
	`615`	`+`
	`616`	`+ /// Gets the current MEV commission`
	`617`	`+ pub fn get_commission_bps(&self) -> u16 {`
	`618`	`+ self.tip_distribution_account_config.commission_bps`
	`619`	`+ }`
`610`	`620`	`}`
`611`	`621`
`612`	`622`	`pub fn derive_tip_distribution_account_address(`