update dependencies (#2032)

## Issue Addressed

NA

## Proposed Changes

Updates out of date dependencies.

## Additional Info

See also https://github.com/sigp/lighthouse/issues/1712 for a list of dependencies that are still out of date and the resasons.
This commit is contained in:
blacktemplar 2020-12-07 08:20:33 +00:00
parent 9c915349d4
commit a28e8decbf
22 changed files with 98 additions and 183 deletions

221
Cargo.lock generated
View File

@ -108,18 +108,6 @@ dependencies = [
"cipher", "cipher",
] ]
[[package]]
name = "aes-ctr"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64c3b03608ea1c077228520a167cca2514dc7cd8100a81b30a2b38be985234e5"
dependencies = [
"aes-soft 0.5.0",
"aesni 0.9.0",
"ctr 0.5.0",
"stream-cipher",
]
[[package]] [[package]]
name = "aes-ctr" name = "aes-ctr"
version = "0.6.0" version = "0.6.0"
@ -129,7 +117,7 @@ dependencies = [
"aes-soft 0.6.4", "aes-soft 0.6.4",
"aesni 0.10.0", "aesni 0.10.0",
"cipher", "cipher",
"ctr 0.6.0", "ctr",
] ]
[[package]] [[package]]
@ -154,7 +142,7 @@ dependencies = [
"aead", "aead",
"aes 0.6.0", "aes 0.6.0",
"cipher", "cipher",
"ctr 0.6.0", "ctr",
"ghash", "ghash",
"subtle 2.3.0", "subtle 2.3.0",
] ]
@ -190,17 +178,6 @@ dependencies = [
"opaque-debug 0.3.0", "opaque-debug 0.3.0",
] ]
[[package]]
name = "aesni"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6a4d655ae633a96d0acaf0fd7e76aafb8ca5732739bba37aac6f882c8fce656"
dependencies = [
"block-cipher",
"opaque-debug 0.3.0",
"stream-cipher",
]
[[package]] [[package]]
name = "aesni" name = "aesni"
version = "0.10.0" version = "0.10.0"
@ -659,9 +636,9 @@ dependencies = [
[[package]] [[package]]
name = "bit-vec" name = "bit-vec"
version = "0.6.2" version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f0dc55f2d8a1a85650ac47858bb001b4c0dd73d79e3c455a842925e68d29cd3" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
[[package]] [[package]]
name = "bitflags" name = "bitflags"
@ -1448,15 +1425,6 @@ dependencies = [
"memchr", "memchr",
] ]
[[package]]
name = "ctr"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc03dee3a2843ac6eb4b5fb39cfcf4cb034d078555d1f4a0afbed418b822f3c2"
dependencies = [
"stream-cipher",
]
[[package]] [[package]]
name = "ctr" name = "ctr"
version = "0.6.0" version = "0.6.0"
@ -1692,7 +1660,7 @@ version = "0.1.0-beta.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ddad09a9bd70478c581a9f7e608a17962c5561a3ca7b1eb5b75cf1c6c3f124b8" checksum = "ddad09a9bd70478c581a9f7e608a17962c5561a3ca7b1eb5b75cf1c6c3f124b8"
dependencies = [ dependencies = [
"aes-ctr 0.6.0", "aes-ctr",
"aes-gcm 0.8.0", "aes-gcm 0.8.0",
"arrayvec", "arrayvec",
"digest 0.9.0", "digest 0.9.0",
@ -1700,7 +1668,7 @@ dependencies = [
"fnv", "fnv",
"futures 0.3.8", "futures 0.3.8",
"hex", "hex",
"hkdf 0.10.0", "hkdf",
"k256", "k256",
"lazy_static", "lazy_static",
"libp2p-core 0.23.1", "libp2p-core 0.23.1",
@ -1712,39 +1680,7 @@ dependencies = [
"sha2 0.9.2", "sha2 0.9.2",
"smallvec 1.5.0", "smallvec 1.5.0",
"tokio 0.3.5", "tokio 0.3.5",
"tokio-util 0.5.0", "tokio-util 0.5.1",
"tracing",
"tracing-subscriber",
"uint",
"zeroize",
]
[[package]]
name = "discv5"
version = "0.1.0-beta.2"
source = "git+https://github.com/sigp/discv5?rev=f117b3ca56fa3dca2317270434634ff7106d391a#f117b3ca56fa3dca2317270434634ff7106d391a"
dependencies = [
"aes-ctr 0.6.0",
"aes-gcm 0.8.0",
"arrayvec",
"digest 0.9.0",
"enr",
"fnv",
"futures 0.3.8",
"hex",
"hkdf 0.9.0",
"k256",
"lazy_static",
"libp2p-core 0.23.1",
"lru_time_cache",
"multihash 0.11.4",
"parking_lot 0.11.1",
"rand 0.7.3",
"rlp",
"sha2 0.9.2",
"smallvec 1.5.0",
"tokio 0.3.5",
"tokio-util 0.4.0",
"tracing", "tracing",
"tracing-subscriber", "tracing-subscriber",
"uint", "uint",
@ -1891,6 +1827,16 @@ name = "env_logger"
version = "0.7.1" version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
dependencies = [
"log 0.4.11",
"regex",
]
[[package]]
name = "env_logger"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f26ecb66b4bdca6c1409b40fb255eefc2bd4f6d135dab3c3124f80ffa2a9661e"
dependencies = [ dependencies = [
"atty", "atty",
"humantime", "humantime",
@ -2053,15 +1999,15 @@ dependencies = [
name = "eth2_keystore" name = "eth2_keystore"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"aes-ctr 0.5.0", "aes-ctr",
"bls", "bls",
"eth2_key_derivation", "eth2_key_derivation",
"eth2_ssz", "eth2_ssz",
"hex", "hex",
"hmac 0.9.0", "hmac 0.10.1",
"pbkdf2 0.5.0", "pbkdf2 0.6.0",
"rand 0.7.3", "rand 0.7.3",
"scrypt 0.4.1", "scrypt",
"serde", "serde",
"serde_json", "serde_json",
"serde_repr", "serde_repr",
@ -2079,7 +2025,7 @@ dependencies = [
"base64 0.13.0", "base64 0.13.0",
"directory", "directory",
"dirs 3.0.1", "dirs 3.0.1",
"discv5 0.1.0-beta.2 (registry+https://github.com/rust-lang/crates.io-index)", "discv5",
"error-chain", "error-chain",
"eth2_ssz", "eth2_ssz",
"eth2_ssz_derive", "eth2_ssz_derive",
@ -2762,7 +2708,7 @@ dependencies = [
"indexmap", "indexmap",
"slab 0.4.2", "slab 0.4.2",
"tokio 0.3.5", "tokio 0.3.5",
"tokio-util 0.5.0", "tokio-util 0.5.1",
"tracing", "tracing",
"tracing-futures", "tracing-futures",
] ]
@ -2797,7 +2743,7 @@ version = "0.2.0"
dependencies = [ dependencies = [
"futures 0.3.8", "futures 0.3.8",
"tokio 0.3.5", "tokio 0.3.5",
"tokio-util 0.4.0", "tokio-util 0.5.1",
] ]
[[package]] [[package]]
@ -2878,16 +2824,6 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b07f60793ff0a4d9cef0f18e63b5357e06209987153a64648c972c1e5aff336f" checksum = "b07f60793ff0a4d9cef0f18e63b5357e06209987153a64648c972c1e5aff336f"
[[package]]
name = "hkdf"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe1149865383e4526a43aee8495f9a325f0b806c63ce6427d06336a590abbbc9"
dependencies = [
"digest 0.9.0",
"hmac 0.8.1",
]
[[package]] [[package]]
name = "hkdf" name = "hkdf"
version = "0.10.0" version = "0.10.0"
@ -3017,8 +2953,8 @@ name = "http_api"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"beacon_chain", "beacon_chain",
"bs58 0.3.1", "bs58 0.4.0",
"discv5 0.1.0-beta.2 (git+https://github.com/sigp/discv5?rev=f117b3ca56fa3dca2317270434634ff7106d391a)", "discv5",
"environment", "environment",
"eth1", "eth1",
"eth2", "eth2",
@ -3110,12 +3046,9 @@ dependencies = [
[[package]] [[package]]
name = "humantime" name = "humantime"
version = "1.3.0" version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a"
dependencies = [
"quick-error",
]
[[package]] [[package]]
name = "hyper" name = "hyper"
@ -3354,7 +3287,7 @@ dependencies = [
name = "int_to_bytes" name = "int_to_bytes"
version = "0.2.0" version = "0.2.0"
dependencies = [ dependencies = [
"bytes 0.5.6", "bytes 0.6.0",
"hex", "hex",
"yaml-rust", "yaml-rust",
] ]
@ -3716,7 +3649,7 @@ dependencies = [
"lazy_static", "lazy_static",
"libsecp256k1", "libsecp256k1",
"log 0.4.11", "log 0.4.11",
"multihash 0.13.1", "multihash 0.13.2",
"multistream-select 0.8.5 (git+https://github.com/sigp/rust-libp2p?rev=e3caf9e0e5e78c9d51c6dccf0d6277cef553bb25)", "multistream-select 0.8.5 (git+https://github.com/sigp/rust-libp2p?rev=e3caf9e0e5e78c9d51c6dccf0d6277cef553bb25)",
"parity-multiaddr 0.9.6 (git+https://github.com/sigp/rust-libp2p?rev=e3caf9e0e5e78c9d51c6dccf0d6277cef553bb25)", "parity-multiaddr 0.9.6 (git+https://github.com/sigp/rust-libp2p?rev=e3caf9e0e5e78c9d51c6dccf0d6277cef553bb25)",
"parking_lot 0.11.1", "parking_lot 0.11.1",
@ -3942,7 +3875,7 @@ dependencies = [
"clap", "clap",
"clap_utils", "clap_utils",
"directory", "directory",
"env_logger", "env_logger 0.8.2",
"environment", "environment",
"eth2_testnet_config", "eth2_testnet_config",
"futures 0.3.8", "futures 0.3.8",
@ -4255,18 +4188,6 @@ dependencies = [
"winapi 0.3.9", "winapi 0.3.9",
] ]
[[package]]
name = "mio-named-pipes"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656"
dependencies = [
"log 0.4.11",
"mio 0.6.23",
"miow 0.3.6",
"winapi 0.3.9",
]
[[package]] [[package]]
name = "mio-uds" name = "mio-uds"
version = "0.6.8" version = "0.6.8"
@ -4317,9 +4238,9 @@ dependencies = [
[[package]] [[package]]
name = "multihash" name = "multihash"
version = "0.13.1" version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb63389ee5fcd4df3f8727600f4a0c3df53c541f0ed4e8b50a9ae51a80fc1efe" checksum = "4dac63698b887d2d929306ea48b63760431ff8a24fac40ddb22f9c7f49fb7cab"
dependencies = [ dependencies = [
"digest 0.9.0", "digest 0.9.0",
"generic-array 0.14.4", "generic-array 0.14.4",
@ -4330,9 +4251,9 @@ dependencies = [
[[package]] [[package]]
name = "multihash-derive" name = "multihash-derive"
version = "0.7.0" version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f5653449cd45d502a53480ee08d7a599e8f4893d2bacb33c63d65bc20af6c1a" checksum = "85ee3c48cb9d9b275ad967a0e96715badc13c6029adb92f34fa17b9ff28fd81f"
dependencies = [ dependencies = [
"proc-macro-crate", "proc-macro-crate",
"proc-macro-error", "proc-macro-error",
@ -4557,9 +4478,9 @@ dependencies = [
[[package]] [[package]]
name = "num-bigint-dig" name = "num-bigint-dig"
version = "0.6.0" version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3d03c330f9f7a2c19e3c0b42698e48141d0809c78cd9b6219f85bd7d7e892aa" checksum = "5d51546d704f52ef14b3c962b5776e53d5b862e5790e40a350d366c209bd7f7a"
dependencies = [ dependencies = [
"autocfg 0.1.7", "autocfg 0.1.7",
"byteorder", "byteorder",
@ -4733,7 +4654,7 @@ dependencies = [
"bs58 0.4.0", "bs58 0.4.0",
"byteorder", "byteorder",
"data-encoding", "data-encoding",
"multihash 0.13.1", "multihash 0.13.2",
"percent-encoding 2.1.0", "percent-encoding 2.1.0",
"serde", "serde",
"static_assertions", "static_assertions",
@ -4846,11 +4767,11 @@ dependencies = [
[[package]] [[package]]
name = "pbkdf2" name = "pbkdf2"
version = "0.5.0" version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7170d73bf11f39b4ce1809aabc95bf5c33564cdc16fc3200ddda17a5f6e5e48b" checksum = "b3b8c0d71734018084da0c0354193a5edfb81b20d2d57a92c5b154aefc554a4a"
dependencies = [ dependencies = [
"crypto-mac 0.9.1", "crypto-mac 0.10.0",
] ]
[[package]] [[package]]
@ -5091,11 +5012,11 @@ dependencies = [
[[package]] [[package]]
name = "prometheus" name = "prometheus"
version = "0.10.0" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30d70cf4412832bcac9cffe27906f4a66e450d323525e977168c70d1b36120ae" checksum = "c8425533e7122f0c3cc7a37e6244b16ad3a2cc32ae7ac6276e2a75da0d9c200d"
dependencies = [ dependencies = [
"cfg-if 0.1.10", "cfg-if 1.0.0",
"fnv", "fnv",
"lazy_static", "lazy_static",
"parking_lot 0.11.1", "parking_lot 0.11.1",
@ -5222,7 +5143,7 @@ version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a44883e74aa97ad63db83c4bf8ca490f02b2fc02f92575e720c8551e843c945f" checksum = "a44883e74aa97ad63db83c4bf8ca490f02b2fc02f92575e720c8551e843c945f"
dependencies = [ dependencies = [
"env_logger", "env_logger 0.7.1",
"log 0.4.11", "log 0.4.11",
"rand 0.7.3", "rand 0.7.3",
"rand_core 0.5.1", "rand_core 0.5.1",
@ -5819,6 +5740,15 @@ version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
[[package]]
name = "salsa20"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "399f290ffc409596022fce5ea5d4138184be4784f2b28c62c59f0d8389059a15"
dependencies = [
"cipher",
]
[[package]] [[package]]
name = "same-file" name = "same-file"
version = "1.0.6" version = "1.0.6"
@ -5867,23 +5797,13 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]] [[package]]
name = "scrypt" name = "scrypt"
version = "0.3.1" version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "10e7e75e27e8cd47e4be027d4b9fdc0b696116f981c22de21ca7bad63a9cb33a" checksum = "8da492dab03f925d977776a0b7233d7b934d6dc2b94faead48928e2e9bacedb9"
dependencies = [ dependencies = [
"hmac 0.8.1", "hmac 0.10.1",
"pbkdf2 0.4.0", "pbkdf2 0.6.0",
"sha2 0.9.2", "salsa20",
]
[[package]]
name = "scrypt"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3437654bbbe34054a268b3859fe41f871215069b39f0aef78808d85c37100696"
dependencies = [
"hmac 0.9.0",
"pbkdf2 0.5.0",
"sha2 0.9.2", "sha2 0.9.2",
] ]
@ -5985,9 +5905,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_json" name = "serde_json"
version = "1.0.59" version = "1.0.60"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95" checksum = "1500e84d27fe482ed1dc791a56eddc2f230046a040fa908c08bda1d9fb615779"
dependencies = [ dependencies = [
"itoa", "itoa",
"ryu", "ryu",
@ -6164,7 +6084,7 @@ name = "simulator"
version = "0.2.0" version = "0.2.0"
dependencies = [ dependencies = [
"clap", "clap",
"env_logger", "env_logger 0.8.2",
"eth1", "eth1",
"eth1_test_rig", "eth1_test_rig",
"futures 0.3.8", "futures 0.3.8",
@ -6221,7 +6141,7 @@ dependencies = [
"slot_clock", "slot_clock",
"task_executor", "task_executor",
"tempdir", "tempdir",
"tokio 0.2.23", "tokio 0.3.5",
"tree_hash", "tree_hash",
"tree_hash_derive", "tree_hash_derive",
"types", "types",
@ -6458,7 +6378,7 @@ dependencies = [
"arbitrary", "arbitrary",
"bls", "bls",
"criterion", "criterion",
"env_logger", "env_logger 0.8.2",
"eth2_hashing", "eth2_hashing",
"eth2_ssz", "eth2_ssz",
"eth2_ssz_types", "eth2_ssz_types",
@ -6955,17 +6875,12 @@ dependencies = [
"futures-core", "futures-core",
"iovec", "iovec",
"lazy_static", "lazy_static",
"libc",
"memchr", "memchr",
"mio 0.6.23", "mio 0.6.23",
"mio-named-pipes",
"mio-uds",
"num_cpus", "num_cpus",
"pin-project-lite 0.1.11", "pin-project-lite 0.1.11",
"signal-hook-registry",
"slab 0.4.2", "slab 0.4.2",
"tokio-macros 0.2.6", "tokio-macros 0.2.6",
"winapi 0.3.9",
] ]
[[package]] [[package]]
@ -7315,15 +7230,15 @@ dependencies = [
[[package]] [[package]]
name = "tokio-util" name = "tokio-util"
version = "0.5.0" version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73af76301319bcacf00d26d3c75534ef248dcad7ceaf36d93ec902453c3b1706" checksum = "3137de2b078e95274b696cc522e87f22c9a753fe3ef3344116ffb94f104f10a3"
dependencies = [ dependencies = [
"bytes 0.6.0", "bytes 0.6.0",
"futures-core", "futures-core",
"futures-sink", "futures-sink",
"log 0.4.11", "log 0.4.11",
"pin-project-lite 0.1.11", "pin-project-lite 0.2.0",
"slab 0.4.2", "slab 0.4.2",
"tokio 0.3.5", "tokio 0.3.5",
] ]
@ -7744,7 +7659,7 @@ dependencies = [
"rand 0.7.3", "rand 0.7.3",
"rayon", "rayon",
"ring", "ring",
"scrypt 0.3.1", "scrypt",
"serde", "serde",
"serde_derive", "serde_derive",
"serde_json", "serde_json",

View File

@ -27,7 +27,7 @@ eth2_wallet = { path = "../crypto/eth2_wallet" }
eth2_wallet_manager = { path = "../common/eth2_wallet_manager" } eth2_wallet_manager = { path = "../common/eth2_wallet_manager" }
rand = "0.7.3" rand = "0.7.3"
validator_dir = { path = "../common/validator_dir" } validator_dir = { path = "../common/validator_dir" }
tokio = { version = "0.3.2", features = ["full"] } tokio = { version = "0.3.5", features = ["full"] }
eth2_keystore = { path = "../crypto/eth2_keystore" } eth2_keystore = { path = "../crypto/eth2_keystore" }
account_utils = { path = "../common/account_utils" } account_utils = { path = "../common/account_utils" }
slashing_protection = { path = "../validator_client/slashing_protection" } slashing_protection = { path = "../validator_client/slashing_protection" }

View File

@ -15,7 +15,7 @@ network = { path = "../network" }
timer = { path = "../timer" } timer = { path = "../timer" }
eth2_libp2p = { path = "../eth2_libp2p" } eth2_libp2p = { path = "../eth2_libp2p" }
parking_lot = "0.11.0" parking_lot = "0.11.0"
prometheus = "0.10.0" prometheus = "0.11.0"
types = { path = "../../consensus/types" } types = { path = "../../consensus/types" }
tree_hash = "0.1.1" tree_hash = "0.1.1"
eth2_config = { path = "../../common/eth2_config" } eth2_config = { path = "../../common/eth2_config" }

View File

@ -32,7 +32,7 @@ base64 = "0.13.0"
snap = "1.0.1" snap = "1.0.1"
void = "1.0.2" void = "1.0.2"
hex = "0.4.2" hex = "0.4.2"
tokio-util = { version = "0.4.0", features = ["codec", "compat"] } tokio-util = { version = "0.4.0", features = ["codec", "compat", "time"] }
tiny-keccak = "2.0.2" tiny-keccak = "2.0.2"
task_executor = { path = "../../common/task_executor" } task_executor = { path = "../../common/task_executor" }
rand = "0.7.3" rand = "0.7.3"

View File

@ -25,12 +25,12 @@ lazy_static = "1.4.0"
warp_utils = { path = "../../common/warp_utils" } warp_utils = { path = "../../common/warp_utils" }
slot_clock = { path = "../../common/slot_clock" } slot_clock = { path = "../../common/slot_clock" }
eth2_ssz = { path = "../../consensus/ssz" } eth2_ssz = { path = "../../consensus/ssz" }
bs58 = "0.3.1" bs58 = "0.4.0"
futures = "0.3.8" futures = "0.3.8"
[dev-dependencies] [dev-dependencies]
store = { path = "../store" } store = { path = "../store" }
environment = { path = "../../lighthouse/environment" } environment = { path = "../../lighthouse/environment" }
tree_hash = "0.1.1" tree_hash = "0.1.1"
discv5 = { git = "https://github.com/sigp/discv5", rev = "f117b3ca56fa3dca2317270434634ff7106d391a", features = ["libp2p"] } discv5 = { version = "0.1.0-beta.2", features = ["libp2p"] }
tokio-compat-02 = "0.1" tokio-compat-02 = "0.1"

View File

@ -7,7 +7,7 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
prometheus = "0.10.0" prometheus = "0.11.0"
warp = { git = "https://github.com/sigp/warp ", branch = "lighthouse" } warp = { git = "https://github.com/sigp/warp ", branch = "lighthouse" }
serde = { version = "1.0.116", features = ["derive"] } serde = { version = "1.0.116", features = ["derive"] }
slog = "2.5.2" slog = "2.5.2"

View File

@ -15,7 +15,7 @@ impl<T: EthSpec> StoreItem for SignedBeaconBlock<T> {
metrics::stop_timer(timer); metrics::stop_timer(timer);
metrics::inc_counter(&metrics::BEACON_BLOCK_WRITE_COUNT); metrics::inc_counter(&metrics::BEACON_BLOCK_WRITE_COUNT);
metrics::inc_counter_by(&metrics::BEACON_BLOCK_WRITE_BYTES, bytes.len() as i64); metrics::inc_counter_by(&metrics::BEACON_BLOCK_WRITE_BYTES, bytes.len() as u64);
bytes bytes
} }
@ -28,7 +28,7 @@ impl<T: EthSpec> StoreItem for SignedBeaconBlock<T> {
metrics::stop_timer(timer); metrics::stop_timer(timer);
metrics::inc_counter(&metrics::BEACON_BLOCK_READ_COUNT); metrics::inc_counter(&metrics::BEACON_BLOCK_READ_COUNT);
metrics::inc_counter_by(&metrics::BEACON_BLOCK_READ_BYTES, len as i64); metrics::inc_counter_by(&metrics::BEACON_BLOCK_READ_BYTES, len as u64);
result result
} }

View File

@ -13,7 +13,7 @@ pub fn store_full_state<E: EthSpec>(
let _overhead_timer = metrics::start_timer(&metrics::BEACON_STATE_WRITE_OVERHEAD_TIMES); let _overhead_timer = metrics::start_timer(&metrics::BEACON_STATE_WRITE_OVERHEAD_TIMES);
StorageContainer::new(state).as_ssz_bytes() StorageContainer::new(state).as_ssz_bytes()
}; };
metrics::inc_counter_by(&metrics::BEACON_STATE_WRITE_BYTES, bytes.len() as i64); metrics::inc_counter_by(&metrics::BEACON_STATE_WRITE_BYTES, bytes.len() as u64);
metrics::inc_counter(&metrics::BEACON_STATE_WRITE_COUNT); metrics::inc_counter(&metrics::BEACON_STATE_WRITE_COUNT);
let key = get_key_for_col(DBColumn::BeaconState.into(), state_root.as_bytes()); let key = get_key_for_col(DBColumn::BeaconState.into(), state_root.as_bytes());
ops.push(KeyValueStoreOp::PutKeyValue(key, bytes)); ops.push(KeyValueStoreOp::PutKeyValue(key, bytes));
@ -34,7 +34,7 @@ pub fn get_full_state<KV: KeyValueStore<E>, E: EthSpec>(
metrics::stop_timer(overhead_timer); metrics::stop_timer(overhead_timer);
metrics::stop_timer(total_timer); metrics::stop_timer(total_timer);
metrics::inc_counter(&metrics::BEACON_STATE_READ_COUNT); metrics::inc_counter(&metrics::BEACON_STATE_READ_COUNT);
metrics::inc_counter_by(&metrics::BEACON_STATE_READ_BYTES, bytes.len() as i64); metrics::inc_counter_by(&metrics::BEACON_STATE_READ_BYTES, bytes.len() as u64);
Ok(Some(container.try_into()?)) Ok(Some(container.try_into()?))
} }

View File

@ -61,7 +61,7 @@ impl<E: EthSpec> LevelDB<E> {
let column_key = get_key_for_col(col, key); let column_key = get_key_for_col(col, key);
metrics::inc_counter(&metrics::DISK_DB_WRITE_COUNT); metrics::inc_counter(&metrics::DISK_DB_WRITE_COUNT);
metrics::inc_counter_by(&metrics::DISK_DB_WRITE_BYTES, val.len() as i64); metrics::inc_counter_by(&metrics::DISK_DB_WRITE_BYTES, val.len() as u64);
let timer = metrics::start_timer(&metrics::DISK_DB_WRITE_TIMES); let timer = metrics::start_timer(&metrics::DISK_DB_WRITE_TIMES);
self.db self.db
@ -103,7 +103,7 @@ impl<E: EthSpec> KeyValueStore<E> for LevelDB<E> {
.map_err(Into::into) .map_err(Into::into)
.map(|opt| { .map(|opt| {
opt.map(|bytes| { opt.map(|bytes| {
metrics::inc_counter_by(&metrics::DISK_DB_READ_BYTES, bytes.len() as i64); metrics::inc_counter_by(&metrics::DISK_DB_READ_BYTES, bytes.len() as u64);
metrics::stop_timer(timer); metrics::stop_timer(timer);
bytes bytes
}) })

View File

@ -6,7 +6,7 @@ edition = "2018"
[dependencies] [dependencies]
futures = "0.3.7" futures = "0.3.7"
tokio-util = { version = "0.4.0", features = ["time"] } tokio-util = { version = "0.5.0", features = ["time"] }
[dev-dependencies] [dev-dependencies]
tokio = { version = "0.3.2", features = ["time", "rt-multi-thread", "macros"] } tokio = { version = "0.3.2", features = ["time", "rt-multi-thread", "macros"] }

View File

@ -8,4 +8,4 @@ edition = "2018"
[dependencies] [dependencies]
lazy_static = "1.4.0" lazy_static = "1.4.0"
prometheus = "0.10.0" prometheus = "0.11.0"

View File

@ -221,7 +221,7 @@ pub fn inc_counter_vec(int_counter_vec: &Result<IntCounterVec>, name: &[&str]) {
} }
} }
pub fn inc_counter_vec_by(int_counter_vec: &Result<IntCounterVec>, name: &[&str], amount: i64) { pub fn inc_counter_vec_by(int_counter_vec: &Result<IntCounterVec>, name: &[&str], amount: u64) {
if let Some(counter) = get_int_counter(int_counter_vec, name) { if let Some(counter) = get_int_counter(int_counter_vec, name) {
counter.inc_by(amount); counter.inc_by(amount);
} }
@ -276,7 +276,7 @@ pub fn inc_counter(counter: &Result<IntCounter>) {
} }
} }
pub fn inc_counter_by(counter: &Result<IntCounter>, value: i64) { pub fn inc_counter_by(counter: &Result<IntCounter>, value: u64) {
if let Ok(counter) = counter { if let Ok(counter) = counter {
counter.inc_by(value); counter.inc_by(value);
} }

View File

@ -15,7 +15,7 @@ bls = { path = "../../crypto/bls" }
serde = { version = "1.0.110", features = ["derive"] } serde = { version = "1.0.110", features = ["derive"] }
rayon = "1.3.0" rayon = "1.3.0"
hyper = "0.13.5" hyper = "0.13.5"
tokio = { version = "0.2.22", features = ["sync"] } tokio = { version = "0.3.5", features = ["sync"] }
environment = { path = "../../lighthouse/environment" } environment = { path = "../../lighthouse/environment" }
store = { path = "../../beacon_node/store" } store = { path = "../../beacon_node/store" }
beacon_chain = { path = "../../beacon_node/beacon_chain" } beacon_chain = { path = "../../beacon_node/beacon_chain" }

View File

@ -5,7 +5,7 @@ authors = ["Paul Hauner <paul@paulhauner.com>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
bytes = "0.5.6" bytes = "0.6.0"
[dev-dependencies] [dev-dependencies]
yaml-rust = "0.4.4" yaml-rust = "0.4.4"

View File

@ -10,7 +10,7 @@ harness = false
[dev-dependencies] [dev-dependencies]
criterion = "0.3.3" criterion = "0.3.3"
env_logger = "0.7.1" env_logger = "0.8.2"
serde = "1.0.116" serde = "1.0.116"
serde_derive = "1.0.116" serde_derive = "1.0.116"
lazy_static = "1.4.0" lazy_static = "1.4.0"

View File

@ -8,10 +8,10 @@ edition = "2018"
[dependencies] [dependencies]
rand = "0.7.3" rand = "0.7.3"
aes-ctr = "0.5.0" aes-ctr = "0.6.0"
hmac = "0.9.0" hmac = "0.10.1"
pbkdf2 = { version = "0.5.0", default-features = false } pbkdf2 = { version = "0.6.0", default-features = false }
scrypt = { version = "0.4.1", default-features = false } scrypt = { version = "0.5.0", default-features = false }
sha2 = "0.9.1" sha2 = "0.9.1"
uuid = { version = "0.8.1", features = ["serde", "v4"] } uuid = { version = "0.8.1", features = ["serde", "v4"] }
zeroize = { version = "1.1.1", features = ["zeroize_derive"] } zeroize = { version = "1.1.1", features = ["zeroize_derive"] }

View File

@ -7,8 +7,8 @@ use crate::json_keystore::{
Kdf, KdfModule, Scrypt, Sha256Checksum, Version, Kdf, KdfModule, Scrypt, Sha256Checksum, Version,
}; };
use crate::Uuid; use crate::Uuid;
use aes_ctr::stream_cipher::generic_array::GenericArray; use aes_ctr::cipher::generic_array::GenericArray;
use aes_ctr::stream_cipher::{NewStreamCipher, SyncStreamCipher}; use aes_ctr::cipher::{NewStreamCipher, SyncStreamCipher};
use aes_ctr::Aes128Ctr as AesCtr; use aes_ctr::Aes128Ctr as AesCtr;
use bls::{Keypair, PublicKey, SecretKey, ZeroizeHash}; use bls::{Keypair, PublicKey, SecretKey, ZeroizeHash};
use eth2_key_derivation::PlainText; use eth2_key_derivation::PlainText;

View File

@ -22,7 +22,7 @@ sloggers = "1.0.1"
types = { "path" = "../consensus/types" } types = { "path" = "../consensus/types" }
bls = { path = "../crypto/bls" } bls = { path = "../crypto/bls" }
clap = "2.33.3" clap = "2.33.3"
env_logger = "0.7.1" env_logger = "0.8.2"
logging = { path = "../common/logging" } logging = { path = "../common/logging" }
slog-term = "2.6.0" slog-term = "2.6.0"
slog-async = "2.5.0" slog-async = "2.5.0"

View File

@ -24,7 +24,7 @@ slog = "2.5.2"
sloggers = "*" sloggers = "*"
slot_clock = { path = "../common/slot_clock" } slot_clock = { path = "../common/slot_clock" }
task_executor = { path = "../common/task_executor" } task_executor = { path = "../common/task_executor" }
tokio = { version = "0.2.21", features = ["full"] } tokio = { version = "0.3.5", features = ["full"] }
tree_hash = { path = "../consensus/tree_hash" } tree_hash = { path = "../consensus/tree_hash" }
tree_hash_derive = { path = "../consensus/tree_hash_derive" } tree_hash_derive = { path = "../consensus/tree_hash_derive" }
types = { path = "../consensus/types" } types = { path = "../consensus/types" }

View File

@ -620,7 +620,7 @@ pub fn update_array<E: EthSpec, T: TargetArrayChunk>(
metrics::inc_counter_vec_by( metrics::inc_counter_vec_by(
&SLASHER_NUM_CHUNKS_UPDATED, &SLASHER_NUM_CHUNKS_UPDATED,
&[T::name()], &[T::name()],
updated_chunks.len() as i64, updated_chunks.len() as u64,
); );
for (chunk_index, chunk) in updated_chunks { for (chunk_index, chunk) in updated_chunks {

View File

@ -15,7 +15,7 @@ parking_lot = "0.11.0"
futures = "0.3.7" futures = "0.3.7"
tokio = "0.3.2" tokio = "0.3.2"
eth1_test_rig = { path = "../eth1_test_rig" } eth1_test_rig = { path = "../eth1_test_rig" }
env_logger = "0.7.1" env_logger = "0.8.2"
clap = "2.33.3" clap = "2.33.3"
rayon = "1.4.1" rayon = "1.4.1"
tokio-compat-02 = "0.1" tokio-compat-02 = "0.1"

View File

@ -60,6 +60,6 @@ serde_utils = { path = "../consensus/serde_utils" }
libsecp256k1 = "0.3.5" libsecp256k1 = "0.3.5"
ring = "0.16.12" ring = "0.16.12"
rand = "0.7.3" rand = "0.7.3"
scrypt = { version = "0.3.1", default-features = false } scrypt = { version = "0.5.0", default-features = false }
lighthouse_metrics = { path = "../common/lighthouse_metrics" } lighthouse_metrics = { path = "../common/lighthouse_metrics" }
lazy_static = "1.4.0" lazy_static = "1.4.0"