Pass the owner's keypair to fullnode-config

This commit is contained in:
Greg Fitzgerald
2018-07-12 17:26:56 -06:00
committed by Greg Fitzgerald
parent 77543d83ff
commit 545f4f1c87
4 changed files with 34 additions and 13 deletions

View File

@@ -6,6 +6,8 @@ use clap::{App, Arg};
use solana::crdt::{get_ip_addr, parse_port_or_addr};
use solana::fullnode::Config;
use solana::nat::get_public_ip_addr;
use solana::signature::read_pkcs8;
use std::env;
use std::io;
use std::net::SocketAddr;
@@ -18,6 +20,14 @@ fn main() {
.takes_value(false)
.help("detect network address from local machine configuration"),
)
.arg(
Arg::with_name("keypair")
.short("k")
.long("keypair")
.value_name("PATH")
.takes_value(true)
.help("/path/to/id.json"),
)
.arg(
Arg::with_name("public")
.short("p")
@@ -54,9 +64,18 @@ fn main() {
bind_addr
};
let mut path = env::home_dir().expect("home directory");
let id_path = if matches.is_present("keypair") {
matches.value_of("keypair").unwrap()
} else {
path.extend(&[".config", "solana", "id.json"]);
path.to_str().unwrap()
};
let pkcs8 = read_pkcs8(id_path).expect("client keypair");
// we need all the receiving sockets to be bound within the expected
// port range that we open on aws
let config = Config::new(&bind_addr);
let config = Config::new(&bind_addr, pkcs8);
let stdout = io::stdout();
serde_json::to_writer(stdout, &config).expect("serialize");
}