Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ hex = "0.4"
http = "0.2"
jsonrpc-core = "18"
monero = { version = "0.17", features = ["serde"] }
reqwest = { version = "0.11", features = ["json"] }
reqwest = { version = "0.11", features = ["json", "socks"] }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
tracing = "0.1"
Expand Down
24 changes: 18 additions & 6 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,24 @@ pub struct LwsRpcClient {
}

impl LwsRpcClient {
pub fn new(addr: String) -> Self {
Self {
inner: CallerWrapper(Arc::new(RemoteCaller {
http_client: reqwest::ClientBuilder::new().build().unwrap(),
addr,
})),
pub fn new(addr: String, proxy: Option<String>) -> Self {
if let Some(proxy_address) = proxy {
Self {
inner: CallerWrapper(Arc::new(RemoteCaller {
http_client: reqwest::Client::builder()
.proxy(reqwest::Proxy::all(proxy_address).unwrap())
.build()
.unwrap(),
addr,
})),
}
} else {
Self {
inner: CallerWrapper(Arc::new(RemoteCaller {
http_client: reqwest::ClientBuilder::new().build().unwrap(),
addr,
})),
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion tests/rpc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,6 @@ async fn setup_monero() -> (

regtest.generate_blocks(100, address).await.unwrap();
let dhost = env::var("MONERO_DAEMON_HOST").unwrap_or_else(|_| "localhost".into());
let lws_client = monero_lws::LwsRpcClient::new(format!("http://{}:38884", dhost));
let lws_client = monero_lws::LwsRpcClient::new(format!("http://{}:38884", dhost), None);
(address, viewkey, lws_client, regtest)
}