grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ETC Config change backport (#4056)

Browse Source 
* 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:
Robert Habermeier
2017-01-05 21:16:33 +01:00
committed by Gav Wood
parent da5b506603
commit 81191848d7
8 changed files with 206 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
json/src/spec/ethash.rs
View File

@@ -89,6 +89,13 @@ pub struct EthashParams {
/// See main EthashParams docs.
#[serde(rename="maxCodeSize")]
pub max_code_size: Option<Uint>,
/// See main EthashParams docs.
#[serde(rename="ecip1010PauseTransition")]
pub ecip1010_pause_transition: Option<Uint>,
/// See main EthashParams docs.
#[serde(rename="ecip1010ContinueTransition")]
pub ecip1010_continue_transition: Option<Uint>,
}
/// Ethash engine deserialization.

5
json/src/spec/params.rs
View File

@@ -35,6 +35,10 @@ pub struct Params {
/// Network id.
#[serde(rename="networkID")]
pub network_id: Uint,
/// Chain id.
#[serde(rename="chainID")]
pub chain_id: Option<Uint>,
/// Name of the main ("eth") subprotocol.
#[serde(rename="subprotocolName")]
pub subprotocol_name: Option<String>,
@@ -58,6 +62,7 @@ mod tests {
"homesteadTransition": "0x118c30",
"maximumExtraDataSize": "0x20",
"networkID" : "0x1",
"chainID" : "0x15",
"subprotocolName" : "exp",
"minGasLimit": "0x1388",
"accountStartNonce": "0x00"