Add validator-info for net/ managed nodes (#5538)

This commit is contained in:
Michael Vines 2019-08-16 11:39:58 -07:00 committed by GitHub
parent d925902b3f
commit c298474e6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 4 deletions

View File

@ -174,6 +174,9 @@ local|tar|skip)
pid=$!
oom_score_adj "$pid" 1000
waitForNodeToInit
solana-validator-info publish -u http://127.0.0.1:8899 \
bootstrap-leader/identity-keypair.json "$(hostname)" -k team/solana --force || true
;;
validator|blockstreamer)
if [[ $deployMethod != skip ]]; then
@ -207,9 +210,10 @@ local|tar|skip)
fi
fi
if [[ -f ~/solana/fullnode-identity.json ]]; then
args+=(--identity ~/solana/fullnode-identity.json)
if [[ ! -f ~/solana/fullnode-identity.json ]]; then
solana-keygen new -o ~/solana/fullnode-identity.json
fi
args+=(--identity ~/solana/fullnode-identity.json)
if [[ $airdropsEnabled != true ]]; then
args+=(--no-airdrop)
@ -275,6 +279,9 @@ local|tar|skip)
./multinode-demo/delegate-stake.sh "${args[@]}"
fi
solana-validator-info publish -u http://127.0.0.1:8899 \
~/solana/fullnode-identity.json "$(hostname)" -k team/solana --force || true
;;
replicator)
if [[ $deployMethod != skip ]]; then

View File

@ -235,7 +235,14 @@ fn main() -> Result<(), Box<dyn error::Error>> {
.help(&format!(
"Validator description, max characters: {}",
MAX_LONG_FIELD_LENGTH
)),
))
)
.arg(
Arg::with_name("force")
.long("force")
.takes_value(false)
.hidden(true) // Don't document this argument to discourage its use
.help("Override keybase username validity check"),
),
)
.subcommand(
@ -311,7 +318,14 @@ fn main() -> Result<(), Box<dyn error::Error>> {
let keys = vec![(id(), false), (validator_keypair.pubkey(), true)];
let validator_info = parse_args(&matches);
if let Some(string) = validator_info.get("keybaseUsername") {
verify_keybase(&validator_keypair.pubkey(), &string)?;
let result = verify_keybase(&validator_keypair.pubkey(), &string);
if result.is_err() {
if matches.is_present("force") {
println!("--force supplied, ignoring: {:?}", result);
} else {
result?;
}
}
}
let validator_string = serde_json::to_string(&validator_info)?;
let validator_info = ValidatorInfo {