ETC Config change backport (#4056)
* delay bomb for Classic (ECIP-1010) (#3179) * delay bomb for classic (ECIP-1010) * formatting fix after core review, rel [e6b5093] * Replay protection for Classic * EIP-155 configuration for Ethereum Classic * EIP-160 configuration for Ethereum Classic * Testnet for Ethereum Classic * revert ETC to correct Network ID * reuse Morden for Classic Testnet * set CHAIN_ID for Classic (#3934) * configurable CHAIN_ID * set CHAIN_ID for Ethereum Classic * prettify classic json Former-commit-id: 6d2f8e31d04d06c8b681075c4dd72b49f2048031
This commit is contained in:
committed by
Gav Wood
parent
da5b506603
commit
81191848d7
@@ -39,6 +39,8 @@ pub struct CommonParams {
|
||||
pub maximum_extra_data_size: usize,
|
||||
/// Network id.
|
||||
pub network_id: u64,
|
||||
/// Chain id.
|
||||
pub chain_id: u64,
|
||||
/// Main subprotocol name.
|
||||
pub subprotocol_name: String,
|
||||
/// Minimum gas limit.
|
||||
@@ -53,6 +55,7 @@ impl From<ethjson::spec::Params> for CommonParams {
|
||||
account_start_nonce: p.account_start_nonce.into(),
|
||||
maximum_extra_data_size: p.maximum_extra_data_size.into(),
|
||||
network_id: p.network_id.into(),
|
||||
chain_id: if let Some(n) = p.chain_id { n.into() } else { p.network_id.into() },
|
||||
subprotocol_name: p.subprotocol_name.unwrap_or_else(|| "eth".to_owned()),
|
||||
min_gas_limit: p.min_gas_limit.into(),
|
||||
fork_block: if let (Some(n), Some(h)) = (p.fork_block, p.fork_hash) { Some((n.into(), h.into())) } else { None },
|
||||
|
||||
Reference in New Issue
Block a user