Update crate dependencies

This commit is contained in:
parazyd
2022-11-08 12:16:52 +01:00
parent 745389c400
commit c1b2c2af5a
42 changed files with 244 additions and 226 deletions

174
Cargo.lock generated
View File

@@ -132,9 +132,9 @@ dependencies = [
[[package]]
name = "async-global-executor"
version = "2.3.0"
version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0da5b41ee986eed3f524c380e6d64965aea573882a8907682ad100f7859305ca"
checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776"
dependencies = [
"async-channel",
"async-executor",
@@ -147,16 +147,16 @@ dependencies = [
[[package]]
name = "async-io"
version = "1.9.0"
version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83e21f3a490c72b3b0cf44962180e60045de2925d8dff97918f7ee43c8f637c7"
checksum = "e8121296a9f05be7f34aa4196b1747243b3b62e048bb7906f644f3fbfc490cf7"
dependencies = [
"async-lock",
"autocfg",
"concurrent-queue",
"futures-lite",
"libc",
"log",
"once_cell",
"parking",
"polling",
"slab",
@@ -275,9 +275,9 @@ dependencies = [
[[package]]
name = "async-tungstenite"
version = "0.17.2"
version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1b71b31561643aa8e7df3effe284fa83ab1a840e52294c5f4bd7bfd8b2becbb"
checksum = "4b750efd83b7e716a015eed5ebb583cda83c52d9b24a8f0125e5c48c3313c9f8"
dependencies = [
"futures-io",
"futures-util",
@@ -328,7 +328,7 @@ dependencies = [
"cc",
"cfg-if",
"libc",
"miniz_oxide",
"miniz_oxide 0.5.4",
"object",
"rustc-demangle",
]
@@ -482,9 +482,9 @@ checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c"
[[package]]
name = "bytemuck"
version = "1.12.1"
version = "1.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f5715e491b5a1598fc2bef5a606847b5dc1d48ea625bd3c02c00de8285591da"
checksum = "aaa3a8d9a1ca92e282c96a32d6511b695d7d994d1d102ba85d279f9b2756947f"
[[package]]
name = "byteorder"
@@ -543,9 +543,9 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
[[package]]
name = "cc"
version = "1.0.73"
version = "1.0.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
checksum = "581f5dba903aac52ea3feb5ec4810848460ee833876f1f9b0fdeab1f19091574"
[[package]]
name = "cfg-if"
@@ -678,9 +678,9 @@ dependencies = [
[[package]]
name = "cmake"
version = "0.1.48"
version = "0.1.49"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a"
checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c"
dependencies = [
"cc",
]
@@ -1009,9 +1009,9 @@ dependencies = [
[[package]]
name = "crypto_box"
version = "0.8.1"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8cbf5d97a01c39dad83e20de5398748bbbb0ffd307b9612cf0db74ab3c88d551"
checksum = "fd26c32de5307fd08aac445a75c43472b14559d5dccdfba8022dbcd075838ebc"
dependencies = [
"aead",
"chacha20 0.9.0",
@@ -1085,9 +1085,9 @@ dependencies = [
[[package]]
name = "cxx"
version = "1.0.80"
version = "1.0.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6b7d4e43b25d3c994662706a1d4fcfc32aaa6afd287502c111b237093bb23f3a"
checksum = "97abf9f0eca9e52b7f81b945524e76710e6cb2366aead23b7d4fbf72e281f888"
dependencies = [
"cc",
"cxxbridge-flags",
@@ -1097,9 +1097,9 @@ dependencies = [
[[package]]
name = "cxx-build"
version = "1.0.80"
version = "1.0.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "84f8829ddc213e2c1368e51a2564c552b65a8cb6a28f31e576270ac81d5e5827"
checksum = "7cc32cc5fea1d894b77d269ddb9f192110069a8a9c1f1d441195fba90553dea3"
dependencies = [
"cc",
"codespan-reporting",
@@ -1112,15 +1112,15 @@ dependencies = [
[[package]]
name = "cxxbridge-flags"
version = "1.0.80"
version = "1.0.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e72537424b474af1460806647c41d4b6d35d09ef7fe031c5c2fa5766047cc56a"
checksum = "8ca220e4794c934dc6b1207c3b42856ad4c302f2df1712e9f8d2eec5afaacf1f"
[[package]]
name = "cxxbridge-macro"
version = "1.0.80"
version = "1.0.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "309e4fb93eed90e1e14bea0da16b209f81813ba9fc7830c20ed151dd7bc0a4d7"
checksum = "b846f081361125bfc8dc9d3940c84e1fd83ba54bbca7b17cd29483c828be0704"
dependencies = [
"proc-macro2",
"quote",
@@ -1196,7 +1196,6 @@ dependencies = [
"easy-parallel",
"futures",
"fxhash",
"group",
"halo2_gadgets",
"halo2_proofs",
"incrementalmerkletree",
@@ -1824,9 +1823,9 @@ dependencies = [
[[package]]
name = "env_logger"
version = "0.9.1"
version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272"
checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7"
dependencies = [
"atty",
"humantime",
@@ -1908,9 +1907,9 @@ dependencies = [
[[package]]
name = "ff"
version = "0.12.0"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df689201f395c6b90dfe87127685f8dbfc083a5e779e613575d8bd7314300c3e"
checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
dependencies = [
"bitvec",
"rand_core 0.6.4",
@@ -1924,7 +1923,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6"
dependencies = [
"crc32fast",
"miniz_oxide",
"miniz_oxide 0.5.4",
]
[[package]]
@@ -2115,13 +2114,13 @@ dependencies = [
[[package]]
name = "futures-intrusive"
version = "0.4.1"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b6bdbb8c5a42b2bb5ee8dd9dc2c7d73ce3e15d26dfe100fb347ffa3f58c672b"
checksum = "a604f7a68fbf8103337523b1fadc8ade7361ee3f112f7c680ad179651616aed5"
dependencies = [
"futures-core",
"lock_api",
"parking_lot 0.12.1",
"parking_lot 0.11.2",
]
[[package]]
@@ -2402,9 +2401,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[package]]
name = "iana-time-zone"
version = "0.1.51"
version = "0.1.53"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f5a6ef98976b22b3b7f2f3a806f858cb862044cfa66805aa3ad84cb3d3b785ed"
checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
dependencies = [
"android_system_properties",
"core-foundation-sys",
@@ -2505,9 +2504,9 @@ dependencies = [
[[package]]
name = "ipnet"
version = "2.5.0"
version = "2.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b"
checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745"
[[package]]
name = "iprange"
@@ -2654,9 +2653,9 @@ checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
[[package]]
name = "libloading"
version = "0.7.3"
version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd"
checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
dependencies = [
"cfg-if",
"winapi",
@@ -2771,6 +2770,15 @@ dependencies = [
"adler",
]
[[package]]
name = "miniz_oxide"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
dependencies = [
"adler",
]
[[package]]
name = "mio"
version = "0.8.5"
@@ -2791,9 +2799,9 @@ checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389"
[[package]]
name = "native-tls"
version = "0.2.10"
version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9"
checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
dependencies = [
"lazy_static",
"libc",
@@ -2872,9 +2880,9 @@ dependencies = [
[[package]]
name = "num_cpus"
version = "1.13.1"
version = "1.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5"
dependencies = [
"hermit-abi",
"libc",
@@ -2912,9 +2920,9 @@ dependencies = [
[[package]]
name = "once_cell"
version = "1.15.0"
version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1"
checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
[[package]]
name = "opaque-debug"
@@ -2969,9 +2977,9 @@ dependencies = [
[[package]]
name = "os_str_bytes"
version = "6.3.0"
version = "6.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"
checksum = "3baf96e39c5359d2eb0dd6ccb42c62b91d9678aa68160d261b9e0ccbf9e9dea9"
[[package]]
name = "parking"
@@ -3084,9 +3092,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
[[package]]
name = "pest"
version = "2.4.0"
version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dbc7bc69c062e492337d74d59b120c274fd3d261b6bf6d3207d499b4b379c41a"
checksum = "a528564cc62c19a7acac4d81e01f39e53e25e17b934878f4c6d25cc2836e62f8"
dependencies = [
"thiserror",
"ucd-trie",
@@ -3178,14 +3186,14 @@ dependencies = [
[[package]]
name = "png"
version = "0.17.6"
version = "0.17.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f0e7f4c94ec26ff209cee506314212639d6c91b80afb82984819fafce9df01c"
checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638"
dependencies = [
"bitflags",
"crc32fast",
"flate2",
"miniz_oxide",
"miniz_oxide 0.6.2",
]
[[package]]
@@ -3215,9 +3223,9 @@ dependencies = [
[[package]]
name = "ppv-lite86"
version = "0.2.16"
version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
[[package]]
name = "prettytable-rs"
@@ -3435,7 +3443,7 @@ checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b"
dependencies = [
"pem",
"ring",
"time 0.3.16",
"time 0.3.17",
"yasna",
]
@@ -3482,9 +3490,9 @@ dependencies = [
[[package]]
name = "regex"
version = "1.6.0"
version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
dependencies = [
"aho-corasick",
"memchr",
@@ -3499,9 +3507,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
[[package]]
name = "regex-syntax"
version = "0.6.27"
version = "0.6.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
[[package]]
name = "region"
@@ -3885,7 +3893,7 @@ checksum = "48dfff04aade74dd495b007c831cd6f4e0cee19c344dd9dc0884c0289b70a786"
dependencies = [
"log",
"termcolor",
"time 0.3.16",
"time 0.3.17",
]
[[package]]
@@ -4222,9 +4230,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
[[package]]
name = "target-lexicon"
version = "0.12.4"
version = "0.12.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c02424087780c9b71cc96799eaeddff35af2bc513278cda5c99fc1f5d026d3c1"
checksum = "9410d0f6853b1d94f0e519fb95df60f29d2c1eff2d921ffdf01a4c8a3b54f12d"
[[package]]
name = "tau"
@@ -4399,9 +4407,9 @@ dependencies = [
[[package]]
name = "time"
version = "0.3.16"
version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fab5c8b9980850e06d92ddbe3ab839c062c801f3927c0fb8abd6fc8e918fbca"
checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376"
dependencies = [
"itoa 1.0.4",
"libc",
@@ -4419,9 +4427,9 @@ checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
[[package]]
name = "time-macros"
version = "0.2.5"
version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "65bb801831d812c562ae7d2bfb531f26e66e4e1f6b17307ba4149c5064710e5b"
checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2"
dependencies = [
"time-core",
]
@@ -4807,9 +4815,9 @@ dependencies = [
[[package]]
name = "wasmer"
version = "3.0.0-rc.1"
version = "3.0.0-rc.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee6eea8f768e7b4313e1db8f8f4d20cccf0999102d53a2c27e1d88ecdf0b638d"
checksum = "acfd471eb798272c684bf6c958ec70c9e6e2cceefc05c9cfe293d995c7fc9cc0"
dependencies = [
"bytes",
"cfg-if",
@@ -4832,9 +4840,9 @@ dependencies = [
[[package]]
name = "wasmer-compiler"
version = "3.0.0-rc.1"
version = "3.0.0-rc.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6aac0e272385c4e29cbd217f874df59362053a5bda95c340d0c90c2cf9e56ca"
checksum = "a075ace8064d26557356cb499ad6e6559346baa825e138122565611c983753ed"
dependencies = [
"backtrace",
"cfg-if",
@@ -4856,9 +4864,9 @@ dependencies = [
[[package]]
name = "wasmer-compiler-cranelift"
version = "3.0.0-rc.1"
version = "3.0.0-rc.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4930b0384f8754129eabcfbd2ac33eaea976aef7a573a2c73728df7a31bab54e"
checksum = "c45fe71c800c50755d675465b50e017038213b8f75bb14d04b8298b2c16a62e2"
dependencies = [
"cranelift-codegen",
"cranelift-entity",
@@ -4875,9 +4883,9 @@ dependencies = [
[[package]]
name = "wasmer-compiler-singlepass"
version = "3.0.0-rc.1"
version = "3.0.0-rc.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2920ecd01f280562142466f78d6acf94a95b8597b93159a1a9524c4f9cf8958"
checksum = "af10e365ef38ab13b1f062d447fb5545546ccc6b99b5daa836fd503eceafb562"
dependencies = [
"byteorder",
"dynasm",
@@ -4893,9 +4901,9 @@ dependencies = [
[[package]]
name = "wasmer-derive"
version = "3.0.0-rc.1"
version = "3.0.0-rc.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75f1bc5a30f2b49dc52fe5ac9487b22b69985032f9a9b7b6d7dc27c56fca6430"
checksum = "d4bee8b64f88235d9b5ed24b76245cbbcc3a252a696a0f65baeb732060a3d005"
dependencies = [
"proc-macro-error",
"proc-macro2",
@@ -4905,9 +4913,9 @@ dependencies = [
[[package]]
name = "wasmer-middlewares"
version = "3.0.0-rc.1"
version = "3.0.0-rc.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4da081d79b2544251ae0cca5d142b1a3952f57c71cdb3dcc9e4394072a0c83fd"
checksum = "29f50edd5e8e19fe81099a3757e5168d65695ae262c98de0518336148094bdd2"
dependencies = [
"wasmer",
"wasmer-types",
@@ -4916,9 +4924,9 @@ dependencies = [
[[package]]
name = "wasmer-types"
version = "3.0.0-rc.1"
version = "3.0.0-rc.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0065ac636258dd9277d69210ad881df5f7973491e693a7e877b0e4389afe5a2c"
checksum = "b5806cf609ca299b265f93b5a8c4c2156933fd7d592c5861a847f11336cf8dc4"
dependencies = [
"enum-iterator",
"enumset",
@@ -4931,9 +4939,9 @@ dependencies = [
[[package]]
name = "wasmer-vm"
version = "3.0.0-rc.1"
version = "3.0.0-rc.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "366dc013296afba61854d4729e360367dd1fb6651266ef1f904059dbdc1d838a"
checksum = "0898e214975ccdbbd0cddc2aa89839b34b6d0f373bc442c7c675cbb024019468"
dependencies = [
"backtrace",
"cc",
@@ -5237,7 +5245,7 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "346d34a236c9d3e5f3b9b74563f238f955bbd05fa0b8b4efa53c130c43982f4c"
dependencies = [
"time 0.3.16",
"time 0.3.17",
]
[[package]]

View File

@@ -50,20 +50,20 @@ members = [
[dependencies]
# Hard dependencies
libc = "0.2.134"
libc = "0.2.137"
log = "0.4.17"
thiserror = "1.0.37"
# async-runtime
async-std = {version = "1.12.0", features = ["attributes"], optional = true}
async-trait = {version = "0.1.57", optional = true}
futures = {version = "0.3.24", optional = true}
async-trait = {version = "0.1.58", optional = true}
futures = {version = "0.3.25", optional = true}
smol = {version = "1.2.5", optional = true}
# Networking
futures-rustls = {version = "0.22.2", features = ["dangerous_configuration"], optional = true}
iprange = {version = "0.6.7", optional = true}
ipnet = {version = "2.5.0", optional = true}
ipnet = {version = "2.5.1", optional = true}
socket2 = {version = "0.4.7", optional = true}
# TLS cert utilities
@@ -74,8 +74,8 @@ 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.85", optional = true}
serde = {version = "1.0.145", features = ["derive"], optional = true}
serde_json = {version = "1.0.87", optional = true}
serde = {version = "1.0.147", 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}
@@ -102,7 +102,7 @@ simplelog = {version = "0.12.0", optional = true}
termion = {version = "1.5.6", optional = true}
# Websockets
async-tungstenite = {version = "0.17.2", optional = true}
async-tungstenite = {version = "0.18.0", optional = true}
tungstenite = {version = "0.17.3", optional = true}
# socks5
@@ -118,14 +118,14 @@ halo2_gadgets = {version = "0.2.0", optional = true}
incrementalmerkletree = {version = "0.3.0", optional = true}
num-bigint = {version = "0.4.3", optional = true}
num-traits = {version = "0.2.15", optional = true}
pasta_curves = {version = "0.4.0", optional = true}
pasta_curves = {version = "0.4.1", optional = true}
sha2 = {version = "0.10.6", optional = true}
# Smart contract runtime
darkfi-sdk = {path = "src/sdk", optional = true}
wasmer = {version = "3.0.0-beta", optional = true}
wasmer-compiler-singlepass = {version = "3.0.0-beta", optional = true}
wasmer-middlewares = {version = "3.0.0-beta", 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}
# Wallet management
libsqlite3-sys = {version = "0.24.2", features = ["bundled-sqlcipher"], optional = true }
@@ -142,7 +142,7 @@ clap = {version = "3.2.20", 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.1"
env_logger = "0.9.3"
easy-parallel = "3.2.0"

View File

@@ -15,9 +15,9 @@ features = ["wallet", "node", "rpc"]
[dependencies]
# Async
smol = "1.2.5"
futures = "0.3.24"
futures = "0.3.25"
async-std = "1.12.0"
async-trait = "0.1.57"
async-trait = "0.1.58"
async-channel = "1.7.1"
async-executor = "1.4.1"
easy-parallel = "3.2.0"
@@ -28,21 +28,21 @@ rand = "0.8.5"
# Misc
clap = {version = "3.2.20", features = ["derive"]}
log = "0.4.17"
num_cpus = "1.13.1"
num_cpus = "1.14.0"
simplelog = "0.12.0"
thiserror = "1.0.37"
url = "2.3.1"
fxhash = "0.2.1"
# Encoding and parsing
serde = {version = "1.0.145", features = ["derive"]}
serde_json = "1.0.85"
serde = {version = "1.0.147", features = ["derive"]}
serde_json = "1.0.87"
# Bitcoin bridge dependencies
bdk = {version = "0.22.0", optional = true}
anyhow = {version = "1.0.65", optional = true}
bdk = {version = "0.24.0", optional = true}
anyhow = {version = "1.0.66", optional = true}
bitcoin = {version = "0.29.1", optional = true}
secp256k1 = {version = "0.24.0", default-features = false, features = ["rand-std"], optional = true}
secp256k1 = {version = "0.24.1", default-features = false, features = ["rand-std"], optional = true}
# Ethereum bridge dependencies
hex = {version = "0.4.3", optional = true}
@@ -52,10 +52,10 @@ keccak-hasher = {version = "0.15.3", optional = true}
num-bigint = {version = "0.4.3", features = ["rand", "serde"], optional = true}
# Solana bridge dependencies
native-tls = {version = "0.2.10", optional = true}
native-tls = {version = "0.2.11", optional = true}
async-native-tls = {version = "0.4.0", optional = true}
solana-client = {version = "1.14.5", optional = true}
solana-sdk = {version = "1.14.5", optional = true}
solana-client = {version = "1.14.7", optional = true}
solana-sdk = {version = "1.14.7", 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}

View File

@@ -15,19 +15,19 @@ features = ["rpc"]
[dependencies]
# Async
smol = "1.2.5"
futures = "0.3.24"
futures = "0.3.25"
async-std = {version = "1.12.0", features = ["attributes"]}
async-trait = "0.1.57"
async-trait = "0.1.58"
async-channel = "1.7.1"
async-executor = "1.4.1"
# Misc
clap = {version = "3.2.20", features = ["derive"]}
log = "0.4.17"
num_cpus = "1.13.1"
num_cpus = "1.14.0"
simplelog = "0.12.0"
url = "2.3.1"
prettytable-rs = "0.9.0"
# Encoding and parsing
serde_json = "1.0.85"
serde_json = "1.0.87"

View File

@@ -15,16 +15,16 @@ darkfi-serial = {path = "../../../src/serial"}
# Async
smol = "1.2.5"
futures = "0.3.24"
futures = "0.3.25"
async-std = {version = "1.12.0", features = ["attributes"]}
async-trait = "0.1.57"
async-trait = "0.1.58"
async-channel = "1.7.1"
async-executor = "1.4.1"
easy-parallel = "3.2.0"
# Misc
log = "0.4.17"
num_cpus = "1.13.1"
num_cpus = "1.14.0"
simplelog = "0.12.0"
thiserror = "1.0.37"
@@ -37,7 +37,7 @@ pasta_curves = "0.4.1"
incrementalmerkletree = "0.3.0"
# Encoding and parsing
serde_json = "1.0.85"
serde_json = "1.0.87"
bs58 = "0.4.0"
fxhash = "0.2.1"

View File

@@ -10,7 +10,7 @@ edition = "2021"
[dependencies]
async-std = "1.12.0"
async-trait = "0.1.57"
async-trait = "0.1.58"
blake3 = "1.3.1"
bs58 = "0.4.0"
chrono = "0.4.22"
@@ -23,15 +23,15 @@ fxhash = "0.2.1"
incrementalmerkletree = "0.3.0"
lazy-init = "0.5.1"
log = "0.4.17"
pasta_curves = "0.4.0"
pasta_curves = "0.4.1"
rand = "0.8.5"
serde_json = "1.0.85"
serde_json = "1.0.87"
simplelog = "0.12.0"
sled = "0.34.7"
smol = "1.2.5"
url = "2.3.1"
# Argument parsing
serde = {version = "1.0.145", features = ["derive"]}
serde = {version = "1.0.147", features = ["derive"]}
structopt = "0.3.26"
structopt-toml = "0.5.1"

View File

@@ -18,5 +18,5 @@ darkfi-serial = {path = "../../src/serial"}
halo2_proofs = "0.2.0"
halo2_gadgets = "0.2.0"
rand = "0.8.5"
serde_json = "1.0.85"
serde_json = "1.0.87"
url = "2.3.1"

View File

@@ -14,9 +14,9 @@ darkfi = {path = "../../../", features = ["rpc"]}
# Async
smol = "1.2.5"
async-std = {version = "1.12.0", features = ["attributes"]}
async-trait = "0.1.57"
async-trait = "0.1.58"
async-channel = "1.7.1"
futures = "0.3.24"
futures = "0.3.25"
# Misc
log = "0.4.17"
@@ -25,6 +25,6 @@ rand = "0.8.5"
url = "2.3.1"
# Encoding and parsing
serde = {version = "1.0.145", features = ["derive"]}
serde_json = "1.0.85"
serde = {version = "1.0.147", features = ["derive"]}
serde_json = "1.0.87"
structopt = "0.3.26"

View File

@@ -10,20 +10,20 @@ edition = "2021"
[dependencies]
async-std = "1.12.0"
async-trait = "0.1.57"
async-trait = "0.1.58"
blake3 = "1.3.1"
bs58 = "0.4.0"
darkfi = {path = "../../../", features = ["raft", "rpc", "util"]}
darkfi-serial = {path = "../../../src/serial"}
dryoc = "0.3.14"
easy-parallel = "3.2.0"
futures = "0.3.24"
futures = "0.3.25"
fxhash = "0.2.1"
lazy_static = "1.4.0"
log = "0.4.17"
serde = "1.0.145"
serde_derive = "1.0.145"
serde_json = "1.0.85"
serde = "1.0.147"
serde_derive = "1.0.147"
serde_json = "1.0.87"
signal-hook-async-std = "0.2.2"
signal-hook = "0.3.14"
simplelog = "0.12.0"

View File

@@ -28,12 +28,12 @@ clap = {version = "3.2.20", features = ["derive"]}
rand = "0.8.5"
simplelog = "0.12.0"
log = "0.4.17"
num_cpus = "1.13.1"
num_cpus = "1.14.0"
url = "2.3.1"
fxhash = "0.2.1"
thiserror = "1.0.37"
# Encoding and parsing
serde_json = "1.0.85"
serde = {version = "1.0.145", features = ["derive"]}
serde_json = "1.0.87"
serde = {version = "1.0.147", features = ["derive"]}
hex = "0.4.3"

View File

@@ -16,9 +16,9 @@ darkfi = {path = "../../", features = ["crypto", "util", "rpc", "wasm-runtime",
darkfi-sdk = {path = "../../src/sdk"}
indicatif = "0.17.1"
log = "0.4.17"
pasta_curves = "0.4.0"
pasta_curves = "0.4.1"
prettytable-rs = "0.9.0"
rand = "0.8.5"
serde_json = "1.0.85"
serde_json = "1.0.87"
simplelog = "0.12.0"
url = "2.3.1"

View File

@@ -10,7 +10,7 @@ edition = "2021"
[dependencies]
async-std = "1.12.0"
async-trait = "0.1.57"
async-trait = "0.1.58"
blake3 = "1.3.1"
bs58 = "0.4.0"
chrono = "0.4.22"
@@ -23,13 +23,13 @@ hex = "0.4.3"
lazy-init = "0.5.1"
log = "0.4.17"
rand = "0.8.5"
serde_json = "1.0.85"
serde_json = "1.0.87"
simplelog = "0.12.0"
sled = "0.34.7"
smol = "1.2.5"
url = "2.3.1"
# Argument parsing
serde = {version = "1.0.145", features = ["derive"]}
serde = {version = "1.0.147", features = ["derive"]}
structopt = "0.3.26"
structopt-toml = "0.5.1"

View File

@@ -17,6 +17,6 @@ async-std = {version = "1.12.0", features = ["attributes"]}
# Misc
clap = {version = "3.2.20", features = ["derive"]}
log = "0.4.17"
serde_json = "1.0.85"
serde_json = "1.0.87"
simplelog = "0.12.0"
url = "2.3.1"

View File

@@ -14,7 +14,7 @@ darkfi-serial = {path = "../../../src/serial"}
# Async
async-std = "1.12.0"
async-trait = "0.1.57"
async-trait = "0.1.58"
ctrlc = { version = "3.2.3", features = ["termination"] }
easy-parallel = "3.2.0"
smol = "1.2.5"
@@ -22,11 +22,11 @@ smol = "1.2.5"
# Misc
blake3 = "1.3.1"
log = "0.4.17"
serde_json = "1.0.85"
serde_json = "1.0.87"
simplelog = "0.12.0"
url = "2.3.1"
# Argument parsing
serde = {version = "1.0.145", features = ["derive"]}
serde = {version = "1.0.147", features = ["derive"]}
structopt = "0.3.26"
structopt-toml = "0.5.1"

View File

@@ -14,16 +14,16 @@ darkfi-serial = {path = "../../src/serial"}
# Async
smol = "1.2.5"
futures = "0.3.24"
futures = "0.3.25"
futures-rustls = "0.22.2"
rustls-pemfile = "1.0.1"
async-std = "1.12.0"
async-trait = "0.1.57"
async-trait = "0.1.58"
easy-parallel = "3.2.0"
async-recursion = "1.0.0"
# Crypto
crypto_box = "0.8.1"
crypto_box = "0.8.2"
rand = "0.8.5"
# Misc
@@ -37,8 +37,8 @@ chrono = "0.4.22"
ripemd = "0.1.3"
# Encoding and parsing
serde_json = "1.0.85"
serde = {version = "1.0.145", features = ["derive"]}
serde_json = "1.0.87"
serde = {version = "1.0.147", features = ["derive"]}
structopt = "0.3.26"
structopt-toml = "0.5.1"
bs58 = "0.4.0"

View File

@@ -14,15 +14,15 @@ darkfi-serial = {path = "../../src/serial"}
# Async
smol = "1.2.5"
futures = "0.3.24"
futures = "0.3.25"
futures-rustls = "0.22.2"
rustls-pemfile = "1.0.1"
async-std = "1.12.0"
async-trait = "0.1.57"
async-trait = "0.1.58"
easy-parallel = "3.2.0"
# Crypto
crypto_box = "0.8.1"
crypto_box = "0.8.2"
rand = "0.8.5"
# Misc
@@ -36,8 +36,8 @@ chrono = "0.4.22"
ripemd = "0.1.3"
# Encoding and parsing
serde_json = "1.0.85"
serde = {version = "1.0.145", features = ["derive"]}
serde_json = "1.0.87"
serde = {version = "1.0.147", features = ["derive"]}
structopt = "0.3.26"
structopt-toml = "0.5.1"
bs58 = "0.4.0"

View File

@@ -13,7 +13,7 @@ darkfi = {path = "../../", features = ["net", "rpc"]}
# Async
async-std = "1.12.0"
async-trait = "0.1.57"
async-trait = "0.1.58"
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.85"
serde_json = "1.0.87"
simplelog = "0.12.0"
url = "2.3.1"
# Argument parsing
serde = {version = "1.0.145", features = ["derive"]}
serde = {version = "1.0.147", features = ["derive"]}
structopt = "0.3.26"
structopt-toml = "0.5.1"
toml = "0.5.9"

View File

@@ -17,9 +17,9 @@ darkfi = { path = "../../../", features = ["rpc"]}
fxhash = "0.2.1"
log = "0.4.17"
prettytable-rs = "0.9.0"
serde = {version = "1.0.145", features = ["derive"]}
serde_json = "1.0.85"
serde = {version = "1.0.147", features = ["derive"]}
serde_json = "1.0.87"
simplelog = "0.12.0"
term_grid = { git = "https://github.com/Dastan-glitch/rust-term-grid.git" }
textwrap = "0.15.1"
textwrap = "0.15.2"
url = "2.3.1"

View File

@@ -15,9 +15,9 @@ darkfi-serial = { path = "../../../src/serial" }
# Async
smol = "1.2.5"
async-std = {version = "1.12.0", features = ["attributes"]}
async-trait = "0.1.57"
async-trait = "0.1.58"
easy-parallel = "3.2.0"
futures = "0.3.24"
futures = "0.3.25"
# Misc
log = "0.4.17"
@@ -30,11 +30,11 @@ url = "2.3.1"
fxhash = "0.2.1"
# Encoding and parsing
serde = {version = "1.0.145", features = ["derive"]}
serde_json = "1.0.85"
serde = {version = "1.0.147", features = ["derive"]}
serde_json = "1.0.87"
structopt = "0.3.26"
structopt-toml = "0.5.1"
crypto_box = {version = "0.8.1", features = ["std"]}
crypto_box = {version = "0.8.2", features = ["std"]}
hex = "0.4.3"
bs58 = "0.4.0"
toml = "0.5.9"

View File

@@ -15,6 +15,6 @@ ctrlc = "3.2.3"
darkfi = {path = "../../", features = ["crypto"]}
darkfi-sdk = {path = "../../src/sdk"}
indicatif = "0.17.1"
num_cpus = "1.13.1"
num_cpus = "1.14.0"
rand = "0.8.5"
rayon = "1.5.3"

View File

@@ -21,10 +21,18 @@ CRATESIO_INDEX = join(getenv("HOME"), ".cache", "crates.io-index")
PICKLE_CACHE = join(getenv("HOME"), ".cache", "cargo-outdated.pickle")
# Set of packages that are ignored by this tool
IGNORES = {"drk-sdk", "darkfi", "darkfi-derive", "darkfi-derive-internal"}
IGNORES = {
"darkfi-serial",
"darkfi-sdk",
"darkfi",
"darkfi-derive",
"darkfi-derive-internal",
"dao-contract",
"money-contract",
}
# Yanked releases from crates.io to ignore
YANKED = {"socket2": ["0.4.5"]}
YANKED = {}
# Cached paths for metadata to not have to search through the crates index
METADATA_PATHS = {}
@@ -101,7 +109,7 @@ def check_dep(name, data):
else:
raise ValueError(f"Invalid dependency: {name}")
if semver.compare(local_version, metadata["vers"], loose=True) < 0:
if semver.compare(local_version, metadata["vers"]) < 0:
name = metadata["name"]
vers = metadata["vers"]

View File

@@ -12,34 +12,34 @@ darkfi-sdk = {path = "../../src/sdk"}
# Async
smol = "1.2.5"
futures = "0.3.24"
futures = "0.3.25"
async-std = {version = "1.12.0", features = ["attributes"]}
async-trait = "0.1.57"
async-trait = "0.1.58"
async-channel = "1.7.1"
async-executor = "1.4.1"
easy-parallel = "3.2.0"
# Misc
log = "0.4.17"
num_cpus = "1.13.1"
num_cpus = "1.14.0"
simplelog = "0.12.0"
thiserror = "1.0.37"
# Crypto
incrementalmerkletree = "0.3.0"
pasta_curves = "0.4.0"
pasta_curves = "0.4.1"
halo2_gadgets = "0.2.0"
halo2_proofs = "0.2.0"
rand = "0.8.5"
chacha20poly1305 = "0.10.1"
group = "0.12.0"
group = "0.12.1"
# Encoding and parsing
serde_json = "1.0.85"
serde_json = "1.0.87"
bs58 = "0.4.0"
fxhash = "0.2.1"
# Utilities
lazy_static = "1.4.0"
url = "2.3.1"
env_logger = "0.9.1"
env_logger = "0.9.3"

View File

@@ -21,34 +21,34 @@ sled = "0.34.7"
# Async
smol = "1.2.5"
futures = "0.3.24"
futures = "0.3.25"
async-std = {version = "1.12.0", features = ["attributes"]}
async-trait = "0.1.57"
async-trait = "0.1.58"
async-channel = "1.7.1"
async-executor = "1.4.1"
easy-parallel = "3.2.0"
# Misc
log = "0.4.17"
num_cpus = "1.13.1"
num_cpus = "1.14.0"
simplelog = "0.12.0"
thiserror = "1.0.37"
# Crypto
incrementalmerkletree = "0.3.0"
pasta_curves = "0.4.0"
pasta_curves = "0.4.1"
halo2_gadgets = "0.2.0"
halo2_proofs = "0.2.0"
rand = "0.8.5"
chacha20poly1305 = "0.10.1"
group = "0.12.0"
group = "0.12.1"
# Encoding and parsing
serde_json = "1.0.85"
serde_json = "1.0.87"
bs58 = "0.4.0"
fxhash = "0.2.1"
# Utilities
lazy_static = "1.4.0"
url = "2.3.1"
env_logger = "0.9.1"
env_logger = "0.9.3"

View File

@@ -15,4 +15,4 @@ darkfi-serial = { path = "../../../../src/serial", features = ["crypto"] }
# We need to disable random using "custom" which makes the crate a noop
# so the wasm32-unknown-unknown target is enabled.
[target.'cfg(target_arch = "wasm32")'.dependencies]
getrandom = { version = "0.2", features = ["custom"] }
getrandom = { version = "0.2.8", features = ["custom"] }

View File

@@ -15,4 +15,4 @@ darkfi-serial = { path = "../../../../src/serial" }
# We need to disable random using "custom" which makes the crate a noop
# so the wasm32-unknown-unknown target is enabled.
[target.'cfg(target_arch = "wasm32")'.dependencies]
getrandom = { version = "0.2", features = ["custom"] }
getrandom = { version = "0.2.8", features = ["custom"] }

View File

@@ -16,16 +16,16 @@ darkfi-serial = {path = "../../src/serial"}
# ANCHOR: dependencies
async-std = "1.12.0"
async-trait = "0.1.57"
async-trait = "0.1.58"
easy-parallel = "3.2.0"
smol = "1.2.5"
num_cpus = "1.13.1"
num_cpus = "1.14.0"
log = "0.4.17"
simplelog = "0.12.0"
url = "2.3.1"
serde_json = "1.0.85"
serde = {version = "1.0.145", features = ["derive"]}
serde_json = "1.0.87"
serde = {version = "1.0.147", features = ["derive"]}
toml = "0.5.9"
# ANCHOR_END: dependencies

View File

@@ -13,9 +13,9 @@ edition = "2021"
darkfi = {path = "../../", features = ["net", "rpc"]}
# Async
smol = "1.2.5"
futures = "0.3.24"
futures = "0.3.25"
async-std = "1.12.0"
async-trait = "0.1.57"
async-trait = "0.1.58"
async-channel = "1.7.1"
async-executor = "1.4.1"
easy-parallel = "3.2.0"
@@ -31,4 +31,4 @@ fxhash = "0.2.1"
url = "2.3.1"
# Encoding and parsing
serde_json = "1.0.85"
serde_json = "1.0.87"

View File

@@ -22,7 +22,7 @@ darkfi-serial = { path = "../../src/serial" }
# We need to disable random using "custom" which makes the crate a noop
# so the wasm32-unknown-unknown target is enabled.
getrandom = { version = "0.2", features = ["custom"] }
getrandom = { version = "0.2.8", features = ["custom"] }
[dev-dependencies]
darkfi = { path = "../../", features = ["wasm-runtime"] }

View File

@@ -14,18 +14,18 @@ dashu = { version = "0.2.0", git = "https://github.com/ertosns/dashu" }
halo2_gadgets = "0.2.0"
halo2_proofs = "0.2.0"
incrementalmerkletree = "0.3.0"
pasta_curves = "0.4.0"
pasta_curves = "0.4.1"
# Async
async-std = "1.12.0"
async-trait = "0.1.57"
async-trait = "0.1.58"
ctrlc = { version = "3.2.3", features = ["termination"] }
easy-parallel = "3.2.0"
smol = "1.2.5"
# Argument parsing
serde = "1.0.145"
serde_derive = "1.0.145"
serde = "1.0.147"
serde_derive = "1.0.147"
structopt = "0.3.26"
structopt-toml = "0.5.1"

View File

@@ -13,19 +13,19 @@ features = ["dht"]
async-channel = "1.7.1"
async-executor = "1.4.1"
async-std = "1.12.0"
async-trait = "0.1.57"
async-trait = "0.1.58"
blake3 = "1.3.1"
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.85"
serde_json = "1.0.87"
simplelog = "0.12.0"
url = "2.3.1"
# Argument parsing
serde = "1.0.145"
serde_derive = "1.0.145"
serde = "1.0.147"
serde_derive = "1.0.147"
structopt = "0.3.26"
structopt-toml = "0.5.1"

View File

@@ -13,7 +13,7 @@ darkfi-sdk = {path="../../../src/sdk"}
darkfi-serial = {path="../../../src/serial"}
rand = "0.8.5"
pasta_curves = "0.4.0"
pasta_curves = "0.4.1"
incrementalmerkletree = "0.3.0"
serde_json = "1.0.87"

View File

@@ -13,5 +13,5 @@ blake3 = "1.3.1"
darkfi = {path = "../../../", features = ["blockchain", "node", "wallet"]}
darkfi-sdk = {path = "../../../src/sdk"}
darkfi-serial = {path = "../../../src/serial"}
serde = "1.0.145"
serde = "1.0.147"
sled = "0.34.7"

View File

@@ -8,9 +8,9 @@ edition = "2018"
[workspace]
[dependencies]
pasta_curves = "0.4.0"
ff = "0.12.0"
group = "0.12.0"
pasta_curves = "0.4.1"
ff = "0.12.1"
group = "0.12.1"
rand = "0.8.5"
[[bin]]

View File

@@ -12,11 +12,11 @@ darkfi = {path = "../../../", features = ["raft"]}
# Async
smol = "1.2.5"
async-std = {version = "1.12.0", features = ["attributes"]}
async-trait = "0.1.57"
async-trait = "0.1.58"
async-channel = "1.7.1"
async-executor = "1.4.1"
easy-parallel = "3.2.0"
futures = "0.3.24"
futures = "0.3.25"
# Misc
log = "0.4.17"
@@ -29,8 +29,8 @@ url = "2.3.1"
fxhash = "0.2.1"
# Encoding and parsing
serde = {version = "1.0.145", features = ["derive"]}
serde_json = "1.0.85"
serde = {version = "1.0.147", features = ["derive"]}
serde_json = "1.0.87"
structopt = "0.3.26"
hex = "0.4.3"
bs58 = "0.4.0"

View File

@@ -14,7 +14,7 @@ darkfi = {path = "../../../", features = ["blockchain"]}
incrementalmerkletree = "0.3.0"
lazy-init = "0.5.1"
log = "0.4.17"
pasta_curves = "0.4.0"
pasta_curves = "0.4.1"
rand = "0.8.5"
serde = {version = "1.0.145", features = ["derive"]}
serde = {version = "1.0.147", features = ["derive"]}
sled = "0.34.7"

View File

@@ -8,10 +8,10 @@ edition = "2021"
[workspace]
[dependencies]
sha3 = "0.10.6"
sha2 = "0.10.6"
digest = "0.10.5"
rand = "0.7.3"
rand = "0.8.5"
aes-gcm-siv = "0.11.1"
curve25519-dalek = "3.2.1"
curve25519-dalek = "4.0.0-pre.2"
ed25519-dalek = "1.0.1"
x25519-dalek = "1.2.0"
x25519-dalek = "2.0.0-pre.1"

View File

@@ -23,7 +23,7 @@ use std::collections::{HashMap, VecDeque};
use aes_gcm_siv::{AeadInPlace, Aes256GcmSiv, KeyInit};
use digest::Update;
use rand::rngs::OsRng;
use sha3::Sha3_256;
use sha2::Sha256;
use x25519_dalek::{PublicKey as X25519PublicKey, StaticSecret as X25519SecretKey};
mod hkdf;
@@ -173,11 +173,11 @@ impl MessageHeader {
/// the message key, and a single byte 0x02 as input to produce the next chain
/// key.
fn kdf_ck(ck: [u8; 32]) -> ([u8; 32], [u8; 32]) {
let mut hmac = Hmac::<Sha3_256>::new_from_slice(&ck);
let mut hmac = Hmac::<Sha256>::new_from_slice(&ck);
hmac.update(&[CHAIN_KEY_CONSTANT]);
let chain_key = hmac.finalize();
let mut hmac = Hmac::<Sha3_256>::new_from_slice(&ck);
let mut hmac = Hmac::<Sha256>::new_from_slice(&ck);
hmac.update(&[MESSAGE_KEY_CONSTANT]);
let message_key = hmac.finalize();
@@ -195,11 +195,11 @@ fn kdf_rk(rk: [u8; 32], dh_out: [u8; 32]) -> ([u8; 32], [u8; 32], [u8; 32]) {
const KDF_RK_INFO: &[u8] = b"x3dh_double_ratchet_kdf_rk";
const KDF_HE_INFO: &[u8] = b"x3dh_double_ratchet_kdf_rk_he";
let (_root_key, hkdf) = Hkdf::<Sha3_256>::extract(&rk, &dh_out);
let (_root_key, hkdf) = Hkdf::<Sha256>::extract(&rk, &dh_out);
let mut chain_key = [0u8; 32];
hkdf.expand(KDF_RK_INFO, &mut chain_key).unwrap();
let (root_key, hkdf) = Hkdf::<Sha3_256>::extract(&rk, &dh_out);
let (root_key, hkdf) = Hkdf::<Sha256>::extract(&rk, &dh_out);
let mut next_header_key = [0u8; 32];
hkdf.expand(KDF_HE_INFO, &mut next_header_key).unwrap();
@@ -529,7 +529,7 @@ fn main() {
ikm.extend_from_slice(&opk_dh.to_bytes());
}
let hkdf = Hkdf::<Sha3_256>::new(&salt, &ikm);
let hkdf = Hkdf::<Sha256>::new(&salt, &ikm);
let mut sk = [0u8; 32];
hkdf.expand(X3DH_INIT_INFO, &mut sk).unwrap();
@@ -610,7 +610,7 @@ fn main() {
// TODO: Erase ephemeral data
let hkdf = Hkdf::<Sha3_256>::new(&salt, &ikm);
let hkdf = Hkdf::<Sha256>::new(&salt, &ikm);
let mut sk2 = [0u8; 32];
hkdf.expand(X3DH_INIT_INFO, &mut sk2).unwrap();
assert_eq!(sk, sk2); // Just to confirm everything's correct

View File

@@ -21,7 +21,9 @@
use curve25519_dalek::{
constants::ED25519_BASEPOINT_POINT, montgomery::MontgomeryPoint, scalar::Scalar,
};
use ed25519_dalek::{Digest, PublicKey as Ed25519PublicKey, Sha512, Signature, Verifier};
use digest::Digest;
use ed25519_dalek::{PublicKey as Ed25519PublicKey, Signature, Verifier};
use sha2::Sha512;
use x25519_dalek::{PublicKey as X25519PublicKey, StaticSecret as X25519SecretKey};
pub trait XeddsaSigner {

View File

@@ -30,7 +30,7 @@ blake2b_simd = "1.0.0"
blake3 = "1.3.1"
halo2_gadgets = "0.2.0"
incrementalmerkletree = "0.3.0"
pasta_curves = "0.4.0"
pasta_curves = "0.4.1"
rand_core = "0.6.4"
sha2 = "0.10.6"

View File

@@ -16,7 +16,7 @@ futures-lite = {version = "1.12.0", optional = true}
blake3 = {version = "1.3.1", optional = true}
fxhash = {version = "0.2.1", optional = true}
incrementalmerkletree = {version = "0.3.0", optional = true}
pasta_curves = {version = "0.4.0", optional = true}
pasta_curves = {version = "0.4.1", optional = true}
url = {version = "2.3.1", optional = true}
[features]

View File

@@ -9,6 +9,6 @@ license = "AGPL-3.0-only"
edition = "2021"
[dependencies]
proc-macro2 = "1.0.46"
proc-macro2 = "1.0.47"
quote = "1.0.21"
syn = {version = "1.0.101", features = ["full", "fold"]}
syn = {version = "1.0.103", features = ["full", "fold"]}

View File

@@ -13,7 +13,7 @@ proc-macro = true
[dependencies]
proc-macro-crate = "1.2.1"
proc-macro2 = "1.0.46"
syn = {version = "1.0.101", features = ["full", "fold"]}
proc-macro2 = "1.0.47"
syn = {version = "1.0.103", features = ["full", "fold"]}
darkfi-derive-internal = {path = "../derive-internal"}