Skip to content

Update tonic, replace parity ipc #2461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pronebird merged 10 commits into from
Mar 13, 2025
Merged

Update tonic, replace parity ipc #2461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ae9f9e6
Switch to dorina-patched-vpn-fork-develop
pronebird Mar 12, 2025
94a8e36
Update tonic to 0.12.3, prost to 0.13.5
pronebird Mar 11, 2025
236a16b
windows: add security and identity wrappers
pronebird Mar 12, 2025
cf48ce8
Add ipc implementation replacing parity
pronebird Mar 12, 2025
11148c3
Remove winapi as it was previously used to patch up issues with parity
pronebird Mar 12, 2025
c5cda76
Add safety section
pronebird Mar 12, 2025
603eb46
Refactor a bit
pronebird Mar 12, 2025
77b5190
fmt: fix
pronebird Mar 12, 2025
5f8c6a0
Fix rebase leftovers
pronebird Mar 13, 2025
5ea0cfa
tauri: replace parity-ipc with nym-ipc
pronebird Mar 13, 2025
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
269 changes: 141 additions & 128 deletions nym-vpn-app/src-tauri/Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions nym-vpn-app/src-tauri/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ clap = { version = "4.5", features = ["derive"] }
build-info = "0.0.40"
sled = "0.34.7"
strum = { version = "0.27", features = ["derive"] }
tonic = { version = "0.11", features = ["channel"] }
parity-tokio-ipc = "0.9.0"
tower = "0.4.8"
tonic = { version = "0.12.3", features = ["channel"] }
tower = "0.5.2"
rust_iso3166 = "0.1"
dirs = "6.0"
semver = "1.0"

# nym deps
nym-vpn-proto = { path = "../../nym-vpn-core/crates/nym-vpn-proto" }
nym-ipc = { path = "../../nym-vpn-core/crates/nym-ipc" }

# tauri deps
tauri-plugin-os = "2.0.1"
Expand Down
3 changes: 1 addition & 2 deletions nym-vpn-app/src-tauri/src/grpc/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ use nym_vpn_proto::{
HealthCheckRequest, InfoResponse, ListGatewaysRequest, Location, SetNetworkRequest,
StoreAccountRequest, UserAgent,
};
use parity_tokio_ipc::Endpoint as IpcEndpoint;
use tauri::{AppHandle, Manager, PackageInfo};
use tokio::sync::mpsc;
use tonic::transport::Endpoint as TonicEndpoint;
Expand Down Expand Up @@ -737,7 +736,7 @@ async fn get_channel(socket_path: PathBuf) -> Result<Channel> {
// NOTE the uri here is ignored
Ok(TonicEndpoint::from_static(DEFAULT_HTTP_ENDPOINT)
.connect_with_connector(tower::service_fn(move |_| {
IpcEndpoint::connect(socket_path.clone())
nym_ipc::client::connect(socket_path.clone())
}))
.await?)
}
Expand Down
Loading
Loading