diff --git a/Cargo.lock b/Cargo.lock index 62d01b3e6da..62bd0efd3bf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2322,7 +2322,7 @@ checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005" [[package]] name = "easy-addr" -version = "0.1.0" +version = "1.20.1" dependencies = [ "cosmwasm-std", "quote", @@ -4834,7 +4834,7 @@ dependencies = [ [[package]] name = "nym-api" -version = "1.1.70" +version = "1.20.1" dependencies = [ "anyhow", "async-trait", @@ -4917,7 +4917,7 @@ dependencies = [ [[package]] name = "nym-api-requests" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bs58", "cosmrs", @@ -4955,7 +4955,7 @@ dependencies = [ [[package]] name = "nym-async-file-watcher" -version = "0.1.0" +version = "1.20.1" dependencies = [ "futures", "log", @@ -4987,7 +4987,7 @@ dependencies = [ [[package]] name = "nym-authenticator-requests" -version = "0.1.0" +version = "1.20.1" dependencies = [ "base64 0.22.1", "bincode", @@ -5011,7 +5011,7 @@ dependencies = [ [[package]] name = "nym-bandwidth-controller" -version = "0.1.0" +version = "1.20.1" dependencies = [ "async-trait", "log", @@ -5028,7 +5028,7 @@ dependencies = [ [[package]] name = "nym-bin-common" -version = "0.6.0" +version = "1.20.1" dependencies = [ "clap", "clap_complete", @@ -5050,7 +5050,7 @@ dependencies = [ [[package]] name = "nym-cache" -version = "0.1.0" +version = "1.20.1" dependencies = [ "tokio", ] @@ -5081,7 +5081,7 @@ dependencies = [ [[package]] name = "nym-cli-commands" -version = "1.0.0" +version = "1.20.1" dependencies = [ "anyhow", "base64 0.22.1", @@ -5177,7 +5177,7 @@ dependencies = [ [[package]] name = "nym-client-core" -version = "1.1.15" +version = "1.20.1" dependencies = [ "async-trait", "base64 0.22.1", @@ -5238,7 +5238,7 @@ dependencies = [ [[package]] name = "nym-client-core-config-types" -version = "0.1.0" +version = "1.20.1" dependencies = [ "humantime-serde", "nym-config", @@ -5253,7 +5253,7 @@ dependencies = [ [[package]] name = "nym-client-core-gateways-storage" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "async-trait", @@ -5272,16 +5272,16 @@ dependencies = [ [[package]] name = "nym-client-core-surb-storage" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "async-trait", "dashmap", "nym-crypto", "nym-sphinx", + "nym-sqlx-pool-guard", "nym-task", "sqlx", - "sqlx-pool-guard", "thiserror 2.0.12", "time", "tokio", @@ -5318,7 +5318,7 @@ dependencies = [ [[package]] name = "nym-client-websocket-requests" -version = "0.1.0" +version = "1.20.1" dependencies = [ "nym-sphinx", "serde", @@ -5327,7 +5327,7 @@ dependencies = [ [[package]] name = "nym-coconut-dkg-common" -version = "0.1.0" +version = "1.20.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -5340,7 +5340,7 @@ dependencies = [ [[package]] name = "nym-common" -version = "1.18.0" +version = "1.20.1" dependencies = [ "tracing", "tracing-test", @@ -5348,7 +5348,7 @@ dependencies = [ [[package]] name = "nym-compact-ecash" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bincode", "bls12_381", @@ -5372,7 +5372,7 @@ dependencies = [ [[package]] name = "nym-config" -version = "0.1.0" +version = "1.20.1" dependencies = [ "dirs", "handlebars", @@ -5404,7 +5404,7 @@ dependencies = [ [[package]] name = "nym-contracts-common" -version = "0.5.0" +version = "1.20.1" dependencies = [ "anyhow", "bs58", @@ -5421,7 +5421,7 @@ dependencies = [ [[package]] name = "nym-contracts-common-testing" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "cosmwasm-std", @@ -5435,7 +5435,7 @@ dependencies = [ [[package]] name = "nym-cpp-ffi" -version = "0.1.2" +version = "1.20.1" dependencies = [ "anyhow", "bs58", @@ -5498,7 +5498,7 @@ dependencies = [ [[package]] name = "nym-credential-proxy-lib" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "axum", @@ -5536,7 +5536,7 @@ dependencies = [ [[package]] name = "nym-credential-proxy-requests" -version = "0.1.0" +version = "1.20.1" dependencies = [ "async-trait", "nym-credentials", @@ -5560,7 +5560,7 @@ dependencies = [ [[package]] name = "nym-credential-storage" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "async-trait", @@ -5571,10 +5571,10 @@ dependencies = [ "nym-credentials-interface", "nym-crypto", "nym-ecash-time", + "nym-sqlx-pool-guard", "nym-test-utils", "serde", "sqlx", - "sqlx-pool-guard", "thiserror 2.0.12", "time", "tokio", @@ -5583,7 +5583,7 @@ dependencies = [ [[package]] name = "nym-credential-utils" -version = "0.1.0" +version = "1.20.1" dependencies = [ "log", "nym-bandwidth-controller", @@ -5601,7 +5601,7 @@ dependencies = [ [[package]] name = "nym-credential-verification" -version = "0.1.0" +version = "1.20.1" dependencies = [ "async-trait", "bs58", @@ -5628,7 +5628,7 @@ dependencies = [ [[package]] name = "nym-credentials" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bincode", "bls12_381", @@ -5652,7 +5652,7 @@ dependencies = [ [[package]] name = "nym-credentials-interface" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bls12_381", "nym-compact-ecash", @@ -5670,7 +5670,7 @@ dependencies = [ [[package]] name = "nym-crypto" -version = "0.4.0" +version = "1.20.1" dependencies = [ "aead", "aes", @@ -5704,7 +5704,7 @@ dependencies = [ [[package]] name = "nym-dkg" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bitvec", "bls12_381", @@ -5726,7 +5726,7 @@ dependencies = [ [[package]] name = "nym-ecash-contract-common" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bs58", "cosmwasm-schema", @@ -5740,7 +5740,7 @@ dependencies = [ [[package]] name = "nym-ecash-signer-check" -version = "0.1.0" +version = "1.20.1" dependencies = [ "futures", "nym-ecash-signer-check-types", @@ -5756,7 +5756,7 @@ dependencies = [ [[package]] name = "nym-ecash-signer-check-types" -version = "0.1.0" +version = "1.20.1" dependencies = [ "nym-coconut-dkg-common", "nym-crypto", @@ -5771,7 +5771,7 @@ dependencies = [ [[package]] name = "nym-ecash-time" -version = "0.1.0" +version = "1.20.1" dependencies = [ "nym-compact-ecash", "time", @@ -5779,7 +5779,7 @@ dependencies = [ [[package]] name = "nym-exit-policy" -version = "0.1.0" +version = "1.20.1" dependencies = [ "reqwest 0.12.22", "serde", @@ -5791,7 +5791,7 @@ dependencies = [ [[package]] name = "nym-ffi-shared" -version = "0.2.1" +version = "1.20.1" dependencies = [ "anyhow", "bs58", @@ -5859,7 +5859,7 @@ dependencies = [ [[package]] name = "nym-gateway-client" -version = "0.1.0" +version = "1.20.1" dependencies = [ "futures", "getrandom 0.2.16", @@ -5942,7 +5942,7 @@ dependencies = [ [[package]] name = "nym-gateway-requests" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "bs58", @@ -5974,7 +5974,7 @@ dependencies = [ [[package]] name = "nym-gateway-stats-storage" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "nym-node-metrics", @@ -5990,7 +5990,7 @@ dependencies = [ [[package]] name = "nym-gateway-storage" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "async-trait", @@ -6009,7 +6009,7 @@ dependencies = [ [[package]] name = "nym-go-ffi" -version = "0.2.2" +version = "1.20.1" dependencies = [ "anyhow", "lazy_static", @@ -6026,7 +6026,7 @@ dependencies = [ [[package]] name = "nym-group-contract-common" -version = "0.1.0" +version = "1.20.1" dependencies = [ "cosmwasm-schema", "cw-controllers", @@ -6037,7 +6037,7 @@ dependencies = [ [[package]] name = "nym-http-api-client" -version = "0.1.0" +version = "1.20.1" dependencies = [ "async-trait", "bincode", @@ -6069,7 +6069,7 @@ dependencies = [ [[package]] name = "nym-http-api-client-macro" -version = "0.1.0" +version = "1.20.1" dependencies = [ "nym-http-api-client", "proc-macro-crate", @@ -6082,7 +6082,7 @@ dependencies = [ [[package]] name = "nym-http-api-common" -version = "0.1.0" +version = "1.20.1" dependencies = [ "axum", "axum-client-ip", @@ -6104,7 +6104,7 @@ dependencies = [ [[package]] name = "nym-id" -version = "0.1.0" +version = "1.20.1" dependencies = [ "nym-credential-storage", "nym-credentials", @@ -6130,7 +6130,7 @@ dependencies = [ [[package]] name = "nym-inclusion-probability" -version = "0.1.0" +version = "1.20.1" dependencies = [ "log", "rand 0.8.5", @@ -6154,7 +6154,7 @@ dependencies = [ [[package]] name = "nym-ip-packet-requests" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bincode", "bytes", @@ -6172,7 +6172,7 @@ dependencies = [ [[package]] name = "nym-ip-packet-router" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "async-trait", @@ -6215,7 +6215,7 @@ dependencies = [ [[package]] name = "nym-ledger" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bip32", "k256", @@ -6226,7 +6226,7 @@ dependencies = [ [[package]] name = "nym-metrics" -version = "0.1.0" +version = "1.20.1" dependencies = [ "dashmap", "lazy_static", @@ -6236,7 +6236,7 @@ dependencies = [ [[package]] name = "nym-mixnet-client" -version = "0.1.0" +version = "1.20.1" dependencies = [ "dashmap", "futures", @@ -6253,7 +6253,7 @@ dependencies = [ [[package]] name = "nym-mixnet-contract-common" -version = "0.6.0" +version = "1.20.1" dependencies = [ "bs58", "cosmwasm-schema", @@ -6276,7 +6276,7 @@ dependencies = [ [[package]] name = "nym-mixnode-common" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bytes", "futures", @@ -6303,7 +6303,7 @@ dependencies = [ [[package]] name = "nym-multisig-contract-common" -version = "0.1.0" +version = "1.20.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -6318,7 +6318,7 @@ dependencies = [ [[package]] name = "nym-network-defaults" -version = "0.1.0" +version = "1.20.1" dependencies = [ "cargo_metadata 0.19.2", "dotenvy", @@ -6517,7 +6517,7 @@ dependencies = [ [[package]] name = "nym-node-requests" -version = "0.1.0" +version = "1.20.1" dependencies = [ "async-trait", "celes", @@ -6637,7 +6637,7 @@ dependencies = [ [[package]] name = "nym-node-tester-utils" -version = "0.1.0" +version = "1.20.1" dependencies = [ "futures", "log", @@ -6677,7 +6677,7 @@ dependencies = [ [[package]] name = "nym-noise" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "arc-swap", @@ -6700,7 +6700,7 @@ dependencies = [ [[package]] name = "nym-noise-keys" -version = "0.1.0" +version = "1.20.1" dependencies = [ "nym-crypto", "schemars 0.8.22", @@ -6710,7 +6710,7 @@ dependencies = [ [[package]] name = "nym-nonexhaustive-delayqueue" -version = "0.1.0" +version = "1.20.1" dependencies = [ "tokio", "tokio-stream", @@ -6736,7 +6736,7 @@ dependencies = [ [[package]] name = "nym-ordered-buffer" -version = "0.1.0" +version = "1.20.1" dependencies = [ "log", "thiserror 2.0.12", @@ -6744,7 +6744,7 @@ dependencies = [ [[package]] name = "nym-outfox" -version = "0.1.0" +version = "1.20.1" dependencies = [ "blake3", "chacha20", @@ -6763,7 +6763,7 @@ dependencies = [ [[package]] name = "nym-pemstore" -version = "0.3.0" +version = "1.20.1" dependencies = [ "pem", "tracing", @@ -6772,7 +6772,7 @@ dependencies = [ [[package]] name = "nym-performance-contract-common" -version = "0.1.0" +version = "1.20.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -6785,7 +6785,7 @@ dependencies = [ [[package]] name = "nym-pool-contract-common" -version = "0.1.0" +version = "1.20.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -6819,7 +6819,7 @@ dependencies = [ [[package]] name = "nym-registration-common" -version = "0.1.0" +version = "1.20.1" dependencies = [ "nym-authenticator-requests", "nym-crypto", @@ -6830,7 +6830,7 @@ dependencies = [ [[package]] name = "nym-sdk" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "async-trait", @@ -6889,7 +6889,7 @@ dependencies = [ [[package]] name = "nym-serde-helpers" -version = "0.1.0" +version = "1.20.1" dependencies = [ "base64 0.22.1", "bs58", @@ -6900,7 +6900,7 @@ dependencies = [ [[package]] name = "nym-service-provider-requests-common" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bincode", "serde", @@ -6909,7 +6909,7 @@ dependencies = [ [[package]] name = "nym-service-providers-common" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "async-trait", @@ -6979,7 +6979,7 @@ dependencies = [ [[package]] name = "nym-socks5-client-core" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "dirs", @@ -7011,7 +7011,7 @@ dependencies = [ [[package]] name = "nym-socks5-proxy-helpers" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bytes", "futures", @@ -7026,7 +7026,7 @@ dependencies = [ [[package]] name = "nym-socks5-requests" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bincode", "log", @@ -7041,7 +7041,7 @@ dependencies = [ [[package]] name = "nym-sphinx" -version = "0.1.0" +version = "1.20.1" dependencies = [ "nym-crypto", "nym-metrics", @@ -7067,7 +7067,7 @@ dependencies = [ [[package]] name = "nym-sphinx-acknowledgements" -version = "0.1.0" +version = "1.20.1" dependencies = [ "generic-array 0.14.7", "nym-crypto", @@ -7085,7 +7085,7 @@ dependencies = [ [[package]] name = "nym-sphinx-addressing" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bincode", "nym-crypto", @@ -7098,7 +7098,7 @@ dependencies = [ [[package]] name = "nym-sphinx-anonymous-replies" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bs58", "nym-crypto", @@ -7116,7 +7116,7 @@ dependencies = [ [[package]] name = "nym-sphinx-chunking" -version = "0.1.0" +version = "1.20.1" dependencies = [ "dashmap", "log", @@ -7134,7 +7134,7 @@ dependencies = [ [[package]] name = "nym-sphinx-cover" -version = "0.1.0" +version = "1.20.1" dependencies = [ "nym-crypto", "nym-sphinx-acknowledgements", @@ -7151,7 +7151,7 @@ dependencies = [ [[package]] name = "nym-sphinx-forwarding" -version = "0.1.0" +version = "1.20.1" dependencies = [ "nym-sphinx-addressing", "nym-sphinx-anonymous-replies", @@ -7162,7 +7162,7 @@ dependencies = [ [[package]] name = "nym-sphinx-framing" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bytes", "nym-sphinx-acknowledgements", @@ -7178,7 +7178,7 @@ dependencies = [ [[package]] name = "nym-sphinx-params" -version = "0.1.0" +version = "1.20.1" dependencies = [ "nym-crypto", "nym-sphinx-types", @@ -7188,7 +7188,7 @@ dependencies = [ [[package]] name = "nym-sphinx-routing" -version = "0.1.0" +version = "1.20.1" dependencies = [ "nym-sphinx-addressing", "nym-sphinx-types", @@ -7197,13 +7197,26 @@ dependencies = [ [[package]] name = "nym-sphinx-types" -version = "0.2.0" +version = "1.20.1" dependencies = [ "nym-outfox", "sphinx-packet", "thiserror 2.0.12", ] +[[package]] +name = "nym-sqlx-pool-guard" +version = "1.20.1" +dependencies = [ + "proc_pidinfo", + "sqlx", + "tempfile", + "tokio", + "tracing", + "tracing-subscriber", + "windows", +] + [[package]] name = "nym-statistics-api" version = "0.3.0" @@ -7236,7 +7249,7 @@ dependencies = [ [[package]] name = "nym-statistics-common" -version = "0.1.0" +version = "1.20.1" dependencies = [ "futures", "log", @@ -7261,7 +7274,7 @@ dependencies = [ [[package]] name = "nym-store-cipher" -version = "0.1.0" +version = "1.20.1" dependencies = [ "aes-gcm", "argon2", @@ -7276,7 +7289,7 @@ dependencies = [ [[package]] name = "nym-task" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "cfg-if", @@ -7294,7 +7307,7 @@ dependencies = [ [[package]] name = "nym-test-utils" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "futures", @@ -7304,7 +7317,7 @@ dependencies = [ [[package]] name = "nym-ticketbooks-merkle" -version = "0.1.0" +version = "1.20.1" dependencies = [ "nym-credentials-interface", "nym-serde-helpers", @@ -7321,7 +7334,7 @@ dependencies = [ [[package]] name = "nym-topology" -version = "0.1.0" +version = "1.20.1" dependencies = [ "async-trait", "nym-api-requests", @@ -7343,7 +7356,7 @@ dependencies = [ [[package]] name = "nym-tun" -version = "0.1.0" +version = "1.20.1" dependencies = [ "etherparse", "log", @@ -7355,7 +7368,7 @@ dependencies = [ [[package]] name = "nym-types" -version = "1.0.0" +version = "1.20.1" dependencies = [ "base64 0.22.1", "cosmrs", @@ -7386,7 +7399,7 @@ dependencies = [ [[package]] name = "nym-upgrade-mode-check" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "jwt-simple", @@ -7404,7 +7417,7 @@ dependencies = [ [[package]] name = "nym-validator-client" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "async-trait", @@ -7498,7 +7511,7 @@ dependencies = [ [[package]] name = "nym-verloc" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bytes", "futures", @@ -7519,7 +7532,7 @@ dependencies = [ [[package]] name = "nym-vesting-contract-common" -version = "0.7.0" +version = "1.20.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -7533,7 +7546,7 @@ dependencies = [ [[package]] name = "nym-vpn-api-lib-wasm" -version = "0.1.0" +version = "1.20.1" dependencies = [ "bs58", "getrandom 0.2.16", @@ -7578,7 +7591,7 @@ dependencies = [ [[package]] name = "nym-wireguard" -version = "0.1.0" +version = "1.20.1" dependencies = [ "base64 0.22.1", "defguard_wireguard_rs", @@ -7601,7 +7614,7 @@ dependencies = [ [[package]] name = "nym-wireguard-private-metadata-client" -version = "1.0.0" +version = "1.20.1" dependencies = [ "async-trait", "nym-http-api-client", @@ -7611,7 +7624,7 @@ dependencies = [ [[package]] name = "nym-wireguard-private-metadata-server" -version = "1.0.0" +version = "1.20.1" dependencies = [ "anyhow", "async-trait", @@ -7631,7 +7644,7 @@ dependencies = [ [[package]] name = "nym-wireguard-private-metadata-shared" -version = "1.0.0" +version = "1.20.1" dependencies = [ "axum", "bincode", @@ -7644,7 +7657,7 @@ dependencies = [ [[package]] name = "nym-wireguard-private-metadata-tests" -version = "1.0.0" +version = "1.20.1" dependencies = [ "async-trait", "axum", @@ -7668,7 +7681,7 @@ dependencies = [ [[package]] name = "nym-wireguard-types" -version = "0.1.0" +version = "1.20.1" dependencies = [ "base64 0.22.1", "nym-crypto", @@ -7741,7 +7754,7 @@ dependencies = [ [[package]] name = "nyxd-scraper" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "async-trait", @@ -10111,19 +10124,6 @@ dependencies = [ "whoami", ] -[[package]] -name = "sqlx-pool-guard" -version = "0.1.0" -dependencies = [ - "proc_pidinfo", - "sqlx", - "tempfile", - "tokio", - "tracing", - "tracing-subscriber", - "windows", -] - [[package]] name = "sqlx-postgres" version = "0.8.6" @@ -12022,7 +12022,7 @@ dependencies = [ [[package]] name = "wasm-client-core" -version = "0.1.0" +version = "1.20.1" dependencies = [ "async-trait", "console_error_panic_hook", @@ -12056,7 +12056,7 @@ dependencies = [ [[package]] name = "wasm-storage" -version = "0.1.0" +version = "1.20.1" dependencies = [ "async-trait", "getrandom 0.2.16", @@ -12085,7 +12085,7 @@ dependencies = [ [[package]] name = "wasm-utils" -version = "0.1.0" +version = "1.20.1" dependencies = [ "console_error_panic_hook", "futures", @@ -12841,7 +12841,7 @@ dependencies = [ [[package]] name = "zknym-lib" -version = "0.1.0" +version = "1.20.1" dependencies = [ "anyhow", "async-trait", @@ -12908,7 +12908,7 @@ dependencies = [ [[package]] name = "zulip-client" -version = "0.1.0" +version = "1.20.1" dependencies = [ "itertools 0.14.0", "nym-bin-common", diff --git a/Cargo.toml b/Cargo.toml index eaad10bbc4f..a81d34fa541 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -145,7 +145,7 @@ members = [ "service-providers/common", "service-providers/ip-packet-router", "service-providers/network-requester", - "sqlx-pool-guard", + "nym-sqlx-pool-guard", "tools/echo-server", "tools/internal/contract-state-importer/importer-cli", "tools/internal/contract-state-importer/importer-contract", @@ -196,6 +196,7 @@ edition = "2024" license = "Apache-2.0" rust-version = "1.85" readme = "README.md" +version = "1.20.1" [workspace.dependencies] addr = "0.15.6" @@ -373,6 +374,76 @@ zeroize = "1.7.0" prometheus = { version = "0.14.0" } +# sdk related deps so we can pull in workspace versions of these in other crates' cargo files, and not have to define the version everywhere +# +# these versions should be kept in line with the workspace version defined above +nym-api-requests = { version = "1.20.1", path = "nym-api/nym-api-requests" } +nym-bandwidth-controller = { version = "1.20.1", path = "common/bandwidth-controller" } +nym-bin-common = { version = "1.20.1", path = "common/bin-common" } +nym-client-core = { version = "1.20.1", path = "common/client-core" } +nym-client-core-config-types = { version = "1.20.1", path = "common/client-core/config-types" } +nym-client-core-gateways-storage = { version = "1.20.1", path = "common/client-core/gateways-storage" } +nym-client-core-surb-storage = { version = "1.20.1", path = "common/client-core/surb-storage" } +nym-compact-ecash = { version = "1.20.1", path = "common/nym_offline_compact_ecash" } +nym-config = { version = "1.20.1", path = "common/config" } +nym-contracts-common = { version = "1.20.1", path = "common/cosmwasm-smart-contracts/contracts-common" } +nym-coconut-dkg-common = { version = "1.20.1", path = "common/cosmwasm-smart-contracts/coconut-dkg" } +nym-credential-storage = { version = "1.20.1", path = "common/credential-storage" } +nym-credential-utils = { version = "1.20.1", path = "common/credential-utils" } +nym-credentials = { version = "1.20.1", path = "common/credentials" } +nym-credentials-interface = { version = "1.20.1", path = "common/credentials-interface" } +nym-crypto = { version = "1.20.1", path = "common/crypto" } +nym-ecash-contract-common = { version = "1.20.1", path = "common/cosmwasm-smart-contracts/ecash-contract" } +nym-ecash-signer-check-types = { version = "1.20.1", path = "common/ecash-signer-check-types" } +nym-ecash-time = { version = "1.20.1", path = "common/ecash-time" } +nym-exit-policy = { version = "1.20.1", path = "common/exit-policy" } +nym-gateway-client = { version = "1.20.1", path = "common/client-libs/gateway-client" } +nym-gateway-requests = { version = "1.20.1", path = "common/gateway-requests" } +nym-group-contract-common = { version = "1.20.1", path = "common/cosmwasm-smart-contracts/group-contract" } +nym-http-api-client = { version = "1.20.1", path = "common/http-api-client" } +nym-http-api-client-macro = { version = "1.20.1", path = "common/http-api-client-macro" } +nym-http-api-common = { version = "1.20.1", path = "common/http-api-common" } +nym-id = { version = "1.20.1", path = "common/nym-id" } +nym-metrics = { version = "1.20.1", path = "common/nym-metrics" } +nym-mixnet-client = { version = "1.20.1", path = "common/client-libs/mixnet-client" } +nym-mixnet-contract-common = { version = "1.20.1", path = "common/cosmwasm-smart-contracts/mixnet-contract" } +nym-multisig-contract-common = { version = "1.20.1", path = "common/cosmwasm-smart-contracts/multisig-contract" } +nym-network-defaults = { version = "1.20.1", path = "common/network-defaults" } +nym-noise = { version = "1.20.1", path = "common/nymnoise" } +nym-noise-keys = { version = "1.20.1", path = "common/nymnoise/keys" } +nym-nonexhaustive-delayqueue = { version = "1.20.1", path = "common/nonexhaustive-delayqueue" } +nym-node-requests = { version = "1.20.1", path = "nym-node/nym-node-requests" } +nym-ordered-buffer = { version = "1.20.1", path = "common/socks5/ordered-buffer" } +nym-outfox = { version = "1.20.1", path = "nym-outfox" } +nym-pemstore = { version = "1.20.1", path = "common/pemstore" } +nym-performance-contract-common = { version = "1.20.1", path = "common/cosmwasm-smart-contracts/nym-performance-contract" } +nym-serde-helpers = { version = "1.20.1", path = "common/serde-helpers" } +nym-service-providers-common = { version = "1.20.1", path = "service-providers/common" } +nym-socks5-client-core = { version = "1.20.1", path = "common/socks5-client-core" } +nym-socks5-proxy-helpers = { version = "1.20.1", path = "common/socks5/proxy-helpers" } +nym-socks5-requests = { version = "1.20.1", path = "common/socks5/requests" } +nym-sphinx = { version = "1.20.1", path = "common/nymsphinx" } +nym-sphinx-acknowledgements = { version = "1.20.1", path = "common/nymsphinx/acknowledgements" } +nym-sphinx-addressing = { version = "1.20.1", path = "common/nymsphinx/addressing" } +nym-sphinx-anonymous-replies = { version = "1.20.1", path = "common/nymsphinx/anonymous-replies" } +nym-sphinx-chunking = { version = "1.20.1", path = "common/nymsphinx/chunking" } +nym-sphinx-cover = { version = "1.20.1", path = "common/nymsphinx/cover" } +nym-sphinx-forwarding = { version = "1.20.1", path = "common/nymsphinx/forwarding" } +nym-sphinx-framing = { version = "1.20.1", path = "common/nymsphinx/framing" } +nym-sphinx-params = { version = "1.20.1", path = "common/nymsphinx/params" } +nym-sphinx-routing = { version = "1.20.1", path = "common/nymsphinx/routing" } +nym-sphinx-types = { version = "1.20.1", path = "common/nymsphinx/types" } +nym-statistics-common = { version = "1.20.1", path = "common/statistics" } +nym-task = { version = "1.20.1", path = "common/task" } +nym-ticketbooks-merkle = { version = "1.20.1", path = "common/ticketbooks-merkle" } +nym-topology = { version = "1.20.1", path = "common/topology" } +nym-upgrade-mode-check = { version = "1.20.1", path = "common/upgrade-mode-check" } +nym-validator-client = { version = "1.20.1", path = "common/client-libs/validator-client" } +nym-vesting-contract-common = { version = "1.20.1", path = "common/cosmwasm-smart-contracts/vesting-contract" } +nym-wireguard-types = { version = "1.20.1", path = "common/wireguard-types" } +nym-sqlx-pool-guard = { version = "1.2.0", path = "common/sqlx-pool-guard" } +wasm-utils = { version = "1.20.1", path = "common/wasm/utils" } + # coconut/DKG related # unfortunately until https://github.com/zkcrypto/bls12_381/issues/10 is resolved, we have to rely on the fork # as we need to be able to serialize Gt so that we could create the lookup table for baby-step-giant-step algorithm diff --git a/clients/native/websocket-requests/Cargo.toml b/clients/native/websocket-requests/Cargo.toml index a3ef6a1f285..ea2bbfd0200 100644 --- a/clients/native/websocket-requests/Cargo.toml +++ b/clients/native/websocket-requests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-client-websocket-requests" -version = "0.1.0" +version.workspace = true authors = ["Jędrzej Stuczyński "] edition = "2021" license.workspace = true diff --git a/common/async-file-watcher/Cargo.toml b/common/async-file-watcher/Cargo.toml index cde165eaab6..a3010f5ae52 100644 --- a/common/async-file-watcher/Cargo.toml +++ b/common/async-file-watcher/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-async-file-watcher" -version = "0.1.0" +version.workspace = true edition.workspace = true license.workspace = true diff --git a/common/authenticator-requests/Cargo.toml b/common/authenticator-requests/Cargo.toml index 6126a18f803..85e41a0c1c5 100644 --- a/common/authenticator-requests/Cargo.toml +++ b/common/authenticator-requests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-authenticator-requests" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true @@ -39,4 +39,4 @@ default = ["verify"] verify = ["hmac", "sha2"] [lints] -workspace = true \ No newline at end of file +workspace = true diff --git a/common/bandwidth-controller/Cargo.toml b/common/bandwidth-controller/Cargo.toml index a94abcc1cb2..f022af7234e 100644 --- a/common/bandwidth-controller/Cargo.toml +++ b/common/bandwidth-controller/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-bandwidth-controller" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true diff --git a/common/bin-common/Cargo.toml b/common/bin-common/Cargo.toml index aa75898ec4f..8220494794c 100644 --- a/common/bin-common/Cargo.toml +++ b/common/bin-common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-bin-common" -version = "0.6.0" +version.workspace = true description = "Common code for nym binaries" edition = { workspace = true } authors = { workspace = true } diff --git a/common/client-core/Cargo.toml b/common/client-core/Cargo.toml index 2f6d87dbc41..3fe096cefc3 100644 --- a/common/client-core/Cargo.toml +++ b/common/client-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-client-core" -version = "1.1.15" +version.workspace = true authors = ["Dave Hrycyszyn "] edition = "2021" rust-version = "1.85" diff --git a/common/client-core/config-types/Cargo.toml b/common/client-core/config-types/Cargo.toml index 31184905f57..bbd6b455eab 100644 --- a/common/client-core/config-types/Cargo.toml +++ b/common/client-core/config-types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-client-core-config-types" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true diff --git a/common/client-core/gateways-storage/Cargo.toml b/common/client-core/gateways-storage/Cargo.toml index 938a6db5dc3..01e86fe95ba 100644 --- a/common/client-core/gateways-storage/Cargo.toml +++ b/common/client-core/gateways-storage/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-client-core-gateways-storage" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true rust-version.workspace = true diff --git a/common/client-core/surb-storage/Cargo.toml b/common/client-core/surb-storage/Cargo.toml index be03487d955..72b38a5b7ac 100644 --- a/common/client-core/surb-storage/Cargo.toml +++ b/common/client-core/surb-storage/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-client-core-surb-storage" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true @@ -26,8 +26,8 @@ workspace = true features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate", "time"] optional = true -[target."cfg(not(target_arch = \"wasm32\"))".dependencies.sqlx-pool-guard] -path = "../../../sqlx-pool-guard" +[target."cfg(not(target_arch = \"wasm32\"))".dependencies.nym-sqlx-pool-guard] +path = "../../../nym-sqlx-pool-guard" [build-dependencies] anyhow = { workspace = true } diff --git a/common/client-core/surb-storage/src/backend/fs_backend/manager.rs b/common/client-core/surb-storage/src/backend/fs_backend/manager.rs index 6edde091ced..b0a6ec68f72 100644 --- a/common/client-core/surb-storage/src/backend/fs_backend/manager.rs +++ b/common/client-core/surb-storage/src/backend/fs_backend/manager.rs @@ -13,7 +13,7 @@ use std::path::Path; use time::OffsetDateTime; use tracing::{error, info}; -use sqlx_pool_guard::SqlitePoolGuard; +use nym_sqlx_pool_guard::SqlitePoolGuard; #[derive(Debug, Clone)] pub struct StorageManager { diff --git a/common/client-libs/gateway-client/Cargo.toml b/common/client-libs/gateway-client/Cargo.toml index 969d94807e3..eafd219155f 100644 --- a/common/client-libs/gateway-client/Cargo.toml +++ b/common/client-libs/gateway-client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-gateway-client" -version = "0.1.0" +version.workspace = true authors = ["Jędrzej Stuczyński "] edition = "2021" license.workspace = true @@ -90,4 +90,4 @@ features = ["js"] wasm = [] [lints] -workspace = true \ No newline at end of file +workspace = true diff --git a/common/client-libs/mixnet-client/Cargo.toml b/common/client-libs/mixnet-client/Cargo.toml index 2a8a39383b6..b426ed994e4 100644 --- a/common/client-libs/mixnet-client/Cargo.toml +++ b/common/client-libs/mixnet-client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-mixnet-client" -version = "0.1.0" +version.workspace = true authors = ["Jedrzej Stuczynski "] edition = "2021" license.workspace = true diff --git a/common/client-libs/validator-client/Cargo.toml b/common/client-libs/validator-client/Cargo.toml index ec4eb62bec7..24724e215f8 100644 --- a/common/client-libs/validator-client/Cargo.toml +++ b/common/client-libs/validator-client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-validator-client" -version = "0.1.0" +version.workspace = true authors = ["Jędrzej Stuczyński "] edition = "2021" rust-version = "1.85" diff --git a/common/commands/Cargo.toml b/common/commands/Cargo.toml index 4398342d4cd..a3f403d1ba2 100644 --- a/common/commands/Cargo.toml +++ b/common/commands/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-cli-commands" -version = "1.0.0" +version.workspace = true authors.workspace = true edition = "2021" license.workspace = true @@ -60,5 +60,5 @@ nym-credential-utils = { path = "../../common/credential-utils" } nym-id = { path = "../nym-id" } nym-credential-proxy-requests = { path = "../../nym-credential-proxy/nym-credential-proxy-requests" } -nym-pemstore = { path = "../../common/pemstore", version = "0.3.0" } +nym-pemstore = { path = "../../common/pemstore" } nym-types = { path = "../../common/types" } diff --git a/common/config/Cargo.toml b/common/config/Cargo.toml index d978fe4aeeb..4dd4b478297 100644 --- a/common/config/Cargo.toml +++ b/common/config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-config" -version = "0.1.0" +version.workspace = true authors = ["Jedrzej Stuczynski "] edition = "2021" license.workspace = true diff --git a/common/cosmwasm-smart-contracts/coconut-dkg/Cargo.toml b/common/cosmwasm-smart-contracts/coconut-dkg/Cargo.toml index d2a9cbd50fd..b96bd2ed4b9 100644 --- a/common/cosmwasm-smart-contracts/coconut-dkg/Cargo.toml +++ b/common/cosmwasm-smart-contracts/coconut-dkg/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-coconut-dkg-common" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true diff --git a/common/cosmwasm-smart-contracts/contracts-common-testing/Cargo.toml b/common/cosmwasm-smart-contracts/contracts-common-testing/Cargo.toml index 0bb81f17921..618299b5d69 100644 --- a/common/cosmwasm-smart-contracts/contracts-common-testing/Cargo.toml +++ b/common/cosmwasm-smart-contracts/contracts-common-testing/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-contracts-common-testing" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/common/cosmwasm-smart-contracts/contracts-common/Cargo.toml b/common/cosmwasm-smart-contracts/contracts-common/Cargo.toml index c13d29a7ec8..277351d5d0f 100644 --- a/common/cosmwasm-smart-contracts/contracts-common/Cargo.toml +++ b/common/cosmwasm-smart-contracts/contracts-common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-contracts-common" -version = "0.5.0" +version.workspace = true description = "Common library for Nym cosmwasm contracts" edition = { workspace = true } authors = { workspace = true } diff --git a/common/cosmwasm-smart-contracts/easy_addr/Cargo.toml b/common/cosmwasm-smart-contracts/easy_addr/Cargo.toml index 992378fbe06..b8a48b40a78 100644 --- a/common/cosmwasm-smart-contracts/easy_addr/Cargo.toml +++ b/common/cosmwasm-smart-contracts/easy_addr/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "easy-addr" -version = "0.1.0" +version.workspace = true edition = "2021" publish = false license.workspace = true @@ -11,4 +11,4 @@ proc-macro = true [dependencies] cosmwasm-std = { workspace = true } quote = { workspace = true } -syn = { workspace = true, features = ["full", "printing", "extra-traits"] } \ No newline at end of file +syn = { workspace = true, features = ["full", "printing", "extra-traits"] } diff --git a/common/cosmwasm-smart-contracts/ecash-contract/Cargo.toml b/common/cosmwasm-smart-contracts/ecash-contract/Cargo.toml index 54bc53fe185..2b68a839a3a 100644 --- a/common/cosmwasm-smart-contracts/ecash-contract/Cargo.toml +++ b/common/cosmwasm-smart-contracts/ecash-contract/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-ecash-contract-common" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true diff --git a/common/cosmwasm-smart-contracts/group-contract/Cargo.toml b/common/cosmwasm-smart-contracts/group-contract/Cargo.toml index e9a942139f0..97aa67b7a9b 100644 --- a/common/cosmwasm-smart-contracts/group-contract/Cargo.toml +++ b/common/cosmwasm-smart-contracts/group-contract/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-group-contract-common" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml b/common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml index ed9b7ac1257..21586838ff7 100644 --- a/common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml +++ b/common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-mixnet-contract-common" -version = "0.6.0" +version.workspace = true description = "Common library for the Nym mixnet contract" rust-version = "1.85" edition = { workspace = true } @@ -22,7 +22,7 @@ semver = { workspace = true, features = ["serde"] } # we still have to preserve that import for `JsonSchema` for `Layer` type (since we can't use cw_serde macro due to custom serde impl) schemars = { workspace = true } thiserror = { workspace = true } -contracts-common = { path = "../contracts-common", package = "nym-contracts-common", version = "0.5.0" } +contracts-common = { path = "../contracts-common", package = "nym-contracts-common" } humantime-serde = { workspace = true } utoipa = { workspace = true, optional = true } @@ -41,4 +41,4 @@ schema = ["cw2"] generate-ts = ['ts-rs'] [lints] -workspace = true \ No newline at end of file +workspace = true diff --git a/common/cosmwasm-smart-contracts/multisig-contract/Cargo.toml b/common/cosmwasm-smart-contracts/multisig-contract/Cargo.toml index 89e039cd1f7..cc469306042 100644 --- a/common/cosmwasm-smart-contracts/multisig-contract/Cargo.toml +++ b/common/cosmwasm-smart-contracts/multisig-contract/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-multisig-contract-common" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true diff --git a/common/cosmwasm-smart-contracts/nym-performance-contract/Cargo.toml b/common/cosmwasm-smart-contracts/nym-performance-contract/Cargo.toml index 078351a3480..356434ac777 100644 --- a/common/cosmwasm-smart-contracts/nym-performance-contract/Cargo.toml +++ b/common/cosmwasm-smart-contracts/nym-performance-contract/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-performance-contract-common" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/common/cosmwasm-smart-contracts/nym-pool-contract/Cargo.toml b/common/cosmwasm-smart-contracts/nym-pool-contract/Cargo.toml index 38d7659ece7..a4567fb0c26 100644 --- a/common/cosmwasm-smart-contracts/nym-pool-contract/Cargo.toml +++ b/common/cosmwasm-smart-contracts/nym-pool-contract/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-pool-contract-common" -version = "0.1.0" +version.workspace = true description = "Common library for the Nym Pool contract" authors.workspace = true repository.workspace = true diff --git a/common/cosmwasm-smart-contracts/vesting-contract/Cargo.toml b/common/cosmwasm-smart-contracts/vesting-contract/Cargo.toml index 9edf0ce49c2..9fdc5d9db71 100644 --- a/common/cosmwasm-smart-contracts/vesting-contract/Cargo.toml +++ b/common/cosmwasm-smart-contracts/vesting-contract/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-vesting-contract-common" -version = "0.7.0" +version.workspace = true description = "Common library for the Nym vesting contract" edition = { workspace = true } authors = { workspace = true } @@ -11,8 +11,8 @@ repository = { workspace = true } cosmwasm-std = { workspace = true } cosmwasm-schema = { workspace = true } cw2 = { workspace = true, optional = true } -mixnet-contract-common = { path = "../mixnet-contract", package = "nym-mixnet-contract-common", version = "0.6.0" } -contracts-common = { path = "../contracts-common", package = "nym-contracts-common", version = "0.5.0" } +mixnet-contract-common = { path = "../mixnet-contract", package = "nym-mixnet-contract-common" } +contracts-common = { path = "../contracts-common", package = "nym-contracts-common" } serde = { workspace = true, features = ["derive"] } thiserror = { workspace = true } # without this feature, cargo clippy emits a ton of incompatibility warnings diff --git a/common/credential-proxy/Cargo.toml b/common/credential-proxy/Cargo.toml index e06fd612e38..f6171e6230a 100644 --- a/common/credential-proxy/Cargo.toml +++ b/common/credential-proxy/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-credential-proxy-lib" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/common/credential-storage/Cargo.toml b/common/credential-storage/Cargo.toml index 9ca0eab6f36..cd2a414ea65 100644 --- a/common/credential-storage/Cargo.toml +++ b/common/credential-storage/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-credential-storage" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true rust-version.workspace = true @@ -22,8 +22,8 @@ nym-credentials = { path = "../credentials" } nym-compact-ecash = { path = "../nym_offline_compact_ecash" } nym-ecash-time = { path = "../ecash-time" } -[target."cfg(not(target_arch = \"wasm32\"))".dependencies.sqlx-pool-guard] -path = "../../sqlx-pool-guard" +[target."cfg(not(target_arch = \"wasm32\"))".dependencies.nym-sqlx-pool-guard] +path = "../../nym-sqlx-pool-guard" [target."cfg(not(target_arch = \"wasm32\"))".dependencies.sqlx] workspace = true diff --git a/common/credential-storage/src/backends/sqlite.rs b/common/credential-storage/src/backends/sqlite.rs index cb1cddf9806..46d4acadae9 100644 --- a/common/credential-storage/src/backends/sqlite.rs +++ b/common/credential-storage/src/backends/sqlite.rs @@ -7,8 +7,8 @@ use crate::models::{ StoredIssuedTicketbook, StoredPendingTicketbook, }; use nym_ecash_time::Date; +use nym_sqlx_pool_guard::SqlitePoolGuard; use sqlx::{Executor, Sqlite, Transaction}; -use sqlx_pool_guard::SqlitePoolGuard; #[derive(Clone)] pub struct SqliteEcashTicketbookManager { diff --git a/common/credential-storage/src/persistent_storage/mod.rs b/common/credential-storage/src/persistent_storage/mod.rs index debef280938..5f78da3610d 100644 --- a/common/credential-storage/src/persistent_storage/mod.rs +++ b/common/credential-storage/src/persistent_storage/mod.rs @@ -34,11 +34,11 @@ use nym_credentials::{ IssuanceTicketBook, IssuedTicketBook, }; use nym_ecash_time::{ecash_today, Date, EcashTime}; +use nym_sqlx_pool_guard::SqlitePoolGuard; use sqlx::{ sqlite::{SqliteAutoVacuum, SqliteSynchronous}, ConnectOptions, }; -use sqlx_pool_guard::SqlitePoolGuard; use std::path::Path; use zeroize::Zeroizing; diff --git a/common/credential-utils/Cargo.toml b/common/credential-utils/Cargo.toml index 81ba19a85be..4afb0ba47d3 100644 --- a/common/credential-utils/Cargo.toml +++ b/common/credential-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-credential-utils" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true @@ -19,4 +19,4 @@ nym-credential-storage = { path = "../../common/credential-storage", features = nym-validator-client = { path = "../../common/client-libs/validator-client" } nym-config = { path = "../../common/config" } nym-client-core = { path = "../../common/client-core" } -nym-ecash-time = { path = "../../common/ecash-time" } \ No newline at end of file +nym-ecash-time = { path = "../../common/ecash-time" } diff --git a/common/credential-verification/Cargo.toml b/common/credential-verification/Cargo.toml index 06c45efdc55..bdf41489793 100644 --- a/common/credential-verification/Cargo.toml +++ b/common/credential-verification/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-credential-verification" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/common/credentials-interface/Cargo.toml b/common/credentials-interface/Cargo.toml index 57a88ea603f..cb51160fc33 100644 --- a/common/credentials-interface/Cargo.toml +++ b/common/credentials-interface/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-credentials-interface" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true @@ -24,4 +24,3 @@ nym-compact-ecash = { path = "../nym_offline_compact_ecash" } nym-ecash-time = { path = "../ecash-time" } nym-network-defaults = { path = "../network-defaults" } nym-upgrade-mode-check = { path = "../upgrade-mode-check" } - diff --git a/common/credentials/Cargo.toml b/common/credentials/Cargo.toml index e3cb06ec408..a3bebf6c39c 100644 --- a/common/credentials/Cargo.toml +++ b/common/credentials/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-credentials" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true @@ -30,4 +30,3 @@ nym-serde-helpers = { path = "../serde-helpers", features = ["date"] } [dev-dependencies] rand = { workspace = true } - diff --git a/common/crypto/Cargo.toml b/common/crypto/Cargo.toml index 37a1e317e54..d2df4bd1a82 100644 --- a/common/crypto/Cargo.toml +++ b/common/crypto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-crypto" -version = "0.4.0" +version.workspace = true description = "Crypto library for the nym mixnet" edition = { workspace = true } authors = { workspace = true } @@ -32,8 +32,8 @@ thiserror = { workspace = true } zeroize = { workspace = true, optional = true, features = ["zeroize_derive"] } # internal -nym-sphinx-types = { path = "../nymsphinx/types", version = "0.2.0", default-features = false } -nym-pemstore = { path = "../../common/pemstore", version = "0.3.0" } +nym-sphinx-types = { workspace = true } +nym-pemstore = { workspace = true } [dev-dependencies] anyhow = { workspace = true } @@ -48,9 +48,9 @@ aead = ["dep:aead", "aead/std", "aes-gcm-siv", "generic-array"] naive_jwt = ["asymmetric", "jwt-simple"] serde = ["dep:serde", "serde_bytes", "ed25519-dalek/serde", "x25519-dalek/serde"] asymmetric = ["x25519-dalek", "ed25519-dalek", "zeroize"] -hashing = ["blake3", "digest", "hkdf", "hmac", "generic-array", "sha2"] +hashing = ["blake3", "digest", "hkdf", "hmac", "generic-array", "sha2", "zeroize"] stream_cipher = ["aes", "ctr", "cipher", "generic-array"] sphinx = ["nym-sphinx-types/sphinx"] [lints] -workspace = true \ No newline at end of file +workspace = true diff --git a/common/dkg/Cargo.toml b/common/dkg/Cargo.toml index b8e4f557319..6afb753f008 100644 --- a/common/dkg/Cargo.toml +++ b/common/dkg/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-dkg" -version = "0.1.0" +version.workspace = true edition = "2021" resolver = "2" license.workspace = true diff --git a/common/ecash-signer-check-types/Cargo.toml b/common/ecash-signer-check-types/Cargo.toml index 0f07437c710..708997d52aa 100644 --- a/common/ecash-signer-check-types/Cargo.toml +++ b/common/ecash-signer-check-types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-ecash-signer-check-types" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/common/ecash-signer-check/Cargo.toml b/common/ecash-signer-check/Cargo.toml index cc8fb6ec296..9c543dbce36 100644 --- a/common/ecash-signer-check/Cargo.toml +++ b/common/ecash-signer-check/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-ecash-signer-check" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/common/ecash-time/Cargo.toml b/common/ecash-time/Cargo.toml index 4eaee90438a..248c180a1de 100644 --- a/common/ecash-time/Cargo.toml +++ b/common/ecash-time/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-ecash-time" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true @@ -16,4 +16,4 @@ time.workspace = true nym-compact-ecash = { path = "../nym_offline_compact_ecash", optional = true } [features] -expiration = ["nym-compact-ecash"] \ No newline at end of file +expiration = ["nym-compact-ecash"] diff --git a/common/exit-policy/Cargo.toml b/common/exit-policy/Cargo.toml index a5e8f26974d..577f7cca628 100644 --- a/common/exit-policy/Cargo.toml +++ b/common/exit-policy/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-exit-policy" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/common/gateway-requests/Cargo.toml b/common/gateway-requests/Cargo.toml index 65a5704fdc8..33554ca427c 100644 --- a/common/gateway-requests/Cargo.toml +++ b/common/gateway-requests/Cargo.toml @@ -3,7 +3,7 @@ [package] name = "nym-gateway-requests" -version = "0.1.0" +version.workspace = true authors = ["Jedrzej Stuczynski "] edition = "2021" license.workspace = true @@ -53,4 +53,4 @@ nym-test-utils = { path = "../test-utils" } tokio = { workspace = true, features = ["full"] } [lints] -workspace = true \ No newline at end of file +workspace = true diff --git a/common/gateway-stats-storage/Cargo.toml b/common/gateway-stats-storage/Cargo.toml index e958e255260..95118af1b79 100644 --- a/common/gateway-stats-storage/Cargo.toml +++ b/common/gateway-stats-storage/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-gateway-stats-storage" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/common/gateway-storage/Cargo.toml b/common/gateway-storage/Cargo.toml index c7878511be6..7c192b55cdd 100644 --- a/common/gateway-storage/Cargo.toml +++ b/common/gateway-storage/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-gateway-storage" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true @@ -43,4 +43,4 @@ sqlx = { workspace = true, features = [ [features] default = [] -mock = ["tokio"] \ No newline at end of file +mock = ["tokio"] diff --git a/common/http-api-client-macro/Cargo.toml b/common/http-api-client-macro/Cargo.toml index ea23bbd23af..c4fc7f1d4e6 100644 --- a/common/http-api-client-macro/Cargo.toml +++ b/common/http-api-client-macro/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-http-api-client-macro" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/common/http-api-client/Cargo.toml b/common/http-api-client/Cargo.toml index e748e37888f..9e4939fff5f 100644 --- a/common/http-api-client/Cargo.toml +++ b/common/http-api-client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-http-api-client" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/common/http-api-common/Cargo.toml b/common/http-api-common/Cargo.toml index 4a405c155ea..d5444e04fa6 100644 --- a/common/http-api-common/Cargo.toml +++ b/common/http-api-common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-http-api-common" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true @@ -52,4 +52,4 @@ middleware = [ utoipa = ["dep:utoipa"] [lints] -workspace = true \ No newline at end of file +workspace = true diff --git a/common/inclusion-probability/Cargo.toml b/common/inclusion-probability/Cargo.toml index b98a1ec5e8e..d27d0a23fa9 100644 --- a/common/inclusion-probability/Cargo.toml +++ b/common/inclusion-probability/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-inclusion-probability" -version = "0.1.0" +version.workspace = true description = "Nym active set probability simulator" edition.workspace = true authors.workspace = true diff --git a/common/ip-packet-requests/Cargo.toml b/common/ip-packet-requests/Cargo.toml index cd9663dc90b..5f22e1b0a81 100644 --- a/common/ip-packet-requests/Cargo.toml +++ b/common/ip-packet-requests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-ip-packet-requests" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/common/ledger/Cargo.toml b/common/ledger/Cargo.toml index 72de9bb0034..98843300c52 100644 --- a/common/ledger/Cargo.toml +++ b/common/ledger/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-ledger" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true diff --git a/common/mixnode-common/Cargo.toml b/common/mixnode-common/Cargo.toml index 8fbab39525c..585e45ec564 100644 --- a/common/mixnode-common/Cargo.toml +++ b/common/mixnode-common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-mixnode-common" -version = "0.1.0" +version.workspace = true authors = ["Jędrzej Stuczyński "] edition = "2021" license.workspace = true @@ -36,4 +36,3 @@ nym-sphinx-params = { path = "../nymsphinx/params" } nym-sphinx-types = { path = "../nymsphinx/types" } nym-task = { path = "../task" } nym-metrics = { path = "../nym-metrics" } - diff --git a/common/network-defaults/Cargo.toml b/common/network-defaults/Cargo.toml index d8cbc367118..5c3a73e2793 100644 --- a/common/network-defaults/Cargo.toml +++ b/common/network-defaults/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-network-defaults" -version = "0.1.0" +version.workspace = true description = "Nym network defaults" edition.workspace = true authors.workspace = true diff --git a/common/node-tester-utils/Cargo.toml b/common/node-tester-utils/Cargo.toml index 89e4043ad39..594f66f4fd9 100644 --- a/common/node-tester-utils/Cargo.toml +++ b/common/node-tester-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-node-tester-utils" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true diff --git a/common/nonexhaustive-delayqueue/Cargo.toml b/common/nonexhaustive-delayqueue/Cargo.toml index 76903a4b5f2..6f320e2fb5b 100644 --- a/common/nonexhaustive-delayqueue/Cargo.toml +++ b/common/nonexhaustive-delayqueue/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-nonexhaustive-delayqueue" -version = "0.1.0" +version.workspace = true authors = ["Jędrzej Stuczyński "] edition = "2021" license.workspace = true @@ -20,4 +20,3 @@ features = ["time"] [target."cfg(target_arch = \"wasm32\")".dependencies.wasmtimer] workspace = true features = ["tokio", "tokio-util"] - diff --git a/common/nym-cache/Cargo.toml b/common/nym-cache/Cargo.toml index 8bcfc2e9975..ac415943b1d 100644 --- a/common/nym-cache/Cargo.toml +++ b/common/nym-cache/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-cache" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/common/nym-common/Cargo.toml b/common/nym-common/Cargo.toml index 5bf119c8eeb..3bcdd52f40b 100644 --- a/common/nym-common/Cargo.toml +++ b/common/nym-common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-common" -version = "1.18.0" +version.workspace = true authors.workspace = true repository.workspace = true license.workspace = true diff --git a/common/nym-id/Cargo.toml b/common/nym-id/Cargo.toml index eb80073fb76..821bc7ef57e 100644 --- a/common/nym-id/Cargo.toml +++ b/common/nym-id/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-id" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/common/nym-metrics/Cargo.toml b/common/nym-metrics/Cargo.toml index 1ac3bce16af..695f641c635 100644 --- a/common/nym-metrics/Cargo.toml +++ b/common/nym-metrics/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-metrics" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/common/nym_offline_compact_ecash/Cargo.toml b/common/nym_offline_compact_ecash/Cargo.toml index 718787b457c..2be337eaaa7 100644 --- a/common/nym_offline_compact_ecash/Cargo.toml +++ b/common/nym_offline_compact_ecash/Cargo.toml @@ -3,7 +3,7 @@ [package] name = "nym-compact-ecash" -version = "0.1.0" +version.workspace = true authors = ["Ania Piotrowska "] edition = "2021" license = { workspace = true } diff --git a/common/nymnoise/Cargo.toml b/common/nymnoise/Cargo.toml index 63050814ef7..b57dc220ed7 100644 --- a/common/nymnoise/Cargo.toml +++ b/common/nymnoise/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-noise" -version = "0.1.0" +version.workspace = true authors = ["Simon Wicky "] edition = "2021" license.workspace = true diff --git a/common/nymnoise/keys/Cargo.toml b/common/nymnoise/keys/Cargo.toml index 94080a004b1..43488efb67b 100644 --- a/common/nymnoise/keys/Cargo.toml +++ b/common/nymnoise/keys/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-noise-keys" -version = "0.1.0" +version.workspace = true authors = ["Simon Wicky "] edition = "2021" license.workspace = true @@ -14,4 +14,4 @@ utoipa = { workspace = true } nym-crypto = { path = "../../crypto", features = ["asymmetric", "serde"] } [lints] -workspace = true \ No newline at end of file +workspace = true diff --git a/common/nymsphinx/Cargo.toml b/common/nymsphinx/Cargo.toml index d6b77f6969b..37d4f6f8f29 100644 --- a/common/nymsphinx/Cargo.toml +++ b/common/nymsphinx/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-sphinx" -version = "0.1.0" +version.workspace = true description = "Top-level crate for sphinx packets as used by the Nym mixnet" edition = { workspace = true } authors = { workspace = true } @@ -26,13 +26,13 @@ nym-sphinx-types = { path = "types" } # those dependencies are due to intriducing preparer and receiver. Perpaphs that indicates they should be moved # to separate crate? -nym-crypto = { path = "../crypto", version = "0.4.0" } -nym-topology = { path = "../topology" } -nym-metrics = { path = "../nym-metrics" } +nym-crypto = { workspace = true } +nym-topology = { workspace = true } +nym-metrics = { workspace = true } [dev-dependencies] -nym-mixnet-contract-common = { path = "../cosmwasm-smart-contracts/mixnet-contract" } -nym-crypto = { path = "../crypto", version = "0.4.0", features = [ +nym-mixnet-contract-common = { workspace = true } +nym-crypto = { workspace = true, features = [ "asymmetric", ] } diff --git a/common/nymsphinx/acknowledgements/Cargo.toml b/common/nymsphinx/acknowledgements/Cargo.toml index 117bc6b7d51..6d0fe4fcff6 100644 --- a/common/nymsphinx/acknowledgements/Cargo.toml +++ b/common/nymsphinx/acknowledgements/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-sphinx-acknowledgements" -version = "0.1.0" +version.workspace = true description = "Sphinx packet ack messages" edition = { workspace = true } authors = { workspace = true } @@ -14,13 +14,13 @@ generic-array = { workspace = true, optional = true, features = ["serde"] } thiserror = { workspace = true } zeroize = { workspace = true } -nym-crypto = { path = "../../crypto", features = ["stream_cipher", "rand"] } -nym-pemstore = { path = "../../pemstore" } -nym-sphinx-addressing = { path = "../addressing" } -nym-sphinx-params = { path = "../params" } -nym-sphinx-routing = { path = "../routing" } -nym-sphinx-types = { path = "../types", features = ["sphinx"] } -nym-topology = { path = "../../topology" } +nym-crypto = { workspace = true, features = ["stream_cipher", "rand"] } +nym-pemstore = { workspace = true } +nym-sphinx-addressing = { workspace = true } +nym-sphinx-params = { workspace = true } +nym-sphinx-routing = { workspace = true } +nym-sphinx-types = { workspace = true, features = ["sphinx"] } +nym-topology = { workspace = true } [features] serde = ["dep:serde", "generic-array"] diff --git a/common/nymsphinx/addressing/Cargo.toml b/common/nymsphinx/addressing/Cargo.toml index c7f756cb5c6..5aec9af3ed6 100644 --- a/common/nymsphinx/addressing/Cargo.toml +++ b/common/nymsphinx/addressing/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-sphinx-addressing" -version = "0.1.0" +version.workspace = true description = "Nym mixnet addressing" edition = { workspace = true } authors = { workspace = true } @@ -8,14 +8,14 @@ license = { workspace = true } repository = { workspace = true } [dependencies] -nym-crypto = { path = "../../crypto", features = ["asymmetric", "sphinx"] } # all addresses are expressed in terms on their crypto keys -nym-sphinx-types = { path = "../types", features = ["sphinx"] } # we need to be able to refer to some types defined inside sphinx crate +nym-crypto = { workspace = true, features = ["asymmetric", "sphinx"] } # all addresses are expressed in terms on their crypto keys +nym-sphinx-types = { workspace = true, features = ["sphinx"] } # we need to be able to refer to some types defined inside sphinx crate serde = { workspace = true } # implementing serialization/deserialization for some types, like `Recipient` thiserror = { workspace = true } [dev-dependencies] rand = { workspace = true } -nym-crypto = { path = "../../crypto", features = ["rand"] } +nym-crypto = { workspace = true, features = ["rand"] } bincode = { workspace = true } serde_json = { workspace = true } -serde = { workspace = true, features = ["derive"] } \ No newline at end of file +serde = { workspace = true, features = ["derive"] } diff --git a/common/nymsphinx/anonymous-replies/Cargo.toml b/common/nymsphinx/anonymous-replies/Cargo.toml index ef9c74b73da..fe9f272146a 100644 --- a/common/nymsphinx/anonymous-replies/Cargo.toml +++ b/common/nymsphinx/anonymous-replies/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-sphinx-anonymous-replies" -version = "0.1.0" +version.workspace = true description = "Anonymous sphinx packet replies using singly-use-reply-blocks (SURB)" edition = { workspace = true } authors = { workspace = true } @@ -13,12 +13,12 @@ bs58 = { workspace = true } thiserror = { workspace = true } tracing = { workspace = true } -nym-crypto = { path = "../../crypto", features = ["stream_cipher", "rand"] } -nym-sphinx-addressing = { path = "../addressing" } -nym-sphinx-params = { path = "../params" } -nym-sphinx-routing = { path = "../routing" } -nym-sphinx-types = { path = "../types" } -nym-topology = { path = "../../topology" } +nym-crypto = { workspace = true, features = ["stream_cipher", "rand"] } +nym-sphinx-addressing = { workspace = true } +nym-sphinx-params = { workspace = true } +nym-sphinx-routing = { workspace = true } +nym-sphinx-types = { workspace = true } +nym-topology = { workspace = true } [target."cfg(target_arch = \"wasm32\")".dependencies.wasm-bindgen] workspace = true diff --git a/common/nymsphinx/chunking/Cargo.toml b/common/nymsphinx/chunking/Cargo.toml index f5ea2408599..708ecb5c103 100644 --- a/common/nymsphinx/chunking/Cargo.toml +++ b/common/nymsphinx/chunking/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-sphinx-chunking" -version = "0.1.0" +version.workspace = true description = "Sphinx packet chunking of underlying data packets" edition = { workspace = true } authors = { workspace = true } @@ -17,11 +17,11 @@ dashmap = { workspace = true, features = ["serde"] } serde = { workspace = true, features = ["derive"] } utoipa = { workspace = true } -nym-sphinx-addressing = { path = "../addressing" } -nym-sphinx-params = { path = "../params" } -nym-sphinx-types = { path = "../types" } -nym-metrics = { path = "../../nym-metrics" } -nym-crypto = { path = "../../crypto", version = "0.4.0", features = [ +nym-sphinx-addressing = { workspace = true } +nym-sphinx-params = { workspace = true } +nym-sphinx-types = { workspace = true } +nym-metrics = { workspace = true } +nym-crypto = { workspace = true, features = [ "asymmetric", ] } diff --git a/common/nymsphinx/cover/Cargo.toml b/common/nymsphinx/cover/Cargo.toml index 59710923d17..69dcf6fe65f 100644 --- a/common/nymsphinx/cover/Cargo.toml +++ b/common/nymsphinx/cover/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-sphinx-cover" -version = "0.1.0" +version.workspace = true description = "Sphinx packets used as cover traffic" edition = { workspace = true } authors = { workspace = true } @@ -11,12 +11,12 @@ repository = { workspace = true } rand = { workspace = true } thiserror = { workspace = true } -nym-crypto = { path = "../../crypto" } -nym-sphinx-acknowledgements = { path = "../acknowledgements" } -nym-sphinx-addressing = { path = "../addressing" } -nym-sphinx-chunking = { path = "../chunking" } -nym-sphinx-forwarding = { path = "../forwarding" } -nym-sphinx-params = { path = "../params" } -nym-sphinx-routing = { path = "../routing" } -nym-sphinx-types = { path = "../types" } -nym-topology = { path = "../../topology" } +nym-crypto = { workspace = true } +nym-sphinx-acknowledgements = { workspace = true } +nym-sphinx-addressing = { workspace = true } +nym-sphinx-chunking = { workspace = true } +nym-sphinx-forwarding = { workspace = true } +nym-sphinx-params = { workspace = true } +nym-sphinx-routing = { workspace = true } +nym-sphinx-types = { workspace = true } +nym-topology = { workspace = true } diff --git a/common/nymsphinx/forwarding/Cargo.toml b/common/nymsphinx/forwarding/Cargo.toml index c8beb33b12f..e9a299c6261 100644 --- a/common/nymsphinx/forwarding/Cargo.toml +++ b/common/nymsphinx/forwarding/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-sphinx-forwarding" -version = "0.1.0" +version.workspace = true description = "Sphinx packet forwarding as Nym mix packets" edition = { workspace = true } authors = { workspace = true } @@ -8,8 +8,8 @@ license = { workspace = true } repository = { workspace = true } [dependencies] -nym-sphinx-addressing = { path = "../addressing" } -nym-sphinx-params = { path = "../params" } -nym-sphinx-types = { path = "../types", features = ["sphinx", "outfox"] } -nym-sphinx-anonymous-replies = { path = "../anonymous-replies" } +nym-sphinx-addressing = { workspace = true } +nym-sphinx-params = { workspace = true } +nym-sphinx-types = { workspace = true, features = ["sphinx", "outfox"] } +nym-sphinx-anonymous-replies = { workspace = true } thiserror = { workspace = true } diff --git a/common/nymsphinx/framing/Cargo.toml b/common/nymsphinx/framing/Cargo.toml index dc9447aebd2..6b67d2c5315 100644 --- a/common/nymsphinx/framing/Cargo.toml +++ b/common/nymsphinx/framing/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-sphinx-framing" -version = "0.1.0" +version.workspace = true description = "Sphinx packet framing for the Nym mixnet" edition = { workspace = true } authors = { workspace = true } @@ -13,11 +13,11 @@ tokio-util = { workspace = true, features = ["codec"] } thiserror = { workspace = true } tracing = { workspace = true } -nym-sphinx-types = { path = "../types", features = ["sphinx", "outfox"] } -nym-sphinx-params = { path = "../params", features = ["sphinx", "outfox"] } -nym-sphinx-forwarding = { path = "../forwarding" } -nym-sphinx-addressing = { path = "../addressing" } -nym-sphinx-acknowledgements = { path = "../acknowledgements" } +nym-sphinx-types = { workspace = true, features = ["sphinx", "outfox"] } +nym-sphinx-params = { workspace = true, features = ["sphinx", "outfox"] } +nym-sphinx-forwarding = { workspace = true } +nym-sphinx-addressing = { workspace = true } +nym-sphinx-acknowledgements = { workspace = true } [dev-dependencies] tokio = { workspace = true, features = ["full"] } diff --git a/common/nymsphinx/params/Cargo.toml b/common/nymsphinx/params/Cargo.toml index 8db26e7b1d5..c5fd617d639 100644 --- a/common/nymsphinx/params/Cargo.toml +++ b/common/nymsphinx/params/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-sphinx-params" -version = "0.1.0" +version.workspace = true description = "Sphinx packet parameters for the Nym mixnet" edition = { workspace = true } authors = { workspace = true } @@ -11,8 +11,8 @@ repository = { workspace = true } thiserror = { workspace = true } serde = { workspace = true, features = ["derive"] } -nym-crypto = { path = "../../crypto", features = ["hashing", "stream_cipher", "aead"] } -nym-sphinx-types = { path = "../types" } +nym-crypto = { workspace = true, features = ["hashing", "stream_cipher", "aead"] } +nym-sphinx-types = { workspace = true } [features] default = ["sphinx"] diff --git a/common/nymsphinx/routing/Cargo.toml b/common/nymsphinx/routing/Cargo.toml index 37b8d5a4dc2..209c9baefb4 100644 --- a/common/nymsphinx/routing/Cargo.toml +++ b/common/nymsphinx/routing/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-sphinx-routing" -version = "0.1.0" +version.workspace = true description = "Sphinx packet routing as Nym mix packets" edition = { workspace = true } authors = { workspace = true } @@ -10,7 +10,7 @@ repository = { workspace = true } [dependencies] thiserror = { workspace = true } -nym-sphinx-addressing = { path = "../addressing" } -nym-sphinx-types = { path = "../types", features = ["sphinx"] } +nym-sphinx-addressing = { workspace = true } +nym-sphinx-types = { workspace = true, features = ["sphinx"] } -[features] \ No newline at end of file +[features] diff --git a/common/nymsphinx/types/Cargo.toml b/common/nymsphinx/types/Cargo.toml index b12d22d7f6a..776f88a41ae 100644 --- a/common/nymsphinx/types/Cargo.toml +++ b/common/nymsphinx/types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-sphinx-types" -version = "0.2.0" +version.workspace = true description = "Re-export sphinx packet types" edition = { workspace = true } authors = { workspace = true } @@ -9,7 +9,7 @@ repository = { workspace = true } [dependencies] sphinx-packet = { workspace = true, optional = true } -nym-outfox = { path = "../../../nym-outfox", optional = true } +nym-outfox = { workspace = true, optional = true } thiserror = { workspace = true } [features] diff --git a/common/nyxd-scraper/Cargo.toml b/common/nyxd-scraper/Cargo.toml index 025e906d56e..406316a3e65 100644 --- a/common/nyxd-scraper/Cargo.toml +++ b/common/nyxd-scraper/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nyxd-scraper" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/common/pemstore/Cargo.toml b/common/pemstore/Cargo.toml index 9c93dc122d6..5534b81dd04 100644 --- a/common/pemstore/Cargo.toml +++ b/common/pemstore/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "nym-pemstore" description = "Store private-public keypairs in PEM format" -version = "0.3.0" +version.workspace = true edition = { workspace = true } authors = { workspace = true } license = { workspace = true } @@ -10,4 +10,4 @@ repository = { workspace = true } [dependencies] pem = { workspace = true } tracing = { workspace = true } -zeroize = { workspace = true } \ No newline at end of file +zeroize = { workspace = true } diff --git a/common/registration/Cargo.toml b/common/registration/Cargo.toml index 22749ccdc9b..19c6f7db1c6 100644 --- a/common/registration/Cargo.toml +++ b/common/registration/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-registration-common" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/common/serde-helpers/Cargo.toml b/common/serde-helpers/Cargo.toml index bc9de1862e3..fcbacb099b7 100644 --- a/common/serde-helpers/Cargo.toml +++ b/common/serde-helpers/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-serde-helpers" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true @@ -22,4 +22,4 @@ time = { workspace = true, features = ["formatting", "parsing"], optional = true hex = ["dep:hex"] bs58 = ["dep:bs58"] base64 = ["dep:base64"] -date = ["time"] \ No newline at end of file +date = ["time"] diff --git a/common/service-provider-requests-common/Cargo.toml b/common/service-provider-requests-common/Cargo.toml index 63aef2eb76d..ea6c106f858 100644 --- a/common/service-provider-requests-common/Cargo.toml +++ b/common/service-provider-requests-common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-service-provider-requests-common" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/common/socks5-client-core/Cargo.toml b/common/socks5-client-core/Cargo.toml index ce8421f3d73..5c351106b2f 100644 --- a/common/socks5-client-core/Cargo.toml +++ b/common/socks5-client-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-socks5-client-core" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true diff --git a/common/socks5/ordered-buffer/Cargo.toml b/common/socks5/ordered-buffer/Cargo.toml index f8d684cd1f7..1fabcfe3a14 100644 --- a/common/socks5/ordered-buffer/Cargo.toml +++ b/common/socks5/ordered-buffer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-ordered-buffer" -version = "0.1.0" +version.workspace = true authors = ["Dave Hrycyszyn "] edition = "2021" license.workspace = true diff --git a/common/socks5/proxy-helpers/Cargo.toml b/common/socks5/proxy-helpers/Cargo.toml index da1d98e254f..071bf82810d 100644 --- a/common/socks5/proxy-helpers/Cargo.toml +++ b/common/socks5/proxy-helpers/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-socks5-proxy-helpers" -version = "0.1.0" +version.workspace = true authors = ["Jedrzej Stuczynski "] edition = "2021" license.workspace = true diff --git a/common/socks5/requests/Cargo.toml b/common/socks5/requests/Cargo.toml index be8ec4f8cae..5b7e95447d0 100644 --- a/common/socks5/requests/Cargo.toml +++ b/common/socks5/requests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-socks5-requests" -version = "0.1.0" +version.workspace = true authors = ["Dave Hrycyszyn "] edition = "2021" license.workspace = true diff --git a/common/statistics/Cargo.toml b/common/statistics/Cargo.toml index b0f122646c8..cd168e1144f 100644 --- a/common/statistics/Cargo.toml +++ b/common/statistics/Cargo.toml @@ -3,7 +3,7 @@ [package] name = "nym-statistics-common" -version = "0.1.0" +version.workspace = true edition.workspace = true license.workspace = true diff --git a/common/store-cipher/Cargo.toml b/common/store-cipher/Cargo.toml index ca0a6286350..909d6a03c24 100644 --- a/common/store-cipher/Cargo.toml +++ b/common/store-cipher/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-store-cipher" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true diff --git a/common/task/Cargo.toml b/common/task/Cargo.toml index d96fcbe0686..51091d209cc 100644 --- a/common/task/Cargo.toml +++ b/common/task/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-task" -version = "0.1.0" +version.workspace = true description = "Task handling" edition.workspace = true authors.workspace = true @@ -39,4 +39,4 @@ tokio = { workspace = true, features = ["rt-multi-thread", "net", "signal", "tes nym-test-utils = { path = "../test-utils" } [lints] -workspace = true \ No newline at end of file +workspace = true diff --git a/common/test-utils/Cargo.toml b/common/test-utils/Cargo.toml index 8c937797022..83a61e07f52 100644 --- a/common/test-utils/Cargo.toml +++ b/common/test-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-test-utils" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/common/ticketbooks-merkle/Cargo.toml b/common/ticketbooks-merkle/Cargo.toml index 3c3f278c6bf..3e07c7d9c3f 100644 --- a/common/ticketbooks-merkle/Cargo.toml +++ b/common/ticketbooks-merkle/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-ticketbooks-merkle" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/common/topology/Cargo.toml b/common/topology/Cargo.toml index 64d60171f4b..c476cf932e5 100644 --- a/common/topology/Cargo.toml +++ b/common/topology/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "nym-topology" -version = "0.1.0" +version.workspace = true edition = { workspace = true } authors = { workspace = true } license = { workspace = true } repository = { workspace = true } homepage = { workspace = true } documentation = { workspace = true } +description = "Nym's topology crate" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -27,21 +28,21 @@ tsify = { workspace = true, features = ["js"], optional = true } wasm-bindgen = { workspace = true, optional = true } ## internal -nym-crypto = { path = "../crypto" } -nym-mixnet-contract-common = { path = "../cosmwasm-smart-contracts/mixnet-contract" } -nym-sphinx-addressing = { path = "../nymsphinx/addressing" } -nym-sphinx-types = { path = "../nymsphinx/types", features = [ +nym-crypto = { workspace = true } +nym-mixnet-contract-common = { workspace = true } +nym-sphinx-addressing = { workspace = true } +nym-sphinx-types = { workspace = true, features = [ "sphinx", "outfox", ] } # I'm not sure how to feel about pulling in this dependency here... -nym-api-requests = { path = "../../nym-api/nym-api-requests" } +nym-api-requests = { workspace = true } # 'wasm-serde-types' feature -wasm-utils = { path = "../wasm/utils", default-features = false, optional = true } +wasm-utils = { workspace = true, optional = true } [features] default = ["provider-trait"] diff --git a/common/tun/Cargo.toml b/common/tun/Cargo.toml index 3915e481e3f..015fcfafc49 100644 --- a/common/tun/Cargo.toml +++ b/common/tun/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-tun" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/common/types/Cargo.toml b/common/types/Cargo.toml index 620ec264d14..cdf6e34e7a4 100644 --- a/common/types/Cargo.toml +++ b/common/types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-types" -version = "1.0.0" +version.workspace = true description = "Nym common types" authors.workspace = true edition = "2021" diff --git a/common/upgrade-mode-check/Cargo.toml b/common/upgrade-mode-check/Cargo.toml index 17f292a5669..fc5152aa182 100644 --- a/common/upgrade-mode-check/Cargo.toml +++ b/common/upgrade-mode-check/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-upgrade-mode-check" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/common/verloc/Cargo.toml b/common/verloc/Cargo.toml index 32b81ed1d66..c82b9d416cd 100644 --- a/common/verloc/Cargo.toml +++ b/common/verloc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-verloc" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/common/wasm/client-core/Cargo.toml b/common/wasm/client-core/Cargo.toml index 85668972f96..d8b27ec2d32 100644 --- a/common/wasm/client-core/Cargo.toml +++ b/common/wasm/client-core/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "wasm-client-core" authors = ["Jedrzej Stuczynski "] -version = "0.1.0" +version.workspace = true edition = "2021" license = "Apache-2.0" repository = "https://github.com/nymtech/nym" diff --git a/common/wasm/storage/Cargo.toml b/common/wasm/storage/Cargo.toml index 71364c0c57c..5766af11909 100644 --- a/common/wasm/storage/Cargo.toml +++ b/common/wasm/storage/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasm-storage" -version = "0.1.0" +version.workspace = true authors = ["Jedrzej Stuczynski "] edition = "2021" license.workspace = true diff --git a/common/wasm/utils/Cargo.toml b/common/wasm/utils/Cargo.toml index 7305908344e..0785c0d8b11 100644 --- a/common/wasm/utils/Cargo.toml +++ b/common/wasm/utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasm-utils" -version = "0.1.0" +version.workspace = true authors = ["Jedrzej Stuczynski "] edition = "2021" license.workspace = true diff --git a/common/wireguard-private-metadata/client/Cargo.toml b/common/wireguard-private-metadata/client/Cargo.toml index d7d23ce4450..5378a5aea54 100644 --- a/common/wireguard-private-metadata/client/Cargo.toml +++ b/common/wireguard-private-metadata/client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-wireguard-private-metadata-client" -version = "1.0.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/common/wireguard-private-metadata/server/Cargo.toml b/common/wireguard-private-metadata/server/Cargo.toml index fa850181f13..c222d153506 100644 --- a/common/wireguard-private-metadata/server/Cargo.toml +++ b/common/wireguard-private-metadata/server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-wireguard-private-metadata-server" -version = "1.0.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/common/wireguard-private-metadata/shared/Cargo.toml b/common/wireguard-private-metadata/shared/Cargo.toml index 26b3cc6cd6d..65daaf4afc9 100644 --- a/common/wireguard-private-metadata/shared/Cargo.toml +++ b/common/wireguard-private-metadata/shared/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-wireguard-private-metadata-shared" -version = "1.0.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/common/wireguard-private-metadata/tests/Cargo.toml b/common/wireguard-private-metadata/tests/Cargo.toml index 074d088f154..a667663e963 100644 --- a/common/wireguard-private-metadata/tests/Cargo.toml +++ b/common/wireguard-private-metadata/tests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-wireguard-private-metadata-tests" -version = "1.0.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true @@ -41,4 +41,3 @@ nym-wireguard-private-metadata-shared = { path = "../shared", features = [ "testing", ] } nym-wireguard-private-metadata-server = { path = "../server" } - diff --git a/common/wireguard-types/Cargo.toml b/common/wireguard-types/Cargo.toml index 9a8a783db01..dd8ded177d9 100644 --- a/common/wireguard-types/Cargo.toml +++ b/common/wireguard-types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-wireguard-types" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/common/wireguard/Cargo.toml b/common/wireguard/Cargo.toml index f2a773d4ec3..1423e03eb83 100644 --- a/common/wireguard/Cargo.toml +++ b/common/wireguard/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-wireguard" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/common/zulip-client/Cargo.toml b/common/zulip-client/Cargo.toml index acfc84a5401..263f3e5c621 100644 --- a/common/zulip-client/Cargo.toml +++ b/common/zulip-client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zulip-client" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/contracts/ecash/Cargo.toml b/contracts/ecash/Cargo.toml index a80b0fb2412..5dff6aa6ebc 100644 --- a/contracts/ecash/Cargo.toml +++ b/contracts/ecash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-ecash" -version = "0.1.0" +version.workspace = true edition = { workspace = true } authors = { workspace = true } license = { workspace = true } diff --git a/gateway/Cargo.toml b/gateway/Cargo.toml index cf1b8f286b3..4e6b7bec7d3 100644 --- a/gateway/Cargo.toml +++ b/gateway/Cargo.toml @@ -84,4 +84,4 @@ mock_instant = "0.6.0" time = { workspace = true } [lints] -workspace = true \ No newline at end of file +workspace = true diff --git a/nym-api/Cargo.toml b/nym-api/Cargo.toml index 362c78f7314..71455a17893 100644 --- a/nym-api/Cargo.toml +++ b/nym-api/Cargo.toml @@ -4,7 +4,7 @@ [package] name = "nym-api" license = "GPL-3.0" -version = "1.1.70" +version.workspace = true authors.workspace = true edition = "2021" rust-version.workspace = true diff --git a/nym-api/nym-api-requests/Cargo.toml b/nym-api/nym-api-requests/Cargo.toml index 267cb731f7e..a83de6ee9c4 100644 --- a/nym-api/nym-api-requests/Cargo.toml +++ b/nym-api/nym-api-requests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-api-requests" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true diff --git a/nym-credential-proxy/nym-credential-proxy-requests/Cargo.toml b/nym-credential-proxy/nym-credential-proxy-requests/Cargo.toml index 76f91373b89..328dea0d13c 100644 --- a/nym-credential-proxy/nym-credential-proxy-requests/Cargo.toml +++ b/nym-credential-proxy/nym-credential-proxy-requests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-credential-proxy-requests" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true @@ -43,4 +43,4 @@ openapi = ["utoipa", "nym-http-api-common/utoipa", "nym-upgrade-mode-check/opena tsify = ["dep:tsify", "wasm-bindgen"] [lints] -workspace = true \ No newline at end of file +workspace = true diff --git a/nym-credential-proxy/vpn-api-lib-wasm/Cargo.toml b/nym-credential-proxy/vpn-api-lib-wasm/Cargo.toml index 8dc406eaf56..fd9cd12ea9f 100644 --- a/nym-credential-proxy/vpn-api-lib-wasm/Cargo.toml +++ b/nym-credential-proxy/vpn-api-lib-wasm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-vpn-api-lib-wasm" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true @@ -35,4 +35,3 @@ nym-credentials-interface = { path = "../../common/credentials-interface" } nym-ecash-time = { path = "../../common/ecash-time", features = ["expiration"] } nym-credential-proxy-requests = { path = "../nym-credential-proxy-requests", default-features = false, features = ["tsify"] } wasm-utils = { path = "../../common/wasm/utils" } - diff --git a/nym-node/nym-node-metrics/Cargo.toml b/nym-node/nym-node-metrics/Cargo.toml index 77970401149..49d5e8360a2 100644 --- a/nym-node/nym-node-metrics/Cargo.toml +++ b/nym-node/nym-node-metrics/Cargo.toml @@ -17,4 +17,4 @@ strum = { workspace = true } tracing = { workspace = true } nym-metrics = { path = "../../common/nym-metrics" } -nym-statistics-common = { path = "../../common/statistics" } \ No newline at end of file +nym-statistics-common = { path = "../../common/statistics" } diff --git a/nym-node/nym-node-requests/Cargo.toml b/nym-node/nym-node-requests/Cargo.toml index ad1ed3013a9..02031818f51 100644 --- a/nym-node/nym-node-requests/Cargo.toml +++ b/nym-node/nym-node-requests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-node-requests" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/nym-outfox/Cargo.toml b/nym-outfox/Cargo.toml index 0c3c3e87635..8d7855bc48f 100644 --- a/nym-outfox/Cargo.toml +++ b/nym-outfox/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-outfox" -version = "0.1.0" +version.workspace = true description = "Outfox package format" edition = { workspace = true } authors = { workspace = true } diff --git a/sqlx-pool-guard/Cargo.toml b/nym-sqlx-pool-guard/Cargo.toml similarity index 93% rename from sqlx-pool-guard/Cargo.toml rename to nym-sqlx-pool-guard/Cargo.toml index cef202e4dfa..0efa2e66132 100644 --- a/sqlx-pool-guard/Cargo.toml +++ b/nym-sqlx-pool-guard/Cargo.toml @@ -1,6 +1,6 @@ [package] -name = "sqlx-pool-guard" -version = "0.1.0" +name = "nym-sqlx-pool-guard" +version.workspace = true edition = "2024" license.workspace = true diff --git a/sqlx-pool-guard/src/apple.rs b/nym-sqlx-pool-guard/src/apple.rs similarity index 100% rename from sqlx-pool-guard/src/apple.rs rename to nym-sqlx-pool-guard/src/apple.rs diff --git a/sqlx-pool-guard/src/lib.rs b/nym-sqlx-pool-guard/src/lib.rs similarity index 100% rename from sqlx-pool-guard/src/lib.rs rename to nym-sqlx-pool-guard/src/lib.rs diff --git a/sqlx-pool-guard/src/linux.rs b/nym-sqlx-pool-guard/src/linux.rs similarity index 100% rename from sqlx-pool-guard/src/linux.rs rename to nym-sqlx-pool-guard/src/linux.rs diff --git a/sqlx-pool-guard/src/windows.rs b/nym-sqlx-pool-guard/src/windows.rs similarity index 100% rename from sqlx-pool-guard/src/windows.rs rename to nym-sqlx-pool-guard/src/windows.rs diff --git a/publish-nym-sphinx-test.sh b/publish-nym-sphinx-test.sh new file mode 100755 index 00000000000..88e29c4928b --- /dev/null +++ b/publish-nym-sphinx-test.sh @@ -0,0 +1,66 @@ +#!/bin/bash +set -e + +# nym-sphinx and its sub-crates +# batches for rate limit of 5 new crates per burst +BATCH1=( + "nym-sphinx-acknowledgements" + "nym-sphinx-addressing" + "nym-api-requests" + "nym-topology" + "nym-sphinx-anonymous-replies" +) + +BATCH2=( + "nym-sphinx-chunking" + "nym-sphinx-cover" + "nym-sphinx-forwarding" + "nym-sphinx-framing" + "nym-sphinx-params" +) + +BATCH3=( + "nym-sphinx-routing" + "nym-sphinx-types" + "nym-sphinx" +) + +publish_batch() { + local -n batch_ref=$1 + shift + + PACKAGE_FLAGS="" + for pkg in "${batch_ref[@]}"; do + PACKAGE_FLAGS="$PACKAGE_FLAGS -p $pkg" + done + + cargo release \ + $PACKAGE_FLAGS \ + --prev-tag-name "" \ + --no-push \ + --no-tag \ + --allow-branch '*' \ + -v \ + "$@" +} + +echo "Publishing batch 1 " +publish_batch BATCH1 "$@" + +if [[ "$*" == *"--execute"* ]]; then + echo "Waiting 600 seconds (10 minutes) before next batch..." + sleep 600 +fi + +echo "Publishing batch 2 " +publish_batch BATCH2 "$@" + +if [[ "$*" == *"--execute"* ]]; then + echo "Waiting 600 seconds (10 minutes) before final batch..." + sleep 600 +fi + +echo "Publishing batch 3 (1 crate)..." +publish_batch BATCH3 "$@" + +echo "All packages published successfully!" diff --git a/publish-sdk.sh b/publish-sdk.sh new file mode 100755 index 00000000000..3b66c0295e7 --- /dev/null +++ b/publish-sdk.sh @@ -0,0 +1,85 @@ +#!/bin/bash +set -e + +# SDK and its dependencies +PACKAGES=( + "nym-bandwidth-controller" + "nym-bin-common" + "nym-client-core" + "nym-client-core-config-types" + "nym-client-core-gateways-storage" + "nym-client-core-surb-storage" + "nym-compact-ecash" + "nym-config" + "nym-contracts-common" + "nym-coconut-dkg-common" + "nym-credential-storage" + "nym-credential-utils" + "nym-credentials" + "nym-credentials-interface" + "nym-crypto" + "nym-ecash-contract-common" + "nym-ecash-signer-check-types" + "nym-ecash-time" + "nym-exit-policy" + "nym-gateway-client" + "nym-gateway-requests" + "nym-group-contract-common" + "nym-http-api-client" + "nym-http-api-client-macro" + "nym-http-api-common" + "nym-id" + "nym-metrics" + "nym-mixnet-client" + "nym-mixnet-contract-common" + "nym-multisig-contract-common" + "nym-network-defaults" + "nym-noise" + "nym-noise-keys" + "nym-nonexhaustive-delayqueue" + "nym-node-requests" + "nym-ordered-buffer" + "nym-outfox" + "nym-pemstore" + "nym-performance-contract-common" + "nym-serde-helpers" + "nym-service-providers-common" + "nym-socks5-client-core" + "nym-socks5-proxy-helpers" + "nym-socks5-requests" + "nym-sphinx" + "nym-sphinx-acknowledgements" + "nym-sphinx-addressing" + "nym-sphinx-anonymous-replies" + "nym-sphinx-chunking" + "nym-sphinx-cover" + "nym-sphinx-forwarding" + "nym-sphinx-framing" + "nym-sphinx-params" + "nym-sphinx-routing" + "nym-sphinx-types" + "nym-statistics-common" + "nym-task" + "nym-ticketbooks-merkle" + "nym-topology" + "nym-upgrade-mode-check" + "nym-validator-client" + "nym-vesting-contract-common" + "nym-wireguard-types" + "nym-sqlx-pool-guard" + "nym-sdk" +) + +PACKAGE_FLAGS="" +for pkg in "${PACKAGES[@]}"; do + PACKAGE_FLAGS="$PACKAGE_FLAGS -p $pkg" +done + +cargo release \ + $PACKAGE_FLAGS \ + --prev-tag-name "" \ + --no-push \ + --no-tag \ + --allow-branch '*' \ # Max: at the moment we're accepting publication from whatever branch - maybe we want to restrain this to master in the future? + -v \ + "$@" diff --git a/sdk/ffi/cpp/Cargo.toml b/sdk/ffi/cpp/Cargo.toml index 8ac5f608db2..56433e42bbd 100644 --- a/sdk/ffi/cpp/Cargo.toml +++ b/sdk/ffi/cpp/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-cpp-ffi" -version = "0.1.2" +version.workspace = true edition = "2021" license.workspace = true diff --git a/sdk/ffi/go/Cargo.toml b/sdk/ffi/go/Cargo.toml index 3366f424a5c..24fcc275c29 100644 --- a/sdk/ffi/go/Cargo.toml +++ b/sdk/ffi/go/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-go-ffi" -version = "0.2.2" +version.workspace = true edition = "2021" license.workspace = true diff --git a/sdk/ffi/shared/Cargo.toml b/sdk/ffi/shared/Cargo.toml index e409035681b..2b4104b60e3 100644 --- a/sdk/ffi/shared/Cargo.toml +++ b/sdk/ffi/shared/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-ffi-shared" -version = "0.2.1" +version.workspace = true edition = "2021" license.workspace = true diff --git a/sdk/rust/nym-sdk/Cargo.toml b/sdk/rust/nym-sdk/Cargo.toml index 523e5801c52..70e1441e8aa 100644 --- a/sdk/rust/nym-sdk/Cargo.toml +++ b/sdk/rust/nym-sdk/Cargo.toml @@ -1,8 +1,11 @@ [package] name = "nym-sdk" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true +description = "Nym's Rust SDK" +repository = "https://github.com/nymtech/nym/sdk/rust/nym-sdk/" +# documentation = "https://docs.rs/nym-sdk" Max: once we upload to crates.io and this is generated, this can be uncommented. # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -17,33 +20,33 @@ path = "src/tcp_proxy/bin/proxy_client.rs" [dependencies] async-trait = { workspace = true } bip39 = { workspace = true } -nym-client-core = { path = "../../../common/client-core", features = [ +nym-client-core = { workspace = true, features = [ "fs-credentials-storage", "fs-surb-storage", "fs-gateways-storage", ] } -nym-crypto = { path = "../../../common/crypto" } -nym-gateway-requests = { path = "../../../common/gateway-requests" } -nym-bandwidth-controller = { path = "../../../common/bandwidth-controller" } -nym-credentials = { path = "../../../common/credentials" } -nym-credentials-interface = { path = "../../../common/credentials-interface" } -nym-credential-storage = { path = "../../../common/credential-storage" } -nym-credential-utils = { path = "../../../common/credential-utils" } -nym-network-defaults = { path = "../../../common/network-defaults" } -nym-sphinx = { path = "../../../common/nymsphinx" } -nym-statistics-common = { path = "../../../common/statistics" } -nym-task = { path = "../../../common/task" } -nym-topology = { path = "../../../common/topology" } -nym-socks5-client-core = { path = "../../../common/socks5-client-core" } -nym-validator-client = { path = "../../../common/client-libs/validator-client", features = [ +nym-crypto = { workspace = true } +nym-gateway-requests = { workspace = true } +nym-bandwidth-controller = { workspace = true } +nym-credentials = { workspace = true } +nym-credentials-interface = { workspace = true } +nym-credential-storage = { workspace = true } +nym-credential-utils = { workspace = true } +nym-network-defaults = { workspace = true } +nym-sphinx = { workspace = true } +nym-statistics-common = { workspace = true } +nym-task = { workspace = true } +nym-topology = { workspace = true } +nym-socks5-client-core = { workspace = true } +nym-validator-client = { workspace = true , features = [ "http-client", ] } -nym-http-api-client = { path = "../../../common/http-api-client" } -nym-socks5-requests = { path = "../../../common/socks5/requests" } -nym-ordered-buffer = { path = "../../../common/socks5/ordered-buffer" } -nym-service-providers-common = { path = "../../../service-providers/common" } -nym-sphinx-addressing = { path = "../../../common/nymsphinx/addressing" } -nym-bin-common = { path = "../../../common/bin-common", features = [ +nym-http-api-client = { workspace = true } +nym-socks5-requests = { workspace = true } +nym-ordered-buffer = { workspace = true } +nym-service-providers-common = { workspace = true } +nym-sphinx-addressing = { workspace = true } +nym-bin-common = { workspace = true, features = [ "basic_tracing", ] } bytecodec = { workspace = true } @@ -82,7 +85,7 @@ reqwest = { workspace = true, features = ["json", "socks"] } thiserror = { workspace = true } tokio = { workspace = true, features = ["full"] } time = { workspace = true } -nym-bin-common = { path = "../../../common/bin-common", features = ["basic_tracing"] } +nym-bin-common = {workspace = true, features = ["basic_tracing"] } # extra dependencies for libp2p examples #libp2p = { git = "https://github.com/ChainSafe/rust-libp2p.git", rev = "e3440d25681df380c9f0f8cfdcfd5ecc0a4f2fb6", features = [ "identify", "macros", "ping", "tokio", "tcp", "dns", "websocket", "noise", "mplex", "yamux", "gossipsub" ]} diff --git a/sdk/rust/nym-sdk/publishing.md b/sdk/rust/nym-sdk/publishing.md new file mode 100644 index 00000000000..1be538d2398 --- /dev/null +++ b/sdk/rust/nym-sdk/publishing.md @@ -0,0 +1,25 @@ +# Publishing the SDK +## Rationale +The Rust SDK has a relatively long (60+) workspace dependencies that have to be published alongside it. In order to make this easy to maintain, the versions of these workspace dependencies and the `nym-sdk` crate (as well as the version of basically all the crates in the monorepo workspace, excluding binaries, contracts, and tools / monitoring clients) are kept in sync. + +This version is defined in the `[workspace.package]` section of the root monorepo `Cargo.toml` file. Each of the workspace dependencies have their paths and versions (this has to be individually defined at the moment per-dependency, **this version needs to stay the same as the `workspace.package` version**) defined in the `[workspace.dependencies]` section of the root monorepo `Cargo.toml` file. + +We have attempted to automate this as much as possible, but due to limitations in tools like `cargo-smart-release` and publishing a subset of a workspace, this is the initial version of publication logic. + +## When Developing +**If you add a workspace dependency to the SDK when developing, make sure to add this to the workspace dependencies in the root monorepo `Cargo.toml` file AND the `publish-sdk.sh` script.** + +## Publishing +To publish the `nym-sdk` crate: +- bump the `[workspace.package]` version +- bump the versions of the workspace dependencies in the `[workspace.dependencies]` section to the same version +- run `./publish-sdk.sh`: +``` +# Dry run with new version, e.g. +./publish-sdk.sh 1.20.0 + +# If there are no errors, run with execute flag - this will attempt to publish the nym-sdk crate and its dependencies to crates.io +./publish-sdk.sh --execute 1.20.0 +``` + +**Note** that the script will update the dependency versions in the root `Cargo.toml` file, but double check anyway. diff --git a/sdk/rust/nym-sdk/src/client_pool.rs b/sdk/rust/nym-sdk/src/client_pool.rs index 0a2471275b3..ae3d1a200d5 100644 --- a/sdk/rust/nym-sdk/src/client_pool.rs +++ b/sdk/rust/nym-sdk/src/client_pool.rs @@ -1,3 +1,6 @@ +//! A variable-size pool of ephemeral Nym Clients to quickly grab and use. +//! +//! //! use crate::mixnet::{MixnetClient, MixnetClientBuilder, NymNetworkDetails}; //! use anyhow::Result; //! use std::fmt; diff --git a/service-providers/common/Cargo.toml b/service-providers/common/Cargo.toml index f8fb5b201bc..fb70c002b9b 100644 --- a/service-providers/common/Cargo.toml +++ b/service-providers/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-service-providers-common" -version = "0.1.0" +version.workspace = true edition = "2021" license.workspace = true @@ -23,4 +23,3 @@ tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } nym-sdk = { path = "../../sdk/rust/nym-sdk" } nym-socks5-requests = { path = "../../common/socks5/requests" } - diff --git a/service-providers/ip-packet-router/Cargo.toml b/service-providers/ip-packet-router/Cargo.toml index c69d1caa200..09b1c18482f 100644 --- a/service-providers/ip-packet-router/Cargo.toml +++ b/service-providers/ip-packet-router/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nym-ip-packet-router" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true diff --git a/tools/internal/contract-state-importer/importer-cli/Cargo.toml b/tools/internal/contract-state-importer/importer-cli/Cargo.toml index db708db2e8b..8a7992c7e83 100644 --- a/tools/internal/contract-state-importer/importer-cli/Cargo.toml +++ b/tools/internal/contract-state-importer/importer-cli/Cargo.toml @@ -26,4 +26,4 @@ nym-bin-common = { path = "../../../../common/bin-common", features = ["basic_tr nym-network-defaults = { path = "../../../../common/network-defaults" } nym-mixnet-contract-common = { path = "../../../../common/cosmwasm-smart-contracts/mixnet-contract" } -nym-vesting-contract-common = { path = "../../../../common/cosmwasm-smart-contracts/vesting-contract" } \ No newline at end of file +nym-vesting-contract-common = { path = "../../../../common/cosmwasm-smart-contracts/vesting-contract" } diff --git a/tools/internal/contract-state-importer/importer-contract/Cargo.toml b/tools/internal/contract-state-importer/importer-contract/Cargo.toml index 2c09e7071e5..a894915cb3c 100644 --- a/tools/internal/contract-state-importer/importer-contract/Cargo.toml +++ b/tools/internal/contract-state-importer/importer-contract/Cargo.toml @@ -21,4 +21,4 @@ cosmwasm-schema = { workspace = true } [features] default = ["library"] -library = [] \ No newline at end of file +library = [] diff --git a/tools/internal/testnet-manager/dkg-bypass-contract/Cargo.toml b/tools/internal/testnet-manager/dkg-bypass-contract/Cargo.toml index fa45302f005..716456923ed 100644 --- a/tools/internal/testnet-manager/dkg-bypass-contract/Cargo.toml +++ b/tools/internal/testnet-manager/dkg-bypass-contract/Cargo.toml @@ -22,4 +22,4 @@ nym-contracts-common = { path = "../../../../common/cosmwasm-smart-contracts/con [features] default = ["library"] -library = [] \ No newline at end of file +library = [] diff --git a/wasm/zknym-lib/Cargo.toml b/wasm/zknym-lib/Cargo.toml index 572e26c6bd0..dcd9c4220d2 100644 --- a/wasm/zknym-lib/Cargo.toml +++ b/wasm/zknym-lib/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zknym-lib" -version = "0.1.0" +version.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true @@ -43,4 +43,4 @@ tokio = { workspace = true, features = ["full"] } [package.metadata.wasm-pack.profile.release] -wasm-opt = false \ No newline at end of file +wasm-opt = false