Merge branch 'master' into multi-bls

Author: paulhauner

.github/workflows/test-suite.yml

@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - master
+      - staging
+      - trying
   pull_request:
 
 jobs:
@@ -108,27 +110,27 @@ jobs:
     - name: Lint code for quality and style with Clippy
       run: make lint
   arbitrary-check:
-   runs-on: ubuntu-latest
-   needs: cargo-fmt
-   steps:
-   - uses: actions/checkout@v1
-   - name: Validate state_processing feature arbitrary-fuzz
-     run:  make arbitrary-fuzz
+    runs-on: ubuntu-latest
+    needs: cargo-fmt
+    steps:
+    - uses: actions/checkout@v1
+    - name: Validate state_processing feature arbitrary-fuzz
+      run:  make arbitrary-fuzz
   cargo-audit:
-   runs-on: ubuntu-latest
-   needs: cargo-fmt
-   steps:
-   - uses: actions/checkout@v1
-   - name: Run cargo audit to identify known security vulnerabilities reported to the RustSec Advisory Database
-     run:  make audit
+    runs-on: ubuntu-latest
+    needs: cargo-fmt
+    steps:
+    - uses: actions/checkout@v1
+    - name: Run cargo audit to identify known security vulnerabilities reported to the RustSec Advisory Database
+      run:  make audit
   cargo-udeps:
-   runs-on: ubuntu-latest
-   needs: cargo-fmt
-   steps:
-   - uses: actions/checkout@v1
-   - name: Get latest version of nightly Rust
-     run: rustup update nightly
-   - name: Install cargo-udeps
-     run: cargo install cargo-udeps --locked
-   - name: Run cargo udeps to identify unused crates in the dependency graph
-     run: make udeps
+    runs-on: ubuntu-latest
+    needs: cargo-fmt
+    steps:
+    - uses: actions/checkout@v1
+    - name: Get latest version of nightly Rust
+      run: rustup update nightly
+    - name: Install cargo-udeps
+      run: cargo install cargo-udeps --locked
+    - name: Run cargo udeps to identify unused crates in the dependency graph
+      run: make udeps

Cargo.lock

@@ -18,7 +18,7 @@ merkle_proof = { path = "../../consensus/merkle_proof" }
 store = { path = "../store" }
 parking_lot = "0.11.0"
 lazy_static = "1.4.0"
-smallvec = "1.4.0"
+smallvec = "1.4.1"
 lighthouse_metrics = { path = "../../common/lighthouse_metrics" }
 log = "0.4.8"
 operation_pool = { path = "../operation_pool" }

beacon_node/beacon_chain/Cargo.toml

@@ -23,7 +23,7 @@ fnv = "1.0.7"
 unsigned-varint = { git = "https://github.com/sigp/unsigned-varint", branch = "latest-codecs", features = ["codec"] }
 lazy_static = "1.4.0"
 lighthouse_metrics = { path = "../../common/lighthouse_metrics" }
-smallvec = "1.4.0"
+smallvec = "1.4.1"
 lru = "0.5.1"
 parking_lot = "0.11.0"
 sha2 = "0.9.1"

beacon_node/eth2_libp2p/Cargo.toml

@@ -80,6 +80,7 @@ pub enum DelegateError<TSpec: EthSpec> {
     Gossipsub(<GossipHandler as ProtocolsHandler>::Error),
     RPC(<RPCHandler<TSpec> as ProtocolsHandler>::Error),
     Identify(<IdentifyHandler as ProtocolsHandler>::Error),
+    Disconnected,
 }
 
 impl<TSpec: EthSpec> std::error::Error for DelegateError<TSpec> {}
@@ -93,6 +94,7 @@ impl<TSpec: EthSpec> std::fmt::Display for DelegateError<TSpec> {
             DelegateError::Gossipsub(err) => err.fmt(formater),
             DelegateError::RPC(err) => err.fmt(formater),
             DelegateError::Identify(err) => err.fmt(formater),
+            DelegateError::Disconnected => write!(formater, "Disconnected"),
         }
     }
 }
@@ -135,11 +137,10 @@ impl<TSpec: EthSpec> ProtocolsHandler for DelegatingHandler<TSpec> {
         let rpc_proto = self.rpc_handler.listen_protocol();
         let identify_proto = self.identify_handler.listen_protocol();
 
-        let timeout = gossip_proto
+        let timeout = *gossip_proto
             .timeout()
             .max(rpc_proto.timeout())
-            .max(identify_proto.timeout())
-            .clone();
+            .max(identify_proto.timeout());
 
         let select = SelectUpgrade::new(
             gossip_proto.into_upgrade().1,
@@ -317,7 +318,7 @@ impl<TSpec: EthSpec> ProtocolsHandler for DelegatingHandler<TSpec> {
             }
             Poll::Ready(ProtocolsHandlerEvent::OutboundSubstreamRequest { protocol, info }) => {
                 return Poll::Ready(ProtocolsHandlerEvent::OutboundSubstreamRequest {
-                    protocol: protocol.map_upgrade(|u| EitherUpgrade::A(u)),
+                    protocol: protocol.map_upgrade(EitherUpgrade::A),
                     info: EitherOutput::First(info),
                 });
             }

beacon_node/eth2_libp2p/src/behaviour/handler/delegate.rs

@@ -95,14 +95,9 @@ impl<TSpec: EthSpec> ProtocolsHandler for BehaviourHandler<TSpec> {
         self.delegate.inject_dial_upgrade_error(info, err)
     }
 
+    // We don't use the keep alive to disconnect. This is handled in the poll
     fn connection_keep_alive(&self) -> KeepAlive {
-        if self.shutting_down {
-            let rpc_keep_alive = self.delegate.rpc().connection_keep_alive();
-            let identify_keep_alive = self.delegate.identify().connection_keep_alive();
-            rpc_keep_alive.max(identify_keep_alive)
-        } else {
-            KeepAlive::Yes
-        }
+        KeepAlive::Yes
     }
 
     fn poll(
@@ -116,6 +111,15 @@ impl<TSpec: EthSpec> ProtocolsHandler for BehaviourHandler<TSpec> {
             Self::Error,
         >,
     > {
+        // Disconnect if the sub-handlers are ready.
+        if self.shutting_down {
+            let rpc_keep_alive = self.delegate.rpc().connection_keep_alive();
+            let identify_keep_alive = self.delegate.identify().connection_keep_alive();
+            if KeepAlive::No == rpc_keep_alive.max(identify_keep_alive) {
+                return Poll::Ready(ProtocolsHandlerEvent::Close(DelegateError::Disconnected));
+            }
+        }
+
         match self.delegate.poll(cx) {
             Poll::Ready(ProtocolsHandlerEvent::Custom(event)) => {
                 return Poll::Ready(ProtocolsHandlerEvent::Custom(