From cf307669aa02aedf42f53525db3a710c6c67a9ea Mon Sep 17 00:00:00 2001 From: parazyd Date: Mon, 10 Jul 2023 15:19:41 +0200 Subject: [PATCH] chore: Update crate dependencies. --- Cargo.lock | 139 ++++++++++----------------- Cargo.toml | 4 +- bin/darkfid/Cargo.toml | 2 +- bin/darkfid2/Cargo.toml | 2 +- bin/darkirc/Cargo.toml | 2 +- bin/darkwiki/darkwiki-cli/Cargo.toml | 2 +- bin/darkwiki/darkwikid/Cargo.toml | 4 +- bin/dnetview/Cargo.toml | 2 +- bin/faucetd/Cargo.toml | 2 +- bin/fud/fud/Cargo.toml | 2 +- bin/genev/genev-cli/Cargo.toml | 2 +- bin/genev/genevd/Cargo.toml | 2 +- bin/lilith/Cargo.toml | 2 +- bin/tau/tau-cli/Cargo.toml | 2 +- bin/tau/taud/Cargo.toml | 2 +- example/dchat/Cargo.toml | 2 +- script/research/dhtd/Cargo.toml | 4 +- 17 files changed, 69 insertions(+), 108 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 88aabe75f..5228f8f46 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -292,7 +292,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.22", + "time 0.3.23", ] [[package]] @@ -341,9 +341,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0122885821398cc923ece939e24d1056a2384ee719432397fa9db87230ff11" +checksum = "62b74f44609f0f91493e3082d3734d98497e094777144380ea4db9f9905dd5b6" dependencies = [ "flate2", "futures-core", @@ -504,7 +504,7 @@ checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -992,7 +992,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -1496,32 +1496,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "curve25519-dalek" -version = "4.0.0-rc.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436ace70fc06e06f7f689d2624dc4e2f0ea666efb5aa704215f7249ae6e047a7" -dependencies = [ - "cfg-if", - "cpufeatures", - "curve25519-dalek-derive", - "fiat-crypto", - "platforms", - "rustc_version 0.4.0", - "subtle", -] - -[[package]] -name = "curve25519-dalek-derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.23", -] - [[package]] name = "darkfi" version = "0.4.1" @@ -1535,7 +1509,6 @@ dependencies = [ "chrono", "clap 4.3.11", "crypto_api_chachapoly", - "curve25519-dalek 4.0.0-rc.3", "darkfi-derive", "darkfi-derive-internal", "darkfi-sdk", @@ -1655,7 +1628,7 @@ dependencies = [ "darkfi-derive-internal", "proc-macro-crate", "proc-macro2", - "syn 1.0.109", + "syn 2.0.25", ] [[package]] @@ -1664,7 +1637,7 @@ version = "0.4.1" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.25", ] [[package]] @@ -1882,7 +1855,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -1915,7 +1888,7 @@ checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" dependencies = [ "darling_core 0.20.1", "quote", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -2248,7 +2221,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -2379,7 +2352,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ - "curve25519-dalek 3.2.0", + "curve25519-dalek", "ed25519", "merlin", "rand 0.7.3", @@ -2461,7 +2434,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -2482,7 +2455,7 @@ dependencies = [ "darling 0.20.1", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -2606,12 +2579,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "fiat-crypto" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" - [[package]] name = "flate2" version = "1.0.26" @@ -2860,7 +2827,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -3909,7 +3876,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -4210,7 +4177,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -4239,7 +4206,7 @@ checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -4303,12 +4270,6 @@ version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" -[[package]] -name = "platforms" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" - [[package]] name = "plotters" version = "0.3.5" @@ -4466,9 +4427,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" dependencies = [ "unicode-ident", ] @@ -4721,7 +4682,7 @@ checksum = "4954fbc00dcd4d8282c987710e50ba513d351400dbdd00e803a05172a90d8976" dependencies = [ "pem", "ring", - "time 0.3.22", + "time 0.3.23", "yasna", ] @@ -4971,7 +4932,7 @@ dependencies = [ "hashlink", "libsqlite3-sys", "smallvec", - "time 0.3.22", + "time 0.3.23", ] [[package]] @@ -5200,9 +5161,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.167" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daf513456463b42aa1d94cff7e0c24d682b429f020b9afa4f5ba5c40a22b237" +checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" dependencies = [ "serde_derive", ] @@ -5220,13 +5181,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.167" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69b106b68bc8054f0e974e70d19984040f8a5cf9215ca82626ea4853f82c4b9" +checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -5271,7 +5232,7 @@ dependencies = [ "serde", "serde_json", "serde_with_macros", - "time 0.3.22", + "time 0.3.23", ] [[package]] @@ -5283,7 +5244,7 @@ dependencies = [ "darling 0.20.1", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -5427,7 +5388,7 @@ dependencies = [ "num-bigint", "num-traits", "thiserror", - "time 0.3.22", + "time 0.3.23", ] [[package]] @@ -5438,7 +5399,7 @@ checksum = "acee08041c5de3d5048c8b3f6f13fafb3026b24ba43c6a695a0c76179b844369" dependencies = [ "log", "termcolor", - "time 0.3.22", + "time 0.3.23", ] [[package]] @@ -5727,7 +5688,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -5749,9 +5710,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.23" +version = "2.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" +checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" dependencies = [ "proc-macro2", "quote", @@ -5924,7 +5885,7 @@ checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -5950,9 +5911,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.22" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" +checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" dependencies = [ "itoa", "libc", @@ -5970,9 +5931,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" dependencies = [ "time-core", ] @@ -6301,7 +6262,7 @@ dependencies = [ "signature 1.6.4", "strum", "thiserror", - "time 0.3.22", + "time 0.3.23", "tor-basic-utils", "tor-checkable", "tor-circmgr", @@ -6483,7 +6444,7 @@ dependencies = [ "aes", "base64ct", "ctr", - "curve25519-dalek 3.2.0", + "curve25519-dalek", "derive_more", "digest 0.10.7", "ed25519-dalek", @@ -6525,7 +6486,7 @@ dependencies = [ "static_assertions", "strum", "thiserror", - "time 0.3.22", + "time 0.3.23", "tor-basic-utils", "tor-checkable", "tor-config", @@ -6565,7 +6526,7 @@ dependencies = [ "smallvec", "subtle", "thiserror", - "time 0.3.22", + "time 0.3.23", "tinystr", "tor-basic-utils", "tor-bytes", @@ -6730,7 +6691,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -7075,7 +7036,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", "wasm-bindgen-shared", ] @@ -7132,7 +7093,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -7608,7 +7569,7 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a0c105152107e3b96f6a00a65e86ce82d9b125230e1c4302940eca58ff71f4f" dependencies = [ - "curve25519-dalek 3.2.0", + "curve25519-dalek", "rand_core 0.5.1", "zeroize", ] @@ -7619,7 +7580,7 @@ version = "2.0.0-pre.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5da623d8af10a62342bcbbb230e33e58a63255a58012f8653c578e54bab48df" dependencies = [ - "curve25519-dalek 3.2.0", + "curve25519-dalek", "rand_core 0.6.4", "zeroize", ] @@ -7639,7 +7600,7 @@ dependencies = [ "ring", "rusticata-macros", "thiserror", - "time 0.3.22", + "time 0.3.23", ] [[package]] @@ -7671,7 +7632,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ - "time 0.3.22", + "time 0.3.23", ] [[package]] @@ -7703,7 +7664,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index e007382f2..c812eff97 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -84,7 +84,7 @@ x509-parser = {version = "0.15.0", features = ["validate", "verify"], optional = # Encoding bs58 = {version = "0.5.0", optional = true} serde_json = {version = "1.0.100", optional = true} -serde = {version = "1.0.167", features = ["derive"], optional = true} +serde = {version = "1.0.171", features = ["derive"], optional = true} semver = {version = "1.0.17", optional = true} structopt = {version= "0.3.26", optional = true} structopt-toml = {version= "0.5.1", optional = true} @@ -129,7 +129,7 @@ sled = {version = "0.34.7", optional = true} sled-overlay = {version = "0.0.7", optional = true} # Temporary version lock -curve25519-dalek = {version = "=4.0.0-rc.3", default-features = false, optional = true} +#curve25519-dalek = {version = "=4.0.0-rc.3", default-features = false, optional = true} [dev-dependencies] clap = {version = "4.3.11", features = ["derive"]} diff --git a/bin/darkfid/Cargo.toml b/bin/darkfid/Cargo.toml index 406e7dd60..d6a79ce26 100644 --- a/bin/darkfid/Cargo.toml +++ b/bin/darkfid/Cargo.toml @@ -29,6 +29,6 @@ simplelog = "0.12.1" smol = "1.3.0" # Argument parsing -serde = {version = "1.0.167", features = ["derive"]} +serde = {version = "1.0.171", features = ["derive"]} structopt = "0.3.26" structopt-toml = "0.5.1" diff --git a/bin/darkfid2/Cargo.toml b/bin/darkfid2/Cargo.toml index 9bf2c398c..ffee6841a 100644 --- a/bin/darkfid2/Cargo.toml +++ b/bin/darkfid2/Cargo.toml @@ -24,6 +24,6 @@ simplelog = "0.12.1" smol = "1.3.0" # Argument parsing -serde = {version = "1.0.167", features = ["derive"]} +serde = {version = "1.0.171", features = ["derive"]} structopt = "0.3.26" structopt-toml = "0.5.1" diff --git a/bin/darkirc/Cargo.toml b/bin/darkirc/Cargo.toml index 9d853afda..0116bb4ee 100644 --- a/bin/darkirc/Cargo.toml +++ b/bin/darkirc/Cargo.toml @@ -46,6 +46,6 @@ simplelog = "0.12.1" smol = "1.3.0" # Argument parsing -serde = {version = "1.0.167", features = ["derive"]} +serde = {version = "1.0.171", features = ["derive"]} structopt = "0.3.26" structopt-toml = "0.5.1" diff --git a/bin/darkwiki/darkwiki-cli/Cargo.toml b/bin/darkwiki/darkwiki-cli/Cargo.toml index a17a38b7f..575399108 100644 --- a/bin/darkwiki/darkwiki-cli/Cargo.toml +++ b/bin/darkwiki/darkwiki-cli/Cargo.toml @@ -25,6 +25,6 @@ rand = "0.8.5" url = "2.4.0" # Encoding and parsing -serde = {version = "1.0.167", features = ["derive"]} +serde = {version = "1.0.171", features = ["derive"]} serde_json = "1.0.100" structopt = "0.3.26" diff --git a/bin/darkwiki/darkwikid/Cargo.toml b/bin/darkwiki/darkwikid/Cargo.toml index 507256812..aac6ec77f 100644 --- a/bin/darkwiki/darkwikid/Cargo.toml +++ b/bin/darkwiki/darkwikid/Cargo.toml @@ -20,8 +20,8 @@ easy-parallel = "3.3.0" futures = "0.3.28" lazy_static = "1.4.0" log = "0.4.19" -serde = "1.0.167" -serde_derive = "1.0.167" +serde = "1.0.171" +serde_derive = "1.0.171" serde_json = "1.0.100" signal-hook-async-std = "0.2.2" signal-hook = "0.3.15" diff --git a/bin/dnetview/Cargo.toml b/bin/dnetview/Cargo.toml index 5923c950f..bc4668fb5 100644 --- a/bin/dnetview/Cargo.toml +++ b/bin/dnetview/Cargo.toml @@ -34,5 +34,5 @@ thiserror = "1.0.43" # Encoding and parsing serde_json = "1.0.100" -serde = {version = "1.0.167", features = ["derive"]} +serde = {version = "1.0.171", features = ["derive"]} hex = "0.4.3" diff --git a/bin/faucetd/Cargo.toml b/bin/faucetd/Cargo.toml index 45492dbd0..90ea0a1e6 100644 --- a/bin/faucetd/Cargo.toml +++ b/bin/faucetd/Cargo.toml @@ -32,6 +32,6 @@ simplelog = "0.12.1" smol = "1.3.0" # Argument parsing -serde = {version = "1.0.167", features = ["derive"]} +serde = {version = "1.0.171", features = ["derive"]} structopt = "0.3.26" structopt-toml = "0.5.1" diff --git a/bin/fud/fud/Cargo.toml b/bin/fud/fud/Cargo.toml index 8e4b607d3..661dbcf54 100644 --- a/bin/fud/fud/Cargo.toml +++ b/bin/fud/fud/Cargo.toml @@ -29,6 +29,6 @@ simplelog = "0.12.1" smol = "1.3.0" # Argument parsing -serde = {version = "1.0.167", features = ["derive"]} +serde = {version = "1.0.171", features = ["derive"]} structopt = "0.3.26" structopt-toml = "0.5.1" diff --git a/bin/genev/genev-cli/Cargo.toml b/bin/genev/genev-cli/Cargo.toml index a832867da..57063a5c0 100644 --- a/bin/genev/genev-cli/Cargo.toml +++ b/bin/genev/genev-cli/Cargo.toml @@ -17,7 +17,7 @@ clap = {version = "4.3.11", features = ["derive"]} libsqlite3-sys = {version = "0.26.0", features = ["bundled-sqlcipher-vendored-openssl"]} log = "0.4.19" simplelog = "0.12.1" -serde = {version = "1.0.167", features = ["derive"]} +serde = {version = "1.0.171", features = ["derive"]} serde_json = "1.0.100" url = "2.4.0" diff --git a/bin/genev/genevd/Cargo.toml b/bin/genev/genevd/Cargo.toml index cd2dd251c..4fbb5bad5 100644 --- a/bin/genev/genevd/Cargo.toml +++ b/bin/genev/genevd/Cargo.toml @@ -28,6 +28,6 @@ simplelog = "0.12.1" smol = "1.3.0" # Argument parsing -serde = {version = "1.0.167", features = ["derive"]} +serde = {version = "1.0.171", features = ["derive"]} structopt = "0.3.26" structopt-toml = "0.5.1" diff --git a/bin/lilith/Cargo.toml b/bin/lilith/Cargo.toml index 2adeefc23..d65f5d1da 100644 --- a/bin/lilith/Cargo.toml +++ b/bin/lilith/Cargo.toml @@ -30,6 +30,6 @@ simplelog = "0.12.1" smol = "1.3.0" # Argument parsing -serde = {version = "1.0.167", features = ["derive"]} +serde = {version = "1.0.171", features = ["derive"]} structopt = "0.3.26" structopt-toml = "0.5.1" diff --git a/bin/tau/tau-cli/Cargo.toml b/bin/tau/tau-cli/Cargo.toml index d55e3e8ca..f01e4bbb1 100644 --- a/bin/tau/tau-cli/Cargo.toml +++ b/bin/tau/tau-cli/Cargo.toml @@ -27,5 +27,5 @@ url = "2.4.0" # Encoding and parsing clap = {version = "4.3.11", features = ["derive"]} -serde = {version = "1.0.167", features = ["derive"]} +serde = {version = "1.0.171", features = ["derive"]} serde_json = "1.0.100" diff --git a/bin/tau/taud/Cargo.toml b/bin/tau/taud/Cargo.toml index 0547d62e6..4316c8477 100644 --- a/bin/tau/taud/Cargo.toml +++ b/bin/tau/taud/Cargo.toml @@ -37,6 +37,6 @@ simplelog = "0.12.1" smol = "1.3.0" # Argument parsing -serde = {version = "1.0.167", features = ["derive"]} +serde = {version = "1.0.171", features = ["derive"]} structopt = "0.3.26" structopt-toml = "0.5.1" diff --git a/example/dchat/Cargo.toml b/example/dchat/Cargo.toml index e33e9d3b0..77bdcf6dd 100644 --- a/example/dchat/Cargo.toml +++ b/example/dchat/Cargo.toml @@ -25,6 +25,6 @@ simplelog = "0.12.1" url = "2.4.0" serde_json = "1.0.100" -serde = {version = "1.0.167", features = ["derive"]} +serde = {version = "1.0.171", features = ["derive"]} toml = "0.7.6" # ANCHOR_END: dependencies diff --git a/script/research/dhtd/Cargo.toml b/script/research/dhtd/Cargo.toml index dfc57e3c8..63f5af1f1 100644 --- a/script/research/dhtd/Cargo.toml +++ b/script/research/dhtd/Cargo.toml @@ -24,8 +24,8 @@ simplelog = "0.12.1" url = "2.4.0" # Argument parsing -serde = "1.0.167" -serde_derive = "1.0.167" +serde = "1.0.171" +serde_derive = "1.0.171" structopt = "0.3.26" structopt-toml = "0.5.1"