Backport #952 to v2.3: Remove trusted relayer packets (#953)

buffalu · web-flow · commit a065951b6a07 · 2025-08-15T09:34:11.000-05:00
diff --git a/core/src/proxy/relayer_stage.rs b/core/src/proxy/relayer_stage.rs
@@ -10,7 +10,6 @@
 
 use {
     crate::{
-        banking_trace::BankingPacketSender,
         proto_packet_to_packet,
         proxy::{
             auth::{generate_auth_tokens, maybe_refresh_auth_tokens, AuthInterceptor},
@@ -79,9 +78,6 @@ pub struct RelayerConfig {
 
     /// The max tolerable age of the last heartbeat.
     pub oldest_allowed_heartbeat: Duration,
-
-    /// If set then it will be assumed the backend verified packets so signature verification will be bypassed in the validator.
-    pub trust_packets: bool,
 }
 
 pub struct RelayerStage {
@@ -97,8 +93,6 @@ impl RelayerStage {
         heartbeat_tx: Sender<HeartbeatEvent>,
         // Channel that non-trusted streamed packets are piped through.
         packet_tx: Sender<PacketBatch>,
-        // Channel that trusted streamed packets are piped through.
-        banking_packet_sender: BankingPacketSender,
         exit: Arc<AtomicBool>,
     ) -> Self {
         let thread = Builder::new()
@@ -114,7 +108,6 @@ impl RelayerStage {
                     cluster_info,
                     heartbeat_tx,
                     packet_tx,
-                    banking_packet_sender,
                     exit,
                 ));
             })
@@ -138,7 +131,6 @@ impl RelayerStage {
         cluster_info: Arc<ClusterInfo>,
         heartbeat_tx: Sender<HeartbeatEvent>,
         packet_tx: Sender<PacketBatch>,
-        banking_packet_sender: BankingPacketSender,
         exit: Arc<AtomicBool>,
     ) {
         const CONNECTION_TIMEOUT: Duration = Duration::from_secs(CONNECTION_TIMEOUT_S);
@@ -163,7 +155,6 @@ impl RelayerStage {
                 &cluster_info,
                 &heartbeat_tx,
                 &packet_tx,
-                &banking_packet_sender,
                 &exit,
                 &CONNECTION_TIMEOUT,
             )
@@ -195,7 +186,6 @@ impl RelayerStage {
         cluster_info: &Arc<ClusterInfo>,
         heartbeat_tx: &Sender<HeartbeatEvent>,
         packet_tx: &Sender<PacketBatch>,
-        banking_packet_sender: &BankingPacketSender,
         exit: &Arc<AtomicBool>,
         connection_timeout: &Duration,
     ) -> crate::proxy::Result<()> {
@@ -261,7 +251,6 @@ impl RelayerStage {
             relayer_client,
             heartbeat_tx,
             packet_tx,
-            banking_packet_sender,
             local_relayer_config,
             global_relayer_config,
             exit,
@@ -280,7 +269,6 @@ impl RelayerStage {
         mut client: RelayerClient<InterceptedService<Channel, AuthInterceptor>>,
         heartbeat_tx: &Sender<HeartbeatEvent>,
         packet_tx: &Sender<PacketBatch>,
-        banking_packet_sender: &BankingPacketSender,
         local_config: &RelayerConfig, // local copy of config with current connections
         global_config: &Arc<Mutex<RelayerConfig>>, // guarded reference for detecting run-time updates
         exit: &Arc<AtomicBool>,
@@ -332,7 +320,6 @@ impl RelayerStage {
             packet_tx,
             local_config,
             global_config,
-            banking_packet_sender,
             exit,
             auth_client,
             access_token,
@@ -352,7 +339,6 @@ impl RelayerStage {
         packet_tx: &Sender<PacketBatch>,
         local_config: &RelayerConfig, // local copy of config with current connections
         global_config: &Arc<Mutex<RelayerConfig>>, // guarded reference for detecting run-time updates
-        banking_packet_sender: &BankingPacketSender,
         exit: &Arc<AtomicBool>,
         mut auth_client: AuthServiceClient<Channel>,
         access_token: Arc<Mutex<Token>>,
@@ -379,7 +365,7 @@ impl RelayerStage {
             tokio::select! {
                 maybe_msg = packet_stream.message() => {
                     let resp = maybe_msg?.ok_or(ProxyError::GrpcStreamDisconnected)?;
-                    Self::handle_relayer_packets(resp, heartbeat_event, heartbeat_tx, &mut last_heartbeat_ts, packet_tx, local_config.trust_packets, banking_packet_sender, &mut relayer_stats)?;
+                    Self::handle_relayer_packets(resp, heartbeat_event, heartbeat_tx, &mut last_heartbeat_ts, packet_tx, &mut relayer_stats)?;
                 }
                 _ = heartbeat_check_interval.tick() => {
                     if last_heartbeat_ts.elapsed() > local_config.oldest_allowed_heartbeat {
@@ -443,8 +429,6 @@ impl RelayerStage {
         heartbeat_tx: &Sender<HeartbeatEvent>,
         last_heartbeat_ts: &mut Instant,
         packet_tx: &Sender<PacketBatch>,
-        trust_packets: bool,
-        banking_packet_sender: &BankingPacketSender,
         relayer_stats: &mut RelayerStageStats,
     ) -> crate::proxy::Result<()> {
         match subscribe_packets_resp.msg {
@@ -469,15 +453,9 @@ impl RelayerStage {
                     .num_packets
                     .add_assign(packet_batch.len() as u64);
 
-                if trust_packets {
-                    banking_packet_sender
-                        .send(Arc::new(vec![packet_batch]))
-                        .map_err(|_| ProxyError::PacketForwardError)?;
-                } else {
-                    packet_tx
-                        .send(packet_batch)
-                        .map_err(|_| ProxyError::PacketForwardError)?;
-                }
+                packet_tx
+                    .send(packet_batch)
+                    .map_err(|_| ProxyError::PacketForwardError)?;
             }
             Some(relayer::subscribe_packets_response::Msg::Heartbeat(_)) => {
                 relayer_stats.num_heartbeats.add_assign(1);
diff --git a/core/src/tpu.rs b/core/src/tpu.rs
@@ -340,7 +340,6 @@ impl Tpu {
             cluster_info.clone(),
             heartbeat_tx,
             sigverify_stage_sender,
-            banking_stage_sender,
             exit.clone(),
         );
 
diff --git a/validator/src/admin_rpc_service.rs b/validator/src/admin_rpc_service.rs
@@ -275,7 +275,6 @@ pub trait AdminRpc {
         &self,
         meta: Self::Metadata,
         relayer_url: String,
-        trust_packets: bool,
         expected_heartbeat_interval_ms: u64,
         max_failed_heartbeats: u64,
     ) -> Result<()>;
@@ -583,7 +582,6 @@ impl AdminRpc for AdminRpcImpl {
         &self,
         meta: Self::Metadata,
         relayer_url: String,
-        trust_packets: bool,
         expected_heartbeat_interval_ms: u64,
         max_failed_heartbeats: u64,
     ) -> Result<()> {
@@ -595,7 +593,6 @@ impl AdminRpc for AdminRpcImpl {
             relayer_url,
             expected_heartbeat_interval,
             oldest_allowed_heartbeat,
-            trust_packets,
         };
         // Detailed log messages are printed inside validate function
         if RelayerStage::is_valid_relayer_config(&config) {
diff --git a/validator/src/cli.rs b/validator/src/cli.rs
@@ -338,6 +338,14 @@ fn deprecated_arguments() -> Vec<DeprecatedArg> {
             \"file\" will be become the sole behavior",
     );
 
+    add_arg!(
+        Arg::with_name("trust_relayer_packets")
+            .long("trust-relayer-packets")
+            .takes_value(false)
+            .help("(DEPRECATED): Not used anymore."),
+        usage_warning: "The trust_relayer_packets argument is obsolete",
+    );
+
     res
 }
 
diff --git a/validator/src/commands/relayer/mod.rs b/validator/src/commands/relayer/mod.rs
@@ -15,12 +15,6 @@ pub fn command(default_args: &DefaultArgs) -> App<'_, '_> {
                 .takes_value(true)
                 .required(true)
         )
-        .arg(
-            Arg::with_name("trust_relayer_packets")
-                .long("trust-relayer-packets")
-                .takes_value(false)
-                .help("Skip signature verification on relayer packets. Not recommended unless the relayer is trusted.")
-        )
         .arg(
             Arg::with_name("relayer_expected_heartbeat_interval_ms")
                 .long("relayer-expected-heartbeat-interval-ms")
@@ -41,7 +35,6 @@ pub fn command(default_args: &DefaultArgs) -> App<'_, '_> {
 
 pub fn execute(subcommand_matches: &ArgMatches, ledger_path: &Path) -> Result<()> {
     let relayer_url = value_t_or_exit!(subcommand_matches, "relayer_url", String);
-    let trust_packets = subcommand_matches.is_present("trust_relayer_packets");
     let expected_heartbeat_interval_ms: u64 =
         value_of(subcommand_matches, "relayer_expected_heartbeat_interval_ms").unwrap();
     let max_failed_heartbeats: u64 =
@@ -52,7 +45,6 @@ pub fn execute(subcommand_matches: &ArgMatches, ledger_path: &Path) -> Result<()
             .await?
             .set_relayer_config(
                 relayer_url,
-                trust_packets,
                 expected_heartbeat_interval_ms,
                 max_failed_heartbeats,
             )
diff --git a/validator/src/commands/run/args.rs b/validator/src/commands/run/args.rs
@@ -1637,12 +1637,6 @@ pub fn add_args<'a>(app: App<'a, 'a>, default_args: &'a DefaultArgs) -> App<'a,
             .help("Relayer url. Set to empty string to disable relayer connection.")
             .takes_value(true)
     )
-    .arg(
-        Arg::with_name("trust_relayer_packets")
-            .long("trust-relayer-packets")
-            .takes_value(false)
-            .help("Skip signature verification on relayer packets. Not recommended unless the relayer is trusted.")
-    )
     .arg(
         Arg::with_name("relayer_expected_heartbeat_interval_ms")
             .long("relayer-expected-heartbeat-interval-ms")
diff --git a/validator/src/commands/run/execute.rs b/validator/src/commands/run/execute.rs
@@ -665,7 +665,6 @@ pub fn execute(
         oldest_allowed_heartbeat: Duration::from_millis(
             max_failed_heartbeats * expected_heartbeat_interval_ms,
         ),
-        trust_packets: matches.is_present("trust_relayer_packets"),
     }));
 
     let shred_receiver_address =
