From 98ef7c834ed13b59e2a8e53e19fca747b2abda28 Mon Sep 17 00:00:00 2001 From: parazyd Date: Sat, 8 Jul 2023 20:17:47 +0200 Subject: [PATCH] chore: Update project dependencies. --- Cargo.lock | 412 +++++++++++------- Cargo.toml | 44 +- bin/darkfid/Cargo.toml | 8 +- bin/darkfid2/Cargo.toml | 2 +- bin/darkirc/Cargo.toml | 12 +- bin/darkwiki/darkwiki-cli/Cargo.toml | 8 +- bin/darkwiki/darkwikid/Cargo.toml | 12 +- bin/dhtd/dhtd/Cargo.toml | 4 +- bin/dnetview/Cargo.toml | 10 +- bin/drk/Cargo.toml | 8 +- bin/faucetd/Cargo.toml | 8 +- bin/fud/fu/Cargo.toml | 4 +- bin/fud/fud/Cargo.toml | 8 +- bin/genev/genev-cli/Cargo.toml | 6 +- bin/genev/genevd/Cargo.toml | 6 +- bin/lilith/Cargo.toml | 8 +- bin/tau/tau-cli/Cargo.toml | 8 +- bin/tau/taud/Cargo.toml | 12 +- bin/vanityaddr/Cargo.toml | 2 +- bin/vanityaddr/src/main.rs | 6 - bin/zkas/Cargo.toml | 2 +- bin/zktool/Cargo.toml | 2 +- example/dchat/Cargo.toml | 8 +- example/p2pdebug/Cargo.toml | 8 +- .../research/blockchain-explorer/Cargo.toml | 4 +- script/research/dhtd/Cargo.toml | 12 +- src/contract/consensus/Cargo.toml | 4 +- src/contract/dao/Cargo.toml | 2 +- src/contract/deployooor/Cargo.toml | 2 +- src/contract/money/Cargo.toml | 2 +- src/contract/test-harness/Cargo.toml | 2 +- src/dht/messages.rs | 17 +- src/dht/mod.rs | 5 +- src/event_graph/mod.rs | 4 +- src/rpc/clock_sync.rs | 4 +- src/rpc/jsonrpc.rs | 6 +- src/sdk/Cargo.toml | 6 +- src/sdk/python/Cargo.toml | 2 +- src/serial/Cargo.toml | 2 +- src/serial/derive-internal/Cargo.toml | 4 +- src/serial/derive/Cargo.toml | 2 +- src/system/mod.rs | 2 - src/system/subscriber.rs | 5 +- src/system/types.rs | 22 - src/wallet/walletdb.rs | 10 - 45 files changed, 382 insertions(+), 345 deletions(-) delete mode 100644 src/system/types.rs diff --git a/Cargo.lock b/Cargo.lock index 9204063f8..617d46331 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -233,8 +233,7 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "arti-client" version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce58be3dce5045adb1d44e1befdd8e2f196df0406ab5a8adb2330d2914e1194b" +source = "git+https://gitlab.torproject.org/tpo/core/arti?rev=77b0dc2edc93c9ad09b833b176e0f7066f017dd1#77b0dc2edc93c9ad09b833b176e0f7066f017dd1" dependencies = [ "cfg-if", "derive_builder_fork_arti", @@ -331,9 +330,9 @@ dependencies = [ [[package]] name = "async-channel" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", "event-listener", @@ -408,7 +407,7 @@ dependencies = [ "log", "parking", "polling", - "rustix 0.37.22", + "rustix 0.37.23", "slab", "socket2 0.4.9", "waker-fn", @@ -448,7 +447,7 @@ dependencies = [ "cfg-if", "event-listener", "futures-lite", - "rustix 0.37.22", + "rustix 0.37.23", "signal-hook", "windows-sys 0.48.0", ] @@ -499,9 +498,9 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "async-trait" -version = "0.1.70" +version = "0.1.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79fa67157abdfd688a259b6648808757db9347af834624f27ec646da976aee5d" +checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" dependencies = [ "proc-macro2", "quote", @@ -586,12 +585,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - [[package]] name = "base64" version = "0.21.2" @@ -671,20 +664,20 @@ checksum = "3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc" dependencies = [ "arrayref", "arrayvec", - "constant_time_eq", + "constant_time_eq 0.2.6", ] [[package]] name = "blake3" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729b71f35bd3fa1a4c86b85d32c8b9069ea7fe14f7a53cfabb65f62d4265b888" +checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", - "constant_time_eq", + "constant_time_eq 0.3.0", "digest 0.10.7", "rayon", ] @@ -827,8 +820,7 @@ dependencies = [ [[package]] name = "caret" version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9ef419ce44623895dbd50f5035d9cf39c65f80922a6fb174f0fb8b40e16e88c" +source = "git+https://gitlab.torproject.org/tpo/core/arti?rev=77b0dc2edc93c9ad09b833b176e0f7066f017dd1#77b0dc2edc93c9ad09b833b176e0f7066f017dd1" [[package]] name = "cargo-platform" @@ -961,9 +953,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.10" +version = "4.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "384e169cc618c613d5e3ca6404dda77a8685a63e08660dcc64abaf7da7cb0c7a" +checksum = "1640e5cc7fb47dbb8338fd471b105e7ed6c3cb2aeb00c2e067127ffd3764a05d" dependencies = [ "clap_builder", "clap_derive", @@ -972,9 +964,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.10" +version = "4.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef137bbe35aab78bdb468ccfba75a5f4d8321ae011d34063770780545176af2d" +checksum = "98c59138d527eeaf9b53f35a77fcc1fad9d883116070c63d5de1c7dc7b00c72b" dependencies = [ "anstream", "anstyle", @@ -984,11 +976,11 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.3.1" +version = "4.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6b5c519bab3ea61843a7923d074b04245624bb84a64a8c150f5deb014e388b" +checksum = "5fc443334c81a804575546c5a8a79b4913b50e28d69232903604cada1de817ce" dependencies = [ - "clap 4.3.10", + "clap 4.3.11", ] [[package]] @@ -1044,13 +1036,13 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "colored" -version = "2.0.1" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17bfac9400fe632590700de801b5dfbdca8b6944073832d1284bdbeef7f00e45" +checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" dependencies = [ - "atty", + "is-terminal", "lazy_static", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -1104,6 +1096,12 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6" +[[package]] +name = "constant_time_eq" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" + [[package]] name = "convert_case" version = "0.4.0" @@ -1228,9 +1226,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] @@ -1522,7 +1520,7 @@ dependencies = [ "blake3", "bs58", "chrono", - "clap 4.3.10", + "clap 4.3.11", "crypto_api_chachapoly", "curve25519-dalek 4.0.0-rc.2", "darkfi-derive", @@ -1535,7 +1533,7 @@ dependencies = [ "futures", "halo2_gadgets", "halo2_proofs", - "itertools 0.10.5", + "itertools 0.11.0", "lazy_static", "libc", "libsqlite3-sys", @@ -1557,7 +1555,7 @@ dependencies = [ "structopt", "structopt-toml", "thiserror", - "toml 0.7.5", + "toml 0.7.6", "tor-hscrypto", "url", "wasmer", @@ -1777,7 +1775,7 @@ dependencies = [ "async-trait", "bs58", "chrono", - "clap 4.3.10", + "clap 4.3.11", "crypto_box", "darkfi", "darkfi-serial", @@ -1798,7 +1796,7 @@ dependencies = [ "smol", "structopt", "structopt-toml", - "toml 0.7.5", + "toml 0.7.6", "url", ] @@ -2019,7 +2017,7 @@ dependencies = [ "serde_json", "simplelog", "smol", - "toml 0.7.5", + "toml 0.7.6", "url", ] @@ -2263,7 +2261,7 @@ dependencies = [ "async-std", "blake3", "bs58", - "clap 4.3.10", + "clap 4.3.11", "clap_complete", "darkfi", "darkfi-dao-contract", @@ -2702,8 +2700,7 @@ dependencies = [ [[package]] name = "fs-mistrust" version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "283ddd10fc57708bbc2195d5f2671d2391b7be7a10422457a77f33fb5ccce334" +source = "git+https://gitlab.torproject.org/tpo/core/arti?rev=77b0dc2edc93c9ad09b833b176e0f7066f017dd1#77b0dc2edc93c9ad09b833b176e0f7066f017dd1" dependencies = [ "derive_builder_fork_arti", "dirs", @@ -2741,7 +2738,7 @@ name = "fu" version = "0.4.1" dependencies = [ "async-std", - "clap 4.3.10", + "clap 4.3.11", "darkfi", "libsqlite3-sys", "log", @@ -2907,7 +2904,7 @@ name = "genev" version = "0.4.1" dependencies = [ "async-std", - "clap 4.3.10", + "clap 4.3.11", "darkfi", "darkfi-serial", "libsqlite3-sys", @@ -3315,12 +3312,12 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi 0.3.2", - "rustix 0.38.2", + "rustix 0.38.3", "windows-sys 0.48.0", ] @@ -3515,7 +3512,7 @@ dependencies = [ "smol", "structopt", "structopt-toml", - "toml 0.7.5", + "toml 0.7.6", "url", ] @@ -3568,6 +3565,15 @@ dependencies = [ "libc", ] +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + [[package]] name = "maybe-rayon" version = "0.1.1" @@ -3736,6 +3742,16 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + [[package]] name = "num-bigint" version = "0.4.3" @@ -3979,6 +3995,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + [[package]] name = "p256" version = "0.11.1" @@ -4119,11 +4141,12 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "pem" -version = "1.1.1" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" +checksum = "6b13fe415cdf3c8e44518e18a7c95a13431d9bdf6d15367d82b23c377fdd441a" dependencies = [ - "base64 0.13.1", + "base64", + "serde", ] [[package]] @@ -4695,9 +4718,9 @@ dependencies = [ [[package]] name = "rcgen" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" +checksum = "4954fbc00dcd4d8282c987710e50ba513d351400dbdd00e803a05172a90d8976" dependencies = [ "pem", "ring", @@ -4748,13 +4771,34 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.4" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.2", + "regex-automata 0.3.2", + "regex-syntax 0.7.3", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.3", ] [[package]] @@ -4765,9 +4809,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "2ab07dc67230e4a4718e70fd5c20055a4334b121f1f9db8fe63ef39ce9b8c846" [[package]] name = "region" @@ -4799,8 +4843,7 @@ checksum = "4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0" [[package]] name = "retry-error" version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccae8fa74f2f93e9c11b0ed2d3aa278e61e357d0b14b7b8a164bea215b9f1155" +source = "git+https://gitlab.torproject.org/tpo/core/arti?rev=77b0dc2edc93c9ad09b833b176e0f7066f017dd1#77b0dc2edc93c9ad09b833b176e0f7066f017dd1" [[package]] name = "rfc6979" @@ -4975,9 +5018,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.22" +version = "0.37.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8818fa822adcc98b18fedbb3632a6a33213c070556b5aa7c4c8cc21cff565c4c" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" dependencies = [ "bitflags 1.3.2", "errno", @@ -4989,9 +5032,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.2" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aabcb0461ebd01d6b79945797c27f8529082226cb630a9865a71870ff63532a4" +checksum = "ac5ffa1efe7548069688cd7028f32591853cd7b5b756d41bcffd2353e4fc75b4" dependencies = [ "bitflags 2.3.3", "errno", @@ -5002,9 +5045,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.2" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e32ca28af694bc1bbf399c33a516dbdf1c90090b8ab23c2bc24f834aa2247f5f" +checksum = "b19faa85ecb5197342b54f987b142fb3e30d0c90da40f80ef4fa9a726e6676ed" dependencies = [ "log", "ring", @@ -5018,14 +5061,14 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.2", + "base64", ] [[package]] name = "rustls-webpki" -version = "0.100.1" +version = "0.101.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +checksum = "15f36a6828982f422756984e47912a7a51dcbc2a197aa791158f8ca61cd8204e" dependencies = [ "ring", "untrusted", @@ -5058,8 +5101,7 @@ checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" [[package]] name = "safelog" version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48fe0047f28130ed3d3040b5042889feffde0f9376fb46e5930721d7dc62fbc7" +source = "git+https://gitlab.torproject.org/tpo/core/arti?rev=77b0dc2edc93c9ad09b833b176e0f7066f017dd1#77b0dc2edc93c9ad09b833b176e0f7066f017dd1" dependencies = [ "derive_more", "educe", @@ -5161,9 +5203,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.166" +version = "1.0.167" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8" +checksum = "7daf513456463b42aa1d94cff7e0c24d682b429f020b9afa4f5ba5c40a22b237" dependencies = [ "serde_derive", ] @@ -5181,9 +5223,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.166" +version = "1.0.167" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6" +checksum = "b69b106b68bc8054f0e974e70d19984040f8a5cf9215ca82626ea4853f82c4b9" dependencies = [ "proc-macro2", "quote", @@ -5192,9 +5234,9 @@ dependencies = [ [[package]] name = "serde_ignored" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94eb4a4087ba8bdf14a9208ac44fddbf55c01a6195f7edfc511ddaff6cae45a6" +checksum = "6de9d103529a9ba50008099785839df1e6f40b4576ed4c000cbfdb051182b827" dependencies = [ "serde", ] @@ -5225,7 +5267,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f02d8aa6e3c385bf084924f660ce2a3a6bd333ba55b35e8590b321f35d88513" dependencies = [ - "base64 0.21.2", + "base64", "chrono", "hex", "indexmap 1.9.3", @@ -5292,6 +5334,15 @@ dependencies = [ "keccak", ] +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + [[package]] name = "shellexpand" version = "3.1.0" @@ -5476,9 +5527,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "smawk" @@ -5751,7 +5802,7 @@ version = "0.4.1" dependencies = [ "async-std", "chrono", - "clap 4.3.10", + "clap 4.3.11", "colored", "darkfi", "libsqlite3-sys", @@ -5792,7 +5843,7 @@ dependencies = [ "structopt", "structopt-toml", "thiserror", - "toml 0.7.5", + "toml 0.7.6", "url", ] @@ -5806,7 +5857,7 @@ dependencies = [ "cfg-if", "fastrand", "redox_syscall 0.3.5", - "rustix 0.37.22", + "rustix 0.37.23", "windows-sys 0.48.0", ] @@ -5861,24 +5912,34 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.41" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c16a64ba9387ef3fdae4f9c1a7f07a0997fce91985c0336f1ddc1822b3b37802" +checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.41" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d14928354b01c4d6a4f0e549069adef399a284e7995c7ccca94e8a07a5346c59" +checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" dependencies = [ "proc-macro2", "quote", "syn 2.0.23", ] +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + [[package]] name = "time" version = "0.1.45" @@ -5954,9 +6015,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" dependencies = [ "serde", "serde_spanned", @@ -5975,9 +6036,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.11" +version = "0.19.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7" +checksum = "c500344a19072298cd05a7224b3c0c629348b78692bf48466c5238656e315a78" dependencies = [ "indexmap 2.0.0", "serde", @@ -5989,8 +6050,7 @@ dependencies = [ [[package]] name = "tor-async-utils" version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b05a3637cae9a1e1c79bd0ce179e7b646cbc25c249d978392f55461ff0f29b" +source = "git+https://gitlab.torproject.org/tpo/core/arti?rev=77b0dc2edc93c9ad09b833b176e0f7066f017dd1#77b0dc2edc93c9ad09b833b176e0f7066f017dd1" dependencies = [ "futures", "pin-project", @@ -6002,8 +6062,7 @@ dependencies = [ [[package]] name = "tor-basic-utils" version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be9303782905d3bb4978b8d0253b502c6caf1dd8d2159cb9656d06024fdd234" +source = "git+https://gitlab.torproject.org/tpo/core/arti?rev=77b0dc2edc93c9ad09b833b176e0f7066f017dd1#77b0dc2edc93c9ad09b833b176e0f7066f017dd1" dependencies = [ "hex", "libc", @@ -6017,8 +6076,7 @@ dependencies = [ [[package]] name = "tor-bytes" version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e65a8ded7cc447e82b7e5f9517b8142adef04f295120778a26f86bc0e420c3b0" +source = "git+https://gitlab.torproject.org/tpo/core/arti?rev=77b0dc2edc93c9ad09b833b176e0f7066f017dd1#77b0dc2edc93c9ad09b833b176e0f7066f017dd1" dependencies = [ "bytes", "digest 0.10.7", @@ -6035,8 +6093,7 @@ dependencies = [ [[package]] name = "tor-cell" version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4759bc3315dc4e9bad8737ce7c4f9ca63dbea10fbd785d6d0972ee8a8c8fa39b" +source = "git+https://gitlab.torproject.org/tpo/core/arti?rev=77b0dc2edc93c9ad09b833b176e0f7066f017dd1#77b0dc2edc93c9ad09b833b176e0f7066f017dd1" dependencies = [ "bitflags 2.3.3", "bytes", @@ -6059,8 +6116,7 @@ dependencies = [ [[package]] name = "tor-cert" version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5cb13eb86bb880b79560913d5f4d795fee5cdd8f2d3d7b82235265d1bf3fe2b" +source = "git+https://gitlab.torproject.org/tpo/core/arti?rev=77b0dc2edc93c9ad09b833b176e0f7066f017dd1#77b0dc2edc93c9ad09b833b176e0f7066f017dd1" dependencies = [ "caret", "digest 0.10.7", @@ -6074,8 +6130,7 @@ dependencies = [ [[package]] name = "tor-chanmgr" version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "247d5bcad069e42cf2beda69926ccf927e76117dc24dd7f03d4414c1ce8512f4" +source = "git+https://gitlab.torproject.org/tpo/core/arti?rev=77b0dc2edc93c9ad09b833b176e0f7066f017dd1#77b0dc2edc93c9ad09b833b176e0f7066f017dd1" dependencies = [ "async-trait", "derive_builder_fork_arti", @@ -6105,8 +6160,7 @@ dependencies = [ [[package]] name = "tor-checkable" version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55b9757eb746564d30de49b90ecc577213e6d743a5280f9c0a7c9932b048d1f9" +source = "git+https://gitlab.torproject.org/tpo/core/arti?rev=77b0dc2edc93c9ad09b833b176e0f7066f017dd1#77b0dc2edc93c9ad09b833b176e0f7066f017dd1" dependencies = [ "humantime", "signature 1.6.4", @@ -6117,8 +6171,7 @@ dependencies = [ [[package]] name = "tor-circmgr" version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d67303c3f769064adf970d2a6a94d0b129cb50b8ddac1d604ade2c8310abcc8" +source = "git+https://gitlab.torproject.org/tpo/core/arti?rev=77b0dc2edc93c9ad09b833b176e0f7066f017dd1#77b0dc2edc93c9ad09b833b176e0f7066f017dd1" dependencies = [ "amplify", "async-trait", @@ -6158,8 +6211,7 @@ dependencies = [ [[package]] name = "tor-config" version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4970e05c64504801e3634059048bc140d85bdad9e500ce7622c77fb51ef5ce8" +source = "git+https://gitlab.torproject.org/tpo/core/arti?rev=77b0dc2edc93c9ad09b833b176e0f7066f017dd1#77b0dc2edc93c9ad09b833b176e0f7066f017dd1" dependencies = [ "config", "derive_builder_fork_arti", @@ -6176,7 +6228,7 @@ dependencies = [ "shellexpand", "strum", "thiserror", - "toml 0.7.5", + "toml 0.7.6", "tor-basic-utils", "tor-error", "tracing", @@ -6185,8 +6237,7 @@ dependencies = [ [[package]] name = "tor-consdiff" version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8277d4676d3fd9dc3e04fddf30cb14bc0bf6d8e73cff55492beed071ef2424e" +source = "git+https://gitlab.torproject.org/tpo/core/arti?rev=77b0dc2edc93c9ad09b833b176e0f7066f017dd1#77b0dc2edc93c9ad09b833b176e0f7066f017dd1" dependencies = [ "digest 0.10.7", "hex", @@ -6197,8 +6248,7 @@ dependencies = [ [[package]] name = "tor-dirclient" version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a0b2a5278d8dc336800b2d1b982663562505e2a2c9dea4ee295cdb419f02a92" +source = "git+https://gitlab.torproject.org/tpo/core/arti?rev=77b0dc2edc93c9ad09b833b176e0f7066f017dd1#77b0dc2edc93c9ad09b833b176e0f7066f017dd1" dependencies = [ "async-compression", "base64ct", @@ -6225,8 +6275,7 @@ dependencies = [ [[package]] name = "tor-dirmgr" version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35f21ef66afc88ce4ee6ba9d592b99865d71782213acebcbd72b475a2c316e5b" +source = "git+https://gitlab.torproject.org/tpo/core/arti?rev=77b0dc2edc93c9ad09b833b176e0f7066f017dd1#77b0dc2edc93c9ad09b833b176e0f7066f017dd1" dependencies = [ "async-trait", "base64ct", @@ -6275,22 +6324,23 @@ dependencies = [ [[package]] name = "tor-error" version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca1b6d079513aa4de740ca086ea091ed0cbaed34d15268dea13def2dfa08d97d" +source = "git+https://gitlab.torproject.org/tpo/core/arti?rev=77b0dc2edc93c9ad09b833b176e0f7066f017dd1#77b0dc2edc93c9ad09b833b176e0f7066f017dd1" dependencies = [ "backtrace", "derive_more", "futures", "once_cell", + "paste", + "static_assertions", "strum", "thiserror", + "tracing", ] [[package]] name = "tor-guardmgr" version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad21c1e61dedfd35e4c94bf5820e294d9434c08ebdc34cece5ac5ae1bc394ac3" +source = "git+https://gitlab.torproject.org/tpo/core/arti?rev=77b0dc2edc93c9ad09b833b176e0f7066f017dd1#77b0dc2edc93c9ad09b833b176e0f7066f017dd1" dependencies = [ "base64ct", "derive_builder_fork_arti", @@ -6327,8 +6377,7 @@ dependencies = [ [[package]] name = "tor-hsclient" version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8954ec647dc5126842a18c0f64b1d1e76e4be888f24c4b71b497501b211c6e59" +source = "git+https://gitlab.torproject.org/tpo/core/arti?rev=77b0dc2edc93c9ad09b833b176e0f7066f017dd1#77b0dc2edc93c9ad09b833b176e0f7066f017dd1" dependencies = [ "async-trait", "derive_more", @@ -6366,8 +6415,7 @@ dependencies = [ [[package]] name = "tor-hscrypto" version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6de0c5c3e75ad096427456fd2ec675829eeeefaabd96c1ad05f923f34ca90652" +source = "git+https://gitlab.torproject.org/tpo/core/arti?rev=77b0dc2edc93c9ad09b833b176e0f7066f017dd1#77b0dc2edc93c9ad09b833b176e0f7066f017dd1" dependencies = [ "data-encoding", "derive_more", @@ -6390,8 +6438,7 @@ dependencies = [ [[package]] name = "tor-keymgr" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbbd45cc02edb9fb9d91029d3fb51891bb8c4e1a4c8ae9c93a1746d585425a01" +source = "git+https://gitlab.torproject.org/tpo/core/arti?rev=77b0dc2edc93c9ad09b833b176e0f7066f017dd1#77b0dc2edc93c9ad09b833b176e0f7066f017dd1" dependencies = [ "derive_more", "dyn-clone", @@ -6408,8 +6455,7 @@ dependencies = [ [[package]] name = "tor-linkspec" version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b02a75b8c21c34e05c19522ae3379b998e0821091366ce4514005e95be39d552" +source = "git+https://gitlab.torproject.org/tpo/core/arti?rev=77b0dc2edc93c9ad09b833b176e0f7066f017dd1#77b0dc2edc93c9ad09b833b176e0f7066f017dd1" dependencies = [ "base64ct", "by_address", @@ -6435,8 +6481,7 @@ dependencies = [ [[package]] name = "tor-llcrypto" version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03f61c060433186164a797719369a1b081c84e878ab96a2f29db7617f991402" +source = "git+https://gitlab.torproject.org/tpo/core/arti?rev=77b0dc2edc93c9ad09b833b176e0f7066f017dd1#77b0dc2edc93c9ad09b833b176e0f7066f017dd1" dependencies = [ "aes", "base64ct", @@ -6466,8 +6511,7 @@ dependencies = [ [[package]] name = "tor-netdir" version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fa66f06935d66c8670acfde4aada87931fa270f9d693c9415aa4db9ea4c4f9" +source = "git+https://gitlab.torproject.org/tpo/core/arti?rev=77b0dc2edc93c9ad09b833b176e0f7066f017dd1#77b0dc2edc93c9ad09b833b176e0f7066f017dd1" dependencies = [ "bitflags 2.3.3", "derive_builder_fork_arti", @@ -6502,8 +6546,7 @@ dependencies = [ [[package]] name = "tor-netdoc" version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2735aad3328cf3822aa27be52cf1fadd72009c628fad01ffc45fef48708ce7" +source = "git+https://gitlab.torproject.org/tpo/core/arti?rev=77b0dc2edc93c9ad09b833b176e0f7066f017dd1#77b0dc2edc93c9ad09b833b176e0f7066f017dd1" dependencies = [ "amplify", "base64ct", @@ -6544,8 +6587,7 @@ dependencies = [ [[package]] name = "tor-persist" version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "648395f5474dbb93a0d7c1743b52e64a05f76a91fabe967b5dd1de263e2342e9" +source = "git+https://gitlab.torproject.org/tpo/core/arti?rev=77b0dc2edc93c9ad09b833b176e0f7066f017dd1#77b0dc2edc93c9ad09b833b176e0f7066f017dd1" dependencies = [ "derive_more", "fs-mistrust", @@ -6561,8 +6603,7 @@ dependencies = [ [[package]] name = "tor-proto" version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bc5785d366dbe533143bb7cfae159d39a427af122629ff9e6d539075906f12d" +source = "git+https://gitlab.torproject.org/tpo/core/arti?rev=77b0dc2edc93c9ad09b833b176e0f7066f017dd1#77b0dc2edc93c9ad09b833b176e0f7066f017dd1" dependencies = [ "asynchronous-codec", "bytes", @@ -6606,8 +6647,7 @@ dependencies = [ [[package]] name = "tor-protover" version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e99e60f0eb25642669a762a7eb8bed0b51050c31e057fd33af1620a3161e3cb3" +source = "git+https://gitlab.torproject.org/tpo/core/arti?rev=77b0dc2edc93c9ad09b833b176e0f7066f017dd1#77b0dc2edc93c9ad09b833b176e0f7066f017dd1" dependencies = [ "caret", "thiserror", @@ -6616,8 +6656,7 @@ dependencies = [ [[package]] name = "tor-rtcompat" version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad4346d4b728444d9976830f7b055ea61eff0afd3d856c777b8b63263c274032" +source = "git+https://gitlab.torproject.org/tpo/core/arti?rev=77b0dc2edc93c9ad09b833b176e0f7066f017dd1#77b0dc2edc93c9ad09b833b176e0f7066f017dd1" dependencies = [ "async-io", "async-rustls", @@ -6635,23 +6674,28 @@ dependencies = [ [[package]] name = "tor-rtmock" version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad31fc8eb0604198ae645feb6afa8ddfeaa7ed5aac401c75052be3689f717914" +source = "git+https://gitlab.torproject.org/tpo/core/arti?rev=77b0dc2edc93c9ad09b833b176e0f7066f017dd1#77b0dc2edc93c9ad09b833b176e0f7066f017dd1" dependencies = [ + "amplify", "async-trait", + "educe", "futures", "humantime", + "itertools 0.11.0", "pin-project", + "slotmap", + "strum", "thiserror", "tor-rtcompat", "tracing", + "tracing-test", + "void", ] [[package]] name = "tor-socksproto" version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a6e3bcb2305a3132164348b7860fdebe21f09fb9aa1a5d72635a4515e6e5e3c" +source = "git+https://gitlab.torproject.org/tpo/core/arti?rev=77b0dc2edc93c9ad09b833b176e0f7066f017dd1#77b0dc2edc93c9ad09b833b176e0f7066f017dd1" dependencies = [ "caret", "subtle", @@ -6663,8 +6707,7 @@ dependencies = [ [[package]] name = "tor-units" version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965389ac9742fbb011ec336fe65d92b7856410ec4c6384cdc82a14176fd07db6" +source = "git+https://gitlab.torproject.org/tpo/core/arti?rev=77b0dc2edc93c9ad09b833b176e0f7066f017dd1#77b0dc2edc93c9ad09b833b176e0f7066f017dd1" dependencies = [ "derive_more", "thiserror", @@ -6700,6 +6743,59 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "tracing-test" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a2c0ff408fe918a94c428a3f2ad04e4afd5c95bbc08fcf868eff750c15728a4" +dependencies = [ + "lazy_static", + "tracing-core", + "tracing-subscriber", + "tracing-test-macro", +] + +[[package]] +name = "tracing-test-macro" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "258bc1c4f8e2e73a977812ab339d503e6feeb92700f6d07a6de4d321522d5c08" +dependencies = [ + "lazy_static", + "quote", + "syn 1.0.109", ] [[package]] @@ -6722,9 +6818,9 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "ucd-trie" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "uint" @@ -6858,6 +6954,12 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be" +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + [[package]] name = "value-bag" version = "1.4.1" @@ -6869,7 +6971,7 @@ name = "vanityaddr" version = "0.4.1" dependencies = [ "bs58", - "clap 4.3.10", + "clap 4.3.11", "ctrlc", "darkfi", "darkfi-sdk", @@ -7478,9 +7580,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448" +checksum = "81a2094c43cc94775293eaa0e499fbc30048a6d824ac82c0351a8c0bf9112529" dependencies = [ "memchr", ] @@ -7611,7 +7713,7 @@ dependencies = [ name = "zkas" version = "0.4.1" dependencies = [ - "clap 4.3.10", + "clap 4.3.11", "darkfi", ] @@ -7619,7 +7721,7 @@ dependencies = [ name = "zktool" version = "0.4.1" dependencies = [ - "clap 4.3.10", + "clap 4.3.11", "darkfi", "darkfi-sdk", ] diff --git a/Cargo.toml b/Cargo.toml index 150a671fe..5a76d3468 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,6 @@ doctest = false [workspace] members = [ "bin/zkas", - #"bin/cashierd", "bin/darkfid", "bin/darkfid2", "bin/drk", @@ -58,13 +57,13 @@ members = [ [dependencies] # Hard dependencies -libc = "0.2.144" +libc = "0.2.147" log = "0.4.19" -thiserror = "1.0.40" +thiserror = "1.0.43" # async-runtime async-std = {version = "1.12.0", features = ["attributes"], optional = true} -async-trait = {version = "0.1.68", optional = true} +async-trait = {version = "0.1.71", optional = true} futures = {version = "0.3.28", optional = true} smol = {version = "1.3.0", optional = true} @@ -78,18 +77,18 @@ tor-hscrypto = {version = "0.3.0", optional = true} # TLS cert utilities ed25519-compact = {version = "2.0.4", optional = true} -rcgen = {version = "0.10.0", optional = true} -rustls-pemfile = {version = "1.0.2", optional = true} +rcgen = {version = "0.11.1", optional = true} +rustls-pemfile = {version = "1.0.3", optional = true} x509-parser = {version = "0.15.0", features = ["validate", "verify"], optional = true} # Encoding bs58 = {version = "0.5.0", optional = true} -serde_json = {version = "1.0.96", optional = true} -serde = {version = "1.0.164", features = ["derive"], optional = true} +serde_json = {version = "1.0.100", optional = true} +serde = {version = "1.0.167", 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} -toml = {version = "0.7.4", optional = true} +toml = {version = "0.7.6", optional = true} # Big float high precision arithmetics dashu = { version = "0.3.1", optional=true } @@ -99,7 +98,7 @@ chrono = {version = "0.4.26", optional = true} darkfi-serial = {path = "src/serial", optional = true} darkfi-derive = {path = "src/serial/derive", optional = true} darkfi-derive-internal = {path = "src/serial/derive-internal", optional = true} -itertools = {version = "0.10.5", optional = true} +itertools = {version = "0.11.0", optional = true} lazy_static = {version = "1.4.0", optional = true} # TODO: Test without serde url = {version = "2.4.0", features = ["serde"], optional = true} @@ -110,7 +109,7 @@ simplelog = {version = "0.12.1", optional = true} # Crypto rand = {version = "0.8.5", optional = true} -blake3 = {version = "1.4.0", features = ["rayon"], optional = true} +blake3 = {version = "1.4.1", features = ["rayon"], optional = true} crypto_api_chachapoly = {version = "0.5.0", optional = true} halo2_proofs = {version = "0.3.0", optional = true} halo2_gadgets = {version = "0.3.0", optional = true} @@ -133,10 +132,10 @@ sled-overlay = {version = "0.0.7", optional = true} curve25519-dalek = {version = "=4.0.0-rc.2", default-features = false, optional = true} [dev-dependencies] -clap = {version = "4.3.3", features = ["derive"]} +clap = {version = "4.3.11", features = ["derive"]} halo2_proofs = {version = "0.3.0", features = ["dev-graph", "gadget-traces", "sanity-checks"]} halo2_gadgets = {version = "0.3.0", features = ["test-dev-graph", "test-dependencies"]} -plotters = "0.3.4" +plotters = "0.3.5" easy-parallel = "3.3.0" prettytable-rs = "0.10.0" @@ -156,7 +155,6 @@ async-runtime = [ blockchain = [ "blake3", "bs58", # <-- TODO: remove after we get rid of json for notifications - "chrono", "crypto_api_chachapoly", "dashu", "halo2_proofs", @@ -191,7 +189,6 @@ dht = [ event-graph = [ "blake3", - "chrono", "rand", "async-runtime", @@ -226,17 +223,6 @@ net = [ "p2p-transport-nym", ] -raft = [ - "chrono", - "rand", - "sled", - - "async-runtime", - "darkfi-serial", - "net", - "util", -] - rpc = [ "rand", "serde", @@ -256,7 +242,6 @@ system = [ tx = [ "blake3", - "rand", "async-runtime", "darkfi-sdk", @@ -265,19 +250,16 @@ tx = [ ] util = [ - "chrono", "simplelog", "serde", "serde_json", "toml", - "url", "darkfi-serial", ] wallet = [ "async-std", - "rand", "rusqlite", "darkfi-serial", @@ -327,3 +309,5 @@ required-features = ["zk"] [patch.crates-io] halo2_proofs = {git="https://github.com/parazyd/halo2", branch="v3"} halo2_gadgets = {git="https://github.com/parazyd/halo2", branch="v3"} +arti-client = {git="https://gitlab.torproject.org/tpo/core/arti", rev="77b0dc2edc93c9ad09b833b176e0f7066f017dd1"} +tor-hscrypto = {git="https://gitlab.torproject.org/tpo/core/arti", rev="77b0dc2edc93c9ad09b833b176e0f7066f017dd1"} diff --git a/bin/darkfid/Cargo.toml b/bin/darkfid/Cargo.toml index 13a278e8f..406e7dd60 100644 --- a/bin/darkfid/Cargo.toml +++ b/bin/darkfid/Cargo.toml @@ -9,14 +9,14 @@ license = "AGPL-3.0-only" edition = "2021" [dependencies] -async-trait = "0.1.68" -blake3 = "1.4.0" +async-trait = "0.1.71" +blake3 = "1.4.1" bs58 = "0.5.0" darkfi = {path = "../../", features = ["blockchain", "wallet", "rpc", "net", "zkas"]} darkfi-sdk = {path = "../../src/sdk"} darkfi-serial = {path = "../../src/serial"} log = "0.4.19" -serde_json = "1.0.96" +serde_json = "1.0.100" sled = "0.34.7" url = "2.4.0" @@ -29,6 +29,6 @@ simplelog = "0.12.1" smol = "1.3.0" # Argument parsing -serde = {version = "1.0.164", features = ["derive"]} +serde = {version = "1.0.167", features = ["derive"]} structopt = "0.3.26" structopt-toml = "0.5.1" diff --git a/bin/darkfid2/Cargo.toml b/bin/darkfid2/Cargo.toml index 197cda3ed..9bf2c398c 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.164", features = ["derive"]} +serde = {version = "1.0.167", features = ["derive"]} structopt = "0.3.26" structopt-toml = "0.5.1" diff --git a/bin/darkirc/Cargo.toml b/bin/darkirc/Cargo.toml index 8f897aead..9d853afda 100644 --- a/bin/darkirc/Cargo.toml +++ b/bin/darkirc/Cargo.toml @@ -14,16 +14,16 @@ darkfi-serial = {path = "../../src/serial"} # Async async-rustls = "0.4.0" -async-trait = "0.1.68" +async-trait = "0.1.71" futures = "0.3.28" -rustls-pemfile = "1.0.2" +rustls-pemfile = "1.0.3" # Crypto crypto_box = "0.8.2" rand = "0.8.5" # Misc -clap = {version = "4.3.3", features = ["derive"]} +clap = {version = "4.3.11", features = ["derive"]} chrono = "0.4.26" libsqlite3-sys = {version = "0.26.0", features = ["bundled-sqlcipher-vendored-openssl"]} log = "0.4.19" @@ -34,8 +34,8 @@ url = "2.4.0" # Encoding and parsing bs58 = "0.5.0" hex = "0.4.3" -serde_json = "1.0.96" -toml = "0.7.4" +serde_json = "1.0.100" +toml = "0.7.6" # Daemon async-std = "1.12.0" @@ -46,6 +46,6 @@ simplelog = "0.12.1" smol = "1.3.0" # Argument parsing -serde = {version = "1.0.164", features = ["derive"]} +serde = {version = "1.0.167", 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 0d98d374a..a17a38b7f 100644 --- a/bin/darkwiki/darkwiki-cli/Cargo.toml +++ b/bin/darkwiki/darkwiki-cli/Cargo.toml @@ -14,8 +14,8 @@ darkfi = {path = "../../../", features = ["rpc"]} # Async smol = "1.3.0" async-std = {version = "1.12.0", features = ["attributes"]} -async-trait = "0.1.68" -async-channel = "1.8.0" +async-trait = "0.1.71" +async-channel = "1.9.0" futures = "0.3.28" # Misc @@ -25,6 +25,6 @@ rand = "0.8.5" url = "2.4.0" # Encoding and parsing -serde = {version = "1.0.164", features = ["derive"]} -serde_json = "1.0.96" +serde = {version = "1.0.167", 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 7e0652d24..507256812 100644 --- a/bin/darkwiki/darkwikid/Cargo.toml +++ b/bin/darkwiki/darkwikid/Cargo.toml @@ -10,8 +10,8 @@ edition = "2021" [dependencies] async-std = "1.12.0" -async-trait = "0.1.68" -blake3 = "1.4.0" +async-trait = "0.1.71" +blake3 = "1.4.1" bs58 = "0.5.0" darkfi = {path = "../../../", features = ["raft", "rpc", "util"]} darkfi-serial = {path = "../../../src/serial"} @@ -20,15 +20,15 @@ easy-parallel = "3.3.0" futures = "0.3.28" lazy_static = "1.4.0" log = "0.4.19" -serde = "1.0.164" -serde_derive = "1.0.164" -serde_json = "1.0.96" +serde = "1.0.167" +serde_derive = "1.0.167" +serde_json = "1.0.100" signal-hook-async-std = "0.2.2" signal-hook = "0.3.15" simplelog = "0.12.1" structopt = "0.3.26" structopt-toml = "0.5.1" smol = "1.3.0" -toml = "0.7.4" +toml = "0.7.6" unicode-segmentation = "1.10.1" url = "2.4.0" diff --git a/bin/dhtd/dhtd/Cargo.toml b/bin/dhtd/dhtd/Cargo.toml index 099be2f54..4ccc84e52 100644 --- a/bin/dhtd/dhtd/Cargo.toml +++ b/bin/dhtd/dhtd/Cargo.toml @@ -10,8 +10,8 @@ edition = "2021" [dependencies] async-std = {version = "1.12.0", features = ["attributes"]} -async-trait = "0.1.68" -blake3 = "1.4.0" +async-trait = "0.1.71" +blake3 = "1.4.1" darkfi = {path = "../../../", features = ["dht"]} darkfi-serial = {path = "../../../src/serial", features = ["derive", "crypto"]} easy-parallel = "3.3.0" diff --git a/bin/dnetview/Cargo.toml b/bin/dnetview/Cargo.toml index 759532449..5923c950f 100644 --- a/bin/dnetview/Cargo.toml +++ b/bin/dnetview/Cargo.toml @@ -21,18 +21,18 @@ tui = {version = "0.19.0", features = ["termion"]} smol = "1.3.0" async-std = {version = "1.12.0", features = ["attributes"]} easy-parallel = "3.3.0" -async-channel = "1.8.0" +async-channel = "1.9.0" # Misc -clap = {version = "4.3.3", features = ["derive"]} +clap = {version = "4.3.11", features = ["derive"]} rand = "0.8.5" simplelog = "0.12.1" libsqlite3-sys = {version = "0.26.0", features = ["bundled-sqlcipher-vendored-openssl"]} log = "0.4.19" url = "2.4.0" -thiserror = "1.0.40" +thiserror = "1.0.43" # Encoding and parsing -serde_json = "1.0.96" -serde = {version = "1.0.164", features = ["derive"]} +serde_json = "1.0.100" +serde = {version = "1.0.167", features = ["derive"]} hex = "0.4.3" diff --git a/bin/drk/Cargo.toml b/bin/drk/Cargo.toml index 091bf15e5..484b9a4d7 100644 --- a/bin/drk/Cargo.toml +++ b/bin/drk/Cargo.toml @@ -11,10 +11,10 @@ edition = "2021" [dependencies] anyhow = "1.0.71" async-std = {version = "1.12.0", features = ["attributes"]} -blake3 = "1.4.0" +blake3 = "1.4.1" bs58 = "0.5.0" -clap = {version = "4.3.3", features = ["derive"]} -clap_complete = "4.3.1" +clap = {version = "4.3.11", features = ["derive"]} +clap_complete = "4.3.2" darkfi = {path = "../../", features = ["blockchain", "rpc", "util", "wallet"]} darkfi-sdk = {path = "../../src/sdk"} darkfi-serial = {path = "../../src/serial", features = ["derive", "crypto"]} @@ -22,7 +22,7 @@ darkfi-money-contract = {path = "../../src/contract/money", features = ["no-entr darkfi-dao-contract = {path = "../../src/contract/dao", features = ["no-entrypoint", "client"]} prettytable-rs = "0.10.0" rand = "0.8.5" -serde_json = "1.0.96" +serde_json = "1.0.100" smol = "1.3.0" simplelog = "0.12.1" signal-hook-async-std = "0.2.2" diff --git a/bin/faucetd/Cargo.toml b/bin/faucetd/Cargo.toml index c39cc2e48..45492dbd0 100644 --- a/bin/faucetd/Cargo.toml +++ b/bin/faucetd/Cargo.toml @@ -9,8 +9,8 @@ license = "AGPL-3.0-only" edition = "2021" [dependencies] -async-trait = "0.1.68" -blake3 = "1.4.0" +async-trait = "0.1.71" +blake3 = "1.4.1" chrono = "0.4.26" darkfi = {path = "../../", features = ["blockchain", "wallet", "rpc", "net", "zkas"]} darkfi-serial = {path = "../../src/serial"} @@ -19,7 +19,7 @@ darkfi-money-contract = {path = "../../src/contract/money", features = ["no-entr log = "0.4.19" rand = "0.8.5" rusqlite = "0.29.0" -serde_json = "1.0.96" +serde_json = "1.0.100" sled = "0.34.7" url = "2.4.0" @@ -32,6 +32,6 @@ simplelog = "0.12.1" smol = "1.3.0" # Argument parsing -serde = {version = "1.0.164", features = ["derive"]} +serde = {version = "1.0.167", features = ["derive"]} structopt = "0.3.26" structopt-toml = "0.5.1" diff --git a/bin/fud/fu/Cargo.toml b/bin/fud/fu/Cargo.toml index ac23cd36b..7c73b67b2 100644 --- a/bin/fud/fu/Cargo.toml +++ b/bin/fud/fu/Cargo.toml @@ -15,9 +15,9 @@ darkfi = {path = "../../../", features = ["util", "rpc"]} async-std = {version = "1.12.0", features = ["attributes"]} # Misc -clap = {version = "4.3.3", features = ["derive"]} +clap = {version = "4.3.11", features = ["derive"]} libsqlite3-sys = {version = "0.26.0", features = ["bundled-sqlcipher-vendored-openssl"]} log = "0.4.19" -serde_json = "1.0.96" +serde_json = "1.0.100" simplelog = "0.12.1" url = "2.4.0" diff --git a/bin/fud/fud/Cargo.toml b/bin/fud/fud/Cargo.toml index 04223e5b9..8e4b607d3 100644 --- a/bin/fud/fud/Cargo.toml +++ b/bin/fud/fud/Cargo.toml @@ -13,11 +13,11 @@ darkfi = {path = "../../../", features = ["dht", "rpc"]} darkfi-serial = {path = "../../../src/serial"} # Misc -async-trait = "0.1.68" -blake3 = "1.4.0" +async-trait = "0.1.71" +blake3 = "1.4.1" libsqlite3-sys = {version = "0.26.0", features = ["bundled-sqlcipher-vendored-openssl"]} log = "0.4.19" -serde_json = "1.0.96" +serde_json = "1.0.100" url = "2.4.0" # Daemon @@ -29,6 +29,6 @@ simplelog = "0.12.1" smol = "1.3.0" # Argument parsing -serde = {version = "1.0.164", features = ["derive"]} +serde = {version = "1.0.167", 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 86660e674..a832867da 100644 --- a/bin/genev/genev-cli/Cargo.toml +++ b/bin/genev/genev-cli/Cargo.toml @@ -13,11 +13,11 @@ darkfi = {path = "../../../", features = ["event-graph", "rpc", "bs58"]} darkfi-serial = {path = "../../../src/serial"} async-std = {version = "1.12.0", features = ["attributes"]} -clap = {version = "4.3.3", features = ["derive"]} +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.164", features = ["derive"]} -serde_json = "1.0.96" +serde = {version = "1.0.167", 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 713babec1..cd2dd251c 100644 --- a/bin/genev/genevd/Cargo.toml +++ b/bin/genev/genevd/Cargo.toml @@ -13,10 +13,10 @@ darkfi = {path = "../../../", features = ["event-graph", "rpc", "bs58", "util"]} darkfi-serial = {path = "../../../src/serial"} # Misc -async-trait = "0.1.68" +async-trait = "0.1.71" libsqlite3-sys = {version = "0.26.0", features = ["bundled-sqlcipher-vendored-openssl"]} log = "0.4.19" -serde_json = "1.0.96" +serde_json = "1.0.100" url = "2.4.0" # Daemon @@ -28,6 +28,6 @@ simplelog = "0.12.1" smol = "1.3.0" # Argument parsing -serde = {version = "1.0.164", features = ["derive"]} +serde = {version = "1.0.167", features = ["derive"]} structopt = "0.3.26" structopt-toml = "0.5.1" diff --git a/bin/lilith/Cargo.toml b/bin/lilith/Cargo.toml index 7b38e982d..2adeefc23 100644 --- a/bin/lilith/Cargo.toml +++ b/bin/lilith/Cargo.toml @@ -12,13 +12,13 @@ repository = "https://github.com/darkrenaissance/darkfi" darkfi = {path = "../../", features = ["net", "rpc"]} # Misc -async-trait = "0.1.68" +async-trait = "0.1.71" futures = "0.3.28" libsqlite3-sys = {version = "0.26.0", features = ["bundled-sqlcipher-vendored-openssl"]} log = "0.4.19" semver = "1.0.17" -serde_json = "1.0.96" -toml = "0.7.4" +serde_json = "1.0.100" +toml = "0.7.6" url = "2.4.0" # Daemon @@ -30,6 +30,6 @@ simplelog = "0.12.1" smol = "1.3.0" # Argument parsing -serde = {version = "1.0.164", features = ["derive"]} +serde = {version = "1.0.167", 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 4664a82e5..d55e3e8ca 100644 --- a/bin/tau/tau-cli/Cargo.toml +++ b/bin/tau/tau-cli/Cargo.toml @@ -16,7 +16,7 @@ async-std = {version = "1.12.0", features = ["attributes"]} # Misc chrono = "0.4.26" -colored = "2.0.0" +colored = "2.0.4" libsqlite3-sys = {version = "0.26.0", features = ["bundled-sqlcipher-vendored-openssl"]} log = "0.4.19" prettytable-rs = "0.10.0" @@ -26,6 +26,6 @@ textwrap = "0.16.0" url = "2.4.0" # Encoding and parsing -clap = {version = "4.3.3", features = ["derive"]} -serde = {version = "1.0.164", features = ["derive"]} -serde_json = "1.0.96" +clap = {version = "4.3.11", features = ["derive"]} +serde = {version = "1.0.167", features = ["derive"]} +serde_json = "1.0.100" diff --git a/bin/tau/taud/Cargo.toml b/bin/tau/taud/Cargo.toml index 3de91ec6c..0547d62e6 100644 --- a/bin/tau/taud/Cargo.toml +++ b/bin/tau/taud/Cargo.toml @@ -13,19 +13,19 @@ darkfi = { path = "../../../", features = ["event-graph", "rpc", "bs58"]} darkfi-serial = { path = "../../../src/serial" } # Misc -async-trait = "0.1.68" +async-trait = "0.1.71" bs58 = "0.5.0" chrono = "0.4.26" crypto_box = {version = "0.8.2", features = ["std"]} futures = "0.3.28" hex = "0.4.3" -libc = "0.2.144" +libc = "0.2.147" libsqlite3-sys = {version = "0.26.0", features = ["bundled-sqlcipher-vendored-openssl"]} log = "0.4.19" rand = "0.8.5" -serde_json = "1.0.96" -thiserror = "1.0.40" -toml = "0.7.4" +serde_json = "1.0.100" +thiserror = "1.0.43" +toml = "0.7.6" url = "2.4.0" # Daemon @@ -37,6 +37,6 @@ simplelog = "0.12.1" smol = "1.3.0" # Argument parsing -serde = {version = "1.0.164", features = ["derive"]} +serde = {version = "1.0.167", features = ["derive"]} structopt = "0.3.26" structopt-toml = "0.5.1" diff --git a/bin/vanityaddr/Cargo.toml b/bin/vanityaddr/Cargo.toml index 894758e13..c96d621b3 100644 --- a/bin/vanityaddr/Cargo.toml +++ b/bin/vanityaddr/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" [dependencies] bs58 = "0.5.0" -clap = {version = "4.3.3", features = ["derive"]} +clap = {version = "4.3.11", features = ["derive"]} ctrlc = "3.4.0" darkfi = {path = "../../", features = ["util"]} darkfi-sdk = {path = "../../src/sdk"} diff --git a/bin/vanityaddr/src/main.rs b/bin/vanityaddr/src/main.rs index 314e9c5bb..9fd24683c 100644 --- a/bin/vanityaddr/src/main.rs +++ b/bin/vanityaddr/src/main.rs @@ -179,12 +179,6 @@ fn main() { // Something fancy let progress = Arc::new(ProgressInc::new()); - /* - let progress = ProgressBar::new_spinner(); - let template = - ProgressStyle::default_bar().template("[{elapsed_precise}] {pos} attempts").unwrap(); - progress.set_style(template); - */ // Fire off the threadpool let progress_ = progress.clone(); diff --git a/bin/zkas/Cargo.toml b/bin/zkas/Cargo.toml index 1a1b81137..74d1382b2 100644 --- a/bin/zkas/Cargo.toml +++ b/bin/zkas/Cargo.toml @@ -9,5 +9,5 @@ license = "AGPL-3.0-only" edition = "2021" [dependencies] -clap = {version = "4.3.3", features = ["derive"]} +clap = {version = "4.3.11", features = ["derive"]} darkfi = {path = "../../", features = ["zkas"]} diff --git a/bin/zktool/Cargo.toml b/bin/zktool/Cargo.toml index 8f624c8eb..26bb73513 100644 --- a/bin/zktool/Cargo.toml +++ b/bin/zktool/Cargo.toml @@ -9,7 +9,7 @@ license = "AGPL-3.0-only" edition = "2021" [dependencies] -clap = {version = "4.3.3", features = ["derive"]} +clap = {version = "4.3.11", features = ["derive"]} darkfi = {path = "../../", features = ["zkas"]} darkfi-sdk = {path = "../../src/sdk"} diff --git a/example/dchat/Cargo.toml b/example/dchat/Cargo.toml index 4748a7759..e33e9d3b0 100644 --- a/example/dchat/Cargo.toml +++ b/example/dchat/Cargo.toml @@ -16,7 +16,7 @@ darkfi-serial = {path = "../../src/serial"} # ANCHOR: dependencies async-std = "1.12.0" -async-trait = "0.1.68" +async-trait = "0.1.71" easy-parallel = "3.3.0" smol = "1.3.0" @@ -24,7 +24,7 @@ log = "0.4.19" simplelog = "0.12.1" url = "2.4.0" -serde_json = "1.0.96" -serde = {version = "1.0.164", features = ["derive"]} -toml = "0.7.4" +serde_json = "1.0.100" +serde = {version = "1.0.167", features = ["derive"]} +toml = "0.7.6" # ANCHOR_END: dependencies diff --git a/example/p2pdebug/Cargo.toml b/example/p2pdebug/Cargo.toml index 805a87edc..d4baae7f0 100644 --- a/example/p2pdebug/Cargo.toml +++ b/example/p2pdebug/Cargo.toml @@ -15,8 +15,8 @@ darkfi = {path = "../../", features = ["net", "rpc"]} smol = "1.3.0" futures = "0.3.28" async-std = "1.12.0" -async-trait = "0.1.68" -async-channel = "1.8.0" +async-trait = "0.1.71" +async-channel = "1.9.0" async-executor = "1.5.1" easy-parallel = "3.3.0" @@ -24,11 +24,11 @@ easy-parallel = "3.3.0" rand = "0.8.5" # Misc -clap = {version = "4.3.3", features = ["derive"]} +clap = {version = "4.3.11", features = ["derive"]} log = "0.4.19" simplelog = "0.12.1" fxhash = "0.2.1" url = "2.4.0" # Encoding and parsing -serde_json = "1.0.96" +serde_json = "1.0.100" diff --git a/script/research/blockchain-explorer/Cargo.toml b/script/research/blockchain-explorer/Cargo.toml index 0e118098e..3c16cace1 100644 --- a/script/research/blockchain-explorer/Cargo.toml +++ b/script/research/blockchain-explorer/Cargo.toml @@ -10,8 +10,8 @@ edition = "2021" [workspace] [dependencies] -blake3 = "1.4.0" -clap = {version = "4.3.3", features = ["derive"]} +blake3 = "1.4.1" +clap = {version = "4.3.11", features = ["derive"]} darkfi = {path = "../../../", features = ["blockchain", "wallet", "rpc"]} darkfi-sdk = {path = "../../../src/sdk"} sled = "0.34.7" diff --git a/script/research/dhtd/Cargo.toml b/script/research/dhtd/Cargo.toml index 537a631d3..dfc57e3c8 100644 --- a/script/research/dhtd/Cargo.toml +++ b/script/research/dhtd/Cargo.toml @@ -10,22 +10,22 @@ path = "../../../" features = ["dht"] [dependencies] -async-channel = "1.8.0" +async-channel = "1.9.0" async-executor = "1.5.1" async-std = "1.12.0" -async-trait = "0.1.68" -blake3 = "1.4.0" +async-trait = "0.1.71" +blake3 = "1.4.1" ctrlc = { version = "3.4.0", features = ["termination"] } easy-parallel = "3.3.0" futures-lite = "1.13.0" log = "0.4.19" -serde_json = "1.0.96" +serde_json = "1.0.100" simplelog = "0.12.1" url = "2.4.0" # Argument parsing -serde = "1.0.164" -serde_derive = "1.0.164" +serde = "1.0.167" +serde_derive = "1.0.167" structopt = "0.3.26" structopt-toml = "0.5.1" diff --git a/src/contract/consensus/Cargo.toml b/src/contract/consensus/Cargo.toml index 8bcc9cc3b..3169411ad 100644 --- a/src/contract/consensus/Cargo.toml +++ b/src/contract/consensus/Cargo.toml @@ -9,11 +9,11 @@ edition = "2021" crate-type = ["cdylib", "rlib"] [dependencies] -blake3 = "1.4.0" +blake3 = "1.4.1" darkfi-sdk = { path = "../../sdk" } darkfi-serial = { path = "../../serial", features = ["derive", "crypto"] } darkfi-money-contract = { path = "../money", features = ["no-entrypoint"] } -thiserror = "1.0.40" +thiserror = "1.0.43" # The following dependencies are used for the client API and # probably shouldn't be in WASM diff --git a/src/contract/dao/Cargo.toml b/src/contract/dao/Cargo.toml index 583525007..3400ca495 100644 --- a/src/contract/dao/Cargo.toml +++ b/src/contract/dao/Cargo.toml @@ -13,7 +13,7 @@ bs58 = "0.5.0" darkfi-sdk = { path = "../../sdk" } darkfi-serial = { path = "../../serial", features = ["derive", "crypto"] } darkfi-money-contract = { path = "../money", features = ["no-entrypoint"] } -thiserror = "1.0.40" +thiserror = "1.0.43" # The following dependencies are used for the client API and # probably shouldn't be in WASM diff --git a/src/contract/deployooor/Cargo.toml b/src/contract/deployooor/Cargo.toml index 8debb24e9..c022685ec 100644 --- a/src/contract/deployooor/Cargo.toml +++ b/src/contract/deployooor/Cargo.toml @@ -11,7 +11,7 @@ crate-type = ["cdylib", "rlib"] [dependencies] darkfi-sdk = { path = "../../sdk" } darkfi-serial = { path = "../../serial", features = ["derive", "crypto"] } -thiserror = "1.0.40" +thiserror = "1.0.43" # We need to disable random using "custom" which makes the crate a noop # so the wasm32-unknown-unknown target is enabled. diff --git a/src/contract/money/Cargo.toml b/src/contract/money/Cargo.toml index 040b9416e..d4642fecc 100644 --- a/src/contract/money/Cargo.toml +++ b/src/contract/money/Cargo.toml @@ -12,7 +12,7 @@ crate-type = ["cdylib", "rlib"] bs58 = "0.5.0" darkfi-sdk = { path = "../../sdk" } darkfi-serial = { path = "../../serial", features = ["derive", "crypto"] } -thiserror = "1.0.40" +thiserror = "1.0.43" # The following dependencies are used for the client API and # probably shouldn't be in WASM diff --git a/src/contract/test-harness/Cargo.toml b/src/contract/test-harness/Cargo.toml index 74fc3a609..bacec3f9b 100644 --- a/src/contract/test-harness/Cargo.toml +++ b/src/contract/test-harness/Cargo.toml @@ -14,7 +14,7 @@ darkfi-money-contract = {path = "../money", features = ["client", "no-entrypoint darkfi-consensus-contract = {path = "../consensus", features = ["client", "no-entrypoint"]} darkfi-deployooor-contract = {path = "../deployooor", features = ["no-entrypoint"]} -blake3 = "1.4.0" +blake3 = "1.4.1" bs58 = "0.5.0" log = "0.4.19" rand = "0.8.5" diff --git a/src/dht/messages.rs b/src/dht/messages.rs index f7db2559b..7cd1a8f70 100644 --- a/src/dht/messages.rs +++ b/src/dht/messages.rs @@ -19,7 +19,7 @@ use std::collections::{HashMap, HashSet}; use darkfi_serial::{serialize, SerialDecodable, SerialEncodable}; -use rand::Rng; +use rand::{rngs::OsRng, Rng}; use crate::{impl_p2p_message, net::Message}; @@ -39,8 +39,7 @@ pub struct KeyRequest { impl KeyRequest { pub fn new(from: blake3::Hash, to: blake3::Hash, key: blake3::Hash) -> Self { // Generate a random id - let mut rng = rand::thread_rng(); - let n: u16 = rng.gen(); + let n: u16 = OsRng.gen(); let id = blake3::hash(&serialize(&n)); Self { id, from, to, key } } @@ -65,8 +64,7 @@ pub struct KeyResponse { impl KeyResponse { pub fn new(from: blake3::Hash, to: blake3::Hash, key: blake3::Hash, value: Vec) -> Self { // Generate a random id - let mut rng = rand::thread_rng(); - let n: u16 = rng.gen(); + let n: u16 = OsRng.gen(); let id = blake3::hash(&serialize(&n)); Self { id, from, to, key, value } } @@ -89,8 +87,7 @@ pub struct LookupRequest { impl LookupRequest { pub fn new(daemon: blake3::Hash, key: blake3::Hash, req_type: u8) -> Self { // Generate a random id - let mut rng = rand::thread_rng(); - let n: u16 = rng.gen(); + let n: u16 = OsRng.gen(); let id = blake3::hash(&serialize(&n)); Self { id, daemon, key, req_type } } @@ -109,8 +106,7 @@ pub struct LookupMapRequest { impl LookupMapRequest { pub fn new(daemon: blake3::Hash) -> Self { // Generate a random id - let mut rng = rand::thread_rng(); - let n: u16 = rng.gen(); + let n: u16 = OsRng.gen(); let id = blake3::hash(&serialize(&n)); Self { id, daemon } } @@ -129,8 +125,7 @@ pub struct LookupMapResponse { impl LookupMapResponse { pub fn new(lookup: HashMap>) -> Self { // Generate a random id - let mut rng = rand::thread_rng(); - let n: u16 = rng.gen(); + let n: u16 = OsRng.gen(); let id = blake3::hash(&serialize(&n)); Self { id, lookup } } diff --git a/src/dht/mod.rs b/src/dht/mod.rs index daefc1a85..ebad543a4 100644 --- a/src/dht/mod.rs +++ b/src/dht/mod.rs @@ -23,7 +23,7 @@ use chrono::Utc; use darkfi_serial::serialize; use futures::{select, FutureExt}; use log::{debug, error, warn}; -use rand::Rng; +use rand::{rngs::OsRng, Rng}; use smol::Executor; use crate::{ @@ -77,8 +77,7 @@ impl Dht { ex: Arc>, ) -> Result { // Generate a random id - let mut rng = rand::thread_rng(); - let n: u16 = rng.gen(); + let n: u16 = OsRng.gen(); let id = blake3::hash(&serialize(&n)); let map = HashMap::default(); let lookup = match initial { diff --git a/src/event_graph/mod.rs b/src/event_graph/mod.rs index 262770094..d4f1c4ef8 100644 --- a/src/event_graph/mod.rs +++ b/src/event_graph/mod.rs @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -use rand::{distributions::Alphanumeric, thread_rng, Rng}; +use rand::{distributions::Alphanumeric, rngs::OsRng, Rng}; pub mod events_queue; pub mod model; @@ -28,7 +28,7 @@ pub trait EventMsg { } pub fn gen_id(len: usize) -> String { - thread_rng().sample_iter(&Alphanumeric).take(len).map(char::from).collect() + OsRng.sample_iter(&Alphanumeric).take(len).map(char::from).collect() } #[cfg(test)] diff --git a/src/rpc/clock_sync.rs b/src/rpc/clock_sync.rs index 8b1e6ac90..a16c4619e 100644 --- a/src/rpc/clock_sync.rs +++ b/src/rpc/clock_sync.rs @@ -20,7 +20,7 @@ use std::{net::UdpSocket, time::Duration}; use log::debug; -use rand::prelude::SliceRandom; +use rand::{prelude::SliceRandom, rngs::OsRng}; use serde_json::json; use url::Url; @@ -37,7 +37,7 @@ const EPOCH: u32 = 2208988800; // 1900 /// retrieve their current system clock. async fn peer_request(peers: &[Url]) -> Result> { // Select peer, None if vector is empty. - let peer = peers.choose(&mut rand::thread_rng()); + let peer = peers.choose(&mut OsRng); match peer { None => Ok(None), Some(p) => { diff --git a/src/rpc/jsonrpc.rs b/src/rpc/jsonrpc.rs index a97d70d52..040e8aef3 100644 --- a/src/rpc/jsonrpc.rs +++ b/src/rpc/jsonrpc.rs @@ -20,7 +20,7 @@ use std::fmt; use async_std::sync::Arc; -use rand::Rng; +use rand::{rngs::OsRng, Rng}; use serde::{Deserialize, Deserializer, Serialize, Serializer}; use serde_json::{json, Value}; @@ -121,11 +121,9 @@ pub struct JsonRequest { impl JsonRequest { pub fn new(method: &str, parameters: Value) -> Self { - let mut rng = rand::thread_rng(); - Self { jsonrpc: json!("2.0"), - id: json!(rng.gen::()), + id: json!(OsRng.gen::()), method: json!(method), params: parameters, } diff --git a/src/sdk/Cargo.toml b/src/sdk/Cargo.toml index ffcb601fe..7196add79 100644 --- a/src/sdk/Cargo.toml +++ b/src/sdk/Cargo.toml @@ -13,7 +13,7 @@ doctest = false [dependencies] # Error handling -thiserror = "1.0.40" +thiserror = "1.0.43" # Serialization darkfi-serial = {version = "0.4.1", path = "../serial", features = ["derive", "crypto"]} @@ -23,7 +23,7 @@ bs58 = "0.5.0" # Cryptography blake2b_simd = "1.0.1" -blake3 = "1.4.0" +blake3 = "1.4.1" chacha20poly1305 = "0.10.1" halo2_gadgets = "0.3.0" bridgetree = "0.3.0" @@ -31,7 +31,7 @@ num-bigint = "0.4.3" num-traits = "0.2.15" pasta_curves = "0.5.1" rand_core = "0.6.4" -sha2 = "0.10.6" +sha2 = "0.10.7" # Misc lazy_static = "1.4.0" diff --git a/src/sdk/python/Cargo.toml b/src/sdk/python/Cargo.toml index 179d4ed9e..4781c9944 100644 --- a/src/sdk/python/Cargo.toml +++ b/src/sdk/python/Cargo.toml @@ -17,5 +17,5 @@ crate-type = ["cdylib"] darkfi = { path = "../../../", features = ["zk", "zkas"] } darkfi-sdk = { path = "../" } halo2_gadgets = "0.3.0" -pyo3 = "0.19.0" +pyo3 = "0.19.1" rand = "0.8.5" diff --git a/src/serial/Cargo.toml b/src/serial/Cargo.toml index 3811129dc..a266e74b5 100644 --- a/src/serial/Cargo.toml +++ b/src/serial/Cargo.toml @@ -13,7 +13,7 @@ darkfi-derive = {version = "0.4.1", path = "./derive", optional = true} futures-lite = {version = "1.13.0", optional = true} # Supported types for encoding -blake3 = {version = "1.4.0", optional = true} +blake3 = {version = "1.4.1", optional = true} bridgetree = {version = "0.3.0", optional = true} pasta_curves = {version = "0.5.1", optional = true} semver = {version = "1.0.17", optional = true} diff --git a/src/serial/derive-internal/Cargo.toml b/src/serial/derive-internal/Cargo.toml index 5d9f598b9..e04ce127d 100644 --- a/src/serial/derive-internal/Cargo.toml +++ b/src/serial/derive-internal/Cargo.toml @@ -9,6 +9,6 @@ license = "AGPL-3.0-only" edition = "2021" [dependencies] -proc-macro2 = "1.0.60" -quote = "1.0.28" +proc-macro2 = "1.0.63" +quote = "1.0.29" syn = {version = "1.0.109", features = ["full", "fold"]} diff --git a/src/serial/derive/Cargo.toml b/src/serial/derive/Cargo.toml index 5f02ee9c0..80e3305fd 100644 --- a/src/serial/derive/Cargo.toml +++ b/src/serial/derive/Cargo.toml @@ -13,7 +13,7 @@ proc-macro = true [dependencies] proc-macro-crate = "1.3.1" -proc-macro2 = "1.0.60" +proc-macro2 = "1.0.63" syn = {version = "1.0.109", features = ["full", "fold"]} darkfi-derive-internal = {version = "0.4.1", path = "../derive-internal"} diff --git a/src/system/mod.rs b/src/system/mod.rs index a982d95eb..dd2ab33ff 100644 --- a/src/system/mod.rs +++ b/src/system/mod.rs @@ -18,8 +18,6 @@ pub mod stoppable_task; pub mod subscriber; -pub mod types; pub use stoppable_task::{StoppableTask, StoppableTaskPtr}; pub use subscriber::{Subscriber, SubscriberPtr, Subscription}; -pub use types::ExecutorPtr; diff --git a/src/system/subscriber.rs b/src/system/subscriber.rs index 824502d0d..3c0dd2dea 100644 --- a/src/system/subscriber.rs +++ b/src/system/subscriber.rs @@ -20,7 +20,7 @@ use std::collections::HashMap; use async_std::sync::{Arc, Mutex}; use log::warn; -use rand::Rng; +use rand::{rngs::OsRng, Rng}; pub type SubscriberPtr = Arc>; @@ -67,8 +67,7 @@ impl Subscriber { } fn random_id() -> SubscriptionId { - let mut rng = rand::thread_rng(); - rng.gen() + OsRng.gen() } pub async fn subscribe(self: Arc) -> Subscription { diff --git a/src/system/types.rs b/src/system/types.rs deleted file mode 100644 index 9db03fcae..000000000 --- a/src/system/types.rs +++ /dev/null @@ -1,22 +0,0 @@ -/* This file is part of DarkFi (https://dark.fi) - * - * Copyright (C) 2020-2023 Dyne.org foundation - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -use smol::Executor; -use std::sync::Arc; - -pub type ExecutorPtr<'a> = Arc>; diff --git a/src/wallet/walletdb.rs b/src/wallet/walletdb.rs index 6c51c553c..46aa3cd7d 100644 --- a/src/wallet/walletdb.rs +++ b/src/wallet/walletdb.rs @@ -26,16 +26,6 @@ use crate::Result; pub type WalletPtr = Arc; -/* -/// Helper function to initialize `WalletPtr` -pub async fn init_wallet(wallet_path: &str, wallet_pass: &str) -> Result { - let expanded = expand_path(wallet_path)?; - let wallet_path = format!("sqlite://{}", expanded.to_str().unwrap()); - let wallet = WalletDb::new(&wallet_path, wallet_pass).await?; - Ok(wallet) -} -*/ - /// Types we want to allow to query from the SQL wallet #[repr(u8)] pub enum QueryType {