diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-10-06 10:50:20 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-10-06 10:50:26 +0200 |
| commit | 2ce54a0d3e45f14f2c2ea2aa0031d05183e72d64 (patch) | |
| tree | 63d49cc7e9f8edef4633d84b0885846e613dc7a1 /src/blockchain_db/berkeleydb/db_bdb.cpp | |
| parent | ad1c3a715b0e94ae449c619195288af39e8fd81b (diff) | |
| parent | 180bcde866cb74fe1e86c16e1357a2e4eae14ee5 (diff) | |
| download | monzero-core-2ce54a0d3e45f14f2c2ea2aa0031d05183e72d64.tar.gz monzero-core-2ce54a0d3e45f14f2c2ea2aa0031d05183e72d64.tar.xz monzero-core-2ce54a0d3e45f14f2c2ea2aa0031d05183e72d64.zip | |
Merge pull request #415
180bcde build: default to Berkeley DB for 32 bit and ARM (moneromooo-monero)
791d8cb db_bdb: fix hard fork keys (moneromooo-monero)
Diffstat (limited to 'src/blockchain_db/berkeleydb/db_bdb.cpp')
| -rw-r--r-- | src/blockchain_db/berkeleydb/db_bdb.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/blockchain_db/berkeleydb/db_bdb.cpp b/src/blockchain_db/berkeleydb/db_bdb.cpp index 2a9e9a7f8..bd579ed38 100644 --- a/src/blockchain_db/berkeleydb/db_bdb.cpp +++ b/src/blockchain_db/berkeleydb/db_bdb.cpp @@ -1865,7 +1865,7 @@ void BlockchainBDB::set_hard_fork_starting_height(uint8_t version, uint64_t heig LOG_PRINT_L3("BlockchainBDB::" << __func__); check_open(); - Dbt_copy<uint8_t> val_key(version); + Dbt_copy<uint32_t> val_key(version + 1); Dbt_copy<uint64_t> val(height); 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.")); @@ -1876,7 +1876,7 @@ uint64_t BlockchainBDB::get_hard_fork_starting_height(uint8_t version) const LOG_PRINT_L3("BlockchainBDB::" << __func__); check_open(); - Dbt_copy<uint8_t> key(version); + Dbt_copy<uint32_t> key(version + 1); Dbt_copy<uint64_t> result; 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__); check_open(); - Dbt_copy<uint64_t> val_key(height); + Dbt_copy<uint32_t> val_key(height + 1); Dbt_copy<uint8_t> val(version); if (m_hf_versions->put(DB_DEFAULT_TX, &val_key, &val, 0)) 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__); check_open(); - Dbt_copy<uint64_t> key(height); + Dbt_copy<uint32_t> key(height + 1); Dbt_copy<uint8_t> result; auto get_result = m_hf_versions->get(DB_DEFAULT_TX, &key, &result, 0); |