Update to the latest libp2p (#2239)

Updates to the latest libp2p and ignores RUSTSEC-2020-0146 from cargo-audit


Co-authored-by: Michael Sproul <michael@sigmaprime.io>

Makefile

@@ -136,8 +136,7 @@ arbitrary-fuzz:
 # Runs cargo audit (Audit Cargo.lock files for crates with security vulnerabilities reported to the RustSec Advisory Database)
 audit:
 	cargo install --force cargo-audit
-	# TODO: we should address this --ignore.
+	cargo audit --ignore RUSTSEC-2020-0146
-	cargo audit --ignore RUSTSEC-2016-0002 --ignore RUSTSEC-2020-0008 --ignore RUSTSEC-2017-0002 --ignore RUSTSEC-2021-0020
 
 # Runs `cargo udeps` to check for unused dependencies
 udeps:

beacon_node/eth2_libp2p/Cargo.toml

@@ -42,7 +42,7 @@ regex = "1.3.9"
 strum = { version = "0.20", features = ["derive"] }
 
 [dependencies.libp2p]
-version = "0.34.0"
+version = "0.35.1"
 default-features = false
 features = ["websocket", "identify", "mplex", "yamux", "noise", "gossipsub", "dns", "tcp-tokio"]
 

beacon_node/store/benches/benches.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use criterion::Criterion;
 use criterion::{black_box, criterion_group, criterion_main, Benchmark};
 use rayon::prelude::*;

common/remote_signer_consumer/tests/post.rs

@@ -98,15 +98,18 @@ mod post {
 
         // `Error::InvalidUrl`.
         // The RemoteSignerHttpConsumer is created, but fails at `path_segments_mut()`.
-        testcase("localhost:abcd", "[InvalidUrl] Url { scheme: \"localhost\", host: None, port: None, path: \"abcd\", query: None, fragment: None }");
+        testcase(
-        testcase("localhost:", "[InvalidUrl] Url { scheme: \"localhost\", host: None, port: None, path: \"\", query: None, fragment: None }");
+            "localhost:abcd",
+            "[InvalidUrl] Url { scheme: \"localhost\", username: \"\", password: None, host: None, port: None, path: \"abcd\", query: None, fragment: None }",
+        );
+        testcase("localhost:", "[InvalidUrl] Url { scheme: \"localhost\", username: \"\", password: None, host: None, port: None, path: \"\", query: None, fragment: None }");
 
         // `Reqwest::Error` of the `Builder` kind.
         // POST is not made.
         testcase(
             "unix:/run/foo.socket",
             &format!(
-                "[Reqwest - Builder] Url {{ scheme: \"unix\", host: None, port: None, path: \"/run/foo.socket/sign/{}\", query: None, fragment: None }}",
+                "[Reqwest - Builder] Url {{ scheme: \"unix\", username: \"\", password: None, host: None, port: None, path: \"/run/foo.socket/sign/{}\", query: None, fragment: None }}",
                 PUBLIC_KEY_1
             ),
         );
@@ -114,7 +117,7 @@ mod post {
         testcase(
             "http://127.0.0.1:0",
             &format!(
-                "[Reqwest - Request] Url {{ scheme: \"http\", host: Some(Ipv4(127.0.0.1)), port: Some(0), path: \"/sign/{}\", query: None, fragment: None }}",
+                "[Reqwest - Request] Url {{ scheme: \"http\", username: \"\", password: None, host: Some(Ipv4(127.0.0.1)), port: Some(0), path: \"/sign/{}\", query: None, fragment: None }}",
                 PUBLIC_KEY_1
             ),
         );

consensus/state_processing/benches/benches.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 extern crate env_logger;
 
 use criterion::Criterion;

consensus/swap_or_not_shuffle/benches/benches.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use criterion::Criterion;
 use criterion::{black_box, criterion_group, criterion_main, Benchmark};
 use swap_or_not_shuffle::{compute_shuffled_index, shuffle_list as fast_shuffle};

consensus/tree_hash/benches/benches.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use criterion::Criterion;
 use criterion::{black_box, criterion_group, criterion_main, Benchmark};
 use lazy_static::lazy_static;

consensus/types/benches/benches.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use criterion::Criterion;
 use criterion::{black_box, criterion_group, criterion_main, Benchmark};
 use rayon::prelude::*;