From 454eacf61627438e1527a2c6b1f8504632f4c371 Mon Sep 17 00:00:00 2001 From: parazyd Date: Tue, 31 Jan 2023 12:45:59 +0100 Subject: [PATCH] Update project dependencies. --- Cargo.lock | 224 +++++++++++++++++--------- Cargo.toml | 20 +-- Makefile | 2 +- bin/cashierd/Cargo.toml | 14 +- bin/dao/dao-cli/Cargo.toml | 6 +- bin/dao/daod/Cargo.toml | 4 +- bin/darkfid/Cargo.toml | 2 +- bin/darkwiki/darkwiki-cli/Cargo.toml | 4 +- bin/darkwiki/darkwikid/Cargo.toml | 6 +- bin/dnetview/Cargo.toml | 2 +- bin/drk/Cargo.toml | 2 +- bin/faucetd/Cargo.toml | 2 +- bin/fud/fu/Cargo.toml | 2 +- bin/fud/fud/Cargo.toml | 2 +- bin/ircd/Cargo.toml | 12 +- bin/ircd2/Cargo.toml | 10 +- bin/lilith/Cargo.toml | 4 +- bin/tau/tau-cli/Cargo.toml | 2 +- bin/tau/taud/Cargo.toml | 6 +- bin/vanityaddr/Cargo.toml | 4 +- bin/zkas/Cargo.toml | 2 +- bin/zktool/Cargo.toml | 2 +- example/dao/Cargo.toml | 4 +- example/dao2/Cargo.toml | 4 +- example/dchat/Cargo.toml | 4 +- example/p2pdebug/Cargo.toml | 6 +- script/research/dhtd/Cargo.toml | 2 +- script/research/raft-diag/Cargo.toml | 6 +- script/research/x3dh/Cargo.toml | 2 +- src/serial/derive-internal/Cargo.toml | 2 +- src/serial/derive/Cargo.toml | 4 +- 31 files changed, 221 insertions(+), 147 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5ca34e4e2..556ae6522 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -219,9 +219,9 @@ dependencies = [ [[package]] name = "async-recursion" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cda8f4bcc10624c4e85bc66b3f452cca98cfa5ca002dc83a16aad2367641bea" +checksum = "3b015a331cc64ebd1774ba119538573603427eaace0a1950c423ab971f903796" dependencies = [ "proc-macro2", "quote", @@ -264,9 +264,9 @@ checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" [[package]] name = "async-trait" -version = "0.1.60" +version = "0.1.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d1d8ab452a3936018a687b20e6f7cf5363d713b732b8884001317b0e48aa3" +checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2" dependencies = [ "proc-macro2", "quote", @@ -339,6 +339,12 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + [[package]] name = "bit-set" version = "0.5.3" @@ -605,9 +611,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.0.32" +version = "4.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7db700bc935f9e43e88d00b0850dae18a63773cfbec6d8e070fccf7fef89a39" +checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76" dependencies = [ "bitflags", "clap_derive", @@ -620,9 +626,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.0.21" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" +checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" dependencies = [ "heck 0.4.0", "proc-macro-error", @@ -1121,7 +1127,7 @@ dependencies = [ "blake3", "bs58", "chrono", - "clap 4.0.32", + "clap 4.1.4", "crypto_api_chachapoly", "darkfi-derive", "darkfi-derive-internal", @@ -1159,7 +1165,7 @@ dependencies = [ "structopt", "structopt-toml", "thiserror", - "toml", + "toml 0.7.1", "url", "wasmer", "wasmer-compiler-singlepass", @@ -1325,7 +1331,7 @@ dependencies = [ "smol", "structopt", "structopt-toml", - "toml", + "toml 0.7.1", "unicode-segmentation", "url", ] @@ -1464,7 +1470,7 @@ dependencies = [ "serde_json", "simplelog", "smol", - "toml", + "toml 0.7.1", "url", ] @@ -1549,7 +1555,7 @@ version = "0.3.0" dependencies = [ "async-channel", "async-std", - "clap 4.0.32", + "clap 4.1.4", "darkfi", "easy-parallel", "hex", @@ -1580,7 +1586,7 @@ dependencies = [ "async-std", "blake3", "bs58", - "clap 4.0.32", + "clap 4.1.4", "darkfi", "darkfi-dao-contract", "darkfi-money-contract", @@ -1953,7 +1959,7 @@ name = "fu" version = "0.3.0" dependencies = [ "async-std", - "clap 4.0.32", + "clap 4.1.4", "darkfi", "log", "serde_json", @@ -1990,9 +1996,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84" dependencies = [ "futures-channel", "futures-core", @@ -2005,9 +2011,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" dependencies = [ "futures-core", "futures-sink", @@ -2015,15 +2021,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" [[package]] name = "futures-executor" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e" dependencies = [ "futures-core", "futures-task", @@ -2043,9 +2049,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" [[package]] name = "futures-lite" @@ -2064,9 +2070,9 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70" dependencies = [ "proc-macro2", "quote", @@ -2086,21 +2092,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" +checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" dependencies = [ "futures-channel", "futures-core", @@ -2402,9 +2408,9 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.17.2" +version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4295cbb7573c16d310e99e713cf9e75101eb190ab31fccd35f2d2691b4352b19" +checksum = "cef509aa9bc73864d6756f0d34d35504af3cf0844373afe9b8669a5b8005a729" dependencies = [ "console", "number_prefix", @@ -2442,9 +2448,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.7.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e" +checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" [[package]] name = "iprange" @@ -2464,7 +2470,7 @@ dependencies = [ "async-trait", "bs58", "chrono", - "clap 4.0.32", + "clap 4.1.4", "crypto_box", "ctrlc", "darkfi", @@ -2483,7 +2489,7 @@ dependencies = [ "smol", "structopt", "structopt-toml", - "toml", + "toml 0.7.1", "url", ] @@ -2495,7 +2501,7 @@ dependencies = [ "async-trait", "bs58", "chrono", - "clap 4.0.32", + "clap 4.1.4", "crypto_box", "ctrlc", "darkfi", @@ -2514,7 +2520,7 @@ dependencies = [ "smol", "structopt", "structopt-toml", - "toml", + "toml 0.7.1", "url", ] @@ -2630,7 +2636,7 @@ dependencies = [ "smol", "structopt", "structopt-toml", - "toml", + "toml 0.7.1", "url", ] @@ -2795,6 +2801,15 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "nom8" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8" +dependencies = [ + "memchr", +] + [[package]] name = "num-bigint" version = "0.4.3" @@ -3050,7 +3065,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4" dependencies = [ - "base64", + "base64 0.13.1", ] [[package]] @@ -3229,13 +3244,12 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" +checksum = "66618389e4ec1c7afe67d51a9bf34ff9236480f8d51e7489b7d5ab0303c13f34" dependencies = [ "once_cell", - "thiserror", - "toml", + "toml_edit 0.18.1", ] [[package]] @@ -3264,9 +3278,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.49" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" +checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" dependencies = [ "unicode-ident", ] @@ -3618,11 +3632,11 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" +checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" dependencies = [ - "base64", + "base64 0.21.0", ] [[package]] @@ -3797,6 +3811,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +dependencies = [ + "serde", +] + [[package]] name = "sha1" version = "0.10.5" @@ -4142,7 +4165,7 @@ dependencies = [ "skeptic", "structopt", "structopt-toml-derive", - "toml", + "toml 0.5.10", ] [[package]] @@ -4215,7 +4238,7 @@ version = "0.4.0" dependencies = [ "async-std", "chrono", - "clap 4.0.32", + "clap 4.1.4", "colored", "darkfi", "log", @@ -4252,7 +4275,7 @@ dependencies = [ "structopt", "structopt-toml", "thiserror", - "toml", + "toml 0.7.1", "url", ] @@ -4427,6 +4450,57 @@ dependencies = [ "serde", ] +[[package]] +name = "toml" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "772c1426ab886e7362aedf4abc9c0d1348a979517efedfc25862944d10137af0" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime 0.6.1", + "toml_edit 0.19.1", +] + +[[package]] +name = "toml_datetime" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5" + +[[package]] +name = "toml_datetime" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b" +dependencies = [ + "indexmap", + "nom8", + "toml_datetime 0.5.1", +] + +[[package]] +name = "toml_edit" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90a238ee2e6ede22fb95350acc78e21dc40da00bb66c0334bde83de4ed89424e" +dependencies = [ + "indexmap", + "nom8", + "serde", + "serde_spanned", + "toml_datetime 0.6.1", +] + [[package]] name = "tracing" version = "0.1.37" @@ -4485,7 +4559,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788" dependencies = [ - "base64", + "base64 0.13.1", "byteorder", "bytes", "http", @@ -4635,7 +4709,7 @@ name = "vanityaddr" version = "0.3.0" dependencies = [ "bs58", - "clap 4.0.32", + "clap 4.1.4", "ctrlc", "darkfi", "darkfi-sdk", @@ -4807,9 +4881,9 @@ dependencies = [ [[package]] name = "wasmer" -version = "3.1.0" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "740f96c9e5d49f0056d716977657f3f7f8eea9923b41f46d1046946707aa038f" +checksum = "840af6d21701220cb805dc7201af301cb99e9b4f646f48a41befbc1d949f0f90" dependencies = [ "bytes", "cfg-if", @@ -4833,9 +4907,9 @@ dependencies = [ [[package]] name = "wasmer-compiler" -version = "3.1.0" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "001d072dd9823e5a06052621eadb531627b4a508d74b67da4590a3d5d9332dc8" +checksum = "b86fab98beaaace77380cb04e681773739473860d1b8499ea6b14f920923e0c5" dependencies = [ "backtrace", "cfg-if", @@ -4857,9 +4931,9 @@ dependencies = [ [[package]] name = "wasmer-compiler-cranelift" -version = "3.1.0" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2974856a7ce40eb033efc9db3d480845385c27079b6e33ce51751f2f3c67e9bd" +checksum = "015eef629fc84889540dc1686bd7fa524b93da9fd2d275b16c49dbe96268e58f" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -4876,9 +4950,9 @@ dependencies = [ [[package]] name = "wasmer-compiler-singlepass" -version = "3.1.0" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c6baae9a0b87050564178fc34138411682aeb725b57255b9b03735d6620d065" +checksum = "07e235ccc192d5f39147e8a430f48040dcfeebc1f1b0d979d2232ec1618d255c" dependencies = [ "byteorder", "dynasm", @@ -4895,9 +4969,9 @@ dependencies = [ [[package]] name = "wasmer-derive" -version = "3.1.0" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36b23b52272494369a1f96428f0056425a85a66154610c988d971bbace8230f1" +checksum = "1ff577b7c1cfcd3d7c5b3a09fe1a499b73f7c17084845ff71225c8250a6a63a9" dependencies = [ "proc-macro-error", "proc-macro2", @@ -4907,9 +4981,9 @@ dependencies = [ [[package]] name = "wasmer-middlewares" -version = "3.1.0" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ebe29eb090b5212606a2f295ded55d44f38f65ff9cfa85795127f77e119a729" +checksum = "c3f7b2443d00487fcd63e0158ea2eb7a12253fcc99b1c73a7a89796f3cb5a10f" dependencies = [ "wasmer", "wasmer-types", @@ -4918,9 +4992,9 @@ dependencies = [ [[package]] name = "wasmer-types" -version = "3.1.0" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bc6cd7a2d2d3bd901ff491f131188c1030694350685279e16e1233b9922846b" +checksum = "8b9600f9da966abae3be0b0a4560e7d1f2c88415a2d01ce362ac06063cb1c473" dependencies = [ "enum-iterator", "enumset", @@ -4933,9 +5007,9 @@ dependencies = [ [[package]] name = "wasmer-vm" -version = "3.1.0" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e67d0cd6c0ef4985d1ce9c7d7cccf34e910804417a230fa16ab7ee904efb4c34" +checksum = "9fc68a7f0a003e6cb63845b7510065097d289553201d64afb9a5e1744da3c6a0" dependencies = [ "backtrace", "cc", @@ -5279,7 +5353,7 @@ dependencies = [ name = "zkas" version = "0.3.0" dependencies = [ - "clap 4.0.32", + "clap 4.1.4", "darkfi", ] @@ -5287,7 +5361,7 @@ dependencies = [ name = "zktool" version = "0.1.0" dependencies = [ - "clap 4.0.32", + "clap 4.1.4", "darkfi", "darkfi-sdk", ] diff --git a/Cargo.toml b/Cargo.toml index 0eafa3e8e..e4749dd39 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,20 +58,20 @@ thiserror = "1.0.38" # async-runtime async-std = {version = "1.12.0", features = ["attributes"], optional = true} -async-trait = {version = "0.1.60", optional = true} -futures = {version = "0.3.25", optional = true} +async-trait = {version = "0.1.64", optional = true} +futures = {version = "0.3.26", optional = true} smol = {version = "1.3.0", optional = true} # Networking futures-rustls = {version = "0.22.2", features = ["dangerous_configuration"], optional = true} iprange = {version = "0.6.7", optional = true} -ipnet = {version = "2.7.0", optional = true} +ipnet = {version = "2.7.1", optional = true} socket2 = {version = "0.4.7", optional = true} # TLS cert utilities ed25519-compact = {version = "2.0.4", features = ["pem"], optional = true} rcgen = {version = "0.10.0", features = ["pem"], optional = true} -rustls-pemfile = {version = "1.0.1", optional = true} +rustls-pemfile = {version = "1.0.2", optional = true} # Encoding bs58 = {version = "0.4.0", optional = true} @@ -80,7 +80,7 @@ serde_json = {version = "1.0.91", optional = true} serde = {version = "1.0.152", features = ["derive"], optional = true} structopt = {version= "0.3.26", optional = true} structopt-toml = {version= "0.5.1", optional = true} -toml = {version = "0.5.10", optional = true} +toml = {version = "0.7.1", optional = true} # big float dashu = { version = "0.2.0", git = "https://github.com/ertosns/dashu", optional=true } @@ -98,7 +98,7 @@ url = {version = "2.3.1", features = ["serde"], optional = true} # Misc # TODO: Implement something simple and kill these deps -indicatif = {version = "0.17.2", optional = true} +indicatif = {version = "0.17.3", optional = true} simplelog = {version = "0.12.0", optional = true} # Websockets @@ -116,9 +116,9 @@ halo2_gadgets = {version = "0.2.0", optional = true} # Smart contract runtime darkfi-sdk = {path = "src/sdk", optional = true} -wasmer = {version = "3.1.0", optional = true} -wasmer-compiler-singlepass = {version = "3.1.0", optional = true} -wasmer-middlewares = {version = "3.1.0", optional = true} +wasmer = {version = "3.1.1", optional = true} +wasmer-compiler-singlepass = {version = "3.1.1", optional = true} +wasmer-middlewares = {version = "3.1.1", optional = true} # Wallet management libsqlite3-sys = {version = "0.24.2", features = ["bundled-sqlcipher"], optional = true } @@ -128,7 +128,7 @@ sqlx = {version = "0.6.2", features = ["runtime-async-std-native-tls", "sqlite"] sled = {version = "0.34.7", optional = true} [dev-dependencies] -clap = {version = "4.0.32", features = ["derive"]} +clap = {version = "4.1.4", 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" diff --git a/Makefile b/Makefile index d5ddcbe6c..d8de0083d 100644 --- a/Makefile +++ b/Makefile @@ -62,7 +62,7 @@ clippy: token_lists contracts $(PROOFS_BIN) RUSTFLAGS="$(RUSTFLAGS)" $(CARGO) clippy --release --all-features --all rustdoc: token_lists contracts $(PROOFS_BIN) - RUSTFLAGS="$(RUSTFLAGS)" $(CARGO) doc --release --all-features --workspace --no-deps --document-private-items + RUSTFLAGS="$(RUSTFLAGS)" $(CARGO) doc --release --all-features --workspace --document-private-items test: token_lists $(PROOFS_BIN) contracts RUSTFLAGS="$(RUSTFLAGS)" $(CARGO) test --release --all-features --all diff --git a/bin/cashierd/Cargo.toml b/bin/cashierd/Cargo.toml index 485e2a169..91d06fc08 100644 --- a/bin/cashierd/Cargo.toml +++ b/bin/cashierd/Cargo.toml @@ -15,9 +15,9 @@ features = ["wallet", "node", "rpc"] [dependencies] # Async smol = "1.3.0" -futures = "0.3.25" +futures = "0.3.26" async-std = "1.12.0" -async-trait = "0.1.60" +async-trait = "0.1.64" async-channel = "1.8.0" async-executor = "1.5.0" easy-parallel = "3.2.0" @@ -26,7 +26,7 @@ easy-parallel = "3.2.0" rand = "0.8.5" # Misc -clap = {version = "4.0.32", features = ["derive"]} +clap = {version = "4.1.4", features = ["derive"]} log = "0.4.17" num_cpus = "1.15.0" simplelog = "0.12.0" @@ -38,10 +38,10 @@ serde = {version = "1.0.152", features = ["derive"]} serde_json = "1.0.91" # Bitcoin bridge dependencies -bdk = {version = "0.25.0", optional = true} +bdk = {version = "0.26.0", optional = true} anyhow = {version = "1.0.68", optional = true} bitcoin = {version = "0.29.1", optional = true} -secp256k1 = {version = "0.25.0", default-features = false, features = ["rand-std"], optional = true} +secp256k1 = {version = "0.26.0", default-features = false, features = ["rand-std"], optional = true} # Ethereum bridge dependencies hex = {version = "0.4.3", optional = true} @@ -53,8 +53,8 @@ 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.11", optional = true} -solana-sdk = {version = "1.14.11", optional = true} +solana-client = {version = "1.14.13", optional = true} +solana-sdk = {version = "1.14.13", optional = true} spl-associated-token-account = {version = "1.1.2", features = ["no-entrypoint"], optional = true} spl-token = {version = "3.5.0", features = ["no-entrypoint"], optional = true} tungstenite = {version = "0.18.0", optional = true} diff --git a/bin/dao/dao-cli/Cargo.toml b/bin/dao/dao-cli/Cargo.toml index 3e933a457..fb854dd13 100644 --- a/bin/dao/dao-cli/Cargo.toml +++ b/bin/dao/dao-cli/Cargo.toml @@ -15,14 +15,14 @@ features = ["rpc"] [dependencies] # Async smol = "1.3.0" -futures = "0.3.25" +futures = "0.3.26" async-std = {version = "1.12.0", features = ["attributes"]} -async-trait = "0.1.60" +async-trait = "0.1.64" async-channel = "1.8.0" async-executor = "1.5.0" # Misc -clap = {version = "4.0.32", features = ["derive"]} +clap = {version = "4.1.4", features = ["derive"]} log = "0.4.17" num_cpus = "1.15.0" simplelog = "0.12.0" diff --git a/bin/dao/daod/Cargo.toml b/bin/dao/daod/Cargo.toml index 1b1beee53..fc9928b46 100644 --- a/bin/dao/daod/Cargo.toml +++ b/bin/dao/daod/Cargo.toml @@ -15,9 +15,9 @@ darkfi-serial = {path = "../../../src/serial"} # Async smol = "1.3.0" -futures = "0.3.25" +futures = "0.3.26" async-std = {version = "1.12.0", features = ["attributes"]} -async-trait = "0.1.60" +async-trait = "0.1.64" async-channel = "1.8.0" async-executor = "1.5.0" easy-parallel = "3.2.0" diff --git a/bin/darkfid/Cargo.toml b/bin/darkfid/Cargo.toml index f930baa6d..70a389063 100644 --- a/bin/darkfid/Cargo.toml +++ b/bin/darkfid/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" [dependencies] async-std = "1.12.0" -async-trait = "0.1.60" +async-trait = "0.1.64" blake3 = "1.3.3" bs58 = "0.4.0" ctrlc = { version = "3.2.4", features = ["termination"] } diff --git a/bin/darkwiki/darkwiki-cli/Cargo.toml b/bin/darkwiki/darkwiki-cli/Cargo.toml index d117c708d..144b0c49b 100644 --- a/bin/darkwiki/darkwiki-cli/Cargo.toml +++ b/bin/darkwiki/darkwiki-cli/Cargo.toml @@ -14,9 +14,9 @@ darkfi = {path = "../../../", features = ["rpc"]} # Async smol = "1.3.0" async-std = {version = "1.12.0", features = ["attributes"]} -async-trait = "0.1.60" +async-trait = "0.1.64" async-channel = "1.8.0" -futures = "0.3.25" +futures = "0.3.26" # Misc log = "0.4.17" diff --git a/bin/darkwiki/darkwikid/Cargo.toml b/bin/darkwiki/darkwikid/Cargo.toml index a97d41f97..f82993e14 100644 --- a/bin/darkwiki/darkwikid/Cargo.toml +++ b/bin/darkwiki/darkwikid/Cargo.toml @@ -10,14 +10,14 @@ edition = "2021" [dependencies] async-std = "1.12.0" -async-trait = "0.1.60" +async-trait = "0.1.64" blake3 = "1.3.3" bs58 = "0.4.0" darkfi = {path = "../../../", features = ["raft", "rpc", "util"]} darkfi-serial = {path = "../../../src/serial"} dryoc = "0.4.3" easy-parallel = "3.2.0" -futures = "0.3.25" +futures = "0.3.26" lazy_static = "1.4.0" log = "0.4.17" serde = "1.0.152" @@ -29,6 +29,6 @@ simplelog = "0.12.0" structopt = "0.3.26" structopt-toml = "0.5.1" smol = "1.3.0" -toml = "0.5.10" +toml = "0.7.1" unicode-segmentation = "1.10.0" url = "2.3.1" diff --git a/bin/dnetview/Cargo.toml b/bin/dnetview/Cargo.toml index 92db6559a..4cf62f6af 100644 --- a/bin/dnetview/Cargo.toml +++ b/bin/dnetview/Cargo.toml @@ -24,7 +24,7 @@ easy-parallel = "3.2.0" async-channel = "1.8.0" # Misc -clap = {version = "4.0.32", features = ["derive"]} +clap = {version = "4.1.4", features = ["derive"]} rand = "0.8.5" simplelog = "0.12.0" log = "0.4.17" diff --git a/bin/drk/Cargo.toml b/bin/drk/Cargo.toml index 6e62c4c94..20762bc5a 100644 --- a/bin/drk/Cargo.toml +++ b/bin/drk/Cargo.toml @@ -16,7 +16,7 @@ anyhow = "1.0.68" async-std = {version = "1.12.0", features = ["attributes"]} blake3 = "1.3.3" bs58 = "0.4.0" -clap = {version = "4.0.32", features = ["derive"]} +clap = {version = "4.1.4", features = ["derive"]} darkfi = {path = "../../", features = ["blockchain", "rpc", "util", "wallet"]} darkfi-sdk = {path = "../../src/sdk"} darkfi-serial = {path = "../../src/serial", features = ["derive", "crypto"]} diff --git a/bin/faucetd/Cargo.toml b/bin/faucetd/Cargo.toml index ec415bbfe..a47ef2879 100644 --- a/bin/faucetd/Cargo.toml +++ b/bin/faucetd/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" [dependencies] async-std = "1.12.0" -async-trait = "0.1.60" +async-trait = "0.1.64" blake3 = "1.3.3" chrono = "0.4.23" ctrlc = { version = "3.2.4", features = ["termination"] } diff --git a/bin/fud/fu/Cargo.toml b/bin/fud/fu/Cargo.toml index 463520b4f..a86d06bb6 100644 --- a/bin/fud/fu/Cargo.toml +++ b/bin/fud/fu/Cargo.toml @@ -15,7 +15,7 @@ darkfi = {path = "../../../", features = ["util", "rpc"]} async-std = {version = "1.12.0", features = ["attributes"]} # Misc -clap = {version = "4.0.32", features = ["derive"]} +clap = {version = "4.1.4", features = ["derive"]} log = "0.4.17" serde_json = "1.0.91" simplelog = "0.12.0" diff --git a/bin/fud/fud/Cargo.toml b/bin/fud/fud/Cargo.toml index a5c0e7c0b..b68362ce0 100644 --- a/bin/fud/fud/Cargo.toml +++ b/bin/fud/fud/Cargo.toml @@ -14,7 +14,7 @@ darkfi-serial = {path = "../../../src/serial"} # Async async-std = "1.12.0" -async-trait = "0.1.60" +async-trait = "0.1.64" ctrlc = { version = "3.2.4", features = ["termination"] } easy-parallel = "3.2.0" smol = "1.3.0" diff --git a/bin/ircd/Cargo.toml b/bin/ircd/Cargo.toml index c118d1e61..fd54452d8 100644 --- a/bin/ircd/Cargo.toml +++ b/bin/ircd/Cargo.toml @@ -14,20 +14,20 @@ darkfi-serial = {path = "../../src/serial"} # Async smol = "1.3.0" -futures = "0.3.25" +futures = "0.3.26" futures-rustls = "0.22.2" -rustls-pemfile = "1.0.1" +rustls-pemfile = "1.0.2" async-std = "1.12.0" -async-trait = "0.1.60" +async-trait = "0.1.64" easy-parallel = "3.2.0" -async-recursion = "1.0.0" +async-recursion = "1.0.2" # Crypto crypto_box = "0.8.2" rand = "0.8.5" # Misc -clap = {version = "4.0.32", features = ["derive"]} +clap = {version = "4.1.4", features = ["derive"]} log = "0.4.17" simplelog = "0.12.0" ctrlc = { version = "3.2.4", features = ["termination"] } @@ -41,5 +41,5 @@ serde = {version = "1.0.152", features = ["derive"]} structopt = "0.3.26" structopt-toml = "0.5.1" bs58 = "0.4.0" -toml = "0.5.10" +toml = "0.7.1" hex = "0.4.3" diff --git a/bin/ircd2/Cargo.toml b/bin/ircd2/Cargo.toml index 0411358f8..d7facef04 100644 --- a/bin/ircd2/Cargo.toml +++ b/bin/ircd2/Cargo.toml @@ -14,11 +14,11 @@ darkfi-serial = {path = "../../src/serial"} # Async smol = "1.3.0" -futures = "0.3.25" +futures = "0.3.26" futures-rustls = "0.22.2" -rustls-pemfile = "1.0.1" +rustls-pemfile = "1.0.2" async-std = "1.12.0" -async-trait = "0.1.60" +async-trait = "0.1.64" easy-parallel = "3.2.0" # Crypto @@ -26,7 +26,7 @@ crypto_box = "0.8.2" rand = "0.8.5" # Misc -clap = {version = "4.0.32", features = ["derive"]} +clap = {version = "4.1.4", features = ["derive"]} log = "0.4.17" simplelog = "0.12.0" ctrlc = { version = "3.2.4", features = ["termination"] } @@ -40,5 +40,5 @@ serde = {version = "1.0.152", features = ["derive"]} structopt = "0.3.26" structopt-toml = "0.5.1" bs58 = "0.4.0" -toml = "0.5.10" +toml = "0.7.1" hex = "0.4.3" diff --git a/bin/lilith/Cargo.toml b/bin/lilith/Cargo.toml index 62f2b87fb..93b2a6030 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.60" +async-trait = "0.1.64" ctrlc = { version = "3.2.4", features = ["termination"] } easy-parallel = "3.2.0" smol = "1.3.0" @@ -28,4 +28,4 @@ url = "2.3.1" serde = {version = "1.0.152", features = ["derive"]} structopt = "0.3.26" structopt-toml = "0.5.1" -toml = "0.5.10" +toml = "0.7.1" diff --git a/bin/tau/tau-cli/Cargo.toml b/bin/tau/tau-cli/Cargo.toml index 851b93d29..15785536b 100644 --- a/bin/tau/tau-cli/Cargo.toml +++ b/bin/tau/tau-cli/Cargo.toml @@ -11,7 +11,7 @@ repository = "https://github.com/darkrenaissance/darkfi" [dependencies] async-std = {version = "1.12.0", features = ["attributes"]} chrono = "0.4.23" -clap = {version = "4.0.32", features = ["derive"]} +clap = {version = "4.1.4", features = ["derive"]} colored = "2.0.0" darkfi = { path = "../../../", features = ["rpc"]} log = "0.4.17" diff --git a/bin/tau/taud/Cargo.toml b/bin/tau/taud/Cargo.toml index 96376847e..6e8f692b3 100644 --- a/bin/tau/taud/Cargo.toml +++ b/bin/tau/taud/Cargo.toml @@ -15,9 +15,9 @@ darkfi-serial = { path = "../../../src/serial" } # Async smol = "1.3.0" async-std = {version = "1.12.0", features = ["attributes"]} -async-trait = "0.1.60" +async-trait = "0.1.64" easy-parallel = "3.2.0" -futures = "0.3.25" +futures = "0.3.26" # Misc log = "0.4.17" @@ -36,4 +36,4 @@ structopt-toml = "0.5.1" crypto_box = {version = "0.8.2", features = ["std"]} hex = "0.4.3" bs58 = "0.4.0" -toml = "0.5.10" +toml = "0.7.1" diff --git a/bin/vanityaddr/Cargo.toml b/bin/vanityaddr/Cargo.toml index 8d2131664..227efb335 100644 --- a/bin/vanityaddr/Cargo.toml +++ b/bin/vanityaddr/Cargo.toml @@ -10,11 +10,11 @@ edition = "2021" [dependencies] bs58 = "0.4.0" -clap = {version = "4.0.32", features = ["derive"]} +clap = {version = "4.1.4", features = ["derive"]} ctrlc = "3.2.4" darkfi = {path = "../../"} darkfi-sdk = {path = "../../src/sdk"} -indicatif = "0.17.2" +indicatif = "0.17.3" num_cpus = "1.15.0" rand = "0.8.5" rayon = "1.6.1" diff --git a/bin/zkas/Cargo.toml b/bin/zkas/Cargo.toml index 9da1b99cd..d146944b0 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.0.32", features = ["derive"]} +clap = {version = "4.1.4", features = ["derive"]} darkfi = {path = "../../", features = ["zkas"]} diff --git a/bin/zktool/Cargo.toml b/bin/zktool/Cargo.toml index f37a9a302..9215b342e 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.0.32", features = ["derive"]} +clap = {version = "4.1.4", features = ["derive"]} darkfi = {path = "../../", features = ["zkas"]} darkfi-sdk = {path = "../../src/sdk"} diff --git a/example/dao/Cargo.toml b/example/dao/Cargo.toml index b6da5cbda..8e84092fa 100644 --- a/example/dao/Cargo.toml +++ b/example/dao/Cargo.toml @@ -12,9 +12,9 @@ darkfi-sdk = {path = "../../src/sdk"} # Async smol = "1.3.0" -futures = "0.3.25" +futures = "0.3.26" async-std = {version = "1.12.0", features = ["attributes"]} -async-trait = "0.1.60" +async-trait = "0.1.64" async-channel = "1.8.0" async-executor = "1.5.0" easy-parallel = "3.2.0" diff --git a/example/dao2/Cargo.toml b/example/dao2/Cargo.toml index d43c6c041..af471f16f 100644 --- a/example/dao2/Cargo.toml +++ b/example/dao2/Cargo.toml @@ -21,9 +21,9 @@ sled = "0.34.7" # Async smol = "1.3.0" -futures = "0.3.25" +futures = "0.3.26" async-std = {version = "1.12.0", features = ["attributes"]} -async-trait = "0.1.60" +async-trait = "0.1.64" async-channel = "1.8.0" async-executor = "1.5.0" easy-parallel = "3.2.0" diff --git a/example/dchat/Cargo.toml b/example/dchat/Cargo.toml index 7a413d3ff..ca345c018 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.60" +async-trait = "0.1.64" easy-parallel = "3.2.0" smol = "1.3.0" num_cpus = "1.15.0" @@ -27,5 +27,5 @@ url = "2.3.1" serde_json = "1.0.91" serde = {version = "1.0.152", features = ["derive"]} -toml = "0.5.10" +toml = "0.7.1" # ANCHOR_END: dependencies diff --git a/example/p2pdebug/Cargo.toml b/example/p2pdebug/Cargo.toml index ffebbd5bc..b67a3f347 100644 --- a/example/p2pdebug/Cargo.toml +++ b/example/p2pdebug/Cargo.toml @@ -13,9 +13,9 @@ edition = "2021" darkfi = {path = "../../", features = ["net", "rpc"]} # Async smol = "1.3.0" -futures = "0.3.25" +futures = "0.3.26" async-std = "1.12.0" -async-trait = "0.1.60" +async-trait = "0.1.64" async-channel = "1.8.0" async-executor = "1.5.0" easy-parallel = "3.2.0" @@ -24,7 +24,7 @@ easy-parallel = "3.2.0" rand = "0.8.5" # Misc -clap = {version = "4.0.32", features = ["derive"]} +clap = {version = "4.1.4", features = ["derive"]} log = "0.4.17" simplelog = "0.12.0" fxhash = "0.2.1" diff --git a/script/research/dhtd/Cargo.toml b/script/research/dhtd/Cargo.toml index 925b037b2..a308c5c3f 100644 --- a/script/research/dhtd/Cargo.toml +++ b/script/research/dhtd/Cargo.toml @@ -13,7 +13,7 @@ features = ["dht"] async-channel = "1.8.0" async-executor = "1.5.0" async-std = "1.12.0" -async-trait = "0.1.60" +async-trait = "0.1.64" blake3 = "1.3.3" ctrlc = { version = "3.2.4", features = ["termination"] } easy-parallel = "3.2.0" diff --git a/script/research/raft-diag/Cargo.toml b/script/research/raft-diag/Cargo.toml index f4d764f66..f1eb830fd 100644 --- a/script/research/raft-diag/Cargo.toml +++ b/script/research/raft-diag/Cargo.toml @@ -12,11 +12,11 @@ darkfi = {path = "../../../", features = ["raft"]} # Async smol = "1.3.0" async-std = {version = "1.12.0", features = ["attributes"]} -async-trait = "0.1.60" +async-trait = "0.1.64" async-channel = "1.8.0" async-executor = "1.5.0" easy-parallel = "3.2.0" -futures = "0.3.25" +futures = "0.3.26" # Misc log = "0.4.17" @@ -34,4 +34,4 @@ serde_json = "1.0.91" structopt = "0.3.26" hex = "0.4.3" bs58 = "0.4.0" -toml = "0.5.10" +toml = "0.7.1" diff --git a/script/research/x3dh/Cargo.toml b/script/research/x3dh/Cargo.toml index f6ef66be1..af2e14ca2 100644 --- a/script/research/x3dh/Cargo.toml +++ b/script/research/x3dh/Cargo.toml @@ -12,6 +12,6 @@ sha2 = "0.10.6" digest = "0.11.0-pre" rand = "0.8.5" aes-gcm-siv = "0.11.1" -curve25519-dalek = {version = "4.0.0-pre.5", features = ["digest"]} +curve25519-dalek = {version = "4.0.0-rc.0", features = ["digest"]} ed25519-dalek = "1.0.1" x25519-dalek = "2.0.0-pre.1" diff --git a/src/serial/derive-internal/Cargo.toml b/src/serial/derive-internal/Cargo.toml index 62020f12a..f965d5ab3 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.49" +proc-macro2 = "1.0.50" quote = "1.0.23" syn = {version = "1.0.107", features = ["full", "fold"]} diff --git a/src/serial/derive/Cargo.toml b/src/serial/derive/Cargo.toml index 0140a70c1..cafc79e2a 100644 --- a/src/serial/derive/Cargo.toml +++ b/src/serial/derive/Cargo.toml @@ -12,8 +12,8 @@ edition = "2021" proc-macro = true [dependencies] -proc-macro-crate = "1.2.1" -proc-macro2 = "1.0.49" +proc-macro-crate = "1.3.0" +proc-macro2 = "1.0.50" syn = {version = "1.0.107", features = ["full", "fold"]} darkfi-derive-internal = {version = "0.3.0", path = "../derive-internal"}