Merge pull request #4416 from nymtech/qa/merge-conflicts

make check on conflicts

Cargo.lock

@@ -2864,7 +2864,7 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
 [[package]]
 name = "explorer-api"
-version = "1.1.32"
+version = "1.1.33"
 dependencies = [
  "chrono",
  "clap 4.4.7",
@@ -5764,7 +5764,7 @@ dependencies = [
 
 [[package]]
 name = "nym-api"
-version = "1.1.34"
+version = "1.1.35"
 dependencies = [
  "actix-web",
  "anyhow",
@@ -5922,7 +5922,7 @@ dependencies = [
 
 [[package]]
 name = "nym-cli"
-version = "1.1.33"
+version = "1.1.34"
 dependencies = [
  "anyhow",
  "base64 0.13.1",
@@ -5998,7 +5998,7 @@ dependencies = [
 
 [[package]]
 name = "nym-client"
-version = "1.1.32"
+version = "1.1.33"
 dependencies = [
  "clap 4.4.7",
  "dirs 4.0.0",
@@ -6347,7 +6347,7 @@ dependencies = [
 
 [[package]]
 name = "nym-gateway"
-version = "1.1.32"
+version = "1.1.33"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -6567,7 +6567,7 @@ dependencies = [
 
 [[package]]
 name = "nym-mixnode"
-version = "1.1.34"
+version = "1.1.35"
 dependencies = [
  "anyhow",
  "axum",
@@ -6687,7 +6687,7 @@ dependencies = [
 
 [[package]]
 name = "nym-network-requester"
-version = "1.1.32"
+version = "1.1.33"
 dependencies = [
  "addr",
  "anyhow",
@@ -6736,7 +6736,7 @@ dependencies = [
 
 [[package]]
 name = "nym-network-statistics"
-version = "1.1.32"
+version = "1.1.33"
 dependencies = [
  "dirs 4.0.0",
  "log",
@@ -6981,7 +6981,7 @@ dependencies = [
 
 [[package]]
 name = "nym-socks5-client"
-version = "1.1.32"
+version = "1.1.33"
 dependencies = [
  "clap 4.4.7",
  "lazy_static",

nym-connect/desktop/Cargo.lock

@@ -958,6 +958,12 @@ version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f"
 
+[[package]]
+name = "const-str"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aca749d3d3f5b87a0d6100509879f9cf486ab510803a4a4e1001da1ff61c2bd6"
+
 [[package]]
 name = "constant_time_eq"
 version = "0.3.0"
@@ -3722,6 +3728,7 @@ dependencies = [
  "clap",
  "clap_complete",
  "clap_complete_fig",
+ "const-str",
  "log",
  "pretty_env_logger",
  "schemars",
@@ -3762,6 +3769,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2 0.10.8",
+ "si-scale",
  "sqlx",
  "tap",
  "thiserror",
@@ -4138,6 +4146,7 @@ dependencies = [
  "cfg-if",
  "dotenvy",
  "hex-literal",
+ "log",
  "once_cell",
  "schemars",
  "serde",
@@ -4504,7 +4513,6 @@ dependencies = [
  "nym-network-defaults",
  "nym-service-provider-directory-common",
  "nym-vesting-contract-common",
- "openssl",
  "prost",
  "reqwest",
  "serde",
@@ -4651,15 +4659,6 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
-[[package]]
-name = "openssl-src"
-version = "111.27.0+1.1.1v"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06e8f197c82d7511c5b014030c9b1efeda40d7d5f99d23b4ceed3524a5e63f02"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "openssl-sys"
 version = "0.9.91"
@@ -4668,7 +4667,6 @@ checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac"
 dependencies = [
  "cc",
  "libc",
- "openssl-src",
  "pkg-config",
  "vcpkg",
 ]
@@ -5509,6 +5507,7 @@ dependencies = [
  "wasm-bindgen-futures",
  "wasm-streams",
  "web-sys",
+ "webpki-roots 0.25.4",
  "winreg 0.50.0",
 ]
 
@@ -6221,6 +6220,12 @@ dependencies = [
  "lazy_static",
 ]
 
+[[package]]
+name = "si-scale"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44beb68bf488343b13ddbd74d1d5d5e6559a58b6dfaee74eb8d5ed4f7ed7666f"
+
 [[package]]
 name = "signal-hook"
 version = "0.3.17"
@@ -6458,7 +6463,7 @@ dependencies = [
  "thiserror",
  "tokio-stream",
  "url",
- "webpki-roots",
+ "webpki-roots 0.22.6",
 ]
 
 [[package]]
@@ -7247,9 +7252,8 @@ checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c"
 dependencies = [
  "futures-util",
  "log",
- "native-tls",
+ "rustls 0.21.7",
  "tokio",
- "tokio-native-tls",
  "tungstenite",
 ]
 
@@ -7429,8 +7433,8 @@ dependencies = [
  "http",
  "httparse",
  "log",
- "native-tls",
  "rand 0.8.5",
+ "rustls 0.21.7",
  "sha1",
  "thiserror",
  "url",
@@ -7874,6 +7878,12 @@ dependencies = [
  "webpki",
 ]
 
+[[package]]
+name = "webpki-roots"
+version = "0.25.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
+
 [[package]]
 name = "webview2-com"
 version = "0.19.1"

nym-wallet/Cargo.lock

@@ -3528,7 +3528,7 @@ dependencies = [
 
 [[package]]
 name = "nym_wallet"
-version = "1.2.11"
+version = "1.2.12"
 dependencies = [
  "async-trait",
  "base64 0.13.1",