diff --git a/src/cryptonote_basic/hardfork.cpp b/src/cryptonote_basic/hardfork.cpp index 11c87c726..04c03854a 100644 --- a/src/cryptonote_basic/hardfork.cpp +++ b/src/cryptonote_basic/hardfork.cpp @@ -50,7 +50,8 @@ static constexpr std::array mainnet_hard_forks = hard_fork{hf::hf18, 1, 839009, 1626217200 /*Tuesday, July 13, 2021 23:00 UTC */ }, // Oxen 9.2: mandatory SS 2.2.0 & lokinet 0.9.5 updates hard_fork{hf::hf19_reward_batching, 0, 1080149, 1655154000 /*Monday, June 13, 2022 21:00 UTC */}, // Oxen 10.1: Service Node Reward Batching hard_fork{hf::hf19_reward_batching, 1, 1090229, 1656363600 /*Monday, June 27, 2022 21:00 UTC */}, // Minor hardfork, upgrades to session. - hard_fork{hf::hf19_reward_batching, 2, 1146479, 1662066000 /*Wednesday, September 14, 2022 0:00 UTC */}, // Oxen 10.2: Unlock fixes, mandatory SS 2.4.0 update + hard_fork{hf::hf19_reward_batching, 2, 1146479, 1663113600 /*Wednesday, September 14, 2022 0:00 UTC */}, // Oxen 10.2: Unlock fixes, mandatory SS 2.4.0 update + hard_fork{hf::hf19_reward_batching, 3, 1253039, 1675900800 /*Thursday, February 9, 2023 0:00 UTC */}, // Oxen 10.3: Mandatory SS 2.5.0 update }; static constexpr std::array testnet_hard_forks = diff --git a/src/cryptonote_core/service_node_rules.h b/src/cryptonote_core/service_node_rules.h index c249455ae..2b7ba84cf 100644 --- a/src/cryptonote_core/service_node_rules.h +++ b/src/cryptonote_core/service_node_rules.h @@ -192,8 +192,8 @@ namespace service_nodes { // blocks out of sync and sending something that it thinks is legit. inline constexpr uint64_t VOTE_OR_TX_VERIFY_HEIGHT_BUFFER = 5; - inline constexpr std::array MIN_STORAGE_SERVER_VERSION{{2, 4, 0}}; - inline constexpr std::array MIN_LOKINET_VERSION{{0, 9, 9}}; + inline constexpr std::array MIN_STORAGE_SERVER_VERSION{{2, 5, 0}}; + inline constexpr std::array MIN_LOKINET_VERSION{{0, 9, 11}}; // The minimum accepted version number, broadcasted by Service Nodes via uptime proofs for each hardfork struct proof_version @@ -205,8 +205,8 @@ namespace service_nodes { }; inline constexpr std::array MIN_UPTIME_PROOF_VERSIONS = { + proof_version{{cryptonote::hf::hf19_reward_batching, 3}, {10,3,0}, {0,9,11}, {2,5,0}}, proof_version{{cryptonote::hf::hf19_reward_batching, 2}, {10,2,0}, {0,9,9}, {2,4,0}}, - proof_version{{cryptonote::hf::hf19_reward_batching, 0}, {10,0,0}, {0,9,9}, {2,3,0}}, }; using swarm_id_t = uint64_t;