diff --git a/src/monero_fork_rules.cpp b/src/monero_fork_rules.cpp index 1db041e..13aa1cf 100644 --- a/src/monero_fork_rules.cpp +++ b/src/monero_fork_rules.cpp @@ -59,7 +59,7 @@ bool monero_fork_rules::lightwallet_hardcoded__use_fork_rules(uint8_t version, i // Protocol / Defaults uint32_t monero_fork_rules::fixed_ringsize() { - return 11; // v8 + return 10; // loki v9 } uint32_t monero_fork_rules::fixed_mixinsize() { diff --git a/src/monero_transfer_utils.cpp b/src/monero_transfer_utils.cpp index e26d51b..e0a8aaa 100644 --- a/src/monero_transfer_utils.cpp +++ b/src/monero_transfer_utils.cpp @@ -82,7 +82,7 @@ bool monero_transfer_utils::is_tx_spendtime_unlocked( // XXX: this needs to be fast, so we'd need to get the starting heights // from the daemon to be correct once voting kicks in uint64_t v2height = nettype == TESTNET ? 624634 : nettype == STAGENET ? (uint64_t)-1/*TODO*/ : 1009827; - uint64_t leeway = block_height < v2height ? CRYPTONOTE_LOCKED_TX_ALLOWED_DELTA_SECONDS_V1 : CRYPTONOTE_LOCKED_TX_ALLOWED_DELTA_SECONDS_V2; + uint64_t leeway = CRYPTONOTE_LOCKED_TX_ALLOWED_DELTA_SECONDS_V2; if(current_time + leeway >= unlock_time) return true; else