removes repair socket from gossip ContactInfo (#32831)

Repair responses are sent back to the address the repair request came
from and there is no need to gossip repair socket address.
https://github.com/solana-labs/solana/blob/9212ac347/core/src/repair/serve_repair.rs#L519
This commit is contained in:
behzad nouri 2023-08-14 20:01:18 +00:00 committed by GitHub
parent ce57cac370
commit 52616cf7aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 20 additions and 31 deletions

View File

@ -28,6 +28,8 @@ cargo_audit_ignores=(
# Exception is a stopgap to unblock CI # Exception is a stopgap to unblock CI
# https://github.com/solana-labs/solana/issues/29586 # https://github.com/solana-labs/solana/issues/29586
--ignore RUSTSEC-2023-0001 --ignore RUSTSEC-2023-0001
--ignore RUSTSEC-2022-0093
) )
scripts/cargo-for-all-lock-files.sh audit "${cargo_audit_ignores[@]}" | $dep_tree_filter scripts/cargo-for-all-lock-files.sh audit "${cargo_audit_ignores[@]}" | $dep_tree_filter
# we want the `cargo audit` exit code, not `$dep_tree_filter`'s # we want the `cargo audit` exit code, not `$dep_tree_filter`'s

View File

@ -214,7 +214,7 @@ pub(crate) type Ping = ping_pong::Ping<[u8; REPAIR_PING_TOKEN_SIZE]>;
/// Window protocol messages /// Window protocol messages
#[derive(Debug, AbiEnumVisitor, AbiExample, Deserialize, Serialize, strum_macros::Display)] #[derive(Debug, AbiEnumVisitor, AbiExample, Deserialize, Serialize, strum_macros::Display)]
#[frozen_abi(digest = "DPHju3YufeNw1qfr22ZWRgJdXb1TvZt8iwLqWXUTyrtW")] #[frozen_abi(digest = "7vZyACjc13qQYWUsqWbdidLXR3uNXpmqUZaKeV3gKuY2")]
pub enum RepairProtocol { pub enum RepairProtocol {
LegacyWindowIndex(LegacyContactInfo, Slot, u64), LegacyWindowIndex(LegacyContactInfo, Slot, u64),
LegacyHighestWindowIndex(LegacyContactInfo, Slot, u64), LegacyHighestWindowIndex(LegacyContactInfo, Slot, u64),
@ -1912,7 +1912,6 @@ mod tests {
nxt.set_gossip((Ipv4Addr::LOCALHOST, 1234)).unwrap(); nxt.set_gossip((Ipv4Addr::LOCALHOST, 1234)).unwrap();
nxt.set_tvu((Ipv4Addr::LOCALHOST, 1235)).unwrap(); nxt.set_tvu((Ipv4Addr::LOCALHOST, 1235)).unwrap();
nxt.set_tvu_quic((Ipv4Addr::LOCALHOST, 1236)).unwrap(); nxt.set_tvu_quic((Ipv4Addr::LOCALHOST, 1236)).unwrap();
nxt.set_repair((Ipv4Addr::LOCALHOST, 1237)).unwrap();
nxt.set_tpu((Ipv4Addr::LOCALHOST, 1238)).unwrap(); nxt.set_tpu((Ipv4Addr::LOCALHOST, 1238)).unwrap();
nxt.set_tpu_forwards((Ipv4Addr::LOCALHOST, 1239)).unwrap(); nxt.set_tpu_forwards((Ipv4Addr::LOCALHOST, 1239)).unwrap();
nxt.set_tpu_vote((Ipv4Addr::LOCALHOST, 1240)).unwrap(); nxt.set_tpu_vote((Ipv4Addr::LOCALHOST, 1240)).unwrap();
@ -1943,7 +1942,6 @@ mod tests {
nxt.set_gossip((Ipv4Addr::LOCALHOST, 1234)).unwrap(); nxt.set_gossip((Ipv4Addr::LOCALHOST, 1234)).unwrap();
nxt.set_tvu((Ipv4Addr::LOCALHOST, 1235)).unwrap(); nxt.set_tvu((Ipv4Addr::LOCALHOST, 1235)).unwrap();
nxt.set_tvu_quic((Ipv4Addr::LOCALHOST, 1236)).unwrap(); nxt.set_tvu_quic((Ipv4Addr::LOCALHOST, 1236)).unwrap();
nxt.set_repair((Ipv4Addr::LOCALHOST, 1237)).unwrap();
nxt.set_tpu((Ipv4Addr::LOCALHOST, 1238)).unwrap(); nxt.set_tpu((Ipv4Addr::LOCALHOST, 1238)).unwrap();
nxt.set_tpu_forwards((Ipv4Addr::LOCALHOST, 1239)).unwrap(); nxt.set_tpu_forwards((Ipv4Addr::LOCALHOST, 1239)).unwrap();
nxt.set_tpu_vote((Ipv4Addr::LOCALHOST, 1240)).unwrap(); nxt.set_tpu_vote((Ipv4Addr::LOCALHOST, 1240)).unwrap();

View File

@ -448,7 +448,7 @@ fn get_target(
Mode::TpuForwards => { Mode::TpuForwards => {
Some((*node.pubkey(), node.tpu_forwards(protocol).unwrap())) Some((*node.pubkey(), node.tpu_forwards(protocol).unwrap()))
} }
Mode::Repair => Some((*node.pubkey(), node.repair().unwrap())), Mode::Repair => todo!("repair socket is not gossiped anymore!"),
Mode::ServeRepair => Some((*node.pubkey(), node.serve_repair().unwrap())), Mode::ServeRepair => Some((*node.pubkey(), node.serve_repair().unwrap())),
Mode::Rpc => None, Mode::Rpc => None,
}; };
@ -856,6 +856,9 @@ pub mod test {
}, },
); );
// TODO: Figure out how to DOS repair. Repair socket is no longer
// gossiped and cannot be obtained from a node's contact-info.
#[cfg(not(test))]
run_dos_no_client( run_dos_no_client(
&nodes, &nodes,
1, 1,

View File

@ -271,7 +271,7 @@ pub fn make_accounts_hashes_message(
pub(crate) type Ping = ping_pong::Ping<[u8; GOSSIP_PING_TOKEN_SIZE]>; pub(crate) type Ping = ping_pong::Ping<[u8; GOSSIP_PING_TOKEN_SIZE]>;
// TODO These messages should go through the gpu pipeline for spam filtering // TODO These messages should go through the gpu pipeline for spam filtering
#[frozen_abi(digest = "9eS1agTwFQxCcCWgoBYhPfEVBfXkppan1zbob5rRRu7u")] #[frozen_abi(digest = "4jtxvWyeFwfDQTTGh4yJLyukALzRNVJ9WNnCbFeJUmaS")]
#[derive(Serialize, Deserialize, Debug, AbiEnumVisitor, AbiExample)] #[derive(Serialize, Deserialize, Debug, AbiEnumVisitor, AbiExample)]
#[allow(clippy::large_enum_variant)] #[allow(clippy::large_enum_variant)]
pub(crate) enum Protocol { pub(crate) enum Protocol {
@ -824,7 +824,7 @@ impl ClusterInfo {
} }
let ip_addr = node.gossip().as_ref().map(SocketAddr::ip).ok(); let ip_addr = node.gossip().as_ref().map(SocketAddr::ip).ok();
Some(format!( Some(format!(
"{:15} {:2}| {:5} | {:44} |{:^9}| {:5}| {:5}| {:5}| {:5}| {:5}| {:5}| {:5}| {:5}| {}\n", "{:15} {:2}| {:5} | {:44} |{:^9}| {:5}| {:5}| {:5}| {:5}| {:5}| {:5}| {:5}| {}\n",
node.gossip() node.gossip()
.ok() .ok()
.filter(|addr| self.socket_addr_space.check(addr)) .filter(|addr| self.socket_addr_space.check(addr))
@ -847,7 +847,6 @@ impl ClusterInfo {
self.addr_to_string(&ip_addr, &node.tpu_forwards(contact_info::Protocol::UDP).ok()), self.addr_to_string(&ip_addr, &node.tpu_forwards(contact_info::Protocol::UDP).ok()),
self.addr_to_string(&ip_addr, &node.tvu(contact_info::Protocol::UDP).ok()), self.addr_to_string(&ip_addr, &node.tvu(contact_info::Protocol::UDP).ok()),
self.addr_to_string(&ip_addr, &node.tvu(contact_info::Protocol::QUIC).ok()), self.addr_to_string(&ip_addr, &node.tvu(contact_info::Protocol::QUIC).ok()),
self.addr_to_string(&ip_addr, &node.repair().ok()),
self.addr_to_string(&ip_addr, &node.serve_repair().ok()), self.addr_to_string(&ip_addr, &node.serve_repair().ok()),
node.shred_version(), node.shred_version(),
)) ))
@ -857,9 +856,9 @@ impl ClusterInfo {
format!( format!(
"IP Address |Age(ms)| Node identifier \ "IP Address |Age(ms)| Node identifier \
| Version |Gossip|TPUvote| TPU |TPUfwd| TVU |TVU Q |Repair|ServeR|ShredVer\n\ | Version |Gossip|TPUvote| TPU |TPUfwd| TVU |TVU Q |ServeR|ShredVer\n\
------------------+-------+----------------------------------------------\ ------------------+-------+---------------------------------------\
+---------+------+-------+------+------+------+------+------+------+--------\n\ +---------+------+-------+------+------+------+------+------+--------\n\
{}\ {}\
Nodes: {}{}{}", Nodes: {}{}{}",
nodes.join(""), nodes.join(""),
@ -2858,7 +2857,6 @@ impl Node {
set_socket!(set_gossip, gossip_addr, "gossip"); set_socket!(set_gossip, gossip_addr, "gossip");
set_socket!(set_tvu, tvu.local_addr().unwrap(), "TVU"); set_socket!(set_tvu, tvu.local_addr().unwrap(), "TVU");
set_socket!(set_tvu_quic, tvu_quic.local_addr().unwrap(), "TVU QUIC"); set_socket!(set_tvu_quic, tvu_quic.local_addr().unwrap(), "TVU QUIC");
set_socket!(set_repair, repair.local_addr().unwrap(), "repair");
set_socket!(set_tpu, tpu.local_addr().unwrap(), "TPU"); set_socket!(set_tpu, tpu.local_addr().unwrap(), "TPU");
set_socket!( set_socket!(
set_tpu_forwards, set_tpu_forwards,
@ -2930,7 +2928,7 @@ impl Node {
bind_two_in_range_with_offset(bind_ip_addr, port_range, QUIC_PORT_OFFSET).unwrap(); bind_two_in_range_with_offset(bind_ip_addr, port_range, QUIC_PORT_OFFSET).unwrap();
let (tpu_vote_port, tpu_vote) = Self::bind(bind_ip_addr, port_range); let (tpu_vote_port, tpu_vote) = Self::bind(bind_ip_addr, port_range);
let (_, retransmit_socket) = Self::bind(bind_ip_addr, port_range); let (_, retransmit_socket) = Self::bind(bind_ip_addr, port_range);
let (repair_port, repair) = Self::bind(bind_ip_addr, port_range); let (_, repair) = Self::bind(bind_ip_addr, port_range);
let (serve_repair_port, serve_repair) = Self::bind(bind_ip_addr, port_range); let (serve_repair_port, serve_repair) = Self::bind(bind_ip_addr, port_range);
let (_, broadcast) = Self::bind(bind_ip_addr, port_range); let (_, broadcast) = Self::bind(bind_ip_addr, port_range);
let (_, ancestor_hashes_requests) = Self::bind(bind_ip_addr, port_range); let (_, ancestor_hashes_requests) = Self::bind(bind_ip_addr, port_range);
@ -2955,7 +2953,6 @@ impl Node {
set_socket!(set_gossip, gossip_port, "gossip"); set_socket!(set_gossip, gossip_port, "gossip");
set_socket!(set_tvu, tvu_port, "TVU"); set_socket!(set_tvu, tvu_port, "TVU");
set_socket!(set_tvu_quic, tvu_quic_port, "TVU QUIC"); set_socket!(set_tvu_quic, tvu_quic_port, "TVU QUIC");
set_socket!(set_repair, repair_port, "repair");
set_socket!(set_tpu, tpu_port, "TPU"); set_socket!(set_tpu, tpu_port, "TPU");
set_socket!(set_tpu_forwards, tpu_forwards_port, "TPU-forwards"); set_socket!(set_tpu_forwards, tpu_forwards_port, "TPU-forwards");
set_socket!(set_tpu_vote, tpu_vote_port, "TPU-vote"); set_socket!(set_tpu_vote, tpu_vote_port, "TPU-vote");
@ -3024,7 +3021,7 @@ impl Node {
let (_, retransmit_sockets) = let (_, retransmit_sockets) =
multi_bind_in_range(bind_ip_addr, port_range, 8).expect("retransmit multi_bind"); multi_bind_in_range(bind_ip_addr, port_range, 8).expect("retransmit multi_bind");
let (repair_port, repair) = Self::bind(bind_ip_addr, port_range); let (_, repair) = Self::bind(bind_ip_addr, port_range);
let (serve_repair_port, serve_repair) = Self::bind(bind_ip_addr, port_range); let (serve_repair_port, serve_repair) = Self::bind(bind_ip_addr, port_range);
let (_, broadcast) = let (_, broadcast) =
@ -3041,7 +3038,6 @@ impl Node {
let _ = info.set_gossip((addr, gossip_port)); let _ = info.set_gossip((addr, gossip_port));
let _ = info.set_tvu((addr, tvu_port)); let _ = info.set_tvu((addr, tvu_port));
let _ = info.set_tvu_quic((addr, tvu_quic_port)); let _ = info.set_tvu_quic((addr, tvu_quic_port));
let _ = info.set_repair((addr, repair_port));
let _ = info.set_tpu(public_tpu_addr.unwrap_or_else(|| SocketAddr::new(addr, tpu_port))); let _ = info.set_tpu(public_tpu_addr.unwrap_or_else(|| SocketAddr::new(addr, tpu_port)));
let _ = info.set_tpu_forwards( let _ = info.set_tpu_forwards(
public_tpu_forwards_addr.unwrap_or_else(|| SocketAddr::new(addr, tpu_forwards_port)), public_tpu_forwards_addr.unwrap_or_else(|| SocketAddr::new(addr, tpu_forwards_port)),

View File

@ -26,7 +26,6 @@ pub const SOCKET_ADDR_UNSPECIFIED: SocketAddr =
SocketAddr::new(IpAddr::V4(Ipv4Addr::UNSPECIFIED), /*port:*/ 0u16); SocketAddr::new(IpAddr::V4(Ipv4Addr::UNSPECIFIED), /*port:*/ 0u16);
const SOCKET_TAG_GOSSIP: u8 = 0; const SOCKET_TAG_GOSSIP: u8 = 0;
const SOCKET_TAG_REPAIR: u8 = 1;
const SOCKET_TAG_RPC: u8 = 2; const SOCKET_TAG_RPC: u8 = 2;
const SOCKET_TAG_RPC_PUBSUB: u8 = 3; const SOCKET_TAG_RPC_PUBSUB: u8 = 3;
const SOCKET_TAG_SERVE_REPAIR: u8 = 4; const SOCKET_TAG_SERVE_REPAIR: u8 = 4;
@ -223,7 +222,6 @@ impl ContactInfo {
} }
get_socket!(gossip, SOCKET_TAG_GOSSIP); get_socket!(gossip, SOCKET_TAG_GOSSIP);
get_socket!(repair, SOCKET_TAG_REPAIR);
get_socket!(rpc, SOCKET_TAG_RPC); get_socket!(rpc, SOCKET_TAG_RPC);
get_socket!(rpc_pubsub, SOCKET_TAG_RPC_PUBSUB); get_socket!(rpc_pubsub, SOCKET_TAG_RPC_PUBSUB);
get_socket!(serve_repair, SOCKET_TAG_SERVE_REPAIR); get_socket!(serve_repair, SOCKET_TAG_SERVE_REPAIR);
@ -237,7 +235,6 @@ impl ContactInfo {
get_socket!(tvu, SOCKET_TAG_TVU, SOCKET_TAG_TVU_QUIC); get_socket!(tvu, SOCKET_TAG_TVU, SOCKET_TAG_TVU_QUIC);
set_socket!(set_gossip, SOCKET_TAG_GOSSIP); set_socket!(set_gossip, SOCKET_TAG_GOSSIP);
set_socket!(set_repair, SOCKET_TAG_REPAIR);
set_socket!(set_rpc, SOCKET_TAG_RPC); set_socket!(set_rpc, SOCKET_TAG_RPC);
set_socket!(set_rpc_pubsub, SOCKET_TAG_RPC_PUBSUB); set_socket!(set_rpc_pubsub, SOCKET_TAG_RPC_PUBSUB);
set_socket!(set_serve_repair, SOCKET_TAG_SERVE_REPAIR); set_socket!(set_serve_repair, SOCKET_TAG_SERVE_REPAIR);
@ -365,7 +362,6 @@ impl ContactInfo {
node.set_gossip((Ipv4Addr::LOCALHOST, 8000)).unwrap(); node.set_gossip((Ipv4Addr::LOCALHOST, 8000)).unwrap();
node.set_tvu((Ipv4Addr::LOCALHOST, 8001)).unwrap(); node.set_tvu((Ipv4Addr::LOCALHOST, 8001)).unwrap();
node.set_tvu_quic((Ipv4Addr::LOCALHOST, 8002)).unwrap(); node.set_tvu_quic((Ipv4Addr::LOCALHOST, 8002)).unwrap();
node.set_repair((Ipv4Addr::LOCALHOST, 8007)).unwrap();
node.set_tpu((Ipv4Addr::LOCALHOST, 8003)).unwrap(); // quic: 8009 node.set_tpu((Ipv4Addr::LOCALHOST, 8003)).unwrap(); // quic: 8009
node.set_tpu_forwards((Ipv4Addr::LOCALHOST, 8004)).unwrap(); // quic: 8010 node.set_tpu_forwards((Ipv4Addr::LOCALHOST, 8004)).unwrap(); // quic: 8010
node.set_tpu_vote((Ipv4Addr::LOCALHOST, 8005)).unwrap(); node.set_tpu_vote((Ipv4Addr::LOCALHOST, 8005)).unwrap();
@ -389,7 +385,6 @@ impl ContactInfo {
node.set_gossip((addr, port + 1)).unwrap(); node.set_gossip((addr, port + 1)).unwrap();
node.set_tvu((addr, port + 2)).unwrap(); node.set_tvu((addr, port + 2)).unwrap();
node.set_tvu_quic((addr, port + 3)).unwrap(); node.set_tvu_quic((addr, port + 3)).unwrap();
node.set_repair((addr, port + 4)).unwrap();
node.set_tpu((addr, port)).unwrap(); // quic: port + 6 node.set_tpu((addr, port)).unwrap(); // quic: port + 6
node.set_tpu_forwards((addr, port + 5)).unwrap(); // quic: port + 11 node.set_tpu_forwards((addr, port + 5)).unwrap(); // quic: port + 11
node.set_tpu_vote((addr, port + 7)).unwrap(); node.set_tpu_vote((addr, port + 7)).unwrap();
@ -732,7 +727,6 @@ mod tests {
} }
} }
assert_eq!(node.gossip().ok().as_ref(), sockets.get(&SOCKET_TAG_GOSSIP)); assert_eq!(node.gossip().ok().as_ref(), sockets.get(&SOCKET_TAG_GOSSIP));
assert_eq!(node.repair().ok().as_ref(), sockets.get(&SOCKET_TAG_REPAIR));
assert_eq!(node.rpc().ok().as_ref(), sockets.get(&SOCKET_TAG_RPC)); assert_eq!(node.rpc().ok().as_ref(), sockets.get(&SOCKET_TAG_RPC));
assert_eq!( assert_eq!(
node.rpc_pubsub().ok().as_ref(), node.rpc_pubsub().ok().as_ref(),
@ -817,7 +811,6 @@ mod tests {
fn cross_verify_with_legacy(node: &ContactInfo) { fn cross_verify_with_legacy(node: &ContactInfo) {
let old = LegacyContactInfo::try_from(node).unwrap(); let old = LegacyContactInfo::try_from(node).unwrap();
assert_eq!(old.gossip().unwrap(), node.gossip().unwrap()); assert_eq!(old.gossip().unwrap(), node.gossip().unwrap());
assert_eq!(old.repair().unwrap(), node.repair().unwrap());
assert_eq!(old.rpc().unwrap(), node.rpc().unwrap()); assert_eq!(old.rpc().unwrap(), node.rpc().unwrap());
assert_eq!(old.rpc_pubsub().unwrap(), node.rpc_pubsub().unwrap()); assert_eq!(old.rpc_pubsub().unwrap(), node.rpc_pubsub().unwrap());
assert_eq!(old.serve_repair().unwrap(), node.serve_repair().unwrap()); assert_eq!(old.serve_repair().unwrap(), node.serve_repair().unwrap());

View File

@ -27,8 +27,7 @@ pub struct LegacyContactInfo {
tvu: SocketAddr, tvu: SocketAddr,
/// TVU over QUIC protocol. /// TVU over QUIC protocol.
tvu_quic: SocketAddr, tvu_quic: SocketAddr,
/// address to send repair responses to unused: SocketAddr,
repair: SocketAddr,
/// transactions address /// transactions address
tpu: SocketAddr, tpu: SocketAddr,
/// address to forward unprocessed transactions to /// address to forward unprocessed transactions to
@ -124,7 +123,7 @@ impl Default for LegacyContactInfo {
gossip: socketaddr_any!(), gossip: socketaddr_any!(),
tvu: socketaddr_any!(), tvu: socketaddr_any!(),
tvu_quic: socketaddr_any!(), tvu_quic: socketaddr_any!(),
repair: socketaddr_any!(), unused: socketaddr_any!(),
tpu: socketaddr_any!(), tpu: socketaddr_any!(),
tpu_forwards: socketaddr_any!(), tpu_forwards: socketaddr_any!(),
tpu_vote: socketaddr_any!(), tpu_vote: socketaddr_any!(),
@ -144,7 +143,7 @@ impl LegacyContactInfo {
gossip: socketaddr!(Ipv4Addr::LOCALHOST, 1234), gossip: socketaddr!(Ipv4Addr::LOCALHOST, 1234),
tvu: socketaddr!(Ipv4Addr::LOCALHOST, 1235), tvu: socketaddr!(Ipv4Addr::LOCALHOST, 1235),
tvu_quic: socketaddr!(Ipv4Addr::LOCALHOST, 1236), tvu_quic: socketaddr!(Ipv4Addr::LOCALHOST, 1236),
repair: socketaddr!(Ipv4Addr::LOCALHOST, 1237), unused: socketaddr!(Ipv4Addr::LOCALHOST, 1237),
tpu: socketaddr!(Ipv4Addr::LOCALHOST, 1238), tpu: socketaddr!(Ipv4Addr::LOCALHOST, 1238),
tpu_forwards: socketaddr!(Ipv4Addr::LOCALHOST, 1239), tpu_forwards: socketaddr!(Ipv4Addr::LOCALHOST, 1239),
tpu_vote: socketaddr!(Ipv4Addr::LOCALHOST, 1240), tpu_vote: socketaddr!(Ipv4Addr::LOCALHOST, 1240),
@ -206,7 +205,6 @@ impl LegacyContactInfo {
get_socket!(gossip); get_socket!(gossip);
get_socket!(tvu, tvu_quic); get_socket!(tvu, tvu_quic);
get_socket!(repair);
get_socket!(@quic tpu); get_socket!(@quic tpu);
get_socket!(@quic tpu_forwards); get_socket!(@quic tpu_forwards);
get_socket!(tpu_vote); get_socket!(tpu_vote);
@ -274,7 +272,7 @@ impl TryFrom<&ContactInfo> for LegacyContactInfo {
gossip: unwrap_socket!(gossip), gossip: unwrap_socket!(gossip),
tvu: unwrap_socket!(tvu, Protocol::UDP), tvu: unwrap_socket!(tvu, Protocol::UDP),
tvu_quic: unwrap_socket!(tvu, Protocol::QUIC), tvu_quic: unwrap_socket!(tvu, Protocol::QUIC),
repair: unwrap_socket!(repair), unused: SOCKET_ADDR_UNSPECIFIED,
tpu: unwrap_socket!(tpu, Protocol::UDP), tpu: unwrap_socket!(tpu, Protocol::UDP),
tpu_forwards: unwrap_socket!(tpu_forwards, Protocol::UDP), tpu_forwards: unwrap_socket!(tpu_forwards, Protocol::UDP),
tpu_vote: unwrap_socket!(tpu_vote), tpu_vote: unwrap_socket!(tpu_vote),

View File

@ -72,7 +72,7 @@ pub struct AdminRpcContactInfo {
pub gossip: SocketAddr, pub gossip: SocketAddr,
pub tvu: SocketAddr, pub tvu: SocketAddr,
pub tvu_quic: SocketAddr, pub tvu_quic: SocketAddr,
pub repair: SocketAddr, pub unused: SocketAddr,
pub tpu: SocketAddr, pub tpu: SocketAddr,
pub tpu_forwards: SocketAddr, pub tpu_forwards: SocketAddr,
pub tpu_vote: SocketAddr, pub tpu_vote: SocketAddr,
@ -104,7 +104,7 @@ impl From<ContactInfo> for AdminRpcContactInfo {
gossip: unwrap_socket!(gossip), gossip: unwrap_socket!(gossip),
tvu: unwrap_socket!(tvu, Protocol::UDP), tvu: unwrap_socket!(tvu, Protocol::UDP),
tvu_quic: unwrap_socket!(tvu, Protocol::QUIC), tvu_quic: unwrap_socket!(tvu, Protocol::QUIC),
repair: unwrap_socket!(repair), unused: SOCKET_ADDR_UNSPECIFIED,
tpu: unwrap_socket!(tpu, Protocol::UDP), tpu: unwrap_socket!(tpu, Protocol::UDP),
tpu_forwards: unwrap_socket!(tpu_forwards, Protocol::UDP), tpu_forwards: unwrap_socket!(tpu_forwards, Protocol::UDP),
tpu_vote: unwrap_socket!(tpu_vote), tpu_vote: unwrap_socket!(tpu_vote),
@ -122,7 +122,6 @@ impl Display for AdminRpcContactInfo {
writeln!(f, "Gossip: {}", self.gossip)?; writeln!(f, "Gossip: {}", self.gossip)?;
writeln!(f, "TVU: {}", self.tvu)?; writeln!(f, "TVU: {}", self.tvu)?;
writeln!(f, "TVU QUIC: {}", self.tvu_quic)?; writeln!(f, "TVU QUIC: {}", self.tvu_quic)?;
writeln!(f, "Repair: {}", self.repair)?;
writeln!(f, "TPU: {}", self.tpu)?; writeln!(f, "TPU: {}", self.tpu)?;
writeln!(f, "TPU Forwards: {}", self.tpu_forwards)?; writeln!(f, "TPU Forwards: {}", self.tpu_forwards)?;
writeln!(f, "TPU Votes: {}", self.tpu_vote)?; writeln!(f, "TPU Votes: {}", self.tpu_vote)?;