diff --git a/Cargo.lock b/Cargo.lock index 9c4710f95..672f0c027 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -36,7 +36,7 @@ dependencies = [ "eth2_keystore", "eth2_wallet", "filesystem", - "rand 0.7.3", + "rand 0.8.5", "regex", "rpassword", "serde", @@ -86,7 +86,7 @@ checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if", "cipher", - "cpufeatures 0.2.2", + "cpufeatures", "ctr", "opaque-debug", ] @@ -111,7 +111,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.5", + "getrandom 0.2.6", "once_cell", "version_check", ] @@ -166,12 +166,6 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - [[package]] name = "arrayvec" version = "0.7.2" @@ -186,9 +180,9 @@ checksum = "e22d1f4b888c298a027c99dc9048015fac177587de20fc30232a057dfbe24a21" [[package]] name = "async-trait" -version = "0.1.52" +version = "0.1.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3" +checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" dependencies = [ "proc-macro2", "quote", @@ -269,12 +263,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - [[package]] name = "base64" version = "0.13.0" @@ -285,13 +273,13 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" name = "beacon_chain" version = "0.2.0" dependencies = [ - "bitvec 0.19.6", + "bitvec", "bls", "derivative", "environment", "eth1", "eth2", - "eth2_hashing 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "eth2_hashing", "eth2_ssz", "eth2_ssz_derive", "eth2_ssz_types", @@ -308,9 +296,9 @@ dependencies = [ "maplit", "merkle_proof", "operation_pool", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "proto_array", - "rand 0.7.3", + "rand 0.8.5", "rayon", "safe_arith", "sensitive_url", @@ -396,31 +384,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - -[[package]] -name = "bitvec" -version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41262f11d771fd4a61aa3ce019fca363b4b6c282fca9da2a31186d3965a47a5c" -dependencies = [ - "either", - "radium 0.3.0", -] - -[[package]] -name = "bitvec" -version = "0.19.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55f93d0ef3363c364d5976646a38f04cf67cfe1d4c8d160cdea02cab2c116b33" -dependencies = [ - "funty", - "radium 0.5.3", - "tap", - "wyz", -] +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitvec" @@ -429,7 +395,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848" dependencies = [ "funty", - "radium 0.6.2", + "radium", "tap", "wyz", ] @@ -474,10 +440,10 @@ version = "0.2.0" dependencies = [ "arbitrary", "blst", - "eth2_hashing 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "eth2_hashing", "eth2_serde_utils", "eth2_ssz", - "ethereum-types 0.12.1", + "ethereum-types", "hex", "milagro_bls", "rand 0.7.3", @@ -559,12 +525,6 @@ version = "3.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" -[[package]] -name = "byte-slice-cast" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3" - [[package]] name = "byte-slice-cast" version = "1.2.1" @@ -608,11 +568,11 @@ dependencies = [ name = "cached_tree_hash" version = "0.1.0" dependencies = [ - "eth2_hashing 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "eth2_hashing", "eth2_ssz", "eth2_ssz_derive", "eth2_ssz_types", - "ethereum-types 0.12.1", + "ethereum-types", "quickcheck 0.9.2", "quickcheck_macros", "smallvec", @@ -657,7 +617,7 @@ checksum = "01b72a433d0cf2aef113ba70f62634c56fddb0f244e6377185c56a7cadbd8f91" dependencies = [ "cfg-if", "cipher", - "cpufeatures 0.2.2", + "cpufeatures", "zeroize", ] @@ -730,7 +690,7 @@ dependencies = [ "dirs", "eth2_network_config", "eth2_ssz", - "ethereum-types 0.12.1", + "ethereum-types", "hex", "serde", "serde_json", @@ -759,7 +719,7 @@ dependencies = [ "lighthouse_network", "monitoring_api", "network", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sensitive_url", "serde", "serde_derive", @@ -847,15 +807,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "cpufeatures" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef" -dependencies = [ - "libc", -] - [[package]] name = "cpufeatures" version = "0.2.2" @@ -1028,7 +979,7 @@ version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a19c6cedffdc8c03a3346d723eb20bd85a13362bb96dc2ac000842c6381ec7bf" dependencies = [ - "nix 0.23.1", + "nix", "winapi", ] @@ -1095,8 +1046,9 @@ dependencies = [ [[package]] name = "darwin-libproc" -version = "0.2.0" -source = "git+https://github.com/agemanning/darwin-libproc?rev=73d1587cb363c00737652fdc987f1bcbaf153ef7#73d1587cb363c00737652fdc987f1bcbaf153ef7" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb90051930c9a0f09e585762152048e23ac74d20c10590ef7cf01c0343c3046" dependencies = [ "darwin-libproc-sys", "libc", @@ -1105,8 +1057,12 @@ dependencies = [ [[package]] name = "darwin-libproc-sys" -version = "0.2.0" -source = "git+https://github.com/agemanning/darwin-libproc?rev=73d1587cb363c00737652fdc987f1bcbaf153ef7#73d1587cb363c00737652fdc987f1bcbaf153ef7" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57cebb5bde66eecdd30ddc4b9cd208238b15db4982ccc72db59d699ea10867c1" +dependencies = [ + "libc", +] [[package]] name = "data-encoding" @@ -1143,7 +1099,7 @@ name = "deposit_contract" version = "0.2.0" dependencies = [ "eth2_ssz", - "ethabi 12.0.0", + "ethabi", "hex", "reqwest", "serde_json", @@ -1275,7 +1231,7 @@ checksum = "ed8f54486179d5a7f11e1f5526f49d925a411a96c1141a707bd5f071be2ab630" dependencies = [ "aes", "aes-gcm", - "arrayvec 0.7.2", + "arrayvec", "digest 0.10.3", "enr", "fnv", @@ -1288,7 +1244,7 @@ dependencies = [ "lru", "parking_lot 0.11.2", "rand 0.8.5", - "rlp 0.5.1", + "rlp", "sha2 0.9.9", "smallvec", "tokio", @@ -1296,7 +1252,7 @@ dependencies = [ "tokio-util", "tracing", "tracing-subscriber", - "uint 0.9.3", + "uint", "zeroize", ] @@ -1353,7 +1309,7 @@ dependencies = [ "derivative", "eth2_ssz", "eth2_ssz_derive", - "ethereum-types 0.12.1", + "ethereum-types", "fork_choice", "fs2", "hex", @@ -1383,7 +1339,7 @@ version = "0.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c13e9b0c3c4170dcc2a12783746c4205d98e18957f57854251eea3f9750fe005" dependencies = [ - "bitvec 0.20.4", + "bitvec", "ff", "generic-array", "group", @@ -1408,7 +1364,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "809869a1328bfb586b48c9c0f87761c47c41793a85bcb06f66074a87cafc1bcd" dependencies = [ - "base64 0.13.0", + "base64", "bs58", "bytes", "ed25519-dalek", @@ -1416,7 +1372,7 @@ dependencies = [ "k256", "log", "rand 0.8.5", - "rlp 0.5.1", + "rlp", "serde", "sha3", "zeroize", @@ -1502,7 +1458,7 @@ dependencies = [ "lazy_static", "lighthouse_metrics", "merkle_proof", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "reqwest", "sensitive_url", "serde", @@ -1542,7 +1498,7 @@ dependencies = [ "eth2_ssz_derive", "futures", "futures-util", - "libsecp256k1 0.6.0", + "libsecp256k1", "lighthouse_network", "procinfo", "proto_array", @@ -1567,35 +1523,23 @@ dependencies = [ [[package]] name = "eth2_hashing" -version = "0.2.0" +version = "0.3.0" dependencies = [ - "cpufeatures 0.1.5", + "cpufeatures", "lazy_static", "ring", "rustc-hex", - "sha2 0.9.9", + "sha2 0.10.2", "wasm-bindgen-test", ] -[[package]] -name = "eth2_hashing" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b67737df7e3769e823d9d583eb5d60bcc4b2ef97ca674d1964ef287a02f8517" -dependencies = [ - "cpufeatures 0.1.5", - "lazy_static", - "ring", - "sha2 0.9.9", -] - [[package]] name = "eth2_interop_keypairs" version = "0.2.0" dependencies = [ - "base64 0.13.0", + "base64", "bls", - "eth2_hashing 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "eth2_hashing", "hex", "lazy_static", "num-bigint", @@ -1626,7 +1570,7 @@ dependencies = [ "hex", "hmac 0.11.0", "pbkdf2 0.8.0", - "rand 0.7.3", + "rand 0.8.5", "scrypt", "serde", "serde_json", @@ -1655,7 +1599,7 @@ dependencies = [ name = "eth2_serde_utils" version = "0.1.1" dependencies = [ - "ethereum-types 0.12.1", + "ethereum-types", "hex", "serde", "serde_derive", @@ -1667,7 +1611,7 @@ name = "eth2_ssz" version = "0.4.1" dependencies = [ "eth2_ssz_derive", - "ethereum-types 0.12.1", + "ethereum-types", "smallvec", ] @@ -1705,7 +1649,7 @@ dependencies = [ "eth2_key_derivation", "eth2_keystore", "hex", - "rand 0.7.3", + "rand 0.8.5", "serde", "serde_json", "serde_repr", @@ -1725,45 +1669,17 @@ dependencies = [ [[package]] name = "ethabi" -version = "12.0.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052a565e3de82944527d6d10a465697e6bb92476b772ca7141080c901f6a63c6" +checksum = "a4c98847055d934070b90e806e12d3936b787d0a115068981c1d8dfd5dfef5a5" dependencies = [ - "ethereum-types 0.9.2", - "rustc-hex", - "serde", - "serde_json", - "tiny-keccak 1.5.0", - "uint 0.8.5", -] - -[[package]] -name = "ethabi" -version = "14.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01317735d563b3bad2d5f90d2e1799f414165408251abb762510f40e790e69a" -dependencies = [ - "anyhow", - "ethereum-types 0.11.0", + "ethereum-types", "hex", "serde", "serde_json", "sha3", "thiserror", - "uint 0.9.3", -] - -[[package]] -name = "ethbloom" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71a6567e6fd35589fea0c63b94b4cf2e55573e413901bdbe60ab15cf0e25e5df" -dependencies = [ - "crunchy", - "fixed-hash 0.6.1", - "impl-rlp 0.2.1", - "impl-serde", - "tiny-keccak 2.0.2", + "uint", ] [[package]] @@ -1773,38 +1689,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfb684ac8fa8f6c5759f788862bb22ec6fe3cb392f6bfd08e3c64b603661e3f8" dependencies = [ "crunchy", - "fixed-hash 0.7.0", - "impl-rlp 0.3.0", + "fixed-hash", + "impl-rlp", "impl-serde", - "tiny-keccak 2.0.2", -] - -[[package]] -name = "ethereum-types" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "473aecff686bd8e7b9db0165cbbb53562376b39bf35b427f0c60446a9e1634b0" -dependencies = [ - "ethbloom 0.9.2", - "fixed-hash 0.6.1", - "impl-rlp 0.2.1", - "impl-serde", - "primitive-types 0.7.3", - "uint 0.8.5", -] - -[[package]] -name = "ethereum-types" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f64b5df66a228d85e4b17e5d6c6aa43b0310898ffe8a85988c4c032357aaabfd" -dependencies = [ - "ethbloom 0.11.1", - "fixed-hash 0.7.0", - "impl-rlp 0.3.0", - "impl-serde", - "primitive-types 0.9.1", - "uint 0.9.3", + "tiny-keccak", ] [[package]] @@ -1813,12 +1701,12 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05136f7057fe789f06e6d41d07b34e6f70d8c86e5693b60f97aaa6553553bdaf" dependencies = [ - "ethbloom 0.11.1", - "fixed-hash 0.7.0", - "impl-rlp 0.3.0", + "ethbloom", + "fixed-hash", + "impl-rlp", "impl-serde", - "primitive-types 0.10.1", - "uint 0.9.3", + "primitive-types", + "uint", ] [[package]] @@ -1855,8 +1743,8 @@ dependencies = [ "lazy_static", "lighthouse_metrics", "lru", - "parking_lot 0.11.2", - "rand 0.7.3", + "parking_lot 0.12.0", + "rand 0.8.5", "reqwest", "sensitive_url", "serde", @@ -1869,7 +1757,7 @@ dependencies = [ "tree_hash", "tree_hash_derive", "types", - "warp 0.3.0", + "warp", "zeroize", ] @@ -1916,7 +1804,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72a4d941a5b7c2a75222e2d44fcdf634a67133d9db31e177ae5ff6ecda852bfe" dependencies = [ - "bitvec 0.20.4", + "bitvec", "rand_core 0.6.3", "subtle", ] @@ -1945,18 +1833,6 @@ dependencies = [ "windows-acl", ] -[[package]] -name = "fixed-hash" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11498d382790b7a8f2fd211780bec78619bba81cdad3a283997c0c41f836759c" -dependencies = [ - "byteorder", - "rand 0.7.3", - "rustc-hex", - "static_assertions", -] - [[package]] name = "fixed-hash" version = "0.7.0" @@ -2171,7 +2047,7 @@ dependencies = [ "environment", "eth1", "eth1_test_rig", - "eth2_hashing 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "eth2_hashing", "eth2_ssz", "futures", "int_to_bytes", @@ -2200,9 +2076,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d39cd93900197114fa1fcb7ae84ca742095eed9442088988ae74fa744e930e77" +checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" dependencies = [ "cfg-if", "libc", @@ -2322,7 +2198,7 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cff78e5788be1e0ab65b04d306b2ed5092c815ec97ec70f4ebd5aee158aa55d" dependencies = [ - "base64 0.13.0", + "base64", "bitflags", "bytes", "headers-core", @@ -2469,7 +2345,7 @@ dependencies = [ "lighthouse_network", "lighthouse_version", "network", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "safe_arith", "sensitive_url", "serde", @@ -2481,7 +2357,7 @@ dependencies = [ "tokio-stream", "tree_hash", "types", - "warp 0.3.2", + "warp", "warp_utils", ] @@ -2502,7 +2378,7 @@ dependencies = [ "store", "tokio", "types", - "warp 0.3.2", + "warp", "warp_utils", ] @@ -2622,31 +2498,13 @@ dependencies = [ "xmltree", ] -[[package]] -name = "impl-codec" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1be51a921b067b0eaca2fad532d9400041561aa922221cc65f95a85641c6bf53" -dependencies = [ - "parity-scale-codec 1.3.7", -] - [[package]] name = "impl-codec" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443" dependencies = [ - "parity-scale-codec 2.3.1", -] - -[[package]] -name = "impl-rlp" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f7a72f11830b52333f36e3b09a288333888bf54380fd0ac0790a3c31ab0f3c5" -dependencies = [ - "rlp 0.4.6", + "parity-scale-codec", ] [[package]] @@ -2655,7 +2513,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808" dependencies = [ - "rlp 0.5.1", + "rlp", ] [[package]] @@ -2680,23 +2538,14 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" +checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee" dependencies = [ "autocfg 1.1.0", "hashbrown", ] -[[package]] -name = "input_buffer" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f97967975f448f1a7ddb12b0bc41069d09ed6a1c161a92687e057325db35d413" -dependencies = [ - "bytes", -] - [[package]] name = "instant" version = "0.1.12" @@ -2793,7 +2642,7 @@ version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "012bb02250fdd38faa5feee63235f7a459974440b9b57593822414c31f92839e" dependencies = [ - "base64 0.13.0", + "base64", "pem", "ring", "serde", @@ -2934,9 +2783,9 @@ checksum = "33a33a362ce288760ec6a508b94caaec573ae7d3bbbd91b87aa0bad4456839db" [[package]] name = "libmdbx" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3265f0f9e378bfbbd98596a3288b5909f26f3169e4f6d4a05fda8c734ce2cdd8" +checksum = "002d7890ec770d222903165b6ba279b0fa3dba8e82610820833184066b006ce0" dependencies = [ "bitflags", "byteorder", @@ -2958,7 +2807,7 @@ dependencies = [ "bytes", "futures", "futures-timer", - "getrandom 0.2.5", + "getrandom 0.2.6", "instant", "lazy_static", "libp2p-core 0.32.0", @@ -2996,7 +2845,7 @@ dependencies = [ "futures-timer", "instant", "lazy_static", - "libsecp256k1 0.7.0", + "libsecp256k1", "log", "multiaddr 0.13.0", "multihash 0.14.0", @@ -3031,10 +2880,10 @@ dependencies = [ "futures-timer", "instant", "lazy_static", - "libsecp256k1 0.7.0", + "libsecp256k1", "log", "multiaddr 0.14.0", - "multihash 0.16.1", + "multihash 0.16.2", "multistream-select 0.11.0", "parking_lot 0.12.0", "pin-project 1.0.10", @@ -3071,7 +2920,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f62943fba0b0dae02b87868620c52a581c54ec9fb04b5e195cf20313fc510c3" dependencies = [ "asynchronous-codec", - "base64 0.13.0", + "base64", "byteorder", "bytes", "fnv", @@ -3239,7 +3088,7 @@ dependencies = [ "log", "quicksink", "rw-stream-sink", - "soketto 0.7.1", + "soketto", "url", "webpki-roots", ] @@ -3257,25 +3106,6 @@ dependencies = [ "yamux", ] -[[package]] -name = "libsecp256k1" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9d220bc1feda2ac231cb78c3d26f27676b8cf82c96971f7aeef3d0cf2797c73" -dependencies = [ - "arrayref", - "base64 0.12.3", - "digest 0.9.0", - "hmac-drbg", - "libsecp256k1-core 0.2.2", - "libsecp256k1-gen-ecmult 0.2.1", - "libsecp256k1-gen-genmult 0.2.1", - "rand 0.7.3", - "serde", - "sha2 0.9.9", - "typenum", -] - [[package]] name = "libsecp256k1" version = "0.7.0" @@ -3283,29 +3113,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b0452aac8bab02242429380e9b2f94ea20cea2b37e2c1777a1358799bbe97f37" dependencies = [ "arrayref", - "base64 0.13.0", + "base64", "digest 0.9.0", "hmac-drbg", - "libsecp256k1-core 0.3.0", - "libsecp256k1-gen-ecmult 0.3.0", - "libsecp256k1-gen-genmult 0.3.0", + "libsecp256k1-core", + "libsecp256k1-gen-ecmult", + "libsecp256k1-gen-genmult", "rand 0.8.5", "serde", "sha2 0.9.9", "typenum", ] -[[package]] -name = "libsecp256k1-core" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f6ab710cec28cef759c5f18671a27dae2a5f952cdaaee1d8e2908cb2478a80" -dependencies = [ - "crunchy", - "digest 0.9.0", - "subtle", -] - [[package]] name = "libsecp256k1-core" version = "0.3.0" @@ -3317,31 +3136,13 @@ dependencies = [ "subtle", ] -[[package]] -name = "libsecp256k1-gen-ecmult" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccab96b584d38fac86a83f07e659f0deafd0253dc096dab5a36d53efe653c5c3" -dependencies = [ - "libsecp256k1-core 0.2.2", -] - [[package]] name = "libsecp256k1-gen-ecmult" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3038c808c55c87e8a172643a7d87187fc6c4174468159cb3090659d55bcb4809" dependencies = [ - "libsecp256k1-core 0.3.0", -] - -[[package]] -name = "libsecp256k1-gen-genmult" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67abfe149395e3aa1c48a2beb32b068e2334402df8181f818d3aee2b304c4f5d" -dependencies = [ - "libsecp256k1-core 0.2.2", + "libsecp256k1-core", ] [[package]] @@ -3350,7 +3151,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3db8d6ba2cec9eacc40e6e8ccc98931840301f1006e95647ceb2dd5c3aa06f7c" dependencies = [ - "libsecp256k1-core 0.3.0", + "libsecp256k1-core", ] [[package]] @@ -3390,7 +3191,7 @@ dependencies = [ "directory", "env_logger 0.9.0", "environment", - "eth2_hashing 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "eth2_hashing", "eth2_network_config", "futures", "lazy_static", @@ -3442,9 +3243,9 @@ dependencies = [ "lighthouse_metrics", "lighthouse_version", "lru", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "prometheus-client", - "rand 0.7.3", + "rand 0.8.5", "regex", "serde", "serde_derive", @@ -3458,7 +3259,7 @@ dependencies = [ "superstruct", "task_executor", "tempfile", - "tiny-keccak 2.0.2", + "tiny-keccak", "tokio", "tokio-io-timeout", "tokio-util", @@ -3485,10 +3286,11 @@ checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" [[package]] name = "lock_api" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" +checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" dependencies = [ + "autocfg 1.1.0", "scopeguard", ] @@ -3561,7 +3363,7 @@ dependencies = [ "lazy_static", "libc", "lighthouse_metrics", - "parking_lot 0.11.2", + "parking_lot 0.12.0", ] [[package]] @@ -3593,9 +3395,9 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" [[package]] name = "mdbx-sys" -version = "0.11.6" +version = "0.11.6-4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb471ee10f93c8c276083d59cae56365cca92d5bb2e27959da89ced5a8adf13e" +checksum = "9dde320ea35df4678486346065386943ed6c5920f2ab445dff8dd5d9c8cd04ad" dependencies = [ "bindgen", "cc", @@ -3622,8 +3424,8 @@ dependencies = [ name = "merkle_proof" version = "0.2.0" dependencies = [ - "eth2_hashing 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ethereum-types 0.12.1", + "eth2_hashing", + "ethereum-types", "lazy_static", "quickcheck 0.9.2", "quickcheck_macros", @@ -3745,7 +3547,7 @@ dependencies = [ "bs58", "byteorder", "data-encoding", - "multihash 0.16.1", + "multihash 0.16.2", "percent-encoding", "serde", "static_assertions", @@ -3768,9 +3570,9 @@ dependencies = [ [[package]] name = "multihash" -version = "0.16.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7392bffd88bc0c4f8297e36a777ab9f80b7127409c4a1acb8fee99c9f27addcd" +checksum = "e3db354f401db558759dfc1e568d010a5d4146f4d3f637be1275ec4a3cf09689" dependencies = [ "core2", "digest 0.10.3", @@ -3813,24 +3615,6 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" -[[package]] -name = "multipart" -version = "0.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050aeedc89243f5347c3e237e3e13dc76fbe4ae3742a57b94dc14f69acf76d4" -dependencies = [ - "buf_redux", - "httparse", - "log", - "mime", - "mime_guess", - "quick-error", - "rand 0.7.3", - "safemem", - "tempfile", - "twoway", -] - [[package]] name = "multipart" version = "0.18.0" @@ -3879,9 +3663,9 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d" +checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" dependencies = [ "lazy_static", "libc", @@ -3920,8 +3704,8 @@ dependencies = [ "lru_cache", "matches", "num_cpus", - "rand 0.7.3", - "rlp 0.5.1", + "rand 0.8.5", + "rlp", "slog", "slog-async", "slog-term", @@ -3937,19 +3721,6 @@ dependencies = [ "types", ] -[[package]] -name = "nix" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77d9f3521ea8e0641a153b3cddaf008dcbf26acd4ed739a2517295e0760d12c7" -dependencies = [ - "bitflags", - "cc", - "cfg-if", - "libc", - "memoffset", -] - [[package]] name = "nix" version = "0.23.1" @@ -4168,7 +3939,7 @@ dependencies = [ "itertools", "lazy_static", "lighthouse_metrics", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "rayon", "serde", "serde_derive", @@ -4186,27 +3957,15 @@ dependencies = [ "stable_deref_trait", ] -[[package]] -name = "parity-scale-codec" -version = "1.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b26b16c7687c3075982af47719e481815df30bc544f7a6690763a25ca16e9d" -dependencies = [ - "arrayvec 0.5.2", - "bitvec 0.17.4", - "byte-slice-cast 0.3.5", - "serde", -] - [[package]] name = "parity-scale-codec" version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909" dependencies = [ - "arrayvec 0.7.2", - "bitvec 0.20.4", - "byte-slice-cast 1.2.1", + "arrayvec", + "bitvec", + "byte-slice-cast", "impl-trait-for-tuples", "parity-scale-codec-derive", "serde", @@ -4242,7 +4001,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" dependencies = [ "lock_api", - "parking_lot_core 0.9.1", + "parking_lot_core 0.9.2", ] [[package]] @@ -4261,9 +4020,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954" +checksum = "995f667a6c822200b0433ac218e05582f0e2efa1b922a3fd2fbaadc5f87bab37" dependencies = [ "cfg-if", "libc", @@ -4274,9 +4033,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5" +checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" [[package]] name = "pbkdf2" @@ -4308,7 +4067,7 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9a3b09a20e374558580a4914d3b7d89bd61b954a5a5e1dcbea98753addb1947" dependencies = [ - "base64 0.13.0", + "base64", ] [[package]] @@ -4406,15 +4165,15 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe" +checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" [[package]] name = "platforms" -version = "1.1.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "989d43012e2ca1c4a02507c67282691a0a3207f9dc67cec596b43fe925b3d325" +checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94" [[package]] name = "plotters" @@ -4450,7 +4209,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" dependencies = [ - "cpufeatures 0.2.2", + "cpufeatures", "opaque-debug", "universal-hash", ] @@ -4462,7 +4221,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" dependencies = [ "cfg-if", - "cpufeatures 0.2.2", + "cpufeatures", "opaque-debug", "universal-hash", ] @@ -4473,43 +4232,17 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" -[[package]] -name = "primitive-types" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd39dcacf71411ba488570da7bbc89b717225e46478b30ba99b92db6b149809" -dependencies = [ - "fixed-hash 0.6.1", - "impl-codec 0.4.2", - "impl-rlp 0.2.1", - "impl-serde", - "uint 0.8.5", -] - -[[package]] -name = "primitive-types" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06345ee39fbccfb06ab45f3a1a5798d9dafa04cb8921a76d227040003a234b0e" -dependencies = [ - "fixed-hash 0.7.0", - "impl-codec 0.5.1", - "impl-rlp 0.3.0", - "impl-serde", - "uint 0.9.3", -] - [[package]] name = "primitive-types" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373" dependencies = [ - "fixed-hash 0.7.0", - "impl-codec 0.5.1", - "impl-rlp 0.3.0", + "fixed-hash", + "impl-codec", + "impl-rlp", "impl-serde", - "uint 0.9.3", + "uint", ] [[package]] @@ -4684,15 +4417,16 @@ checksum = "cf7e6d18738ecd0902d30d1ad232c9125985a3422929b16c65517b38adc14f96" [[package]] name = "psutil" -version = "3.2.1" -source = "git+https://github.com/sigp/rust-psutil?rev=b3e44bc7ec5d545b8cb8ad4e3dffe074b6e6336b#b3e44bc7ec5d545b8cb8ad4e3dffe074b6e6336b" +version = "3.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f866af2b0f8e4b0d2d00aad8a9c5fc48fad33466cd99a64cbb3a4c1505f1a62d" dependencies = [ "cfg-if", "darwin-libproc", "derive_more", "glob", "mach", - "nix 0.21.2", + "nix", "num_cpus", "once_cell", "platforms", @@ -4751,9 +4485,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4af2ec4714533fcdf07e886f17025ace8b997b9ce51204ee69b6da831c3da57" +checksum = "632d02bff7f874a36f33ea8bb416cd484b90cc66c1194b1a1110d067a7013f58" dependencies = [ "proc-macro2", ] @@ -4779,18 +4513,6 @@ dependencies = [ "rusqlite", ] -[[package]] -name = "radium" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac" - -[[package]] -name = "radium" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" - [[package]] name = "radium" version = "0.6.2" @@ -4808,7 +4530,6 @@ dependencies = [ "rand_chacha 0.2.2", "rand_core 0.5.1", "rand_hc", - "rand_pcg", ] [[package]] @@ -4857,7 +4578,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ - "getrandom 0.2.5", + "getrandom 0.2.6", ] [[package]] @@ -4869,22 +4590,13 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", -] - [[package]] name = "rand_xorshift" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8" +checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" dependencies = [ - "rand_core 0.5.1", + "rand_core 0.6.3", ] [[package]] @@ -4914,20 +4626,20 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae183fc1b06c149f0c1793e1eb447c8b04bfe46d48e9e48bfb8d2d7ed64ecf0" +checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" dependencies = [ "bitflags", ] [[package]] name = "redox_users" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7776223e2696f1aa4c6b0170e83212f47296a00424305117d013dfe86fb0fe55" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.5", + "getrandom 0.2.6", "redox_syscall", "thiserror", ] @@ -4973,7 +4685,7 @@ version = "0.11.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46a1f7aa4f35e5e8b4160449f51afc758f0ce6454315a9fa7d0d113e958c41eb" dependencies = [ - "base64 0.13.0", + "base64", "bytes", "encoding_rs", "futures-core", @@ -5035,15 +4747,6 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" -[[package]] -name = "rlp" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1190dcc8c3a512f1eef5d09bb8c84c7f39e1054e174d1795482e18f5272f2e73" -dependencies = [ - "rustc-hex", -] - [[package]] name = "rlp" version = "0.5.1" @@ -5121,7 +4824,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.6", + "semver 1.0.7", ] [[package]] @@ -5130,7 +4833,7 @@ version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" dependencies = [ - "base64 0.13.0", + "base64", "log", "ring", "sct 0.6.1", @@ -5265,9 +4968,9 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.20.3" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d03ceae636d0fed5bae6a7f4f664354c5f4fcedf6eef053fef17e49f837d0a" +checksum = "9c42e6f1735c5f00f51e43e28d6634141f2bcad10931b2609ddd74a86d751260" dependencies = [ "secp256k1-sys", ] @@ -5283,9 +4986,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.3.1" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23a2ac85147a3a11d77ecf1bc7166ec0b92febfa4461c37944e180f319ece467" +checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc" dependencies = [ "bitflags", "core-foundation", @@ -5324,9 +5027,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a3381e03edd24287172047536f20cabde766e2cd3e65e6b00fb3af51c4f38d" +checksum = "d65bd28f48be7196d222d95b9243287f48d27aca604e08497513019ff0502cc4" [[package]] name = "semver-parser" @@ -5445,7 +5148,7 @@ checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" dependencies = [ "block-buffer 0.9.0", "cfg-if", - "cpufeatures 0.2.2", + "cpufeatures", "digest 0.9.0", "opaque-debug", ] @@ -5457,7 +5160,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" dependencies = [ "cfg-if", - "cpufeatures 0.2.2", + "cpufeatures", "digest 0.10.3", ] @@ -5469,7 +5172,7 @@ checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", "cfg-if", - "cpufeatures 0.2.2", + "cpufeatures", "digest 0.9.0", "opaque-debug", ] @@ -5481,7 +5184,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" dependencies = [ "cfg-if", - "cpufeatures 0.2.2", + "cpufeatures", "digest 0.10.3", ] @@ -5553,7 +5256,7 @@ dependencies = [ "eth1_test_rig", "futures", "node_test_rig", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "rayon", "sensitive_url", "tokio", @@ -5582,8 +5285,8 @@ dependencies = [ "logging", "lru", "maplit", - "parking_lot 0.11.2", - "rand 0.7.3", + "parking_lot 0.12.0", + "rand 0.8.5", "rayon", "safe_arith", "serde", @@ -5737,7 +5440,7 @@ version = "0.2.0" dependencies = [ "lazy_static", "lighthouse_metrics", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "types", ] @@ -5791,28 +5494,13 @@ dependencies = [ "winapi", ] -[[package]] -name = "soketto" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4919971d141dbadaa0e82b5d369e2d7666c98e4625046140615ca363e50d4daa" -dependencies = [ - "base64 0.13.0", - "bytes", - "futures", - "httparse", - "log", - "rand 0.8.5", - "sha-1 0.9.8", -] - [[package]] name = "soketto" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2" dependencies = [ - "base64 0.13.0", + "base64", "bytes", "flate2", "futures", @@ -5851,7 +5539,7 @@ dependencies = [ "beacon_chain", "bls", "env_logger 0.9.0", - "eth2_hashing 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "eth2_hashing", "eth2_ssz", "eth2_ssz_types", "int_to_bytes", @@ -5898,7 +5586,7 @@ dependencies = [ "leveldb", "lighthouse_metrics", "lru", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "serde", "serde_derive", "slog", @@ -5967,15 +5655,15 @@ name = "swap_or_not_shuffle" version = "0.2.0" dependencies = [ "criterion", - "eth2_hashing 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ethereum-types 0.12.1", + "eth2_hashing", + "ethereum-types", ] [[package]] name = "syn" -version = "1.0.89" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea297be220d52398dcc07ce15a209fce436d361735ac1db700cab3b6cdfb9f54" +checksum = "704df27628939572cd88d33f171cd6f896f4eaca85252c6e0a72d8d8287ee86f" dependencies = [ "proc-macro2", "quote", @@ -6187,15 +5875,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "tiny-keccak" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d8a021c69bb74a44ccedb824a046447e2c84a01df9e5c20779750acb38e11b2" -dependencies = [ - "crunchy", -] - [[package]] name = "tiny-keccak" version = "2.0.2" @@ -6304,19 +5983,6 @@ dependencies = [ "tokio-util", ] -[[package]] -name = "tokio-tungstenite" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1a5f475f1b9d077ea1017ecbc60890fda8e54942d680ca0b1d2b47cfa2d861b" -dependencies = [ - "futures-util", - "log", - "pin-project 1.0.10", - "tokio", - "tungstenite 0.12.0", -] - [[package]] name = "tokio-tungstenite" version = "0.15.0" @@ -6327,7 +5993,7 @@ dependencies = [ "log", "pin-project 1.0.10", "tokio", - "tungstenite 0.14.0", + "tungstenite", ] [[package]] @@ -6395,16 +6061,6 @@ dependencies = [ "valuable", ] -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project 1.0.10", - "tracing", -] - [[package]] name = "tracing-log" version = "0.1.2" @@ -6458,11 +6114,11 @@ name = "tree_hash" version = "0.4.1" dependencies = [ "beacon_chain", - "eth2_hashing 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "eth2_hashing", "eth2_ssz", "eth2_ssz_derive", - "ethereum-types 0.12.1", - "rand 0.7.3", + "ethereum-types", + "rand 0.8.5", "smallvec", "tree_hash_derive", "types", @@ -6528,32 +6184,13 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" -[[package]] -name = "tungstenite" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ada8297e8d70872fa9a551d93250a9f407beb9f37ef86494eb20012a2ff7c24" -dependencies = [ - "base64 0.13.0", - "byteorder", - "bytes", - "http", - "httparse", - "input_buffer", - "log", - "rand 0.8.5", - "sha-1 0.9.8", - "url", - "utf-8", -] - [[package]] name = "tungstenite" version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0b2d8558abd2e276b0a8df5c05a2ec762609344191e5fd23e292c910e9165b5" dependencies = [ - "base64 0.13.0", + "base64", "byteorder", "bytes", "http", @@ -6593,20 +6230,20 @@ dependencies = [ "compare_fields_derive", "criterion", "derivative", - "eth2_hashing 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "eth2_hashing", "eth2_interop_keypairs", "eth2_serde_utils", "eth2_ssz", "eth2_ssz_derive", "eth2_ssz_types", - "ethereum-types 0.12.1", + "ethereum-types", "hex", "int_to_bytes", "itertools", "lazy_static", "log", - "parking_lot 0.11.2", - "rand 0.7.3", + "parking_lot 0.12.0", + "rand 0.8.5", "rand_xorshift", "rayon", "regex", @@ -6633,18 +6270,6 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" -[[package]] -name = "uint" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9db035e67dfaf7edd9aebfe8676afcd63eed53c8a4044fed514c8cccf1835177" -dependencies = [ - "byteorder", - "crunchy", - "rustc-hex", - "static_assertions", -] - [[package]] name = "uint" version = "0.9.3" @@ -6770,7 +6395,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.5", + "getrandom 0.2.6", "serde", ] @@ -6797,14 +6422,14 @@ dependencies = [ "hyper", "itertools", "lazy_static", - "libsecp256k1 0.6.0", + "libsecp256k1", "lighthouse_metrics", "lighthouse_version", "lockfile", "logging", "monitoring_api", - "parking_lot 0.11.2", - "rand 0.7.3", + "parking_lot 0.12.0", + "rand 0.8.5", "reqwest", "ring", "safe_arith", @@ -6822,7 +6447,7 @@ dependencies = [ "types", "url", "validator_dir", - "warp 0.3.2", + "warp", "warp_utils", ] @@ -6837,7 +6462,7 @@ dependencies = [ "filesystem", "hex", "lockfile", - "rand 0.7.3", + "rand 0.8.5", "tempfile", "tree_hash", "types", @@ -6894,40 +6519,10 @@ dependencies = [ "try-lock", ] -[[package]] -name = "warp" -version = "0.3.0" -source = "git+https://github.com/macladson/warp?rev=dfa259e#dfa259e19b7490e6bc4bf247e8b76f671d29a0eb" -dependencies = [ - "bytes", - "futures", - "headers", - "http", - "hyper", - "log", - "mime", - "mime_guess", - "multipart 0.17.1", - "percent-encoding", - "pin-project 1.0.10", - "scoped-tls", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", - "tokio-rustls", - "tokio-stream", - "tokio-tungstenite 0.13.0", - "tokio-util", - "tower-service", - "tracing", - "tracing-futures", -] - [[package]] name = "warp" version = "0.3.2" -source = "git+https://github.com/macladson/warp?rev=7e75acc#7e75acc368229a46a236a8c991bf251fe7fe50ef" +source = "git+https://github.com/macladson/warp?rev=7e75acc368229a46a236a8c991bf251fe7fe50ef#7e75acc368229a46a236a8c991bf251fe7fe50ef" dependencies = [ "bytes", "futures-channel", @@ -6938,7 +6533,7 @@ dependencies = [ "log", "mime", "mime_guess", - "multipart 0.18.0", + "multipart", "percent-encoding", "pin-project 1.0.10", "scoped-tls", @@ -6948,7 +6543,7 @@ dependencies = [ "tokio", "tokio-rustls", "tokio-stream", - "tokio-tungstenite 0.15.0", + "tokio-tungstenite", "tokio-util", "tower-service", "tracing", @@ -6969,7 +6564,7 @@ dependencies = [ "state_processing", "tokio", "types", - "warp 0.3.2", + "warp", ] [[package]] @@ -7107,31 +6702,33 @@ dependencies = [ [[package]] name = "web3" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd24abe6f2b68e0677f843059faea87bcbd4892e39f02886f366d8222c3c540d" +checksum = "44f258e254752d210b84fe117b31f1e3cc9cbf04c0d747eb7f8cf7cf5e370f6d" dependencies = [ - "arrayvec 0.5.2", - "base64 0.13.0", + "arrayvec", + "base64", "bytes", "derive_more", - "ethabi 14.1.0", - "ethereum-types 0.11.0", + "ethabi", + "ethereum-types", "futures", "futures-timer", "headers", "hex", + "idna", "jsonrpc-core", "log", - "parking_lot 0.11.2", + "once_cell", + "parking_lot 0.12.0", "pin-project 1.0.10", "reqwest", - "rlp 0.5.1", + "rlp", "secp256k1", "serde", "serde_json", - "soketto 0.5.0", - "tiny-keccak 2.0.2", + "soketto", + "tiny-keccak", "tokio", "tokio-util", "url", @@ -7266,9 +6863,9 @@ dependencies = [ [[package]] name = "windows-sys" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6" +checksum = "5acdd78cb4ba54c0045ac14f62d8f94a03d10047904ae2a40afa1e99d8f70825" dependencies = [ "windows_aarch64_msvc", "windows_i686_gnu", @@ -7279,33 +6876,33 @@ dependencies = [ [[package]] name = "windows_aarch64_msvc" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" +checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" [[package]] name = "windows_i686_gnu" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" +checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" [[package]] name = "windows_i686_msvc" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" +checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" [[package]] name = "windows_x86_64_gnu" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" +checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" [[package]] name = "windows_x86_64_msvc" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" +checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" [[package]] name = "winreg" diff --git a/Cargo.toml b/Cargo.toml index dc07a7cfe..c79859d0a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -91,10 +91,11 @@ members = [ [patch] [patch.crates-io] fixed-hash = { git = "https://github.com/paritytech/parity-common", rev="df638ab0885293d21d656dc300d39236b69ce57d" } -warp = { git = "https://github.com/macladson/warp", rev ="7e75acc" } +warp = { git = "https://github.com/macladson/warp", rev="7e75acc368229a46a236a8c991bf251fe7fe50ef" } eth2_ssz = { path = "consensus/ssz" } eth2_ssz_derive = { path = "consensus/ssz_derive" } eth2_ssz_types = { path = "consensus/ssz_types" } +eth2_hashing = { path = "crypto/eth2_hashing" } tree_hash = { path = "consensus/tree_hash" } tree_hash_derive = { path = "consensus/tree_hash_derive" } eth2_serde_utils = { path = "consensus/serde_utils" } diff --git a/beacon_node/beacon_chain/Cargo.toml b/beacon_node/beacon_chain/Cargo.toml index 552adffac..0f632c4de 100644 --- a/beacon_node/beacon_chain/Cargo.toml +++ b/beacon_node/beacon_chain/Cargo.toml @@ -19,7 +19,7 @@ serde_json = "1.0.58" [dependencies] merkle_proof = { path = "../../consensus/merkle_proof" } store = { path = "../store" } -parking_lot = "0.11.0" +parking_lot = "0.12.0" lazy_static = "1.4.0" smallvec = "1.6.1" lighthouse_metrics = { path = "../../common/lighthouse_metrics" } @@ -30,7 +30,7 @@ serde_derive = "1.0.116" slog = { version = "2.5.2", features = ["max_level_trace"] } sloggers = { version = "2.1.1", features = ["json"] } slot_clock = { path = "../../common/slot_clock" } -eth2_hashing = "0.2.0" +eth2_hashing = "0.3.0" eth2_ssz = "0.4.1" eth2_ssz_types = "0.2.2" eth2_ssz_derive = "0.3.0" @@ -42,11 +42,11 @@ eth1 = { path = "../eth1" } futures = "0.3.7" genesis = { path = "../genesis" } int_to_bytes = { path = "../../consensus/int_to_bytes" } -rand = "0.7.3" +rand = "0.8.5" proto_array = { path = "../../consensus/proto_array" } lru = "0.7.1" tempfile = "3.1.0" -bitvec = "0.19.3" +bitvec = "0.20.4" bls = { path = "../../crypto/bls" } safe_arith = { path = "../../consensus/safe_arith" } fork_choice = { path = "../../consensus/fork_choice" } diff --git a/beacon_node/client/Cargo.toml b/beacon_node/client/Cargo.toml index a34d02ae1..3079d7744 100644 --- a/beacon_node/client/Cargo.toml +++ b/beacon_node/client/Cargo.toml @@ -13,7 +13,7 @@ store = { path = "../store" } network = { path = "../network" } timer = { path = "../timer" } lighthouse_network = { path = "../lighthouse_network" } -parking_lot = "0.11.0" +parking_lot = "0.12.0" types = { path = "../../consensus/types" } eth2_config = { path = "../../common/eth2_config" } slot_clock = { path = "../../common/slot_clock" } diff --git a/beacon_node/eth1/Cargo.toml b/beacon_node/eth1/Cargo.toml index 9600ef489..ecf3c19e3 100644 --- a/beacon_node/eth1/Cargo.toml +++ b/beacon_node/eth1/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dev-dependencies] eth1_test_rig = { path = "../../testing/eth1_test_rig" } toml = "0.5.6" -web3 = { version = "0.17.0", default-features = false, features = ["http-tls", "signing", "ws-tls-tokio"] } +web3 = { version = "0.18.0", default-features = false, features = ["http-tls", "signing", "ws-tls-tokio"] } sloggers = { version = "2.1.1", features = ["json"] } environment = { path = "../../lighthouse/environment" } @@ -22,7 +22,7 @@ merkle_proof = { path = "../../consensus/merkle_proof"} eth2_ssz = "0.4.1" eth2_ssz_derive = "0.3.0" tree_hash = "0.4.1" -parking_lot = "0.11.0" +parking_lot = "0.12.0" slog = "2.5.2" tokio = { version = "1.14.0", features = ["full"] } state_processing = { path = "../../consensus/state_processing" } diff --git a/beacon_node/execution_layer/Cargo.toml b/beacon_node/execution_layer/Cargo.toml index d81f83d69..6cd49e9f6 100644 --- a/beacon_node/execution_layer/Cargo.toml +++ b/beacon_node/execution_layer/Cargo.toml @@ -17,7 +17,7 @@ eth2_serde_utils = "0.1.1" serde_json = "1.0.58" serde = { version = "1.0.116", features = ["derive"] } eth1 = { path = "../eth1" } -warp = { git = "https://github.com/macladson/warp", rev ="dfa259e", features = ["tls"] } +warp = { version = "0.3.2", features = ["tls"] } jsonwebtoken = "8" environment = { path = "../../lighthouse/environment" } bytes = "1.1.0" @@ -28,10 +28,10 @@ lru = "0.7.1" exit-future = "0.2.0" tree_hash = "0.4.1" tree_hash_derive = { path = "../../consensus/tree_hash_derive"} -parking_lot = "0.11.0" +parking_lot = "0.12.0" slot_clock = { path = "../../common/slot_clock" } tempfile = "3.1.0" -rand = "0.7.3" +rand = "0.8.5" zeroize = { version = "1.4.2", features = ["zeroize_derive"] } lighthouse_metrics = { path = "../../common/lighthouse_metrics" } lazy_static = "1.4.0" diff --git a/beacon_node/genesis/Cargo.toml b/beacon_node/genesis/Cargo.toml index 3a19fe0f2..87c56d360 100644 --- a/beacon_node/genesis/Cargo.toml +++ b/beacon_node/genesis/Cargo.toml @@ -17,7 +17,7 @@ rayon = "1.4.1" state_processing = { path = "../../consensus/state_processing" } merkle_proof = { path = "../../consensus/merkle_proof" } eth2_ssz = "0.4.1" -eth2_hashing = "0.2.0" +eth2_hashing = "0.3.0" tree_hash = "0.4.1" tokio = { version = "1.14.0", features = ["full"] } slog = "2.5.2" diff --git a/beacon_node/http_api/Cargo.toml b/beacon_node/http_api/Cargo.toml index 4ed9bdd7d..0e20f5c8b 100644 --- a/beacon_node/http_api/Cargo.toml +++ b/beacon_node/http_api/Cargo.toml @@ -28,7 +28,7 @@ eth2_ssz = "0.4.1" bs58 = "0.4.0" futures = "0.3.8" execution_layer = {path = "../execution_layer"} -parking_lot = "0.11.0" +parking_lot = "0.12.0" safe_arith = {path = "../../consensus/safe_arith"} diff --git a/beacon_node/lighthouse_network/Cargo.toml b/beacon_node/lighthouse_network/Cargo.toml index c2d5d859d..95ca7dc27 100644 --- a/beacon_node/lighthouse_network/Cargo.toml +++ b/beacon_node/lighthouse_network/Cargo.toml @@ -26,14 +26,14 @@ lighthouse_metrics = { path = "../../common/lighthouse_metrics" } smallvec = "1.6.1" tokio-io-timeout = "1.1.1" lru = "0.7.1" -parking_lot = "0.11.0" +parking_lot = "0.12.0" sha2 = "0.9.1" snap = "1.0.1" hex = "0.4.2" tokio-util = { version = "0.6.2", features = ["codec", "compat", "time"] } tiny-keccak = "2.0.2" task_executor = { path = "../../common/task_executor" } -rand = "0.7.3" +rand = "0.8.5" directory = { path = "../../common/directory" } regex = "1.5.5" strum = { version = "0.24.0", features = ["derive"] } diff --git a/beacon_node/network/Cargo.toml b/beacon_node/network/Cargo.toml index 66f70eb55..3688baf34 100644 --- a/beacon_node/network/Cargo.toml +++ b/beacon_node/network/Cargo.toml @@ -29,7 +29,7 @@ error-chain = "0.12.4" tokio = { version = "1.14.0", features = ["full"] } tokio-stream = "0.1.3" smallvec = "1.6.1" -rand = "0.7.3" +rand = "0.8.5" fnv = "1.0.7" rlp = "0.5.0" lazy_static = "1.4.0" diff --git a/beacon_node/operation_pool/Cargo.toml b/beacon_node/operation_pool/Cargo.toml index 361c0a07f..84d23a456 100644 --- a/beacon_node/operation_pool/Cargo.toml +++ b/beacon_node/operation_pool/Cargo.toml @@ -9,7 +9,7 @@ derivative = "2.1.1" itertools = "0.10.0" lazy_static = "1.4.0" lighthouse_metrics = { path = "../../common/lighthouse_metrics" } -parking_lot = "0.11.0" +parking_lot = "0.12.0" types = { path = "../../consensus/types" } state_processing = { path = "../../consensus/state_processing" } eth2_ssz = "0.4.1" diff --git a/beacon_node/store/Cargo.toml b/beacon_node/store/Cargo.toml index 679a2f95b..20ae37b3b 100644 --- a/beacon_node/store/Cargo.toml +++ b/beacon_node/store/Cargo.toml @@ -11,7 +11,7 @@ beacon_chain = {path = "../beacon_chain"} [dependencies] db-key = "0.0.5" leveldb = { version = "0.8.6", default-features = false } -parking_lot = "0.11.0" +parking_lot = "0.12.0" itertools = "0.10.0" eth2_ssz = "0.4.1" eth2_ssz_derive = "0.3.0" diff --git a/common/account_utils/Cargo.toml b/common/account_utils/Cargo.toml index 02333ff59..ccff88cee 100644 --- a/common/account_utils/Cargo.toml +++ b/common/account_utils/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -rand = "0.7.3" +rand = "0.8.5" eth2_wallet = { path = "../../crypto/eth2_wallet" } eth2_keystore = { path = "../../crypto/eth2_keystore" } filesystem = { path = "../filesystem" } diff --git a/common/deposit_contract/Cargo.toml b/common/deposit_contract/Cargo.toml index d1eae97ce..7c3d18394 100644 --- a/common/deposit_contract/Cargo.toml +++ b/common/deposit_contract/Cargo.toml @@ -16,4 +16,4 @@ hex = "0.4.2" types = { path = "../../consensus/types"} eth2_ssz = "0.4.1" tree_hash = "0.4.1" -ethabi = "12.0.0" +ethabi = "16.0.0" diff --git a/common/deposit_contract/src/lib.rs b/common/deposit_contract/src/lib.rs index 92ccee3be..2a9f985d5 100644 --- a/common/deposit_contract/src/lib.rs +++ b/common/deposit_contract/src/lib.rs @@ -70,13 +70,13 @@ pub fn decode_eth1_tx_data( }; } - let root = decode_token!(Hash256, to_fixed_bytes); + let root = decode_token!(Hash256, into_fixed_bytes); let deposit_data = DepositData { amount, - signature: decode_token!(SignatureBytes, to_bytes), - withdrawal_credentials: decode_token!(Hash256, to_bytes), - pubkey: decode_token!(PublicKeyBytes, to_bytes), + signature: decode_token!(SignatureBytes, into_bytes), + withdrawal_credentials: decode_token!(Hash256, into_bytes), + pubkey: decode_token!(PublicKeyBytes, into_bytes), }; Ok((deposit_data, root)) diff --git a/common/eth2/Cargo.toml b/common/eth2/Cargo.toml index fecebe8ca..674672326 100644 --- a/common/eth2/Cargo.toml +++ b/common/eth2/Cargo.toml @@ -15,7 +15,7 @@ lighthouse_network = { path = "../../beacon_node/lighthouse_network" } proto_array = { path = "../../consensus/proto_array", optional = true } eth2_serde_utils = "0.1.1" eth2_keystore = { path = "../../crypto/eth2_keystore" } -libsecp256k1 = "0.6.0" +libsecp256k1 = "0.7.0" ring = "0.16.19" bytes = "1.0.1" account_utils = { path = "../../common/account_utils" } @@ -28,10 +28,7 @@ store = { path = "../../beacon_node/store", optional = true } slashing_protection = { path = "../../validator_client/slashing_protection", optional = true } [target.'cfg(target_os = "linux")'.dependencies] -# TODO: update psutil once fix is merged: https://github.com/rust-psutil/rust-psutil/pull/93 -# TODO: Even once the above PR is corrected, there are sub-dependencies that need to be updated. -# psutil = { version = "3.2.0", optional = true } -psutil = { git = "https://github.com/sigp/rust-psutil", rev = "b3e44bc7ec5d545b8cb8ad4e3dffe074b6e6336b", optional = true } +psutil = { version = "3.2.2", optional = true } procinfo = { version = "0.4.2", optional = true } [features] diff --git a/common/eth2_interop_keypairs/Cargo.toml b/common/eth2_interop_keypairs/Cargo.toml index 2e2d78128..5f577bedc 100644 --- a/common/eth2_interop_keypairs/Cargo.toml +++ b/common/eth2_interop_keypairs/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" [dependencies] lazy_static = "1.4.0" num-bigint = "0.4.2" -eth2_hashing = "0.2.0" +eth2_hashing = "0.3.0" hex = "0.4.2" serde_yaml = "0.8.13" serde = "1.0.116" diff --git a/common/malloc_utils/Cargo.toml b/common/malloc_utils/Cargo.toml index 881b9e346..569eed608 100644 --- a/common/malloc_utils/Cargo.toml +++ b/common/malloc_utils/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" lighthouse_metrics = { path = "../lighthouse_metrics" } lazy_static = "1.4.0" libc = "0.2.79" -parking_lot = "0.11.0" +parking_lot = "0.12.0" [features] mallinfo2 = [] diff --git a/common/slot_clock/Cargo.toml b/common/slot_clock/Cargo.toml index eaf280398..d9fdd7312 100644 --- a/common/slot_clock/Cargo.toml +++ b/common/slot_clock/Cargo.toml @@ -8,4 +8,4 @@ edition = "2021" types = { path = "../../consensus/types" } lazy_static = "1.4.0" lighthouse_metrics = { path = "../lighthouse_metrics" } -parking_lot = "0.11.0" +parking_lot = "0.12.0" diff --git a/common/validator_dir/Cargo.toml b/common/validator_dir/Cargo.toml index 6fd4730f4..0eba4cf23 100644 --- a/common/validator_dir/Cargo.toml +++ b/common/validator_dir/Cargo.toml @@ -14,7 +14,7 @@ bls = { path = "../../crypto/bls" } eth2_keystore = { path = "../../crypto/eth2_keystore" } filesystem = { path = "../filesystem" } types = { path = "../../consensus/types" } -rand = "0.7.3" +rand = "0.8.5" deposit_contract = { path = "../deposit_contract" } tree_hash = "0.4.1" hex = "0.4.2" diff --git a/consensus/cached_tree_hash/Cargo.toml b/consensus/cached_tree_hash/Cargo.toml index 95762bbc7..f9433e4a4 100644 --- a/consensus/cached_tree_hash/Cargo.toml +++ b/consensus/cached_tree_hash/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] ethereum-types = "0.12.1" eth2_ssz_types = "0.2.2" -eth2_hashing = "0.2.0" +eth2_hashing = "0.3.0" eth2_ssz_derive = "0.3.0" eth2_ssz = "0.4.1" tree_hash = "0.4.1" diff --git a/consensus/merkle_proof/Cargo.toml b/consensus/merkle_proof/Cargo.toml index 89cd502cf..7400d4f54 100644 --- a/consensus/merkle_proof/Cargo.toml +++ b/consensus/merkle_proof/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] ethereum-types = "0.12.1" -eth2_hashing = "0.2.0" +eth2_hashing = "0.3.0" lazy_static = "1.4.0" safe_arith = { path = "../safe_arith" } diff --git a/consensus/state_processing/Cargo.toml b/consensus/state_processing/Cargo.toml index d5599782a..a0ce23748 100644 --- a/consensus/state_processing/Cargo.toml +++ b/consensus/state_processing/Cargo.toml @@ -19,7 +19,7 @@ safe_arith = { path = "../safe_arith" } tree_hash = "0.4.1" types = { path = "../types", default-features = false } rayon = "1.4.1" -eth2_hashing = "0.2.0" +eth2_hashing = "0.3.0" int_to_bytes = { path = "../int_to_bytes" } smallvec = "1.6.1" arbitrary = { version = "1.0", features = ["derive"], optional = true } diff --git a/consensus/swap_or_not_shuffle/Cargo.toml b/consensus/swap_or_not_shuffle/Cargo.toml index ada4fba40..1c7ad5f02 100644 --- a/consensus/swap_or_not_shuffle/Cargo.toml +++ b/consensus/swap_or_not_shuffle/Cargo.toml @@ -12,7 +12,7 @@ harness = false criterion = "0.3.3" [dependencies] -eth2_hashing = "0.2.0" +eth2_hashing = "0.3.0" ethereum-types = "0.12.1" [features] diff --git a/consensus/tree_hash/Cargo.toml b/consensus/tree_hash/Cargo.toml index bdc724403..ab080eac0 100644 --- a/consensus/tree_hash/Cargo.toml +++ b/consensus/tree_hash/Cargo.toml @@ -7,7 +7,7 @@ license = "Apache-2.0" description = "Efficient Merkle-hashing as used in Ethereum 2.0" [dev-dependencies] -rand = "0.7.3" +rand = "0.8.5" tree_hash_derive = "0.4.0" types = { path = "../types" } beacon_chain = { path = "../../beacon_node/beacon_chain" } @@ -16,7 +16,7 @@ eth2_ssz_derive = "0.3.0" [dependencies] ethereum-types = "0.12.1" -eth2_hashing = "0.2.0" +eth2_hashing = "0.3.0" smallvec = "1.6.1" [features] diff --git a/consensus/types/Cargo.toml b/consensus/types/Cargo.toml index c23f0700b..6350d0775 100644 --- a/consensus/types/Cargo.toml +++ b/consensus/types/Cargo.toml @@ -14,12 +14,12 @@ compare_fields = { path = "../../common/compare_fields" } compare_fields_derive = { path = "../../common/compare_fields_derive" } eth2_interop_keypairs = { path = "../../common/eth2_interop_keypairs" } ethereum-types = "0.12.1" -eth2_hashing = "0.2.0" +eth2_hashing = "0.3.0" hex = "0.4.2" int_to_bytes = { path = "../int_to_bytes" } log = "0.4.11" rayon = "1.4.1" -rand = "0.7.3" +rand = "0.8.5" safe_arith = { path = "../safe_arith" } serde = {version = "1.0.116" , features = ["rc"] } serde_derive = "1.0.116" @@ -31,7 +31,7 @@ swap_or_not_shuffle = { path = "../swap_or_not_shuffle" } test_random_derive = { path = "../../common/test_random_derive" } tree_hash = "0.4.1" tree_hash_derive = "0.4.0" -rand_xorshift = "0.2.0" +rand_xorshift = "0.3.0" cached_tree_hash = { path = "../cached_tree_hash" } serde_yaml = "0.8.13" tempfile = "3.1.0" @@ -41,7 +41,7 @@ arbitrary = { version = "1.0", features = ["derive"], optional = true } eth2_serde_utils = "0.1.1" regex = "1.5.5" lazy_static = "1.4.0" -parking_lot = "0.11.1" +parking_lot = "0.12.0" itertools = "0.10.0" superstruct = "0.4.1" serde_json = "1.0.74" diff --git a/crypto/bls/Cargo.toml b/crypto/bls/Cargo.toml index d71b46dc5..912f49c6f 100644 --- a/crypto/bls/Cargo.toml +++ b/crypto/bls/Cargo.toml @@ -13,7 +13,7 @@ serde = "1.0.116" serde_derive = "1.0.116" eth2_serde_utils = "0.1.1" hex = "0.4.2" -eth2_hashing = "0.2.0" +eth2_hashing = "0.3.0" ethereum-types = "0.12.1" arbitrary = { version = "1.0", features = ["derive"], optional = true } zeroize = { version = "1.4.2", features = ["zeroize_derive"] } diff --git a/crypto/eth2_hashing/Cargo.toml b/crypto/eth2_hashing/Cargo.toml index 574dbcf2c..7490ab609 100644 --- a/crypto/eth2_hashing/Cargo.toml +++ b/crypto/eth2_hashing/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "eth2_hashing" -version = "0.2.0" +version = "0.3.0" authors = ["Paul Hauner "] edition = "2021" license = "Apache-2.0" @@ -9,8 +9,8 @@ description = "Hashing primitives used in Ethereum 2.0" [dependencies] lazy_static = { version = "1.4.0", optional = true } ring = "0.16.19" -sha2 = "0.9.5" -cpufeatures = "0.1.5" +sha2 = "0.10.2" +cpufeatures = "0.2.2" [dev-dependencies] rustc-hex = "2.1.0" diff --git a/crypto/eth2_keystore/Cargo.toml b/crypto/eth2_keystore/Cargo.toml index 2bfdde8ac..98521c8fb 100644 --- a/crypto/eth2_keystore/Cargo.toml +++ b/crypto/eth2_keystore/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -rand = "0.7.3" +rand = "0.8.5" hmac = "0.11.0" pbkdf2 = { version = "0.8.0", default-features = false } scrypt = { version = "0.7.0", default-features = false } diff --git a/crypto/eth2_wallet/Cargo.toml b/crypto/eth2_wallet/Cargo.toml index e564209b6..71f66ff93 100644 --- a/crypto/eth2_wallet/Cargo.toml +++ b/crypto/eth2_wallet/Cargo.toml @@ -11,7 +11,7 @@ serde = "1.0.116" serde_json = "1.0.58" serde_repr = "0.1.6" uuid = { version = "0.8.1", features = ["serde", "v4"] } -rand = "0.7.3" +rand = "0.8.5" eth2_keystore = { path = "../eth2_keystore" } eth2_key_derivation = { path = "../eth2_key_derivation" } tiny-bip39 = "0.8.1" diff --git a/lcli/Cargo.toml b/lcli/Cargo.toml index 48bee9fba..24d66ae8c 100644 --- a/lcli/Cargo.toml +++ b/lcli/Cargo.toml @@ -33,7 +33,7 @@ lighthouse_version = { path = "../common/lighthouse_version" } directory = { path = "../common/directory" } account_utils = { path = "../common/account_utils" } eth2_wallet = { path = "../crypto/eth2_wallet" } -web3 = { version = "0.17.0", default-features = false, features = ["http-tls", "signing", "ws-tls-tokio"] } +web3 = { version = "0.18.0", default-features = false, features = ["http-tls", "signing", "ws-tls-tokio"] } eth1_test_rig = { path = "../testing/eth1_test_rig" } sensitive_url = { path = "../common/sensitive_url" } eth2 = { path = "../common/eth2" } diff --git a/lighthouse/Cargo.toml b/lighthouse/Cargo.toml index fa1289eba..c17c1ef72 100644 --- a/lighthouse/Cargo.toml +++ b/lighthouse/Cargo.toml @@ -26,7 +26,7 @@ slog = { version = "2.5.2", features = ["max_level_trace"] } sloggers = { version = "2.1.1", features = ["json"] } types = { "path" = "../consensus/types" } bls = { path = "../crypto/bls" } -eth2_hashing = "0.2.0" +eth2_hashing = "0.3.0" clap = "2.33.3" env_logger = "0.9.0" environment = { path = "./environment" } diff --git a/slasher/Cargo.toml b/slasher/Cargo.toml index 0139b6624..22b3408ab 100644 --- a/slasher/Cargo.toml +++ b/slasher/Cargo.toml @@ -15,8 +15,8 @@ lighthouse_metrics = { path = "../common/lighthouse_metrics" } filesystem = { path = "../common/filesystem" } mdbx = { package = "libmdbx", version = "0.1.0" } lru = "0.7.1" -parking_lot = "0.11.0" -rand = "0.7.3" +parking_lot = "0.12.0" +rand = "0.8.5" safe_arith = { path = "../consensus/safe_arith" } serde = "1.0" serde_derive = "1.0" diff --git a/slasher/tests/random.rs b/slasher/tests/random.rs index 7ff7fe585..8126602f3 100644 --- a/slasher/tests/random.rs +++ b/slasher/tests/random.rs @@ -42,23 +42,23 @@ fn random_test(seed: u64, test_config: TestConfig) { let tempdir = tempdir().unwrap(); let mut config = Config::new(tempdir.path().into()); - config.validator_chunk_size = 1 << rng.gen_range(1, 4); + config.validator_chunk_size = 1 << rng.gen_range(1..4); - let chunk_size_exponent = rng.gen_range(1, 4); + let chunk_size_exponent = rng.gen_range(1..4); config.chunk_size = 1 << chunk_size_exponent; - config.history_length = 1 << rng.gen_range(chunk_size_exponent, chunk_size_exponent + 3); + config.history_length = 1 << rng.gen_range(chunk_size_exponent..chunk_size_exponent + 3); let slasher = Slasher::::open(config.clone(), test_logger()).unwrap(); let validators = (0..num_validators as u64).collect::>(); - let num_attestations = rng.gen_range(2, max_attestations + 1); + let num_attestations = rng.gen_range(2..max_attestations + 1); let mut current_epoch = Epoch::new(0); let mut attestations = vec![]; for _ in 0..num_attestations { - let num_attesters = rng.gen_range(1, num_validators); + let num_attesters = rng.gen_range(1..num_validators); let mut attesting_indices = validators .choose_multiple(&mut rng, num_attesters) .copied() @@ -70,17 +70,17 @@ fn random_test(seed: u64, test_config: TestConfig) { let source = rng.gen_range( current_epoch .as_u64() - .saturating_sub(config.history_length as u64 - 1), - current_epoch.as_u64() + 1, + .saturating_sub(config.history_length as u64 - 1) + ..current_epoch.as_u64() + 1, ); - let target = rng.gen_range(source, current_epoch.as_u64() + 1); + let target = rng.gen_range(source..current_epoch.as_u64() + 1); (source, target) } else { - let source = rng.gen_range(0, max(3 * current_epoch.as_u64(), 1)); - let target = rng.gen_range(source, max(3 * current_epoch.as_u64(), source + 1)); + let source = rng.gen_range(0..max(3 * current_epoch.as_u64(), 1)); + let target = rng.gen_range(source..max(3 * current_epoch.as_u64(), source + 1)); (source, target) }; - let target_root = rng.gen_range(0, 3); + let target_root = rng.gen_range(0..3); let attestation = indexed_att(&attesting_indices, source, target, target_root); if check_slashings { @@ -92,9 +92,9 @@ fn random_test(seed: u64, test_config: TestConfig) { // Maybe add a random block too if test_config.add_blocks && rng.gen_bool(0.1) { - let slot = rng.gen_range(0, 1 + 3 * current_epoch.as_u64() * E::slots_per_epoch() / 2); - let proposer = rng.gen_range(0, num_validators as u64); - let block_root = rng.gen_range(0, 2); + let slot = rng.gen_range(0..1 + 3 * current_epoch.as_u64() * E::slots_per_epoch() / 2); + let proposer = rng.gen_range(0..num_validators as u64); + let block_root = rng.gen_range(0..2); slasher.accept_block_header(block(slot, proposer, block_root)); } diff --git a/testing/eth1_test_rig/Cargo.toml b/testing/eth1_test_rig/Cargo.toml index 57162f97b..08766f14f 100644 --- a/testing/eth1_test_rig/Cargo.toml +++ b/testing/eth1_test_rig/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] tokio = { version = "1.14.0", features = ["time"] } -web3 = { version = "0.17.0", default-features = false, features = ["http-tls", "signing", "ws-tls-tokio"] } +web3 = { version = "0.18.0", default-features = false, features = ["http-tls", "signing", "ws-tls-tokio"] } types = { path = "../../consensus/types"} serde_json = "1.0.58" deposit_contract = { path = "../../common/deposit_contract"} diff --git a/testing/eth1_test_rig/src/lib.rs b/testing/eth1_test_rig/src/lib.rs index 1b80097cc..52ae3922b 100644 --- a/testing/eth1_test_rig/src/lib.rs +++ b/testing/eth1_test_rig/src/lib.rs @@ -194,6 +194,8 @@ impl DepositContract { to: Some(self.contract.address()), gas: Some(U256::from(DEPOSIT_GAS)), gas_price: None, + max_fee_per_gas: None, + max_priority_fee_per_gas: None, value: Some(from_gwei(deposit_data.amount)), // Note: the reason we use this `TransactionRequest` instead of just using the // function in `self.contract` is so that the `eth1_tx_data` function gets used diff --git a/testing/simulator/Cargo.toml b/testing/simulator/Cargo.toml index c2f435fab..677050843 100644 --- a/testing/simulator/Cargo.toml +++ b/testing/simulator/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" node_test_rig = { path = "../node_test_rig" } eth1 = {path = "../../beacon_node/eth1"} types = { path = "../../consensus/types" } -parking_lot = "0.11.0" +parking_lot = "0.12.0" futures = "0.3.7" tokio = "1.14.0" eth1_test_rig = { path = "../eth1_test_rig" } diff --git a/validator_client/Cargo.toml b/validator_client/Cargo.toml index a1604064a..9833c046f 100644 --- a/validator_client/Cargo.toml +++ b/validator_client/Cargo.toml @@ -30,7 +30,7 @@ dirs = "3.0.1" directory = { path = "../common/directory" } lockfile = { path = "../common/lockfile" } environment = { path = "../lighthouse/environment" } -parking_lot = "0.11.0" +parking_lot = "0.12.0" exit-future = "0.2.0" filesystem = { path = "../common/filesystem" } hex = "0.4.2" @@ -47,9 +47,9 @@ warp_utils = { path = "../common/warp_utils" } warp = "0.3.2" hyper = "0.14.4" eth2_serde_utils = "0.1.1" -libsecp256k1 = "0.6.0" +libsecp256k1 = "0.7.0" ring = "0.16.19" -rand = { version = "0.7.3", features = ["small_rng"] } +rand = { version = "0.8.5", features = ["small_rng"] } lighthouse_metrics = { path = "../common/lighthouse_metrics" } lazy_static = "1.4.0" itertools = "0.10.0"