Merge remote-tracking branch 'origin/unstable' into tree-states

testing/node_test_rig/src/lib.rs

@@ -98,7 +98,7 @@ pub fn testing_client_config() -> ClientConfig {
     // Setting ports to `0` means that the OS will choose some available port.
     client_config
         .network
-        .set_ipv4_listening_address(std::net::Ipv4Addr::UNSPECIFIED, 0, 0);
+        .set_ipv4_listening_address(std::net::Ipv4Addr::UNSPECIFIED, 0, 0, 0);
     client_config.network.upnp_enabled = false;
     client_config.http_api.enabled = true;
     client_config.http_api.listen_port = 0;
@@ -220,14 +220,13 @@ impl<E: EthSpec> LocalValidatorClient<E> {
         config.validator_dir = files.validator_dir.path().into();
         config.secrets_dir = files.secrets_dir.path().into();
 
-        ProductionValidatorClient::new(context, config)
+        let mut client = ProductionValidatorClient::new(context, config).await?;
+
+        client
+            .start_service()
             .await
-            .map(move |mut client| {
-                client
-                    .start_service()
-                    .expect("should start validator services");
-                Self { client, files }
-            })
+            .expect("should start validator services");
+        Ok(Self { client, files })
     }
 }
 

testing/simulator/src/local_network.rs

@@ -14,6 +14,7 @@ use std::{sync::Arc, time::Duration};
 use types::{Epoch, EthSpec};
 
 const BOOTNODE_PORT: u16 = 42424;
+const QUIC_PORT: u16 = 43424;
 pub const INVALID_ADDRESS: &str = "http://127.0.0.1:42423";
 
 pub const EXECUTION_PORT: u16 = 4000;
@@ -63,6 +64,7 @@ impl<E: EthSpec> LocalNetwork<E> {
             std::net::Ipv4Addr::UNSPECIFIED,
             BOOTNODE_PORT,
             BOOTNODE_PORT,
+            QUIC_PORT,
         );
         beacon_config.network.enr_udp4_port = Some(BOOTNODE_PORT);
         beacon_config.network.enr_tcp4_port = Some(BOOTNODE_PORT);
@@ -154,6 +156,7 @@ impl<E: EthSpec> LocalNetwork<E> {
                 std::net::Ipv4Addr::UNSPECIFIED,
                 BOOTNODE_PORT + count,
                 BOOTNODE_PORT + count,
+                QUIC_PORT + count,
             );
             beacon_config.network.enr_udp4_port = Some(BOOTNODE_PORT + count);
             beacon_config.network.enr_tcp4_port = Some(BOOTNODE_PORT + count);

testing/web3signer_tests/tls/README.md

@@ -1,6 +1,6 @@
 ## TLS Testing Files
 
 The files in this directory are used for testing TLS with web3signer. We store them in this
-repository since the are not sensitive and it's simpler than regenerating them for each test.
+repository since they are not sensitive and it's simpler than regenerating them for each test.
 
 The files were generated using the `./generate.sh` script.