From 963bc09087ecf50d1043e62876a8878dae258385 Mon Sep 17 00:00:00 2001 From: warptangent Date: Sun, 22 Feb 2015 10:31:11 -0800 Subject: [PATCH 1/2] Revert "Bounds error, should fix #27" This reverts commit 6f1c4b4c2c78c930fe30ed648e855a6ce55f7dcd. --- src/cryptonote_core/BlockchainDB_impl/db_lmdb.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cryptonote_core/BlockchainDB_impl/db_lmdb.cpp b/src/cryptonote_core/BlockchainDB_impl/db_lmdb.cpp index ce568151..4fa16b23 100644 --- a/src/cryptonote_core/BlockchainDB_impl/db_lmdb.cpp +++ b/src/cryptonote_core/BlockchainDB_impl/db_lmdb.cpp @@ -1053,7 +1053,7 @@ uint64_t BlockchainLMDB::height() const LOG_PRINT_L3("BlockchainLMDB::" << __func__); check_open(); - return m_height - 1; + return m_height; } From b88ab643ca576b450944b0438ae1f606520204fe Mon Sep 17 00:00:00 2001 From: warptangent Date: Sun, 22 Feb 2015 10:38:23 -0800 Subject: [PATCH 2/2] Fix Blockchain::get_tail_id() to set parameter to last block number instead of height This reflects the behavior of blockchain_storage::get_tail_id(). Fixes #27 so that RPC method getlastblockheader works. --- src/cryptonote_core/blockchain.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index b671fa71..525c7f36 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -463,7 +463,7 @@ crypto::hash Blockchain::get_tail_id(uint64_t& height) const { LOG_PRINT_L3("Blockchain::" << __func__); CRITICAL_REGION_LOCAL(m_blockchain_lock); - height = m_db->height(); + height = m_db->height() - 1; return get_tail_id(); } //------------------------------------------------------------------