creating2morrow/neveko
1
0
Fork 0
mirror of https://github.com/creating2morrow/neveko.git synced 2025-01-03 09:29:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix args for i2p monero remote node

Browse source
This commit is contained in:
creating2morrow 2023-06-23 16:51:51 -04:00
parent 6c8db495b2
commit c9213c8d2e
2 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
docs/index.txt
View file

@ -31,6 +31,9 @@ B -> http://c2m66oddrzozztxyzjegbdwtgbeiibq5vz2tpchmqamrzcahcfoq.b32.i2p
- /download/neveko-x86_64-linux-gnu-v0.4.3-alpha.tar.bz2 - latest neveko download - /download/neveko-x86_64-linux-gnu-v0.4.3-alpha.tar.bz2 - latest neveko download
- /download/neveko-x86_64-linux-gnu-v0.4.3-alpha.tar.bz2.sig - detached sig - /download/neveko-x86_64-linux-gnu-v0.4.3-alpha.tar.bz2.sig - detached sig
# Monero remote node (stagenet)
xmr3kaacphwkk4z2gp35bdl47lrrnzimmyqj4oliauqrjzqecofa.b32.i2p
NEVEKO Links (Clear) NEVEKO Links (Clear)
# Github # Github
@ -38,9 +41,9 @@ NEVEKO Links (Clear)
git clone https://github.com/creating2morrow/neveko.git git clone https://github.com/creating2morrow/neveko.git
-----BEGIN PGP SIGNATURE----- -----BEGIN PGP SIGNATURE-----
iJIEARYKADoWIQQEoRcoLQbE3ctKJgFaPK5QG49jTAUCZJQ+DRwcY3JlYXRpbmdf iJIEARYKADoWIQQEoRcoLQbE3ctKJgFaPK5QG49jTAUCZJXzkxwcY3JlYXRpbmdf
dG9tb3Jyb3dAcHJvdG9uLm1lAAoJEFo8rlAbj2NMbdgA/RwFjSOMYbhhrVv6nSEZ dG9tb3Jyb3dAcHJvdG9uLm1lAAoJEFo8rlAbj2NMn+EBAN2vhrS+ndb2aS2QpGe7
HdbiWc8hwIEjWUltrkNG3ZtWAP48a4hXzmPelJbpQvvxRm7HbbC0JdkOgtB+5o0G doQtGzzMV5Zk8kKocZVHD92EAQDa+WbGmZSqAic9PpWGwpEqGj2GcNC+mvtcGyaP
5GRGAg== zn8qCg==
=BWhs =HMN/
-----END PGP SIGNATURE----- -----END PGP SIGNATURE-----

17
neveko-core/src/monero.rs
View file

@ -191,20 +191,27 @@ pub fn start_daemon() {
/// Start monero-wallet-rpc /// Start monero-wallet-rpc
pub fn start_rpc() { pub fn start_rpc() {
info!("starting monero-wallet-rpc"); info!("starting monero-wallet-rpc");
let cli_args = args::Args::parse();
let bin_dir = get_monero_location(); let bin_dir = get_monero_location();
let port = get_rpc_port(); let port = get_rpc_port();
let login = get_rpc_creds(); let login = get_rpc_creds();
let daemon_address = get_rpc_daemon(); let daemon_address = cli_args.monero_rpc_daemon;
let rpc_login = format!("{}:{}", &login.username, &login.credential); let rpc_login = format!("{}:{}", &login.username, &login.credential);
let mut wallet_dir = format!( let mut wallet_dir = format!(
"/home/{}/.neveko/stagenet/wallet/", "/home/{}/.neveko/stagenet/wallet/",
std::env::var("USER").unwrap_or(String::from("user")), std::env::var("USER").unwrap_or(String::from("user")),
); );
let release_env = utils::get_release_env(); let release_env = utils::get_release_env();
let cli_args = args::Args::parse(); if cli_args.remote_node && !&daemon_address.contains(".i2p") {
if cli_args.remote_node && !&cli_args.i2p_proxy_host.contains(".i2p") {
warn!("invalid i2p monero remote node detected"); warn!("invalid i2p monero remote node detected");
} }
// proxy host can't have protocol
let mut proxy_host = utils::get_i2p_http_proxy();
if proxy_host.contains("http://") {
let values = proxy_host.split("http://");
let mut v: Vec<String> = values.map(|s| String::from(s)).collect();
proxy_host = v.remove(1);
}
if release_env == utils::ReleaseEnvironment::Development { if release_env == utils::ReleaseEnvironment::Development {
let mut args = vec![ let mut args = vec![
"--rpc-bind-port", "--rpc-bind-port",
@ -219,7 +226,7 @@ pub fn start_rpc() {
]; ];
if cli_args.remote_node { if cli_args.remote_node {
args.push("--proxy"); args.push("--proxy");
args.push(&cli_args.i2p_proxy_host); args.push(&proxy_host);
} }
let output = Command::new(format!("{}/monero-wallet-rpc", bin_dir)) let output = Command::new(format!("{}/monero-wallet-rpc", bin_dir))
.args(args) .args(args)
@ -243,7 +250,7 @@ pub fn start_rpc() {
]; ];
if cli_args.remote_node { if cli_args.remote_node {
args.push("--proxy"); args.push("--proxy");
args.push(&cli_args.i2p_proxy_host); args.push(&proxy_host);
} }
let output = Command::new(format!("{}/monero-wallet-rpc", bin_dir)) let output = Command::new(format!("{}/monero-wallet-rpc", bin_dir))
.args(args) .args(args)