diff --git a/Cargo.lock b/Cargo.lock index 02a9e4886e..28efbd69ef 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -389,16 +389,6 @@ dependencies = [ "futures-core", ] -[[package]] -name = "async-file-watcher" -version = "0.1.0" -dependencies = [ - "futures", - "log", - "notify", - "tokio", -] - [[package]] name = "async-io" version = "1.13.0" @@ -3301,20 +3291,6 @@ dependencies = [ "itoa", ] -[[package]] -name = "http-api-client" -version = "0.1.0" -dependencies = [ - "async-trait", - "reqwest", - "serde", - "serde_json", - "thiserror", - "tracing", - "url", - "wasmtimer", -] - [[package]] name = "http-body" version = "0.4.5" @@ -3943,17 +3919,6 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -[[package]] -name = "ledger" -version = "0.1.0" -dependencies = [ - "bip32", - "k256", - "ledger-transport", - "ledger-transport-hid", - "thiserror", -] - [[package]] name = "ledger-apdu" version = "0.10.0" @@ -4596,9 +4561,9 @@ version = "1.2.4-rc.2" dependencies = [ "async-trait", "futures", - "http-api-client", "js-sys", "nym-bin-common", + "nym-http-api-client", "nym-ordered-buffer", "nym-service-providers-common", "nym-socks5-requests", @@ -5073,6 +5038,16 @@ dependencies = [ "ts-rs", ] +[[package]] +name = "nym-async-file-watcher" +version = "0.1.0" +dependencies = [ + "futures", + "log", + "notify", + "tokio", +] + [[package]] name = "nym-bandwidth-controller" version = "0.1.0" @@ -5695,6 +5670,20 @@ dependencies = [ "serde", ] +[[package]] +name = "nym-http-api-client" +version = "0.1.0" +dependencies = [ + "async-trait", + "reqwest", + "serde", + "serde_json", + "thiserror", + "tracing", + "url", + "wasmtimer", +] + [[package]] name = "nym-id" version = "0.1.0" @@ -5784,6 +5773,17 @@ dependencies = [ "url", ] +[[package]] +name = "nym-ledger" +version = "0.1.0" +dependencies = [ + "bip32", + "k256", + "ledger-transport", + "ledger-transport-hid", + "thiserror", +] + [[package]] name = "nym-metrics" version = "0.1.0" @@ -5948,7 +5948,6 @@ version = "1.1.33" dependencies = [ "addr", "anyhow", - "async-file-watcher", "async-trait", "bs58 0.5.0", "clap 4.4.7", @@ -5957,6 +5956,7 @@ dependencies = [ "humantime-serde", "ipnetwork 0.20.0", "log", + "nym-async-file-watcher", "nym-bin-common", "nym-client-core", "nym-client-websocket-requests", @@ -6051,10 +6051,10 @@ version = "0.1.0" dependencies = [ "async-trait", "base64 0.21.4", - "http-api-client", "nym-bin-common", "nym-crypto", "nym-exit-policy", + "nym-http-api-client", "nym-wireguard-types", "schemars", "serde", @@ -6632,7 +6632,6 @@ dependencies = [ "eyre", "flate2", "futures", - "http-api-client", "itertools 0.10.5", "log", "nym-api-requests", @@ -6643,6 +6642,7 @@ dependencies = [ "nym-contracts-common", "nym-ephemera-common", "nym-group-contract-common", + "nym-http-api-client", "nym-mixnet-contract-common", "nym-multisig-contract-common", "nym-name-service-common", @@ -6768,7 +6768,6 @@ name = "nymvisor" version = "0.1.0" dependencies = [ "anyhow", - "async-file-watcher", "bytes", "clap 4.4.7", "dotenvy", @@ -6778,6 +6777,7 @@ dependencies = [ "humantime 2.1.0", "humantime-serde", "nix 0.27.1", + "nym-async-file-watcher", "nym-bin-common", "nym-config", "nym-task", diff --git a/nym-connect/desktop/Cargo.lock b/nym-connect/desktop/Cargo.lock index 4d3504d267..8a87804f61 100644 --- a/nym-connect/desktop/Cargo.lock +++ b/nym-connect/desktop/Cargo.lock @@ -2844,20 +2844,6 @@ dependencies = [ "itoa 1.0.9", ] -[[package]] -name = "http-api-client" -version = "0.1.0" -dependencies = [ - "async-trait", - "reqwest", - "serde", - "serde_json", - "thiserror", - "tracing", - "url", - "wasmtimer", -] - [[package]] name = "http-body" version = "0.4.5" @@ -4177,6 +4163,20 @@ dependencies = [ "serde", ] +[[package]] +name = "nym-http-api-client" +version = "0.1.0" +dependencies = [ + "async-trait", + "reqwest", + "serde", + "serde_json", + "thiserror", + "tracing", + "url", + "wasmtimer", +] + [[package]] name = "nym-metrics" version = "0.1.0" @@ -4590,7 +4590,6 @@ dependencies = [ "eyre", "flate2", "futures", - "http-api-client", "itertools", "log", "nym-api-requests", @@ -4601,6 +4600,7 @@ dependencies = [ "nym-contracts-common", "nym-ephemera-common", "nym-group-contract-common", + "nym-http-api-client", "nym-mixnet-contract-common", "nym-multisig-contract-common", "nym-name-service-common", @@ -7378,7 +7378,9 @@ dependencies = [ "futures-util", "log", "rustls 0.21.7", + "rustls-native-certs", "tokio", + "tokio-rustls 0.24.1", "tungstenite", ] @@ -7559,6 +7561,7 @@ dependencies = [ "httparse", "log", "rand 0.8.5", + "rustls 0.21.7", "sha1", "thiserror", "url",