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

Add support for non-fork side of Phoenix (#11627) 

* Add support for non-fork side of Phoenix

* Change the primary identifier to ClassicNoPhoenix

* Fix precompile config for non-fork side of Phoenix
This commit is contained in:
Wei Tang 2020-04-15 13:04:18 +02:00 committed by GitHub
parent 2a3b321a34
commit 2b77203526
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 31147 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31140
ethcore/res/ethereum/classic_no_phoenix.json Normal file
View File

File diff suppressed because it is too large Load Diff

1
ethcore/spec/src/chain.rs
View File

@ -75,6 +75,7 @@ macro_rules! bundle_test_machine {
bundle_release_spec! {
"ethereum/callisto" => new_callisto,
"ethereum/classic" => new_classic,
"ethereum/classic_no_phoenix" => new_classic_no_phoenix,
"ethereum/ellaism" => new_ellaism,
"ethereum/ethercore" => new_ethercore,
"ethereum/evancore" => new_evancore,

2
parity/cli/mod.rs
View File

@ -300,7 +300,7 @@ usage! {
ARG arg_chain: (String) = "foundation", or |c: &Config| c.parity.as_ref()?.chain.clone(),
"--chain=[CHAIN]",
"Specify the blockchain type. CHAIN may be either a JSON chain specification file or ethereum, classic, poacore, xdai, volta, ewc, musicoin, ellaism, mix, callisto, ethercore, mordor, ropsten, kovan, rinkeby, goerli, kotti, poasokol, testnet, evantestcore, evancore or dev.",
"Specify the blockchain type. CHAIN may be either a JSON chain specification file or ethereum, classic, classic-no-phoenix, poacore, xdai, volta, ewc, musicoin, ellaism, mix, callisto, ethercore, mordor, ropsten, kovan, rinkeby, goerli, kotti, poasokol, testnet, evantestcore, evancore or dev.",
ARG arg_keys_path: (String) = "$BASE/keys", or |c: &Config| c.parity.as_ref()?.keys_path.clone(),
"--keys-path=[PATH]",

5
parity/params.rs
View File

@ -35,6 +35,7 @@ use crate::configuration;
pub enum SpecType {
Foundation,
Classic,
ClassicNoPhoenix,
Poanet,
Xdai,
Volta,
@ -70,6 +71,8 @@ impl str::FromStr for SpecType {
let spec = match s {
"eth" | "ethereum" | "foundation" | "mainnet" => SpecType::Foundation,
"etc" | "classic" => SpecType::Classic,
"classic-no-phoenix" | "classic-oppose-phoenix" | "classic-oppose-phoenix-fork" =>
SpecType::ClassicNoPhoenix,
"poanet" | "poacore" => SpecType::Poanet,
"xdai" => SpecType::Xdai,
"volta" => SpecType::Volta,
@ -100,6 +103,7 @@ impl fmt::Display for SpecType {
f.write_str(match *self {
SpecType::Foundation => "foundation",
SpecType::Classic => "classic",
SpecType::ClassicNoPhoenix => "classic-no-phoenix",
SpecType::Poanet => "poanet",
SpecType::Xdai => "xdai",
SpecType::Volta => "volta",
@ -130,6 +134,7 @@ impl SpecType {
match *self {
SpecType::Foundation => Ok(spec::new_foundation(params)),
SpecType::Classic => Ok(spec::new_classic(params)),
SpecType::ClassicNoPhoenix => Ok(spec::new_classic_no_phoenix(params)),
SpecType::Poanet => Ok(spec::new_poanet(params)),
SpecType::Xdai => Ok(spec::new_xdai(params)),
SpecType::Volta => Ok(spec::new_volta(params)),