Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #613

Browse Source 
30f92f5 Fix hf when import with verify off (Howard Chu)
This commit is contained in:
Riccardo Spagni 2016-01-15 19:42:16 +02:00
commit f6a75a4875
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
6 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/blockchain_db/berkeleydb/db_bdb.cpp
View File

@ -2150,6 +2150,11 @@ uint64_t BlockchainBDB::get_hard_fork_starting_height(uint8_t version) const
return result;
}
void BlockchainBDB::check_hard_fork_info()
{
/* FIXME: Some other time */
}
void BlockchainBDB::set_hard_fork_version(uint64_t height, uint8_t version)
{
LOG_PRINT_L3("BlockchainBDB::" << __func__);

1
src/blockchain_db/berkeleydb/db_bdb.h
View File

@ -375,6 +375,7 @@ private:
virtual uint64_t get_hard_fork_starting_height(uint8_t version) const;
virtual void set_hard_fork_version(uint64_t height, uint8_t version);
virtual uint8_t get_hard_fork_version(uint64_t height) const;
virtual void check_hard_fork_info();
/**
* @brief convert a tx output to a blob for storage

1
src/blockchain_db/blockchain_db.h
View File

@ -502,6 +502,7 @@ public:
virtual uint64_t get_hard_fork_starting_height(uint8_t version) const = 0;
virtual void set_hard_fork_version(uint64_t height, uint8_t version) = 0;
virtual uint8_t get_hard_fork_version(uint64_t height) const = 0;
virtual void check_hard_fork_info() = 0;
virtual bool is_read_only() const = 0;

21
src/blockchain_db/lmdb/db_lmdb.cpp
View File

@ -2434,6 +2434,27 @@ void BlockchainLMDB::get_output_tx_and_index(const uint64_t& amount, const std::
LOG_PRINT_L3("db3: " << db3);
}
void BlockchainLMDB::check_hard_fork_info()
{
LOG_PRINT_L3("BlockchainLMDB::" << __func__);
check_open();
TXN_PREFIX(0);
MDB_stat db_stat1, db_stat2;
if (mdb_stat(*txn_ptr, m_blocks, &db_stat1))
throw0(DB_ERROR("Failed to query m_blocks"));
if (mdb_stat(*txn_ptr, m_hf_versions, &db_stat2))
throw0(DB_ERROR("Failed to query m_hf_starting_heights"));
if (db_stat1.ms_entries != db_stat2.ms_entries)
{
mdb_drop(*txn_ptr, m_hf_starting_heights, 1);
mdb_drop(*txn_ptr, m_hf_versions, 1);
}
TXN_POSTFIX_SUCCESS();
}
void BlockchainLMDB::set_hard_fork_starting_height(uint8_t version, uint64_t height)
{
LOG_PRINT_L3("BlockchainLMDB::" << __func__);

1
src/blockchain_db/lmdb/db_lmdb.h
View File

@ -235,6 +235,7 @@ private:
virtual uint64_t get_hard_fork_starting_height(uint8_t version) const;
virtual void set_hard_fork_version(uint64_t height, uint8_t version);
virtual uint8_t get_hard_fork_version(uint64_t height) const;
virtual void check_hard_fork_info();
/**
* @brief convert a tx output to a blob for storage

1
src/blockchain_utilities/fake_core.h
View File

@ -83,6 +83,7 @@ struct fake_core_lmdb
}
~fake_core_lmdb()
{
m_storage.get_db().check_hard_fork_info();
m_storage.deinit();
}