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

Add watchtower option to specify RPC timeout 

This is useful when solana-watchtower is running on slow network.
This commit is contained in:
Ivan Mironov 2022-08-07 16:00:32 +05:00 committed by Michael Vines
parent 2f40c5680e
commit 9159415e1b
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
watchtower/src/main.rs
View File

@ -31,6 +31,7 @@ struct Config {
ignore_http_bad_gateway: bool, ignore_http_bad_gateway: bool,
interval: Duration, interval: Duration,
json_rpc_url: String, json_rpc_url: String,
rpc_timeout: Duration,
minimum_validator_identity_balance: u64, minimum_validator_identity_balance: u64,
monitor_active_stake: bool, monitor_active_stake: bool,
unhealthy_threshold: usize, unhealthy_threshold: usize,
@ -81,6 +82,14 @@ fn get_config() -> Config {
.validator(is_url) .validator(is_url)
.help("JSON RPC URL for the cluster"), .help("JSON RPC URL for the cluster"),
) )
.arg(
Arg::with_name("rpc_timeout")
.long("rpc-timeout")
.value_name("SECONDS")
.takes_value(true)
.default_value("30")
.help("Timeout value for RPC requests"),
)
.arg( .arg(
Arg::with_name("interval") Arg::with_name("interval")
.long("interval") .long("interval")
@ -161,6 +170,8 @@ fn get_config() -> Config {
)); ));
let json_rpc_url = let json_rpc_url =
value_t!(matches, "json_rpc_url", String).unwrap_or_else(|_| config.json_rpc_url.clone()); value_t!(matches, "json_rpc_url", String).unwrap_or_else(|_| config.json_rpc_url.clone());
let rpc_timeout = value_t_or_exit!(matches, "rpc_timeout", u64);
let rpc_timeout = Duration::from_secs(rpc_timeout);
let validator_identity_pubkeys: Vec<_> = pubkeys_of(&matches, "validator_identities") let validator_identity_pubkeys: Vec<_> = pubkeys_of(&matches, "validator_identities")
.unwrap_or_default() .unwrap_or_default()
.into_iter() .into_iter()
@ -176,6 +187,7 @@ fn get_config() -> Config {
ignore_http_bad_gateway, ignore_http_bad_gateway,
interval, interval,
json_rpc_url, json_rpc_url,
rpc_timeout,
minimum_validator_identity_balance, minimum_validator_identity_balance,
monitor_active_stake, monitor_active_stake,
unhealthy_threshold, unhealthy_threshold,
@ -221,7 +233,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
let config = get_config(); let config = get_config();
let rpc_client = RpcClient::new(config.json_rpc_url.clone()); let rpc_client = RpcClient::new_with_timeout(config.json_rpc_url.clone(), config.rpc_timeout);
let notifier = Notifier::default(); let notifier = Notifier::default();
let mut last_transaction_count = 0; let mut last_transaction_count = 0;
let mut last_recent_blockhash = Hash::default(); let mut last_recent_blockhash = Hash::default();