From 60a827b3cd442d59eb1001834649262b8a7dd4aa Mon Sep 17 00:00:00 2001 From: sowle Date: Sun, 17 Mar 2024 00:50:21 +0100 Subject: [PATCH] stagenet set up (testing HF4 @ 2550700) --- src/currency_core/blockchain_storage.cpp | 3 +++ src/currency_core/currency_config.h | 25 ++++++++++++++---------- src/currency_core/difficulty.cpp | 2 ++ src/currency_core/pos_mining.cpp | 2 +- src/p2p/net_node.inl | 12 ++++++------ 5 files changed, 27 insertions(+), 17 deletions(-) diff --git a/src/currency_core/blockchain_storage.cpp b/src/currency_core/blockchain_storage.cpp index 17ed1fbd..8ec5b403 100644 --- a/src/currency_core/blockchain_storage.cpp +++ b/src/currency_core/blockchain_storage.cpp @@ -5957,6 +5957,9 @@ bool blockchain_storage::validate_pos_block(const block& b, uint64_t split_height )const { + + basic_diff = basic_diff / STAGENET_POS_DIFF_DIVISOR; + bool is_pos = is_pos_block(b); CHECK_AND_ASSERT_MES(is_pos, false, "is_pos_block() returned false validate_pos_block()"); diff --git a/src/currency_core/currency_config.h b/src/currency_core/currency_config.h index 50ca76a8..76d89afc 100644 --- a/src/currency_core/currency_config.h +++ b/src/currency_core/currency_config.h @@ -110,13 +110,14 @@ #ifndef TESTNET -#define P2P_DEFAULT_PORT 11121 -#define RPC_DEFAULT_PORT 11211 +#define P2P_DEFAULT_PORT 11171 +#define RPC_DEFAULT_PORT 11711 #define STRATUM_DEFAULT_PORT 11777 -#define P2P_NETWORK_ID_TESTNET_FLAG 0 +#define P2P_NETWORK_ID_TESTNET_FLAG 7 #define P2P_MAINTAINERS_PUB_KEY "8f138bb73f6d663a3746a542770781a09579a7b84cb4125249e95530824ee607" #define DIFFICULTY_POS_STARTER 1 -#else +#else +static_assert(false, "testnet is not supported"); #define P2P_DEFAULT_PORT (11112 + CURRENCY_FORMATION_VERSION) #define RPC_DEFAULT_PORT 12111 #define STRATUM_DEFAULT_PORT 11888 @@ -190,12 +191,16 @@ -#define CURRENCY_NAME_ABR "ZANO" -#define CURRENCY_NAME_BASE "Zano" -#define CURRENCY_NAME_SHORT_BASE "Zano" +#define CURRENCY_NAME_ABR "ZANO_STAGE" +#define CURRENCY_NAME_BASE "Zano_SN" +#define CURRENCY_NAME_SHORT_BASE "Zano_SN" + +#define STAGENET_POW_DIFF_DIVISOR 10000000 +#define STAGENET_POS_DIFF_DIVISOR 80000 + #ifndef TESTNET -#define CURRENCY_NAME CURRENCY_NAME_BASE -#define CURRENCY_NAME_SHORT CURRENCY_NAME_SHORT_BASE +#define CURRENCY_NAME CURRENCY_NAME_BASE"_stagenet" +#define CURRENCY_NAME_SHORT CURRENCY_NAME_SHORT_BASE"_stagenet" #else #define CURRENCY_NAME CURRENCY_NAME_BASE"_testnet" #define CURRENCY_NAME_SHORT CURRENCY_NAME_SHORT_BASE"_testnet" @@ -267,7 +272,7 @@ #define ZANO_HARDFORK_01_AFTER_HEIGHT 194624 // 2019-09-21 20:25:16 #define ZANO_HARDFORK_02_AFTER_HEIGHT 999999 // 2021-04-05 09:11:45 #define ZANO_HARDFORK_03_AFTER_HEIGHT 1082577 // 2021-06-01 23:28:10 -#define ZANO_HARDFORK_04_AFTER_HEIGHT 2555000 // 2024-03-21 10:16:46 (expected) +#define ZANO_HARDFORK_04_AFTER_HEIGHT 2550700 // 2024-03-18 10:36:37 (STAGENET) #else /////// Zarcanum Testnet ////////////////////////////// #define ZANO_HARDFORK_01_AFTER_HEIGHT 0 diff --git a/src/currency_core/difficulty.cpp b/src/currency_core/difficulty.cpp index b0bdfac0..0c7793b4 100644 --- a/src/currency_core/difficulty.cpp +++ b/src/currency_core/difficulty.cpp @@ -68,6 +68,8 @@ namespace currency { bool check_hash(const crypto::hash &hash_, wide_difficulty_type difficulty) { + difficulty = difficulty / STAGENET_POW_DIFF_DIVISOR; + //revert byte order crypto::hash h = {}; for (size_t i = 0; i != sizeof(h); i++) diff --git a/src/currency_core/pos_mining.cpp b/src/currency_core/pos_mining.cpp index 5bc1d973..6d42d8e1 100644 --- a/src/currency_core/pos_mining.cpp +++ b/src/currency_core/pos_mining.cpp @@ -13,7 +13,7 @@ namespace currency { void pos_mining_context::init(const wide_difficulty_type& pos_diff, const stake_modifier_type& sm, bool is_zarcanum) { - this->basic_diff = pos_diff; + this->basic_diff = pos_diff / STAGENET_POS_DIFF_DIVISOR; this->sk.stake_modifier = sm; this->zarcanum = is_zarcanum; diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl index 22c2e457..70620e6d 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl @@ -314,12 +314,12 @@ namespace nodetool //ADD_HARDCODED_SEED_NODE(std::string("0.0.0.0:") + std::to_string(P2P_DEFAULT_PORT)); ADD_HARDCODED_SEED_NODE("95.217.43.225", P2P_DEFAULT_PORT); ADD_HARDCODED_SEED_NODE("94.130.137.230", P2P_DEFAULT_PORT); - ADD_HARDCODED_SEED_NODE("95.217.42.247", P2P_DEFAULT_PORT); - ADD_HARDCODED_SEED_NODE("94.130.160.115", P2P_DEFAULT_PORT); - ADD_HARDCODED_SEED_NODE("195.201.107.230", P2P_DEFAULT_PORT); - ADD_HARDCODED_SEED_NODE("95.217.46.49", P2P_DEFAULT_PORT); - ADD_HARDCODED_SEED_NODE("159.69.76.144", P2P_DEFAULT_PORT); - ADD_HARDCODED_SEED_NODE("144.76.183.143", P2P_DEFAULT_PORT); + //ADD_HARDCODED_SEED_NODE("95.217.42.247", P2P_DEFAULT_PORT); + //ADD_HARDCODED_SEED_NODE("94.130.160.115", P2P_DEFAULT_PORT); + //ADD_HARDCODED_SEED_NODE("195.201.107.230", P2P_DEFAULT_PORT); + //ADD_HARDCODED_SEED_NODE("95.217.46.49", P2P_DEFAULT_PORT); + //ADD_HARDCODED_SEED_NODE("159.69.76.144", P2P_DEFAULT_PORT); + //ADD_HARDCODED_SEED_NODE("144.76.183.143", P2P_DEFAULT_PORT); #else // TESTNET ADD_HARDCODED_SEED_NODE("95.217.43.225", P2P_DEFAULT_PORT);