Use SSZ types in rpc (#1244)

* Update `milagro_bls` to new release (#1183)

* Update milagro_bls to new release

Signed-off-by: Kirk Baird <baird.k@outlook.com>

* Tidy up fake cryptos

Signed-off-by: Kirk Baird <baird.k@outlook.com>

* move SecretHash to bls and put plaintext back

Signed-off-by: Kirk Baird <baird.k@outlook.com>

* Update v0.12.0 to v0.12.1

* Use ssz types for Request and error types

* Fix errors

* Constrain BlocksByRangeRequest count to MAX_REQUEST_BLOCKS

* Fix issues after rebasing

* Address review comments

Co-authored-by: Kirk Baird <baird.k@outlook.com>
Co-authored-by: Michael Sproul <michael@sigmaprime.io>
Co-authored-by: Age Manning <Age@AgeManning.com>

beacon_node/network/Cargo.toml

@@ -24,6 +24,7 @@ slot_clock = { path = "../../common/slot_clock" }
 slog = { version = "2.5.2", features = ["max_level_trace"] }
 hex = "0.4.2"
 eth2_ssz = "0.1.2"
+eth2_ssz_types = { path =  "../../consensus/ssz_types" }
 tree_hash = "0.1.0"
 futures = "0.3.5"
 error-chain = "0.12.2"

beacon_node/network/src/router/processor.rs

@@ -322,7 +322,7 @@ impl<T: BeaconChainTypes> Processor<T> {
         &mut self,
         peer_id: PeerId,
         request_id: SubstreamId,
-        req: BlocksByRangeRequest,
+        mut req: BlocksByRangeRequest,
     ) {
         debug!(
             self.log,
@@ -333,6 +333,10 @@ impl<T: BeaconChainTypes> Processor<T> {
             "step" => req.step,
         );
 
+        // Should not send more than max request blocks
+        if req.count > MAX_REQUEST_BLOCKS {
+            req.count = MAX_REQUEST_BLOCKS;
+        }
         if req.step == 0 {
             warn!(self.log,
                 "Peer sent invalid range request";

beacon_node/network/src/sync/manager.rs

@@ -36,16 +36,17 @@
 use super::block_processor::{spawn_block_processor, BatchProcessResult, ProcessId};
 use super::network_context::SyncNetworkContext;
 use super::peer_sync_info::{PeerSyncInfo, PeerSyncType};
-use super::range_sync::{BatchId, ChainId, RangeSync};
+use super::range_sync::{BatchId, ChainId, RangeSync, EPOCHS_PER_BATCH};
 use super::RequestId;
 use crate::service::NetworkMessage;
 use beacon_chain::{BeaconChain, BeaconChainTypes, BlockProcessingOutcome};
-use eth2_libp2p::rpc::BlocksByRootRequest;
+use eth2_libp2p::rpc::{methods::MAX_REQUEST_BLOCKS, BlocksByRootRequest};
 use eth2_libp2p::types::NetworkGlobals;
 use eth2_libp2p::PeerId;
 use fnv::FnvHashMap;
 use slog::{crit, debug, error, info, trace, warn, Logger};
 use smallvec::SmallVec;
+use ssz_types::VariableList;
 use std::boxed::Box;
 use std::ops::Sub;
 use std::sync::Arc;
@@ -188,6 +189,10 @@ pub fn spawn<T: BeaconChainTypes>(
     network_send: mpsc::UnboundedSender<NetworkMessage<T::EthSpec>>,
     log: slog::Logger,
 ) -> mpsc::UnboundedSender<SyncMessage<T::EthSpec>> {
+    assert!(
+        MAX_REQUEST_BLOCKS >= T::EthSpec::slots_per_epoch() * EPOCHS_PER_BATCH,
+        "Max blocks that can be requested in a single batch greater than max allowed blocks in a single request"
+    );
     // generate the message channel
     let (sync_send, sync_recv) = mpsc::unbounded_channel::<SyncMessage<T::EthSpec>>();
 
@@ -489,7 +494,7 @@ impl<T: BeaconChainTypes> SyncManager<T> {
         }
 
         let request = BlocksByRootRequest {
-            block_roots: vec![block_hash],
+            block_roots: VariableList::from(vec![block_hash]),
         };
 
         if let Ok(request_id) = self.network.blocks_by_root_request(peer_id, request) {
@@ -707,7 +712,7 @@ impl<T: BeaconChainTypes> SyncManager<T> {
         };
 
         let request = BlocksByRootRequest {
-            block_roots: vec![parent_hash],
+            block_roots: VariableList::from(vec![parent_hash]),
         };
 
         // We continue to search for the chain of blocks from the same peer. Other peers are not

beacon_node/network/src/sync/range_sync/batch.rs

@@ -3,6 +3,7 @@ use eth2_libp2p::rpc::methods::*;
 use eth2_libp2p::PeerId;
 use fnv::FnvHashMap;
 use ssz::Encode;
+use std::cmp::min;
 use std::cmp::Ordering;
 use std::collections::hash_map::Entry;
 use std::collections::{HashMap, HashSet};
@@ -75,7 +76,7 @@ impl<T: EthSpec> Batch<T> {
     pub fn to_blocks_by_range_request(&self) -> BlocksByRangeRequest {
         BlocksByRangeRequest {
             start_slot: self.start_slot.into(),
-            count: std::cmp::min(
+            count: min(
                 T::slots_per_epoch() * EPOCHS_PER_BATCH,
                 self.end_slot.sub(self.start_slot).into(),
             ),

beacon_node/network/src/sync/range_sync/mod.rs

@@ -9,5 +9,5 @@ mod sync_type;
 
 pub use batch::Batch;
 pub use batch::BatchId;
-pub use chain::ChainId;
+pub use chain::{ChainId, EPOCHS_PER_BATCH};
 pub use range::RangeSync;