diff --git a/Cargo.lock b/Cargo.lock index df0a550a41..56a1df6b85 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2129,8 +2129,8 @@ dependencies = [ "base64 0.22.1", "libc", "log", - "netlink-packet-core 0.7.0", - "netlink-packet-generic 0.3.3", + "netlink-packet-core", + "netlink-packet-generic", "netlink-packet-route", "netlink-packet-utils", "netlink-packet-wireguard", @@ -2656,12 +2656,12 @@ dependencies = [ "bip39", "console_error_panic_hook", "js-sys", + "nym-wasm-storage", + "nym-wasm-utils", "serde-wasm-bindgen 0.6.5", "thiserror 2.0.17", "wasm-bindgen", "wasm-bindgen-futures", - "wasm-storage", - "wasm-utils", "zeroize", ] @@ -4591,6 +4591,8 @@ dependencies = [ "nym-service-providers-common", "nym-socks5-requests", "nym-validator-client", + "nym-wasm-client-core", + "nym-wasm-utils", "rand 0.8.5", "serde", "serde-wasm-bindgen 0.6.5", @@ -4600,8 +4602,6 @@ dependencies = [ "url", "wasm-bindgen", "wasm-bindgen-futures", - "wasm-client-core", - "wasm-utils", ] [[package]] @@ -4673,15 +4673,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" @@ -4690,19 +4681,10 @@ checksum = "1cd7eb8ad331c84c6b8cb7f685b448133e5ad82e1ffd5acafac374af4a5a308b" dependencies = [ "anyhow", "byteorder", - "netlink-packet-core 0.7.0", + "netlink-packet-core", "netlink-packet-utils", ] -[[package]] -name = "netlink-packet-generic" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f891b2e0054cac5a684a06628f59568f841c93da4e551239da6e518f539e775" -dependencies = [ - "netlink-packet-core 0.8.1", -] - [[package]] name = "netlink-packet-route" version = "0.20.1" @@ -4714,7 +4696,7 @@ dependencies = [ "byteorder", "libc", "log", - "netlink-packet-core 0.7.0", + "netlink-packet-core", "netlink-packet-utils", ] @@ -4732,14 +4714,16 @@ dependencies = [ [[package]] name = "netlink-packet-wireguard" -version = "0.2.4" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598962d9067d3153a00106da10e7b8276cea68f396f4a22f5b4a079270d92e29" +checksum = "60b25b050ff1f6a1e23c6777b72db22790fe5b6b5ccfd3858672587a79876c8f" dependencies = [ + "anyhow", + "byteorder", "libc", "log", - "netlink-packet-core 0.8.1", - "netlink-packet-generic 0.4.0", + "netlink-packet-generic", + "netlink-packet-utils", ] [[package]] @@ -5080,7 +5064,7 @@ dependencies = [ [[package]] name = "nym-authenticator-client" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bincode", "futures", @@ -5328,6 +5312,7 @@ dependencies = [ "nym-task", "nym-topology", "nym-validator-client", + "nym-wasm-utils", "rand 0.8.5", "rand_chacha 0.3.1", "serde", @@ -5346,7 +5331,6 @@ dependencies = [ "url", "wasm-bindgen", "wasm-bindgen-futures", - "wasm-utils", "wasmtimer", "zeroize", ] @@ -5415,6 +5399,8 @@ dependencies = [ "nym-gateway-requests", "nym-node-tester-utils", "nym-node-tester-wasm", + "nym-wasm-client-core", + "nym-wasm-utils", "once_cell", "rand 0.8.5", "serde", @@ -5426,8 +5412,6 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "wasm-bindgen-test", - "wasm-client-core", - "wasm-utils", "web-sys", ] @@ -6029,6 +6013,7 @@ dependencies = [ "nym-statistics-common", "nym-task", "nym-validator-client", + "nym-wasm-utils", "rand 0.8.5", "serde", "si-scale", @@ -6042,7 +6027,6 @@ dependencies = [ "url", "wasm-bindgen", "wasm-bindgen-futures", - "wasm-utils", "wasmtimer", "zeroize", ] @@ -6798,13 +6782,13 @@ dependencies = [ "nym-sphinx-params", "nym-task", "nym-topology", + "nym-wasm-utils", "rand 0.8.5", "rand_chacha 0.3.1", "serde", "serde_json", "thiserror 2.0.17", "tokio", - "wasm-utils", ] [[package]] @@ -6814,6 +6798,8 @@ dependencies = [ "futures", "js-sys", "nym-node-tester-utils", + "nym-wasm-client-core", + "nym-wasm-utils", "rand 0.8.5", "serde", "serde-wasm-bindgen 0.6.5", @@ -6822,8 +6808,6 @@ dependencies = [ "tsify", "wasm-bindgen", "wasm-bindgen-futures", - "wasm-client-core", - "wasm-utils", "wasmtimer", ] @@ -7494,6 +7478,7 @@ dependencies = [ "nym-mixnet-contract-common", "nym-sphinx-addressing", "nym-sphinx-types", + "nym-wasm-utils", "rand 0.8.5", "reqwest 0.12.28", "serde", @@ -7503,7 +7488,6 @@ dependencies = [ "tracing", "tsify", "wasm-bindgen", - "wasm-utils", ] [[package]] @@ -7710,6 +7694,7 @@ dependencies = [ "nym-credentials-interface", "nym-crypto", "nym-ecash-time", + "nym-wasm-utils", "serde", "serde-wasm-bindgen 0.6.5", "serde_json", @@ -7717,7 +7702,6 @@ dependencies = [ "time", "tsify", "wasm-bindgen", - "wasm-utils", "zeroize", ] @@ -7741,6 +7725,72 @@ dependencies = [ "ts-rs", ] +[[package]] +name = "nym-wasm-client-core" +version = "1.20.1" +dependencies = [ + "async-trait", + "console_error_panic_hook", + "js-sys", + "nym-bandwidth-controller", + "nym-client-core", + "nym-config", + "nym-credential-storage", + "nym-crypto", + "nym-gateway-client", + "nym-http-api-client", + "nym-sphinx", + "nym-sphinx-acknowledgements", + "nym-statistics-common", + "nym-task", + "nym-topology", + "nym-validator-client", + "nym-wasm-storage", + "nym-wasm-utils", + "rand 0.8.5", + "serde", + "serde-wasm-bindgen 0.6.5", + "thiserror 2.0.17", + "time", + "tsify", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "zeroize", +] + +[[package]] +name = "nym-wasm-storage" +version = "1.20.1" +dependencies = [ + "async-trait", + "getrandom 0.2.16", + "indexed_db_futures", + "js-sys", + "nym-store-cipher", + "nym-wasm-utils", + "serde", + "serde-wasm-bindgen 0.6.5", + "thiserror 2.0.17", + "wasm-bindgen", +] + +[[package]] +name = "nym-wasm-utils" +version = "1.20.1" +dependencies = [ + "console_error_panic_hook", + "futures", + "getrandom 0.2.16", + "gloo-net", + "gloo-utils 0.2.0", + "js-sys", + "tungstenite 0.20.1", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "nym-wireguard" version = "1.20.1" @@ -12248,56 +12298,6 @@ dependencies = [ "syn 2.0.113", ] -[[package]] -name = "wasm-client-core" -version = "1.20.1" -dependencies = [ - "async-trait", - "console_error_panic_hook", - "js-sys", - "nym-bandwidth-controller", - "nym-client-core", - "nym-config", - "nym-credential-storage", - "nym-crypto", - "nym-gateway-client", - "nym-http-api-client", - "nym-sphinx", - "nym-sphinx-acknowledgements", - "nym-statistics-common", - "nym-task", - "nym-topology", - "nym-validator-client", - "rand 0.8.5", - "serde", - "serde-wasm-bindgen 0.6.5", - "thiserror 2.0.17", - "time", - "tsify", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-storage", - "wasm-utils", - "zeroize", -] - -[[package]] -name = "wasm-storage" -version = "1.20.1" -dependencies = [ - "async-trait", - "getrandom 0.2.16", - "indexed_db_futures", - "js-sys", - "nym-store-cipher", - "serde", - "serde-wasm-bindgen 0.6.5", - "thiserror 2.0.17", - "wasm-bindgen", - "wasm-utils", -] - [[package]] name = "wasm-streams" version = "0.4.2" @@ -12311,22 +12311,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "wasm-utils" -version = "1.20.1" -dependencies = [ - "console_error_panic_hook", - "futures", - "getrandom 0.2.16", - "gloo-net", - "gloo-utils 0.2.0", - "js-sys", - "tungstenite 0.20.1", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - [[package]] name = "wasmtimer" version = "0.4.3" @@ -13124,6 +13108,7 @@ dependencies = [ "nym-credentials", "nym-crypto", "nym-http-api-client", + "nym-wasm-utils", "rand 0.8.5", "reqwest 0.12.28", "serde", @@ -13132,7 +13117,6 @@ dependencies = [ "tsify", "uuid", "wasm-bindgen", - "wasm-utils", "wasmtimer", "zeroize", ] diff --git a/Cargo.toml b/Cargo.toml index 36af571f53..ac64fac938 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -381,30 +381,35 @@ prometheus = { version = "0.14.0" } # sdk related deps so we can pull in workspace versions of these in other crates' cargo files, and not have to define the version everywhere # these versions should be kept in line with the workspace version defined above nym-api-requests = { version = "1.20.1", path = "nym-api/nym-api-requests" } +nym-authenticator-requests = { version = "1.20.1", path = "common/authenticator-requests" } +nym-async-file-watcher = { version = "1.20.1", path = "common/async-file-watcher" } +nym-authenticator-client = { version = "1.20.1", path = "nym-authenticator-client" } nym-bandwidth-controller = { version = "1.20.1", path = "common/bandwidth-controller" } nym-bin-common = { version = "1.20.1", path = "common/bin-common" } nym-cache = { version = "1.20.1", path = "common/nym-cache" } -nym-client-core = { version = "1.20.1", path = "common/client-core" } +nym-client-core = { version = "1.20.1", path = "common/client-core", default-features = false } nym-client-core-config-types = { version = "1.20.1", path = "common/client-core/config-types" } nym-client-core-gateways-storage = { version = "1.20.1", path = "common/client-core/gateways-storage" } nym-client-core-surb-storage = { version = "1.20.1", path = "common/client-core/surb-storage" } +nym-common = { version = "1.20.1", path = "common/nym-common" } nym-compact-ecash = { version = "1.20.1", path = "common/nym_offline_compact_ecash" } nym-config = { version = "1.20.1", path = "common/config" } nym-contracts-common = { version = "1.20.1", path = "common/cosmwasm-smart-contracts/contracts-common" } nym-coconut-dkg-common = { version = "1.20.1", path = "common/cosmwasm-smart-contracts/coconut-dkg" } nym-credential-storage = { version = "1.20.1", path = "common/credential-storage" } nym-credential-utils = { version = "1.20.1", path = "common/credential-utils" } -nym-credentials = { version = "1.20.1", path = "common/credentials" } +nym-credentials = { version = "1.20.1", path = "common/credentials", default-features = false } nym-credentials-interface = { version = "1.20.1", path = "common/credentials-interface" } -nym-credential-proxy-requests = { version = "1.20.1", path = "nym-credential-proxy/nym-credential-proxy-requests" } -nym-crypto = { version = "1.20.1", path = "common/crypto" } +nym-credential-proxy-requests = { version = "1.20.1", path = "nym-credential-proxy/nym-credential-proxy-requests", default-features = false } +nym-credential-verification = { version = "1.20.1", path = "common/credential-verification" } +nym-crypto = { version = "1.20.1", path = "common/crypto", default-features = false } nym-ecash-contract-common = { version = "1.20.1", path = "common/cosmwasm-smart-contracts/ecash-contract" } nym-ecash-signer-check = { version = "1.20.1", path = "common/ecash-signer-check" } nym-ecash-signer-check-types = { version = "1.20.1", path = "common/ecash-signer-check-types" } nym-ecash-time = { version = "1.20.1", path = "common/ecash-time" } nym-exit-policy = { version = "1.20.1", path = "common/exit-policy" } nym-ffi-shared = { version = "1.20.1", path = "sdk/ffi/shared" } -nym-gateway-client = { version = "1.20.1", path = "common/client-libs/gateway-client" } +nym-gateway-client = { version = "1.20.1", path = "common/client-libs/gateway-client", default-features = false } nym-gateway-requests = { version = "1.20.1", path = "common/gateway-requests" } nym-gateway-storage = { version = "1.20.1", path = "common/gateway-storage" } nym-group-contract-common = { version = "1.20.1", path = "common/cosmwasm-smart-contracts/group-contract" } @@ -412,11 +417,14 @@ nym-http-api-client = { version = "1.20.1", path = "common/http-api-client" } nym-http-api-client-macro = { version = "1.20.1", path = "common/http-api-client-macro" } nym-http-api-common = { version = "1.20.1", path = "common/http-api-common", default-features = false } nym-id = { version = "1.20.1", path = "common/nym-id" } +nym-ip-packet-client = { version = "1.20.1", path = "nym-ip-packet-client" } +nym-ip-packet-requests = { version = "1.20.1", path = "common/ip-packet-requests" } nym-metrics = { version = "1.20.1", path = "common/nym-metrics" } nym-mixnet-client = { version = "1.20.1", path = "common/client-libs/mixnet-client" } nym-mixnet-contract-common = { version = "1.20.1", path = "common/cosmwasm-smart-contracts/mixnet-contract" } nym-multisig-contract-common = { version = "1.20.1", path = "common/cosmwasm-smart-contracts/multisig-contract" } nym-network-defaults = { version = "1.20.1", path = "common/network-defaults" } +nym-node-tester-utils = { version = "1.20.1", path = "common/node-tester-utils" } nym-noise = { version = "1.20.1", path = "common/nymnoise" } nym-noise-keys = { version = "1.20.1", path = "common/nymnoise/keys" } nym-nonexhaustive-delayqueue = { version = "1.20.1", path = "common/nonexhaustive-delayqueue" } @@ -424,6 +432,7 @@ nym-node-requests = { version = "1.20.1", path = "nym-node/nym-node-requests" } nym-node-metrics = { version = "1.20.1", path = "nym-node/nym-node-metrics" } nym-ordered-buffer = { version = "1.20.1", path = "common/socks5/ordered-buffer" } nym-outfox = { version = "1.20.1", path = "nym-outfox" } +nym-registration-common = { version = "1.20.1", path = "common/registration" } nym-pemstore = { version = "1.20.1", path = "common/pemstore" } nym-performance-contract-common = { version = "1.20.1", path = "common/cosmwasm-smart-contracts/nym-performance-contract" } nym-sdk = { version = "1.20.1", path = "sdk/rust/nym-sdk" } @@ -446,16 +455,20 @@ nym-sphinx-routing = { version = "1.20.1", path = "common/nymsphinx/routing" } nym-sphinx-types = { version = "1.20.1", path = "common/nymsphinx/types" } nym-statistics-common = { version = "1.20.1", path = "common/statistics" } nym-task = { version = "1.20.1", path = "common/task" } +nym-tun = { version = "1.20.1", path = "common/tun" } nym-test-utils = { version = "1.20.1", path = "common/test-utils" } nym-ticketbooks-merkle = { version = "1.20.1", path = "common/ticketbooks-merkle" } nym-topology = { version = "1.20.1", path = "common/topology" } nym-types = { version = "1.20.1", path = "common/types" } nym-upgrade-mode-check = { version = "1.20.1", path = "common/upgrade-mode-check" } -nym-validator-client = { version = "1.20.1", path = "common/client-libs/validator-client" } +nym-validator-client = { version = "1.20.1", path = "common/client-libs/validator-client", default-features = false } nym-vesting-contract-common = { version = "1.20.1", path = "common/cosmwasm-smart-contracts/vesting-contract" } +nym-wireguard = { version = "1.20.1", path = "common/wireguard" } nym-wireguard-types = { version = "1.20.1", path = "common/wireguard-types" } -nym-sqlx-pool-guard = { version = "1.2.0", path = "common/sqlx-pool-guard" } -wasm-utils = { version = "1.20.1", path = "common/wasm/utils" } +nym-sqlx-pool-guard = { version = "1.2.0", path = "nym-sqlx-pool-guard" } +nym-wasm-client-core = { version = "1.20.1", path = "common/wasm/client-core" } +nym-wasm-storage = { version = "1.20.1", path = "common/wasm/storage" } +nym-wasm-utils = { version = "1.20.1", path = "common/wasm/utils", default-features = false } # coconut/DKG related # unfortunately until https://github.com/zkcrypto/bls12_381/issues/10 is resolved, we have to rely on the fork diff --git a/clients/native/Cargo.toml b/clients/native/Cargo.toml index e5a754cc0f..3d11c2e77d 100644 --- a/clients/native/Cargo.toml +++ b/clients/native/Cargo.toml @@ -43,7 +43,7 @@ tokio-tungstenite = { workspace = true } zeroize = { workspace = true } ## internal -nym-bandwidth-controller = { path = "../../common/bandwidth-controller" } +nym-bandwidth-controller = { workspace = true } nym-bin-common = { path = "../../common/bin-common", features = [ "output_format", "clap", @@ -55,7 +55,7 @@ nym-client-core = { path = "../../common/client-core", features = [ "fs-gateways-storage", "cli", ] } -nym-config = { path = "../../common/config" } +nym-config = { workspace = true } nym-credential-storage = { path = "../../common/credential-storage" } nym-credentials = { path = "../../common/credentials" } nym-crypto = { path = "../../common/crypto" } @@ -65,7 +65,7 @@ nym-sphinx = { path = "../../common/nymsphinx" } nym-pemstore = { path = "../../common/pemstore" } nym-task = { path = "../../common/task" } nym-topology = { path = "../../common/topology" } -nym-validator-client = { path = "../../common/client-libs/validator-client", features = [ +nym-validator-client = { workspace = true, features = [ "http-client", ] } nym-client-websocket-requests = { path = "websocket-requests" } diff --git a/clients/socks5/Cargo.toml b/clients/socks5/Cargo.toml index b72db16f41..b819d7ef03 100644 --- a/clients/socks5/Cargo.toml +++ b/clients/socks5/Cargo.toml @@ -36,19 +36,19 @@ nym-client-core = { path = "../../common/client-core", features = [ "fs-gateways-storage", "cli", ] } -nym-config = { path = "../../common/config" } +nym-config = { workspace = true } nym-credential-storage = { path = "../../common/credential-storage" } nym-credentials = { path = "../../common/credentials" } nym-crypto = { path = "../../common/crypto" } nym-gateway-requests = { path = "../../common/gateway-requests" } nym-id = { path = "../../common/nym-id" } nym-network-defaults = { path = "../../common/network-defaults" } -nym-ordered-buffer = { path = "../../common/socks5/ordered-buffer" } +nym-ordered-buffer = { workspace = true } nym-pemstore = { path = "../../common/pemstore" } nym-socks5-client-core = { path = "../../common/socks5-client-core" } nym-sphinx = { path = "../../common/nymsphinx" } nym-topology = { path = "../../common/topology" } -nym-validator-client = { path = "../../common/client-libs/validator-client", features = [ +nym-validator-client = { workspace = true, features = [ "http-client", ] } diff --git a/common/bandwidth-controller/Cargo.toml b/common/bandwidth-controller/Cargo.toml index 35522d1403..813f0101d0 100644 --- a/common/bandwidth-controller/Cargo.toml +++ b/common/bandwidth-controller/Cargo.toml @@ -21,5 +21,5 @@ nym-task = { workspace = true } nym-validator-client = { workspace = true } [target."cfg(not(target_arch = \"wasm32\"))".dependencies.nym-validator-client] -path = "../client-libs/validator-client" +workspace = true features = ["http-client"] diff --git a/common/client-core/Cargo.toml b/common/client-core/Cargo.toml index 5bbde38c7e..df46b63178 100644 --- a/common/client-core/Cargo.toml +++ b/common/client-core/Cargo.toml @@ -105,8 +105,8 @@ features = ["tokio"] workspace = true features = ["futures"] -[target."cfg(target_arch = \"wasm32\")".dependencies.wasm-utils] -path = "../wasm/utils" +[target."cfg(target_arch = \"wasm32\")".dependencies.nym-wasm-utils] +workspace = true features = ["websocket"] [target."cfg(target_arch = \"wasm32\")".dependencies.time] diff --git a/common/client-core/surb-storage/Cargo.toml b/common/client-core/surb-storage/Cargo.toml index d45a09e72e..b1aa34eff4 100644 --- a/common/client-core/surb-storage/Cargo.toml +++ b/common/client-core/surb-storage/Cargo.toml @@ -27,7 +27,7 @@ features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate", "time"] optional = true [target."cfg(not(target_arch = \"wasm32\"))".dependencies.nym-sqlx-pool-guard] -path = "../../../nym-sqlx-pool-guard" +workspace = true [build-dependencies] anyhow = { workspace = true } diff --git a/common/client-libs/gateway-client/Cargo.toml b/common/client-libs/gateway-client/Cargo.toml index 9fab2f96fb..e4b56780e8 100644 --- a/common/client-libs/gateway-client/Cargo.toml +++ b/common/client-libs/gateway-client/Cargo.toml @@ -61,8 +61,8 @@ workspace = true [target."cfg(target_arch = \"wasm32\")".dependencies.wasm-bindgen-futures] workspace = true -[target."cfg(target_arch = \"wasm32\")".dependencies.wasm-utils] -path = "../../wasm/utils" +[target."cfg(target_arch = \"wasm32\")".dependencies.nym-wasm-utils] +workspace = true features = ["websocket"] [target."cfg(target_arch = \"wasm32\")".dependencies.gloo-utils] diff --git a/common/credential-storage/Cargo.toml b/common/credential-storage/Cargo.toml index 75b0dd181b..66f4a027a0 100644 --- a/common/credential-storage/Cargo.toml +++ b/common/credential-storage/Cargo.toml @@ -23,7 +23,7 @@ nym-compact-ecash = { workspace = true } nym-ecash-time = { workspace = true } [target."cfg(not(target_arch = \"wasm32\"))".dependencies.nym-sqlx-pool-guard] -path = "../../nym-sqlx-pool-guard" +workspace = true [target."cfg(not(target_arch = \"wasm32\"))".dependencies.sqlx] workspace = true diff --git a/common/gateway-storage/Cargo.toml b/common/gateway-storage/Cargo.toml index ce75e21848..8991c9bcba 100644 --- a/common/gateway-storage/Cargo.toml +++ b/common/gateway-storage/Cargo.toml @@ -28,8 +28,8 @@ tokio = { workspace = true, features = ["sync"], optional = true } tracing = { workspace = true } nym-credentials-interface = { workspace = true } -nym-gateway-requests = { path = "../gateway-requests" } -nym-sphinx = { path = "../nymsphinx" } +nym-gateway-requests = { workspace = true } +nym-sphinx = { workspace = true } [build-dependencies] anyhow = { workspace = true } diff --git a/common/ip-packet-requests/Cargo.toml b/common/ip-packet-requests/Cargo.toml index 5f22e1b0a8..8d7c6a5257 100644 --- a/common/ip-packet-requests/Cargo.toml +++ b/common/ip-packet-requests/Cargo.toml @@ -11,10 +11,10 @@ license.workspace = true [dependencies] bincode = { workspace = true } bytes = { workspace = true } -nym-bin-common = { path = "../bin-common" } -nym-crypto = { path = "../crypto" } -nym-service-provider-requests-common = { path = "../service-provider-requests-common" } -nym-sphinx = { path = "../nymsphinx" } +nym-bin-common = { workspace = true } +nym-crypto = { workspace = true } +nym-service-provider-requests-common = { workspace = true } +nym-sphinx = { workspace = true } rand = { workspace = true } serde = { workspace = true, features = ["derive"] } thiserror = { workspace = true } diff --git a/common/mixnode-common/Cargo.toml b/common/mixnode-common/Cargo.toml index 585e45ec56..de9a6e2912 100644 --- a/common/mixnode-common/Cargo.toml +++ b/common/mixnode-common/Cargo.toml @@ -26,13 +26,13 @@ url = { workspace = true } time.workspace = true thiserror = { workspace = true } -nym-crypto = { path = "../crypto", features = ["asymmetric"] } -nym-network-defaults = { path = "../network-defaults" } -nym-sphinx-acknowledgements = { path = "../nymsphinx/acknowledgements" } -nym-sphinx-addressing = { path = "../nymsphinx/addressing" } -nym-sphinx-forwarding = { path = "../nymsphinx/forwarding" } -nym-sphinx-framing = { path = "../nymsphinx/framing" } -nym-sphinx-params = { path = "../nymsphinx/params" } -nym-sphinx-types = { path = "../nymsphinx/types" } +nym-crypto = { workspace = true, features = ["asymmetric"] } +nym-network-defaults = { workspace = true } +nym-sphinx-acknowledgements = { workspace = true } +nym-sphinx-addressing = { workspace = true } +nym-sphinx-forwarding = { workspace = true } +nym-sphinx-framing = { workspace = true } +nym-sphinx-params = { workspace = true } +nym-sphinx-types = { workspace = true } nym-task = { path = "../task" } -nym-metrics = { path = "../nym-metrics" } +nym-metrics = { workspace = true } diff --git a/common/node-tester-utils/Cargo.toml b/common/node-tester-utils/Cargo.toml index 594f66f4fd..f8c58e8511 100644 --- a/common/node-tester-utils/Cargo.toml +++ b/common/node-tester-utils/Cargo.toml @@ -16,17 +16,17 @@ serde_json = { workspace = true } thiserror = { workspace = true } tokio = { workspace = true, features = ["macros"] } -nym-crypto = { path = "../crypto", features = ["asymmetric"] } -nym-task = { path = "../task" } -nym-topology = { path = "../topology" } -nym-sphinx-params = { path = "../nymsphinx/params" } +nym-crypto = { workspace = true, features = ["asymmetric"] } +nym-task = { workspace = true } +nym-topology = { workspace = true } +nym-sphinx-params = { workspace = true } # TODO: do we need the whole nymsphinx? -nym-sphinx = { path = "../nymsphinx" } +nym-sphinx = { workspace = true } ## non-wasm-only dependencies [target."cfg(not(target_arch = \"wasm32\"))".dependencies.log] workspace = true ## wasm-only dependencies -[target."cfg(target_arch = \"wasm32\")".dependencies.wasm-utils] -path = "../wasm/utils" +[target."cfg(target_arch = \"wasm32\")".dependencies.nym-wasm-utils] +workspace = true diff --git a/common/nym-connection-monitor/Cargo.toml b/common/nym-connection-monitor/Cargo.toml index ed4a514d32..03de5da740 100644 --- a/common/nym-connection-monitor/Cargo.toml +++ b/common/nym-connection-monitor/Cargo.toml @@ -16,10 +16,10 @@ workspace = true bincode.workspace = true bytes.workspace = true futures.workspace = true -nym-config = { path = "../config" } -nym-common = { path = "../nym-common" } -nym-ip-packet-requests = { path = "../ip-packet-requests" } -nym-sdk = { path = "../../sdk/rust/nym-sdk" } +nym-config = { workspace = true } +nym-common = { workspace = true } +nym-ip-packet-requests = { workspace = true } +nym-sdk = { workspace = true } pnet_packet.workspace = true thiserror.workspace = true tokio.workspace = true diff --git a/common/nym-id/Cargo.toml b/common/nym-id/Cargo.toml index 821bc7ef57..3a70b5b74e 100644 --- a/common/nym-id/Cargo.toml +++ b/common/nym-id/Cargo.toml @@ -16,5 +16,5 @@ time.workspace = true tracing.workspace = true zeroize.workspace = true -nym-credential-storage = { path = "../credential-storage" } -nym-credentials = { path = "../credentials" } +nym-credential-storage = { workspace = true } +nym-credentials = { workspace = true } diff --git a/common/nymsphinx/Cargo.toml b/common/nymsphinx/Cargo.toml index f34d84725e..1fba34a0c2 100644 --- a/common/nymsphinx/Cargo.toml +++ b/common/nymsphinx/Cargo.toml @@ -39,7 +39,7 @@ nym-crypto = { workspace = true, features = [ # do not include this when compiling into wasm as it somehow when combined together with reqwest, it will require # net2 via tokio-util -> tokio -> mio -> net2 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.nym-sphinx-framing] -path = "framing" +workspace = true [target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio] workspace = true diff --git a/common/registration/Cargo.toml b/common/registration/Cargo.toml index 19c6f7db1c..d418de149f 100644 --- a/common/registration/Cargo.toml +++ b/common/registration/Cargo.toml @@ -14,7 +14,7 @@ workspace = true [dependencies] tokio-util.workspace = true -nym-authenticator-requests = { path = "../authenticator-requests" } -nym-crypto = { path = "../crypto" } -nym-ip-packet-requests = { path = "../ip-packet-requests" } -nym-sphinx = { path = "../nymsphinx" } +nym-authenticator-requests = { workspace = true } +nym-crypto = { workspace = true } +nym-ip-packet-requests = { workspace = true } +nym-sphinx = { workspace = true } diff --git a/common/socks5-client-core/Cargo.toml b/common/socks5-client-core/Cargo.toml index 5c351106b2..b54fbb2ee2 100644 --- a/common/socks5-client-core/Cargo.toml +++ b/common/socks5-client-core/Cargo.toml @@ -21,19 +21,19 @@ thiserror = { workspace = true } tokio = { workspace = true, features = ["rt-multi-thread", "net", "signal"] } url = { workspace = true } -nym-bandwidth-controller = { path = "../../common/bandwidth-controller" } -nym-client-core = { path = "../client-core", features = ["fs-credentials-storage", "fs-surb-storage", "fs-gateways-storage"] } -nym-config = { path = "../config" } -nym-contracts-common = { path = "../cosmwasm-smart-contracts/contracts-common" } -nym-credential-storage = { path = "../credential-storage" } -nym-mixnet-contract-common = { path = "../cosmwasm-smart-contracts/mixnet-contract" } -nym-network-defaults = { path = "../network-defaults" } +nym-bandwidth-controller = { workspace = true } +nym-client-core = { workspace = true, features = ["fs-credentials-storage", "fs-surb-storage", "fs-gateways-storage"] } +nym-config = { workspace = true } +nym-contracts-common = { workspace = true } +nym-credential-storage = { workspace = true } +nym-mixnet-contract-common = { workspace = true } +nym-network-defaults = { workspace = true } nym-service-providers-common = { path = "../../service-providers/common" } nym-socks5-proxy-helpers = { path = "../socks5/proxy-helpers" } nym-socks5-requests = { path = "../socks5/requests" } nym-sphinx = { path = "../nymsphinx" } nym-task = { path = "../task" } -nym-validator-client = { path = "../client-libs/validator-client" } +nym-validator-client = { workspace = true } [features] default = [] diff --git a/common/socks5/proxy-helpers/Cargo.toml b/common/socks5/proxy-helpers/Cargo.toml index 071bf82810..70da2c7e1b 100644 --- a/common/socks5/proxy-helpers/Cargo.toml +++ b/common/socks5/proxy-helpers/Cargo.toml @@ -17,9 +17,9 @@ futures = { workspace = true } log = { workspace = true } # internal -nym-ordered-buffer = { path = "../ordered-buffer" } -nym-socks5-requests = { path = "../requests" } -nym-task = { path = "../../task" } +nym-ordered-buffer = { workspace = true } +nym-socks5-requests = { workspace = true } +nym-task = { workspace = true } [dev-dependencies] tokio-test = { workspace = true } diff --git a/common/socks5/requests/Cargo.toml b/common/socks5/requests/Cargo.toml index 5b7e95447d..f067b1b9f7 100644 --- a/common/socks5/requests/Cargo.toml +++ b/common/socks5/requests/Cargo.toml @@ -10,9 +10,9 @@ license.workspace = true [dependencies] bincode = { workspace = true } log = { workspace = true } -nym-exit-policy = { path = "../../../common/exit-policy"} -nym-service-providers-common = { path = "../../../service-providers/common" } -nym-sphinx-addressing = { path = "../../../common/nymsphinx/addressing" } +nym-exit-policy = { workspace = true} +nym-service-providers-common = { workspace = true } +nym-sphinx-addressing = { workspace = true } serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } tap = { workspace = true } diff --git a/common/statistics/Cargo.toml b/common/statistics/Cargo.toml index cd168e1144..e89aa4dc6b 100644 --- a/common/statistics/Cargo.toml +++ b/common/statistics/Cargo.toml @@ -23,11 +23,11 @@ si-scale = { workspace = true } strum = { workspace = true } strum_macros = { workspace = true } -nym-crypto = { path = "../crypto" } -nym-sphinx = { path = "../nymsphinx" } -nym-credentials-interface = { path = "../credentials-interface" } -nym-metrics = { path = "../nym-metrics" } -nym-task = { path = "../task" } +nym-crypto = { workspace = true } +nym-sphinx = { workspace = true } +nym-credentials-interface = { workspace = true } +nym-metrics = { workspace = true } +nym-task = { workspace = true } utoipa = { workspace = true, optional = true } diff --git a/common/topology/Cargo.toml b/common/topology/Cargo.toml index c476cf932e..da51f63bbd 100644 --- a/common/topology/Cargo.toml +++ b/common/topology/Cargo.toml @@ -42,11 +42,11 @@ nym-api-requests = { workspace = true } # 'wasm-serde-types' feature -wasm-utils = { workspace = true, optional = true } +nym-wasm-utils = { workspace = true, optional = true } [features] default = ["provider-trait"] provider-trait = ["async-trait"] -wasm-serde-types = ["tsify", "wasm-bindgen", "wasm-utils"] +wasm-serde-types = ["tsify", "wasm-bindgen", "nym-wasm-utils"] persistence = ["serde_json"] outfox = [] diff --git a/common/topology/src/wasm_helpers.rs b/common/topology/src/wasm_helpers.rs index 1abf88272b..8d07cbcce0 100644 --- a/common/topology/src/wasm_helpers.rs +++ b/common/topology/src/wasm_helpers.rs @@ -6,13 +6,13 @@ use crate::node::{EntryDetails, RoutingNode, RoutingNodeError, SupportedRoles}; use crate::{CachedEpochRewardedSet, NymTopology, NymTopologyMetadata}; +use nym_wasm_utils::error::simple_js_error; use serde::{Deserialize, Serialize}; use std::collections::HashMap; use std::net::SocketAddr; use thiserror::Error; use tsify::Tsify; use wasm_bindgen::{JsValue, prelude::wasm_bindgen}; -use wasm_utils::error::simple_js_error; #[derive(Debug, Error)] pub enum SerializableTopologyError { diff --git a/common/tun/Cargo.toml b/common/tun/Cargo.toml index 015fcfafc4..243288d4fc 100644 --- a/common/tun/Cargo.toml +++ b/common/tun/Cargo.toml @@ -15,7 +15,7 @@ thiserror.workspace = true tokio = { workspace = true, features = ["rt-multi-thread", "net", "io-util", "time", "sync", "macros"] } etherparse = { workspace = true } log.workspace = true -nym-wireguard-types = { path = "../wireguard-types", optional = true } +nym-wireguard-types = { workspace = true, optional = true } [target.'cfg(target_os = "linux")'.dependencies] tokio-tun.workspace = true diff --git a/common/types/Cargo.toml b/common/types/Cargo.toml index cdf6e34e7a..bc340f0ee5 100644 --- a/common/types/Cargo.toml +++ b/common/types/Cargo.toml @@ -29,10 +29,10 @@ x25519-dalek = { workspace = true, features = ["static_secrets"] } cosmwasm-std = { workspace = true } cosmrs = { workspace = true } -nym-validator-client = { path = "../../common/client-libs/validator-client" } +nym-validator-client = { workspace = true } nym-mixnet-contract-common = { path = "../../common/cosmwasm-smart-contracts/mixnet-contract" } nym-vesting-contract-common = { path = "../../common/cosmwasm-smart-contracts/vesting-contract" } -nym-config = { path = "../../common/config" } +nym-config = { workspace = true } nym-crypto = { path = "../../common/crypto", features = ["asymmetric"] } [dev-dependencies] diff --git a/common/verloc/Cargo.toml b/common/verloc/Cargo.toml index c82b9d416c..d7f48abf6a 100644 --- a/common/verloc/Cargo.toml +++ b/common/verloc/Cargo.toml @@ -24,6 +24,6 @@ url = { workspace = true } nym-crypto = { path = "../crypto", features = ["asymmetric"] } nym-task = { path = "../task" } -nym-validator-client = { path = "../client-libs/validator-client" } -nym-http-api-client = { path = "../http-api-client" } -nym-api-requests = { path = "../../nym-api/nym-api-requests" } +nym-validator-client = { workspace = true } +nym-http-api-client = { workspace = true } +nym-api-requests = { workspace = true } diff --git a/common/wasm/client-core/Cargo.toml b/common/wasm/client-core/Cargo.toml index d8b27ec2d3..aab008fa5e 100644 --- a/common/wasm/client-core/Cargo.toml +++ b/common/wasm/client-core/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "wasm-client-core" +name = "nym-wasm-client-core" authors = ["Jedrzej Stuczynski "] version.workspace = true edition = "2021" @@ -22,21 +22,21 @@ wasm-bindgen = { workspace = true } wasm-bindgen-futures = { workspace = true } zeroize = { workspace = true } -nym-bandwidth-controller = { path = "../../bandwidth-controller" } -nym-client-core = { path = "../../client-core", default-features = false, features = ["wasm"] } -nym-config = { path = "../../config" } -nym-credential-storage = { path = "../../credential-storage" } -nym-crypto = { path = "../../crypto", features = ["asymmetric", "serde"] } -nym-gateway-client = { path = "../../client-libs/gateway-client", default-features = false, features = ["wasm"] } -nym-sphinx = { path = "../../nymsphinx" } -nym-sphinx-acknowledgements = { path = "../../nymsphinx/acknowledgements", features = ["serde"] } -nym-statistics-common = { path = "../../statistics" } -nym-task = { path = "../../task" } -nym-topology = { path = "../../topology", features = ["wasm-serde-types"] } -nym-validator-client = { path = "../../client-libs/validator-client", default-features = false } -nym-http-api-client = { path = "../../http-api-client" } -wasm-utils = { path = "../utils" } -wasm-storage = { path = "../storage" } +nym-bandwidth-controller = { workspace = true } +nym-client-core = { workspace = true, default-features = false, features = ["wasm"] } +nym-config = { workspace = true } +nym-credential-storage = { workspace = true } +nym-crypto = { workspace = true, features = ["asymmetric", "serde"] } +nym-gateway-client = { workspace = true, default-features = false, features = ["wasm"] } +nym-sphinx = { workspace = true } +nym-sphinx-acknowledgements = { workspace = true, features = ["serde"] } +nym-statistics-common = { workspace = true } +nym-task = { workspace = true } +nym-topology = { workspace = true, features = ["wasm-serde-types"] } +nym-validator-client = { workspace = true, default-features = false } +nym-http-api-client = { workspace = true } +nym-wasm-utils = { workspace = true } +nym-wasm-storage = { workspace = true } # The `console_error_panic_hook` crate provides better debugging of panics by diff --git a/common/wasm/client-core/src/error.rs b/common/wasm/client-core/src/error.rs index ab41b190dd..05448aff41 100644 --- a/common/wasm/client-core/src/error.rs +++ b/common/wasm/client-core/src/error.rs @@ -11,8 +11,8 @@ use nym_sphinx::addressing::clients::RecipientFormattingError; use nym_sphinx::anonymous_replies::requests::InvalidAnonymousSenderTagRepresentation; use nym_topology::NymTopologyError; use nym_validator_client::ValidatorClientError; +use nym_wasm_utils::wasm_error; use thiserror::Error; -use wasm_utils::wasm_error; #[derive(Debug, Error)] pub enum WasmCoreError { diff --git a/common/wasm/client-core/src/helpers.rs b/common/wasm/client-core/src/helpers.rs index 8d7c4dc6e4..2b69630cf7 100644 --- a/common/wasm/client-core/src/helpers.rs +++ b/common/wasm/client-core/src/helpers.rs @@ -22,15 +22,15 @@ use nym_topology::wasm_helpers::WasmFriendlyNymTopology; use nym_topology::{EpochRewardedSet, NymTopology, RoutingNode}; use nym_validator_client::client::IdentityKey; use nym_validator_client::{nym_api::NymApiClientExt, UserAgent}; +use nym_wasm_utils::error::PromisableResult; use rand::thread_rng; use url::Url; use wasm_bindgen::prelude::wasm_bindgen; use wasm_bindgen_futures::future_to_promise; -use wasm_utils::error::PromisableResult; pub use nym_credential_storage::ephemeral_storage::EphemeralStorage as EphemeralCredentialStorage; use nym_topology::provider_trait::ToTopologyMetadata; -use wasm_utils::{console_log, console_warn}; +use nym_wasm_utils::{console_log, console_warn}; // don't get too excited about the name, under the hood it's just a big fat placeholder // with no disk_persistence diff --git a/common/wasm/client-core/src/lib.rs b/common/wasm/client-core/src/lib.rs index 761df16ae4..90c70febfd 100644 --- a/common/wasm/client-core/src/lib.rs +++ b/common/wasm/client-core/src/lib.rs @@ -35,4 +35,4 @@ pub use nym_validator_client::{DirectSigningReqwestRpcNyxdClient, QueryReqwestRp pub use nym_validator_client::client::IdentityKey; #[cfg(target_arch = "wasm32")] -pub use wasm_utils::set_panic_hook; +pub use nym_wasm_utils::set_panic_hook; diff --git a/common/wasm/client-core/src/storage/core_client_traits.rs b/common/wasm/client-core/src/storage/core_client_traits.rs index 9e1e409891..7526b28eab 100644 --- a/common/wasm/client-core/src/storage/core_client_traits.rs +++ b/common/wasm/client-core/src/storage/core_client_traits.rs @@ -18,7 +18,7 @@ use nym_client_core::client::key_manager::ClientKeys; use nym_client_core::client::replies::reply_storage::browser_backend; use nym_credential_storage::ephemeral_storage::EphemeralStorage as EphemeralCredentialStorage; use nym_crypto::asymmetric::ed25519; -use wasm_utils::console_log; +use nym_wasm_utils::console_log; // temporary until other variants are properly implemented (probably it should get changed into `ClientStorage` // implementing all traits and everything getting combined diff --git a/common/wasm/client-core/src/storage/mod.rs b/common/wasm/client-core/src/storage/mod.rs index b129ab331b..91544172af 100644 --- a/common/wasm/client-core/src/storage/mod.rs +++ b/common/wasm/client-core/src/storage/mod.rs @@ -5,6 +5,7 @@ use crate::error::WasmCoreError; use crate::storage::wasm_client_traits::{v1, v2, WasmClientStorage}; use async_trait::async_trait; use js_sys::Promise; +use nym_wasm_utils::error::{simple_js_error, PromisableResult}; use serde::de::DeserializeOwned; use serde::Serialize; use wasm_bindgen::prelude::*; @@ -13,7 +14,6 @@ use wasm_storage::traits::BaseWasmStorage; use wasm_storage::{ Build, Database, RawDbResult, TryFromJs, TryToJs, VersionChangeEvent, WasmStorage, }; -use wasm_utils::error::{simple_js_error, PromisableResult}; use zeroize::Zeroizing; pub mod core_client_traits; diff --git a/common/wasm/storage/Cargo.toml b/common/wasm/storage/Cargo.toml index 5766af1190..7645ec1da1 100644 --- a/common/wasm/storage/Cargo.toml +++ b/common/wasm/storage/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "wasm-storage" +name = "nym-wasm-storage" version.workspace = true authors = ["Jedrzej Stuczynski "] edition = "2021" @@ -18,4 +18,4 @@ indexed_db_futures = { workspace = true } thiserror = { workspace = true } nym-store-cipher = { path = "../../store-cipher", features = ["json"] } -wasm-utils = { path = "../utils", default-features = false } +nym-wasm-utils = { workspace = true, default-features = false } diff --git a/common/wasm/storage/src/error.rs b/common/wasm/storage/src/error.rs index 3ca74adee4..ee28306c8b 100644 --- a/common/wasm/storage/src/error.rs +++ b/common/wasm/storage/src/error.rs @@ -1,10 +1,10 @@ // Copyright 2023 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 +use nym_wasm_utils::error::simple_js_error; use serde_wasm_bindgen::Error; use thiserror::Error; use wasm_bindgen::JsValue; -use wasm_utils::error::simple_js_error; #[derive(Debug, Error)] pub enum StorageError { diff --git a/common/wasm/storage/src/lib.rs b/common/wasm/storage/src/lib.rs index 8d9e795270..c20015ab53 100644 --- a/common/wasm/storage/src/lib.rs +++ b/common/wasm/storage/src/lib.rs @@ -8,11 +8,11 @@ use nym_store_cipher::{ Aes256Gcm, Algorithm, EncryptedData, KdfInfo, KeySizeUser, Params, StoreCipher, Unsigned, Version, }; +use nym_wasm_utils::console_log; use serde::de::DeserializeOwned; use serde::Serialize; use std::future::IntoFuture; use wasm_bindgen::JsValue; -use wasm_utils::console_log; pub use indexed_db_futures::database::{Database, VersionChangeEvent}; pub use indexed_db_futures::prelude::*; diff --git a/common/wasm/utils/Cargo.toml b/common/wasm/utils/Cargo.toml index 0785c0d8b1..8876e53cd8 100644 --- a/common/wasm/utils/Cargo.toml +++ b/common/wasm/utils/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "wasm-utils" +name = "nym-wasm-utils" version.workspace = true authors = ["Jedrzej Stuczynski "] edition = "2021" diff --git a/common/wireguard-private-metadata/server/Cargo.toml b/common/wireguard-private-metadata/server/Cargo.toml index c222d15350..8ba04d0339 100644 --- a/common/wireguard-private-metadata/server/Cargo.toml +++ b/common/wireguard-private-metadata/server/Cargo.toml @@ -25,9 +25,9 @@ tower-http = { workspace = true, features = [ utoipa = { workspace = true, features = ["axum_extras", "time"] } utoipa-swagger-ui = { workspace = true, features = ["axum"] } -nym-credentials-interface = { path = "../../credentials-interface" } -nym-credential-verification = { path = "../../credential-verification" } -nym-http-api-common = { path = "../../http-api-common", features = [ +nym-credentials-interface = { workspace = true } +nym-credential-verification = { workspace = true } +nym-http-api-common = { workspace = true, features = [ "middleware", "utoipa", "output", diff --git a/common/wireguard-private-metadata/shared/Cargo.toml b/common/wireguard-private-metadata/shared/Cargo.toml index 65daaf4afc..880f54b1e5 100644 --- a/common/wireguard-private-metadata/shared/Cargo.toml +++ b/common/wireguard-private-metadata/shared/Cargo.toml @@ -16,7 +16,7 @@ serde = { workspace = true } thiserror = { workspace = true } utoipa = { workspace = true } -nym-credentials-interface = { path = "../../credentials-interface" } +nym-credentials-interface = { workspace = true } [features] testing = [] diff --git a/common/wireguard-private-metadata/tests/Cargo.toml b/common/wireguard-private-metadata/tests/Cargo.toml index a667663e96..ff3ad816b8 100644 --- a/common/wireguard-private-metadata/tests/Cargo.toml +++ b/common/wireguard-private-metadata/tests/Cargo.toml @@ -12,11 +12,11 @@ license.workspace = true async-trait = { workspace = true } axum = { workspace = true, features = ["tokio", "macros"] } futures = { workspace = true } -nym-credential-verification = { path = "../../credential-verification" } -nym-credentials-interface = { path = "../../credentials-interface" } -nym-crypto = { path = "../../crypto", features = ["asymmetric"] } -nym-http-api-client = { path = "../../http-api-client" } -nym-http-api-common = { path = "../../http-api-common", features = [ +nym-credential-verification = { workspace = true } +nym-credentials-interface = { workspace = true } +nym-crypto = { workspace = true, features = ["asymmetric"] } +nym-http-api-client = { workspace = true } +nym-http-api-common = { workspace = true, features = [ "middleware", "utoipa", "output", diff --git a/common/wireguard/Cargo.toml b/common/wireguard/Cargo.toml index 1423e03eb8..991078b3c7 100644 --- a/common/wireguard/Cargo.toml +++ b/common/wireguard/Cargo.toml @@ -20,14 +20,14 @@ tokio = { workspace = true, features = ["rt-multi-thread", "net", "io-util"] } tokio-stream = { workspace = true } tracing = { workspace = true } -nym-credentials-interface = { path = "../credentials-interface" } -nym-credential-verification = { path = "../credential-verification" } -nym-crypto = { path = "../crypto", features = ["asymmetric"] } +nym-credentials-interface = { workspace = true } +nym-credential-verification = { workspace = true } +nym-crypto = { workspace = true, features = ["asymmetric"] } nym-gateway-storage = { path = "../gateway-storage" } nym-gateway-requests = { path = "../gateway-requests" } nym-network-defaults = { path = "../network-defaults" } nym-task = { path = "../task" } -nym-wireguard-types = { path = "../wireguard-types" } +nym-wireguard-types = { workspace = true } nym-node-metrics = { path = "../../nym-node/nym-node-metrics" } [dev-dependencies] diff --git a/common/zulip-client/Cargo.toml b/common/zulip-client/Cargo.toml index fe9c1c699a..cc065e917c 100644 --- a/common/zulip-client/Cargo.toml +++ b/common/zulip-client/Cargo.toml @@ -19,8 +19,8 @@ url = { workspace = true, features = ["serde"] } serde = { workspace = true, features = ["derive"] } zeroize = { workspace = true } -nym-bin-common = { path = "../bin-common" } -nym-http-api-client = { path = "../http-api-client" } +nym-bin-common = { workspace = true } +nym-http-api-client = { workspace = true } reqwest = { workspace = true } tracing = { workspace = true } diff --git a/contracts/coconut-dkg/Cargo.toml b/contracts/coconut-dkg/Cargo.toml index 977448b9e7..317918dab8 100644 --- a/contracts/coconut-dkg/Cargo.toml +++ b/contracts/coconut-dkg/Cargo.toml @@ -16,7 +16,7 @@ required-features = ["schema-gen"] crate-type = ["cdylib", "rlib"] [dependencies] -nym-coconut-dkg-common = { path = "../../common/cosmwasm-smart-contracts/coconut-dkg" } +nym-coconut-dkg-common = { workspace = true } nym-contracts-common = { path = "../../common/cosmwasm-smart-contracts/contracts-common" } nym-contracts-common-testing = { path = "../../common/cosmwasm-smart-contracts/contracts-common-testing", optional = true } nym-group-contract-common = { path = "../../common/cosmwasm-smart-contracts/group-contract", optional = true } diff --git a/gateway/Cargo.toml b/gateway/Cargo.toml index 3328b23c87..4e6c15d5d5 100644 --- a/gateway/Cargo.toml +++ b/gateway/Cargo.toml @@ -47,10 +47,10 @@ zeroize = { workspace = true } # internal -nym-credentials = { path = "../common/credentials" } -nym-credentials-interface = { path = "../common/credentials-interface" } -nym-credential-verification = { path = "../common/credential-verification" } -nym-crypto = { path = "../common/crypto", features = ["sphinx"] } +nym-credentials = { workspace = true } +nym-credentials-interface = { workspace = true } +nym-credential-verification = { workspace = true } +nym-crypto = { workspace = true, features = ["sphinx"] } nym-gateway-storage = { path = "../common/gateway-storage" } nym-gateway-stats-storage = { path = "../common/gateway-stats-storage" } nym-gateway-requests = { path = "../common/gateway-requests" } @@ -62,18 +62,18 @@ nym-sphinx = { path = "../common/nymsphinx" } nym-statistics-common = { path = "../common/statistics" } nym-task = { path = "../common/task" } nym-topology = { path = "../common/topology" } -nym-validator-client = { path = "../common/client-libs/validator-client" } +nym-validator-client = { workspace = true } nym-ip-packet-router = { path = "../service-providers/ip-packet-router" } nym-node-metrics = { path = "../nym-node/nym-node-metrics" } nym-upgrade-mode-check = { path = "../common/upgrade-mode-check" } nym-wireguard = { path = "../common/wireguard" } nym-wireguard-private-metadata-server = { path = "../common/wireguard-private-metadata/server" } -nym-wireguard-types = { path = "../common/wireguard-types" } +nym-wireguard-types = { workspace = true } -nym-authenticator-requests = { path = "../common/authenticator-requests" } -nym-client-core = { path = "../common/client-core", features = ["cli"] } -nym-id = { path = "../common/nym-id" } +nym-authenticator-requests = { workspace = true } +nym-client-core = { workspace = true, features = ["cli"] } +nym-id = { workspace = true } nym-service-provider-requests-common = { path = "../common/service-provider-requests-common" } defguard_wireguard_rs = { workspace = true } diff --git a/nym-api/Cargo.toml b/nym-api/Cargo.toml index d6957c30f8..b8b633e939 100644 --- a/nym-api/Cargo.toml +++ b/nym-api/Cargo.toml @@ -68,43 +68,43 @@ utoipa-swagger-ui = { workspace = true, features = ["axum"] } tracing = { workspace = true } ## internal -nym-cache = { path = "../common/nym-cache" } -nym-bandwidth-controller = { path = "../common/bandwidth-controller" } -nym-ecash-contract-common = { path = "../common/cosmwasm-smart-contracts/ecash-contract" } -nym-ecash-time = { path = "../common/ecash-time", features = ["expiration"] } -nym-coconut-dkg-common = { path = "../common/cosmwasm-smart-contracts/coconut-dkg" } -nym-compact-ecash = { path = "../common/nym_offline_compact_ecash" } -nym-credentials-interface = { path = "../common/credentials-interface" } -nym-config = { path = "../common/config" } +nym-cache = { workspace = true } +nym-bandwidth-controller = { workspace = true } +nym-ecash-contract-common = { workspace = true } +nym-ecash-time = { workspace = true, features = ["expiration"] } +nym-coconut-dkg-common = { workspace = true } +nym-compact-ecash = { workspace = true } +nym-credentials-interface = { workspace = true } +nym-config = { workspace = true } cosmwasm-std = { workspace = true } -nym-credential-storage = { path = "../common/credential-storage", features = [ +nym-credential-storage = { workspace = true, features = [ "persistent-storage", ] } -nym-credentials = { path = "../common/credentials" } -nym-crypto = { path = "../common/crypto" } +nym-credentials = { workspace = true } +nym-crypto = { workspace = true } cw2 = { workspace = true } cw3 = { workspace = true } cw4 = { workspace = true } nym-dkg = { path = "../common/dkg", features = ["cw-types"] } -nym-gateway-client = { path = "../common/client-libs/gateway-client" } -nym-mixnet-contract-common = { path = "../common/cosmwasm-smart-contracts/mixnet-contract", features = ["utoipa"] } -nym-contracts-common = { path = "../common/cosmwasm-smart-contracts/contracts-common", features = ["naive_float", "utoipa"] } -nym-sphinx = { path = "../common/nymsphinx" } -nym-pemstore = { path = "../common/pemstore" } -nym-task = { path = "../common/task" } -nym-topology = { path = "../common/topology" } -nym-api-requests = { path = "nym-api-requests" } -nym-validator-client = { path = "../common/client-libs/validator-client" } -nym-http-api-client = { path = "../common/http-api-client" } -nym-bin-common = { path = "../common/bin-common", features = ["output_format", "openapi", "basic_tracing"] } -nym-node-tester-utils = { path = "../common/node-tester-utils" } -nym-node-requests = { path = "../nym-node/nym-node-requests" } -nym-types = { path = "../common/types" } -nym-http-api-common = { path = "../common/http-api-common", features = ["utoipa", "output", "middleware"] } -nym-serde-helpers = { path = "../common/serde-helpers", features = ["date"] } -nym-ticketbooks-merkle = { path = "../common/ticketbooks-merkle" } -nym-statistics-common = { path = "../common/statistics" } -nym-ecash-signer-check = { path = "../common/ecash-signer-check" } +nym-gateway-client = { workspace = true } +nym-mixnet-contract-common = { workspace = true, features = ["utoipa"] } +nym-contracts-common = { workspace = true, features = ["naive_float", "utoipa"] } +nym-sphinx = { workspace = true } +nym-pemstore = { workspace = true } +nym-task = { workspace = true } +nym-topology = { workspace = true } +nym-api-requests = { workspace = true } +nym-validator-client = { workspace = true } +nym-http-api-client = { workspace = true } +nym-bin-common = { workspace = true, features = ["output_format", "openapi", "basic_tracing"] } +nym-node-tester-utils = { workspace = true } +nym-node-requests = { workspace = true } +nym-types = { workspace = true } +nym-http-api-common = { workspace = true, features = ["utoipa", "output", "middleware"] } +nym-serde-helpers = { workspace = true, features = ["date"] } +nym-ticketbooks-merkle = { workspace = true } +nym-statistics-common = { workspace = true } +nym-ecash-signer-check = { workspace = true } [features] diff --git a/nym-api/nym-api-requests/Cargo.toml b/nym-api/nym-api-requests/Cargo.toml index a83de6ee9c..e926222571 100644 --- a/nym-api/nym-api-requests/Cargo.toml +++ b/nym-api/nym-api-requests/Cargo.toml @@ -27,21 +27,21 @@ tracing = { workspace = true } # for serde on secp256k1 signatures ecdsa = { workspace = true, features = ["serde"] } -nym-serde-helpers = { path = "../../common/serde-helpers", features = ["bs58", "base64", "date"] } -nym-credentials-interface = { path = "../../common/credentials-interface" } -nym-crypto = { path = "../../common/crypto", features = ["serde", "asymmetric"] } +nym-serde-helpers = { workspace = true, features = ["bs58", "base64", "date"] } +nym-credentials-interface = { workspace = true } +nym-crypto = { workspace = true, features = ["serde", "asymmetric"] } -nym-config = { path = "../../common/config" } -nym-ecash-time = { path = "../../common/ecash-time" } -nym-compact-ecash = { path = "../../common/nym_offline_compact_ecash" } -nym-contracts-common = { path = "../../common/cosmwasm-smart-contracts/contracts-common", features = ["naive_float"] } -nym-mixnet-contract-common = { path = "../../common/cosmwasm-smart-contracts/mixnet-contract", features = ["utoipa"] } -nym-coconut-dkg-common = { path = "../../common/cosmwasm-smart-contracts/coconut-dkg" } +nym-config = { workspace = true } +nym-ecash-time = { workspace = true } +nym-compact-ecash = { workspace = true } +nym-contracts-common = { workspace = true , features = ["naive_float"] } +nym-mixnet-contract-common = { workspace = true , features = ["utoipa"] } +nym-coconut-dkg-common = { workspace = true } nym-node-requests = { path = "../../nym-node/nym-node-requests", default-features = false, features = ["openapi"] } nym-noise-keys = { path = "../../common/nymnoise/keys" } -nym-network-defaults = { path = "../../common/network-defaults" } -nym-ticketbooks-merkle = { path = "../../common/ticketbooks-merkle" } -nym-ecash-signer-check-types = { path = "../../common/ecash-signer-check-types" } +nym-network-defaults = { workspace = true } +nym-ticketbooks-merkle = { workspace = true } +nym-ecash-signer-check-types = { workspace = true } [dev-dependencies] diff --git a/nym-authenticator-client/Cargo.toml b/nym-authenticator-client/Cargo.toml index c9a92b2f2d..86c0a90f03 100644 --- a/nym-authenticator-client/Cargo.toml +++ b/nym-authenticator-client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-authenticator-client" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true @@ -21,12 +21,12 @@ tokio-util.workspace = true tokio.workspace = true tracing.workspace = true -nym-authenticator-requests = { path = "../common/authenticator-requests" } -nym-bandwidth-controller = { path = "../common/bandwidth-controller" } -nym-credentials-interface = { path = "../common/credentials-interface" } -nym-crypto = { path = "../common/crypto" } -nym-registration-common = { path = "../common/registration" } +nym-authenticator-requests = { workspace = true } +nym-bandwidth-controller = { workspace = true } +nym-credentials-interface = { workspace = true } +nym-crypto = { workspace = true } +nym-registration-common = { workspace = true } nym-sdk = { path = "../sdk/rust/nym-sdk" } nym-service-provider-requests-common = { path = "../common/service-provider-requests-common" } -nym-validator-client = { path = "../common/client-libs/validator-client" } -nym-wireguard-types = { path = "../common/wireguard-types" } +nym-validator-client = { workspace = true } +nym-wireguard-types = { workspace = true } diff --git a/nym-browser-extension/storage/Cargo.toml b/nym-browser-extension/storage/Cargo.toml index 98fcd059e5..c8b019ea3d 100644 --- a/nym-browser-extension/storage/Cargo.toml +++ b/nym-browser-extension/storage/Cargo.toml @@ -26,8 +26,8 @@ thiserror = { workspace = true } console_error_panic_hook = { workspace = true, optional = true } -wasm-utils = { path = "../../common/wasm/utils" } -wasm-storage = { path = "../../common/wasm/storage" } +nym-wasm-utils = { path = "../../common/wasm/utils" } +nym-wasm-storage = { path = "../../common/wasm/storage" } #[package.metadata.wasm-pack.profile.release] diff --git a/nym-credential-proxy/nym-credential-proxy-requests/Cargo.toml b/nym-credential-proxy/nym-credential-proxy-requests/Cargo.toml index 328dea0d13..8032056714 100644 --- a/nym-credential-proxy/nym-credential-proxy-requests/Cargo.toml +++ b/nym-credential-proxy/nym-credential-proxy-requests/Cargo.toml @@ -27,7 +27,7 @@ utoipa = { workspace = true, optional = true, features = ["uuid"] } nym-credentials = { path = "../../common/credentials" } nym-credentials-interface = { path = "../../common/credentials-interface" } -nym-http-api-common = { path = "../../common/http-api-common", optional = true } +nym-http-api-common = { workspace = true, optional = true } nym-http-api-client = { path = "../../common/http-api-client" } nym-serde-helpers = { path = "../../common/serde-helpers", features = ["bs58"] } nym-upgrade-mode-check = { path = "../../common/upgrade-mode-check" } diff --git a/nym-credential-proxy/nym-credential-proxy/Cargo.toml b/nym-credential-proxy/nym-credential-proxy/Cargo.toml index 6715e0841a..dceda1d622 100644 --- a/nym-credential-proxy/nym-credential-proxy/Cargo.toml +++ b/nym-credential-proxy/nym-credential-proxy/Cargo.toml @@ -49,9 +49,9 @@ zeroize.workspace = true nym-bin-common = { path = "../../common/bin-common", features = [ "basic_tracing", ] } -nym-compact-ecash = { path = "../../common/nym_offline_compact_ecash" } -nym-config = { path = "../../common/config" } -nym-crypto = { path = "../../common/crypto", features = [ +nym-compact-ecash = { workspace = true } +nym-config = { workspace = true } +nym-crypto = { workspace = true, features = [ "asymmetric", "rand", "serde", @@ -59,12 +59,12 @@ nym-crypto = { path = "../../common/crypto", features = [ nym-credentials = { path = "../../common/credentials" } nym-credentials-interface = { path = "../../common/credentials-interface" } nym-ecash-contract-common = { path = "../../common/cosmwasm-smart-contracts/ecash-contract" } -nym-http-api-common = { path = "../../common/http-api-common", features = [ +nym-http-api-common = { workspace = true, features = [ "utoipa", "middleware", ] } nym-http-api-client = { path = "../../common/http-api-client", default-features = false } -nym-validator-client = { path = "../../common/client-libs/validator-client" } +nym-validator-client = { workspace = true } nym-network-defaults = { path = "../../common/network-defaults" } nym-credential-proxy-requests = { path = "../nym-credential-proxy-requests", features = [ diff --git a/nym-credential-proxy/vpn-api-lib-wasm/Cargo.toml b/nym-credential-proxy/vpn-api-lib-wasm/Cargo.toml index 1b7b510f67..52baabd2cb 100644 --- a/nym-credential-proxy/vpn-api-lib-wasm/Cargo.toml +++ b/nym-credential-proxy/vpn-api-lib-wasm/Cargo.toml @@ -28,11 +28,11 @@ tsify = { workspace = true, features = ["js"] } serde-wasm-bindgen = { workspace = true } # NYM: -nym-bin-common = { path = "../../common/bin-common" } -nym-crypto = { path = "../../common/crypto", features = ["asymmetric"] } -nym-compact-ecash = { path = "../../common/nym_offline_compact_ecash" } -nym-credentials = { path = "../../common/credentials" } -nym-credentials-interface = { path = "../../common/credentials-interface" } -nym-ecash-time = { path = "../../common/ecash-time", features = ["expiration"] } -nym-credential-proxy-requests = { path = "../nym-credential-proxy-requests", default-features = false, features = ["tsify"] } -wasm-utils = { path = "../../common/wasm/utils" } +nym-bin-common = { workspace = true } +nym-crypto = { workspace = true, features = ["asymmetric"] } +nym-compact-ecash = { workspace = true } +nym-credentials = { workspace = true } +nym-credentials-interface = { workspace = true } +nym-ecash-time = { workspace = true, features = ["expiration"] } +nym-credential-proxy-requests = { workspace = true, features = ["tsify"] } +nym-wasm-utils = { workspace = true } diff --git a/nym-credential-proxy/vpn-api-lib-wasm/src/error.rs b/nym-credential-proxy/vpn-api-lib-wasm/src/error.rs index 7322254064..5e1255bdbc 100644 --- a/nym-credential-proxy/vpn-api-lib-wasm/src/error.rs +++ b/nym-credential-proxy/vpn-api-lib-wasm/src/error.rs @@ -1,9 +1,9 @@ // Copyright 2024 Nym Technologies SA // SPDX-License-Identifier: GPL-3.0-only +use nym_wasm_utils::wasm_error; use serde_wasm_bindgen::Error; use thiserror::Error; -use wasm_utils::wasm_error; #[derive(Debug, Error)] pub enum VpnApiLibError { diff --git a/nym-credential-proxy/vpn-api-lib-wasm/src/lib.rs b/nym-credential-proxy/vpn-api-lib-wasm/src/lib.rs index abdff1bfe8..00ca53805a 100644 --- a/nym-credential-proxy/vpn-api-lib-wasm/src/lib.rs +++ b/nym-credential-proxy/vpn-api-lib-wasm/src/lib.rs @@ -19,12 +19,12 @@ use nym_credentials::{ use nym_credentials_interface::TicketType; use nym_crypto::asymmetric::ed25519; use nym_ecash_time::{EcashTime, ecash_default_expiration_date}; +use nym_wasm_utils::console_error; use serde::{Deserialize, Serialize}; use std::collections::HashMap; use time::Date; use tsify::Tsify; use wasm_bindgen::prelude::*; -use wasm_utils::console_error; use zeroize::Zeroizing; pub mod error; @@ -267,11 +267,11 @@ pub struct FullSerialisedNymIssuedTicketbook { #[wasm_bindgen(start)] pub fn main() { - wasm_utils::console_log!("[rust main]: rust module loaded"); - wasm_utils::console_log!( + nym_wasm_utils::console_log!("[rust main]: rust module loaded"); + nym_wasm_utils::console_log!( "vpn-api-lib version used:\n{}", nym_bin_common::bin_info!().pretty_print() ); - wasm_utils::console_log!("[rust main]: setting panic hook"); - wasm_utils::set_panic_hook(); + nym_wasm_utils::console_log!("[rust main]: setting panic hook"); + nym_wasm_utils::set_panic_hook(); } diff --git a/nym-data-observatory/Cargo.toml b/nym-data-observatory/Cargo.toml index 3eba6c3444..448a078923 100644 --- a/nym-data-observatory/Cargo.toml +++ b/nym-data-observatory/Cargo.toml @@ -20,11 +20,11 @@ axum = { workspace = true, features = ["tokio"] } chrono = { workspace = true } clap = { workspace = true, features = ["cargo", "derive", "env"] } cosmrs = { workspace = true } -nym-config = { path = "../common/config" } +nym-config = { workspace = true } nym-bin-common = { path = "../common/bin-common", features = ["output_format"] } nym-network-defaults = { path = "../common/network-defaults" } nym-task = { path = "../common/task" } -nym-validator-client = { path = "../common/client-libs/validator-client" } +nym-validator-client = { workspace = true } nyxd-scraper-psql = { path = "../common/nyxd-scraper-psql" } nyxd-scraper-shared = { path = "../common/nyxd-scraper-shared" } reqwest = { workspace = true, features = ["rustls-tls"] } diff --git a/nym-gateway-probe/Cargo.toml b/nym-gateway-probe/Cargo.toml index cd9ba0edfa..5579cdc946 100644 --- a/nym-gateway-probe/Cargo.toml +++ b/nym-gateway-probe/Cargo.toml @@ -42,20 +42,20 @@ x25519-dalek = { workspace = true, features = [ "static_secrets", ] } -nym-authenticator-requests = { path = "../common/authenticator-requests" } -nym-bandwidth-controller = { path = "../common/bandwidth-controller" } -nym-bin-common = { path = "../common/bin-common" } -nym-client-core = { path = "../common/client-core" } +nym-authenticator-requests = { workspace = true } +nym-bandwidth-controller = { workspace = true } +nym-bin-common = { workspace = true } +nym-client-core = { workspace = true } nym-crypto = { path = "../common/crypto" } -nym-config = { path = "../common/config" } +nym-config = { workspace = true } nym-connection-monitor = { path = "../common/nym-connection-monitor" } nym-credentials-interface = { path = "../common/credentials-interface" } nym-credential-utils = { path = "../common/credential-utils" } -nym-ip-packet-client = { path = "../nym-ip-packet-client" } -nym-authenticator-client = { path = "../nym-authenticator-client" } -nym-ip-packet-requests = { path = "../common/ip-packet-requests" } -nym-sdk = { path = "../sdk/rust/nym-sdk" } -nym-validator-client = { path = "../common/client-libs/validator-client" } +nym-ip-packet-client = { workspace = true } +nym-authenticator-client = { workspace = true } +nym-ip-packet-requests = { workspace = true } +nym-sdk = { workspace = true } +nym-validator-client = { workspace = true } nym-credentials = { path = "../common/credentials" } nym-http-api-client-macro = { path = "../common/http-api-client-macro" } nym-http-api-client = { path = "../common/http-api-client" } diff --git a/nym-ip-packet-client/Cargo.toml b/nym-ip-packet-client/Cargo.toml index 5bb5a5a0c2..13b45ca821 100644 --- a/nym-ip-packet-client/Cargo.toml +++ b/nym-ip-packet-client/Cargo.toml @@ -20,5 +20,5 @@ tokio-util.workspace = true tokio.workspace = true tracing.workspace = true -nym-sdk = { path = "../sdk/rust/nym-sdk" } -nym-ip-packet-requests = { path = "../common/ip-packet-requests" } +nym-sdk = { workspace = true } +nym-ip-packet-requests = { workspace = true } diff --git a/nym-network-monitor/Cargo.toml b/nym-network-monitor/Cargo.toml index 5b9b29e7db..1f1c158ff1 100644 --- a/nym-network-monitor/Cargo.toml +++ b/nym-network-monitor/Cargo.toml @@ -40,6 +40,6 @@ nym-sdk = { path = "../sdk/rust/nym-sdk" } nym-sphinx = { path = "../common/nymsphinx" } nym-topology = { path = "../common/topology" } nym-types = { path = "../common/types" } -nym-validator-client = { path = "../common/client-libs/validator-client" } +nym-validator-client = { workspace = true } nym-http-api-client = { path = "../common/http-api-client" } nym-mixnet-contract-common = { path = "../common/cosmwasm-smart-contracts/mixnet-contract" } diff --git a/nym-node-status-api/nym-node-status-api/Cargo.toml b/nym-node-status-api/nym-node-status-api/Cargo.toml index b7830cb46d..4e91a830c0 100644 --- a/nym-node-status-api/nym-node-status-api/Cargo.toml +++ b/nym-node-status-api/nym-node-status-api/Cargo.toml @@ -35,11 +35,11 @@ nym-bin-common = { path = "../../common/bin-common", features = ["models"] } nym-node-status-client = { path = "../nym-node-status-client" } nym-crypto = { path = "../../common/crypto", features = ["asymmetric", "serde"] } nym-http-api-client = { path = "../../common/http-api-client" } -nym-http-api-common = { path = "../../common/http-api-common", features = ["middleware"] } +nym-http-api-common = { workspace = true, features = ["middleware"] } nym-network-defaults = { path = "../../common/network-defaults" } nym-serde-helpers = { path = "../../common/serde-helpers" } nym-statistics-common = { path = "../../common/statistics" } -nym-validator-client = { path = "../../common/client-libs/validator-client" } +nym-validator-client = { workspace = true } nym-task = { path = "../../common/task" } nym-node-requests = { path = "../../nym-node/nym-node-requests", features = ["openapi"] } nym-ecash-time = { path = "../../common/ecash-time", features = ["expiration"] } diff --git a/nym-node/Cargo.toml b/nym-node/Cargo.toml index 8402b9cc31..6c5a60d0f3 100644 --- a/nym-node/Cargo.toml +++ b/nym-node/Cargo.toml @@ -57,7 +57,7 @@ nym-bin-common = { path = "../common/bin-common", features = [ nym-client-core-config-types = { path = "../common/client-core/config-types", features = [ "disk-persistence", ] } -nym-config = { path = "../common/config" } +nym-config = { workspace = true } nym-credential-verification = { path = "../common/credential-verification" } nym-crypto = { path = "../common/crypto", features = ["asymmetric", "rand"] } nym-nonexhaustive-delayqueue = { path = "../common/nonexhaustive-delayqueue" } @@ -65,23 +65,23 @@ nym-mixnet-client = { path = "../common/client-libs/mixnet-client" } nym-noise = { path = "../common/nymnoise" } nym-noise-keys = { path = "../common/nymnoise/keys" } nym-pemstore = { path = "../common/pemstore" } -nym-sphinx-acknowledgements = { path = "../common/nymsphinx/acknowledgements" } -nym-sphinx-addressing = { path = "../common/nymsphinx/addressing" } -nym-sphinx-framing = { path = "../common/nymsphinx/framing" } -nym-sphinx-types = { path = "../common/nymsphinx/types" } -nym-sphinx-forwarding = { path = "../common/nymsphinx/forwarding" } +nym-sphinx-acknowledgements = { workspace = true } +nym-sphinx-addressing = { workspace = true } +nym-sphinx-framing = { workspace = true } +nym-sphinx-types = { workspace = true } +nym-sphinx-forwarding = { workspace = true } nym-sphinx-routing = { path = "../common/nymsphinx/routing" } nym-sphinx-params = { path = "../common/nymsphinx/params" } nym-statistics-common = { path = "../common/statistics" } nym-task = { path = "../common/task" } nym-types = { path = "../common/types" } -nym-validator-client = { path = "../common/client-libs/validator-client" } +nym-validator-client = { workspace = true } nym-wireguard = { path = "../common/wireguard" } -nym-wireguard-types = { path = "../common/wireguard-types" } +nym-wireguard-types = { workspace = true } nym-verloc = { path = "../common/verloc" } -nym-metrics = { path = "../common/nym-metrics" } +nym-metrics = { workspace = true} nym-gateway-stats-storage = { path = "../common/gateway-stats-storage" } -nym-topology = { path = "../common/topology" } +nym-topology = { workspace = true } nym-http-api-client = { path = "../common/http-api-client" } # http server @@ -93,7 +93,7 @@ tower-http = { workspace = true, features = ["fs"] } utoipa = { workspace = true, features = ["axum_extras", "time"] } utoipa-swagger-ui = { workspace = true, features = ["axum"] } -nym-http-api-common = { path = "../common/http-api-common", features = [ +nym-http-api-common = { workspace = true, features = [ "utoipa", "output", "middleware", diff --git a/nym-node/nym-node-metrics/Cargo.toml b/nym-node/nym-node-metrics/Cargo.toml index adda13d4d9..e683e5b900 100644 --- a/nym-node/nym-node-metrics/Cargo.toml +++ b/nym-node/nym-node-metrics/Cargo.toml @@ -16,5 +16,5 @@ time = { workspace = true } strum = { workspace = true } tracing = { workspace = true } -nym-metrics = { path = "../../common/nym-metrics" } -nym-statistics-common = { path = "../../common/statistics" } +nym-metrics = { workspace = true } +nym-statistics-common = { workspace = true } diff --git a/nym-registration-client/Cargo.toml b/nym-registration-client/Cargo.toml index d2b57bd75f..110f62582c 100644 --- a/nym-registration-client/Cargo.toml +++ b/nym-registration-client/Cargo.toml @@ -20,11 +20,11 @@ tracing.workspace = true typed-builder.workspace = true url.workspace = true -nym-authenticator-client = { path = "../nym-authenticator-client" } -nym-bandwidth-controller = { path = "../common/bandwidth-controller" } -nym-credential-storage = { path = "../common/credential-storage" } -nym-credentials-interface = { path = "../common/credentials-interface" } -nym-ip-packet-client = { path = "../nym-ip-packet-client" } +nym-authenticator-client = { workspace = true } +nym-bandwidth-controller = { workspace = true } +nym-credential-storage = { workspace = true } +nym-credentials-interface = { workspace = true } +nym-ip-packet-client = { workspace = true } nym-registration-common = { path = "../common/registration" } nym-sdk = { path = "../sdk/rust/nym-sdk" } -nym-validator-client = { path = "../common/client-libs/validator-client" } +nym-validator-client = { workspace = true } diff --git a/nym-signers-monitor/Cargo.toml b/nym-signers-monitor/Cargo.toml index 5763e10260..0b867f04ad 100644 --- a/nym-signers-monitor/Cargo.toml +++ b/nym-signers-monitor/Cargo.toml @@ -25,7 +25,7 @@ nym-bin-common = { path = "../common/bin-common", features = ["output_format", " nym-ecash-signer-check = { path = "../common/ecash-signer-check" } nym-network-defaults = { path = "../common/network-defaults" } nym-task = { path = "../common/task" } -nym-validator-client = { path = "../common/client-libs/validator-client" } +nym-validator-client = { workspace = true } zulip-client = { path = "../common/zulip-client" } [lints] diff --git a/nym-statistics-api/Cargo.toml b/nym-statistics-api/Cargo.toml index 83a73177ff..961a656681 100644 --- a/nym-statistics-api/Cargo.toml +++ b/nym-statistics-api/Cargo.toml @@ -39,7 +39,7 @@ utoipauto.workspace = true #internal nym-bin-common = { path = "../common/bin-common" } -nym-http-api-common = { path = "../common/http-api-common", features = [ +nym-http-api-common = { workspace = true, features = [ "middleware", ] } nym-statistics-common = { path = "../common/statistics", features = [ @@ -48,7 +48,7 @@ nym-statistics-common = { path = "../common/statistics", features = [ nym-task = { path = "../common/task" } nym-http-api-client = { path = "../common/http-api-client" } -nym-validator-client = { path = "../common/client-libs/validator-client" } +nym-validator-client = { workspace = true } [build-dependencies] anyhow = { workspace = true } diff --git a/nym-validator-rewarder/Cargo.toml b/nym-validator-rewarder/Cargo.toml index 02ae864855..6cc213c7ef 100644 --- a/nym-validator-rewarder/Cargo.toml +++ b/nym-validator-rewarder/Cargo.toml @@ -33,18 +33,18 @@ humantime = { workspace = true } humantime-serde.workspace = true # internal -nym-bin-common = { path = "../common/bin-common", features = ["output_format", "basic_tracing"] } -nym-config = { path = "../common/config" } -nym-ecash-time = { path = "../common/ecash-time" } -nym-contracts-common = { path = "../common/cosmwasm-smart-contracts/contracts-common" } -nym-compact-ecash = { path = "../common/nym_offline_compact_ecash" } -nym-crypto = { path = "../common/crypto", features = ["asymmetric", "rand"] } -nym-credentials = { path = "../common/credentials" } +nym-bin-common = { workspace = true, features = ["output_format", "basic_tracing"] } +nym-config = { workspace = true } +nym-ecash-time = { workspace = true } +nym-contracts-common = { workspace = true } +nym-compact-ecash = { workspace = true } +nym-crypto = { workspace = true, features = ["asymmetric", "rand"] } +nym-credentials = { workspace = true } nym-network-defaults = { path = "../common/network-defaults" } nym-task = { path = "../common/task" } -nym-validator-client = { path = "../common/client-libs/validator-client" } +nym-validator-client = { workspace = true } nym-http-api-client = { path = "../common/http-api-client" } -nym-coconut-dkg-common = { path = "../common/cosmwasm-smart-contracts/coconut-dkg" } +nym-coconut-dkg-common = { workspace = true } nyxd-scraper-sqlite = { path = "../common/nyxd-scraper-sqlite" } nym-ticketbooks-merkle = { path = "../common/ticketbooks-merkle" } nym-serde-helpers = { path = "../common/serde-helpers", features = ["base64"] } diff --git a/nym-wallet/src-tauri/Cargo.toml b/nym-wallet/src-tauri/Cargo.toml index 6327991107..1c32fb69bb 100644 --- a/nym-wallet/src-tauri/Cargo.toml +++ b/nym-wallet/src-tauri/Cargo.toml @@ -57,7 +57,7 @@ cosmwasm-std = "=2.2.2" cosmrs = { version = "0.22.0" } nym-node-requests = { path = "../../nym-node/nym-node-requests" } -nym-validator-client = { path = "../../common/client-libs/validator-client" } +nym-validator-client = { workspace = true } nym-crypto = { path = "../../common/crypto", features = ["asymmetric"] } nym-contracts-common = { path = "../../common/cosmwasm-smart-contracts/contracts-common" } nym-mixnet-contract-common = { path = "../../common/cosmwasm-smart-contracts/mixnet-contract" } diff --git a/nyx-chain-watcher/Cargo.toml b/nyx-chain-watcher/Cargo.toml index 0e2dfe38fb..594fe150ee 100644 --- a/nyx-chain-watcher/Cargo.toml +++ b/nyx-chain-watcher/Cargo.toml @@ -20,11 +20,11 @@ async-trait.workspace = true axum = { workspace = true, features = ["tokio"] } chrono = { workspace = true } clap = { workspace = true, features = ["cargo", "derive", "env"] } -nym-config = { path = "../common/config" } +nym-config = { workspace = true } nym-bin-common = { path = "../common/bin-common", features = ["output_format"] } nym-network-defaults = { path = "../common/network-defaults" } nym-task = { path = "../common/task" } -nym-validator-client = { path = "../common/client-libs/validator-client" } +nym-validator-client = { workspace = true } nyxd-scraper-sqlite = { path = "../common/nyxd-scraper-sqlite" } reqwest = { workspace = true, features = ["rustls-tls"] } schemars = { workspace = true } diff --git a/service-providers/common/Cargo.toml b/service-providers/common/Cargo.toml index fb70c002b9..79026d40b2 100644 --- a/service-providers/common/Cargo.toml +++ b/service-providers/common/Cargo.toml @@ -7,8 +7,8 @@ license.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -nym-bin-common = { path = "../../common/bin-common" } -nym-sphinx-anonymous-replies = { path = "../../common/nymsphinx/anonymous-replies" } +nym-bin-common = { workspace = true } +nym-sphinx-anonymous-replies = { workspace = true } async-trait = { workspace = true } log = { workspace = true } @@ -21,5 +21,5 @@ serde_json = { workspace = true } anyhow = { workspace = true } tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } -nym-sdk = { path = "../../sdk/rust/nym-sdk" } -nym-socks5-requests = { path = "../../common/socks5/requests" } +nym-sdk = { workspace = true } +nym-socks5-requests = { workspace = true } diff --git a/service-providers/ip-packet-router/Cargo.toml b/service-providers/ip-packet-router/Cargo.toml index 769b19f822..7b1747e6fd 100644 --- a/service-providers/ip-packet-router/Cargo.toml +++ b/service-providers/ip-packet-router/Cargo.toml @@ -18,24 +18,25 @@ clap.workspace = true etherparse = { workspace = true } futures = { workspace = true } log = { workspace = true } -nym-bin-common = { path = "../../common/bin-common", features = ["clap", "basic_tracing"] } -nym-client-core = { path = "../../common/client-core" } -nym-config = { path = "../../common/config" } -nym-crypto = { path = "../../common/crypto" } -nym-exit-policy = { path = "../../common/exit-policy" } -nym-id = { path = "../../common/nym-id" } -nym-ip-packet-requests = { path = "../../common/ip-packet-requests" } -nym-network-defaults = { path = "../../common/network-defaults" } +nym-bin-common = { workspace = true, features = ["clap", "basic_tracing"] } +nym-client-core = { workspace = true } +nym-config = { workspace = true } +nym-crypto = { workspace = true } +nym-exit-policy = { workspace = true } +nym-id = { workspace = true } +nym-ip-packet-requests = { workspace = true } +nym-network-defaults = { workspace = true } + nym-network-requester = { path = "../network-requester" } -nym-sdk = { path = "../../sdk/rust/nym-sdk" } -nym-service-provider-requests-common = { path = "../../common/service-provider-requests-common" } -nym-service-providers-common = { path = "../common" } -nym-sphinx = { path = "../../common/nymsphinx" } -nym-task = { path = "../../common/task" } -nym-tun = { path = "../../common/tun" } -nym-types = { path = "../../common/types" } -nym-wireguard = { path = "../../common/wireguard" } -nym-wireguard-types = { path = "../../common/wireguard-types" } +nym-sdk = { workspace = true } +nym-service-provider-requests-common = { workspace = true } +nym-service-providers-common = { workspace = true } +nym-sphinx = { workspace = true } +nym-task = { workspace = true } +nym-tun = { workspace = true } +nym-types = { workspace = true } +nym-wireguard = { workspace = true } +nym-wireguard-types = { workspace = true } rand = { workspace = true } reqwest.workspace = true serde = { workspace = true, features = ["derive"] } diff --git a/tools/internal/contract-state-importer/importer-cli/Cargo.toml b/tools/internal/contract-state-importer/importer-cli/Cargo.toml index 3814ccf172..68ae16841a 100644 --- a/tools/internal/contract-state-importer/importer-cli/Cargo.toml +++ b/tools/internal/contract-state-importer/importer-cli/Cargo.toml @@ -22,7 +22,7 @@ tokio = { workspace = true, features = ["rt-multi-thread", "net", "signal"] } tracing = { workspace = true } importer-contract = { path = "../importer-contract" } -nym-validator-client = { path = "../../../../common/client-libs/validator-client" } +nym-validator-client = { workspace = true } nym-bin-common = { path = "../../../../common/bin-common", features = ["basic_tracing"] } nym-network-defaults = { path = "../../../../common/network-defaults" } diff --git a/tools/internal/testnet-manager/Cargo.toml b/tools/internal/testnet-manager/Cargo.toml index 8182586e17..00210fcd7f 100644 --- a/tools/internal/testnet-manager/Cargo.toml +++ b/tools/internal/testnet-manager/Cargo.toml @@ -36,10 +36,10 @@ zeroize = { workspace = true, features = ["zeroize_derive"] } nym-bin-common = { path = "../../../common/bin-common", features = ["output_format", "basic_tracing"] } nym-crypto = { path = "../../../common/crypto", features = ["asymmetric", "rand", "serde"] } -nym-config = { path = "../../../common/config" } -nym-validator-client = { path = "../../../common/client-libs/validator-client" } -nym-compact-ecash = { path = "../../../common/nym_offline_compact_ecash" } -nym-http-api-client = { path = "../../../common/http-api-client" } +nym-config = { workspace = true } +nym-validator-client = { workspace = true } +nym-compact-ecash = { workspace = true } +nym-http-api-client = { workspace = true } dkg-bypass-contract = { path = "dkg-bypass-contract", default-features = false } # contracts: @@ -48,7 +48,7 @@ nym-contracts-common = { path = "../../../common/cosmwasm-smart-contracts/contra nym-vesting-contract-common = { path = "../../../common/cosmwasm-smart-contracts/vesting-contract" } nym-group-contract-common = { path = "../../../common/cosmwasm-smart-contracts/group-contract" } nym-ecash-contract-common = { path = "../../../common/cosmwasm-smart-contracts/ecash-contract" } -nym-coconut-dkg-common = { path = "../../../common/cosmwasm-smart-contracts/coconut-dkg" } +nym-coconut-dkg-common = { workspace = true } nym-multisig-contract-common = { path = "../../../common/cosmwasm-smart-contracts/multisig-contract" } nym-performance-contract-common = { path = "../../../common/cosmwasm-smart-contracts/nym-performance-contract" } nym-pemstore = { path = "../../../common/pemstore" } diff --git a/tools/internal/testnet-manager/dkg-bypass-contract/Cargo.toml b/tools/internal/testnet-manager/dkg-bypass-contract/Cargo.toml index d92070bc00..45c2caa551 100644 --- a/tools/internal/testnet-manager/dkg-bypass-contract/Cargo.toml +++ b/tools/internal/testnet-manager/dkg-bypass-contract/Cargo.toml @@ -18,7 +18,7 @@ cosmwasm-std = { workspace = true } cosmwasm-schema = { workspace = true } cw-storage-plus = { workspace = true } -nym-coconut-dkg-common = { path = "../../../../common/cosmwasm-smart-contracts/coconut-dkg" } +nym-coconut-dkg-common = { workspace = true } nym-contracts-common = { path = "../../../../common/cosmwasm-smart-contracts/contracts-common" } [features] diff --git a/tools/internal/validator-status-check/Cargo.toml b/tools/internal/validator-status-check/Cargo.toml index 6506045b10..388e681597 100644 --- a/tools/internal/validator-status-check/Cargo.toml +++ b/tools/internal/validator-status-check/Cargo.toml @@ -23,7 +23,7 @@ tracing = { workspace = true } time = { workspace = true } -nym-validator-client = { path = "../../../common/client-libs/validator-client" } +nym-validator-client = { workspace = true } nym-bin-common = { path = "../../../common/bin-common", features = ["output_format", "basic_tracing"] } nym-network-defaults = { path = "../../../common/network-defaults" } nym-http-api-client = { path = "../../../common/http-api-client" } diff --git a/tools/nym-cli/Cargo.toml b/tools/nym-cli/Cargo.toml index adf015f9f8..7ca85e6b8d 100644 --- a/tools/nym-cli/Cargo.toml +++ b/tools/nym-cli/Cargo.toml @@ -24,7 +24,7 @@ tap = { workspace = true } nym-cli-commands = { path = "../../common/commands" } nym-bin-common = { path = "../../common/bin-common", features = ["basic_tracing"] } -nym-validator-client = { path = "../../common/client-libs/validator-client", features = ["http-client"] } +nym-validator-client = { workspace = true, features = ["http-client"] } nym-network-defaults = { path = "../../common/network-defaults" } [package.metadata.deb] diff --git a/tools/nym-id-cli/Cargo.toml b/tools/nym-id-cli/Cargo.toml index 2c918cca1c..7d264bb2e8 100644 --- a/tools/nym-id-cli/Cargo.toml +++ b/tools/nym-id-cli/Cargo.toml @@ -18,6 +18,6 @@ clap = { workspace = true, features = ["derive"] } tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } tracing.workspace = true -nym-bin-common = { path = "../../common/bin-common", features = ["output_format", "basic_tracing"] } -nym-credential-storage = { path = "../../common/credential-storage" } -nym-id = { path = "../../common/nym-id" } +nym-bin-common = { workspace = true, features = ["output_format", "basic_tracing"] } +nym-credential-storage = { workspace = true } +nym-id = { workspace = true } diff --git a/tools/nymvisor/Cargo.toml b/tools/nymvisor/Cargo.toml index 7db871dd23..e1ff8f3437 100644 --- a/tools/nymvisor/Cargo.toml +++ b/tools/nymvisor/Cargo.toml @@ -35,7 +35,7 @@ url = { workspace = true, features = ["serde"] } nym-async-file-watcher = { path = "../../common/async-file-watcher" } nym-bin-common = { path = "../../common/bin-common", features = ["output_format", "basic_tracing"] } -nym-config = { path = "../../common/config" } +nym-config = { workspace = true } nym-task = { path = "../../common/task"} [dev-dependencies] diff --git a/tools/ts-rs-cli/Cargo.toml b/tools/ts-rs-cli/Cargo.toml index a66c6e54c8..37eea72b36 100644 --- a/tools/ts-rs-cli/Cargo.toml +++ b/tools/ts-rs-cli/Cargo.toml @@ -12,11 +12,11 @@ anyhow = { workspace = true } ts-rs = { workspace = true } walkdir = { workspace = true } -nym-validator-client = { path = "../../common/client-libs/validator-client", features = [ +nym-validator-client = { workspace = true, features = [ "generate-ts" ] } -nym-api-requests = { path = "../../nym-api/nym-api-requests", features = ["generate-ts"] } -nym-mixnet-contract-common = { path = "../../common/cosmwasm-smart-contracts/mixnet-contract", features = ["generate-ts"] } -nym-vesting-contract-common = { path = "../../common/cosmwasm-smart-contracts/vesting-contract", features = ["generate-ts"] } +nym-api-requests = { workspace = true, features = ["generate-ts"] } +nym-mixnet-contract-common = { workspace = true, features = ["generate-ts"] } +nym-vesting-contract-common = { workspace = true, features = ["generate-ts"] } nym-types = { path = "../../common/types", features = ["generate-ts"] } nym-wallet-types = { path = "../../nym-wallet/nym-wallet-types", features = ["generate-ts"] } diff --git a/wasm/client/Cargo.toml b/wasm/client/Cargo.toml index 0c8813c4a9..3bc15e7ade 100644 --- a/wasm/client/Cargo.toml +++ b/wasm/client/Cargo.toml @@ -33,12 +33,13 @@ thiserror = { workspace = true } tsify = { workspace = true, features = ["js"] } web-sys = { workspace = true } -nym-bin-common = { path = "../../common/bin-common" } -wasm-client-core = { path = "../../common/wasm/client-core" } -wasm-utils = { path = "../../common/wasm/utils" } -nym-gateway-requests = { path = "../../common/gateway-requests" } +nym-bin-common = { workspace = true } +nym-wasm-client-core = { workspace = true } +nym-wasm-utils = { workspace = true } +nym-gateway-requests = { workspace = true } + +nym-node-tester-utils = { workspace = true, optional = true } -nym-node-tester-utils = { path = "../../common/node-tester-utils", optional = true } nym-node-tester-wasm = { path = "../node-tester", optional = true } tokio_with_wasm = { workspace = true, features = ["full"] } diff --git a/wasm/full-nym-wasm/Cargo.toml b/wasm/full-nym-wasm/Cargo.toml index 424277cd0b..f3a7357e6c 100644 --- a/wasm/full-nym-wasm/Cargo.toml +++ b/wasm/full-nym-wasm/Cargo.toml @@ -15,9 +15,10 @@ publish = false crate-type = ["cdylib", "rlib"] [dependencies] -nym-client-wasm = { path = "../client", optional = true } +nym-client-wasm = { workspace = true, optional = true } + nym-node-tester-wasm = { path = "../node-tester", optional = true } -mix-fetch-wasm = { path = "../mix-fetch", optional = true } +mix-fetch-wasm = { workspace = true, optional = true } [features] default = ["client", "node-tester"] diff --git a/wasm/mix-fetch/Cargo.toml b/wasm/mix-fetch/Cargo.toml index e749af5a2b..f1d81694ad 100644 --- a/wasm/mix-fetch/Cargo.toml +++ b/wasm/mix-fetch/Cargo.toml @@ -28,14 +28,14 @@ wasm-bindgen-futures = { workspace = true } thiserror = { workspace = true } tsify = { workspace = true, features = ["js"] } -nym-bin-common = { path = "../../common/bin-common" } -nym-http-api-client = { path = "../../common/http-api-client" } -nym-socks5-requests = { path = "../../common/socks5/requests" } -nym-ordered-buffer = { path = "../../common/socks5/ordered-buffer" } -nym-service-providers-common = { path = "../../service-providers/common" } -nym-validator-client = { path = "../../common/client-libs/validator-client", default-features = false } -wasm-client-core = { path = "../../common/wasm/client-core" } -wasm-utils = { path = "../../common/wasm/utils" } +nym-bin-common = { workspace = true } +nym-http-api-client = { workspace = true } +nym-socks5-requests = { workspace = true } +nym-ordered-buffer = { workspace = true } +nym-service-providers-common = { workspace = true } +nym-validator-client = { workspace = true, default-features = false } +nym-wasm-client-core = { workspace = true } +nym-wasm-utils = { workspace = true } [package.metadata.wasm-pack.profile.release] wasm-opt = false diff --git a/wasm/node-tester/Cargo.toml b/wasm/node-tester/Cargo.toml index 518b40d40c..8a61eb06ab 100644 --- a/wasm/node-tester/Cargo.toml +++ b/wasm/node-tester/Cargo.toml @@ -28,9 +28,9 @@ tsify = { workspace = true, features = ["js"] } wasmtimer = { workspace = true } -nym-node-tester-utils = { path = "../../common/node-tester-utils" } -wasm-client-core = { path = "../../common/wasm/client-core" } -wasm-utils = { path = "../../common/wasm/utils" } +nym-node-tester-utils = { workspace = true } +nym-wasm-client-core = { workspace = true } +nym-wasm-utils = { workspace = true } [package.metadata.wasm-pack.profile.release] wasm-opt = false diff --git a/wasm/zknym-lib/Cargo.toml b/wasm/zknym-lib/Cargo.toml index e4e60e1184..d19affd72e 100644 --- a/wasm/zknym-lib/Cargo.toml +++ b/wasm/zknym-lib/Cargo.toml @@ -31,12 +31,12 @@ zeroize.workspace = true rand = { workspace = true } -nym-bin-common = { path = "../../common/bin-common" } -nym-compact-ecash = { path = "../../common/nym_offline_compact_ecash" } -nym-credentials = { path = "../../common/credentials" } -nym-crypto = { path = "../../common/crypto", features = ["asymmetric", "rand"] } +nym-bin-common = { workspace = true } +nym-compact-ecash = { workspace = true } +nym-credentials = { workspace = true } +nym-crypto = { workspace = true, features = ["asymmetric", "rand"] } nym-http-api-client = { path = "../../common/http-api-client" } -wasm-utils = { path = "../../common/wasm/utils" } +nym-wasm-utils = { path = "../../common/wasm/utils" } [dev-dependencies] anyhow = { workspace = true } diff --git a/wasm/zknym-lib/src/error.rs b/wasm/zknym-lib/src/error.rs index b06ca52ef2..31b8091927 100644 --- a/wasm/zknym-lib/src/error.rs +++ b/wasm/zknym-lib/src/error.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use nym_http_api_client::HttpClientError; +use nym_wasm_utils::wasm_error; use thiserror::Error; -use wasm_utils::wasm_error; #[derive(Debug, Error)] pub enum ZkNymError { diff --git a/wasm/zknym-lib/src/lib.rs b/wasm/zknym-lib/src/lib.rs index 4d0b342232..7bff719be4 100644 --- a/wasm/zknym-lib/src/lib.rs +++ b/wasm/zknym-lib/src/lib.rs @@ -23,8 +23,8 @@ pub(crate) mod vpn_api_client; #[wasm_bindgen(start)] // #[cfg(target_arch = "wasm32")] pub fn main() { - wasm_utils::console_log!("[rust main]: rust module loaded"); - wasm_utils::console_log!( + nym_wasm_utils::console_log!("[rust main]: rust module loaded"); + nym_wasm_utils::console_log!( "wasm zk-nym version used: {}", nym_bin_common::bin_info_owned!() );