diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index e994671b5be..fd54e675cfe 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -8,17 +8,18 @@ on: - 'explorer-api/**' - 'gateway/**' - 'integrations/**' - - 'mixnode/**' - 'nym-api/**' - - 'nym-data-observatory/**' + - 'nym-credential-proxy/**' - 'nym-network-monitor/**' - 'nym-node/**' - 'nym-node-status-api/**' - 'nym-outfox/**' - 'nym-validator-rewarder/**' - - 'sdk/lib/**' + - 'nyx-chain-watcher/**' + - 'sdk/ffi/**' - 'sdk/rust/**' - 'service-providers/**' + - 'nym-browser-extension/storage/**' - 'tools/**' - 'wasm/**' - 'Cargo.toml' diff --git a/.github/workflows/ci-sdk-wasm.yml b/.github/workflows/ci-sdk-wasm.yml index 40bb639501d..732367ca4a6 100644 --- a/.github/workflows/ci-sdk-wasm.yml +++ b/.github/workflows/ci-sdk-wasm.yml @@ -1,6 +1,7 @@ name: ci-sdk-wasm on: + workflow_dispatch: pull_request: paths: - 'wasm/**' diff --git a/Cargo.lock b/Cargo.lock index 8d4d22f6eb7..e650ab52e66 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -692,15 +692,16 @@ dependencies = [ [[package]] name = "bip32" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa13fae8b6255872fd86f7faf4b41168661d7d78609f7bfe6771b85c6739a15b" +checksum = "db40d3dfbeab4e031d78c844642fa0caa0b0db11ce1607ac9d2986dff1405c69" dependencies = [ "bs58", "hmac", "k256", "rand_core 0.6.4", "ripemd", + "secp256k1", "sha2 0.10.8", "subtle 2.5.0", "zeroize", @@ -916,7 +917,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", - "semver 1.0.24", + "semver 1.0.25", "serde", "serde_json", "thiserror 1.0.69", @@ -930,7 +931,7 @@ checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" dependencies = [ "camino", "cargo-platform", - "semver 1.0.24", + "semver 1.0.25", "serde", "serde_json", "thiserror 1.0.69", @@ -1067,9 +1068,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.26" +version = "4.5.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8eb5e908ef3a6efbe1ed62520fb7287959888c88485abe072543190ecc66783" +checksum = "769b0145982b4b48713e01ec42d61614425f27b7058bda7180a3a41f30104796" dependencies = [ "clap_builder", "clap_derive", @@ -1077,9 +1078,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.26" +version = "4.5.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b01801b5fc6a0a232407abc821660c9c6d25a1cafc0d4f85f29fb8d9afc121" +checksum = "1b26884eb4b57140e4d2d93652abfa49498b938b3c9179f9fc487b0acc3edad7" dependencies = [ "anstream", "anstyle", @@ -1089,9 +1090,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.40" +version = "4.5.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac2e663e3e3bed2d32d065a8404024dad306e699a04263ec59919529f803aee9" +checksum = "375f9d8255adeeedd51053574fd8d4ba875ea5fa558e86617b07f09f1680c8b6" dependencies = [ "clap", ] @@ -1773,7 +1774,7 @@ dependencies = [ "cosmwasm-std", "cw2", "schemars", - "semver 1.0.24", + "semver 1.0.25", "serde", "thiserror 1.0.69", ] @@ -1788,7 +1789,7 @@ dependencies = [ "cosmwasm-std", "cw-storage-plus", "schemars", - "semver 1.0.24", + "semver 1.0.25", "serde", "thiserror 1.0.69", ] @@ -2285,6 +2286,18 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "enum-as-inner" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.90", +] + [[package]] name = "env_filter" version = "0.1.2" @@ -2424,7 +2437,7 @@ dependencies = [ "schemars", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.11", "tokio", ] @@ -2436,7 +2449,7 @@ dependencies = [ "console_error_panic_hook", "js-sys", "serde-wasm-bindgen 0.6.5", - "thiserror 1.0.69", + "thiserror 2.0.11", "wasm-bindgen", "wasm-bindgen-futures", "wasm-storage", @@ -2814,9 +2827,9 @@ dependencies = [ [[package]] name = "getset" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f636605b743120a8d32ed92fc27b6cde1a769f8f936c065151eb66f88ded513c" +checksum = "eded738faa0e88d3abc9d1a13cb11adc2073c400969eeb8793cf7132589959fc" dependencies = [ "proc-macro-error2", "proc-macro2", @@ -3092,6 +3105,61 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0" +[[package]] +name = "hickory-proto" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "447afdcdb8afb9d0a852af6dc65d9b285ce720ed7a59e42a8bf2e931c67bc1b5" +dependencies = [ + "async-trait", + "bytes", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "h2", + "http 0.2.12", + "idna 1.0.3", + "ipnet", + "once_cell", + "rand", + "rustls 0.21.12", + "rustls-pemfile 1.0.4", + "thiserror 1.0.69", + "tinyvec", + "tokio", + "tokio-rustls 0.24.1", + "tracing", + "url", + "webpki-roots 0.25.4", +] + +[[package]] +name = "hickory-resolver" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a2e2aba9c389ce5267d31cf1e4dace82390ae276b0b364ea55630b1fa1b44b4" +dependencies = [ + "cfg-if", + "futures-util", + "hickory-proto", + "ipconfig", + "lru-cache", + "once_cell", + "parking_lot", + "rand", + "resolv-conf", + "rustls 0.21.12", + "smallvec", + "thiserror 1.0.69", + "tokio", + "tokio-rustls 0.24.1", + "tracing", + "webpki-roots 0.25.4", +] + [[package]] name = "hidapi" version = "1.5.0" @@ -3131,6 +3199,17 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "hostname" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +dependencies = [ + "libc", + "match_cfg", + "winapi", +] + [[package]] name = "html5ever" version = "0.27.0" @@ -3649,9 +3728,9 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.17.9" +version = "0.17.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf675b85ed934d3c67b5c5469701eec7db22689d0a2139d856e0925fa28b281" +checksum = "183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235" dependencies = [ "console", "number_prefix", @@ -3739,6 +3818,18 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa2f047c0a98b2f299aa5d6d7088443570faae494e9ae1305e48be000c9e0eb1" +[[package]] +name = "ipconfig" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" +dependencies = [ + "socket2", + "widestring", + "windows-sys 0.48.0", + "winreg 0.50.0", +] + [[package]] name = "ipnet" version = "2.9.0" @@ -3946,9 +4037,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.167" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "libm" @@ -3989,6 +4080,12 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + [[package]] name = "linux-raw-sys" version = "0.4.14" @@ -4031,9 +4128,9 @@ checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" [[package]] name = "log" -version = "0.4.22" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" [[package]] name = "loom" @@ -4063,6 +4160,15 @@ dependencies = [ "tracing-subscriber", ] +[[package]] +name = "lru-cache" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" +dependencies = [ + "linked-hash-map", +] + [[package]] name = "mac" version = "0.1.1" @@ -4137,6 +4243,12 @@ dependencies = [ "tendril", ] +[[package]] +name = "match_cfg" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" + [[package]] name = "matchers" version = "0.1.0" @@ -4278,7 +4390,7 @@ dependencies = [ "rand", "serde", "serde-wasm-bindgen 0.6.5", - "thiserror 1.0.69", + "thiserror 2.0.11", "tokio", "tsify", "url", @@ -4671,13 +4783,13 @@ dependencies = [ "rand_chacha", "reqwest 0.12.4", "schemars", - "semver 1.0.24", + "semver 1.0.25", "serde", "serde_json", "sha2 0.9.9", "sqlx", "tempfile", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tokio", "tokio-stream", @@ -4702,6 +4814,7 @@ dependencies = [ "ecdsa", "getset", "nym-compact-ecash", + "nym-config", "nym-contracts-common", "nym-credentials-interface", "nym-crypto", @@ -4717,7 +4830,7 @@ dependencies = [ "serde_json", "sha2 0.10.8", "tendermint 0.40.1", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "ts-rs", "utoipa", @@ -4769,7 +4882,7 @@ dependencies = [ "rand", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.11", "tokio", "tokio-stream", "tokio-util", @@ -4792,7 +4905,7 @@ dependencies = [ "rand", "serde", "sha2 0.10.8", - "thiserror 1.0.69", + "thiserror 2.0.11", "x25519-dalek", ] @@ -4812,7 +4925,7 @@ dependencies = [ "nym-task", "nym-validator-client", "rand", - "thiserror 1.0.69", + "thiserror 2.0.11", "url", "zeroize", ] @@ -4851,7 +4964,7 @@ dependencies = [ "nym-validator-client", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.11", ] [[package]] @@ -4929,7 +5042,7 @@ dependencies = [ "serde_json", "tap", "tempfile", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tokio", "toml 0.8.19", @@ -4966,7 +5079,7 @@ dependencies = [ "serde", "serde_json", "tap", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tokio", "tokio-tungstenite", @@ -5004,6 +5117,7 @@ dependencies = [ "nym-explorer-client", "nym-gateway-client", "nym-gateway-requests", + "nym-http-api-client", "nym-id", "nym-metrics", "nym-mixnet-client", @@ -5023,7 +5137,7 @@ dependencies = [ "si-scale", "tap", "tempfile", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tokio", "tokio-stream", @@ -5048,7 +5162,7 @@ dependencies = [ "nym-sphinx-addressing", "nym-sphinx-params", "serde", - "thiserror 1.0.69", + "thiserror 2.0.11", "url", ] @@ -5063,7 +5177,7 @@ dependencies = [ "nym-gateway-requests", "serde", "sqlx", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tokio", "url", @@ -5081,7 +5195,7 @@ dependencies = [ "nym-sphinx", "nym-task", "sqlx", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tokio", ] @@ -5100,7 +5214,7 @@ dependencies = [ "serde", "serde-wasm-bindgen 0.6.5", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.11", "tsify", "wasm-bindgen", "wasm-bindgen-futures", @@ -5138,7 +5252,7 @@ dependencies = [ "serde", "serde_derive", "sha2 0.9.9", - "thiserror 1.0.69", + "thiserror 2.0.11", "zeroize", ] @@ -5185,7 +5299,7 @@ dependencies = [ "serde", "sha2 0.9.9", "subtle 2.5.0", - "thiserror 1.0.69", + "thiserror 2.0.11", "zeroize", ] @@ -5198,7 +5312,7 @@ dependencies = [ "log", "nym-network-defaults", "serde", - "thiserror 1.0.69", + "thiserror 2.0.11", "toml 0.8.19", "url", ] @@ -5214,7 +5328,7 @@ dependencies = [ "schemars", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.11", "utoipa", "vergen", ] @@ -5275,7 +5389,7 @@ dependencies = [ "strum 0.26.3", "strum_macros 0.26.4", "tempfile", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tokio", "tokio-util", @@ -5323,7 +5437,7 @@ dependencies = [ "nym-ecash-time", "serde", "sqlx", - "thiserror 1.0.69", + "thiserror 2.0.11", "tokio", "zeroize", ] @@ -5341,7 +5455,7 @@ dependencies = [ "nym-credentials-interface", "nym-ecash-time", "nym-validator-client", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tokio", ] @@ -5364,7 +5478,7 @@ dependencies = [ "nym-validator-client", "rand", "si-scale", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tokio", "tracing", @@ -5388,7 +5502,7 @@ dependencies = [ "nym-validator-client", "rand", "serde", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "zeroize", ] @@ -5404,7 +5518,7 @@ dependencies = [ "rand", "serde", "strum 0.26.3", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "utoipa", ] @@ -5432,7 +5546,7 @@ dependencies = [ "serde", "serde_bytes", "subtle-encoding", - "thiserror 1.0.69", + "thiserror 2.0.11", "x25519-dalek", "zeroize", ] @@ -5456,7 +5570,7 @@ dependencies = [ "serde", "serde_derive", "sha2 0.9.9", - "thiserror 1.0.69", + "thiserror 2.0.11", "zeroize", ] @@ -5471,7 +5585,7 @@ dependencies = [ "cw-utils", "cw2", "nym-multisig-contract-common", - "thiserror 1.0.69", + "thiserror 2.0.11", ] [[package]] @@ -5497,7 +5611,7 @@ dependencies = [ "reqwest 0.12.4", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.11", "tracing", "utoipa", ] @@ -5521,7 +5635,7 @@ dependencies = [ "nym-explorer-api-requests", "reqwest 0.12.4", "serde", - "thiserror 1.0.69", + "thiserror 2.0.11", "tokio", "tracing", "url", @@ -5581,7 +5695,7 @@ dependencies = [ "rand", "sha2 0.10.8", "sqlx", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tokio", "tokio-stream", @@ -5605,6 +5719,7 @@ dependencies = [ "nym-credentials-interface", "nym-crypto", "nym-gateway-requests", + "nym-http-api-client", "nym-network-defaults", "nym-pemstore", "nym-sphinx", @@ -5614,7 +5729,7 @@ dependencies = [ "rand", "serde", "si-scale", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tokio", "tokio-stream", @@ -5647,7 +5762,7 @@ dependencies = [ "serde", "serde_json", "strum 0.26.3", - "thiserror 1.0.69", + "thiserror 2.0.11", "tokio", "tracing", "tungstenite 0.20.1", @@ -5665,7 +5780,7 @@ dependencies = [ "nym-statistics-common", "sqlx", "strum 0.26.3", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tokio", "tracing", @@ -5681,7 +5796,7 @@ dependencies = [ "nym-gateway-requests", "nym-sphinx", "sqlx", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tokio", "tracing", @@ -5697,7 +5812,7 @@ dependencies = [ "nym-ffi-shared", "nym-sdk", "nym-sphinx-anonymous-replies", - "thiserror 1.0.69", + "thiserror 2.0.11", "tokio", "uniffi", "uniffi_build", @@ -5719,12 +5834,15 @@ name = "nym-http-api-client" version = "0.1.0" dependencies = [ "async-trait", + "hickory-resolver", "http 1.1.0", "nym-bin-common", + "once_cell", "reqwest 0.12.4", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.11", + "tokio", "tracing", "url", "wasmtimer", @@ -5755,7 +5873,7 @@ version = "0.1.0" dependencies = [ "nym-credential-storage", "nym-credentials", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tracing", "zeroize", @@ -5781,7 +5899,7 @@ version = "0.1.0" dependencies = [ "log", "rand", - "thiserror 1.0.69", + "thiserror 2.0.11", ] [[package]] @@ -5795,7 +5913,7 @@ dependencies = [ "nym-sphinx", "rand", "serde", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tokio", "tokio-util", @@ -5835,7 +5953,7 @@ dependencies = [ "serde", "serde_json", "tap", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tokio", "tokio-tun", @@ -5851,7 +5969,7 @@ dependencies = [ "k256", "ledger-transport", "ledger-transport-hid", - "thiserror 1.0.69", + "thiserror 2.0.11", ] [[package]] @@ -5892,11 +6010,11 @@ dependencies = [ "nym-contracts-common", "rand_chacha", "schemars", - "semver 1.0.24", + "semver 1.0.25", "serde", "serde-json-wasm", "serde_repr", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "ts-rs", "utoipa", @@ -5922,7 +6040,7 @@ dependencies = [ "nym-task", "rand", "serde", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tokio", "tokio-util", @@ -5941,7 +6059,7 @@ dependencies = [ "cw4", "schemars", "serde", - "thiserror 1.0.69", + "thiserror 2.0.11", ] [[package]] @@ -6034,7 +6152,7 @@ dependencies = [ "sqlx", "tap", "tempfile", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tokio", "tokio-tungstenite", @@ -6093,12 +6211,12 @@ dependencies = [ "nym-wireguard", "nym-wireguard-types", "rand", - "semver 1.0.24", + "semver 1.0.25", "serde", "serde_json", "si-scale", "sysinfo", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tokio", "tokio-util", @@ -6144,7 +6262,7 @@ dependencies = [ "serde", "serde_json", "strum 0.26.3", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tokio", "utoipa", @@ -6198,7 +6316,7 @@ dependencies = [ "sqlx", "strum 0.26.3", "strum_macros 0.26.4", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tokio", "tokio-util", @@ -6241,7 +6359,7 @@ dependencies = [ "rand_chacha", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.11", "tokio", "wasm-utils", ] @@ -6256,7 +6374,7 @@ dependencies = [ "rand", "serde", "serde-wasm-bindgen 0.6.5", - "thiserror 1.0.69", + "thiserror 2.0.11", "tokio", "tsify", "wasm-bindgen", @@ -6297,7 +6415,7 @@ name = "nym-ordered-buffer" version = "0.1.0" dependencies = [ "log", - "thiserror 1.0.69", + "thiserror 2.0.11", ] [[package]] @@ -6315,7 +6433,7 @@ dependencies = [ "rand", "rayon", "sphinx-packet", - "thiserror 1.0.69", + "thiserror 2.0.11", "zeroize", ] @@ -6369,7 +6487,7 @@ dependencies = [ "reqwest 0.12.4", "serde", "tap", - "thiserror 1.0.69", + "thiserror 2.0.11", "tokio", "tokio-stream", "tokio-util", @@ -6412,7 +6530,7 @@ dependencies = [ "nym-sphinx-anonymous-replies", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.11", "tokio", ] @@ -6442,7 +6560,7 @@ dependencies = [ "serde", "serde_json", "tap", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tokio", "url", @@ -6476,7 +6594,7 @@ dependencies = [ "schemars", "serde", "tap", - "thiserror 1.0.69", + "thiserror 2.0.11", "tokio", "url", ] @@ -6508,7 +6626,7 @@ dependencies = [ "serde", "serde_json", "tap", - "thiserror 1.0.69", + "thiserror 2.0.11", ] [[package]] @@ -6533,7 +6651,7 @@ dependencies = [ "rand", "rand_chacha", "rand_distr", - "thiserror 1.0.69", + "thiserror 2.0.11", "tokio", ] @@ -6551,7 +6669,7 @@ dependencies = [ "nym-topology", "rand", "serde", - "thiserror 1.0.69", + "thiserror 2.0.11", "zeroize", ] @@ -6563,7 +6681,7 @@ dependencies = [ "nym-sphinx-types", "rand", "serde", - "thiserror 1.0.69", + "thiserror 2.0.11", ] [[package]] @@ -6580,7 +6698,7 @@ dependencies = [ "rand", "rand_chacha", "serde", - "thiserror 1.0.69", + "thiserror 2.0.11", "wasm-bindgen", ] @@ -6597,7 +6715,7 @@ dependencies = [ "nym-sphinx-types", "rand", "serde", - "thiserror 1.0.69", + "thiserror 2.0.11", "utoipa", ] @@ -6615,7 +6733,7 @@ dependencies = [ "nym-sphinx-types", "nym-topology", "rand", - "thiserror 1.0.69", + "thiserror 2.0.11", ] [[package]] @@ -6626,7 +6744,7 @@ dependencies = [ "nym-sphinx-addressing", "nym-sphinx-params", "nym-sphinx-types", - "thiserror 1.0.69", + "thiserror 2.0.11", ] [[package]] @@ -6641,7 +6759,7 @@ dependencies = [ "nym-sphinx-forwarding", "nym-sphinx-params", "nym-sphinx-types", - "thiserror 1.0.69", + "thiserror 2.0.11", "tokio", "tokio-util", ] @@ -6653,7 +6771,7 @@ dependencies = [ "nym-crypto", "nym-sphinx-types", "serde", - "thiserror 1.0.69", + "thiserror 2.0.11", ] [[package]] @@ -6662,7 +6780,7 @@ version = "0.1.0" dependencies = [ "nym-sphinx-addressing", "nym-sphinx-types", - "thiserror 1.0.69", + "thiserror 2.0.11", ] [[package]] @@ -6671,7 +6789,7 @@ version = "0.2.0" dependencies = [ "nym-outfox", "sphinx-packet", - "thiserror 1.0.69", + "thiserror 2.0.11", ] [[package]] @@ -6690,7 +6808,7 @@ dependencies = [ "sha2 0.10.8", "si-scale", "sysinfo", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tokio", "wasmtimer", @@ -6707,7 +6825,7 @@ dependencies = [ "rand", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.11", "zeroize", ] @@ -6718,7 +6836,7 @@ dependencies = [ "cfg-if", "futures", "log", - "thiserror 1.0.69", + "thiserror 2.0.11", "tokio", "tokio-util", "tracing", @@ -6760,7 +6878,7 @@ dependencies = [ "reqwest 0.12.4", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.11", "tracing", "tsify", "wasm-bindgen", @@ -6774,7 +6892,7 @@ dependencies = [ "etherparse", "log", "nym-wireguard-types", - "thiserror 1.0.69", + "thiserror 2.0.11", "tokio", "tokio-tun", ] @@ -6802,7 +6920,7 @@ dependencies = [ "sha2 0.10.8", "strum 0.26.3", "tempfile", - "thiserror 1.0.69", + "thiserror 2.0.11", "ts-rs", "url", "utoipa", @@ -6849,7 +6967,7 @@ dependencies = [ "serde_json", "sha2 0.9.9", "tendermint-rpc", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tokio", "tracing", @@ -6893,7 +7011,7 @@ dependencies = [ "serde_with", "sha2 0.10.8", "sqlx", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tokio", "tracing", @@ -6912,7 +7030,7 @@ dependencies = [ "nym-task", "nym-validator-client", "rand", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tokio", "tokio-util", @@ -6930,7 +7048,7 @@ dependencies = [ "nym-contracts-common", "nym-mixnet-contract-common", "serde", - "thiserror 1.0.69", + "thiserror 2.0.11", "ts-rs", ] @@ -6951,7 +7069,7 @@ dependencies = [ "serde", "serde-wasm-bindgen 0.6.5", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tsify", "wasm-bindgen", @@ -6998,7 +7116,7 @@ dependencies = [ "nym-node-metrics", "nym-task", "nym-wireguard-types", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tokio", "tokio-stream", @@ -7017,7 +7135,7 @@ dependencies = [ "nym-network-defaults", "rand", "serde", - "thiserror 1.0.69", + "thiserror 2.0.11", "x25519-dalek", ] @@ -7044,7 +7162,7 @@ dependencies = [ "serde_json", "sha2 0.10.8", "tar", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tokio", "tracing", @@ -7073,7 +7191,7 @@ dependencies = [ "serde", "serde_json", "sqlx", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tokio", "tokio-util", @@ -7100,7 +7218,7 @@ dependencies = [ "sqlx", "tendermint 0.40.1", "tendermint-rpc", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tokio", "tokio-stream", @@ -7534,18 +7652,18 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" +checksum = "1e2ec53ad785f4d35dac0adea7f7dc6f1bb277ad84a680c7afefeae05d1f5916" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" +checksum = "d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb" dependencies = [ "proc-macro2", "quote", @@ -8213,6 +8331,16 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "resolv-conf" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" +dependencies = [ + "hostname", + "quick-error 1.2.3", +] + [[package]] name = "rfc6979" version = "0.4.0" @@ -8474,7 +8602,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.24", + "semver 1.0.25", ] [[package]] @@ -8711,6 +8839,24 @@ dependencies = [ "zeroize", ] +[[package]] +name = "secp256k1" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25996b82292a7a57ed3508f052cfff8640d38d32018784acd714758b43da9c8f" +dependencies = [ + "secp256k1-sys", +] + +[[package]] +name = "secp256k1-sys" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70a129b9e9efbfb223753b9163c4ab3b13cff7fd9c7f010fbac25ab4099fa07e" +dependencies = [ + "cc", +] + [[package]] name = "security-framework" version = "2.11.0" @@ -8745,9 +8891,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba" +checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03" dependencies = [ "serde", ] @@ -8842,9 +8988,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.135" +version = "1.0.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9" +checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949" dependencies = [ "itoa", "memchr", @@ -9833,7 +9979,7 @@ dependencies = [ "pin-project", "rand", "reqwest 0.11.27", - "semver 1.0.24", + "semver 1.0.25", "serde", "serde_bytes", "serde_json", @@ -9901,7 +10047,7 @@ dependencies = [ "serde_json", "sqlx", "tempfile", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tokio", "toml 0.8.19", @@ -10053,9 +10199,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.40.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" dependencies = [ "backtrace", "bytes", @@ -10082,9 +10228,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", @@ -11183,7 +11329,7 @@ dependencies = [ "rand", "serde", "serde-wasm-bindgen 0.6.5", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tsify", "url", @@ -11205,7 +11351,7 @@ dependencies = [ "nym-store-cipher", "serde", "serde-wasm-bindgen 0.6.5", - "thiserror 1.0.69", + "thiserror 2.0.11", "wasm-bindgen", "wasm-utils", ] @@ -11317,6 +11463,12 @@ dependencies = [ "web-sys", ] +[[package]] +name = "widestring" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" + [[package]] name = "winapi" version = "0.3.9" @@ -11921,7 +12073,7 @@ dependencies = [ "rand", "reqwest 0.12.4", "serde", - "thiserror 1.0.69", + "thiserror 2.0.11", "tokio", "tsify", "uuid", diff --git a/Cargo.toml b/Cargo.toml index a5d0b678aad..f07836d73b2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,8 +52,8 @@ members = [ "common/execute", "common/exit-policy", "common/gateway-requests", - "common/gateway-storage", "common/gateway-stats-storage", + "common/gateway-storage", "common/http-api-client", "common/http-api-common", "common/inclusion-probability", @@ -92,6 +92,7 @@ members = [ "common/topology", "common/tun", "common/types", + "common/verloc", "common/wasm/client-core", "common/wasm/storage", "common/wasm/utils", @@ -103,14 +104,6 @@ members = [ "explorer-api/explorer-client", "gateway", "integrations/bity", - "sdk/ffi/cpp", - "sdk/ffi/go", - "sdk/ffi/shared", - "sdk/rust/nym-sdk", - "service-providers/authenticator", - "service-providers/common", - "service-providers/ip-packet-router", - "service-providers/network-requester", "nym-api", "nym-api/nym-api-requests", "nym-browser-extension/storage", @@ -118,20 +111,34 @@ members = [ "nym-credential-proxy/nym-credential-proxy-requests", "nym-credential-proxy/vpn-api-lib-wasm", "nym-network-monitor", - "nyx-chain-watcher", "nym-node", - "nym-node/nym-node-requests", - "nym-node/nym-node-metrics", "nym-node-status-api/nym-node-status-agent", "nym-node-status-api/nym-node-status-api", "nym-node-status-api/nym-node-status-client", + "nym-node/nym-node-metrics", + "nym-node/nym-node-requests", "nym-outfox", "nym-validator-rewarder", + "nyx-chain-watcher", + "sdk/ffi/cpp", + "sdk/ffi/go", + "sdk/ffi/shared", + "sdk/rust/nym-sdk", + "service-providers/authenticator", + "service-providers/common", + "service-providers/ip-packet-router", + "service-providers/network-requester", "tools/echo-server", - "tools/internal/ssl-inject", + "tools/echo-server", + "tools/internal/contract-state-importer/importer-cli", + "tools/internal/contract-state-importer/importer-contract", + "tools/internal/mixnet-connectivity-check", # "tools/internal/sdk-version-bump", + "tools/internal/ssl-inject", + "tools/internal/testnet-manager", "tools/internal/testnet-manager", "tools/internal/testnet-manager/dkg-bypass-contract", + "tools/internal/testnet-manager/dkg-bypass-contract", "tools/nym-cli", "tools/nym-id-cli", "tools/nym-nr-query", @@ -142,13 +149,6 @@ members = [ "wasm/mix-fetch", "wasm/node-tester", "wasm/zknym-lib", - "tools/echo-server", - "tools/internal/contract-state-importer/importer-cli", - "tools/internal/contract-state-importer/importer-contract", - "tools/internal/testnet-manager", - "tools/internal/testnet-manager/dkg-bypass-contract", - "common/verloc", - "tools/internal/mixnet-connectivity-check", ] default-members = [ @@ -172,7 +172,6 @@ exclude = [ "explorer", "contracts", "nym-wallet", - "nym-vpn/ui/src-tauri", "cpu-cycles", ] @@ -216,7 +215,7 @@ chacha20 = "0.9.0" chacha20poly1305 = "0.10.1" chrono = "0.4.39" cipher = "0.4.3" -clap = "4.5.26" +clap = "4.5.27" clap_complete = "4.5" clap_complete_fig = "4.5" colored = "2.0" @@ -249,11 +248,12 @@ futures = "0.3.31" futures-util = "0.3" generic-array = "0.14.7" getrandom = "0.2.10" -getset = "0.1.3" +getset = "0.1.4" handlebars = "3.5.5" headers = "0.4.0" hex = "0.4.3" hex-literal = "0.3.3" +hickory-resolver = "0.24.2" hkdf = "0.12.3" hmac = "0.12.1" http = "1" @@ -264,7 +264,7 @@ humantime-serde = "1.1.1" human-repr = "1.1.0" hyper = "1.4.1" hyper-util = "0.1" -indicatif = "0.17.9" +indicatif = "0.17.11" inquire = "0.6.2" ip_network = "0.4.1" ipnetwork = "0.20" @@ -307,11 +307,11 @@ rocket_cors = "0.6.0" rocket_okapi = "0.8.0" safer-ffi = "0.1.13" schemars = "0.8.21" -semver = "1.0.24" +semver = "1.0.25" serde = "1.0.217" serde_bytes = "0.11.15" serde_derive = "1.0" -serde_json = "1.0.135" +serde_json = "1.0.138" serde_json_path = "0.7.1" serde_repr = "0.1" serde_with = "3.9.0" @@ -328,9 +328,9 @@ sysinfo = "0.33.0" tap = "1.0.1" tar = "0.4.43" tempfile = "3.15" -thiserror = "1.0.64" +thiserror = "2.0" time = "0.3.37" -tokio = "1.39" +tokio = "1.43" tokio-stream = "0.1.17" tokio-test = "0.4.4" tokio-tun = "0.11.5" @@ -384,7 +384,7 @@ cw4 = { version = "=1.1.2" } cw-controllers = { version = "=1.1.0" } # cosmrs-related -bip32 = { version = "0.5.2", default-features = false } +bip32 = { version = "0.5.3", default-features = false } cosmrs = { version = "0.21.0" } diff --git a/README.md b/README.md index ba378a2a7a4..54e8ff07340 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ The platform is composed of multiple Rust crates. Top-level executable binary cr * `nym-client` - an executable which you can build into your own applications. Use it for interacting with Nym nodes. * `nym-socks5-client` - a Socks5 proxy you can run on your machine and use with existing applications. * `nym-explorer` - a (projected) block explorer and (existing) mixnet viewer. -* `nym-wallet` - a desktop wallet implemented using the [Tauri](https://tauri.studio/en/docs/about/intro) framework. +* `nym-wallet` - a desktop wallet implemented using the [Tauri](https://tauri.app)) framework. * `nym-cli` - a tool for interacting with the network from the CLI.