From 1d7866f6882c25e5a2376ac39369791c67671aeb Mon Sep 17 00:00:00 2001 From: parazyd Date: Tue, 29 Nov 2022 11:20:54 +0100 Subject: [PATCH] Update crate dependencies. --- Cargo.lock | 543 +++++++++--------- Cargo.toml | 30 +- bin/cashierd/Cargo.toml | 16 +- bin/dao/dao-cli/Cargo.toml | 8 +- bin/dao/daod/Cargo.toml | 6 +- bin/darkfid/Cargo.toml | 11 +- bin/darkotc/Cargo.toml | 4 +- bin/darkwiki/darkwiki-cli/Cargo.toml | 6 +- bin/darkwiki/darkwikid/Cargo.toml | 12 +- bin/dnetview/Cargo.toml | 8 +- bin/drk/Cargo.toml | 5 +- bin/faucetd/Cargo.toml | 11 +- bin/fud/fu/Cargo.toml | 4 +- bin/fud/fud/Cargo.toml | 8 +- bin/ircd/Cargo.toml | 10 +- bin/ircd2/Cargo.toml | 10 +- bin/lilith/Cargo.toml | 6 +- bin/tau/tau-cli/Cargo.toml | 8 +- bin/tau/taud/Cargo.toml | 8 +- bin/vanityaddr/Cargo.toml | 6 +- bin/vanityaddr/src/main.rs | 16 +- bin/zkas/Cargo.toml | 2 +- example/dao/Cargo.toml | 8 +- example/dao2/Cargo.toml | 8 +- example/dchat/Cargo.toml | 6 +- example/p2pdebug/Cargo.toml | 8 +- .../research/crypsinous_playground/Cargo.toml | 8 +- script/research/dhtd/Cargo.toml | 12 +- .../merkletree_null_benchmark/Cargo.toml | 2 +- script/research/nodes-tool/Cargo.toml | 4 +- script/research/raft-diag/Cargo.toml | 10 +- .../rpc_client_notifications/Cargo.toml | 2 +- .../research/state_usage_analyser/Cargo.toml | 2 +- script/research/x3dh/Cargo.toml | 2 +- src/consensus/state.rs | 6 +- src/error.rs | 11 +- src/rpc/websockets.rs | 10 +- src/sdk/Cargo.toml | 2 +- src/serial/Cargo.toml | 2 +- src/serial/derive-internal/Cargo.toml | 2 +- src/serial/derive/Cargo.toml | 2 +- src/util/time.rs | 22 +- tests/arithmetic_proof.rs | 16 +- tests/burn_proof.rs | 33 +- tests/mint_proof.rs | 31 +- tests/zkvm_opcodes.rs | 6 +- 46 files changed, 484 insertions(+), 469 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e86984882..cd516a618 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -40,9 +40,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.19" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ "memchr", ] @@ -99,22 +99,22 @@ version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28" dependencies = [ - "concurrent-queue", + "concurrent-queue 1.2.4", "event-listener", "futures-core", ] [[package]] name = "async-executor" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" +checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" dependencies = [ + "async-lock", "async-task", - "concurrent-queue", + "concurrent-queue 2.0.0", "fastrand", "futures-lite", - "once_cell", "slab", ] @@ -147,13 +147,13 @@ dependencies = [ [[package]] name = "async-io" -version = "1.10.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8121296a9f05be7f34aa4196b1747243b3b62e048bb7906f644f3fbfc490cf7" +checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794" dependencies = [ "async-lock", "autocfg", - "concurrent-queue", + "concurrent-queue 2.0.0", "futures-lite", "libc", "log", @@ -162,7 +162,7 @@ dependencies = [ "slab", "socket2", "waker-fn", - "winapi", + "windows-sys 0.42.0", ] [[package]] @@ -201,20 +201,20 @@ dependencies = [ [[package]] name = "async-process" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02111fd8655a613c25069ea89fc8d9bb89331fa77486eb3bc059ee757cfa481c" +checksum = "6381ead98388605d0d9ff86371043b5aa922a3905824244de40dc263a14fcba4" dependencies = [ "async-io", + "async-lock", "autocfg", "blocking", "cfg-if", "event-listener", "futures-lite", "libc", - "once_cell", "signal-hook", - "winapi", + "windows-sys 0.42.0", ] [[package]] @@ -264,9 +264,9 @@ checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" [[package]] name = "async-trait" -version = "0.1.58" +version = "0.1.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c" +checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364" dependencies = [ "proc-macro2", "quote", @@ -307,7 +307,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi", ] @@ -380,30 +380,21 @@ checksum = "72936ee4afc7f8f736d1c38383b56480b5497b4617b4a77bdbf1d2ababc76127" dependencies = [ "arrayref", "arrayvec", - "constant_time_eq", + "constant_time_eq 0.1.5", ] [[package]] name = "blake3" -version = "1.3.1" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" +checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", - "constant_time_eq", - "digest 0.10.5", -] - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", + "constant_time_eq 0.2.4", + "digest 0.10.6", ] [[package]] @@ -417,16 +408,16 @@ dependencies = [ [[package]] name = "blocking" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc" +checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8" dependencies = [ "async-channel", + "async-lock", "async-task", "atomic-waker", "fastrand", "futures-lite", - "once_cell", ] [[package]] @@ -494,9 +485,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" +checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" [[package]] name = "cache-padded" @@ -543,9 +534,9 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" [[package]] name = "cc" -version = "1.0.74" +version = "1.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581f5dba903aac52ea3feb5ec4810848460ee833876f1f9b0fdeab1f19091574" +checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" [[package]] name = "cfg-if" @@ -553,16 +544,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "chacha20" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed8738f14471a99f0e316c327e68fc82a3611cc2895fcb604b89eedaf8f39d95" -dependencies = [ - "cipher 0.2.5", - "rand_core 0.5.1", -] - [[package]] name = "chacha20" version = "0.9.0" @@ -570,7 +551,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7fc89c7c5b9e7a02dfe45cd2367bae382f9ed31c61ca8debe5f827c420a2f08" dependencies = [ "cfg-if", - "cipher 0.4.3", + "cipher", "cpufeatures", ] @@ -581,36 +562,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" dependencies = [ "aead", - "chacha20 0.9.0", - "cipher 0.4.3", + "chacha20", + "cipher", "poly1305", "zeroize", ] [[package]] name = "chrono" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" +checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" dependencies = [ "iana-time-zone", "js-sys", "num-integer", "num-traits", - "time 0.1.44", + "time 0.1.45", "wasm-bindgen", "winapi", ] -[[package]] -name = "cipher" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" -dependencies = [ - "generic-array", -] - [[package]] name = "cipher" version = "0.4.3" @@ -639,47 +611,17 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.23" +version = "4.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +checksum = "f94eecf2f2d0e0220737d9e6d8530da1e903b97dde58ebaf749262e85ce133c9" dependencies = [ - "atty", "bitflags", - "clap_derive 3.2.18", - "clap_lex 0.2.4", - "indexmap", + "clap_derive", + "clap_lex", + "is-terminal", "once_cell", "strsim 0.10.0", "termcolor", - "textwrap 0.16.0", -] - -[[package]] -name = "clap" -version = "4.0.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389ca505fd2c00136e0d0cd34bcd8b6bd0b59d5779aab396054b716334230c1c" -dependencies = [ - "atty", - "bitflags", - "clap_derive 4.0.21", - "clap_lex 0.3.0", - "once_cell", - "strsim 0.10.0", - "termcolor", -] - -[[package]] -name = "clap_derive" -version = "3.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" -dependencies = [ - "heck 0.4.0", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", ] [[package]] @@ -695,15 +637,6 @@ dependencies = [ "syn", ] -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - [[package]] name = "clap_lex" version = "0.3.0" @@ -758,6 +691,15 @@ dependencies = [ "cache-padded", ] +[[package]] +name = "concurrent-queue" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd7bef69dc86e3c610e4e7aed41035e2a7ed12e72dd7530f61327a6579a4390b" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "console" version = "0.15.2" @@ -784,6 +726,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +[[package]] +name = "constant_time_eq" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279" + [[package]] name = "core-foundation" version = "0.9.3" @@ -972,22 +920,22 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.11" +version = "0.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348" +checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset", + "memoffset 0.7.1", "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd42583b04998a5363558e5f9291ee5a5ff6b49944332103f251e7479a82aa7" +checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" dependencies = [ "cfg-if", "crossbeam-utils", @@ -995,9 +943,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" dependencies = [ "cfg-if", ] @@ -1066,9 +1014,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd26c32de5307fd08aac445a75c43472b14559d5dccdfba8022dbcd075838ebc" dependencies = [ "aead", - "chacha20 0.9.0", + "chacha20", "chacha20poly1305", - "salsa20 0.10.2", + "salsa20", "x25519-dalek", "xsalsa20poly1305", "zeroize", @@ -1137,9 +1085,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97abf9f0eca9e52b7f81b945524e76710e6cb2366aead23b7d4fbf72e281f888" +checksum = "d4a41a86530d0fe7f5d9ea779916b7cadd2d4f9add748b99c2c029cbbdfaf453" dependencies = [ "cc", "cxxbridge-flags", @@ -1149,9 +1097,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc32cc5fea1d894b77d269ddb9f192110069a8a9c1f1d441195fba90553dea3" +checksum = "06416d667ff3e3ad2df1cd8cd8afae5da26cf9cec4d0825040f88b5ca659a2f0" dependencies = [ "cc", "codespan-reporting", @@ -1164,15 +1112,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca220e4794c934dc6b1207c3b42856ad4c302f2df1712e9f8d2eec5afaacf1f" +checksum = "820a9a2af1669deeef27cb271f476ffd196a2c4b6731336011e0ba63e2c7cf71" [[package]] name = "cxxbridge-macro" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b846f081361125bfc8dc9d3940c84e1fd83ba54bbca7b17cd29483c828be0704" +checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470" dependencies = [ "proc-macro2", "quote", @@ -1187,7 +1135,7 @@ dependencies = [ "async-executor", "async-std", "async-trait", - "clap 3.2.23", + "clap 4.0.28", "darkfi", "futures", "log", @@ -1275,7 +1223,7 @@ dependencies = [ "bs58", "chacha20poly1305", "chrono", - "clap 3.2.23", + "clap 4.0.28", "crypto_api_chachapoly", "darkfi-derive", "darkfi-derive-internal", @@ -1313,7 +1261,7 @@ dependencies = [ "rustls-pemfile", "serde", "serde_json", - "sha2 0.10.6", + "sha2", "simplelog", "sled", "smol", @@ -1322,10 +1270,9 @@ dependencies = [ "structopt", "structopt-toml", "subtle", - "termion", + "termion 2.0.1", "thiserror", "toml", - "tungstenite", "url", "wasmer", "wasmer-compiler-singlepass", @@ -1384,7 +1331,7 @@ dependencies = [ "pasta_curves", "rand", "rand_core 0.6.4", - "sha2 0.10.6", + "sha2", "subtle", "thiserror", ] @@ -1419,7 +1366,6 @@ dependencies = [ "fxhash", "incrementalmerkletree", "lazy-init", - "libsqlite3-sys", "log", "pasta_curves", "rand", @@ -1440,7 +1386,7 @@ version = "0.3.0" dependencies = [ "async-std", "bs58", - "clap 3.2.23", + "clap 4.0.28", "darkfi", "darkfi-sdk", "darkfi-serial", @@ -1674,11 +1620,11 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ - "block-buffer 0.10.3", + "block-buffer", "crypto-common", "subtle", ] @@ -1719,7 +1665,7 @@ version = "0.3.0" dependencies = [ "async-channel", "async-std", - "clap 3.2.23", + "clap 4.0.28", "darkfi", "easy-parallel", "fxhash", @@ -1731,7 +1677,7 @@ dependencies = [ "serde_json", "simplelog", "smol", - "termion", + "termion 2.0.1", "thiserror", "tui", "url", @@ -1750,12 +1696,11 @@ dependencies = [ "anyhow", "async-std", "bs58", - "clap 4.0.25", + "clap 4.0.28", "darkfi", "darkfi-money-contract", "darkfi-sdk", "darkfi-serial", - "libsqlite3-sys", "prettytable-rs", "rand", "serde_json", @@ -1766,19 +1711,19 @@ dependencies = [ [[package]] name = "dryoc" -version = "0.3.14" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63e3117a596ee19e5e1b00c5a7bd39a083bf631b23d52fc960428556fb9ef5d8" +checksum = "77c379d15d4e38e40b7a58aa961190e9a0d94aba6d331a1291a01be69335cf9f" dependencies = [ "bitflags", - "chacha20 0.6.0", + "chacha20", "curve25519-dalek", "generic-array", "lazy_static", "libc", - "rand_core 0.5.1", - "salsa20 0.7.2", - "sha2 0.9.9", + "rand_core 0.6.4", + "salsa20", + "sha2", "subtle", "winapi", "zeroize", @@ -1830,9 +1775,9 @@ checksum = "6907e25393cdcc1f4f3f513d9aac1e840eb1cc341a0fccb01171f7d14d10b946" [[package]] name = "ed25519-compact" -version = "1.0.16" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e18997d4604542d0736fae2c5ad6de987f0a50530cbcc14a7ce5a685328a252d" +checksum = "1f2d21333b679bbbac680b3eb45c86937e42f69277028f4e97b599b80b86c253" dependencies = [ "ct-codecs", "getrandom 0.2.8", @@ -1899,17 +1844,38 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.9.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" dependencies = [ - "atty", "humantime", + "is-terminal", "log", "regex", "termcolor", ] +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + [[package]] name = "error-chain" version = "0.12.4" @@ -1970,7 +1936,6 @@ dependencies = [ "easy-parallel", "hex", "lazy-init", - "libsqlite3-sys", "log", "rand", "serde", @@ -1997,12 +1962,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" dependencies = [ "crc32fast", - "miniz_oxide 0.5.4", + "miniz_oxide 0.6.2", ] [[package]] @@ -2114,7 +2079,7 @@ name = "fu" version = "0.3.0" dependencies = [ "async-std", - "clap 3.2.23", + "clap 4.0.28", "darkfi", "log", "serde_json", @@ -2449,6 +2414,15 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + [[package]] name = "hex" version = "0.4.3" @@ -2520,9 +2494,9 @@ dependencies = [ [[package]] name = "image" -version = "0.24.4" +version = "0.24.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd8e4fb07cf672b1642304e731ef8a6a4c7891d67bb4fd4f5ce58cd6ed86803c" +checksum = "69b7ea949b537b0fd0af141fff8c77690f2ce96f4f41f042ccb6c69c6c965945" dependencies = [ "bytemuck", "byteorder", @@ -2544,9 +2518,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.1" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ "autocfg", "hashbrown", @@ -2554,12 +2528,13 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.17.1" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfddc9561e8baf264e0e45e197fd7696320026eb10a8180340debc27b18f535b" +checksum = "4295cbb7573c16d310e99e713cf9e75101eb190ab31fccd35f2d2691b4352b19" dependencies = [ "console", "number_prefix", + "portable-atomic", "unicode-width", ] @@ -2581,6 +2556,16 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "io-lifetimes" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" +dependencies = [ + "libc", + "windows-sys 0.42.0", +] + [[package]] name = "ipnet" version = "2.5.1" @@ -2605,7 +2590,7 @@ dependencies = [ "async-trait", "bs58", "chrono", - "clap 3.2.23", + "clap 4.0.28", "crypto_box", "ctrlc", "darkfi", @@ -2637,7 +2622,7 @@ dependencies = [ "async-trait", "bs58", "chrono", - "clap 3.2.23", + "clap 4.0.28", "crypto_box", "ctrlc", "darkfi", @@ -2661,6 +2646,18 @@ dependencies = [ "url", ] +[[package]] +name = "is-terminal" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330" +dependencies = [ + "hermit-abi 0.2.6", + "io-lifetimes", + "rustix", + "windows-sys 0.42.0", +] + [[package]] name = "itertools" version = "0.10.5" @@ -2684,9 +2681,9 @@ checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" [[package]] name = "jpeg-decoder" -version = "0.2.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9478aa10f73e7528198d75109c8be5cd7d15fb530238040148d5f9a22d4c5b3b" +checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" [[package]] name = "js-sys" @@ -2781,6 +2778,12 @@ dependencies = [ "cc", ] +[[package]] +name = "linux-raw-sys" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f" + [[package]] name = "lock_api" version = "0.4.9" @@ -2818,9 +2821,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memmap2" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95af15f345b17af2efc8ead6080fb8bc376f8cec1b35277b935637595fe77498" +checksum = "4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc" dependencies = [ "libc", ] @@ -2834,6 +2837,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -2963,7 +2975,7 @@ version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", ] @@ -3011,9 +3023,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.42" +version = "0.10.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13" +checksum = "020433887e44c27ff16365eaa2d380547a94544ad509aff6eb5b6e3e0b27b376" dependencies = [ "bitflags", "cfg-if", @@ -3043,9 +3055,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.77" +version = "0.9.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03b84c3b2d099b81f0953422b4d4ad58761589d0229b5506356afca05a3670a" +checksum = "07d5c8cb6e57b3a3612064d7b18b117912b4ce70955c2504d4b741c9e244b132" dependencies = [ "autocfg", "cc", @@ -3056,9 +3068,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.3.1" +version = "6.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3baf96e39c5359d2eb0dd6ccb42c62b91d9678aa68160d261b9e0ccbf9e9dea9" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" [[package]] name = "parking" @@ -3084,7 +3096,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.4", + "parking_lot_core 0.9.5", ] [[package]] @@ -3103,9 +3115,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0" +checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" dependencies = [ "cfg-if", "libc", @@ -3171,9 +3183,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a528564cc62c19a7acac4d81e01f39e53e25e17b934878f4c6d25cc2836e62f8" +checksum = "5f400b0f7905bf702f9f3dc3df5a121b16c54e9e8012c082905fdf09a931861a" dependencies = [ "thiserror", "ucd-trie", @@ -3277,16 +3289,16 @@ dependencies = [ [[package]] name = "polling" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4609a838d88b73d8238967b60dd115cc08d38e2bbaf51ee1e4b695f89122e2" +checksum = "9f7d73f1eaed1ca1fb37b54dcc9b38e3b17d6c7b8ecb7abfffcac8d0351f17d4" dependencies = [ "autocfg", "cfg-if", "libc", "log", "wepoll-ffi", - "winapi", + "windows-sys 0.42.0", ] [[package]] @@ -3300,6 +3312,12 @@ dependencies = [ "universal-hash", ] +[[package]] +name = "portable-atomic" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15eb2c6e362923af47e13c23ca5afb859e83d54452c55b0b9ac763b8f7c1ac16" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -3492,11 +3510,10 @@ dependencies = [ [[package]] name = "rayon" -version = "1.5.3" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" +checksum = "1e060280438193c554f654141c9ea9417886713b7acd75974c85b18a69a88e0b" dependencies = [ - "autocfg", "crossbeam-deque", "either", "rayon-core", @@ -3504,9 +3521,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.9.3" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" +checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -3650,7 +3667,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -3694,6 +3711,20 @@ dependencies = [ "semver 0.11.0", ] +[[package]] +name = "rustix" +version = "0.36.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb93e85278e08bb5788653183213d3a60fc242b10cb9be96586f5a73dcb67c23" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.42.0", +] + [[package]] name = "rustls" version = "0.20.7" @@ -3739,22 +3770,13 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" -[[package]] -name = "salsa20" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "399f290ffc409596022fce5ea5d4138184be4784f2b28c62c59f0d8389059a15" -dependencies = [ - "cipher 0.2.5", -] - [[package]] name = "salsa20" version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" dependencies = [ - "cipher 0.4.3", + "cipher", ] [[package]] @@ -3856,9 +3878,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.147" +version = "1.0.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +checksum = "e53f64bb4ba0191d6d0676e1b141ca55047d83b74f5607e6d8eb88126c52c2dc" dependencies = [ "serde_derive", ] @@ -3876,9 +3898,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.147" +version = "1.0.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +checksum = "a55492425aa53521babf6137309e7d34c20bbfbbfcfe2c7f3a047fd1f6b92c0c" dependencies = [ "proc-macro2", "quote", @@ -3887,9 +3909,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.87" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" +checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" dependencies = [ "itoa 1.0.4", "ryu", @@ -3898,26 +3920,13 @@ dependencies = [ [[package]] name = "sha-1" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" +checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.5", -] - -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", + "digest 0.10.6", ] [[package]] @@ -3928,7 +3937,7 @@ checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -4148,7 +4157,7 @@ dependencies = [ "once_cell", "paste", "percent-encoding", - "sha2 0.10.6", + "sha2", "smallvec", "sqlformat", "sqlx-rt", @@ -4169,7 +4178,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "sha2 0.10.6", + "sha2", "sqlx-core", "sqlx-rt", "syn", @@ -4287,9 +4296,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.103" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" +checksum = "4ae548ec36cf198c0ef7710d3c230987c2d6d7bd98ad6edc0274462724c585ce" dependencies = [ "proc-macro2", "quote", @@ -4337,7 +4346,7 @@ version = "0.4.0" dependencies = [ "async-std", "chrono", - "clap 3.2.23", + "clap 4.0.28", "colored", "darkfi", "fxhash", @@ -4445,6 +4454,18 @@ dependencies = [ "redox_termios", ] +[[package]] +name = "termion" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "659c1f379f3408c7e5e84c7d0da6d93404e3800b6b9d063ba24436419302ec90" +dependencies = [ + "libc", + "numtoa", + "redox_syscall", + "redox_termios", +] + [[package]] name = "textwrap" version = "0.11.0" @@ -4465,12 +4486,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - [[package]] name = "thiserror" version = "1.0.37" @@ -4493,9 +4508,9 @@ dependencies = [ [[package]] name = "time" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" dependencies = [ "libc", "wasi 0.10.0+wasi-snapshot-preview1", @@ -4602,7 +4617,7 @@ dependencies = [ "bitflags", "cassowary", "crossterm", - "termion", + "termion 1.5.6", "unicode-segmentation", "unicode-width", ] @@ -4763,7 +4778,7 @@ name = "vanityaddr" version = "0.3.0" dependencies = [ "bs58", - "clap 3.2.23", + "clap 4.0.28", "ctrlc", "darkfi", "darkfi-sdk", @@ -4903,18 +4918,18 @@ checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" [[package]] name = "wasm-encoder" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5816e88e8ea7335016aa62eb0485747f786136d505a9b3890f8c400211d9b5f" +checksum = "05632e0a66a6ed8cca593c24223aabd6262f256c3693ad9822c315285f010614" dependencies = [ "leb128", ] [[package]] name = "wasmer" -version = "3.0.0-rc.2" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acfd471eb798272c684bf6c958ec70c9e6e2cceefc05c9cfe293d995c7fc9cc0" +checksum = "4927f95d9f17b9a3b123c99ca9d9d45952a7df1b97826545212d9517e1c54ec3" dependencies = [ "bytes", "cfg-if", @@ -4937,9 +4952,9 @@ dependencies = [ [[package]] name = "wasmer-compiler" -version = "3.0.0-rc.2" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a075ace8064d26557356cb499ad6e6559346baa825e138122565611c983753ed" +checksum = "50749ff89787ebce029e83b77cfb1585c1eb67ff7cb34aaa7ba64ebeb2b474f2" dependencies = [ "backtrace", "cfg-if", @@ -4961,9 +4976,9 @@ dependencies = [ [[package]] name = "wasmer-compiler-cranelift" -version = "3.0.0-rc.2" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c45fe71c800c50755d675465b50e017038213b8f75bb14d04b8298b2c16a62e2" +checksum = "009219b2cb6e5e7f398249d16293940a21f16536f3831ce1a140e503ccab76e5" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -4980,9 +4995,9 @@ dependencies = [ [[package]] name = "wasmer-compiler-singlepass" -version = "3.0.0-rc.2" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af10e365ef38ab13b1f062d447fb5545546ccc6b99b5daa836fd503eceafb562" +checksum = "3068f8165ef7657fb80f1d38cf6e2ecb932311f8b5a773a5902e64c65d2636a8" dependencies = [ "byteorder", "dynasm", @@ -4998,9 +5013,9 @@ dependencies = [ [[package]] name = "wasmer-derive" -version = "3.0.0-rc.2" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4bee8b64f88235d9b5ed24b76245cbbcc3a252a696a0f65baeb732060a3d005" +checksum = "d19406a021b637c2d46d202a96f15d7d27b2762af7aeeb2ebcb5896b329ab313" dependencies = [ "proc-macro-error", "proc-macro2", @@ -5010,9 +5025,9 @@ dependencies = [ [[package]] name = "wasmer-middlewares" -version = "3.0.0-rc.2" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29f50edd5e8e19fe81099a3757e5168d65695ae262c98de0518336148094bdd2" +checksum = "d010ca5c4749819a953fb030b79ead7acbb428b2c1c204982ce0b401810f02d1" dependencies = [ "wasmer", "wasmer-types", @@ -5021,9 +5036,9 @@ dependencies = [ [[package]] name = "wasmer-types" -version = "3.0.0-rc.2" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5806cf609ca299b265f93b5a8c4c2156933fd7d592c5861a847f11336cf8dc4" +checksum = "3bfa18d5568dec7df1bc92023bee9adcb135a2d59288e080788add89705262b4" dependencies = [ "enum-iterator", "enumset", @@ -5036,9 +5051,9 @@ dependencies = [ [[package]] name = "wasmer-vm" -version = "3.0.0-rc.2" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0898e214975ccdbbd0cddc2aa89839b34b6d0f373bc442c7c675cbb024019468" +checksum = "3e2ab5dbf2886cf842f1edfde10d8cbeb687fe2f27a5f7b23b5058bed1696441" dependencies = [ "backtrace", "cc", @@ -5049,7 +5064,7 @@ dependencies = [ "lazy_static", "libc", "mach", - "memoffset", + "memoffset 0.6.5", "more-asserts", "region", "scopeguard", @@ -5066,9 +5081,9 @@ checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a" [[package]] name = "wast" -version = "48.0.0" +version = "50.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84825b5ac7164df8260c9e2b2e814075334edbe7ac426f2469b93a5eeac23cce" +checksum = "a2cbb59d4ac799842791fe7e806fa5dbbf6b5554d538e51cc8e176db6ff0ae34" dependencies = [ "leb128", "memchr", @@ -5078,9 +5093,9 @@ dependencies = [ [[package]] name = "wat" -version = "1.0.50" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "129da4a03ec6d2a815f42c88f641824e789d5be0d86d2f90aa8a218c7068e0be" +checksum = "584aaf7a1ecf4d383bbe1a25eeab0cbb8ff96acc6796707ff65cde48f4632f15" dependencies = [ "wast", ] @@ -5305,9 +5320,9 @@ dependencies = [ [[package]] name = "wyz" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b31594f29d27036c383b53b59ed3476874d518f0efb151b27a4c275141390e" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" dependencies = [ "tap", ] @@ -5331,7 +5346,7 @@ checksum = "472c385ee974833d7e59979eeb74175d56774be3768b5bcc581337e21396bda3" dependencies = [ "aead", "poly1305", - "salsa20 0.10.2", + "salsa20", "subtle", "zeroize", ] @@ -5382,6 +5397,6 @@ dependencies = [ name = "zkas" version = "0.3.0" dependencies = [ - "clap 3.2.23", + "clap 4.0.28", "darkfi", ] diff --git a/Cargo.toml b/Cargo.toml index 1ad16b831..14b2d7b23 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,7 +58,7 @@ thiserror = "1.0.37" # async-runtime async-std = {version = "1.12.0", features = ["attributes"], optional = true} -async-trait = {version = "0.1.58", optional = true} +async-trait = {version = "0.1.59", optional = true} futures = {version = "0.3.25", optional = true} smol = {version = "1.2.5", optional = true} @@ -69,27 +69,27 @@ ipnet = {version = "2.5.1", optional = true} socket2 = {version = "0.4.7", optional = true} # TLS cert utilities -ed25519-compact = {version = "1.0.16", features = ["pem"], optional = true} +ed25519-compact = {version = "2.0.2", features = ["pem"], optional = true} rcgen = {version = "0.10.0", features = ["pem"], optional = true} rustls-pemfile = {version = "1.0.1", optional = true} # Encoding bs58 = {version = "0.4.0", optional = true} hex = {version = "0.4.3", optional = true} -serde_json = {version = "1.0.87", optional = true} -serde = {version = "1.0.147", features = ["derive"], optional = true} +serde_json = {version = "1.0.89", optional = true} +serde = {version = "1.0.148", features = ["derive"], optional = true} structopt = {version= "0.3.26", optional = true} structopt-toml = {version= "0.5.1", optional = true} toml = {version = "0.5.9", optional = true} # Utilities # TODO: check chrono usage and impl our own -chrono = {version = "0.4.22", optional = true} +chrono = {version = "0.4.23", 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} fxhash = {version = "0.2.1", optional = true} -indexmap = {version = "1.9.1", optional = true} +indexmap = {version = "1.9.2", optional = true} itertools = {version = "0.10.5", optional = true} lazy-init = {version = "0.5.1", optional = true} lazy_static = {version = "1.4.0", optional = true} @@ -99,13 +99,12 @@ url = {version = "2.3.1", features = ["serde"], optional = true} # Misc # TODO: Implement something simple and kill these deps -indicatif = {version = "0.17.1", optional = true} +indicatif = {version = "0.17.2", optional = true} simplelog = {version = "0.12.0", optional = true} -termion = {version = "1.5.6", optional = true} +termion = {version = "2.0.1", optional = true} # Websockets async-tungstenite = {version = "0.18.0", optional = true} -tungstenite = {version = "0.17.3", optional = true} # socks5 fast-socks5 = {version = "0.4.3", optional = true} @@ -113,7 +112,7 @@ fast-socks5 = {version = "0.4.3", optional = true} # Crypto rand = {version = "0.8.5", optional = true} blake2b_simd = {version = "1.0.0", optional = true} -blake3 = {version = "1.3.1", optional = true} +blake3 = {version = "1.3.3", optional = true} chacha20poly1305 = {version = "0.10.1", optional = true} crypto_api_chachapoly = {version = "0.5.0", optional = true} halo2_proofs = {version = "0.2.0", optional = true} @@ -126,9 +125,9 @@ sha2 = {version = "0.10.6", optional = true} # Smart contract runtime darkfi-sdk = {path = "src/sdk", optional = true} -wasmer = {version = "3.0.0-rc.2", optional = true} -wasmer-compiler-singlepass = {version = "3.0.0-rc.2", optional = true} -wasmer-middlewares = {version = "3.0.0-rc.2", optional = true} +wasmer = {version = "3.0.2", optional = true} +wasmer-compiler-singlepass = {version = "3.0.2", optional = true} +wasmer-middlewares = {version = "3.0.2", optional = true} # Wallet management libsqlite3-sys = {version = "0.24.2", features = ["bundled-sqlcipher"], optional = true } @@ -143,11 +142,11 @@ dashu = { version = "0.2.0", git = "https://github.com/ertosns/dashu", optional= rcell = { version = "1.1.3", optional=true } [dev-dependencies] -clap = {version = "3.2.20", features = ["derive"]} +clap = {version = "4.0.28", features = ["derive"]} halo2_proofs = {version = "0.2.0", features = ["dev-graph", "gadget-traces", "sanity-checks"]} halo2_gadgets = {version = "0.2.0", features = ["dev-graph", "test-dependencies"]} plotters = "0.3.4" -env_logger = "0.9.3" +env_logger = "0.10.0" easy-parallel = "3.2.0" @@ -330,7 +329,6 @@ wasm-runtime = [ websockets = [ "async-tungstenite", - "tungstenite", ] zkas = [ diff --git a/bin/cashierd/Cargo.toml b/bin/cashierd/Cargo.toml index 2b5104131..297b594e2 100644 --- a/bin/cashierd/Cargo.toml +++ b/bin/cashierd/Cargo.toml @@ -17,16 +17,16 @@ features = ["wallet", "node", "rpc"] smol = "1.2.5" futures = "0.3.25" async-std = "1.12.0" -async-trait = "0.1.58" +async-trait = "0.1.59" async-channel = "1.7.1" -async-executor = "1.4.1" +async-executor = "1.5.0" easy-parallel = "3.2.0" # Crypto rand = "0.8.5" # Misc -clap = {version = "3.2.20", features = ["derive"]} +clap = {version = "4.0.28", features = ["derive"]} log = "0.4.17" num_cpus = "1.14.0" simplelog = "0.12.0" @@ -35,8 +35,8 @@ url = "2.3.1" fxhash = "0.2.1" # Encoding and parsing -serde = {version = "1.0.147", features = ["derive"]} -serde_json = "1.0.87" +serde = {version = "1.0.148", features = ["derive"]} +serde_json = "1.0.89" # Bitcoin bridge dependencies bdk = {version = "0.24.0", optional = true} @@ -54,11 +54,11 @@ num-bigint = {version = "0.4.3", features = ["rand", "serde"], optional = true} # Solana bridge dependencies native-tls = {version = "0.2.11", optional = true} async-native-tls = {version = "0.4.0", optional = true} -solana-client = {version = "1.14.7", optional = true} -solana-sdk = {version = "1.14.7", optional = true} +solana-client = {version = "1.14.9", optional = true} +solana-sdk = {version = "1.14.9", optional = true} spl-associated-token-account = {version = "1.1.1", features = ["no-entrypoint"], optional = true} spl-token = {version = "3.5.0", features = ["no-entrypoint"], optional = true} -tungstenite = {version = "0.17.3", optional = true} +tungstenite = {version = "0.18.0", optional = true} [features] btc = [ diff --git a/bin/dao/dao-cli/Cargo.toml b/bin/dao/dao-cli/Cargo.toml index 79f8a6b1d..67e634fc9 100644 --- a/bin/dao/dao-cli/Cargo.toml +++ b/bin/dao/dao-cli/Cargo.toml @@ -17,12 +17,12 @@ features = ["rpc"] smol = "1.2.5" futures = "0.3.25" async-std = {version = "1.12.0", features = ["attributes"]} -async-trait = "0.1.58" +async-trait = "0.1.59" async-channel = "1.7.1" -async-executor = "1.4.1" +async-executor = "1.5.0" # Misc -clap = {version = "3.2.20", features = ["derive"]} +clap = {version = "4.0.28", features = ["derive"]} log = "0.4.17" num_cpus = "1.14.0" simplelog = "0.12.0" @@ -30,4 +30,4 @@ url = "2.3.1" prettytable-rs = "0.9.0" # Encoding and parsing -serde_json = "1.0.87" +serde_json = "1.0.89" diff --git a/bin/dao/daod/Cargo.toml b/bin/dao/daod/Cargo.toml index 0d9a284aa..40545b73e 100644 --- a/bin/dao/daod/Cargo.toml +++ b/bin/dao/daod/Cargo.toml @@ -17,9 +17,9 @@ darkfi-serial = {path = "../../../src/serial"} smol = "1.2.5" futures = "0.3.25" async-std = {version = "1.12.0", features = ["attributes"]} -async-trait = "0.1.58" +async-trait = "0.1.59" async-channel = "1.7.1" -async-executor = "1.4.1" +async-executor = "1.5.0" easy-parallel = "3.2.0" # Misc @@ -37,7 +37,7 @@ pasta_curves = "0.4.1" incrementalmerkletree = "0.3.0" # Encoding and parsing -serde_json = "1.0.87" +serde_json = "1.0.89" bs58 = "0.4.0" fxhash = "0.2.1" diff --git a/bin/darkfid/Cargo.toml b/bin/darkfid/Cargo.toml index 1d02653dc..693932330 100644 --- a/bin/darkfid/Cargo.toml +++ b/bin/darkfid/Cargo.toml @@ -10,10 +10,10 @@ edition = "2021" [dependencies] async-std = "1.12.0" -async-trait = "0.1.58" -blake3 = "1.3.1" +async-trait = "0.1.59" +blake3 = "1.3.3" bs58 = "0.4.0" -chrono = "0.4.22" +chrono = "0.4.23" ctrlc = { version = "3.2.3", features = ["termination"] } darkfi = {path = "../../", features = ["blockchain", "wallet", "rpc", "net"]} darkfi-sdk = {path = "../../src/sdk"} @@ -25,15 +25,14 @@ lazy-init = "0.5.1" log = "0.4.17" pasta_curves = "0.4.1" rand = "0.8.5" -serde_json = "1.0.87" +serde_json = "1.0.89" simplelog = "0.12.0" sled = "0.34.7" smol = "1.2.5" -libsqlite3-sys = {version = "0.24.2", features = ["bundled-sqlcipher"]} sqlx = {version = "0.6.2", features = ["runtime-async-std-native-tls", "sqlite"]} url = "2.3.1" # Argument parsing -serde = {version = "1.0.147", features = ["derive"]} +serde = {version = "1.0.148", features = ["derive"]} structopt = "0.3.26" structopt-toml = "0.5.1" diff --git a/bin/darkotc/Cargo.toml b/bin/darkotc/Cargo.toml index f53c47d64..65f298ac1 100644 --- a/bin/darkotc/Cargo.toml +++ b/bin/darkotc/Cargo.toml @@ -11,12 +11,12 @@ edition = "2021" [dependencies] async-std = {version = "1.12.0", features = ["attributes"]} bs58 = "0.4.0" -clap = {version = "3.2.20", features = ["derive"]} +clap = {version = "4.0.28", features = ["derive"]} darkfi = {path = "../../", features = ["crypto", "rpc", "util", "tx"]} darkfi-sdk = {path = "../../src/sdk"} darkfi-serial = {path = "../../src/serial"} halo2_proofs = "0.2.0" halo2_gadgets = "0.2.0" rand = "0.8.5" -serde_json = "1.0.87" +serde_json = "1.0.89" url = "2.3.1" diff --git a/bin/darkwiki/darkwiki-cli/Cargo.toml b/bin/darkwiki/darkwiki-cli/Cargo.toml index 1f6c71e88..5bfe29535 100644 --- a/bin/darkwiki/darkwiki-cli/Cargo.toml +++ b/bin/darkwiki/darkwiki-cli/Cargo.toml @@ -14,7 +14,7 @@ darkfi = {path = "../../../", features = ["rpc"]} # Async smol = "1.2.5" async-std = {version = "1.12.0", features = ["attributes"]} -async-trait = "0.1.58" +async-trait = "0.1.59" async-channel = "1.7.1" futures = "0.3.25" @@ -25,6 +25,6 @@ rand = "0.8.5" url = "2.3.1" # Encoding and parsing -serde = {version = "1.0.147", features = ["derive"]} -serde_json = "1.0.87" +serde = {version = "1.0.148", features = ["derive"]} +serde_json = "1.0.89" structopt = "0.3.26" diff --git a/bin/darkwiki/darkwikid/Cargo.toml b/bin/darkwiki/darkwikid/Cargo.toml index 792bfa447..478882324 100644 --- a/bin/darkwiki/darkwikid/Cargo.toml +++ b/bin/darkwiki/darkwikid/Cargo.toml @@ -10,20 +10,20 @@ edition = "2021" [dependencies] async-std = "1.12.0" -async-trait = "0.1.58" -blake3 = "1.3.1" +async-trait = "0.1.59" +blake3 = "1.3.3" bs58 = "0.4.0" darkfi = {path = "../../../", features = ["raft", "rpc", "util"]} darkfi-serial = {path = "../../../src/serial"} -dryoc = "0.3.14" +dryoc = "0.4.2" easy-parallel = "3.2.0" futures = "0.3.25" fxhash = "0.2.1" lazy_static = "1.4.0" log = "0.4.17" -serde = "1.0.147" -serde_derive = "1.0.147" -serde_json = "1.0.87" +serde = "1.0.148" +serde_derive = "1.0.148" +serde_json = "1.0.89" signal-hook-async-std = "0.2.2" signal-hook = "0.3.14" simplelog = "0.12.0" diff --git a/bin/dnetview/Cargo.toml b/bin/dnetview/Cargo.toml index 0a2cb444f..8214d8f90 100644 --- a/bin/dnetview/Cargo.toml +++ b/bin/dnetview/Cargo.toml @@ -14,7 +14,7 @@ features = ["rpc"] [dependencies] # Tui -termion = "1.5.6" +termion = "2.0.1" tui = {version = "0.19.0", features = ["termion"]} # Async @@ -24,7 +24,7 @@ easy-parallel = "3.2.0" async-channel = "1.7.1" # Misc -clap = {version = "3.2.20", features = ["derive"]} +clap = {version = "4.0.28", features = ["derive"]} rand = "0.8.5" simplelog = "0.12.0" log = "0.4.17" @@ -34,6 +34,6 @@ fxhash = "0.2.1" thiserror = "1.0.37" # Encoding and parsing -serde_json = "1.0.87" -serde = {version = "1.0.147", features = ["derive"]} +serde_json = "1.0.89" +serde = {version = "1.0.148", features = ["derive"]} hex = "0.4.3" diff --git a/bin/drk/Cargo.toml b/bin/drk/Cargo.toml index 8b06f59b1..30984783f 100644 --- a/bin/drk/Cargo.toml +++ b/bin/drk/Cargo.toml @@ -12,15 +12,14 @@ edition = "2021" anyhow = "1.0.66" async-std = {version = "1.12.0", features = ["attributes"]} bs58 = "0.4.0" -clap = {version = "4.0.25", features = ["derive"]} +clap = {version = "4.0.28", features = ["derive"]} darkfi = {path = "../../", features = ["blockchain", "rpc", "util", "wallet"]} darkfi-sdk = {path = "../../src/sdk"} darkfi-serial = {path = "../../src/serial", features = ["derive", "crypto"]} darkfi-money-contract = {path = "../../src/contract/money", features = ["no-entrypoint", "client"]} prettytable-rs = "0.9.0" rand = "0.8.5" -serde_json = "1.0.87" +serde_json = "1.0.89" simplelog = "0.12.0" -libsqlite3-sys = {version = "0.24.2", features = ["bundled-sqlcipher"]} sqlx = {version = "0.6.2", features = ["runtime-async-std-native-tls", "sqlite"]} url = "2.3.1" diff --git a/bin/faucetd/Cargo.toml b/bin/faucetd/Cargo.toml index 325eda427..20e4eb73b 100644 --- a/bin/faucetd/Cargo.toml +++ b/bin/faucetd/Cargo.toml @@ -10,10 +10,10 @@ edition = "2021" [dependencies] async-std = "1.12.0" -async-trait = "0.1.58" -blake3 = "1.3.1" +async-trait = "0.1.59" +blake3 = "1.3.3" bs58 = "0.4.0" -chrono = "0.4.22" +chrono = "0.4.23" ctrlc = { version = "3.2.3", features = ["termination"] } darkfi = {path = "../../", features = ["blockchain", "wallet", "rpc", "net", "zkas", "crypto"]} darkfi-serial = {path = "../../src/serial"} @@ -24,15 +24,14 @@ hex = "0.4.3" lazy-init = "0.5.1" log = "0.4.17" rand = "0.8.5" -serde_json = "1.0.87" +serde_json = "1.0.89" simplelog = "0.12.0" sled = "0.34.7" smol = "1.2.5" -libsqlite3-sys = {version = "0.24.2", features = ["bundled-sqlcipher"]} sqlx = {version = "0.6.2", features = ["runtime-async-std-native-tls", "sqlite"]} url = "2.3.1" # Argument parsing -serde = {version = "1.0.147", features = ["derive"]} +serde = {version = "1.0.148", 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 f88e1db7c..d0ad13c53 100644 --- a/bin/fud/fu/Cargo.toml +++ b/bin/fud/fu/Cargo.toml @@ -15,8 +15,8 @@ darkfi = {path = "../../../", features = ["util", "rpc"]} async-std = {version = "1.12.0", features = ["attributes"]} # Misc -clap = {version = "3.2.20", features = ["derive"]} +clap = {version = "4.0.28", features = ["derive"]} log = "0.4.17" -serde_json = "1.0.87" +serde_json = "1.0.89" simplelog = "0.12.0" url = "2.3.1" diff --git a/bin/fud/fud/Cargo.toml b/bin/fud/fud/Cargo.toml index 7b285f3d5..55ca94820 100644 --- a/bin/fud/fud/Cargo.toml +++ b/bin/fud/fud/Cargo.toml @@ -14,19 +14,19 @@ darkfi-serial = {path = "../../../src/serial"} # Async async-std = "1.12.0" -async-trait = "0.1.58" +async-trait = "0.1.59" ctrlc = { version = "3.2.3", features = ["termination"] } easy-parallel = "3.2.0" smol = "1.2.5" # Misc -blake3 = "1.3.1" +blake3 = "1.3.3" log = "0.4.17" -serde_json = "1.0.87" +serde_json = "1.0.89" simplelog = "0.12.0" url = "2.3.1" # Argument parsing -serde = {version = "1.0.147", features = ["derive"]} +serde = {version = "1.0.148", features = ["derive"]} structopt = "0.3.26" structopt-toml = "0.5.1" diff --git a/bin/ircd/Cargo.toml b/bin/ircd/Cargo.toml index 5cdee3f34..685dd929b 100644 --- a/bin/ircd/Cargo.toml +++ b/bin/ircd/Cargo.toml @@ -18,7 +18,7 @@ futures = "0.3.25" futures-rustls = "0.22.2" rustls-pemfile = "1.0.1" async-std = "1.12.0" -async-trait = "0.1.58" +async-trait = "0.1.59" easy-parallel = "3.2.0" async-recursion = "1.0.0" @@ -27,18 +27,18 @@ crypto_box = "0.8.2" rand = "0.8.5" # Misc -clap = {version = "3.2.20", features = ["derive"]} +clap = {version = "4.0.28", features = ["derive"]} log = "0.4.17" simplelog = "0.12.0" fxhash = "0.2.1" ctrlc = { version = "3.2.3", features = ["termination"] } url = "2.3.1" -chrono = "0.4.22" +chrono = "0.4.23" ripemd = "0.1.3" # Encoding and parsing -serde_json = "1.0.87" -serde = {version = "1.0.147", features = ["derive"]} +serde_json = "1.0.89" +serde = {version = "1.0.148", features = ["derive"]} structopt = "0.3.26" structopt-toml = "0.5.1" bs58 = "0.4.0" diff --git a/bin/ircd2/Cargo.toml b/bin/ircd2/Cargo.toml index 9a485e975..56f9a8dc9 100644 --- a/bin/ircd2/Cargo.toml +++ b/bin/ircd2/Cargo.toml @@ -18,7 +18,7 @@ futures = "0.3.25" futures-rustls = "0.22.2" rustls-pemfile = "1.0.1" async-std = "1.12.0" -async-trait = "0.1.58" +async-trait = "0.1.59" easy-parallel = "3.2.0" # Crypto @@ -26,18 +26,18 @@ crypto_box = "0.8.2" rand = "0.8.5" # Misc -clap = {version = "3.2.20", features = ["derive"]} +clap = {version = "4.0.28", features = ["derive"]} log = "0.4.17" simplelog = "0.12.0" fxhash = "0.2.1" ctrlc = { version = "3.2.3", features = ["termination"] } url = "2.3.1" -chrono = "0.4.22" +chrono = "0.4.23" ripemd = "0.1.3" # Encoding and parsing -serde_json = "1.0.87" -serde = {version = "1.0.147", features = ["derive"]} +serde_json = "1.0.89" +serde = {version = "1.0.148", features = ["derive"]} structopt = "0.3.26" structopt-toml = "0.5.1" bs58 = "0.4.0" diff --git a/bin/lilith/Cargo.toml b/bin/lilith/Cargo.toml index 310f57184..9946ea5dc 100644 --- a/bin/lilith/Cargo.toml +++ b/bin/lilith/Cargo.toml @@ -13,7 +13,7 @@ darkfi = {path = "../../", features = ["net", "rpc"]} # Async async-std = "1.12.0" -async-trait = "0.1.58" +async-trait = "0.1.59" ctrlc = { version = "3.2.3", features = ["termination"] } easy-parallel = "3.2.0" smol = "1.2.5" @@ -21,12 +21,12 @@ smol = "1.2.5" # Misc fxhash = "0.2.1" log = "0.4.17" -serde_json = "1.0.87" +serde_json = "1.0.89" simplelog = "0.12.0" url = "2.3.1" # Argument parsing -serde = {version = "1.0.147", features = ["derive"]} +serde = {version = "1.0.148", features = ["derive"]} structopt = "0.3.26" structopt-toml = "0.5.1" toml = "0.5.9" diff --git a/bin/tau/tau-cli/Cargo.toml b/bin/tau/tau-cli/Cargo.toml index de854069f..0bad05a98 100644 --- a/bin/tau/tau-cli/Cargo.toml +++ b/bin/tau/tau-cli/Cargo.toml @@ -10,15 +10,15 @@ repository = "https://github.com/darkrenaissance/darkfi" [dependencies] async-std = {version = "1.12.0", features = ["attributes"]} -chrono = "0.4.22" -clap = {version = "3.2.20", features = ["derive"]} +chrono = "0.4.23" +clap = {version = "4.0.28", features = ["derive"]} colored = "2.0.0" darkfi = { path = "../../../", features = ["rpc"]} fxhash = "0.2.1" log = "0.4.17" prettytable-rs = "0.9.0" -serde = {version = "1.0.147", features = ["derive"]} -serde_json = "1.0.87" +serde = {version = "1.0.148", features = ["derive"]} +serde_json = "1.0.89" simplelog = "0.12.0" term_grid = { git = "https://github.com/Dastan-glitch/rust-term-grid.git" } textwrap = "0.15.2" diff --git a/bin/tau/taud/Cargo.toml b/bin/tau/taud/Cargo.toml index 8587e1186..87363cc02 100644 --- a/bin/tau/taud/Cargo.toml +++ b/bin/tau/taud/Cargo.toml @@ -15,7 +15,7 @@ darkfi-serial = { path = "../../../src/serial" } # Async smol = "1.2.5" async-std = {version = "1.12.0", features = ["attributes"]} -async-trait = "0.1.58" +async-trait = "0.1.59" easy-parallel = "3.2.0" futures = "0.3.25" @@ -23,15 +23,15 @@ futures = "0.3.25" log = "0.4.17" simplelog = "0.12.0" rand = "0.8.5" -chrono = "0.4.22" +chrono = "0.4.23" thiserror = "1.0.37" ctrlc = { version = "3.2.3", features = ["termination"] } url = "2.3.1" fxhash = "0.2.1" # Encoding and parsing -serde = {version = "1.0.147", features = ["derive"]} -serde_json = "1.0.87" +serde = {version = "1.0.148", features = ["derive"]} +serde_json = "1.0.89" structopt = "0.3.26" structopt-toml = "0.5.1" crypto_box = {version = "0.8.2", features = ["std"]} diff --git a/bin/vanityaddr/Cargo.toml b/bin/vanityaddr/Cargo.toml index 460446235..5daf03da5 100644 --- a/bin/vanityaddr/Cargo.toml +++ b/bin/vanityaddr/Cargo.toml @@ -10,11 +10,11 @@ edition = "2021" [dependencies] bs58 = "0.4.0" -clap = {version = "3.2.20", features = ["derive"]} +clap = {version = "4.0.28", features = ["derive"]} ctrlc = "3.2.3" darkfi = {path = "../../", features = ["crypto"]} darkfi-sdk = {path = "../../src/sdk"} -indicatif = "0.17.1" +indicatif = "0.17.2" num_cpus = "1.14.0" rand = "0.8.5" -rayon = "1.5.3" +rayon = "1.6.0" diff --git a/bin/vanityaddr/src/main.rs b/bin/vanityaddr/src/main.rs index 952eba087..b6b963de6 100644 --- a/bin/vanityaddr/src/main.rs +++ b/bin/vanityaddr/src/main.rs @@ -19,7 +19,7 @@ use std::{process::exit, sync::mpsc::channel}; use clap::Parser; -use darkfi_sdk::crypto::{Address, Keypair, SecretKey}; +use darkfi_sdk::crypto::{Keypair, SecretKey}; use indicatif::{ProgressBar, ProgressStyle}; use rand::rngs::OsRng; use rayon::prelude::*; @@ -30,7 +30,7 @@ use darkfi::cli_desc; #[clap(name = "vanityaddr", about = cli_desc!(), version)] #[clap(arg_required_else_help(true))] struct Args { - /// Prefixes to search (must start with 1) + /// Prefixes to search prefix: Vec, /// Should the search be case-sensitive @@ -38,7 +38,7 @@ struct Args { case_sensitive: bool, /// Number of threads to use (defaults to number of available CPUs) - #[clap(short, parse(try_from_str))] + #[clap(short)] threads: Option, } @@ -50,9 +50,8 @@ struct DrkAddr { impl DrkAddr { pub fn new() -> Self { let kp = Keypair::random(&mut OsRng); - let addr = Address::from(kp.public); - Self { secret: kp.secret, address: format!("{}", addr) } + Self { secret: kp.secret, address: format!("{}", kp.public) } } pub fn starts_with(&self, prefix: &str, case_sensitive: bool) -> bool { @@ -81,13 +80,6 @@ fn main() { exit(1); } - for (idx, prefix) in args.prefix.iter().enumerate() { - if !prefix.starts_with('1') { - eprintln!("Error: Address prefix at index {} must start with \"1\".", idx); - exit(1); - } - } - // Check if prefixes are valid base58 for (idx, prefix) in args.prefix.iter().enumerate() { match bs58::decode(prefix).into_vec() { diff --git a/bin/zkas/Cargo.toml b/bin/zkas/Cargo.toml index b2bc7ecac..a8a788966 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 = "3.2.20", features = ["derive"]} +clap = {version = "4.0.28", features = ["derive"]} darkfi = {path = "../../", features = ["zkas"]} diff --git a/example/dao/Cargo.toml b/example/dao/Cargo.toml index 378ada311..1aedf03df 100644 --- a/example/dao/Cargo.toml +++ b/example/dao/Cargo.toml @@ -14,9 +14,9 @@ darkfi-sdk = {path = "../../src/sdk"} smol = "1.2.5" futures = "0.3.25" async-std = {version = "1.12.0", features = ["attributes"]} -async-trait = "0.1.58" +async-trait = "0.1.59" async-channel = "1.7.1" -async-executor = "1.4.1" +async-executor = "1.5.0" easy-parallel = "3.2.0" # Misc @@ -35,11 +35,11 @@ chacha20poly1305 = "0.10.1" group = "0.12.1" # Encoding and parsing -serde_json = "1.0.87" +serde_json = "1.0.89" bs58 = "0.4.0" fxhash = "0.2.1" # Utilities lazy_static = "1.4.0" url = "2.3.1" -env_logger = "0.9.3" +env_logger = "0.10.0" diff --git a/example/dao2/Cargo.toml b/example/dao2/Cargo.toml index 8eb9787d0..fe3b0c1d4 100644 --- a/example/dao2/Cargo.toml +++ b/example/dao2/Cargo.toml @@ -23,9 +23,9 @@ sled = "0.34.7" smol = "1.2.5" futures = "0.3.25" async-std = {version = "1.12.0", features = ["attributes"]} -async-trait = "0.1.58" +async-trait = "0.1.59" async-channel = "1.7.1" -async-executor = "1.4.1" +async-executor = "1.5.0" easy-parallel = "3.2.0" # Misc @@ -44,11 +44,11 @@ chacha20poly1305 = "0.10.1" group = "0.12.1" # Encoding and parsing -serde_json = "1.0.87" +serde_json = "1.0.89" bs58 = "0.4.0" fxhash = "0.2.1" # Utilities lazy_static = "1.4.0" url = "2.3.1" -env_logger = "0.9.3" +env_logger = "0.10.0" diff --git a/example/dchat/Cargo.toml b/example/dchat/Cargo.toml index b4d59681a..0d87a77ff 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.58" +async-trait = "0.1.59" easy-parallel = "3.2.0" smol = "1.2.5" num_cpus = "1.14.0" @@ -25,7 +25,7 @@ log = "0.4.17" simplelog = "0.12.0" url = "2.3.1" -serde_json = "1.0.87" -serde = {version = "1.0.147", features = ["derive"]} +serde_json = "1.0.89" +serde = {version = "1.0.148", features = ["derive"]} toml = "0.5.9" # ANCHOR_END: dependencies diff --git a/example/p2pdebug/Cargo.toml b/example/p2pdebug/Cargo.toml index 2ff236221..fd7d3ea2f 100644 --- a/example/p2pdebug/Cargo.toml +++ b/example/p2pdebug/Cargo.toml @@ -15,20 +15,20 @@ darkfi = {path = "../../", features = ["net", "rpc"]} smol = "1.2.5" futures = "0.3.25" async-std = "1.12.0" -async-trait = "0.1.58" +async-trait = "0.1.59" async-channel = "1.7.1" -async-executor = "1.4.1" +async-executor = "1.5.0" easy-parallel = "3.2.0" # Crypto rand = "0.8.5" # Misc -clap = {version = "3.2.20", features = ["derive"]} +clap = {version = "4.0.28", features = ["derive"]} log = "0.4.17" simplelog = "0.12.0" fxhash = "0.2.1" url = "2.3.1" # Encoding and parsing -serde_json = "1.0.87" +serde_json = "1.0.89" diff --git a/script/research/crypsinous_playground/Cargo.toml b/script/research/crypsinous_playground/Cargo.toml index cf14d2ae3..3c7a04955 100644 --- a/script/research/crypsinous_playground/Cargo.toml +++ b/script/research/crypsinous_playground/Cargo.toml @@ -18,19 +18,19 @@ pasta_curves = "0.4.1" # Async async-std = "1.12.0" -async-trait = "0.1.58" +async-trait = "0.1.59" ctrlc = { version = "3.2.3", features = ["termination"] } easy-parallel = "3.2.0" smol = "1.2.5" # Argument parsing -serde = "1.0.147" -serde_derive = "1.0.147" +serde = "1.0.148" +serde_derive = "1.0.148" structopt = "0.3.26" structopt-toml = "0.5.1" # Misc -blake3 = "1.3.1" +blake3 = "1.3.3" log = "0.4.17" simplelog = "0.12.0" rand = "0.8.5" diff --git a/script/research/dhtd/Cargo.toml b/script/research/dhtd/Cargo.toml index 449ab520d..e03fc3b91 100644 --- a/script/research/dhtd/Cargo.toml +++ b/script/research/dhtd/Cargo.toml @@ -11,21 +11,21 @@ features = ["dht"] [dependencies] async-channel = "1.7.1" -async-executor = "1.4.1" +async-executor = "1.5.0" async-std = "1.12.0" -async-trait = "0.1.58" -blake3 = "1.3.1" +async-trait = "0.1.59" +blake3 = "1.3.3" ctrlc = { version = "3.2.3", features = ["termination"] } easy-parallel = "3.2.0" futures-lite = "1.12.0" log = "0.4.17" -serde_json = "1.0.87" +serde_json = "1.0.89" simplelog = "0.12.0" url = "2.3.1" # Argument parsing -serde = "1.0.147" -serde_derive = "1.0.147" +serde = "1.0.148" +serde_derive = "1.0.148" structopt = "0.3.26" structopt-toml = "0.5.1" diff --git a/script/research/merkletree_null_benchmark/Cargo.toml b/script/research/merkletree_null_benchmark/Cargo.toml index cf8f96374..07788a127 100644 --- a/script/research/merkletree_null_benchmark/Cargo.toml +++ b/script/research/merkletree_null_benchmark/Cargo.toml @@ -16,4 +16,4 @@ rand = "0.8.5" pasta_curves = "0.4.1" incrementalmerkletree = "0.3.0" -serde_json = "1.0.87" +serde_json = "1.0.89" diff --git a/script/research/nodes-tool/Cargo.toml b/script/research/nodes-tool/Cargo.toml index de2efa243..ba31ab8e2 100644 --- a/script/research/nodes-tool/Cargo.toml +++ b/script/research/nodes-tool/Cargo.toml @@ -9,9 +9,9 @@ edition = "2021" [dependencies] async-std = "1.12.0" -blake3 = "1.3.1" +blake3 = "1.3.3" darkfi = {path = "../../../", features = ["blockchain", "wallet", "rpc"]} darkfi-sdk = {path = "../../../src/sdk"} darkfi-serial = {path = "../../../src/serial"} -serde = "1.0.147" +serde = "1.0.148" sled = "0.34.7" diff --git a/script/research/raft-diag/Cargo.toml b/script/research/raft-diag/Cargo.toml index 4dce6da36..fe0ce80c7 100644 --- a/script/research/raft-diag/Cargo.toml +++ b/script/research/raft-diag/Cargo.toml @@ -12,9 +12,9 @@ darkfi = {path = "../../../", features = ["raft"]} # Async smol = "1.2.5" async-std = {version = "1.12.0", features = ["attributes"]} -async-trait = "0.1.58" +async-trait = "0.1.59" async-channel = "1.7.1" -async-executor = "1.4.1" +async-executor = "1.5.0" easy-parallel = "3.2.0" futures = "0.3.25" @@ -22,15 +22,15 @@ futures = "0.3.25" log = "0.4.17" simplelog = "0.12.0" rand = "0.8.5" -chrono = "0.4.22" +chrono = "0.4.23" thiserror = "1.0.37" ctrlc = { version = "3.2.3", features = ["termination"] } url = "2.3.1" fxhash = "0.2.1" # Encoding and parsing -serde = {version = "1.0.147", features = ["derive"]} -serde_json = "1.0.87" +serde = {version = "1.0.148", features = ["derive"]} +serde_json = "1.0.89" structopt = "0.3.26" hex = "0.4.3" bs58 = "0.4.0" diff --git a/script/research/rpc_client_notifications/Cargo.toml b/script/research/rpc_client_notifications/Cargo.toml index 81f58ec80..03de0ce20 100644 --- a/script/research/rpc_client_notifications/Cargo.toml +++ b/script/research/rpc_client_notifications/Cargo.toml @@ -11,5 +11,5 @@ edition = "2021" async-std = "1.12.0" darkfi = {path = "../../../", features = ["rpc"]} futures = "0.3.25" -serde_json = "1.0.87" +serde_json = "1.0.89" url = {version = "2.3.1", features = ["serde"]} diff --git a/script/research/state_usage_analyser/Cargo.toml b/script/research/state_usage_analyser/Cargo.toml index e470e6749..7cead86da 100644 --- a/script/research/state_usage_analyser/Cargo.toml +++ b/script/research/state_usage_analyser/Cargo.toml @@ -16,5 +16,5 @@ lazy-init = "0.5.1" log = "0.4.17" pasta_curves = "0.4.1" rand = "0.8.5" -serde = {version = "1.0.147", features = ["derive"]} +serde = {version = "1.0.148", features = ["derive"]} sled = "0.34.7" diff --git a/script/research/x3dh/Cargo.toml b/script/research/x3dh/Cargo.toml index 2dd18db69..f0de83bc2 100644 --- a/script/research/x3dh/Cargo.toml +++ b/script/research/x3dh/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" [dependencies] sha2 = "0.10.6" -digest = "0.10.5" +digest = "0.10.6" rand = "0.8.5" aes-gcm-siv = "0.11.1" curve25519-dalek = "4.0.0-pre.2" diff --git a/src/consensus/state.rs b/src/consensus/state.rs index 8657d3425..966ee9ce7 100644 --- a/src/consensus/state.rs +++ b/src/consensus/state.rs @@ -380,12 +380,12 @@ impl ValidatorState { /// Slots duration is configured using the SLOT_TIME constant. pub fn next_n_slot_start(&self, n: u64) -> Duration { assert!(n > 0); - let start_time = NaiveDateTime::from_timestamp(self.consensus.genesis_ts.0, 0); + let start_time = NaiveDateTime::from_timestamp_opt(self.consensus.genesis_ts.0, 0).unwrap(); let current_slot = self.current_slot() + n; let next_slot_start = (current_slot * constants::SLOT_TIME) + (start_time.timestamp() as u64); - let next_slot_start = NaiveDateTime::from_timestamp(next_slot_start as i64, 0); - let current_time = NaiveDateTime::from_timestamp(Utc::now().timestamp(), 0); + let next_slot_start = NaiveDateTime::from_timestamp_opt(next_slot_start as i64, 0).unwrap(); + let current_time = NaiveDateTime::from_timestamp_opt(Utc::now().timestamp(), 0).unwrap(); let diff = next_slot_start - current_time; Duration::new(diff.num_seconds().try_into().unwrap(), 0) diff --git a/src/error.rs b/src/error.rs index dcfa31cf4..b5ef5ac87 100644 --- a/src/error.rs +++ b/src/error.rs @@ -147,7 +147,7 @@ pub enum Error { #[error("No URL found")] NoUrlFound, - #[cfg(feature = "tungstenite")] + #[cfg(feature = "async-tungstenite")] #[error("tungstenite error: {0}")] TungsteniteError(String), @@ -572,12 +572,21 @@ impl From for Error { } } +/* #[cfg(feature = "tungstenite")] impl From for Error { fn from(err: tungstenite::Error) -> Self { Self::TungsteniteError(err.to_string()) } } +*/ + +#[cfg(feature = "async-tungstenite")] +impl From for Error { + fn from(err: async_tungstenite::tungstenite::Error) -> Self { + Self::TungsteniteError(err.to_string()) + } +} #[cfg(feature = "futures-rustls")] impl From for Error { diff --git a/src/rpc/websockets.rs b/src/rpc/websockets.rs index b743d3a0b..05e92238b 100644 --- a/src/rpc/websockets.rs +++ b/src/rpc/websockets.rs @@ -22,11 +22,13 @@ use std::{ task::{Context, Poll}, }; -use async_tungstenite::WebSocketStream; +use async_tungstenite::{ + tungstenite::{handshake::client::Response, Message}, + WebSocketStream, +}; use futures::sink::Sink; use futures_rustls::{client::TlsStream, rustls::ServerName, TlsConnector}; use smol::{prelude::*, Async}; -use tungstenite::{handshake::client::Response, Message}; use url::Url; use crate::{Error, Result as DrkResult}; @@ -38,7 +40,7 @@ pub enum WsStream { } impl Sink for WsStream { - type Error = tungstenite::Error; + type Error = async_tungstenite::tungstenite::Error; fn poll_ready(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll> { match &mut *self { @@ -70,7 +72,7 @@ impl Sink for WsStream { } impl Stream for WsStream { - type Item = tungstenite::Result; + type Item = async_tungstenite::tungstenite::Result; fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll> { match &mut *self { diff --git a/src/sdk/Cargo.toml b/src/sdk/Cargo.toml index 365836fd8..8e3c115d8 100644 --- a/src/sdk/Cargo.toml +++ b/src/sdk/Cargo.toml @@ -27,7 +27,7 @@ bs58 = "0.4.0" # Cryptography blake2b_simd = "1.0.0" -blake3 = "1.3.1" +blake3 = "1.3.3" halo2_gadgets = "0.2.0" incrementalmerkletree = "0.3.0" pasta_curves = "0.4.1" diff --git a/src/serial/Cargo.toml b/src/serial/Cargo.toml index 877b48fd5..897fae546 100644 --- a/src/serial/Cargo.toml +++ b/src/serial/Cargo.toml @@ -13,7 +13,7 @@ darkfi-derive = {path = "./derive", optional = true} futures-lite = {version = "1.12.0", optional = true} # Supported types for encoding -blake3 = {version = "1.3.1", optional = true} +blake3 = {version = "1.3.3", optional = true} fxhash = {version = "0.2.1", optional = true} incrementalmerkletree = {version = "0.3.0", optional = true} pasta_curves = {version = "0.4.1", optional = true} diff --git a/src/serial/derive-internal/Cargo.toml b/src/serial/derive-internal/Cargo.toml index e13852d28..f4948377f 100644 --- a/src/serial/derive-internal/Cargo.toml +++ b/src/serial/derive-internal/Cargo.toml @@ -11,4 +11,4 @@ edition = "2021" [dependencies] proc-macro2 = "1.0.47" quote = "1.0.21" -syn = {version = "1.0.103", features = ["full", "fold"]} +syn = {version = "1.0.104", features = ["full", "fold"]} diff --git a/src/serial/derive/Cargo.toml b/src/serial/derive/Cargo.toml index efd424ca5..0ab5e9877 100644 --- a/src/serial/derive/Cargo.toml +++ b/src/serial/derive/Cargo.toml @@ -14,6 +14,6 @@ proc-macro = true [dependencies] proc-macro-crate = "1.2.1" proc-macro2 = "1.0.47" -syn = {version = "1.0.103", features = ["full", "fold"]} +syn = {version = "1.0.104", features = ["full", "fold"]} darkfi-derive-internal = {path = "../derive-internal"} diff --git a/src/util/time.rs b/src/util/time.rs index 45b7c8ca8..2155fa9aa 100644 --- a/src/util/time.rs +++ b/src/util/time.rs @@ -47,8 +47,8 @@ impl Timestamp { /// Calculates elapsed time of a `Timestamp`. pub fn elapsed(&self) -> u64 { - let start_time = NaiveDateTime::from_timestamp(self.0, 0); - let end_time = NaiveDateTime::from_timestamp(Utc::now().timestamp(), 0); + let start_time = NaiveDateTime::from_timestamp_opt(self.0, 0).unwrap(); + let end_time = NaiveDateTime::from_timestamp_opt(Utc::now().timestamp(), 0).unwrap(); let diff = end_time - start_time; diff.num_seconds() as u64 } @@ -105,15 +105,19 @@ pub fn timestamp_to_date(timestamp: i64, format: DateFormat) -> String { } match format { - DateFormat::Date => { - NaiveDateTime::from_timestamp(timestamp, 0).date().format("%-d %b").to_string() - } - DateFormat::DateTime => { - NaiveDateTime::from_timestamp(timestamp, 0).format("%H:%M:%S %A %-d %B").to_string() - } + DateFormat::Date => NaiveDateTime::from_timestamp_opt(timestamp, 0) + .unwrap() + .date() + .format("%-d %b") + .to_string(), + DateFormat::DateTime => NaiveDateTime::from_timestamp_opt(timestamp, 0) + .unwrap() + .format("%H:%M:%S %A %-d %B") + .to_string(), DateFormat::Nanos => { const A_BILLION: i64 = 1_000_000_000; - NaiveDateTime::from_timestamp(timestamp / A_BILLION, (timestamp % A_BILLION) as u32) + NaiveDateTime::from_timestamp_opt(timestamp / A_BILLION, (timestamp % A_BILLION) as u32) + .unwrap() .format("%H:%M:%S.%f") .to_string() } diff --git a/tests/arithmetic_proof.rs b/tests/arithmetic_proof.rs index 9c840e7f5..ca499a4d0 100644 --- a/tests/arithmetic_proof.rs +++ b/tests/arithmetic_proof.rs @@ -16,23 +16,21 @@ * along with this program. If not, see . */ +use halo2_proofs::circuit::Value; +use pasta_curves::pallas; +use rand::rngs::OsRng; +use simplelog::{ColorChoice, Config, LevelFilter, TermLogger, TerminalMode}; + use darkfi::{ - crypto::{ - proof::{ProvingKey, VerifyingKey}, - Proof, - }, zk::{ + proof::{ProvingKey, VerifyingKey}, vm::{Witness, ZkCircuit}, vm_stack::empty_witnesses, + Proof, }, zkas::decoder::ZkBinary, Result, }; -use halo2_proofs::circuit::Value; -use pasta_curves::pallas; -use rand::rngs::OsRng; - -use simplelog::{ColorChoice, Config, LevelFilter, TermLogger, TerminalMode}; #[test] fn arithmetic_proof() -> Result<()> { diff --git a/tests/burn_proof.rs b/tests/burn_proof.rs index fa649983b..d5001a1c9 100644 --- a/tests/burn_proof.rs +++ b/tests/burn_proof.rs @@ -16,31 +16,32 @@ * along with this program. If not, see . */ -use darkfi::{ +use darkfi_sdk::{ crypto::{ - proof::{ProvingKey, VerifyingKey}, - Proof, + pedersen::{pedersen_commitment_base, pedersen_commitment_u64}, + poseidon_hash, MerkleNode, Nullifier, PublicKey, SecretKey, }, + incrementalmerkletree::{bridgetree::BridgeTree, Tree}, + pasta::{ + arithmetic::CurveAffine, + group::{ff::Field, Curve}, + pallas, + }, +}; +use halo2_gadgets::poseidon::primitives as poseidon; +use halo2_proofs::circuit::Value; +use rand::rngs::OsRng; + +use darkfi::{ zk::{ + proof::{ProvingKey, VerifyingKey}, vm::{Witness, ZkCircuit}, vm_stack::empty_witnesses, + Proof, }, zkas::decoder::ZkBinary, Result, }; -use darkfi_sdk::crypto::{ - pedersen::{pedersen_commitment_base, pedersen_commitment_u64}, - poseidon_hash, MerkleNode, Nullifier, PublicKey, SecretKey, -}; -use halo2_gadgets::poseidon::primitives as poseidon; -use halo2_proofs::circuit::Value; -use incrementalmerkletree::{bridgetree::BridgeTree, Tree}; -use pasta_curves::{ - arithmetic::CurveAffine, - group::{ff::Field, Curve}, - pallas, -}; -use rand::rngs::OsRng; #[test] fn burn_proof() -> Result<()> { diff --git a/tests/mint_proof.rs b/tests/mint_proof.rs index 1e6feb74c..1c0416d76 100644 --- a/tests/mint_proof.rs +++ b/tests/mint_proof.rs @@ -16,30 +16,31 @@ * along with this program. If not, see . */ -use darkfi::{ +use darkfi_sdk::{ crypto::{ - proof::{ProvingKey, VerifyingKey}, - Proof, + pedersen::{pedersen_commitment_base, pedersen_commitment_u64}, + PublicKey, SecretKey, }, + pasta::{ + arithmetic::CurveAffine, + group::{ff::Field, Curve}, + pallas, + }, +}; +use halo2_gadgets::poseidon::primitives as poseidon; +use halo2_proofs::circuit::Value; +use rand::rngs::OsRng; + +use darkfi::{ zk::{ + proof::{ProvingKey, VerifyingKey}, vm::{Witness, ZkCircuit}, vm_stack::empty_witnesses, + Proof, }, zkas::decoder::ZkBinary, Result, }; -use darkfi_sdk::crypto::{ - pedersen::{pedersen_commitment_base, pedersen_commitment_u64}, - PublicKey, SecretKey, -}; -use halo2_gadgets::poseidon::primitives as poseidon; -use halo2_proofs::circuit::Value; -use pasta_curves::{ - arithmetic::CurveAffine, - group::{ff::Field, Curve}, - pallas, -}; -use rand::rngs::OsRng; #[test] fn mint_proof() -> Result<()> { diff --git a/tests/zkvm_opcodes.rs b/tests/zkvm_opcodes.rs index 20c29a052..ccd829547 100644 --- a/tests/zkvm_opcodes.rs +++ b/tests/zkvm_opcodes.rs @@ -31,13 +31,11 @@ use rand::rngs::OsRng; use simplelog::{ColorChoice, Config, LevelFilter, TermLogger, TerminalMode}; use darkfi::{ - crypto::{ - proof::{ProvingKey, VerifyingKey}, - Proof, - }, zk::{ + proof::{ProvingKey, VerifyingKey}, vm::ZkCircuit, vm_stack::{empty_witnesses, Witness}, + Proof, }, zkas::ZkBinary, Result,