oxen-io
/
oxen-core
mirror of https://github.com/oxen-io/oxen-core.git
2
1
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1447 from darcys22/version-bump-9.1.0 

Version bump 9.1.0
This commit is contained in:
Jason Rhinelander 2021-04-22 03:13:35 -03:00 committed by GitHub
parent b72a6b4f6e c07b713cd5
commit 422d82e205
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -51,7 +51,7 @@ message(STATUS "CMake version ${CMAKE_VERSION}")
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.12 CACHE STRING "macOS deployment target (Apple clang only)")
project(oxen
VERSION 9.0.0
VERSION 9.1.0
LANGUAGES CXX C)
set(OXEN_RELEASE_CODENAME "Salty Saga")

3
src/cryptonote_basic/hardfork.cpp
View File

@ -74,7 +74,8 @@ static constexpr HardFork::Params mainnet_hard_forks[] =
{ network_version_14_blink, 442333, 0, 1578528000 }, // 2020-01-09 00:00UTC
{ network_version_15_ons, 496969, 0, 1585105200 }, // 2020-03-25 14:00AEDT (03:00UTC)
{ network_version_16_pulse, 641111, 0, 1602464400 }, // 2020-10-12 12:00AEDT (01:00UTC)
{ network_version_17, 641111 + BLOCKS_EXPECTED_IN_DAYS(180), 0, 1602464400 + 180*24*60*60 }, // HF16 + 180 days
{ network_version_17, 770711, 0, 1618016400 }, // Saturday, April 10, 2021 1:00:00 UTC
{ network_version_18, 785000, 0, 1619736143 }, // Thursday, April 29, 2021 22:42:23 UTC
};
static constexpr HardFork::Params testnet_hard_forks[] =

2
src/cryptonote_core/cryptonote_core.cpp
View File

@ -1661,7 +1661,7 @@ namespace cryptonote
crypto::public_key pubkey = m_service_node_list.get_random_pubkey();
crypto::x25519_public_key x_pkey{0};
constexpr std::array<uint16_t, 3> MIN_TIMESTAMP_VERSION{9,0,0};
constexpr std::array<uint16_t, 3> MIN_TIMESTAMP_VERSION{9,1,0};
std::array<uint16_t,3> proofversion;
m_service_node_list.access_proof(pubkey, [&](auto &proof) {
x_pkey = proof.pubkey_x25519;

2
src/cryptonote_core/service_node_quorum_cop.cpp
View File

@ -96,7 +96,7 @@ namespace service_nodes
service_nodes::participation_history<service_nodes::timestamp_participation_entry> timestamp_participation{};
service_nodes::participation_history<service_nodes::timesync_entry> timesync_status{};
constexpr std::array<uint16_t, 3> MIN_TIMESTAMP_VERSION{9,0,0};
constexpr std::array<uint16_t, 3> MIN_TIMESTAMP_VERSION{9,1,0};
bool check_timestamp_obligation = false;
m_core.get_service_node_list().access_proof(pubkey, [&](const proof_info &proof) {

6
src/cryptonote_core/service_node_rules.h
View File

@ -211,8 +211,8 @@ namespace service_nodes {
// blocks out of sync and sending something that it thinks is legit.
constexpr uint64_t VOTE_OR_TX_VERIFY_HEIGHT_BUFFER = 5;
constexpr std::array<uint16_t, 3> MIN_STORAGE_SERVER_VERSION{{2, 0, 9}};
constexpr std::array<uint16_t, 3> MIN_LOKINET_VERSION{{0, 8, 0}};
constexpr std::array<uint16_t, 3> MIN_STORAGE_SERVER_VERSION{{2, 1, 0}};
constexpr std::array<uint16_t, 3> MIN_LOKINET_VERSION{{0, 9, 0}};
// The minimum accepted version number, broadcasted by Service Nodes via uptime proofs for each hardfork
struct proof_version
@ -222,7 +222,7 @@ namespace service_nodes {
};
constexpr proof_version MIN_UPTIME_PROOF_VERSIONS[] = {
{cryptonote::network_version_18, {9,0,0}},
{cryptonote::network_version_18, {9,1,0}},
{cryptonote::network_version_16_pulse, {8,1,0}},
{cryptonote::network_version_15_ons, {7,1,2}},
{cryptonote::network_version_14_blink, {6,1,0}},