cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Change genesis fork for testnets (#750)

Browse Source 
* Change genesis fork for testnets

* Fix genesis fork in lcli
This commit is contained in:
Paul Hauner 2020-01-06 17:30:08 +11:00 committed by GitHub
parent 2dddbed7ce
commit b0c8b2b700
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
beacon_node/src/config.rs
View File

@ -357,6 +357,13 @@ fn init_new_client<E: EthSpec>(
let spec = &mut eth2_config.spec; let spec = &mut eth2_config.spec;
// For now, assume that all networks will use the lighthouse genesis fork.
spec.genesis_fork = Fork {
previous_version: [0, 0, 0, 0],
current_version: [1, 3, 3, 7],
epoch: Epoch::new(0),
};
client_config.eth1.deposit_contract_address = client_config.eth1.deposit_contract_address =
format!("{:?}", eth2_testnet_config.deposit_contract_address()?); format!("{:?}", eth2_testnet_config.deposit_contract_address()?);
client_config.eth1.deposit_contract_deploy_block = client_config.eth1.deposit_contract_deploy_block =

8
lcli/src/deploy_deposit_contract.rs
View File

@ -5,7 +5,7 @@ use eth2_testnet_config::Eth2TestnetConfig;
use std::fs::File; use std::fs::File;
use std::io::Read; use std::io::Read;
use std::path::PathBuf; use std::path::PathBuf;
use types::{ChainSpec, EthSpec, YamlConfig}; use types::{ChainSpec, Epoch, EthSpec, Fork, YamlConfig};
use web3::{transports::Http, Web3}; use web3::{transports::Http, Web3};
pub const SECONDS_PER_ETH1_BLOCK: u64 = 15; pub const SECONDS_PER_ETH1_BLOCK: u64 = 15;
@ -130,6 +130,12 @@ pub fn lighthouse_testnet_spec(mut spec: ChainSpec) -> ChainSpec {
// With a follow distance of 16, this is 40mins. // With a follow distance of 16, this is 40mins.
spec.seconds_per_day = SECONDS_PER_ETH1_BLOCK * spec.eth1_follow_distance * 2 * 5; spec.seconds_per_day = SECONDS_PER_ETH1_BLOCK * spec.eth1_follow_distance * 2 * 5;
spec.genesis_fork = Fork {
previous_version: [0, 0, 0, 0],
current_version: [1, 3, 3, 7],
epoch: Epoch::new(0),
};
spec spec
} }

10
lcli/src/eth1_genesis.rs
View File

@ -5,7 +5,7 @@ use futures::Future;
use genesis::{Eth1Config, Eth1GenesisService}; use genesis::{Eth1Config, Eth1GenesisService};
use std::path::PathBuf; use std::path::PathBuf;
use std::time::Duration; use std::time::Duration;
use types::EthSpec; use types::{Epoch, EthSpec, Fork};
/// Interval between polling the eth1 node for genesis information. /// Interval between polling the eth1 node for genesis information.
pub const ETH1_GENESIS_UPDATE_INTERVAL: Duration = Duration::from_millis(7_000); pub const ETH1_GENESIS_UPDATE_INTERVAL: Duration = Duration::from_millis(7_000);
@ -28,7 +28,7 @@ pub fn run<T: EthSpec>(mut env: Environment<T>, matches: &ArgMatches) -> Result<
let mut eth2_testnet_config: Eth2TestnetConfig<T> = let mut eth2_testnet_config: Eth2TestnetConfig<T> =
Eth2TestnetConfig::load(testnet_dir.clone())?; Eth2TestnetConfig::load(testnet_dir.clone())?;
let spec = eth2_testnet_config let mut spec = eth2_testnet_config
.yaml_config .yaml_config
.as_ref() .as_ref()
.ok_or_else(|| "The testnet directory must contain a spec config".to_string())? .ok_or_else(|| "The testnet directory must contain a spec config".to_string())?
@ -40,6 +40,12 @@ pub fn run<T: EthSpec>(mut env: Environment<T>, matches: &ArgMatches) -> Result<
) )
})?; })?;
spec.genesis_fork = Fork {
previous_version: [0, 0, 0, 0],
current_version: [1, 3, 3, 7],
epoch: Epoch::new(0),
};
let mut config = Eth1Config::default(); let mut config = Eth1Config::default();
config.endpoint = endpoint.to_string(); config.endpoint = endpoint.to_string();
config.deposit_contract_address = eth2_testnet_config.deposit_contract_address.clone(); config.deposit_contract_address = eth2_testnet_config.deposit_contract_address.clone();