Stable futures (#879)

* Port eth1 lib to use stable futures

* Port eth1_test_rig to stable futures

* Port eth1 tests to stable futures

* Port genesis service to stable futures

* Port genesis tests to stable futures

* Port beacon_chain to stable futures

* Port lcli to stable futures

* Fix eth1_test_rig (#1014)

* Fix lcli

* Port timer to stable futures

* Fix timer

* Port websocket_server to stable futures

* Port notifier to stable futures

* Add TODOS

* Update hashmap hashset to stable futures

* Adds panic test to hashset delay

* Port remote_beacon_node to stable futures

* Fix lcli merge conflicts

* Non rpc stuff compiles

* protocol.rs compiles

* Port websockets, timer and notifier to stable futures (#1035)

* Fix lcli

* Port timer to stable futures

* Fix timer

* Port websocket_server to stable futures

* Port notifier to stable futures

* Add TODOS

* Port remote_beacon_node to stable futures

* Partial eth2-libp2p stable future upgrade

* Finished first round of fighting RPC types

* Further progress towards porting eth2-libp2p adds caching to discovery

* Update behaviour

* RPC handler to stable futures

* Update RPC to master libp2p

* Network service additions

* Fix the fallback transport construction (#1102)

* Correct warning

* Remove hashmap delay

* Compiling version of eth2-libp2p

* Update all crates versions

* Fix conversion function and add tests (#1113)

* Port validator_client to stable futures (#1114)

* Add PH & MS slot clock changes

* Account for genesis time

* Add progress on duties refactor

* Add simple is_aggregator bool to val subscription

* Start work on attestation_verification.rs

* Add progress on ObservedAttestations

* Progress with ObservedAttestations

* Fix tests

* Add observed attestations to the beacon chain

* Add attestation observation to processing code

* Add progress on attestation verification

* Add first draft of ObservedAttesters

* Add more tests

* Add observed attesters to beacon chain

* Add observers to attestation processing

* Add more attestation verification

* Create ObservedAggregators map

* Remove commented-out code

* Add observed aggregators into chain

* Add progress

* Finish adding features to attestation verification

* Ensure beacon chain compiles

* Link attn verification into chain

* Integrate new attn verification in chain

* Remove old attestation processing code

* Start trying to fix beacon_chain tests

* Split adding into pools into two functions

* Add aggregation to harness

* Get test harness working again

* Adjust the number of aggregators for test harness

* Fix edge-case in harness

* Integrate new attn processing in network

* Fix compile bug in validator_client

* Update validator API endpoints

* Fix aggreagation in test harness

* Fix enum thing

* Fix attestation observation bug:

* Patch failing API tests

* Start adding comments to attestation verification

* Remove unused attestation field

* Unify "is block known" logic

* Update comments

* Supress fork choice errors for network processing

* Add todos

* Tidy

* Add gossip attn tests

* Disallow test harness to produce old attns

* Comment out in-progress tests

* Partially address pruning tests

* Fix failing store test

* Add aggregate tests

* Add comments about which spec conditions we check

* Dont re-aggregate

* Split apart test harness attn production

* Fix compile error in network

* Make progress on commented-out test

* Fix skipping attestation test

* Add fork choice verification tests

* Tidy attn tests, remove dead code

* Remove some accidentally added code

* Fix clippy lint

* Rename test file

* Add block tests, add cheap block proposer check

* Rename block testing file

* Add observed_block_producers

* Tidy

* Switch around block signature verification

* Finish block testing

* Remove gossip from signature tests

* First pass of self review

* Fix deviation in spec

* Update test spec tags

* Start moving over to hashset

* Finish moving observed attesters to hashmap

* Move aggregation pool over to hashmap

* Make fc attn borrow again

* Fix rest_api compile error

* Fix missing comments

* Fix monster test

* Uncomment increasing slots test

* Address remaining comments

* Remove unsafe, use cfg test

* Remove cfg test flag

* Fix dodgy comment

* Revert "Update hashmap hashset to stable futures"

This reverts commit d432378a3c.

* Revert "Adds panic test to hashset delay"

This reverts commit 281502396f.

* Ported attestation_service

* Ported duties_service

* Ported fork_service

* More ports

* Port block_service

* Minor fixes

* VC compiles

* Update TODOS

* Borrow self where possible

* Ignore aggregates that are already known.

* Unify aggregator modulo logic

* Fix typo in logs

* Refactor validator subscription logic

* Avoid reproducing selection proof

* Skip HTTP call if no subscriptions

* Rename DutyAndState -> DutyAndProof

* Tidy logs

* Print root as dbg

* Fix compile errors in tests

* Fix compile error in test

* Re-Fix attestation and duties service

* Minor fixes

Co-authored-by: Paul Hauner <paul@paulhauner.com>

* Network crate update to stable futures

* Port account_manager to stable futures (#1121)

* Port account_manager to stable futures

* Run async fns in tokio environment

* Port rest_api crate to stable futures (#1118)

* Port rest_api lib to stable futures

* Reduce tokio features

* Update notifier to stable futures

* Builder update

* Further updates

* Convert self referential async functions

* stable futures fixes (#1124)

* Fix eth1 update functions

* Fix genesis and client

* Fix beacon node lib

* Return appropriate runtimes from environment

* Fix test rig

* Refactor eth1 service update

* Upgrade simulator to stable futures

* Lighthouse compiles on stable futures

* Remove println debugging statement

* Update libp2p service, start rpc test upgrade

* Update network crate for new libp2p

* Update tokio::codec to futures_codec (#1128)

* Further work towards RPC corrections

* Correct http timeout and network service select

* Use tokio runtime for libp2p

* Revert "Update tokio::codec to futures_codec (#1128)"

This reverts commit e57aea924a.

* Upgrade RPC libp2p tests

* Upgrade secio fallback test

* Upgrade gossipsub examples

* Clean up RPC protocol

* Test fixes (#1133)

* Correct websocket timeout and run on os thread

* Fix network test

* Clean up PR

* Correct tokio tcp move attestation service tests

* Upgrade attestation service tests

* Correct network test

* Correct genesis test

* Test corrections

* Log info when block is received

* Modify logs and update attester service events

* Stable futures: fixes to vc, eth1 and account manager (#1142)

* Add local testnet scripts

* Remove whiteblock script

* Rename local testnet script

* Move spawns onto handle

* Fix VC panic

* Initial fix to block production issue

* Tidy block producer fix

* Tidy further

* Add local testnet clean script

* Run cargo fmt

* Tidy duties service

* Tidy fork service

* Tidy ForkService

* Tidy AttestationService

* Tidy notifier

* Ensure await is not suppressed in eth1

* Ensure await is not suppressed in account_manager

* Use .ok() instead of .unwrap_or(())

* RPC decoding test for proto

* Update discv5 and eth2-libp2p deps

* Fix lcli double runtime issue (#1144)

* Handle stream termination and dialing peer errors

* Correct peer_info variant types

* Remove unnecessary warnings

* Handle subnet unsubscription removal and improve logigng

* Add logs around ping

* Upgrade discv5 and improve logging

* Handle peer connection status for multiple connections

* Improve network service logging

* Improve logging around peer manager

* Upgrade swarm poll centralise peer management

* Identify clients on error

* Fix `remove_peer` in sync (#1150)

* remove_peer removes from all chains

* Remove logs

* Fix early return from loop

* Improved logging, fix panic

* Partially correct tests

* Stable futures: Vc sync (#1149)

* Improve syncing heuristic

* Add comments

* Use safer method for tolerance

* Fix tests

* Stable futures: Fix VC bug, update agg pool, add more metrics (#1151)

* Expose epoch processing summary

* Expose participation metrics to prometheus

* Switch to f64

* Reduce precision

* Change precision

* Expose observed attesters metrics

* Add metrics for agg/unagg attn counts

* Add metrics for gossip rx

* Add metrics for gossip tx

* Adds ignored attns to prom

* Add attestation timing

* Add timer for aggregation pool sig agg

* Add write lock timer for agg pool

* Add more metrics to agg pool

* Change map lock code

* Add extra metric to agg pool

* Change lock handling in agg pool

* Change .write() to .read()

* Add another agg pool timer

* Fix for is_aggregator

* Fix pruning bug

Co-authored-by: pawan <pawandhananjay@gmail.com>
Co-authored-by: Paul Hauner <paul@paulhauner.com>

beacon_node/rest_api/src/validator.rs

@@ -1,13 +1,12 @@
 use crate::helpers::{check_content_type_for_json, publish_beacon_block_to_network};
 use crate::response_builder::ResponseBuilder;
-use crate::{ApiError, ApiResult, BoxFut, NetworkChannel, UrlQuery};
+use crate::{ApiError, ApiResult, NetworkChannel, UrlQuery};
 use beacon_chain::{
     attestation_verification::Error as AttnError, BeaconChain, BeaconChainTypes, BlockError,
     StateSkipConfig,
 };
 use bls::PublicKeyBytes;
 use eth2_libp2p::PubsubMessage;
-use futures::{Future, Stream};
 use hyper::{Body, Request};
 use network::NetworkMessage;
 use rayon::prelude::*;
@@ -23,23 +22,23 @@ use types::{
 /// HTTP Handler to retrieve the duties for a set of validators during a particular epoch. This
 /// method allows for collecting bulk sets of validator duties without risking exceeding the max
 /// URL length with query pairs.
-pub fn post_validator_duties<T: BeaconChainTypes>(
+pub async fn post_validator_duties<T: BeaconChainTypes>(
     req: Request<Body>,
     beacon_chain: Arc<BeaconChain<T>>,
-) -> BoxFut {
+) -> ApiResult {
     let response_builder = ResponseBuilder::new(&req);
 
-    let future = req
-        .into_body()
-        .concat2()
-        .map_err(|e| ApiError::ServerError(format!("Unable to get request body: {:?}", e)))
-        .and_then(|chunks| {
-            serde_json::from_slice::<ValidatorDutiesRequest>(&chunks).map_err(|e| {
-                ApiError::BadRequest(format!(
-                    "Unable to parse JSON into ValidatorDutiesRequest: {:?}",
-                    e
-                ))
-            })
+    let body = req.into_body();
+    let chunks = hyper::body::to_bytes(body)
+        .await
+        .map_err(|e| ApiError::ServerError(format!("Unable to get request body: {:?}", e)))?;
+
+    serde_json::from_slice::<ValidatorDutiesRequest>(&chunks)
+        .map_err(|e| {
+            ApiError::BadRequest(format!(
+                "Unable to parse JSON into ValidatorDutiesRequest: {:?}",
+                e
+            ))
         })
         .and_then(|bulk_request| {
             return_validator_duties(
@@ -48,45 +47,42 @@ pub fn post_validator_duties<T: BeaconChainTypes>(
                 bulk_request.pubkeys.into_iter().map(Into::into).collect(),
             )
         })
-        .and_then(|duties| response_builder?.body_no_ssz(&duties));
-
-    Box::new(future)
+        .and_then(|duties| response_builder?.body_no_ssz(&duties))
 }
 
 /// HTTP Handler to retrieve subscriptions for a set of validators. This allows the node to
 /// organise peer discovery and topic subscription for known validators.
-pub fn post_validator_subscriptions<T: BeaconChainTypes>(
+pub async fn post_validator_subscriptions<T: BeaconChainTypes>(
     req: Request<Body>,
-    mut network_chan: NetworkChannel<T::EthSpec>,
-) -> BoxFut {
+    network_chan: NetworkChannel<T::EthSpec>,
+) -> ApiResult {
     try_future!(check_content_type_for_json(&req));
     let response_builder = ResponseBuilder::new(&req);
 
     let body = req.into_body();
-    Box::new(
-        body.concat2()
-            .map_err(|e| ApiError::ServerError(format!("Unable to get request body: {:?}", e)))
-            .and_then(|chunks| {
-                serde_json::from_slice(&chunks).map_err(|e| {
-                    ApiError::BadRequest(format!(
-                        "Unable to parse JSON into ValidatorSubscriptions: {:?}",
+    let chunks = hyper::body::to_bytes(body)
+        .await
+        .map_err(|e| ApiError::ServerError(format!("Unable to get request body: {:?}", e)))?;
+
+    serde_json::from_slice(&chunks)
+        .map_err(|e| {
+            ApiError::BadRequest(format!(
+                "Unable to parse JSON into ValidatorSubscriptions: {:?}",
+                e
+            ))
+        })
+        .and_then(move |subscriptions: Vec<ValidatorSubscription>| {
+            network_chan
+                .send(NetworkMessage::Subscribe { subscriptions })
+                .map_err(|e| {
+                    ApiError::ServerError(format!(
+                        "Unable to subscriptions to the network: {:?}",
                         e
                     ))
-                })
-            })
-            .and_then(move |subscriptions: Vec<ValidatorSubscription>| {
-                network_chan
-                    .try_send(NetworkMessage::Subscribe { subscriptions })
-                    .map_err(|e| {
-                        ApiError::ServerError(format!(
-                            "Unable to subscriptions to the network: {:?}",
-                            e
-                        ))
-                    })?;
-                Ok(())
-            })
-            .and_then(|_| response_builder?.body_no_ssz(&())),
-    )
+                })?;
+            Ok(())
+        })
+        .and_then(|_| response_builder?.body_no_ssz(&()))
 }
 
 /// HTTP Handler to retrieve all validator duties for the given epoch.
@@ -291,24 +287,23 @@ pub fn get_new_beacon_block<T: BeaconChainTypes>(
 }
 
 /// HTTP Handler to publish a SignedBeaconBlock, which has been signed by a validator.
-pub fn publish_beacon_block<T: BeaconChainTypes>(
+pub async fn publish_beacon_block<T: BeaconChainTypes>(
     req: Request<Body>,
     beacon_chain: Arc<BeaconChain<T>>,
     network_chan: NetworkChannel<T::EthSpec>,
     log: Logger,
-) -> BoxFut {
+) -> ApiResult {
     try_future!(check_content_type_for_json(&req));
     let response_builder = ResponseBuilder::new(&req);
 
     let body = req.into_body();
-    Box::new(
-        body.concat2()
-            .map_err(|e| ApiError::ServerError(format!("Unable to get request body: {:?}", e)))
-            .and_then(|chunks| {
-                serde_json::from_slice(&chunks).map_err(|e| {
+    let chunks = hyper::body::to_bytes(body)
+        .await
+        .map_err(|e| ApiError::ServerError(format!("Unable to get request body: {:?}", e)))?;
+
+    serde_json::from_slice(&chunks).map_err(|e| {
                     ApiError::BadRequest(format!("Unable to parse JSON into SignedBeaconBlock: {:?}", e))
                 })
-            })
             .and_then(move |block: SignedBeaconBlock<T::EthSpec>| {
                 let slot = block.slot();
                 match beacon_chain.process_block(block.clone()) {
@@ -382,7 +377,6 @@ pub fn publish_beacon_block<T: BeaconChainTypes>(
                 }
         })
         .and_then(|_| response_builder?.body_no_ssz(&()))
-    )
 }
 
 /// HTTP Handler to produce a new Attestation from the current state, ready to be signed by a validator.
@@ -424,59 +418,56 @@ pub fn get_aggregate_attestation<T: BeaconChainTypes>(
 }
 
 /// HTTP Handler to publish a list of Attestations, which have been signed by a number of validators.
-pub fn publish_attestations<T: BeaconChainTypes>(
+pub async fn publish_attestations<T: BeaconChainTypes>(
     req: Request<Body>,
     beacon_chain: Arc<BeaconChain<T>>,
     network_chan: NetworkChannel<T::EthSpec>,
     log: Logger,
-) -> BoxFut {
+) -> ApiResult {
     try_future!(check_content_type_for_json(&req));
     let response_builder = ResponseBuilder::new(&req);
 
-    Box::new(
-        req.into_body()
-            .concat2()
-            .map_err(|e| ApiError::ServerError(format!("Unable to get request body: {:?}", e)))
-            .map(|chunk| chunk.iter().cloned().collect::<Vec<u8>>())
-            .and_then(|chunks| {
-                serde_json::from_slice(&chunks.as_slice()).map_err(|e| {
-                    ApiError::BadRequest(format!(
-                        "Unable to deserialize JSON into a list of attestations: {:?}",
-                        e
-                    ))
+    let body = req.into_body();
+    let chunk = hyper::body::to_bytes(body)
+        .await
+        .map_err(|e| ApiError::ServerError(format!("Unable to get request body: {:?}", e)))?;
+
+    let chunks = chunk.iter().cloned().collect::<Vec<u8>>();
+    serde_json::from_slice(&chunks.as_slice())
+        .map_err(|e| {
+            ApiError::BadRequest(format!(
+                "Unable to deserialize JSON into a list of attestations: {:?}",
+                e
+            ))
+        })
+        // Process all of the aggregates _without_ exiting early if one fails.
+        .map(move |attestations: Vec<Attestation<T::EthSpec>>| {
+            attestations
+                .into_par_iter()
+                .enumerate()
+                .map(|(i, attestation)| {
+                    process_unaggregated_attestation(
+                        &beacon_chain,
+                        network_chan.clone(),
+                        attestation,
+                        i,
+                        &log,
+                    )
                 })
-            })
-            // Process all of the aggregates _without_ exiting early if one fails.
-            .map(move |attestations: Vec<Attestation<T::EthSpec>>| {
-                attestations
-                    .into_par_iter()
-                    .enumerate()
-                    .map(|(i, attestation)| {
-                        process_unaggregated_attestation(
-                            &beacon_chain,
-                            network_chan.clone(),
-                            attestation,
-                            i,
-                            &log,
-                        )
-                    })
-                    .collect::<Vec<Result<_, _>>>()
-            })
-            // Iterate through all the results and return on the first `Err`.
-            //
-            // Note: this will only provide info about the _first_ failure, not all failures.
-            .and_then(|processing_results| {
-                processing_results.into_iter().try_for_each(|result| result)
-            })
-            .and_then(|_| response_builder?.body_no_ssz(&())),
-    )
+                .collect::<Vec<Result<_, _>>>()
+        })
+        // Iterate through all the results and return on the first `Err`.
+        //
+        // Note: this will only provide info about the _first_ failure, not all failures.
+        .and_then(|processing_results| processing_results.into_iter().try_for_each(|result| result))
+        .and_then(|_| response_builder?.body_no_ssz(&()))
 }
 
 /// Processes an unaggregrated attestation that was included in a list of attestations with the
 /// index `i`.
 fn process_unaggregated_attestation<T: BeaconChainTypes>(
     beacon_chain: &BeaconChain<T>,
-    mut network_chan: NetworkChannel<T::EthSpec>,
+    network_chan: NetworkChannel<T::EthSpec>,
     attestation: Attestation<T::EthSpec>,
     i: usize,
     log: &Logger,
@@ -496,7 +487,7 @@ fn process_unaggregated_attestation<T: BeaconChainTypes>(
         })?;
 
     // Publish the attestation to the network
-    if let Err(e) = network_chan.try_send(NetworkMessage::Publish {
+    if let Err(e) = network_chan.send(NetworkMessage::Publish {
         messages: vec![PubsubMessage::Attestation(Box::new((
             attestation
                 .subnet_id(&beacon_chain.spec)
@@ -542,61 +533,56 @@ fn process_unaggregated_attestation<T: BeaconChainTypes>(
 }
 
 /// HTTP Handler to publish an Attestation, which has been signed by a validator.
-pub fn publish_aggregate_and_proofs<T: BeaconChainTypes>(
+pub async fn publish_aggregate_and_proofs<T: BeaconChainTypes>(
     req: Request<Body>,
     beacon_chain: Arc<BeaconChain<T>>,
     network_chan: NetworkChannel<T::EthSpec>,
     log: Logger,
-) -> BoxFut {
+) -> ApiResult {
     try_future!(check_content_type_for_json(&req));
     let response_builder = ResponseBuilder::new(&req);
-
-    Box::new(
-        req.into_body()
-            .concat2()
-            .map_err(|e| ApiError::ServerError(format!("Unable to get request body: {:?}", e)))
-            .map(|chunk| chunk.iter().cloned().collect::<Vec<u8>>())
-            .and_then(|chunks| {
-                serde_json::from_slice(&chunks.as_slice()).map_err(|e| {
-                    ApiError::BadRequest(format!(
-                        "Unable to deserialize JSON into a list of SignedAggregateAndProof: {:?}",
-                        e
-                    ))
-                })
-            })
-            // Process all of the aggregates _without_ exiting early if one fails.
-            .map(
-                move |signed_aggregates: Vec<SignedAggregateAndProof<T::EthSpec>>| {
-                    signed_aggregates
-                        .into_par_iter()
-                        .enumerate()
-                        .map(|(i, signed_aggregate)| {
-                            process_aggregated_attestation(
-                                &beacon_chain,
-                                network_chan.clone(),
-                                signed_aggregate,
-                                i,
-                                &log,
-                            )
-                        })
-                        .collect::<Vec<Result<_, _>>>()
-                },
-            )
-            // Iterate through all the results and return on the first `Err`.
-            //
-            // Note: this will only provide info about the _first_ failure, not all failures.
-            .and_then(|processing_results| {
-                processing_results.into_iter().try_for_each(|result| result)
-            })
-            .and_then(|_| response_builder?.body_no_ssz(&())),
-    )
+    let body = req.into_body();
+    let chunk = hyper::body::to_bytes(body)
+        .await
+        .map_err(|e| ApiError::ServerError(format!("Unable to get request body: {:?}", e)))?;
+    let chunks = chunk.iter().cloned().collect::<Vec<u8>>();
+    serde_json::from_slice(&chunks.as_slice())
+        .map_err(|e| {
+            ApiError::BadRequest(format!(
+                "Unable to deserialize JSON into a list of SignedAggregateAndProof: {:?}",
+                e
+            ))
+        })
+        // Process all of the aggregates _without_ exiting early if one fails.
+        .map(
+            move |signed_aggregates: Vec<SignedAggregateAndProof<T::EthSpec>>| {
+                signed_aggregates
+                    .into_par_iter()
+                    .enumerate()
+                    .map(|(i, signed_aggregate)| {
+                        process_aggregated_attestation(
+                            &beacon_chain,
+                            network_chan.clone(),
+                            signed_aggregate,
+                            i,
+                            &log,
+                        )
+                    })
+                    .collect::<Vec<Result<_, _>>>()
+            },
+        )
+        // Iterate through all the results and return on the first `Err`.
+        //
+        // Note: this will only provide info about the _first_ failure, not all failures.
+        .and_then(|processing_results| processing_results.into_iter().try_for_each(|result| result))
+        .and_then(|_| response_builder?.body_no_ssz(&()))
 }
 
 /// Processes an aggregrated attestation that was included in a list of attestations with the index
 /// `i`.
 fn process_aggregated_attestation<T: BeaconChainTypes>(
     beacon_chain: &BeaconChain<T>,
-    mut network_chan: NetworkChannel<T::EthSpec>,
+    network_chan: NetworkChannel<T::EthSpec>,
     signed_aggregate: SignedAggregateAndProof<T::EthSpec>,
     i: usize,
     log: &Logger,
@@ -643,7 +629,7 @@ fn process_aggregated_attestation<T: BeaconChainTypes>(
         };
 
     // Publish the attestation to the network
-    if let Err(e) = network_chan.try_send(NetworkMessage::Publish {
+    if let Err(e) = network_chan.send(NetworkMessage::Publish {
         messages: vec![PubsubMessage::AggregateAndProofAttestation(Box::new(
             signed_aggregate,
         ))],