mirror of
https://github.com/monero-project/monero.git
synced 2025-12-09 00:21:28 +09:00
Merge pull request #10025
a8959f2 Daemon RPC: rm high_height_ok field from getblocks.bin (j-berman)
This commit is contained in:
commit
c6524eecd1
@ -729,12 +729,6 @@ namespace cryptonote
|
|||||||
crypto::hash last_block_hash;
|
crypto::hash last_block_hash;
|
||||||
m_core.get_blockchain_top(last_block_height, last_block_hash);
|
m_core.get_blockchain_top(last_block_height, last_block_hash);
|
||||||
|
|
||||||
if (!req.high_height_ok && req.start_height > last_block_height)
|
|
||||||
{
|
|
||||||
res.status = "Failed";
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (req.start_height > last_block_height ||
|
if (req.start_height > last_block_height ||
|
||||||
(!req.block_ids.empty() && last_block_hash == req.block_ids.front()))
|
(!req.block_ids.empty() && last_block_hash == req.block_ids.front()))
|
||||||
{
|
{
|
||||||
|
|||||||
@ -189,7 +189,6 @@ inline const std::string get_rpc_status(const bool trusted_daemon, const std::st
|
|||||||
uint64_t start_height;
|
uint64_t start_height;
|
||||||
bool prune;
|
bool prune;
|
||||||
bool no_miner_tx;
|
bool no_miner_tx;
|
||||||
bool high_height_ok;
|
|
||||||
uint64_t pool_info_since;
|
uint64_t pool_info_since;
|
||||||
uint64_t max_block_count;
|
uint64_t max_block_count;
|
||||||
|
|
||||||
@ -200,7 +199,6 @@ inline const std::string get_rpc_status(const bool trusted_daemon, const std::st
|
|||||||
KV_SERIALIZE(start_height)
|
KV_SERIALIZE(start_height)
|
||||||
KV_SERIALIZE(prune)
|
KV_SERIALIZE(prune)
|
||||||
KV_SERIALIZE_OPT(no_miner_tx, false)
|
KV_SERIALIZE_OPT(no_miner_tx, false)
|
||||||
KV_SERIALIZE_OPT(high_height_ok, false) // default false maintains backwards compatibility for clients that relied on failure on high height
|
|
||||||
KV_SERIALIZE_OPT(pool_info_since, (uint64_t)0)
|
KV_SERIALIZE_OPT(pool_info_since, (uint64_t)0)
|
||||||
KV_SERIALIZE_OPT(max_block_count, (uint64_t)0)
|
KV_SERIALIZE_OPT(max_block_count, (uint64_t)0)
|
||||||
END_KV_SERIALIZE_MAP()
|
END_KV_SERIALIZE_MAP()
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user