gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

validator: Trusted validators are now called known validators

Browse Source
This commit is contained in:
Trent Nelson
2021-08-17 22:17:46 -06:00
committed by Trent Nelson
parent 169ded9a70
commit e0bc5fa690
8 changed files with 56 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
validator/src/main.rs
View File

@ -462,7 +462,7 @@ fn get_rpc_node(
.count();
info!(
"Total {} RPC nodes found. {} trusted, {} blacklisted ",
"Total {} RPC nodes found. {} known, {} blacklisted ",
rpc_peers_total, rpc_peers_trusted, rpc_peers_blacklisted
);
@ -475,7 +475,7 @@ fn get_rpc_node(
blacklisted_rpc_nodes.clear();
Some("Blacklist timeout expired".to_owned())
} else {
Some("Wait for trusted rpc peers".to_owned())
Some("Wait for known rpc peers".to_owned())
};
continue;
}
@ -937,11 +937,12 @@ fn rpc_bootstrap(
&& trusted_validators.len() == 1
&& bootstrap_config.no_untrusted_rpc {
warn!("The snapshot download is too slow, throughput: {} < min speed {} bytes/sec, but will NOT abort \
and try a different node as it is the only trusted validator and the no-untrusted-rpc is set. \
and try a different node as it is the only known validator and the --only-known-rpc flag \
is set. \
Abort count: {}, Progress detail: {:?}",
download_progress.last_throughput, minimal_snapshot_download_speed,
download_abort_count, download_progress);
return true; // Do not abort download from the one-and-only trusted validator
return true; // Do not abort download from the one-and-only known validator
}
}
warn!("The snapshot download is too slow, throughput: {} < min speed {} bytes/sec, will abort \
@ -1258,10 +1259,10 @@ pub fn main() {
.value_name("SLOT_DISTANCE")
.takes_value(true)
.default_value("150")
.help("If --trusted-validators are specified, report this validator healthy \
.help("If --known-validators are specified, report this validator healthy \
if its latest account hash is no further behind than this number of \
slots from the latest trusted validator account hash. \
If no --trusted-validators are specified, the validator will always \
slots from the latest known validator account hash. \
If no --known-validators are specified, the validator will always \
report itself to be healthy")
)
.arg(
@ -1555,7 +1556,8 @@ pub fn main() {
)
.arg(
Arg::with_name("trusted_validators")
.long("trusted-validator")
.alias("trusted-validator")
.long("known-validator")
.validator(is_pubkey)
.value_name("VALIDATOR IDENTITY")
.multiple(true)
@ -1574,9 +1576,10 @@ pub fn main() {
)
.arg(
Arg::with_name("no_untrusted_rpc")
.long("no-untrusted-rpc")
.alias("no-untrusted-rpc")
.long("only-known-rpc")
.takes_value(false)
.help("Use the RPC service of trusted validators only")
.help("Use the RPC service of known validators only")
)
.arg(
Arg::with_name("repair_validators")
@ -1744,10 +1747,11 @@ pub fn main() {
)
.arg(
Arg::with_name("halt_on_trusted_validators_accounts_hash_mismatch")
.long("halt-on-trusted-validators-accounts-hash-mismatch")
.alias("halt-on-trusted-validators-accounts-hash-mismatch")
.long("halt-on-known-validators-accounts-hash-mismatch")
.requires("trusted_validators")
.takes_value(false)
.help("Abort the validator if a bank hash mismatch is detected within trusted validator set"),
.help("Abort the validator if a bank hash mismatch is detected within known validator set"),
)
.arg(
Arg::with_name("frozen_accounts")
@ -2282,7 +2286,7 @@ pub fn main() {
&identity_keypair.pubkey(),
&matches,
"trusted_validators",
"--trusted-validator",
"--known-validator",
);
let repair_validators = validators_set(
&identity_keypair.pubkey(),