blockworks-foundation
/
solana-with-rpc-optimizations
mirror of https://github.com/blockworks-foundation/solana-with-rpc-optimizations.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

validator: `--tpu-host-addr` -> `--public-tpu-address` (#31137)

This commit is contained in:
DimAn 2023-04-12 15:33:09 +02:00 committed by GitHub
parent 9136f80d36
commit b81b7ebf03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gossip/src/cluster_info.rs
View File

@ -3007,7 +3007,7 @@ impl Node {
gossip_addr: &SocketAddr,
port_range: PortRange,
bind_ip_addr: IpAddr,
overwrite_tpu_addr: Option<SocketAddr>,
public_tpu_addr: Option<SocketAddr>,
) -> Node {
let (gossip_port, (gossip, ip_echo)) =
Self::get_gossip_port(gossip_addr, port_range, bind_ip_addr);
@ -3061,7 +3061,7 @@ impl Node {
let _ = info.set_tvu((addr, tvu_port));
let _ = info.set_tvu_forwards((addr, tvu_forwards_port));
let _ = info.set_repair((addr, repair_port));
let _ = info.set_tpu(overwrite_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((addr, tpu_forwards_port));
let _ = info.set_tpu_vote((addr, tpu_vote_port));
let _ = info.set_serve_repair((addr, serve_repair_port));

5
validator/src/cli.rs
View File

@ -372,8 +372,9 @@ pub fn app<'a>(version: &'a str, default_args: &'a DefaultArgs) -> App<'a, 'a> {
[default: ask --entrypoint, or 127.0.0.1 when --entrypoint is not provided]"),
)
.arg(
Arg::with_name("tpu_host_addr")
.long("tpu-host-addr")
Arg::with_name("public_tpu_addr")
.long("public-tpu-address")
.alias("tpu-host-addr")
.value_name("HOST:PORT")
.takes_value(true)
.validator(solana_net_utils::is_host_port)

8
validator/src/main.rs
View File

@ -1702,9 +1702,9 @@ pub fn main() {
}),
);
let overwrite_tpu_addr = matches.value_of("tpu_host_addr").map(|tpu_addr| {
solana_net_utils::parse_host_port(tpu_addr).unwrap_or_else(|err| {
eprintln!("Failed to parse --overwrite-tpu-addr: {err}");
let public_tpu_addr = matches.value_of("public_tpu_addr").map(|public_tpu_addr| {
solana_net_utils::parse_host_port(public_tpu_addr).unwrap_or_else(|err| {
eprintln!("Failed to parse --public-tpu-address: {err}");
exit(1);
})
});
@ -1719,7 +1719,7 @@ pub fn main() {
&gossip_addr,
dynamic_port_range,
bind_address,
overwrite_tpu_addr,
public_tpu_addr,
);
if restricted_repair_only_mode {