Merge branch 'master' into auth-bft

This commit is contained in:
keorn
2016-11-25 10:51:06 +00:00
138 changed files with 5226 additions and 1070 deletions

View File

@@ -47,6 +47,8 @@ pub const INF_PROTOCOL: [u8; 3] = *b"inf";
pub struct SyncConfig {
/// Max blocks to download ahead
pub max_download_ahead_blocks: usize,
/// Enable ancient block download.
pub download_old_blocks: bool,
/// Network ID
pub network_id: usize,
/// Main "eth" subprotocol name.
@@ -61,6 +63,7 @@ impl Default for SyncConfig {
fn default() -> SyncConfig {
SyncConfig {
max_download_ahead_blocks: 20000,
download_old_blocks: true,
network_id: 1,
subprotocol_name: ETH_PROTOCOL,
fork_block: None,