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

ensure socks proxy is up before starting wallet rpc

Browse source
This commit is contained in:
creating2morrow 2023-06-28 20:54:44 -04:00
parent f50cb91842
commit 9077a61cfd
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -26,7 +26,7 @@ NEVidebla-EKOnomia (invisible economy)
* `git clone https://github.com/creating2morrow/neveko` * `git clone https://github.com/creating2morrow/neveko`
* `cd neveko && ./scripts/build_all_and_run.sh "-- -h"` * `cd neveko && ./scripts/build_all_and_run.sh "-- -h"`
* Example to start neveko with remote stagenet node / i2p proxy remote for development: * Example to start neveko with remote stagenet node / i2p proxy remote for development:
* `./scripts/build_all_and_run.sh "-- --monero-rpc-daemon http://xmr3kaacphwkk4z2gp35bdl47lrrnzimmyqj4oliauqrjzqecofa.b32.i2p:38081 --monero-location /path/to/monero-x86_64-linux-gnu-v0.18.2.2/ --i2p-proxy-host x.x.x.x:port --i2p-tunnels-json /path/to/manual-i2p/config/ --i2p-advanced --i2p-socks-proxy-host x.x.x.x:xxxx` * `./scripts/build_all_and_run.sh "-- --monero-rpc-daemon http://xmr3kaacphwkk4z2gp35bdl47lrrnzimmyqj4oliauqrjzqecofa.b32.i2p:38081 --monero-location /path/to/monero-x86_64-linux-gnu-v0.18.2.2/ --i2p-proxy-host http://x.x.x.x:port --i2p-tunnels-json /path/to/manual-i2p/config/ --i2p-advanced --i2p-socks-proxy-host http://x.x.x.x:xxxx`
* the `--monero-location` flag is needed even when using a remote node because * the `--monero-location` flag is needed even when using a remote node because
neveko has its own monero-wallet-rpc instance neveko has its own monero-wallet-rpc instance
* remote nodes are forced over the `--i2p-proxy-host` * remote nodes are forced over the `--i2p-proxy-host`

11
neveko-core/src/i2p.rs
View file

@ -155,7 +155,7 @@ fn create_tx_proxy_tunnel() {
.args([ .args([
"socks.create", "socks.create",
"127.0.0.1", "127.0.0.1",
&format!("{}", utils::get_i2p_wallet_proxy_host()), &format!("{}", get_i2p_socks_proxy_port()),
]) ])
.spawn() .spawn()
.expect("i2p-zero failed to create a tx proxy tunnel"); .expect("i2p-zero failed to create a tx proxy tunnel");
@ -187,6 +187,15 @@ fn get_i2p_proxy_port() -> String {
port port
} }
/// Extract i2p socks port from command line arg
fn get_i2p_socks_proxy_port() -> String {
let proxy_host = utils::get_i2p_wallet_proxy_host();
let values = proxy_host.split(":");
let mut v: Vec<String> = values.map(|s| String::from(s)).collect();
let port = v.remove(2);
port
}
/// Create the http proxy if it doesn't exist /// Create the http proxy if it doesn't exist
fn create_http_proxy() { fn create_http_proxy() {
let args = args::Args::parse(); let args = args::Args::parse();

6
neveko-core/src/utils.rs
View file

@ -535,12 +535,12 @@ pub async fn start_up() {
wallet_password = read_password().unwrap(); wallet_password = read_password().unwrap();
std::env::set_var(crate::MONERO_WALLET_PASSWORD, &wallet_password); std::env::set_var(crate::MONERO_WALLET_PASSWORD, &wallet_password);
} }
gen_app_wallet(&wallet_password).await; gen_app_gpg().await;
let env: String = get_release_env().value();
if !args.i2p_advanced { if !args.i2p_advanced {
i2p::start().await; i2p::start().await;
} }
gen_app_gpg().await; gen_app_wallet(&wallet_password).await;
let env: String = get_release_env().value();
start_gui(); start_gui();
{ {
tokio::spawn(async { tokio::spawn(async {