From b79d4a9777c187b5bd3ced41b5dcc587865a8034 Mon Sep 17 00:00:00 2001 From: mfahampshire Date: Mon, 18 Aug 2025 17:56:31 +0200 Subject: [PATCH] revert some changes --- Cargo.lock | 40 +++++++++---------- Makefile | 2 +- clients/native/Cargo.toml | 7 +++- clients/socks5/Cargo.toml | 2 +- gateway/Cargo.toml | 2 +- nym-api/Cargo.toml | 32 ++++++++++++--- .../nym-credential-proxy/Cargo.toml | 35 ++++++++++++---- nym-network-monitor/Cargo.toml | 2 +- .../nym-node-status-agent/Cargo.toml | 2 +- .../nym-node-status-api/Cargo.toml | 2 +- .../nym-node-status-client/Cargo.toml | 2 +- nym-node/Cargo.toml | 2 +- nym-statistics-api/Cargo.toml | 2 +- nym-validator-rewarder/Cargo.toml | 2 +- nyx-chain-watcher/Cargo.toml | 2 +- service-providers/authenticator/Cargo.toml | 2 +- service-providers/ip-packet-router/Cargo.toml | 14 +++++-- .../network-requester/Cargo.toml | 20 +++++++--- wasm/client/Cargo.toml | 2 +- wasm/full-nym-wasm/Cargo.toml | 3 +- wasm/mix-fetch/Cargo.toml | 2 +- wasm/node-tester/Cargo.toml | 2 +- wasm/zknym-lib/Cargo.toml | 2 +- 23 files changed, 121 insertions(+), 62 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 129bf23213..78c928f094 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4800,7 +4800,7 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "nym-api" -version = "1.6.0" +version = "1.1.62" dependencies = [ "anyhow", "async-trait", @@ -4969,7 +4969,7 @@ dependencies = [ [[package]] name = "nym-authenticator" -version = "1.6.0" +version = "0.1.0" dependencies = [ "anyhow", "bincode", @@ -5180,7 +5180,7 @@ dependencies = [ [[package]] name = "nym-client" -version = "1.6.0" +version = "1.1.59" dependencies = [ "bs58", "clap", @@ -5324,7 +5324,7 @@ dependencies = [ [[package]] name = "nym-client-wasm" -version = "1.6.0" +version = "1.4.0-rc.0" dependencies = [ "anyhow", "futures", @@ -5518,7 +5518,7 @@ dependencies = [ [[package]] name = "nym-credential-proxy" -version = "1.6.0" +version = "0.1.7" dependencies = [ "anyhow", "async-trait", @@ -5929,7 +5929,7 @@ dependencies = [ [[package]] name = "nym-gateway" -version = "1.6.0" +version = "1.1.36" dependencies = [ "anyhow", "async-trait", @@ -6261,7 +6261,7 @@ dependencies = [ [[package]] name = "nym-ip-packet-router" -version = "1.6.0" +version = "0.1.0" dependencies = [ "anyhow", "async-trait", @@ -6336,7 +6336,7 @@ dependencies = [ [[package]] name = "nym-mix-fetch-wasm" -version = "1.6.0" +version = "1.4.0-rc.0" dependencies = [ "async-trait", "futures", @@ -6510,7 +6510,7 @@ dependencies = [ [[package]] name = "nym-network-monitor" -version = "1.6.0" +version = "1.0.2" dependencies = [ "anyhow", "axum 0.7.9", @@ -6543,7 +6543,7 @@ dependencies = [ [[package]] name = "nym-network-requester" -version = "1.6.0" +version = "1.1.60" dependencies = [ "addr", "anyhow", @@ -6593,7 +6593,7 @@ dependencies = [ [[package]] name = "nym-node" -version = "1.6.0" +version = "1.15.0" dependencies = [ "anyhow", "arc-swap", @@ -6738,7 +6738,7 @@ dependencies = [ [[package]] name = "nym-node-status-agent" -version = "1.6.0" +version = "0.1.2" dependencies = [ "anyhow", "clap", @@ -6755,7 +6755,7 @@ dependencies = [ [[package]] name = "nym-node-status-api" -version = "1.6.0" +version = "3.2.2" dependencies = [ "ammonia", "anyhow", @@ -6809,7 +6809,7 @@ dependencies = [ [[package]] name = "nym-node-status-client" -version = "1.6.0" +version = "1.0.4" dependencies = [ "anyhow", "bincode", @@ -6844,7 +6844,7 @@ dependencies = [ [[package]] name = "nym-node-tester-wasm" -version = "1.6.0" +version = "1.3.0-rc.0" dependencies = [ "futures", "js-sys", @@ -6921,7 +6921,7 @@ dependencies = [ [[package]] name = "nym-nyx-chain-watcher" -version = "1.6.0" +version = "0.1.14" dependencies = [ "anyhow", "async-trait", @@ -7172,7 +7172,7 @@ dependencies = [ [[package]] name = "nym-socks5-client" -version = "1.6.0" +version = "1.1.59" dependencies = [ "bs58", "clap", @@ -7610,7 +7610,7 @@ dependencies = [ [[package]] name = "nym-statistics-api" -version = "1.6.0" +version = "0.1.4" dependencies = [ "anyhow", "axum 0.7.9", @@ -7967,7 +7967,7 @@ dependencies = [ [[package]] name = "nym-validator-rewarder" -version = "1.6.0" +version = "0.3.0" dependencies = [ "anyhow", "bip39", @@ -8223,7 +8223,7 @@ dependencies = [ [[package]] name = "nym-zknym-lib" -version = "1.6.0" +version = "0.1.0" dependencies = [ "anyhow", "async-trait", diff --git a/Makefile b/Makefile index c69797c9e3..033a48c961 100644 --- a/Makefile +++ b/Makefile @@ -107,7 +107,7 @@ sdk-wasm-build: $(MAKE) -C nym-browser-extension/storage wasm-pack $(MAKE) -C wasm/client $(MAKE) -C wasm/node-tester - $(MAKE) -C wasm/mix-fetch + # $(MAKE) -C wasm/mix-fetch $(MAKE) -C wasm/zknym-lib #$(MAKE) -C wasm/full-nym-wasm diff --git a/clients/native/Cargo.toml b/clients/native/Cargo.toml index fe4759f8ec..52bce47f95 100644 --- a/clients/native/Cargo.toml +++ b/clients/native/Cargo.toml @@ -1,7 +1,10 @@ [package] name = "nym-client" -version.workspace = true -authors = ["Dave Hrycyszyn ", "Jędrzej Stuczyński "] +version = "1.1.59" +authors = [ + "Dave Hrycyszyn ", + "Jędrzej Stuczyński ", +] description = "Implementation of the Nym Client" edition = "2021" rust-version = "1.70" diff --git a/clients/socks5/Cargo.toml b/clients/socks5/Cargo.toml index 33610d6c24..c2e035c8a2 100644 --- a/clients/socks5/Cargo.toml +++ b/clients/socks5/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-socks5-client" -version.workspace = true +version = "1.1.59" authors = ["Dave Hrycyszyn "] description = "A SOCKS5 localhost proxy that converts incoming messages to Sphinx and sends them to a Nym address" edition = "2021" diff --git a/gateway/Cargo.toml b/gateway/Cargo.toml index 95edd7cd04..33b9cf3c7b 100644 --- a/gateway/Cargo.toml +++ b/gateway/Cargo.toml @@ -4,7 +4,7 @@ [package] name = "nym-gateway" license = "GPL-3.0" -version.workspace = true +version = "1.1.36" authors = [ "Dave Hrycyszyn ", "Jędrzej Stuczyński ", diff --git a/nym-api/Cargo.toml b/nym-api/Cargo.toml index 9770e3fd48..3a83881958 100644 --- a/nym-api/Cargo.toml +++ b/nym-api/Cargo.toml @@ -4,7 +4,7 @@ [package] name = "nym-api" license = "GPL-3.0" -version.workspace = true +version = "1.1.62" authors.workspace = true edition = "2021" rust-version.workspace = true @@ -67,7 +67,14 @@ zeroize = { workspace = true } # for axum server axum = { workspace = true, features = ["tokio"] } axum-extra = { workspace = true, features = ["typed-header"] } -tower-http = { workspace = true, features = ["cors", "trace", "compression-br", "compression-deflate", "compression-gzip", "compression-zstd"] } +tower-http = { workspace = true, features = [ + "cors", + "trace", + "compression-br", + "compression-deflate", + "compression-gzip", + "compression-zstd", +] } utoipa = { workspace = true, features = ["axum_extras", "time"] } utoipauto = { workspace = true } utoipa-swagger-ui = { workspace = true, features = ["axum"] } @@ -103,9 +110,14 @@ cw4 = { workspace = true } nym-dkg = { path = "../common/dkg", features = ["cw-types"] } nym-gateway-client = { path = "../common/client-libs/gateway-client" } nym-inclusion-probability = { path = "../common/inclusion-probability" } -nym-mixnet-contract-common = { path = "../common/cosmwasm-smart-contracts/mixnet-contract", features = ["utoipa"] } +nym-mixnet-contract-common = { path = "../common/cosmwasm-smart-contracts/mixnet-contract", features = [ + "utoipa", +] } nym-vesting-contract-common = { path = "../common/cosmwasm-smart-contracts/vesting-contract" } -nym-contracts-common = { path = "../common/cosmwasm-smart-contracts/contracts-common", features = ["naive_float", "utoipa"] } +nym-contracts-common = { path = "../common/cosmwasm-smart-contracts/contracts-common", features = [ + "naive_float", + "utoipa", +] } nym-multisig-contract-common = { path = "../common/cosmwasm-smart-contracts/multisig-contract" } nym-sphinx = { path = "../common/nymsphinx" } nym-pemstore = { path = "../common/pemstore" } @@ -113,11 +125,19 @@ 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-bin-common = { path = "../common/bin-common", features = ["output_format", "openapi", "basic_tracing"] } +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-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" } diff --git a/nym-credential-proxy/nym-credential-proxy/Cargo.toml b/nym-credential-proxy/nym-credential-proxy/Cargo.toml index c081166dd4..301fac0efb 100644 --- a/nym-credential-proxy/nym-credential-proxy/Cargo.toml +++ b/nym-credential-proxy/nym-credential-proxy/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-credential-proxy" -version.workspace = true +version = "0.1.7" authors.workspace = true repository.workspace = true homepage.workspace = true @@ -26,7 +26,13 @@ rand.workspace = true reqwest = { workspace = true, features = ["rustls-tls"] } serde = { workspace = true, features = ["derive"] } serde_json.workspace = true -sqlx = { workspace = true, features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate", "time"] } +sqlx = { workspace = true, features = [ + "runtime-tokio-rustls", + "sqlite", + "macros", + "migrate", + "time", +] } strum = { workspace = true, features = ["derive"] } strum_macros.workspace = true time.workspace = true @@ -42,25 +48,40 @@ utoipa = { workspace = true, features = ["axum_extras", "time"] } utoipa-swagger-ui = { workspace = true, features = ["axum"] } zeroize.workspace = true -nym-bin-common = { path = "../../common/bin-common", features = ["basic_tracing"] } +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 = ["asymmetric", "rand", "serde"] } +nym-crypto = { path = "../../common/crypto", features = [ + "asymmetric", + "rand", + "serde", +] } 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 = ["utoipa"] } +nym-http-api-common = { path = "../../common/http-api-common", features = [ + "utoipa", +] } nym-validator-client = { path = "../../common/client-libs/validator-client" } nym-network-defaults = { path = "../../common/network-defaults" } -nym-credential-proxy-requests = { path = "../nym-credential-proxy-requests", features = ["openapi"] } +nym-credential-proxy-requests = { path = "../nym-credential-proxy-requests", features = [ + "openapi", +] } [dev-dependencies] tempfile = { workspace = true } [build-dependencies] tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } -sqlx = { workspace = true, features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate"] } +sqlx = { workspace = true, features = [ + "runtime-tokio-rustls", + "sqlite", + "macros", + "migrate", +] } [features] default = ["cors"] diff --git a/nym-network-monitor/Cargo.toml b/nym-network-monitor/Cargo.toml index dc24b0dcba..c693cb5b19 100644 --- a/nym-network-monitor/Cargo.toml +++ b/nym-network-monitor/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-network-monitor" -version.workspace = true +version = "1.0.2" authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/nym-node-status-api/nym-node-status-agent/Cargo.toml b/nym-node-status-api/nym-node-status-agent/Cargo.toml index 5d7570644d..f0abf580a6 100644 --- a/nym-node-status-api/nym-node-status-agent/Cargo.toml +++ b/nym-node-status-api/nym-node-status-agent/Cargo.toml @@ -3,7 +3,7 @@ [package] name = "nym-node-status-agent" -version.workspace = true +version = "0.1.2" authors.workspace = true repository.workspace = true homepage.workspace = true 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 0acbfeaf76..8ff0de8917 100644 --- a/nym-node-status-api/nym-node-status-api/Cargo.toml +++ b/nym-node-status-api/nym-node-status-api/Cargo.toml @@ -3,7 +3,7 @@ [package] name = "nym-node-status-api" -version.workspace = true +version = "3.2.2" authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/nym-node-status-api/nym-node-status-client/Cargo.toml b/nym-node-status-api/nym-node-status-client/Cargo.toml index cd8a2f08c6..ca627aa5b5 100644 --- a/nym-node-status-api/nym-node-status-client/Cargo.toml +++ b/nym-node-status-api/nym-node-status-client/Cargo.toml @@ -3,7 +3,7 @@ [package] name = "nym-node-status-client" -version.workspace = true +version = "1.0.4" authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/nym-node/Cargo.toml b/nym-node/Cargo.toml index e5b8e913fd..96be330954 100644 --- a/nym-node/Cargo.toml +++ b/nym-node/Cargo.toml @@ -3,7 +3,7 @@ [package] name = "nym-node" -version.workspace = true +version = "1.15.0" authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/nym-statistics-api/Cargo.toml b/nym-statistics-api/Cargo.toml index 76e7c3661c..4d37557118 100644 --- a/nym-statistics-api/Cargo.toml +++ b/nym-statistics-api/Cargo.toml @@ -3,7 +3,7 @@ [package] name = "nym-statistics-api" -version.workspace = true +version = "0.1.4" authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/nym-validator-rewarder/Cargo.toml b/nym-validator-rewarder/Cargo.toml index 0fd9d5da12..6e50f19709 100644 --- a/nym-validator-rewarder/Cargo.toml +++ b/nym-validator-rewarder/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-validator-rewarder" -version.workspace = true +version = "0.3.0" authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/nyx-chain-watcher/Cargo.toml b/nyx-chain-watcher/Cargo.toml index fd69203287..24a6e91b6d 100644 --- a/nyx-chain-watcher/Cargo.toml +++ b/nyx-chain-watcher/Cargo.toml @@ -3,7 +3,7 @@ [package] name = "nym-nyx-chain-watcher" -version.workspace = true +version = "0.1.14" authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/service-providers/authenticator/Cargo.toml b/service-providers/authenticator/Cargo.toml index c08b8a0d47..85e4dc7021 100644 --- a/service-providers/authenticator/Cargo.toml +++ b/service-providers/authenticator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-authenticator" -version.workspace = true +version = "0.1.0" authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/service-providers/ip-packet-router/Cargo.toml b/service-providers/ip-packet-router/Cargo.toml index 09b1c18482..4893246f7c 100644 --- a/service-providers/ip-packet-router/Cargo.toml +++ b/service-providers/ip-packet-router/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-ip-packet-router" -version.workspace = true +version = "0.1.0" authors.workspace = true repository.workspace = true homepage.workspace = true @@ -17,7 +17,10 @@ clap.workspace = true etherparse = { workspace = true } futures = { workspace = true } log = { workspace = true } -nym-bin-common = { path = "../../common/bin-common", features = ["clap", "basic_tracing"] } +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" } @@ -41,7 +44,12 @@ serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } thiserror = { workspace = true } time = { workspace = true } -tokio = { workspace = true, features = ["rt-multi-thread", "net", "io-util", "macros"] } +tokio = { workspace = true, features = [ + "rt-multi-thread", + "net", + "io-util", + "macros", +] } tokio-util = { workspace = true, features = ["codec"] } url.workspace = true diff --git a/service-providers/network-requester/Cargo.toml b/service-providers/network-requester/Cargo.toml index 88a134cc5b..399ef4c04a 100644 --- a/service-providers/network-requester/Cargo.toml +++ b/service-providers/network-requester/Cargo.toml @@ -4,7 +4,7 @@ [package] name = "nym-network-requester" license = "GPL-3.0" -version.workspace = true +version = "1.1.60" authors.workspace = true edition.workspace = true rust-version = "1.70" @@ -20,7 +20,7 @@ anyhow = { workspace = true } addr = { workspace = true } async-trait = { workspace = true } bs58 = { workspace = true } -clap = { workspace = true, features = ["cargo", "derive"]} +clap = { workspace = true, features = ["cargo", "derive"] } dirs = { workspace = true } futures = { workspace = true } humantime-serde = { workspace = true } @@ -32,10 +32,10 @@ regex = { workspace = true } reqwest = { workspace = true, features = ["json"] } serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } -sqlx = { workspace = true, features = ["runtime-tokio-rustls", "chrono"]} +sqlx = { workspace = true, features = ["runtime-tokio-rustls", "chrono"] } tap = { workspace = true } thiserror = { workspace = true } -tokio = { workspace = true, features = [ "net", "rt-multi-thread", "macros" ] } +tokio = { workspace = true, features = ["net", "rt-multi-thread", "macros"] } tokio-tungstenite = { workspace = true } url = { workspace = true } time = { workspace = true } @@ -43,8 +43,16 @@ zeroize = { workspace = true } # internal nym-async-file-watcher = { path = "../../common/async-file-watcher" } -nym-bin-common = { path = "../../common/bin-common", features = ["output_format", "clap", "basic_tracing"] } -nym-client-core = { path = "../../common/client-core", features = ["cli", "fs-gateways-storage", "fs-surb-storage"] } +nym-bin-common = { path = "../../common/bin-common", features = [ + "output_format", + "clap", + "basic_tracing", +] } +nym-client-core = { path = "../../common/client-core", features = [ + "cli", + "fs-gateways-storage", + "fs-surb-storage", +] } nym-client-websocket-requests = { path = "../../clients/native/websocket-requests" } nym-config = { path = "../../common/config" } nym-credentials = { path = "../../common/credentials" } diff --git a/wasm/client/Cargo.toml b/wasm/client/Cargo.toml index f45cbb7373..a763355710 100644 --- a/wasm/client/Cargo.toml +++ b/wasm/client/Cargo.toml @@ -4,7 +4,7 @@ authors = [ "Dave Hrycyszyn ", "Jedrzej Stuczynski ", ] -version.workspace = true +version = "1.4.0-rc.0" edition = "2021" keywords = ["nym", "sphinx", "wasm", "webassembly", "privacy"] license = "Apache-2.0" diff --git a/wasm/full-nym-wasm/Cargo.toml b/wasm/full-nym-wasm/Cargo.toml index 452a1e11b6..fee4fa182a 100644 --- a/wasm/full-nym-wasm/Cargo.toml +++ b/wasm/full-nym-wasm/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "nym-wasm-sdk" authors = ["Jedrzej Stuczynski "] -version.workspace = true +version = "1.2.2" edition = "2021" keywords = ["nym", "sphinx", "wasm", "webassembly", "privacy"] license = "Apache-2.0" @@ -26,4 +26,3 @@ mix-fetch = ["mix-fetch-wasm"] [package.metadata.wasm-pack.profile.release] wasm-opt = false - diff --git a/wasm/mix-fetch/Cargo.toml b/wasm/mix-fetch/Cargo.toml index 1581c1b594..a4a4987e98 100644 --- a/wasm/mix-fetch/Cargo.toml +++ b/wasm/mix-fetch/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "nym-mix-fetch-wasm" authors = ["Jedrzej Stuczynski "] -version.workspace = true +version = "1.4.0-rc.0" edition = "2021" keywords = ["nym", "fetch", "wasm", "webassembly", "privacy"] license = "Apache-2.0" diff --git a/wasm/node-tester/Cargo.toml b/wasm/node-tester/Cargo.toml index 979459592c..ca9ff1f1ca 100644 --- a/wasm/node-tester/Cargo.toml +++ b/wasm/node-tester/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "nym-node-tester-wasm" authors = ["Jedrzej Stuczynski "] -version.workspace = true +version = "1.3.0-rc.0" edition = "2021" keywords = ["nym", "sphinx", "webassembly", "privacy", "tester"] license = "Apache-2.0" diff --git a/wasm/zknym-lib/Cargo.toml b/wasm/zknym-lib/Cargo.toml index 46be5d8663..a00fa1d7f6 100644 --- a/wasm/zknym-lib/Cargo.toml +++ b/wasm/zknym-lib/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-zknym-lib" -version.workspace = true +version = "0.1.0" authors.workspace = true repository.workspace = true homepage.workspace = true