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

Don't enforce lokinet reachability yet 

This makes reachability testing activate at HF19.  We probably want to
come back and update this before HF19, but for now we just check but
don't enforce lokinet reachability.
This commit is contained in:
Jason Rhinelander 2021-06-10 12:19:28 -03:00
parent f5c5f7e9f8
commit c2d6e095b2
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cryptonote_config.h
View File

@ -337,8 +337,9 @@ namespace cryptonote
network_version_14_blink,
network_version_15_ons,
network_version_16_pulse,
network_version_17, // future HF
network_version_18, // future HF
network_version_17,
network_version_18,
network_version_19,
network_version_count,
};

3
src/cryptonote_core/service_node_quorum_cop.cpp
View File

@ -130,7 +130,8 @@ namespace service_nodes
result.storage_server_reachable = false;
}
if (!lokinet_reachable)
// TODO: perhaps come back and make this activate on some "soft fork" height before HF19?
if (!lokinet_reachable && hf_version >= cryptonote::network_version_19)
{
LOG_PRINT_L1("Service Node lokinet is not reachable for node: " << pubkey);
result.lokinet_reachable = false;

4
tests/core_tests/chaingen.cpp
View File

@ -958,13 +958,13 @@ bool oxen_chain_generator::block_begin(oxen_blockchain_entry &entry, oxen_create
constexpr uint64_t num_blocks = cryptonote::get_config(cryptonote::FAKECHAIN).GOVERNANCE_REWARD_INTERVAL_IN_BLOCKS;
uint64_t start_height = height - num_blocks;
static_assert(cryptonote::network_version_count == cryptonote::network_version_18 + 1,
static_assert(cryptonote::network_version_count == cryptonote::network_version_19 + 1,
"The code below needs to be updated to support higher hard fork versions");
if (blk.major_version == cryptonote::network_version_15_ons)
miner_tx_context.batched_governance = FOUNDATION_REWARD_HF15 * num_blocks;
else if (blk.major_version == cryptonote::network_version_16_pulse)
miner_tx_context.batched_governance = (FOUNDATION_REWARD_HF15 + CHAINFLIP_LIQUIDITY_HF16) * num_blocks;
else if (blk.major_version >= cryptonote::network_version_17 && blk.major_version <= cryptonote::network_version_18)
else if (blk.major_version >= cryptonote::network_version_17 && blk.major_version <= cryptonote::network_version_19)
miner_tx_context.batched_governance = FOUNDATION_REWARD_HF17 * num_blocks;
else
{