monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-18 00:37:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

db_bdb: fix hard fork keys

Browse source 
Berkeley DB requires RECNO keys to be 32 bits, and forbids a key
value of 0.
This commit is contained in:
moneromooo-monero 2015-10-04 19:00:37 +01:00
parent 1e7fc9c093
commit 791d8cb038
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/blockchain_db/berkeleydb/db_bdb.cpp
View file

@ -1865,7 +1865,7 @@ void BlockchainBDB::set_hard_fork_starting_height(uint8_t version, uint64_t heig
LOG_PRINT_L3("BlockchainBDB::" << __func__); LOG_PRINT_L3("BlockchainBDB::" << __func__);
check_open(); check_open();
Dbt_copy<uint8_t> val_key(version); Dbt_copy<uint32_t> val_key(version + 1);
Dbt_copy<uint64_t> val(height); Dbt_copy<uint64_t> val(height);
if (m_hf_starting_heights->put(DB_DEFAULT_TX, &val_key, &val, 0)) if (m_hf_starting_heights->put(DB_DEFAULT_TX, &val_key, &val, 0))
throw1(DB_ERROR("Error adding hard fork starting height to db transaction.")); throw1(DB_ERROR("Error adding hard fork starting height to db transaction."));
@ -1876,7 +1876,7 @@ uint64_t BlockchainBDB::get_hard_fork_starting_height(uint8_t version) const
LOG_PRINT_L3("BlockchainBDB::" << __func__); LOG_PRINT_L3("BlockchainBDB::" << __func__);
check_open(); check_open();
Dbt_copy<uint8_t> key(version); Dbt_copy<uint32_t> key(version + 1);
Dbt_copy<uint64_t> result; Dbt_copy<uint64_t> result;
auto get_result = m_hf_starting_heights->get(DB_DEFAULT_TX, &key, &result, 0); auto get_result = m_hf_starting_heights->get(DB_DEFAULT_TX, &key, &result, 0);
@ -1893,7 +1893,7 @@ void BlockchainBDB::set_hard_fork_version(uint64_t height, uint8_t version)
LOG_PRINT_L3("BlockchainBDB::" << __func__); LOG_PRINT_L3("BlockchainBDB::" << __func__);
check_open(); check_open();
Dbt_copy<uint64_t> val_key(height); Dbt_copy<uint32_t> val_key(height + 1);
Dbt_copy<uint8_t> val(version); Dbt_copy<uint8_t> val(version);
if (m_hf_versions->put(DB_DEFAULT_TX, &val_key, &val, 0)) if (m_hf_versions->put(DB_DEFAULT_TX, &val_key, &val, 0))
throw1(DB_ERROR("Error adding hard fork version to db transaction.")); throw1(DB_ERROR("Error adding hard fork version to db transaction."));
@ -1904,7 +1904,7 @@ uint8_t BlockchainBDB::get_hard_fork_version(uint64_t height) const
LOG_PRINT_L3("BlockchainBDB::" << __func__); LOG_PRINT_L3("BlockchainBDB::" << __func__);
check_open(); check_open();
Dbt_copy<uint64_t> key(height); Dbt_copy<uint32_t> key(height + 1);
Dbt_copy<uint8_t> result; Dbt_copy<uint8_t> result;
auto get_result = m_hf_versions->get(DB_DEFAULT_TX, &key, &result, 0); auto get_result = m_hf_versions->get(DB_DEFAULT_TX, &key, &result, 0);