Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

ETC Config change backport #4056

Merged
merged 4 commits into from
Jan 5, 2017
Merged

ETC Config change backport #4056

merged 4 commits into from
Jan 5, 2017

Conversation

rphmeier
Copy link
Contributor

@rphmeier rphmeier commented Jan 5, 2017

#3179
#3812
#3934

CC @splix -- Everything look OK here? To be included with our 1.4.8 release.

splix and others added 4 commits January 5, 2017 17:47
* delay bomb for classic (ECIP-1010)

* formatting fix after core review, rel [e6b5093]
* 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
* configurable CHAIN_ID

* set CHAIN_ID for Ethereum Classic
@rphmeier rphmeier added A8-backport 🕸 Pull request is already reviewed well in another branch. M4-core ⛓ Core client code / Rust. labels Jan 5, 2017
@splix
Copy link
Contributor

splix commented Jan 5, 2017

@rphmeier yes, looks good. thanks

@gavofyork gavofyork merged commit 6d2f8e3 into beta Jan 5, 2017
@gavofyork gavofyork deleted the etc-conf-backport branch January 5, 2017 20:16
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A8-backport 🕸 Pull request is already reviewed well in another branch. M4-core ⛓ Core client code / Rust.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants