From 4cebce5be06a7a0f64ad789a8f498d8f0709489b Mon Sep 17 00:00:00 2001 From: Aron Date: Fri, 9 Oct 2020 14:54:39 -0300 Subject: [PATCH] Prepare floonet step --- core/src/consensus.rs | 2 +- src/bin/epic.rs | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/core/src/consensus.rs b/core/src/consensus.rs index 068e5819..c4c0debe 100644 --- a/core/src/consensus.rs +++ b/core/src/consensus.rs @@ -315,7 +315,7 @@ pub const MAX_BLOCK_WEIGHT: usize = 40_000; pub const MAINNET_FIRST_HARD_FORK: u64 = 700000; /// Floonet first hard fork height -pub const FLOONET_FIRST_HARD_FORK: u64 = 2880; +pub const FLOONET_FIRST_HARD_FORK: u64 = 10080; /// AutomatedTesting and UserTesting first hard fork height. pub const TESTING_FIRST_HARD_FORK: u64 = 6; diff --git a/src/bin/epic.rs b/src/bin/epic.rs index 6bfdc1e6..8d70f5b2 100644 --- a/src/bin/epic.rs +++ b/src/bin/epic.rs @@ -82,13 +82,14 @@ fn real_main() -> i32 { .get_matches(); let node_config; - let chain_type = if args.is_present("floonet") { - global::ChainTypes::Floonet - } else if args.is_present("usernet") { - global::ChainTypes::UserTesting - } else { - global::ChainTypes::Mainnet - }; + let chain_type = global::ChainTypes::Floonet; + // let chain_type = if args.is_present("floonet") { + // global::ChainTypes::Floonet + // } else if args.is_present("usernet") { + // global::ChainTypes::UserTesting + // } else { + // global::ChainTypes::Mainnet + // }; if let ("taxes", Some(taxes_args)) = args.subcommand() { global::set_mining_mode(chain_type.clone()); let generate: u64 = taxes_args