diff --git a/Cargo.lock b/Cargo.lock index 46d64c42f5..e3aee9e08a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -662,17 +662,6 @@ dependencies = [ "url", ] -[[package]] -name = "backon" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cffb0e931875b666fc4fcb20fee52e9bbd1ef836fd9e9e04ec21555f9f85f7ef" -dependencies = [ - "fastrand 2.3.0", - "gloo-timers", - "tokio", -] - [[package]] name = "base16ct" version = "0.2.0" @@ -697,15 +686,6 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" -[[package]] -name = "base64-url" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e2b6c78c06f7288d5e3c3d683bde35a79531127c83b087e5d0d77c974b4b28" -dependencies = [ - "base64 0.22.1", -] - [[package]] name = "base64ct" version = "1.8.0" @@ -2359,7 +2339,7 @@ dependencies = [ "cosmwasm-schema", "cosmwasm-std", "cw-storage-plus", - "nym-coconut-dkg-common 0.1.0", + "nym-coconut-dkg-common", "nym-contracts-common", ] @@ -2441,8 +2421,8 @@ dependencies = [ "dashmap", "dirs", "futures", - "nym-bin-common 0.6.0", - "nym-crypto 0.4.0", + "nym-bin-common", + "nym-crypto", "nym-sdk", "serde", "tempfile", @@ -3813,11 +3793,11 @@ dependencies = [ "clap", "dirs", "importer-contract", - "nym-bin-common 0.6.0", - "nym-mixnet-contract-common 0.6.0", - "nym-network-defaults 0.1.0", - "nym-validator-client 0.1.0", - "nym-vesting-contract-common 0.7.0", + "nym-bin-common", + "nym-mixnet-contract-common", + "nym-network-defaults", + "nym-validator-client", + "nym-vesting-contract-common", "serde", "serde_json", "tokio", @@ -4074,15 +4054,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.14.0" @@ -4527,7 +4498,7 @@ dependencies = [ "async-trait", "futures", "js-sys", - "nym-bin-common 0.6.0", + "nym-bin-common", "nym-http-api-client", "nym-ordered-buffer", "nym-service-providers-common", @@ -4552,9 +4523,9 @@ dependencies = [ "anyhow", "clap", "futures", - "nym-bin-common 0.6.0", - "nym-crypto 0.4.0", - "nym-network-defaults 0.1.0", + "nym-bin-common", + "nym-crypto", + "nym-network-defaults", "nym-sdk", "tokio", "tracing", @@ -4566,7 +4537,7 @@ version = "0.0.1" dependencies = [ "bytes", "dirs", - "nym-bin-common 0.6.0", + "nym-bin-common", "nym-ip-packet-requests", "nym-sdk", "reqwest 0.12.24", @@ -4918,37 +4889,37 @@ dependencies = [ "futures", "humantime-serde", "moka", - "nym-api-requests 0.1.0", + "nym-api-requests", "nym-bandwidth-controller", - "nym-bin-common 0.6.0", + "nym-bin-common", "nym-cache", - "nym-coconut-dkg-common 0.1.0", - "nym-compact-ecash 0.1.0", - "nym-config 0.1.0", + "nym-coconut-dkg-common", + "nym-compact-ecash", + "nym-config", "nym-contracts-common", "nym-credential-storage", - "nym-credentials 0.1.0", - "nym-credentials-interface 0.1.0", - "nym-crypto 0.4.0", + "nym-credentials", + "nym-credentials-interface", + "nym-crypto", "nym-dkg", - "nym-ecash-contract-common 0.1.0", + "nym-ecash-contract-common", "nym-ecash-signer-check", - "nym-ecash-time 0.1.0", + "nym-ecash-time", "nym-gateway-client", "nym-http-api-client", "nym-http-api-common", - "nym-mixnet-contract-common 0.6.0", - "nym-node-requests 0.1.0", + "nym-mixnet-contract-common", + "nym-node-requests", "nym-node-tester-utils", - "nym-pemstore 0.3.0", - "nym-serde-helpers 0.1.0", + "nym-pemstore", + "nym-serde-helpers", "nym-sphinx", "nym-statistics-common", "nym-task", - "nym-ticketbooks-merkle 0.1.0", + "nym-ticketbooks-merkle", "nym-topology", "nym-types", - "nym-validator-client 0.1.0", + "nym-validator-client", "pin-project", "rand 0.8.5", "rand_chacha 0.3.1", @@ -4987,20 +4958,20 @@ dependencies = [ "ecdsa", "hex", "humantime-serde", - "nym-coconut-dkg-common 0.1.0", - "nym-compact-ecash 0.1.0", - "nym-config 0.1.0", + "nym-coconut-dkg-common", + "nym-compact-ecash", + "nym-config", "nym-contracts-common", - "nym-credentials-interface 0.1.0", - "nym-crypto 0.4.0", - "nym-ecash-signer-check-types 0.1.0", - "nym-ecash-time 0.1.0", - "nym-mixnet-contract-common 0.6.0", - "nym-network-defaults 0.1.0", - "nym-node-requests 0.1.0", - "nym-noise-keys 0.1.0", - "nym-serde-helpers 0.1.0", - "nym-ticketbooks-merkle 0.1.0", + "nym-credentials-interface", + "nym-crypto", + "nym-ecash-signer-check-types", + "nym-ecash-time", + "nym-mixnet-contract-common", + "nym-network-defaults", + "nym-node-requests", + "nym-noise-keys", + "nym-serde-helpers", + "nym-ticketbooks-merkle", "rand_chacha 0.3.1", "schemars 0.8.22", "serde", @@ -5015,43 +4986,6 @@ dependencies = [ "utoipa", ] -[[package]] -name = "nym-api-requests" -version = "0.1.0" -source = "git+https://github.com/nymtech/nym?branch=develop#9f9639950b93369ecdbd0874f775b21ab8c65662" -dependencies = [ - "bs58", - "cosmrs", - "cosmwasm-std", - "ecdsa", - "hex", - "humantime-serde", - "nym-coconut-dkg-common 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-compact-ecash 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-config 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-contracts-common", - "nym-credentials-interface 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-crypto 0.4.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-ecash-signer-check-types 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-ecash-time 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-mixnet-contract-common 0.6.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-network-defaults 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-node-requests 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-noise-keys 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-serde-helpers 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-ticketbooks-merkle 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "schemars 0.8.22", - "serde", - "serde_json", - "sha2 0.10.9", - "tendermint", - "tendermint-rpc", - "thiserror 2.0.17", - "time", - "tracing", - "utoipa", -] - [[package]] name = "nym-async-file-watcher" version = "0.1.0" @@ -5070,13 +5004,13 @@ dependencies = [ "futures", "nym-authenticator-requests", "nym-bandwidth-controller", - "nym-credentials-interface 0.1.0", - "nym-crypto 0.4.0", + "nym-credentials-interface", + "nym-crypto", "nym-registration-common", "nym-sdk", "nym-service-provider-requests-common", - "nym-validator-client 0.1.0", - "nym-wireguard-types 0.1.0", + "nym-validator-client", + "nym-wireguard-types", "semver 1.0.27", "thiserror 2.0.17", "tokio", @@ -5091,17 +5025,17 @@ dependencies = [ "base64 0.22.1", "bincode", "hmac", - "nym-credentials-interface 0.1.0", - "nym-crypto 0.4.0", - "nym-network-defaults 0.1.0", + "nym-credentials-interface", + "nym-crypto", + "nym-network-defaults", "nym-service-provider-requests-common", "nym-sphinx", - "nym-wireguard-types 0.1.0", + "nym-wireguard-types", "rand 0.8.5", "semver 1.0.27", "serde", "sha2 0.10.9", - "strum_macros 0.27.2", + "strum_macros", "thiserror 2.0.17", "x25519-dalek", ] @@ -5114,14 +5048,14 @@ dependencies = [ "bip39", "log", "nym-credential-storage", - "nym-credentials 0.1.0", - "nym-credentials-interface 0.1.0", - "nym-crypto 0.4.0", - "nym-ecash-contract-common 0.1.0", - "nym-ecash-time 0.1.0", - "nym-network-defaults 0.1.0", + "nym-credentials", + "nym-credentials-interface", + "nym-crypto", + "nym-ecash-contract-common", + "nym-ecash-time", + "nym-network-defaults", "nym-task", - "nym-validator-client 0.1.0", + "nym-validator-client", "rand 0.8.5", "thiserror 2.0.17", "url", @@ -5150,19 +5084,6 @@ dependencies = [ "vergen 8.3.1", ] -[[package]] -name = "nym-bin-common" -version = "0.6.0" -source = "git+https://github.com/nymtech/nym?branch=develop#9f9639950b93369ecdbd0874f775b21ab8c65662" -dependencies = [ - "const-str", - "log", - "schemars 0.8.22", - "serde", - "utoipa", - "vergen 8.3.1", -] - [[package]] name = "nym-cache" version = "0.1.0" @@ -5184,10 +5105,10 @@ dependencies = [ "dotenvy", "inquire", "log", - "nym-bin-common 0.6.0", + "nym-bin-common", "nym-cli-commands", - "nym-network-defaults 0.1.0", - "nym-validator-client 0.1.0", + "nym-network-defaults", + "nym-validator-client", "serde", "serde_json", "tap", @@ -5217,29 +5138,29 @@ dependencies = [ "k256", "log", "nym-bandwidth-controller", - "nym-bin-common 0.6.0", + "nym-bin-common", "nym-client-core", - "nym-coconut-dkg-common 0.1.0", - "nym-config 0.1.0", + "nym-coconut-dkg-common", + "nym-config", "nym-contracts-common", - "nym-credential-proxy-requests 0.1.0", + "nym-credential-proxy-requests", "nym-credential-storage", "nym-credential-utils", - "nym-credentials 0.1.0", - "nym-credentials-interface 0.1.0", - "nym-crypto 0.4.0", - "nym-ecash-contract-common 0.1.0", - "nym-ecash-time 0.1.0", + "nym-credentials", + "nym-credentials-interface", + "nym-crypto", + "nym-ecash-contract-common", + "nym-ecash-time", "nym-http-api-client", "nym-id", - "nym-mixnet-contract-common 0.6.0", - "nym-multisig-contract-common 0.1.0", - "nym-network-defaults 0.1.0", - "nym-pemstore 0.3.0", + "nym-mixnet-contract-common", + "nym-multisig-contract-common", + "nym-network-defaults", + "nym-pemstore", "nym-sphinx", "nym-types", - "nym-validator-client 0.1.0", - "nym-vesting-contract-common 0.7.0", + "nym-validator-client", + "nym-vesting-contract-common", "rand 0.8.5", "serde", "serde_json", @@ -5263,21 +5184,21 @@ dependencies = [ "futures", "log", "nym-bandwidth-controller", - "nym-bin-common 0.6.0", + "nym-bin-common", "nym-client-core", "nym-client-websocket-requests", - "nym-config 0.1.0", + "nym-config", "nym-credential-storage", - "nym-credentials 0.1.0", - "nym-crypto 0.4.0", + "nym-credentials", + "nym-crypto", "nym-gateway-requests", "nym-id", - "nym-network-defaults 0.1.0", - "nym-pemstore 0.3.0", + "nym-network-defaults", + "nym-pemstore", "nym-sphinx", "nym-task", "nym-topology", - "nym-validator-client 0.1.0", + "nym-validator-client", "rand 0.8.5", "serde", "serde_json", @@ -5312,23 +5233,23 @@ dependencies = [ "nym-client-core-gateways-storage", "nym-client-core-surb-storage", "nym-credential-storage", - "nym-credentials-interface 0.1.0", - "nym-crypto 0.4.0", - "nym-ecash-time 0.1.0", + "nym-credentials-interface", + "nym-crypto", + "nym-ecash-time", "nym-gateway-client", "nym-gateway-requests", "nym-http-api-client", "nym-id", "nym-mixnet-client", - "nym-mixnet-contract-common 0.6.0", - "nym-network-defaults 0.1.0", + "nym-mixnet-contract-common", + "nym-network-defaults", "nym-nonexhaustive-delayqueue", - "nym-pemstore 0.3.0", + "nym-pemstore", "nym-sphinx", "nym-statistics-common", "nym-task", "nym-topology", - "nym-validator-client 0.1.0", + "nym-validator-client", "rand 0.8.5", "rand_chacha 0.3.1", "serde", @@ -5358,8 +5279,8 @@ name = "nym-client-core-config-types" version = "0.1.0" dependencies = [ "humantime-serde", - "nym-config 0.1.0", - "nym-pemstore 0.3.0", + "nym-config", + "nym-pemstore", "nym-sphinx-addressing", "nym-sphinx-params", "nym-statistics-common", @@ -5375,7 +5296,7 @@ dependencies = [ "anyhow", "async-trait", "cosmrs", - "nym-crypto 0.4.0", + "nym-crypto", "nym-gateway-requests", "serde", "sqlx", @@ -5394,7 +5315,7 @@ dependencies = [ "anyhow", "async-trait", "dashmap", - "nym-crypto 0.4.0", + "nym-crypto", "nym-sphinx", "nym-task", "sqlx", @@ -5413,7 +5334,7 @@ dependencies = [ "futures", "gloo-timers", "js-sys", - "nym-bin-common 0.6.0", + "nym-bin-common", "nym-gateway-requests", "nym-node-tester-utils", "nym-node-tester-wasm", @@ -5453,21 +5374,7 @@ dependencies = [ "cw2", "cw4", "nym-contracts-common", - "nym-multisig-contract-common 0.1.0", -] - -[[package]] -name = "nym-coconut-dkg-common" -version = "0.1.0" -source = "git+https://github.com/nymtech/nym?branch=develop#9f9639950b93369ecdbd0874f775b21ab8c65662" -dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cw-utils", - "cw2", - "cw4", - "nym-contracts-common", - "nym-multisig-contract-common 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", + "nym-multisig-contract-common", ] [[package]] @@ -5491,8 +5398,8 @@ dependencies = [ "ff", "group", "itertools 0.14.0", - "nym-network-defaults 0.1.0", - "nym-pemstore 0.3.0", + "nym-network-defaults", + "nym-pemstore", "rand 0.8.5", "rayon", "serde", @@ -5502,29 +5409,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "nym-compact-ecash" -version = "0.1.0" -source = "git+https://github.com/nymtech/nym?branch=develop#9f9639950b93369ecdbd0874f775b21ab8c65662" -dependencies = [ - "bincode", - "bls12_381", - "bs58", - "cfg-if", - "digest 0.10.7", - "ff", - "group", - "itertools 0.14.0", - "nym-network-defaults 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-pemstore 0.3.0 (git+https://github.com/nymtech/nym?branch=develop)", - "rand 0.8.5", - "serde", - "sha2 0.10.9", - "subtle 2.6.1", - "thiserror 2.0.17", - "zeroize", -] - [[package]] name = "nym-config" version = "0.1.0" @@ -5532,22 +5416,7 @@ dependencies = [ "dirs", "handlebars", "log", - "nym-network-defaults 0.1.0", - "serde", - "thiserror 2.0.17", - "toml 0.8.23", - "url", -] - -[[package]] -name = "nym-config" -version = "0.1.0" -source = "git+https://github.com/nymtech/nym?branch=develop#9f9639950b93369ecdbd0874f775b21ab8c65662" -dependencies = [ - "dirs", - "handlebars", - "log", - "nym-network-defaults 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", + "nym-network-defaults", "serde", "thiserror 2.0.17", "toml 0.8.23", @@ -5562,7 +5431,7 @@ dependencies = [ "bytes", "futures", "nym-common", - "nym-config 0.1.0", + "nym-config", "nym-ip-packet-requests", "nym-sdk", "pnet_packet", @@ -5610,7 +5479,7 @@ dependencies = [ "anyhow", "bs58", "lazy_static", - "nym-bin-common 0.6.0", + "nym-bin-common", "nym-ffi-shared", "nym-sdk", "nym-sphinx-anonymous-replies", @@ -5629,26 +5498,26 @@ dependencies = [ "clap", "futures", "humantime", - "nym-bin-common 0.6.0", - "nym-compact-ecash 0.1.0", - "nym-config 0.1.0", + "nym-bin-common", + "nym-compact-ecash", + "nym-config", "nym-credential-proxy-lib", - "nym-credential-proxy-requests 0.1.0", - "nym-credentials 0.1.0", - "nym-credentials-interface 0.1.0", - "nym-crypto 0.4.0", - "nym-ecash-contract-common 0.1.0", + "nym-credential-proxy-requests", + "nym-credentials", + "nym-credentials-interface", + "nym-crypto", + "nym-ecash-contract-common", "nym-ecash-signer-check", "nym-http-api-common", - "nym-network-defaults 0.1.0", - "nym-validator-client 0.1.0", + "nym-network-defaults", + "nym-validator-client", "rand 0.8.5", "reqwest 0.12.24", "serde", "serde_json", "sqlx", "strum", - "strum_macros 0.27.2", + "strum_macros", "tempfile", "thiserror 2.0.17", "time", @@ -5674,22 +5543,22 @@ dependencies = [ "futures", "humantime", "nym-cache", - "nym-compact-ecash 0.1.0", - "nym-credential-proxy-requests 0.1.0", - "nym-credentials 0.1.0", - "nym-credentials-interface 0.1.0", - "nym-crypto 0.4.0", - "nym-ecash-contract-common 0.1.0", + "nym-compact-ecash", + "nym-credential-proxy-requests", + "nym-credentials", + "nym-credentials-interface", + "nym-crypto", + "nym-ecash-contract-common", "nym-ecash-signer-check", - "nym-network-defaults 0.1.0", - "nym-validator-client 0.1.0", + "nym-network-defaults", + "nym-validator-client", "rand 0.8.5", "reqwest 0.12.24", "serde", "serde_json", "sqlx", "strum", - "strum_macros 0.27.2", + "strum_macros", "tempfile", "thiserror 2.0.17", "time", @@ -5706,11 +5575,11 @@ name = "nym-credential-proxy-requests" version = "0.1.0" dependencies = [ "async-trait", - "nym-credentials 0.1.0", - "nym-credentials-interface 0.1.0", + "nym-credentials", + "nym-credentials-interface", "nym-http-api-client", "nym-http-api-common", - "nym-serde-helpers 0.1.0", + "nym-serde-helpers", "reqwest 0.12.24", "schemars 0.8.22", "serde", @@ -5724,26 +5593,6 @@ dependencies = [ "wasmtimer", ] -[[package]] -name = "nym-credential-proxy-requests" -version = "0.1.0" -source = "git+https://github.com/nymtech/nym?branch=develop#9f9639950b93369ecdbd0874f775b21ab8c65662" -dependencies = [ - "async-trait", - "nym-credentials 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-credentials-interface 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-http-api-client", - "nym-serde-helpers 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "reqwest 0.12.24", - "schemars 0.8.22", - "serde", - "serde_json", - "serde_with", - "time", - "uuid", - "wasmtimer", -] - [[package]] name = "nym-credential-storage" version = "0.1.0" @@ -5752,11 +5601,11 @@ dependencies = [ "async-trait", "bincode", "log", - "nym-compact-ecash 0.1.0", - "nym-credentials 0.1.0", - "nym-credentials-interface 0.1.0", - "nym-crypto 0.4.0", - "nym-ecash-time 0.1.0", + "nym-compact-ecash", + "nym-credentials", + "nym-credentials-interface", + "nym-crypto", + "nym-ecash-time", "nym-test-utils", "serde", "sqlx", @@ -5773,12 +5622,12 @@ dependencies = [ "log", "nym-bandwidth-controller", "nym-client-core", - "nym-config 0.1.0", + "nym-config", "nym-credential-storage", - "nym-credentials 0.1.0", - "nym-credentials-interface 0.1.0", - "nym-ecash-time 0.1.0", - "nym-validator-client 0.1.0", + "nym-credentials", + "nym-credentials-interface", + "nym-ecash-time", + "nym-validator-client", "thiserror 2.0.17", "time", "tokio", @@ -5794,14 +5643,14 @@ dependencies = [ "cw-utils", "dyn-clone", "futures", - "nym-api-requests 0.1.0", - "nym-credentials 0.1.0", - "nym-credentials-interface 0.1.0", - "nym-ecash-contract-common 0.1.0", + "nym-api-requests", + "nym-credentials", + "nym-credentials-interface", + "nym-ecash-contract-common", "nym-gateway-requests", "nym-gateway-storage", "nym-task", - "nym-validator-client 0.1.0", + "nym-validator-client", "rand 0.8.5", "si-scale", "thiserror 2.0.17", @@ -5818,15 +5667,15 @@ dependencies = [ "bls12_381", "cosmrs", "log", - "nym-api-requests 0.1.0", - "nym-credentials-interface 0.1.0", - "nym-crypto 0.4.0", - "nym-ecash-contract-common 0.1.0", - "nym-ecash-time 0.1.0", + "nym-api-requests", + "nym-credentials-interface", + "nym-crypto", + "nym-ecash-contract-common", + "nym-ecash-time", "nym-http-api-client", - "nym-network-defaults 0.1.0", - "nym-serde-helpers 0.1.0", - "nym-validator-client 0.1.0", + "nym-network-defaults", + "nym-serde-helpers", + "nym-validator-client", "rand 0.8.5", "serde", "thiserror 2.0.17", @@ -5834,60 +5683,18 @@ dependencies = [ "zeroize", ] -[[package]] -name = "nym-credentials" -version = "0.1.0" -source = "git+https://github.com/nymtech/nym?branch=develop#9f9639950b93369ecdbd0874f775b21ab8c65662" -dependencies = [ - "bincode", - "bls12_381", - "cosmrs", - "log", - "nym-api-requests 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-credentials-interface 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-crypto 0.4.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-ecash-contract-common 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-ecash-time 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-http-api-client", - "nym-network-defaults 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-serde-helpers 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-validator-client 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "serde", - "thiserror 2.0.17", - "time", - "zeroize", -] - [[package]] name = "nym-credentials-interface" version = "0.1.0" dependencies = [ "bls12_381", - "nym-compact-ecash 0.1.0", - "nym-ecash-time 0.1.0", - "nym-network-defaults 0.1.0", + "nym-compact-ecash", + "nym-ecash-time", + "nym-network-defaults", "rand 0.8.5", "serde", "strum", - "strum_macros 0.27.2", - "thiserror 2.0.17", - "time", - "utoipa", -] - -[[package]] -name = "nym-credentials-interface" -version = "0.1.0" -source = "git+https://github.com/nymtech/nym?branch=develop#9f9639950b93369ecdbd0874f775b21ab8c65662" -dependencies = [ - "bls12_381", - "nym-compact-ecash 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-ecash-time 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-network-defaults 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "rand 0.8.5", - "serde", - "strum", - "strum_macros 0.27.2", + "strum_macros", "thiserror 2.0.17", "time", "utoipa", @@ -5911,8 +5718,8 @@ dependencies = [ "hkdf", "hmac", "jwt-simple", - "nym-pemstore 0.3.0", - "nym-sphinx-types 0.2.0", + "nym-pemstore", + "nym-sphinx-types", "rand 0.8.5", "rand_chacha 0.3.1", "serde", @@ -5924,28 +5731,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "nym-crypto" -version = "0.4.0" -source = "git+https://github.com/nymtech/nym?branch=develop#9f9639950b93369ecdbd0874f775b21ab8c65662" -dependencies = [ - "aes", - "base64 0.22.1", - "bs58", - "cipher", - "ctr", - "ed25519-dalek", - "generic-array 0.14.9", - "nym-pemstore 0.3.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-sphinx-types 0.2.0 (git+https://github.com/nymtech/nym?branch=develop)", - "serde", - "serde_bytes", - "subtle-encoding", - "thiserror 2.0.17", - "x25519-dalek", - "zeroize", -] - [[package]] name = "nym-dkg" version = "0.1.0" @@ -5957,7 +5742,7 @@ dependencies = [ "ff", "group", "nym-contracts-common", - "nym-pemstore 0.3.0", + "nym-pemstore", "rand 0.8.5", "rand_chacha 0.3.1", "rand_core 0.6.4", @@ -5978,21 +5763,7 @@ dependencies = [ "cw-controllers", "cw-utils", "cw2", - "nym-multisig-contract-common 0.1.0", - "thiserror 2.0.17", -] - -[[package]] -name = "nym-ecash-contract-common" -version = "0.1.0" -source = "git+https://github.com/nymtech/nym?branch=develop#9f9639950b93369ecdbd0874f775b21ab8c65662" -dependencies = [ - "bs58", - "cosmwasm-schema", - "cosmwasm-std", - "cw-controllers", - "cw-utils", - "nym-multisig-contract-common 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", + "nym-multisig-contract-common", "thiserror 2.0.17", ] @@ -6001,10 +5772,10 @@ name = "nym-ecash-signer-check" version = "0.1.0" dependencies = [ "futures", - "nym-ecash-signer-check-types 0.1.0", + "nym-ecash-signer-check-types", "nym-http-api-client", - "nym-network-defaults 0.1.0", - "nym-validator-client 0.1.0", + "nym-network-defaults", + "nym-validator-client", "semver 1.0.27", "thiserror 2.0.17", "tokio", @@ -6016,24 +5787,8 @@ dependencies = [ name = "nym-ecash-signer-check-types" version = "0.1.0" dependencies = [ - "nym-coconut-dkg-common 0.1.0", - "nym-crypto 0.4.0", - "semver 1.0.27", - "serde", - "thiserror 2.0.17", - "time", - "tracing", - "url", - "utoipa", -] - -[[package]] -name = "nym-ecash-signer-check-types" -version = "0.1.0" -source = "git+https://github.com/nymtech/nym?branch=develop#9f9639950b93369ecdbd0874f775b21ab8c65662" -dependencies = [ - "nym-coconut-dkg-common 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-crypto 0.4.0 (git+https://github.com/nymtech/nym?branch=develop)", + "nym-coconut-dkg-common", + "nym-crypto", "semver 1.0.27", "serde", "thiserror 2.0.17", @@ -6047,16 +5802,7 @@ dependencies = [ name = "nym-ecash-time" version = "0.1.0" dependencies = [ - "nym-compact-ecash 0.1.0", - "time", -] - -[[package]] -name = "nym-ecash-time" -version = "0.1.0" -source = "git+https://github.com/nymtech/nym?branch=develop#9f9639950b93369ecdbd0874f775b21ab8c65662" -dependencies = [ - "nym-compact-ecash 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", + "nym-compact-ecash", "time", ] @@ -6072,18 +5818,6 @@ dependencies = [ "utoipa", ] -[[package]] -name = "nym-exit-policy" -version = "0.1.0" -source = "git+https://github.com/nymtech/nym?branch=develop#9f9639950b93369ecdbd0874f775b21ab8c65662" -dependencies = [ - "serde", - "serde_json", - "thiserror 2.0.17", - "tracing", - "utoipa", -] - [[package]] name = "nym-ffi-shared" version = "0.2.1" @@ -6091,8 +5825,8 @@ dependencies = [ "anyhow", "bs58", "lazy_static", - "nym-bin-common 0.6.0", - "nym-crypto 0.4.0", + "nym-bin-common", + "nym-crypto", "nym-sdk", "nym-sphinx-anonymous-replies", "tokio", @@ -6115,13 +5849,13 @@ dependencies = [ "futures", "ipnetwork", "mock_instant", - "nym-api-requests 0.1.0", + "nym-api-requests", "nym-authenticator-requests", "nym-client-core", "nym-credential-verification", - "nym-credentials 0.1.0", - "nym-credentials-interface 0.1.0", - "nym-crypto 0.4.0", + "nym-credentials", + "nym-credentials-interface", + "nym-crypto", "nym-gateway-requests", "nym-gateway-stats-storage", "nym-gateway-storage", @@ -6129,7 +5863,7 @@ dependencies = [ "nym-ip-packet-router", "nym-mixnet-client", "nym-mixnode-common", - "nym-network-defaults 0.1.0", + "nym-network-defaults", "nym-network-requester", "nym-node-metrics", "nym-sdk", @@ -6139,10 +5873,10 @@ dependencies = [ "nym-task", "nym-topology", "nym-types", - "nym-validator-client 0.1.0", + "nym-validator-client", "nym-wireguard", "nym-wireguard-private-metadata-server", - "nym-wireguard-types 0.1.0", + "nym-wireguard-types", "rand 0.8.5", "serde", "sha2 0.10.9", @@ -6166,17 +5900,17 @@ dependencies = [ "gloo-utils 0.2.0", "nym-bandwidth-controller", "nym-credential-storage", - "nym-credentials 0.1.0", - "nym-credentials-interface 0.1.0", - "nym-crypto 0.4.0", + "nym-credentials", + "nym-credentials-interface", + "nym-crypto", "nym-gateway-requests", "nym-http-api-client", - "nym-network-defaults 0.1.0", - "nym-pemstore 0.3.0", + "nym-network-defaults", + "nym-pemstore", "nym-sphinx", "nym-statistics-common", "nym-task", - "nym-validator-client 0.1.0", + "nym-validator-client", "rand 0.8.5", "serde", "si-scale", @@ -6201,14 +5935,14 @@ version = "0.0.0" dependencies = [ "itertools 0.14.0", "nym-client-core", - "nym-crypto 0.4.0", + "nym-contracts-common", + "nym-crypto", "nym-http-api-client", - "nym-network-defaults 0.1.0", + "nym-network-defaults", "nym-sphinx", "nym-sphinx-addressing", "nym-topology", - "nym-validator-client 0.1.0", - "nym-vpn-api-client", + "nym-validator-client", "rand 0.8.5", "serde", "serde_json", @@ -6235,14 +5969,14 @@ dependencies = [ "nym-authenticator-client", "nym-authenticator-requests", "nym-bandwidth-controller", - "nym-bin-common 0.6.0", + "nym-bin-common", "nym-client-core", - "nym-config 0.1.0", + "nym-config", "nym-connection-monitor", "nym-credential-utils", - "nym-credentials 0.1.0", - "nym-credentials-interface 0.1.0", - "nym-crypto 0.4.0", + "nym-credentials", + "nym-credentials-interface", + "nym-crypto", "nym-http-api-client", "nym-http-api-client-macro", "nym-ip-packet-client", @@ -6250,7 +5984,7 @@ dependencies = [ "nym-node-status-client", "nym-sdk", "nym-topology", - "nym-validator-client 0.1.0", + "nym-validator-client", "pnet_packet", "rand 0.8.5", "serde", @@ -6273,12 +6007,12 @@ dependencies = [ "bs58", "futures", "generic-array 0.14.9", - "nym-compact-ecash 0.1.0", - "nym-credentials 0.1.0", - "nym-credentials-interface 0.1.0", - "nym-crypto 0.4.0", - "nym-pemstore 0.3.0", - "nym-serde-helpers 0.1.0", + "nym-compact-ecash", + "nym-credentials", + "nym-credentials-interface", + "nym-crypto", + "nym-pemstore", + "nym-serde-helpers", "nym-sphinx", "nym-statistics-common", "nym-task", @@ -6322,7 +6056,7 @@ dependencies = [ "bincode", "defguard_wireguard_rs", "dyn-clone", - "nym-credentials-interface 0.1.0", + "nym-credentials-interface", "nym-gateway-requests", "nym-sphinx", "sqlx", @@ -6338,8 +6072,8 @@ version = "0.2.2" dependencies = [ "anyhow", "lazy_static", - "nym-bin-common 0.6.0", - "nym-crypto 0.4.0", + "nym-bin-common", + "nym-crypto", "nym-ffi-shared", "nym-sdk", "nym-sphinx-anonymous-replies", @@ -6360,18 +6094,6 @@ dependencies = [ "serde", ] -[[package]] -name = "nym-group-contract-common" -version = "0.1.0" -source = "git+https://github.com/nymtech/nym?branch=develop#9f9639950b93369ecdbd0874f775b21ab8c65662" -dependencies = [ - "cosmwasm-schema", - "cw-controllers", - "cw4", - "schemars 0.8.22", - "serde", -] - [[package]] name = "nym-http-api-client" version = "0.1.0" @@ -6386,10 +6108,10 @@ dependencies = [ "inventory", "itertools 0.14.0", "mime", - "nym-bin-common 0.6.0", + "nym-bin-common", "nym-http-api-client-macro", "nym-http-api-common", - "nym-network-defaults 0.1.0", + "nym-network-defaults", "once_cell", "reqwest 0.12.24", "serde", @@ -6443,7 +6165,7 @@ name = "nym-id" version = "0.1.0" dependencies = [ "nym-credential-storage", - "nym-credentials 0.1.0", + "nym-credentials", "thiserror 2.0.17", "time", "tracing", @@ -6457,7 +6179,7 @@ dependencies = [ "anyhow", "bs58", "clap", - "nym-bin-common 0.6.0", + "nym-bin-common", "nym-credential-storage", "nym-id", "tokio", @@ -6494,8 +6216,8 @@ version = "0.1.0" dependencies = [ "bincode", "bytes", - "nym-bin-common 0.6.0", - "nym-crypto 0.4.0", + "nym-bin-common", + "nym-crypto", "nym-service-provider-requests-common", "nym-sphinx", "rand 0.8.5", @@ -6519,14 +6241,14 @@ dependencies = [ "etherparse", "futures", "log", - "nym-bin-common 0.6.0", + "nym-bin-common", "nym-client-core", - "nym-config 0.1.0", - "nym-crypto 0.4.0", - "nym-exit-policy 0.1.0", + "nym-config", + "nym-crypto", + "nym-exit-policy", "nym-id", "nym-ip-packet-requests", - "nym-network-defaults 0.1.0", + "nym-network-defaults", "nym-network-requester", "nym-sdk", "nym-service-provider-requests-common", @@ -6536,7 +6258,7 @@ dependencies = [ "nym-tun", "nym-types", "nym-wireguard", - "nym-wireguard-types 0.1.0", + "nym-wireguard-types", "rand 0.8.5", "reqwest 0.12.24", "serde", @@ -6576,7 +6298,7 @@ version = "0.1.0" dependencies = [ "dashmap", "futures", - "nym-crypto 0.4.0", + "nym-crypto", "nym-noise", "nym-sphinx", "nym-task", @@ -6610,27 +6332,6 @@ dependencies = [ "utoipa", ] -[[package]] -name = "nym-mixnet-contract-common" -version = "0.6.0" -source = "git+https://github.com/nymtech/nym?branch=develop#9f9639950b93369ecdbd0874f775b21ab8c65662" -dependencies = [ - "bs58", - "cosmwasm-schema", - "cosmwasm-std", - "cw-controllers", - "cw-storage-plus", - "humantime-serde", - "nym-contracts-common", - "schemars 0.8.22", - "semver 1.0.27", - "serde", - "serde_repr", - "thiserror 2.0.17", - "time", - "utoipa", -] - [[package]] name = "nym-mixnode-common" version = "0.1.0" @@ -6639,15 +6340,15 @@ dependencies = [ "futures", "humantime-serde", "log", - "nym-crypto 0.4.0", + "nym-crypto", "nym-metrics", - "nym-network-defaults 0.1.0", + "nym-network-defaults", "nym-sphinx-acknowledgements", "nym-sphinx-addressing", "nym-sphinx-forwarding", "nym-sphinx-framing", "nym-sphinx-params", - "nym-sphinx-types 0.2.0", + "nym-sphinx-types", "nym-task", "rand 0.8.5", "serde", @@ -6673,22 +6374,6 @@ dependencies = [ "thiserror 2.0.17", ] -[[package]] -name = "nym-multisig-contract-common" -version = "0.1.0" -source = "git+https://github.com/nymtech/nym?branch=develop#9f9639950b93369ecdbd0874f775b21ab8c65662" -dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cw-storage-plus", - "cw-utils", - "cw3", - "cw4", - "schemars 0.8.22", - "serde", - "thiserror 2.0.17", -] - [[package]] name = "nym-network-defaults" version = "0.1.0" @@ -6703,21 +6388,6 @@ dependencies = [ "utoipa", ] -[[package]] -name = "nym-network-defaults" -version = "0.1.0" -source = "git+https://github.com/nymtech/nym?branch=develop#9f9639950b93369ecdbd0874f775b21ab8c65662" -dependencies = [ - "cargo_metadata 0.19.2", - "dotenvy", - "log", - "regex", - "schemars 0.8.22", - "serde", - "url", - "utoipa", -] - [[package]] name = "nym-network-monitor" version = "1.0.2" @@ -6728,18 +6398,18 @@ dependencies = [ "dashmap", "futures", "log", - "nym-bin-common 0.6.0", + "nym-bin-common", "nym-client-core", - "nym-crypto 0.4.0", + "nym-crypto", "nym-gateway-requests", "nym-http-api-client", - "nym-mixnet-contract-common 0.6.0", - "nym-network-defaults 0.1.0", + "nym-mixnet-contract-common", + "nym-network-defaults", "nym-sdk", "nym-sphinx", "nym-topology", "nym-types", - "nym-validator-client 0.1.0", + "nym-validator-client", "petgraph", "rand 0.8.5", "rand_chacha 0.3.1", @@ -6768,16 +6438,16 @@ dependencies = [ "ipnetwork", "log", "nym-async-file-watcher", - "nym-bin-common 0.6.0", + "nym-bin-common", "nym-client-core", "nym-client-websocket-requests", - "nym-config 0.1.0", + "nym-config", "nym-credential-storage", - "nym-credentials 0.1.0", - "nym-crypto 0.4.0", - "nym-exit-policy 0.1.0", + "nym-credentials", + "nym-crypto", + "nym-exit-policy", "nym-id", - "nym-network-defaults 0.1.0", + "nym-network-defaults", "nym-ordered-buffer", "nym-sdk", "nym-service-providers-common", @@ -6834,10 +6504,10 @@ dependencies = [ "indicatif", "ipnetwork", "lioness", - "nym-bin-common 0.6.0", + "nym-bin-common", "nym-client-core-config-types", - "nym-config 0.1.0", - "nym-crypto 0.4.0", + "nym-config", + "nym-crypto", "nym-gateway", "nym-gateway-stats-storage", "nym-http-api-client", @@ -6847,26 +6517,26 @@ dependencies = [ "nym-mixnet-client", "nym-network-requester", "nym-node-metrics", - "nym-node-requests 0.1.0", + "nym-node-requests", "nym-noise", - "nym-noise-keys 0.1.0", + "nym-noise-keys", "nym-nonexhaustive-delayqueue", - "nym-pemstore 0.3.0", + "nym-pemstore", "nym-sphinx-acknowledgements", "nym-sphinx-addressing", "nym-sphinx-forwarding", "nym-sphinx-framing", "nym-sphinx-params", "nym-sphinx-routing", - "nym-sphinx-types 0.2.0", + "nym-sphinx-types", "nym-statistics-common", "nym-task", "nym-topology", "nym-types", - "nym-validator-client 0.1.0", + "nym-validator-client", "nym-verloc", "nym-wireguard", - "nym-wireguard-types 0.1.0", + "nym-wireguard-types", "rand 0.8.5", "rand_chacha 0.3.1", "serde", @@ -6911,47 +6581,24 @@ dependencies = [ "celes", "humantime", "humantime-serde", - "nym-bin-common 0.6.0", - "nym-crypto 0.4.0", - "nym-exit-policy 0.1.0", + "nym-bin-common", + "nym-crypto", + "nym-exit-policy", "nym-http-api-client", - "nym-noise-keys 0.1.0", - "nym-wireguard-types 0.1.0", + "nym-noise-keys", + "nym-wireguard-types", "rand_chacha 0.3.1", "schemars 0.8.22", "serde", "serde_json", "strum", - "strum_macros 0.27.2", + "strum_macros", "thiserror 2.0.17", "time", "tokio", "utoipa", ] -[[package]] -name = "nym-node-requests" -version = "0.1.0" -source = "git+https://github.com/nymtech/nym?branch=develop#9f9639950b93369ecdbd0874f775b21ab8c65662" -dependencies = [ - "celes", - "humantime", - "humantime-serde", - "nym-bin-common 0.6.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-crypto 0.4.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-exit-policy 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-noise-keys 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-wireguard-types 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "schemars 0.8.22", - "serde", - "serde_json", - "strum", - "strum_macros 0.27.2", - "thiserror 2.0.17", - "time", - "utoipa", -] - [[package]] name = "nym-node-status-agent" version = "1.0.7" @@ -6959,8 +6606,8 @@ dependencies = [ "anyhow", "clap", "futures", - "nym-bin-common 0.6.0", - "nym-crypto 0.4.0", + "nym-bin-common", + "nym-crypto", "nym-node-status-client", "rand 0.8.5", "tempfile", @@ -6986,23 +6633,23 @@ dependencies = [ "humantime", "itertools 0.14.0", "moka", - "nym-bin-common 0.6.0", + "nym-bin-common", "nym-contracts-common", "nym-credential-proxy-lib", - "nym-credentials 0.1.0", - "nym-crypto 0.4.0", - "nym-ecash-time 0.1.0", + "nym-credentials", + "nym-crypto", + "nym-ecash-time", "nym-http-api-client", "nym-http-api-common", - "nym-mixnet-contract-common 0.6.0", - "nym-network-defaults 0.1.0", + "nym-mixnet-contract-common", + "nym-network-defaults", "nym-node-metrics", - "nym-node-requests 0.1.0", + "nym-node-requests", "nym-node-status-client", - "nym-serde-helpers 0.1.0", + "nym-serde-helpers", "nym-statistics-common", "nym-task", - "nym-validator-client 0.1.0", + "nym-validator-client", "rand 0.8.5", "rand_chacha 0.3.1", "regex", @@ -7013,7 +6660,7 @@ dependencies = [ "serde_json_path", "sqlx", "strum", - "strum_macros 0.27.2", + "strum_macros", "thiserror 2.0.17", "time", "tokio", @@ -7036,8 +6683,8 @@ dependencies = [ "anyhow", "bincode", "bs58", - "nym-credentials 0.1.0", - "nym-crypto 0.4.0", + "nym-credentials", + "nym-crypto", "reqwest 0.12.24", "serde", "serde_json", @@ -7051,7 +6698,7 @@ version = "0.1.0" dependencies = [ "futures", "log", - "nym-crypto 0.4.0", + "nym-crypto", "nym-sphinx", "nym-sphinx-params", "nym-task", @@ -7093,15 +6740,15 @@ dependencies = [ "arc-swap", "bytes", "futures", - "nym-crypto 0.4.0", - "nym-noise-keys 0.1.0", + "nym-crypto", + "nym-noise-keys", "nym-test-utils", "pin-project", "rand_chacha 0.3.1", "sha2 0.10.9", "snow", "strum", - "strum_macros 0.27.2", + "strum_macros", "thiserror 2.0.17", "tokio", "tokio-util", @@ -7112,18 +6759,7 @@ dependencies = [ name = "nym-noise-keys" version = "0.1.0" dependencies = [ - "nym-crypto 0.4.0", - "schemars 0.8.22", - "serde", - "utoipa", -] - -[[package]] -name = "nym-noise-keys" -version = "0.1.0" -source = "git+https://github.com/nymtech/nym?branch=develop#9f9639950b93369ecdbd0874f775b21ab8c65662" -dependencies = [ - "nym-crypto 0.4.0 (git+https://github.com/nymtech/nym?branch=develop)", + "nym-crypto", "schemars 0.8.22", "serde", "utoipa", @@ -7146,8 +6782,8 @@ dependencies = [ "anyhow", "clap", "log", - "nym-bin-common 0.6.0", - "nym-network-defaults 0.1.0", + "nym-bin-common", + "nym-network-defaults", "nym-sdk", "nym-service-providers-common", "nym-socks5-requests", @@ -7191,16 +6827,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "nym-pemstore" -version = "0.3.0" -source = "git+https://github.com/nymtech/nym?branch=develop#9f9639950b93369ecdbd0874f775b21ab8c65662" -dependencies = [ - "pem", - "tracing", - "zeroize", -] - [[package]] name = "nym-performance-contract-common" version = "0.1.0" @@ -7214,20 +6840,6 @@ dependencies = [ "thiserror 2.0.17", ] -[[package]] -name = "nym-performance-contract-common" -version = "0.1.0" -source = "git+https://github.com/nymtech/nym?branch=develop#9f9639950b93369ecdbd0874f775b21ab8c65662" -dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cw-controllers", - "nym-contracts-common", - "schemars 0.8.22", - "serde", - "thiserror 2.0.17", -] - [[package]] name = "nym-pool-contract-common" version = "0.1.0" @@ -7249,11 +6861,11 @@ dependencies = [ "nym-authenticator-client", "nym-bandwidth-controller", "nym-credential-storage", - "nym-credentials-interface 0.1.0", + "nym-credentials-interface", "nym-ip-packet-client", "nym-registration-common", "nym-sdk", - "nym-validator-client 0.1.0", + "nym-validator-client", "thiserror 2.0.17", "tokio", "tokio-util", @@ -7266,7 +6878,7 @@ name = "nym-registration-common" version = "0.1.0" dependencies = [ "nym-authenticator-requests", - "nym-crypto 0.4.0", + "nym-crypto", "nym-ip-packet-requests", "nym-sphinx", "tokio-util", @@ -7292,19 +6904,19 @@ dependencies = [ "httpcodec", "log", "nym-bandwidth-controller", - "nym-bin-common 0.6.0", + "nym-bin-common", "nym-client-core", - "nym-config 0.1.0", + "nym-config", "nym-credential-storage", "nym-credential-utils", - "nym-credentials 0.1.0", - "nym-credentials-interface 0.1.0", - "nym-crypto 0.4.0", + "nym-credentials", + "nym-credentials-interface", + "nym-crypto", "nym-gateway-directory", "nym-gateway-requests", "nym-http-api-client", "nym-ip-packet-requests", - "nym-network-defaults 0.1.0", + "nym-network-defaults", "nym-ordered-buffer", "nym-service-providers-common", "nym-socks5-client-core", @@ -7314,7 +6926,7 @@ dependencies = [ "nym-statistics-common", "nym-task", "nym-topology", - "nym-validator-client 0.1.0", + "nym-validator-client", "parking_lot", "pnet_packet", "rand 0.8.5", @@ -7346,18 +6958,6 @@ dependencies = [ "time", ] -[[package]] -name = "nym-serde-helpers" -version = "0.1.0" -source = "git+https://github.com/nymtech/nym?branch=develop#9f9639950b93369ecdbd0874f775b21ab8c65662" -dependencies = [ - "base64 0.22.1", - "bs58", - "hex", - "serde", - "time", -] - [[package]] name = "nym-service-provider-requests-common" version = "0.1.0" @@ -7374,7 +6974,7 @@ dependencies = [ "anyhow", "async-trait", "log", - "nym-bin-common 0.6.0", + "nym-bin-common", "nym-sdk", "nym-socks5-requests", "nym-sphinx-anonymous-replies", @@ -7392,11 +6992,11 @@ dependencies = [ "clap", "humantime", "itertools 0.14.0", - "nym-bin-common 0.6.0", + "nym-bin-common", "nym-ecash-signer-check", - "nym-network-defaults 0.1.0", + "nym-network-defaults", "nym-task", - "nym-validator-client 0.1.0", + "nym-validator-client", "time", "tokio", "tracing", @@ -7411,21 +7011,21 @@ dependencies = [ "bs58", "clap", "log", - "nym-bin-common 0.6.0", + "nym-bin-common", "nym-client-core", - "nym-config 0.1.0", + "nym-config", "nym-credential-storage", - "nym-credentials 0.1.0", - "nym-crypto 0.4.0", + "nym-credentials", + "nym-crypto", "nym-gateway-requests", "nym-id", - "nym-network-defaults 0.1.0", + "nym-network-defaults", "nym-ordered-buffer", - "nym-pemstore 0.3.0", + "nym-pemstore", "nym-socks5-client-core", "nym-sphinx", "nym-topology", - "nym-validator-client 0.1.0", + "nym-validator-client", "rand 0.8.5", "serde", "serde_json", @@ -7447,17 +7047,17 @@ dependencies = [ "log", "nym-bandwidth-controller", "nym-client-core", - "nym-config 0.1.0", + "nym-config", "nym-contracts-common", "nym-credential-storage", - "nym-mixnet-contract-common 0.6.0", - "nym-network-defaults 0.1.0", + "nym-mixnet-contract-common", + "nym-network-defaults", "nym-service-providers-common", "nym-socks5-proxy-helpers", "nym-socks5-requests", "nym-sphinx", "nym-task", - "nym-validator-client 0.1.0", + "nym-validator-client", "pin-project", "rand 0.8.5", "reqwest 0.12.24", @@ -7491,7 +7091,7 @@ version = "0.1.0" dependencies = [ "bincode", "log", - "nym-exit-policy 0.1.0", + "nym-exit-policy", "nym-service-providers-common", "nym-sphinx-addressing", "serde", @@ -7506,9 +7106,9 @@ version = "0.1.0" dependencies = [ "bincode", "log", - "nym-crypto 0.4.0", + "nym-crypto", "nym-metrics", - "nym-mixnet-contract-common 0.6.0", + "nym-mixnet-contract-common", "nym-sphinx-acknowledgements", "nym-sphinx-addressing", "nym-sphinx-anonymous-replies", @@ -7518,7 +7118,7 @@ dependencies = [ "nym-sphinx-framing", "nym-sphinx-params", "nym-sphinx-routing", - "nym-sphinx-types 0.2.0", + "nym-sphinx-types", "nym-topology", "rand 0.8.5", "rand_chacha 0.3.1", @@ -7535,12 +7135,12 @@ name = "nym-sphinx-acknowledgements" version = "0.1.0" dependencies = [ "generic-array 0.14.9", - "nym-crypto 0.4.0", - "nym-pemstore 0.3.0", + "nym-crypto", + "nym-pemstore", "nym-sphinx-addressing", "nym-sphinx-params", "nym-sphinx-routing", - "nym-sphinx-types 0.2.0", + "nym-sphinx-types", "nym-topology", "rand 0.8.5", "serde", @@ -7553,8 +7153,8 @@ name = "nym-sphinx-addressing" version = "0.1.0" dependencies = [ "bincode", - "nym-crypto 0.4.0", - "nym-sphinx-types 0.2.0", + "nym-crypto", + "nym-sphinx-types", "rand 0.8.5", "serde", "serde_json", @@ -7566,11 +7166,11 @@ name = "nym-sphinx-anonymous-replies" version = "0.1.0" dependencies = [ "bs58", - "nym-crypto 0.4.0", + "nym-crypto", "nym-sphinx-addressing", "nym-sphinx-params", "nym-sphinx-routing", - "nym-sphinx-types 0.2.0", + "nym-sphinx-types", "nym-topology", "rand 0.8.5", "rand_chacha 0.3.1", @@ -7586,11 +7186,11 @@ version = "0.1.0" dependencies = [ "dashmap", "log", - "nym-crypto 0.4.0", + "nym-crypto", "nym-metrics", "nym-sphinx-addressing", "nym-sphinx-params", - "nym-sphinx-types 0.2.0", + "nym-sphinx-types", "rand 0.8.5", "serde", "thiserror 2.0.17", @@ -7602,14 +7202,14 @@ dependencies = [ name = "nym-sphinx-cover" version = "0.1.0" dependencies = [ - "nym-crypto 0.4.0", + "nym-crypto", "nym-sphinx-acknowledgements", "nym-sphinx-addressing", "nym-sphinx-chunking", "nym-sphinx-forwarding", "nym-sphinx-params", "nym-sphinx-routing", - "nym-sphinx-types 0.2.0", + "nym-sphinx-types", "nym-topology", "rand 0.8.5", "thiserror 2.0.17", @@ -7622,7 +7222,7 @@ dependencies = [ "nym-sphinx-addressing", "nym-sphinx-anonymous-replies", "nym-sphinx-params", - "nym-sphinx-types 0.2.0", + "nym-sphinx-types", "serde", "thiserror 2.0.17", ] @@ -7636,7 +7236,7 @@ dependencies = [ "nym-sphinx-addressing", "nym-sphinx-forwarding", "nym-sphinx-params", - "nym-sphinx-types 0.2.0", + "nym-sphinx-types", "thiserror 2.0.17", "tokio", "tokio-util", @@ -7647,8 +7247,8 @@ dependencies = [ name = "nym-sphinx-params" version = "0.1.0" dependencies = [ - "nym-crypto 0.4.0", - "nym-sphinx-types 0.2.0", + "nym-crypto", + "nym-sphinx-types", "serde", "thiserror 2.0.17", ] @@ -7658,7 +7258,7 @@ name = "nym-sphinx-routing" version = "0.1.0" dependencies = [ "nym-sphinx-addressing", - "nym-sphinx-types 0.2.0", + "nym-sphinx-types", "thiserror 2.0.17", ] @@ -7671,14 +7271,6 @@ dependencies = [ "thiserror 2.0.17", ] -[[package]] -name = "nym-sphinx-types" -version = "0.2.0" -source = "git+https://github.com/nymtech/nym?branch=develop#9f9639950b93369ecdbd0874f775b21ab8c65662" -dependencies = [ - "thiserror 2.0.17", -] - [[package]] name = "nym-statistics-api" version = "0.2.1" @@ -7689,12 +7281,12 @@ dependencies = [ "axum-extra", "celes", "clap", - "nym-bin-common 0.6.0", + "nym-bin-common", "nym-http-api-client", "nym-http-api-common", "nym-statistics-common", "nym-task", - "nym-validator-client 0.1.0", + "nym-validator-client", "serde", "serde_json", "sqlx", @@ -7716,8 +7308,8 @@ version = "0.1.0" dependencies = [ "futures", "log", - "nym-credentials-interface 0.1.0", - "nym-crypto 0.4.0", + "nym-credentials-interface", + "nym-crypto", "nym-metrics", "nym-sphinx", "nym-task", @@ -7726,7 +7318,7 @@ dependencies = [ "sha2 0.10.9", "si-scale", "strum", - "strum_macros 0.27.2", + "strum_macros", "sysinfo", "thiserror 2.0.17", "time", @@ -7783,8 +7375,8 @@ dependencies = [ name = "nym-ticketbooks-merkle" version = "0.1.0" dependencies = [ - "nym-credentials-interface 0.1.0", - "nym-serde-helpers 0.1.0", + "nym-credentials-interface", + "nym-serde-helpers", "rand 0.8.5", "rand_chacha 0.3.1", "rs_merkle", @@ -7796,31 +7388,16 @@ dependencies = [ "utoipa", ] -[[package]] -name = "nym-ticketbooks-merkle" -version = "0.1.0" -source = "git+https://github.com/nymtech/nym?branch=develop#9f9639950b93369ecdbd0874f775b21ab8c65662" -dependencies = [ - "nym-credentials-interface 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-serde-helpers 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "rs_merkle", - "schemars 0.8.22", - "serde", - "sha2 0.10.9", - "time", - "utoipa", -] - [[package]] name = "nym-topology" version = "0.1.0" dependencies = [ "async-trait", - "nym-api-requests 0.1.0", - "nym-crypto 0.4.0", - "nym-mixnet-contract-common 0.6.0", + "nym-api-requests", + "nym-crypto", + "nym-mixnet-contract-common", "nym-sphinx-addressing", - "nym-sphinx-types 0.2.0", + "nym-sphinx-types", "rand 0.8.5", "reqwest 0.12.24", "serde", @@ -7839,7 +7416,7 @@ version = "0.1.0" dependencies = [ "etherparse", "log", - "nym-wireguard-types 0.1.0", + "nym-wireguard-types", "thiserror 2.0.17", "tokio", "tokio-tun", @@ -7856,18 +7433,18 @@ dependencies = [ "hmac", "itertools 0.14.0", "log", - "nym-config 0.1.0", - "nym-crypto 0.4.0", - "nym-mixnet-contract-common 0.6.0", - "nym-validator-client 0.1.0", - "nym-vesting-contract-common 0.7.0", + "nym-config", + "nym-crypto", + "nym-mixnet-contract-common", + "nym-validator-client", + "nym-vesting-contract-common", "reqwest 0.12.24", "schemars 0.8.22", "serde", "serde_json", "sha2 0.10.9", "strum", - "strum_macros 0.27.2", + "strum_macros", "tempfile", "thiserror 2.0.17", "ts-rs", @@ -7882,7 +7459,7 @@ version = "0.1.0" dependencies = [ "anyhow", "jwt-simple", - "nym-crypto 0.4.0", + "nym-crypto", "nym-http-api-client", "reqwest 0.12.24", "serde", @@ -7912,20 +7489,20 @@ dependencies = [ "flate2", "futures", "itertools 0.14.0", - "nym-api-requests 0.1.0", - "nym-coconut-dkg-common 0.1.0", - "nym-compact-ecash 0.1.0", - "nym-config 0.1.0", + "nym-api-requests", + "nym-coconut-dkg-common", + "nym-compact-ecash", + "nym-config", "nym-contracts-common", - "nym-ecash-contract-common 0.1.0", - "nym-group-contract-common 0.1.0", + "nym-ecash-contract-common", + "nym-group-contract-common", "nym-http-api-client", - "nym-mixnet-contract-common 0.6.0", - "nym-multisig-contract-common 0.1.0", - "nym-network-defaults 0.1.0", - "nym-performance-contract-common 0.1.0", - "nym-serde-helpers 0.1.0", - "nym-vesting-contract-common 0.7.0", + "nym-mixnet-contract-common", + "nym-multisig-contract-common", + "nym-network-defaults", + "nym-performance-contract-common", + "nym-serde-helpers", + "nym-vesting-contract-common", "prost", "reqwest 0.12.24", "serde", @@ -7942,56 +7519,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "nym-validator-client" -version = "0.1.0" -source = "git+https://github.com/nymtech/nym?branch=develop#9f9639950b93369ecdbd0874f775b21ab8c65662" -dependencies = [ - "async-trait", - "base64 0.22.1", - "bip32", - "bip39", - "colored", - "cosmrs", - "cosmwasm-std", - "cw-controllers", - "cw-utils", - "cw2", - "cw3", - "cw4", - "eyre", - "flate2", - "futures", - "itertools 0.14.0", - "nym-api-requests 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-coconut-dkg-common 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-compact-ecash 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-config 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-contracts-common", - "nym-ecash-contract-common 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-group-contract-common 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-http-api-client", - "nym-mixnet-contract-common 0.6.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-multisig-contract-common 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-network-defaults 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-performance-contract-common 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-serde-helpers 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-vesting-contract-common 0.7.0 (git+https://github.com/nymtech/nym?branch=develop)", - "prost", - "reqwest 0.12.24", - "serde", - "serde_json", - "sha2 0.10.9", - "tendermint-rpc", - "thiserror 2.0.17", - "time", - "tokio", - "tracing", - "url", - "wasmtimer", - "zeroize", -] - [[package]] name = "nym-validator-rewarder" version = "0.3.0" @@ -8003,22 +7530,22 @@ dependencies = [ "futures", "humantime", "humantime-serde", - "nym-bin-common 0.6.0", - "nym-coconut-dkg-common 0.1.0", - "nym-compact-ecash 0.1.0", - "nym-config 0.1.0", + "nym-bin-common", + "nym-coconut-dkg-common", + "nym-compact-ecash", + "nym-config", "nym-contracts-common", - "nym-credentials 0.1.0", - "nym-credentials-interface 0.1.0", - "nym-crypto 0.4.0", - "nym-ecash-time 0.1.0", + "nym-credentials", + "nym-credentials-interface", + "nym-crypto", + "nym-ecash-time", "nym-http-api-client", - "nym-network-defaults 0.1.0", - "nym-pemstore 0.3.0", - "nym-serde-helpers 0.1.0", + "nym-network-defaults", + "nym-pemstore", + "nym-serde-helpers", "nym-task", - "nym-ticketbooks-merkle 0.1.0", - "nym-validator-client 0.1.0", + "nym-ticketbooks-merkle", + "nym-validator-client", "nyxd-scraper", "rand 0.8.5", "rand_chacha 0.3.1", @@ -8042,11 +7569,11 @@ dependencies = [ "bytes", "futures", "humantime", - "nym-api-requests 0.1.0", - "nym-crypto 0.4.0", + "nym-api-requests", + "nym-crypto", "nym-http-api-client", "nym-task", - "nym-validator-client 0.1.0", + "nym-validator-client", "rand 0.8.5", "thiserror 2.0.17", "time", @@ -8064,56 +7591,12 @@ dependencies = [ "cosmwasm-std", "cw2", "nym-contracts-common", - "nym-mixnet-contract-common 0.6.0", + "nym-mixnet-contract-common", "serde", "thiserror 2.0.17", "ts-rs", ] -[[package]] -name = "nym-vesting-contract-common" -version = "0.7.0" -source = "git+https://github.com/nymtech/nym?branch=develop#9f9639950b93369ecdbd0874f775b21ab8c65662" -dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "nym-contracts-common", - "nym-mixnet-contract-common 0.6.0 (git+https://github.com/nymtech/nym?branch=develop)", - "serde", - "thiserror 2.0.17", -] - -[[package]] -name = "nym-vpn-api-client" -version = "1.17.0-beta" -source = "git+https://github.com/nymtech/nym-vpn-client/?rev=5ab01ba06057449614dd6a8450d04358c5ec33d1#5ab01ba06057449614dd6a8450d04358c5ec33d1" -dependencies = [ - "backon", - "base64-url", - "bip39", - "bs58", - "chrono", - "itertools 0.13.0", - "nym-compact-ecash 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-config 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-contracts-common", - "nym-credential-proxy-requests 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-crypto 0.4.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-http-api-client", - "nym-network-defaults 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-validator-client 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "serde", - "serde_json", - "sha2 0.10.9", - "strum", - "strum_macros 0.26.4", - "thiserror 2.0.17", - "time", - "tracing", - "url", - "zeroize", -] - [[package]] name = "nym-vpn-api-lib-wasm" version = "0.1.0" @@ -8121,13 +7604,13 @@ dependencies = [ "bs58", "getrandom 0.2.16", "js-sys", - "nym-bin-common 0.6.0", - "nym-compact-ecash 0.1.0", - "nym-credential-proxy-requests 0.1.0", - "nym-credentials 0.1.0", - "nym-credentials-interface 0.1.0", - "nym-crypto 0.4.0", - "nym-ecash-time 0.1.0", + "nym-bin-common", + "nym-compact-ecash", + "nym-credential-proxy-requests", + "nym-credentials", + "nym-credentials-interface", + "nym-crypto", + "nym-ecash-time", "serde", "serde-wasm-bindgen 0.6.5", "serde_json", @@ -8146,16 +7629,16 @@ dependencies = [ "cosmrs", "cosmwasm-std", "hex-literal", - "nym-config 0.1.0", - "nym-mixnet-contract-common 0.6.0", - "nym-network-defaults 0.1.0", + "nym-config", + "nym-mixnet-contract-common", + "nym-network-defaults", "nym-types", - "nym-validator-client 0.1.0", - "nym-vesting-contract-common 0.7.0", + "nym-validator-client", + "nym-vesting-contract-common", "serde", "serde_json", "strum", - "strum_macros 0.27.2", + "strum_macros", "ts-rs", ] @@ -8175,14 +7658,14 @@ dependencies = [ "log", "nym-authenticator-requests", "nym-credential-verification", - "nym-credentials-interface 0.1.0", - "nym-crypto 0.4.0", + "nym-credentials-interface", + "nym-crypto", "nym-gateway-requests", "nym-gateway-storage", - "nym-network-defaults 0.1.0", + "nym-network-defaults", "nym-node-metrics", "nym-task", - "nym-wireguard-types 0.1.0", + "nym-wireguard-types", "thiserror 2.0.17", "time", "tokio", @@ -8210,7 +7693,7 @@ dependencies = [ "axum", "futures", "nym-credential-verification", - "nym-credentials-interface 0.1.0", + "nym-credentials-interface", "nym-http-api-common", "nym-wireguard", "nym-wireguard-private-metadata-shared", @@ -8227,7 +7710,7 @@ version = "1.0.0" dependencies = [ "axum", "bincode", - "nym-credentials-interface 0.1.0", + "nym-credentials-interface", "schemars 0.8.22", "serde", "thiserror 2.0.17", @@ -8241,7 +7724,7 @@ dependencies = [ "async-trait", "axum", "nym-credential-verification", - "nym-credentials-interface 0.1.0", + "nym-credentials-interface", "nym-http-api-client", "nym-http-api-common", "nym-wireguard", @@ -8259,29 +7742,15 @@ version = "0.1.0" dependencies = [ "base64 0.22.1", "log", - "nym-config 0.1.0", - "nym-crypto 0.4.0", - "nym-network-defaults 0.1.0", + "nym-config", + "nym-crypto", + "nym-network-defaults", "rand 0.8.5", "serde", "thiserror 2.0.17", "x25519-dalek", ] -[[package]] -name = "nym-wireguard-types" -version = "0.1.0" -source = "git+https://github.com/nymtech/nym?branch=develop#9f9639950b93369ecdbd0874f775b21ab8c65662" -dependencies = [ - "base64 0.22.1", - "log", - "nym-config 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "nym-network-defaults 0.1.0 (git+https://github.com/nymtech/nym?branch=develop)", - "serde", - "thiserror 2.0.17", - "x25519-dalek", -] - [[package]] name = "nymvisor" version = "0.1.29" @@ -8297,8 +7766,8 @@ dependencies = [ "humantime-serde", "nix 0.27.1", "nym-async-file-watcher", - "nym-bin-common 0.6.0", - "nym-config 0.1.0", + "nym-bin-common", + "nym-config", "nym-task", "reqwest 0.12.24", "serde", @@ -8321,11 +7790,11 @@ dependencies = [ "axum", "chrono", "clap", - "nym-bin-common 0.6.0", - "nym-config 0.1.0", - "nym-network-defaults 0.1.0", + "nym-bin-common", + "nym-config", + "nym-network-defaults", "nym-task", - "nym-validator-client 0.1.0", + "nym-validator-client", "nyxd-scraper", "reqwest 0.12.24", "schemars 0.8.22", @@ -10865,20 +10334,7 @@ version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" dependencies = [ - "strum_macros 0.27.2", -] - -[[package]] -name = "strum_macros" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.107", + "strum_macros", ] [[package]] @@ -11191,21 +10647,21 @@ dependencies = [ "dkg-bypass-contract", "humantime", "indicatif", - "nym-bin-common 0.6.0", - "nym-coconut-dkg-common 0.1.0", - "nym-compact-ecash 0.1.0", - "nym-config 0.1.0", + "nym-bin-common", + "nym-coconut-dkg-common", + "nym-compact-ecash", + "nym-config", "nym-contracts-common", - "nym-crypto 0.4.0", - "nym-ecash-contract-common 0.1.0", - "nym-group-contract-common 0.1.0", + "nym-crypto", + "nym-ecash-contract-common", + "nym-group-contract-common", "nym-http-api-client", - "nym-mixnet-contract-common 0.6.0", - "nym-multisig-contract-common 0.1.0", - "nym-pemstore 0.3.0", - "nym-performance-contract-common 0.1.0", - "nym-validator-client 0.1.0", - "nym-vesting-contract-common 0.7.0", + "nym-mixnet-contract-common", + "nym-multisig-contract-common", + "nym-pemstore", + "nym-performance-contract-common", + "nym-validator-client", + "nym-vesting-contract-common", "rand 0.8.5", "serde", "serde_json", @@ -11942,11 +11398,11 @@ name = "ts-rs-cli" version = "0.1.0" dependencies = [ "anyhow", - "nym-api-requests 0.1.0", - "nym-mixnet-contract-common 0.6.0", + "nym-api-requests", + "nym-mixnet-contract-common", "nym-types", - "nym-validator-client 0.1.0", - "nym-vesting-contract-common 0.7.0", + "nym-validator-client", + "nym-vesting-contract-common", "nym-wallet-types", "ts-rs", "walkdir", @@ -12392,10 +11848,10 @@ dependencies = [ "anyhow", "clap", "comfy-table", - "nym-bin-common 0.6.0", + "nym-bin-common", "nym-http-api-client", - "nym-network-defaults 0.1.0", - "nym-validator-client 0.1.0", + "nym-network-defaults", + "nym-validator-client", "serde", "serde_json", "strum", @@ -12671,9 +12127,9 @@ dependencies = [ "js-sys", "nym-bandwidth-controller", "nym-client-core", - "nym-config 0.1.0", + "nym-config", "nym-credential-storage", - "nym-crypto 0.4.0", + "nym-crypto", "nym-gateway-client", "nym-http-api-client", "nym-sphinx", @@ -12681,7 +12137,7 @@ dependencies = [ "nym-statistics-common", "nym-task", "nym-topology", - "nym-validator-client 0.1.0", + "nym-validator-client", "rand 0.8.5", "serde", "serde-wasm-bindgen 0.6.5", @@ -13503,10 +12959,10 @@ dependencies = [ "bs58", "getrandom 0.2.16", "js-sys", - "nym-bin-common 0.6.0", - "nym-compact-ecash 0.1.0", - "nym-credentials 0.1.0", - "nym-crypto 0.4.0", + "nym-bin-common", + "nym-compact-ecash", + "nym-credentials", + "nym-crypto", "nym-http-api-client", "rand 0.8.5", "reqwest 0.12.24", @@ -13566,7 +13022,7 @@ name = "zulip-client" version = "0.1.0" dependencies = [ "itertools 0.14.0", - "nym-bin-common 0.6.0", + "nym-bin-common", "nym-http-api-client", "reqwest 0.12.24", "serde", diff --git a/nym-gateway-directory/Cargo.toml b/nym-gateway-directory/Cargo.toml index 7c47617210..744ed703a4 100644 --- a/nym-gateway-directory/Cargo.toml +++ b/nym-gateway-directory/Cargo.toml @@ -16,10 +16,11 @@ nym-http-api-client = { path = "../common/http-api-client" } nym-sphinx = { path = "../common/nymsphinx" } # replaces the types pulled in from nym-sdk in nym-vpn-client repo nym-topology = { path = "../common/topology" } # replaces the types pulled in from nym-sdk in nym-vpn-client repo nym-validator-client = { path = "../common/client-libs/validator-client" } -nym-vpn-api-client = { git = "https://github.com/nymtech/nym-vpn-client/", rev = "5ab01ba06057449614dd6a8450d04358c5ec33d1" } +# nym-vpn-api-client = { git = "https://github.com/nymtech/nym-vpn-client/", rev = "5ab01ba06057449614dd6a8450d04358c5ec33d1" } nym-crypto = { path = "../common/crypto" } nym-sphinx-addressing = { path = "../common/nymsphinx/addressing" } nym-network-defaults = { path = "../common/network-defaults" } +nym-contracts-common = { path = "../common/cosmwasm-smart-contracts/contracts-common" } rand.workspace = true serde.workspace = true diff --git a/nym-gateway-directory/src/entries/country.rs b/nym-gateway-directory/src/entries/country.rs index 0a93685e7b..537c3deb6b 100644 --- a/nym-gateway-directory/src/entries/country.rs +++ b/nym-gateway-directory/src/entries/country.rs @@ -1,7 +1,7 @@ // Copyright 2024 - Nym Technologies SA // SPDX-License-Identifier: GPL-3.0-only -use crate::Location; +use crate::{Location, NymDirectoryCountry}; #[derive(Debug, Clone, PartialEq, Eq, Hash)] pub struct Country { @@ -14,8 +14,8 @@ impl Country { } } -impl From for Country { - fn from(country: nym_vpn_api_client::response::NymDirectoryCountry) -> Self { +impl From for Country { + fn from(country: NymDirectoryCountry) -> Self { Self { iso_code: country.iso_code().to_string(), } diff --git a/nym-gateway-directory/src/entries/gateway.rs b/nym-gateway-directory/src/entries/gateway.rs index 1c99a3a73d..c64f5ee262 100644 --- a/nym-gateway-directory/src/entries/gateway.rs +++ b/nym-gateway-directory/src/entries/gateway.rs @@ -1,15 +1,12 @@ // Copyright 2024 - Nym Technologies SA // SPDX-License-Identifier: GPL-3.0-only - use itertools::Itertools; +use nym_contracts_common::Percent; use nym_sphinx::addressing::nodes::NodeIdentity; use nym_topology::{NodeId, RoutingNode}; use nym_validator_client::models::{KeyRotationId, NymNodeDescription}; -use nym_vpn_api_client::{ - response::{BridgeInformation, BridgeParameters}, - types::{Percent, ScoreThresholds}, -}; use rand::seq::IteratorRandom; +use serde::{Deserialize, Serialize}; use std::{ fmt::{self, Display}, net::{IpAddr, Ipv4Addr, Ipv6Addr}, @@ -18,14 +15,13 @@ use std::{ use tracing::error; use crate::{ - AuthAddress, Country, Error, IpPacketRouterAddress, + AuthAddress, BridgeInformation, BridgeParameters, Country, Error, IpPacketRouterAddress, + ScoreThresholds, entries::score::{HIGH_SCORE_THRESHOLD, LOW_SCORE_THRESHOLD, MEDIUM_SCORE_THRESHOLD, Score}, error::Result, helpers, }; -// pub type NymNode = Gateway; - pub const COUNTRY_WITH_REGION_SELECTOR: &str = "US"; #[derive(Clone)] @@ -286,7 +282,7 @@ pub struct Location { pub asn: Option, } -#[derive(Debug, Clone, Copy, PartialEq, Eq)] +#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)] pub enum ScoreValue { Offline, Low, @@ -391,17 +387,17 @@ pub struct WgProbeResults { pub ping_ips_performance: f32, } -impl From for AsnKind { - fn from(value: nym_vpn_api_client::response::AsnKind) -> Self { +impl From for AsnKind { + fn from(value: helpers::AsnKind) -> Self { match value { - nym_vpn_api_client::response::AsnKind::Residential => AsnKind::Residential, - nym_vpn_api_client::response::AsnKind::Other => AsnKind::Other, + helpers::AsnKind::Residential => AsnKind::Residential, + helpers::AsnKind::Other => AsnKind::Other, } } } -impl From for Asn { - fn from(location: nym_vpn_api_client::response::Asn) -> Self { +impl From for Asn { + fn from(location: helpers::Asn) -> Self { Asn { asn: location.asn, name: location.name, @@ -410,8 +406,8 @@ impl From for Asn { } } -impl From for Location { - fn from(location: nym_vpn_api_client::response::Location) -> Self { +impl From for Location { + fn from(location: helpers::Location) -> Self { Location { two_letter_iso_country_code: location.two_letter_iso_country_code, latitude: location.latitude, @@ -423,36 +419,36 @@ impl From for Location { } } -impl From for ScoreValue { - fn from(value: nym_vpn_api_client::response::ScoreValue) -> Self { - match value { - nym_vpn_api_client::response::ScoreValue::Offline => ScoreValue::Offline, - nym_vpn_api_client::response::ScoreValue::Low => ScoreValue::Low, - nym_vpn_api_client::response::ScoreValue::Medium => ScoreValue::Medium, - nym_vpn_api_client::response::ScoreValue::High => ScoreValue::High, - } - } -} +// impl From for ScoreValue { +// fn from(value: nym_vpn_api_client::response::ScoreValue) -> Self { +// match value { +// nym_vpn_api_client::response::ScoreValue::Offline => ScoreValue::Offline, +// nym_vpn_api_client::response::ScoreValue::Low => ScoreValue::Low, +// nym_vpn_api_client::response::ScoreValue::Medium => ScoreValue::Medium, +// nym_vpn_api_client::response::ScoreValue::High => ScoreValue::High, +// } +// } +// } -impl From for Performance { - fn from(value: nym_vpn_api_client::response::DVpnGatewayPerformance) -> Self { - Performance { - last_updated_utc: value.last_updated_utc, - score: value.score.into(), - load: value.load.into(), - uptime_percentage_last_24_hours: value.uptime_percentage_last_24_hours, - } - } -} +// impl From for Performance { +// fn from(value: nym_vpn_api_client::response::DVpnGatewayPerformance) -> Self { +// Performance { +// last_updated_utc: value.last_updated_utc, +// score: value.score.into(), +// load: value.load.into(), +// uptime_percentage_last_24_hours: value.uptime_percentage_last_24_hours, +// } +// } +// } -impl From for Probe { - fn from(probe: nym_vpn_api_client::response::Probe) -> Self { - Probe { - last_updated_utc: probe.last_updated_utc, - outcome: ProbeOutcome::from(probe.outcome), - } - } -} +// impl From for Probe { +// fn from(probe: nym_vpn_api_client::response::Probe) -> Self { +// Probe { +// last_updated_utc: probe.last_updated_utc, +// outcome: ProbeOutcome::from(probe.outcome), +// } +// } +// } impl From for Score { fn from(percent: Percent) -> Self { @@ -469,96 +465,96 @@ impl From for Score { } } -impl From for ProbeOutcome { - fn from(outcome: nym_vpn_api_client::response::ProbeOutcome) -> Self { - ProbeOutcome { - as_entry: Entry::from(outcome.as_entry), - as_exit: outcome.as_exit.map(Exit::from), - wg: outcome.wg.map(WgProbeResults::from), - } - } -} +// impl From for ProbeOutcome { +// fn from(outcome: nym_vpn_api_client::response::ProbeOutcome) -> Self { +// ProbeOutcome { +// as_entry: Entry::from(outcome.as_entry), +// as_exit: outcome.as_exit.map(Exit::from), +// wg: outcome.wg.map(WgProbeResults::from), +// } +// } +// } -impl From for Entry { - fn from(entry: nym_vpn_api_client::response::Entry) -> Self { - Entry { - can_connect: entry.can_connect, - can_route: entry.can_route, - } - } -} +// impl From for Entry { +// fn from(entry: nym_vpn_api_client::response::Entry) -> Self { +// Entry { +// can_connect: entry.can_connect, +// can_route: entry.can_route, +// } +// } +// } -impl From for Exit { - fn from(exit: nym_vpn_api_client::response::Exit) -> Self { - Exit { - can_connect: exit.can_connect, - can_route_ip_v4: exit.can_route_ip_v4, - can_route_ip_external_v4: exit.can_route_ip_external_v4, - can_route_ip_v6: exit.can_route_ip_v6, - can_route_ip_external_v6: exit.can_route_ip_external_v6, - } - } -} +// impl From for Exit { +// fn from(exit: nym_vpn_api_client::response::Exit) -> Self { +// Exit { +// can_connect: exit.can_connect, +// can_route_ip_v4: exit.can_route_ip_v4, +// can_route_ip_external_v4: exit.can_route_ip_external_v4, +// can_route_ip_v6: exit.can_route_ip_v6, +// can_route_ip_external_v6: exit.can_route_ip_external_v6, +// } +// } +// } -impl From for WgProbeResults { - fn from(results: nym_vpn_api_client::response::WgProbeResults) -> Self { - WgProbeResults { - can_register: results.can_register, - can_handshake: results.can_handshake, - can_resolve_dns: results.can_resolve_dns, - ping_hosts_performance: results.ping_hosts_performance, - ping_ips_performance: results.ping_ips_performance, - } - } -} +// impl From for WgProbeResults { +// fn from(results: nym_vpn_api_client::response::WgProbeResults) -> Self { +// WgProbeResults { +// can_register: results.can_register, +// can_handshake: results.can_handshake, +// can_resolve_dns: results.can_resolve_dns, +// ping_hosts_performance: results.ping_hosts_performance, +// ping_ips_performance: results.ping_ips_performance, +// } +// } +// } -impl TryFrom for Gateway { - type Error = Error; +// impl TryFrom for Gateway { +// type Error = Error; - fn try_from(gateway: nym_vpn_api_client::response::NymDirectoryGateway) -> Result { - let identity = - NodeIdentity::from_base58_string(&gateway.identity_key).map_err(|source| { - Error::NodeIdentityFormattingError { - identity: gateway.identity_key, - source, - } - })?; +// fn try_from(gateway: nym_vpn_api_client::response::NymDirectoryGateway) -> Result { +// let identity = +// NodeIdentity::from_base58_string(&gateway.identity_key).map_err(|source| { +// Error::NodeIdentityFormattingError { +// identity: gateway.identity_key, +// source, +// } +// })?; - let ipr_address = gateway - .ip_packet_router - .and_then(|ipr| IpPacketRouterAddress::try_from_base58_string(&ipr.address).ok()); +// let ipr_address = gateway +// .ip_packet_router +// .and_then(|ipr| IpPacketRouterAddress::try_from_base58_string(&ipr.address).ok()); - let authenticator_address = gateway - .authenticator - .and_then(|auth| AuthAddress::try_from_base58_string(&auth.address).ok()); +// let authenticator_address = gateway +// .authenticator +// .and_then(|auth| AuthAddress::try_from_base58_string(&auth.address).ok()); - let hostname = gateway.entry.hostname; - let first_ip_address = gateway - .ip_addresses - .first() - .cloned() - .map(|ip| ip.to_string()); - let host = hostname.or(first_ip_address); +// let hostname = gateway.entry.hostname; +// let first_ip_address = gateway +// .ip_addresses +// .first() +// .cloned() +// .map(|ip| ip.to_string()); +// let host = hostname.or(first_ip_address); - Ok(Gateway { - identity, - moniker: gateway.name, - location: Some(gateway.location.into()), - ipr_address, - authenticator_address, - bridge_params: gateway.bridges, - last_probe: gateway.last_probe.map(Probe::from), - ips: gateway.ip_addresses, - host, - clients_ws_port: Some(gateway.entry.ws_port), - clients_wss_port: gateway.entry.wss_port, - mixnet_performance: Some(gateway.performance), - mixnet_score: Some(Score::from(gateway.performance)), - wg_performance: gateway.performance_v2.map(Performance::from), - version: gateway.build_information.map(|info| info.build_version), - }) - } -} +// Ok(Gateway { +// identity, +// moniker: gateway.name, +// location: Some(gateway.location.into()), +// ipr_address, +// authenticator_address, +// bridge_params: gateway.bridges, +// last_probe: gateway.last_probe.map(Probe::from), +// ips: gateway.ip_addresses, +// host, +// clients_ws_port: Some(gateway.entry.ws_port), +// clients_wss_port: gateway.entry.wss_port, +// mixnet_performance: Some(gateway.performance), +// mixnet_score: Some(Score::from(gateway.performance)), +// wg_performance: gateway.performance_v2.map(Performance::from), +// version: gateway.build_information.map(|info| info.build_version), +// }) +// } +// } pub type NymNodeList = GatewayList; @@ -702,22 +698,22 @@ impl fmt::Display for GatewayType { } } -impl From for GatewayType { - fn from(gateway_type: nym_vpn_api_client::types::GatewayType) -> Self { +impl From for GatewayType { + fn from(gateway_type: helpers::GatewayType) -> Self { match gateway_type { - nym_vpn_api_client::types::GatewayType::MixnetEntry => GatewayType::MixnetEntry, - nym_vpn_api_client::types::GatewayType::MixnetExit => GatewayType::MixnetExit, - nym_vpn_api_client::types::GatewayType::Wg => GatewayType::Wg, + helpers::GatewayType::MixnetEntry => GatewayType::MixnetEntry, + helpers::GatewayType::MixnetExit => GatewayType::MixnetExit, + helpers::GatewayType::Wg => GatewayType::Wg, } } } -impl From for nym_vpn_api_client::types::GatewayType { +impl From for helpers::GatewayType { fn from(gateway_type: GatewayType) -> Self { match gateway_type { - GatewayType::MixnetEntry => nym_vpn_api_client::types::GatewayType::MixnetEntry, - GatewayType::MixnetExit => nym_vpn_api_client::types::GatewayType::MixnetExit, - GatewayType::Wg => nym_vpn_api_client::types::GatewayType::Wg, + GatewayType::MixnetEntry => helpers::GatewayType::MixnetEntry, + GatewayType::MixnetExit => helpers::GatewayType::MixnetExit, + GatewayType::Wg => helpers::GatewayType::Wg, } } } @@ -731,189 +727,3 @@ pub enum GatewayFilter { Exit, // Has an IPR address Vpn, // Has an authenticator address } - -// #[derive(Debug, Clone, PartialEq)] -// pub struct GatewayFilters { -// pub gw_type: GatewayType, -// pub filters: Vec, -// } - -#[cfg(test)] -mod tests { - use super::*; - - // Create a list of Gateways with different properties set for testing - fn sample_gateway_list(gw_type: GatewayType) -> GatewayList { - let asn = Asn { - asn: "AS12345".to_string(), - name: "Test ASN".to_string(), - kind: AsnKind::Residential, - }; - let addr = "MNrmKzuKjNdbEhfPUzVNfjw63oBQNSayqoQKGL4JjAV.6fDcSN6faGpvA3pd3riCwjpzXc7RQfWmGMa82UVoEwKE@d5adfJNtcdZW2XwK85JAAU8nXAs9JCPYn2RNvDLZn4e"; - let ipr = IpPacketRouterAddress::try_from_base58_string(addr).unwrap(); - let aa = AuthAddress::try_from_base58_string(addr).unwrap(); - let variables = [ - ("US", "CA", None, Some(ipr), Some(aa)), // Gateway 1 - ("US", "NY", Some(asn.clone()), None, None), // Gateway 2 - ("DE", "BE", None, None, Some(aa)), // Gateway 3 - ("FR", "Aquitaine", Some(asn.clone()), None, Some(aa)), // Gateway 4 - ("US", "TX", Some(asn.clone()), Some(ipr), None), // Gateway 5 - ("GB", "Hampshire", None, None, None), // Gateway 6 - ]; - - let mut instance = 0; - let gateways: Vec = variables - .into_iter() - .map(|(country, region, asn, ipr, aa)| { - instance += 1; - Gateway { - identity: NodeIdentity::from_base58_string( - "7CWjY3QFoA9dgE535u9bQiXCfzgMZvSpJu842GA1Wn42", - ) - .unwrap(), - moniker: format!("Gateway {instance}"), - location: Some(Location { - two_letter_iso_country_code: country.to_string(), - region: region.to_string(), - asn, - ..Default::default() - }), - ipr_address: ipr, - authenticator_address: aa, - bridge_params: None, - last_probe: None, - ips: Vec::new(), - host: None, - clients_ws_port: None, - clients_wss_port: None, - mixnet_performance: Some(Percent::from_percentage_value(75).unwrap()), - mixnet_score: None, - wg_performance: Some(Performance { - last_updated_utc: "2024-01-01T00:00:00Z".to_string(), - score: ScoreValue::High, - load: ScoreValue::Low, - uptime_percentage_last_24_hours: 0.75, - }), - version: None, - } - }) - .collect(); - GatewayList::new(Some(gw_type), gateways) - } - - #[test] - fn test_gateway_filter_score() { - let wg_list = sample_gateway_list(GatewayType::Wg); - let mixnet_entry_list = sample_gateway_list(GatewayType::MixnetEntry); - let mixnet_exit_list = sample_gateway_list(GatewayType::MixnetExit); - - let gws = wg_list.filter(&[GatewayFilter::MinScore(ScoreValue::High)]); - assert_eq!(gws.len(), 6); - let gws = wg_list.filter(&[GatewayFilter::MinScore(ScoreValue::Medium)]); - assert_eq!(gws.len(), 6); - let gws = wg_list.filter(&[GatewayFilter::MinScore(ScoreValue::Low)]); - assert_eq!(gws.len(), 6); - - let gws = mixnet_entry_list.filter(&[GatewayFilter::MinScore(ScoreValue::High)]); - assert_eq!(gws.len(), 0); - let gws = mixnet_entry_list.filter(&[GatewayFilter::MinScore(ScoreValue::Medium)]); - assert_eq!(gws.len(), 6); - let gws = mixnet_entry_list.filter(&[GatewayFilter::MinScore(ScoreValue::Low)]); - assert_eq!(gws.len(), 6); - - let gws = mixnet_exit_list.filter(&[GatewayFilter::MinScore(ScoreValue::High)]); - assert_eq!(gws.len(), 0); - let gws = mixnet_exit_list.filter(&[GatewayFilter::MinScore(ScoreValue::Medium)]); - assert_eq!(gws.len(), 6); - let gws = mixnet_exit_list.filter(&[GatewayFilter::MinScore(ScoreValue::Low)]); - assert_eq!(gws.len(), 6); - } - - #[test] - fn test_gateway_filter_exit_nodes() { - let gateway_list = sample_gateway_list(GatewayType::MixnetEntry); - let exit_gws = gateway_list.filter(&[GatewayFilter::Exit]); - assert_eq!(exit_gws.len(), 2); - assert_eq!(exit_gws[0].moniker, "Gateway 1"); - assert_eq!(exit_gws[1].moniker, "Gateway 5"); - } - - #[test] - fn test_gateway_filter_vpn_nodes() { - let gateway_list = sample_gateway_list(GatewayType::MixnetExit); - let vpn_gws = gateway_list.filter(&[GatewayFilter::Vpn]); - assert_eq!(vpn_gws.len(), 3); - assert_eq!(vpn_gws[0].moniker, "Gateway 1"); - assert_eq!(vpn_gws[1].moniker, "Gateway 3"); - assert_eq!(vpn_gws[2].moniker, "Gateway 4"); - } - - #[test] - fn test_gateway_filter_residential() { - let gateway_list = sample_gateway_list(GatewayType::Wg); - let residential_gws = gateway_list.filter(&[GatewayFilter::Residential]); - assert_eq!(residential_gws.len(), 3); - assert_eq!(residential_gws[0].moniker, "Gateway 2"); - assert_eq!(residential_gws[1].moniker, "Gateway 4"); - assert_eq!(residential_gws[2].moniker, "Gateway 5"); - } - - #[test] - fn test_gateway_random_country() { - let gateway_list = sample_gateway_list(GatewayType::MixnetEntry); - - assert!( - gateway_list - .choose_random(&[GatewayFilter::Country("US".into())]) - .unwrap() - .is_in_country("US") - ); - - assert!( - gateway_list - .choose_random(&[GatewayFilter::Country("DE".into())]) - .unwrap() - .is_in_country("DE") - ); - - assert!( - gateway_list - .choose_random(&[GatewayFilter::Country("BE".into())]) - .is_none() - ); - } - - #[test] - fn test_gateway_random_region() { - let gateway_list = sample_gateway_list(GatewayType::MixnetExit); - - assert!( - gateway_list - .choose_random(&[ - GatewayFilter::Country("US".into()), - GatewayFilter::Region("CA".into()) - ]) - .unwrap() - .is_in_region("CA") - ); - - assert!( - gateway_list - .choose_random(&[ - GatewayFilter::Country("GB".into()), - GatewayFilter::Region("Hampshire".into()) - ]) - .unwrap() - .is_in_region("Hampshire") - ); - - assert!( - gateway_list - .choose_random(&[ - GatewayFilter::Country("DE".into()), - GatewayFilter::Region("XZ".into()) - ]) - .is_none() - ); - } -} diff --git a/nym-gateway-directory/src/entries/ipr_addresses.rs b/nym-gateway-directory/src/entries/ipr_addresses.rs index 37c596f5c0..42de5ef878 100644 --- a/nym-gateway-directory/src/entries/ipr_addresses.rs +++ b/nym-gateway-directory/src/entries/ipr_addresses.rs @@ -2,7 +2,6 @@ // SPDX-License-Identifier: GPL-3.0-only use nym_sphinx::addressing::clients::Recipient; use nym_sphinx::addressing::nodes::NodeIdentity; -// use nym_sdk::mixnet::{NodeIdentity, Recipient}; use nym_validator_client::models::NymNodeData; use crate::{Error, error::Result}; diff --git a/nym-gateway-directory/src/entries/score.rs b/nym-gateway-directory/src/entries/score.rs index 490be6c8cb..5024ffab3d 100644 --- a/nym-gateway-directory/src/entries/score.rs +++ b/nym-gateway-directory/src/entries/score.rs @@ -1,7 +1,7 @@ // Copyright 2025 - Nym Technologies SA // SPDX-License-Identifier: GPL-3.0-only -use nym_vpn_api_client::types::ScoreThresholds; +use crate::helpers::ScoreThresholds; pub(crate) const HIGH_SCORE_THRESHOLD: u8 = 80; pub(crate) const MEDIUM_SCORE_THRESHOLD: u8 = 60; diff --git a/nym-gateway-directory/src/gateway_client.rs b/nym-gateway-directory/src/gateway_client.rs index 6dadb0365f..0eed52fba3 100644 --- a/nym-gateway-directory/src/gateway_client.rs +++ b/nym-gateway-directory/src/gateway_client.rs @@ -6,21 +6,20 @@ use std::{ net::{IpAddr, SocketAddr}, }; +use crate::{ + Error, GatewayMinPerformance, ScoreThresholds, + entries::gateway::{Gateway, GatewayList, GatewayType, NymNodeList}, + error::Result, +}; +use nym_contracts_common::Percent; use nym_http_api_client::UserAgent; use nym_validator_client::{ models::NymNodeDescription, nym_api::NymApiClientExt, nym_nodes::SkimmedNodesWithMetadata, }; -use nym_vpn_api_client::types::{GatewayMinPerformance, Percent, ScoreThresholds}; use rand::{prelude::SliceRandom, thread_rng}; use tracing::{debug, error, warn}; use url::Url; -use crate::{ - Error, - entries::gateway::{Gateway, GatewayList, GatewayType, NymNodeList}, - error::Result, -}; - #[derive(Clone, Debug)] pub struct Config { pub nyxd_url: Url, diff --git a/nym-gateway-directory/src/helpers.rs b/nym-gateway-directory/src/helpers.rs index 4c023d4ef5..ba6995f655 100644 --- a/nym-gateway-directory/src/helpers.rs +++ b/nym-gateway-directory/src/helpers.rs @@ -1,6 +1,9 @@ // Copyright 2023 - Nym Technologies SA // SPDX-License-Identifier: GPL-3.0-only +use crate::ScoreValue; +use nym_contracts_common::Percent; +use serde::{Deserialize, Serialize}; use std::net::{IpAddr, Ipv4Addr, Ipv6Addr}; pub fn split_ips(ips: Vec) -> (Vec, Vec) { @@ -13,3 +16,119 @@ pub fn split_ips(ips: Vec) -> (Vec, Vec) { (v4, v6) }) } + +// Types copied in from nym-vpn-client/nym-vpn-core/crates/nym-vpn-api-client + +#[derive(Debug, Clone, Serialize, Deserialize)] +pub struct NymDirectoryCountry(String); + +impl NymDirectoryCountry { + pub fn iso_code(&self) -> &str { + &self.0 + } + pub fn into_string(self) -> String { + self.0 + } +} + +impl From for NymDirectoryCountry { + fn from(s: String) -> Self { + Self(s) + } +} + +#[derive(Clone, Copy, Debug, Eq, PartialEq)] +pub struct ScoreThresholds { + pub high: u8, + pub medium: u8, + pub low: u8, +} + +#[derive(Clone, Debug)] +pub enum GatewayType { + MixnetEntry, + MixnetExit, + Wg, +} + +#[derive(Clone, Copy, Default, Debug, Eq, PartialEq)] +pub struct GatewayMinPerformance { + pub mixnet_min_performance: Option, + pub vpn_min_performance: Option, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct BridgeInformation { + pub version: String, + pub transports: Vec, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +#[serde(tag = "transport_type", content = "args")] +#[serde(rename_all = "snake_case")] +pub enum BridgeParameters { + QuicPlain(QuicClientOptions), +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct QuicClientOptions { + /// Address describing the remote transport server. This is a vec to support multiple addresses + /// so as to support both IPv4 and IPv6. These addresses are meant to describe a single bridge + /// as the key material should not be used across multiple instances. + pub addresses: Vec, + + /// Override hostname used for certificate verification + pub host: Option, + + /// Use identity public key to verify server self signed certificate + pub id_pubkey: String, +} + +#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)] +#[serde(rename_all = "snake_case")] +pub enum AsnKind { + Residential, + Other, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct Asn { + pub asn: String, + pub name: String, + pub kind: AsnKind, +} + +#[derive(Debug, Clone, Serialize, Deserialize)] +pub struct Entry { + pub can_connect: bool, + pub can_route: bool, +} + +#[derive(Debug, Clone, Serialize, Deserialize)] +pub struct Exit { + pub can_connect: bool, + pub can_route_ip_v4: bool, + pub can_route_ip_external_v4: bool, + pub can_route_ip_v6: bool, + pub can_route_ip_external_v6: bool, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct Location { + pub two_letter_iso_country_code: String, + pub latitude: f64, + pub longitude: f64, + + pub city: String, + pub region: String, + + pub asn: Option, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct DVpnGatewayPerformance { + pub last_updated_utc: String, + pub score: ScoreValue, + pub load: ScoreValue, + pub uptime_percentage_last_24_hours: f32, +} diff --git a/nym-gateway-directory/src/lib.rs b/nym-gateway-directory/src/lib.rs index 1ca4741d8c..25b97bcb22 100644 --- a/nym-gateway-directory/src/lib.rs +++ b/nym-gateway-directory/src/lib.rs @@ -5,7 +5,6 @@ mod entries; mod error; mod gateway_client; mod helpers; -pub use nym_vpn_api_client::types::{GatewayMinPerformance, NaiveFloat, Percent}; pub use crate::{ entries::{ @@ -22,5 +21,8 @@ pub use crate::{ }, error::Error, gateway_client::{Config, GatewayClient}, - helpers::split_ips, + helpers::{ + BridgeInformation, BridgeParameters, GatewayMinPerformance, NymDirectoryCountry, + QuicClientOptions, ScoreThresholds, split_ips, + }, };