Merge latest master in v0.2.0

eth2/utils/remote_beacon_node/src/lib.rs

@@ -15,16 +15,17 @@ use std::marker::PhantomData;
 use std::time::Duration;
 use types::{
     Attestation, AttestationData, AttesterSlashing, BeaconBlock, BeaconState, CommitteeIndex,
-    Epoch, EthSpec, Fork, Hash256, ProposerSlashing, PublicKey, Signature, SignedAggregateAndProof,
-    SignedBeaconBlock, Slot,
+    Epoch, EthSpec, Fork, Hash256, ProposerSlashing, PublicKey, PublicKeyBytes, Signature,
+    SignedAggregateAndProof, SignedBeaconBlock, Slot,
 };
 use url::Url;
 
 pub use operation_pool::PersistedOperationPool;
 pub use proto_array_fork_choice::core::ProtoArray;
 pub use rest_types::{
-    CanonicalHeadResponse, Committee, HeadBeaconBlock, ValidatorDutiesRequest, ValidatorDutyBytes,
-    ValidatorRequest, ValidatorResponse, ValidatorSubscription,
+    CanonicalHeadResponse, Committee, HeadBeaconBlock, IndividualVotesRequest,
+    IndividualVotesResponse, ValidatorDutiesRequest, ValidatorDutyBytes, ValidatorRequest,
+    ValidatorResponse, ValidatorSubscription,
 };
 
 // Setting a long timeout for debug ensures that crypto-heavy operations can still succeed.
@@ -110,6 +111,10 @@ impl<E: EthSpec> HttpClient<E> {
         Advanced(self.clone())
     }
 
+    pub fn consensus(&self) -> Consensus<E> {
+        Consensus(self.clone())
+    }
+
     fn url(&self, path: &str) -> Result<Url, Error> {
         self.url.join(path).map_err(|e| e.into())
     }
@@ -388,6 +393,14 @@ impl<E: EthSpec> Beacon<E> {
             .and_then(move |url| client.json_get(url, vec![]))
     }
 
+    /// Returns the genesis validators root.
+    pub fn get_genesis_validators_root(&self) -> impl Future<Item = Hash256, Error = Error> {
+        let client = self.0.clone();
+        self.url("genesis_validators_root")
+            .into_future()
+            .and_then(move |url| client.json_get(url, vec![]))
+    }
+
     /// Returns the fork at the head of the beacon chain.
     pub fn get_fork(&self) -> impl Future<Item = Fork, Error = Error> {
         let client = self.0.clone();
@@ -674,6 +687,47 @@ impl<E: EthSpec> Advanced<E> {
     }
 }
 
+/// Provides the functions on the `/consensus` endpoint of the node.
+#[derive(Clone)]
+pub struct Consensus<E>(HttpClient<E>);
+
+impl<E: EthSpec> Consensus<E> {
+    fn url(&self, path: &str) -> Result<Url, Error> {
+        self.0
+            .url("consensus/")
+            .and_then(move |url| url.join(path).map_err(Error::from))
+            .map_err(Into::into)
+    }
+
+    /// Gets a `IndividualVote` for each of the given `pubkeys`.
+    pub fn get_individual_votes(
+        &self,
+        epoch: Epoch,
+        pubkeys: Vec<PublicKeyBytes>,
+    ) -> impl Future<Item = IndividualVotesResponse, Error = Error> {
+        let client = self.0.clone();
+        let req_body = IndividualVotesRequest { epoch, pubkeys };
+
+        self.url("individual_votes")
+            .into_future()
+            .and_then(move |url| client.json_post::<_>(url, req_body))
+            .and_then(|response| error_for_status(response).map_err(Error::from))
+            .and_then(|mut success| success.json().map_err(Error::from))
+    }
+
+    /// Gets a `VoteCount` for the given `epoch`.
+    pub fn get_vote_count(
+        &self,
+        epoch: Epoch,
+    ) -> impl Future<Item = IndividualVotesResponse, Error = Error> {
+        let client = self.0.clone();
+        let query_params = vec![("epoch".into(), format!("{}", epoch.as_u64()))];
+        self.url("vote_count")
+            .into_future()
+            .and_then(move |url| client.json_get(url, query_params))
+    }
+}
+
 #[derive(Deserialize)]
 #[serde(bound = "T: EthSpec")]
 pub struct BlockResponse<T: EthSpec> {