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

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

Browse Source
This commit is contained in:
Michael Vines
2019-08-16 11:39:58 -07:00
committed by GitHub
parent d925902b3f
commit c298474e6f
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
net/remote/remote-node.sh
View File

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

18
validator-info/src/validator_info.rs
View File

@ -235,7 +235,14 @@ fn main() -> Result<(), Box<dyn error::Error>> {
.help(&format!( .help(&format!(
"Validator description, max characters: {}", "Validator description, max characters: {}",
MAX_LONG_FIELD_LENGTH 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( .subcommand(
@ -311,7 +318,14 @@ fn main() -> Result<(), Box<dyn error::Error>> {
let keys = vec![(id(), false), (validator_keypair.pubkey(), true)]; let keys = vec![(id(), false), (validator_keypair.pubkey(), true)];
let validator_info = parse_args(&matches); let validator_info = parse_args(&matches);
if let Some(string) = validator_info.get("keybaseUsername") { 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_string = serde_json::to_string(&validator_info)?;
let validator_info = ValidatorInfo { let validator_info = ValidatorInfo {