diff --git a/Cargo.lock b/Cargo.lock index cd57e39357..46d64c42f5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -895,15 +895,6 @@ dependencies = [ "generic-array 0.14.9", ] -[[package]] -name = "block2" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5" -dependencies = [ - "objc2", -] - [[package]] name = "bloomfilter" version = "3.0.1" @@ -2103,16 +2094,6 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476" -[[package]] -name = "debounced" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "107e5cd9b5163c19751e53eef634cae25cf5ed5f6d0c81125feaa92e43703cc7" -dependencies = [ - "futures-timer", - "futures-util", -] - [[package]] name = "defguard_wireguard_rs" version = "0.4.7" @@ -2121,9 +2102,9 @@ dependencies = [ "base64 0.22.1", "libc", "log", - "netlink-packet-core 0.7.0", + "netlink-packet-core", "netlink-packet-generic", - "netlink-packet-route 0.20.1", + "netlink-packet-route", "netlink-packet-utils", "netlink-packet-wireguard", "netlink-sys", @@ -2360,18 +2341,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "dispatch2" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec" -dependencies = [ - "bitflags 2.10.0", - "block2", - "libc", - "objc2", -] - [[package]] name = "displaydoc" version = "0.2.5" @@ -2962,12 +2931,6 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" -[[package]] -name = "futures-timer" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" - [[package]] name = "futures-util" version = "0.3.31" @@ -4050,12 +4013,6 @@ dependencies = [ "serde", ] -[[package]] -name = "ipnetwork" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf370abdafd54d13e54a620e8c3e1145f28e46cc9d704bc6d94414559df41763" - [[package]] name = "iri-string" version = "0.7.8" @@ -4678,15 +4635,6 @@ dependencies = [ "netlink-packet-utils", ] -[[package]] -name = "netlink-packet-core" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3463cbb78394cb0141e2c926b93fc2197e473394b761986eca3b9da2c63ae0f4" -dependencies = [ - "paste", -] - [[package]] name = "netlink-packet-generic" version = "0.3.3" @@ -4695,7 +4643,7 @@ checksum = "1cd7eb8ad331c84c6b8cb7f685b448133e5ad82e1ffd5acafac374af4a5a308b" dependencies = [ "anyhow", "byteorder", - "netlink-packet-core 0.7.0", + "netlink-packet-core", "netlink-packet-utils", ] @@ -4710,22 +4658,10 @@ dependencies = [ "byteorder", "libc", "log", - "netlink-packet-core 0.7.0", + "netlink-packet-core", "netlink-packet-utils", ] -[[package]] -name = "netlink-packet-route" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ec2f5b6839be2a19d7fa5aab5bc444380f6311c2b693551cb80f45caaa7b5ef" -dependencies = [ - "bitflags 2.10.0", - "libc", - "log", - "netlink-packet-core 0.8.1", -] - [[package]] name = "netlink-packet-utils" version = "0.5.2" @@ -4752,20 +4688,6 @@ dependencies = [ "netlink-packet-utils", ] -[[package]] -name = "netlink-proto" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65d130ee111430e47eed7896ea43ca693c387f097dd97376bffafbf25812128" -dependencies = [ - "bytes", - "futures", - "log", - "netlink-packet-core 0.8.1", - "netlink-sys", - "thiserror 2.0.17", -] - [[package]] name = "netlink-sys" version = "0.8.7" @@ -4773,10 +4695,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16c903aa70590cb93691bf97a767c8d1d6122d2cc9070433deb3bbf36ce8bd23" dependencies = [ "bytes", - "futures", "libc", "log", - "tokio", ] [[package]] @@ -4818,19 +4738,6 @@ dependencies = [ "memoffset", ] -[[package]] -name = "nix" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" -dependencies = [ - "bitflags 2.10.0", - "cfg-if", - "cfg_aliases", - "libc", - "memoffset", -] - [[package]] name = "no-std-compat" version = "0.4.1" @@ -5145,19 +5052,6 @@ dependencies = [ "utoipa", ] -[[package]] -name = "nym-apple-network" -version = "1.17.0-beta" -source = "git+https://github.com/nymtech/nym-vpn-client/?rev=5ab01ba06057449614dd6a8450d04358c5ec33d1#5ab01ba06057449614dd6a8450d04358c5ec33d1" -dependencies = [ - "block2", - "dispatch2", - "nix 0.30.1", - "objc2", - "objc2-foundation", - "thiserror 2.0.17", -] - [[package]] name = "nym-async-file-watcher" version = "0.1.0" @@ -5576,15 +5470,6 @@ dependencies = [ "nym-multisig-contract-common 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", ] -[[package]] -name = "nym-common" -version = "1.17.0-beta" -source = "git+https://github.com/nymtech/nym-vpn-client/?rev=5ab01ba06057449614dd6a8450d04358c5ec33d1#5ab01ba06057449614dd6a8450d04358c5ec33d1" -dependencies = [ - "tracing", - "tracing-test", -] - [[package]] name = "nym-common" version = "1.18.0" @@ -5676,7 +5561,7 @@ dependencies = [ "bincode", "bytes", "futures", - "nym-common 1.18.0", + "nym-common", "nym-config 0.1.0", "nym-ip-packet-requests", "nym-sdk", @@ -6228,7 +6113,7 @@ dependencies = [ "defguard_wireguard_rs", "fastrand 2.3.0", "futures", - "ipnetwork 0.20.0", + "ipnetwork", "mock_instant", "nym-api-requests 0.1.0", "nym-authenticator-requests", @@ -6316,11 +6201,9 @@ version = "0.0.0" dependencies = [ "itertools 0.14.0", "nym-client-core", - "nym-common 1.17.0-beta", "nym-crypto 0.4.0", "nym-http-api-client", "nym-network-defaults 0.1.0", - "nym-offline-monitor", "nym-sphinx", "nym-sphinx-addressing", "nym-topology", @@ -6882,7 +6765,7 @@ dependencies = [ "dirs", "futures", "humantime-serde", - "ipnetwork 0.20.0", + "ipnetwork", "log", "nym-async-file-watcher", "nym-bin-common 0.6.0", @@ -6949,7 +6832,7 @@ dependencies = [ "human-repr", "humantime-serde", "indicatif", - "ipnetwork 0.20.0", + "ipnetwork", "lioness", "nym-bin-common 0.6.0", "nym-client-core-config-types", @@ -7272,26 +7155,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "nym-offline-monitor" -version = "1.17.0-beta" -source = "git+https://github.com/nymtech/nym-vpn-client/?rev=5ab01ba06057449614dd6a8450d04358c5ec33d1#5ab01ba06057449614dd6a8450d04358c5ec33d1" -dependencies = [ - "async-trait", - "debounced", - "dispatch2", - "futures", - "nym-apple-network", - "nym-common 1.17.0-beta", - "nym-routing", - "nym-windows", - "thiserror 2.0.17", - "tokio", - "tokio-stream", - "tokio-util", - "tracing", -] - [[package]] name = "nym-ordered-buffer" version = "0.1.0" @@ -7409,30 +7272,6 @@ dependencies = [ "tokio-util", ] -[[package]] -name = "nym-routing" -version = "1.17.0-beta" -source = "git+https://github.com/nymtech/nym-vpn-client/?rev=5ab01ba06057449614dd6a8450d04358c5ec33d1#5ab01ba06057449614dd6a8450d04358c5ec33d1" -dependencies = [ - "bitflags 2.10.0", - "futures", - "ipnetwork 0.21.1", - "libc", - "netlink-packet-core 0.8.1", - "netlink-packet-route 0.25.1", - "netlink-sys", - "nix 0.30.1", - "nym-common 1.17.0-beta", - "nym-windows", - "rtnetlink", - "system-configuration 0.6.1", - "thiserror 2.0.17", - "tokio", - "tracing", - "widestring", - "windows", -] - [[package]] name = "nym-sdk" version = "0.1.0" @@ -8320,19 +8159,6 @@ dependencies = [ "ts-rs", ] -[[package]] -name = "nym-windows" -version = "1.17.0-beta" -source = "git+https://github.com/nymtech/nym-vpn-client/?rev=5ab01ba06057449614dd6a8450d04358c5ec33d1#5ab01ba06057449614dd6a8450d04358c5ec33d1" -dependencies = [ - "bitflags 2.10.0", - "futures", - "thiserror 2.0.17", - "tokio", - "tracing", - "windows", -] - [[package]] name = "nym-wireguard" version = "0.1.0" @@ -8542,15 +8368,6 @@ dependencies = [ "url", ] -[[package]] -name = "objc2" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c2599ce0ec54857b29ce62166b0ed9b4f6f1a70ccc9a71165b6154caca8c05" -dependencies = [ - "objc2-encode", -] - [[package]] name = "objc2-core-foundation" version = "0.3.2" @@ -8558,27 +8375,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" dependencies = [ "bitflags 2.10.0", - "dispatch2", - "objc2", -] - -[[package]] -name = "objc2-encode" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33" - -[[package]] -name = "objc2-foundation" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272" -dependencies = [ - "bitflags 2.10.0", - "block2", - "libc", - "objc2", - "objc2-core-foundation", ] [[package]] @@ -9679,7 +9475,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "sync_wrapper 0.1.2", - "system-configuration 0.5.1", + "system-configuration", "tokio", "tokio-rustls 0.24.1", "tower-service", @@ -9832,23 +9628,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "rtnetlink" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08fd15aa4c64c34d0b3178e45ec6dad313a9f02b193376d501668a7950264bb7" -dependencies = [ - "futures", - "log", - "netlink-packet-core 0.8.1", - "netlink-packet-route 0.25.1", - "netlink-proto", - "netlink-sys", - "nix 0.29.0", - "thiserror 1.0.69", - "tokio", -] - [[package]] name = "rust-embed" version = "8.8.0" @@ -11224,18 +11003,7 @@ checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", "core-foundation", - "system-configuration-sys 0.5.0", -] - -[[package]] -name = "system-configuration" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" -dependencies = [ - "bitflags 2.10.0", - "core-foundation", - "system-configuration-sys 0.6.0", + "system-configuration-sys", ] [[package]] @@ -11248,16 +11016,6 @@ dependencies = [ "libc", ] -[[package]] -name = "system-configuration-sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "tagptr" version = "0.2.0" diff --git a/nym-gateway-directory/Cargo.toml b/nym-gateway-directory/Cargo.toml index 86254574c4..7c47617210 100644 --- a/nym-gateway-directory/Cargo.toml +++ b/nym-gateway-directory/Cargo.toml @@ -12,16 +12,13 @@ workspace = true [dependencies] itertools.workspace = true nym-client-core = { path = "../common/client-core" } -nym-common = { git = "https://github.com/nymtech/nym-vpn-client/", rev = "5ab01ba06057449614dd6a8450d04358c5ec33d1" } nym-http-api-client = { path = "../common/http-api-client" } -nym-offline-monitor = { git = "https://github.com/nymtech/nym-vpn-client/", rev = "5ab01ba06057449614dd6a8450d04358c5ec33d1" } nym-sphinx = { path = "../common/nymsphinx" } # replaces the types pulled in from nym-sdk in nym-vpn-client repo nym-topology = { path = "../common/topology" } # replaces the types pulled in from nym-sdk in nym-vpn-client repo nym-validator-client = { path = "../common/client-libs/validator-client" } nym-vpn-api-client = { git = "https://github.com/nymtech/nym-vpn-client/", rev = "5ab01ba06057449614dd6a8450d04358c5ec33d1" } nym-crypto = { path = "../common/crypto" } nym-sphinx-addressing = { path = "../common/nymsphinx/addressing" } - nym-network-defaults = { path = "../common/network-defaults" } rand.workspace = true diff --git a/nym-gateway-directory/README.md b/nym-gateway-directory/README.md new file mode 100644 index 0000000000..a5b4ab276a --- /dev/null +++ b/nym-gateway-directory/README.md @@ -0,0 +1,3 @@ +# `nym-gateway-directory` + +This is a stripped down version of the `nym-gateway-directory` crate from the `nym-vpn-client` repository exposing functions and types related to IPRs. This is for use by the Rust SDK's `stream_wrapper` module.