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>

lcli/Cargo.toml

@@ -9,23 +9,24 @@ edition = "2018"
 
 [dependencies]
 clap = "2.33.0"
-hex = "0.3"
+hex = "0.4.2"
 log = "0.4.8"
-serde = "1.0.102"
+serde = "1.0.110"
 serde_yaml = "0.8.11"
-simple_logger = "1.3.0"
+simple_logger = "1.6.0"
 types = { path = "../eth2/types" }
 state_processing = { path = "../eth2/state_processing" }
 eth2_ssz = "0.1.2"
-regex = "1.3.1"
+regex = "1.3.7"
 eth1_test_rig = { path = "../tests/eth1_test_rig" }
-futures = "0.1.25"
+futures = { version = "0.3.5", features = ["compat"] }
 environment = { path = "../lighthouse/environment" }
 web3 = "0.10.0"
 eth2_testnet_config = { path = "../eth2/utils/eth2_testnet_config" }
-dirs = "2.0"
+dirs = "2.0.2"
 genesis = { path = "../beacon_node/genesis" }
 deposit_contract = { path = "../eth2/utils/deposit_contract" }
-tree_hash = { path = "../eth2/utils/tree_hash" }
+tree_hash = "0.1.0"
+tokio = { version = "0.2.20", features = ["full"] }
 clap_utils = { path = "../eth2/utils/clap_utils" }
 eth2-libp2p = { path = "../beacon_node/eth2-libp2p" }

lcli/src/deploy_deposit_contract.rs

@@ -5,7 +5,7 @@ use deposit_contract::{
     CONTRACT_DEPLOY_GAS,
 };
 use environment::Environment;
-use futures::{Future, IntoFuture};
+use futures::compat::Future01CompatExt;
 use std::path::PathBuf;
 use types::EthSpec;
 use web3::{
@@ -15,7 +15,7 @@ use web3::{
     Web3,
 };
 
-pub fn run<T: EthSpec>(mut env: Environment<T>, matches: &ArgMatches) -> Result<(), String> {
+pub fn run<T: EthSpec>(mut env: Environment<T>, matches: &ArgMatches<'_>) -> Result<(), String> {
     let eth1_ipc_path: PathBuf = clap_utils::parse_required(matches, "eth1-ipc")?;
     let from_address: Address = clap_utils::parse_required(matches, "from-address")?;
     let confirmations: usize = clap_utils::parse_required(matches, "confirmations")?;
@@ -31,18 +31,20 @@ pub fn run<T: EthSpec>(mut env: Environment<T>, matches: &ArgMatches) -> Result<
         )
     })?;
 
-    // It's unlikely that this will be the _actual_ deployment block, however it'll be close
-    // enough to serve our purposes.
-    //
-    // We only need the deposit block to put a lower bound on the block number we need to search
-    // for deposit logs.
-    let deploy_block = env
-        .runtime()
-        .block_on(web3.eth().block_number())
-        .map_err(|e| format!("Failed to get block number: {}", e))?;
+    env.runtime().block_on(async {
+        // It's unlikely that this will be the _actual_ deployment block, however it'll be close
+        // enough to serve our purposes.
+        //
+        // We only need the deposit block to put a lower bound on the block number we need to search
+        // for deposit logs.
+        let deploy_block = web3
+            .eth()
+            .block_number()
+            .compat()
+            .await
+            .map_err(|e| format!("Failed to get block number: {}", e))?;
 
-    let address = env.runtime().block_on(
-        Contract::deploy(web3.eth(), &ABI)
+        let pending_contract = Contract::deploy(web3.eth(), &ABI)
             .map_err(|e| format!("Unable to build contract deployer: {:?}", e))?
             .confirmations(confirmations)
             .options(Options {
@@ -50,17 +52,17 @@ pub fn run<T: EthSpec>(mut env: Environment<T>, matches: &ArgMatches) -> Result<
                 ..Options::default()
             })
             .execute(bytecode, (), from_address)
-            .into_future()
-            .map_err(|e| format!("Unable to execute deployment: {:?}", e))
-            .and_then(|pending| {
-                pending.map_err(|e| format!("Unable to await pending contract: {:?}", e))
-            })
-            .map(|tx_receipt| tx_receipt.address())
-            .map_err(|e| format!("Failed to execute deployment: {:?}", e)),
-    )?;
+            .map_err(|e| format!("Unable to execute deployment: {:?}", e))?;
 
-    println!("deposit_contract_address: {:?}", address);
-    println!("deposit_contract_deploy_block: {}", deploy_block);
+        let address = pending_contract
+            .compat()
+            .await
+            .map_err(|e| format!("Unable to await pending contract: {:?}", e))?
+            .address();
 
-    Ok(())
+        println!("deposit_contract_address: {:?}", address);
+        println!("deposit_contract_deploy_block: {}", deploy_block);
+
+        Ok(())
+    })
 }

lcli/src/eth1_genesis.rs

@@ -1,7 +1,6 @@
 use clap::ArgMatches;
 use environment::Environment;
 use eth2_testnet_config::Eth2TestnetConfig;
-use futures::Future;
 use genesis::{Eth1Config, Eth1GenesisService};
 use std::path::PathBuf;
 use std::time::Duration;
@@ -10,7 +9,7 @@ use types::EthSpec;
 /// Interval between polling the eth1 node for genesis information.
 pub const ETH1_GENESIS_UPDATE_INTERVAL: Duration = Duration::from_millis(7_000);
 
-pub fn run<T: EthSpec>(mut env: Environment<T>, matches: &ArgMatches) -> Result<(), String> {
+pub fn run<T: EthSpec>(mut env: Environment<T>, matches: &ArgMatches<'_>) -> Result<(), String> {
     let endpoint = matches
         .value_of("eth1-endpoint")
         .ok_or_else(|| "eth1-endpoint not specified")?;
@@ -49,19 +48,19 @@ pub fn run<T: EthSpec>(mut env: Environment<T>, matches: &ArgMatches) -> Result<
 
     let genesis_service = Eth1GenesisService::new(config, env.core_context().log.clone());
 
-    let future = genesis_service
-        .wait_for_genesis_state(ETH1_GENESIS_UPDATE_INTERVAL, spec)
-        .map(move |genesis_state| {
-            eth2_testnet_config.genesis_state = Some(genesis_state);
-            eth2_testnet_config.force_write_to_file(testnet_dir)
-        });
+    env.runtime().block_on(async {
+        let _ = genesis_service
+            .wait_for_genesis_state(ETH1_GENESIS_UPDATE_INTERVAL, spec)
+            .await
+            .map(move |genesis_state| {
+                eth2_testnet_config.genesis_state = Some(genesis_state);
+                eth2_testnet_config.force_write_to_file(testnet_dir)
+            })
+            .map_err(|e| format!("Failed to find genesis: {}", e))?;
 
-    info!("Starting service to produce genesis BeaconState from eth1");
-    info!("Connecting to eth1 http endpoint: {}", endpoint);
+        info!("Starting service to produce genesis BeaconState from eth1");
+        info!("Connecting to eth1 http endpoint: {}", endpoint);
 
-    env.runtime()
-        .block_on(future)
-        .map_err(|e| format!("Failed to find genesis: {}", e))??;
-
-    Ok(())
+        Ok(())
+    })
 }

lcli/src/generate_bootnode_enr.rs

@@ -1,9 +1,8 @@
 use clap::ArgMatches;
 use eth2_libp2p::{
-    discovery::{build_enr, CombinedKey, Keypair, ENR_FILENAME},
+    discovery::{build_enr, CombinedKey, CombinedKeyExt, Keypair, ENR_FILENAME},
     NetworkConfig, NETWORK_KEY_FILENAME,
 };
-use std::convert::TryInto;
 use std::fs;
 use std::fs::File;
 use std::io::Write;
@@ -30,10 +29,7 @@ pub fn run<T: EthSpec>(matches: &ArgMatches) -> Result<(), String> {
     config.enr_tcp_port = Some(tcp_port);
 
     let local_keypair = Keypair::generate_secp256k1();
-    let enr_key: CombinedKey = local_keypair
-        .clone()
-        .try_into()
-        .map_err(|e| format!("Unable to convert keypair: {:?}", e))?;
+    let enr_key = CombinedKey::from_libp2p(&local_keypair)?;
     let enr = build_enr::<T>(&enr_key, &config, EnrForkId::default())
         .map_err(|e| format!("Unable to create ENR: {:?}", e))?;
 

lcli/src/main.rs

@@ -465,7 +465,10 @@ fn main() {
     }
 }
 
-fn run<T: EthSpec>(env_builder: EnvironmentBuilder<T>, matches: &ArgMatches) -> Result<(), String> {
+fn run<T: EthSpec>(
+    env_builder: EnvironmentBuilder<T>,
+    matches: &ArgMatches<'_>,
+) -> Result<(), String> {
     let env = env_builder
         .multi_threaded_tokio_runtime()
         .map_err(|e| format!("should start tokio runtime: {:?}", e))?

lcli/src/refund_deposit_contract.rs

@@ -1,6 +1,6 @@
 use clap::ArgMatches;
 use environment::Environment;
-use futures::Future;
+use futures::compat::Future01CompatExt;
 use std::path::PathBuf;
 use types::EthSpec;
 use web3::{
@@ -12,7 +12,7 @@ use web3::{
 /// `keccak("steal()")[0..4]`
 pub const STEAL_FN_SIGNATURE: &[u8] = &[0xcf, 0x7a, 0x89, 0x65];
 
-pub fn run<T: EthSpec>(mut env: Environment<T>, matches: &ArgMatches) -> Result<(), String> {
+pub fn run<T: EthSpec>(mut env: Environment<T>, matches: &ArgMatches<'_>) -> Result<(), String> {
     let eth1_ipc_path: PathBuf = clap_utils::parse_required(matches, "eth1-ipc")?;
     let from: Address = clap_utils::parse_required(matches, "from-address")?;
     let contract_address: Address = clap_utils::parse_required(matches, "contract-address")?;
@@ -21,8 +21,9 @@ pub fn run<T: EthSpec>(mut env: Environment<T>, matches: &ArgMatches) -> Result<
         Ipc::new(eth1_ipc_path).map_err(|e| format!("Unable to connect to eth1 IPC: {:?}", e))?;
     let web3 = Web3::new(transport);
 
-    env.runtime().block_on(
-        web3.eth()
+    env.runtime().block_on(async {
+        let _ = web3
+            .eth()
             .send_transaction(TransactionRequest {
                 from,
                 to: Some(contract_address),
@@ -33,8 +34,10 @@ pub fn run<T: EthSpec>(mut env: Environment<T>, matches: &ArgMatches) -> Result<
                 nonce: None,
                 condition: None,
             })
-            .map_err(|e| format!("Failed to call deposit fn: {:?}", e)),
-    )?;
+            .compat()
+            .await
+            .map_err(|e| format!("Failed to call steal fn: {:?}", e))?;
 
-    Ok(())
+        Ok(())
+    })
 }