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

min version, delay testnet hardfork

This commit is contained in:
Sean Darcy 2020-12-18 16:21:23 +11:00
parent 5b30dea2a4
commit 426ad6b5f3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cryptonote_basic/hardfork.cpp
View File

@ -89,7 +89,7 @@ static constexpr HardFork::Params testnet_hard_forks[] =
{ network_version_14_blink, 174630, 0, 1575075600 }, // 2019-11-30 07:00UTC
{ network_version_15_lns, 244777, 0, 1583940000 }, // 2020-03-11 15:20UTC
{ network_version_16_pulse, 382222, 0, 1600468200 }, // 2020-09-18 22:30UTC
{ network_version_17, 447155 + BLOCKS_EXPECTED_IN_HOURS(2), 0, 1608262440 + 2*60*60 }, // 2020-12-18 05:34UTC
{ network_version_17, 447155 + BLOCKS_EXPECTED_IN_HOURS(4), 0, 1608262440 + 4*60*60 }, // 2020-12-18 05:34UTC
};
static constexpr HardFork::Params devnet_hard_forks[] =

2
src/cryptonote_core/cryptonote_core.cpp
View File

@ -1666,7 +1666,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{8,1,5};
constexpr std::array<uint16_t, 3> MIN_TIMESTAMP_VERSION{9,0,0};
std::array<uint16_t,3> proofversion;
m_service_node_list.access_proof(pubkey, [&](auto &proof) {
x_pkey = proof.pubkey_x25519;