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:
parent
2a3b321a34
commit
2b77203526
31140
ethcore/res/ethereum/classic_no_phoenix.json
Normal file
31140
ethcore/res/ethereum/classic_no_phoenix.json
Normal file
File diff suppressed because it is too large
Load Diff
@ -75,6 +75,7 @@ macro_rules! bundle_test_machine {
|
|||||||
bundle_release_spec! {
|
bundle_release_spec! {
|
||||||
"ethereum/callisto" => new_callisto,
|
"ethereum/callisto" => new_callisto,
|
||||||
"ethereum/classic" => new_classic,
|
"ethereum/classic" => new_classic,
|
||||||
|
"ethereum/classic_no_phoenix" => new_classic_no_phoenix,
|
||||||
"ethereum/ellaism" => new_ellaism,
|
"ethereum/ellaism" => new_ellaism,
|
||||||
"ethereum/ethercore" => new_ethercore,
|
"ethereum/ethercore" => new_ethercore,
|
||||||
"ethereum/evancore" => new_evancore,
|
"ethereum/evancore" => new_evancore,
|
||||||
|
@ -300,7 +300,7 @@ usage! {
|
|||||||
|
|
||||||
ARG arg_chain: (String) = "foundation", or |c: &Config| c.parity.as_ref()?.chain.clone(),
|
ARG arg_chain: (String) = "foundation", or |c: &Config| c.parity.as_ref()?.chain.clone(),
|
||||||
"--chain=[CHAIN]",
|
"--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(),
|
ARG arg_keys_path: (String) = "$BASE/keys", or |c: &Config| c.parity.as_ref()?.keys_path.clone(),
|
||||||
"--keys-path=[PATH]",
|
"--keys-path=[PATH]",
|
||||||
|
@ -35,6 +35,7 @@ use crate::configuration;
|
|||||||
pub enum SpecType {
|
pub enum SpecType {
|
||||||
Foundation,
|
Foundation,
|
||||||
Classic,
|
Classic,
|
||||||
|
ClassicNoPhoenix,
|
||||||
Poanet,
|
Poanet,
|
||||||
Xdai,
|
Xdai,
|
||||||
Volta,
|
Volta,
|
||||||
@ -70,6 +71,8 @@ impl str::FromStr for SpecType {
|
|||||||
let spec = match s {
|
let spec = match s {
|
||||||
"eth" | "ethereum" | "foundation" | "mainnet" => SpecType::Foundation,
|
"eth" | "ethereum" | "foundation" | "mainnet" => SpecType::Foundation,
|
||||||
"etc" | "classic" => SpecType::Classic,
|
"etc" | "classic" => SpecType::Classic,
|
||||||
|
"classic-no-phoenix" | "classic-oppose-phoenix" | "classic-oppose-phoenix-fork" =>
|
||||||
|
SpecType::ClassicNoPhoenix,
|
||||||
"poanet" | "poacore" => SpecType::Poanet,
|
"poanet" | "poacore" => SpecType::Poanet,
|
||||||
"xdai" => SpecType::Xdai,
|
"xdai" => SpecType::Xdai,
|
||||||
"volta" => SpecType::Volta,
|
"volta" => SpecType::Volta,
|
||||||
@ -100,6 +103,7 @@ impl fmt::Display for SpecType {
|
|||||||
f.write_str(match *self {
|
f.write_str(match *self {
|
||||||
SpecType::Foundation => "foundation",
|
SpecType::Foundation => "foundation",
|
||||||
SpecType::Classic => "classic",
|
SpecType::Classic => "classic",
|
||||||
|
SpecType::ClassicNoPhoenix => "classic-no-phoenix",
|
||||||
SpecType::Poanet => "poanet",
|
SpecType::Poanet => "poanet",
|
||||||
SpecType::Xdai => "xdai",
|
SpecType::Xdai => "xdai",
|
||||||
SpecType::Volta => "volta",
|
SpecType::Volta => "volta",
|
||||||
@ -130,6 +134,7 @@ impl SpecType {
|
|||||||
match *self {
|
match *self {
|
||||||
SpecType::Foundation => Ok(spec::new_foundation(params)),
|
SpecType::Foundation => Ok(spec::new_foundation(params)),
|
||||||
SpecType::Classic => Ok(spec::new_classic(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::Poanet => Ok(spec::new_poanet(params)),
|
||||||
SpecType::Xdai => Ok(spec::new_xdai(params)),
|
SpecType::Xdai => Ok(spec::new_xdai(params)),
|
||||||
SpecType::Volta => Ok(spec::new_volta(params)),
|
SpecType::Volta => Ok(spec::new_volta(params)),
|
||||||
|
Loading…
Reference in New Issue
Block a user