From 70cf644cc82f5d7e4388274dc41f682689deca45 Mon Sep 17 00:00:00 2001
From: buffalu <85544055+buffalu@users.noreply.github.com>
Date: Wed, 23 Aug 2023 20:02:36 -0500
Subject: [PATCH] Use cluster info functions for tpu (#345) (#347)

---
 Cargo.lock                            | 6 +++---
 core/Cargo.toml                       | 2 +-
 core/src/proxy/fetch_stage_manager.rs | 7 ++-----
 programs/sbf/Cargo.lock               | 4 ++--
 validator/src/admin_rpc_service.rs    | 1 -
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 47c22ddd7c..6acd3f8254 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2796,7 +2796,7 @@ dependencies = [
 
 [[package]]
 name = "jito-protos"
-version = "1.16.10"
+version = "1.16.13"
 dependencies = [
  "bytes",
  "prost 0.11.9",
@@ -5470,7 +5470,7 @@ dependencies = [
 
 [[package]]
 name = "solana-bundle"
-version = "1.16.10"
+version = "1.16.13"
 dependencies = [
  "assert_matches",
  "itertools",
@@ -7180,7 +7180,7 @@ dependencies = [
 
 [[package]]
 name = "solana-tip-distributor"
-version = "1.16.10"
+version = "1.16.13"
 dependencies = [
  "anchor-lang",
  "clap 4.3.19",
diff --git a/core/Cargo.toml b/core/Cargo.toml
index fd77b27ee4..6fe2aed76b 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -71,9 +71,9 @@ strum_macros = { workspace = true }
 sys-info = { workspace = true }
 tempfile = { workspace = true }
 thiserror = { workspace = true }
-tokio = { version = "~1.14.1", features = ["full"] }
 tip-distribution = { workspace = true }
 tip-payment = { workspace = true }
+tokio = { version = "~1.14.1", features = ["full"] }
 tonic = { workspace = true }
 trees = { workspace = true }
 
diff --git a/core/src/proxy/fetch_stage_manager.rs b/core/src/proxy/fetch_stage_manager.rs
index 01250ede0d..38471fc512 100644
--- a/core/src/proxy/fetch_stage_manager.rs
+++ b/core/src/proxy/fetch_stage_manager.rs
@@ -159,11 +159,8 @@ impl FetchStageManager {
         tpu_address: SocketAddr,
         tpu_forward_address: SocketAddr,
     ) -> Result<(), contact_info::Error> {
-        let mut new_contact_info = cluster_info.my_contact_info();
-        // TODO (LB): double check protocol!!!!!!
-        new_contact_info.set_tpu(tpu_address)?;
-        new_contact_info.set_tpu_forwards(tpu_forward_address)?;
-        cluster_info.set_my_contact_info(new_contact_info);
+        cluster_info.set_tpu(tpu_address)?;
+        cluster_info.set_tpu_forwards(tpu_forward_address)?;
         Ok(())
     }
 
diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
index 6546137598..19f5b33b7b 100644
--- a/programs/sbf/Cargo.lock
+++ b/programs/sbf/Cargo.lock
@@ -2406,7 +2406,7 @@ dependencies = [
 
 [[package]]
 name = "jito-protos"
-version = "1.16.10"
+version = "1.16.13"
 dependencies = [
  "bytes",
  "prost 0.11.9",
@@ -4754,7 +4754,7 @@ dependencies = [
 
 [[package]]
 name = "solana-bundle"
-version = "1.16.10"
+version = "1.16.13"
 dependencies = [
  "itertools",
  "log",
diff --git a/validator/src/admin_rpc_service.rs b/validator/src/admin_rpc_service.rs
index 4911216da2..2be51d513e 100644
--- a/validator/src/admin_rpc_service.rs
+++ b/validator/src/admin_rpc_service.rs
@@ -942,7 +942,6 @@ mod tests {
         },
         std::{
             collections::HashSet,
-            str::FromStr,
             sync::{atomic::AtomicBool, Mutex},
         },
     };