Merge pull request #1610

b70ab128 rpc: fix orphan_status when getting blocks (moneromooo-monero)
This commit is contained in:
Riccardo Spagni
2017-01-22 11:48:39 -05:00
5 changed files with 16 additions and 9 deletions
+2 -2
View File
@@ -989,9 +989,9 @@ namespace cryptonote
return m_blockchain_storage.get_block_id_by_height(height);
}
//-----------------------------------------------------------------------------------------------
bool core::get_block_by_hash(const crypto::hash &h, block &blk) const
bool core::get_block_by_hash(const crypto::hash &h, block &blk, bool *orphan) const
{
return m_blockchain_storage.get_block_by_hash(h, blk);
return m_blockchain_storage.get_block_by_hash(h, blk, orphan);
}
//-----------------------------------------------------------------------------------------------
std::string core::print_pool(bool short_format) const