Merge pull request #5878

f9b3f6e Removed Berkeley DB and db switching logic (JesusRami)

20 files changed, 35 insertions, 3188 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d5bf7af62..beb97bfcf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -357,54 +357,9 @@ endif()
 # memory was the default in Cryptonote before Monero implemented LMDB, it still works but is unnecessary.
 # set(DATABASE memory)
 set(DATABASE lmdb)
-
-if (DEFINED ENV{DATABASE})
-  set(DATABASE $ENV{DATABASE})
-  message(STATUS "DATABASE set: ${DATABASE}")
-else()
-  message(STATUS "Could not find DATABASE in env (not required unless you want to change database type from default: ${DATABASE})")
-endif()
-
-set(BERKELEY_DB_OVERRIDE 0)
-if (DEFINED ENV{BERKELEY_DB})
-  set(BERKELEY_DB_OVERRIDE 1)
-  set(BERKELEY_DB $ENV{BERKELEY_DB})
-elseif()
-  set(BERKELEY_DB 0)
-endif()
-
-if (DATABASE STREQUAL "lmdb")
-  message(STATUS "Using LMDB as default DB type")
-  set(BLOCKCHAIN_DB DB_LMDB)
-  add_definitions("-DDEFAULT_DB_TYPE=\"lmdb\"")
-elseif (DATABASE STREQUAL "berkeleydb")
-  find_package(BerkeleyDB)
-  if(NOT BERKELEY_DB)
-      die("Found BerkeleyDB includes, but could not find BerkeleyDB library. Please make sure you have installed libdb and libdb-dev / libdb++-dev or the equivalent.")
-  else()
-    message(STATUS "Found BerkeleyDB include (db.h) in ${BERKELEY_DB_INCLUDE_DIR}")
-    if(BERKELEY_DB_LIBRARIES)
-      message(STATUS "Found BerkeleyDB shared library")
-      set(BDB_STATIC false CACHE BOOL "BDB Static flag")
-      set(BDB_INCLUDE ${BERKELEY_DB_INCLUDE_DIR} CACHE STRING "BDB include path")
-      set(BDB_LIBRARY ${BERKELEY_DB_LIBRARIES} CACHE STRING "BDB library name")
-      set(BDB_LIBRARY_DIRS "" CACHE STRING "BDB Library dirs")
-      set(BERKELEY_DB 1)
-    else()
-      die("Found BerkeleyDB includes, but could not find BerkeleyDB library. Please make sure you have installed libdb and libdb-dev / libdb++-dev or the equivalent.")
-    endif()
-  endif()
-
-  message(STATUS "Using Berkeley DB as default DB type")
-  add_definitions("-DDEFAULT_DB_TYPE=\"berkeley\"")
-else()
-  die("Invalid database type: ${DATABASE}")
-endif()
-
-if(BERKELEY_DB)
-  add_definitions("-DBERKELEY_DB")
-endif()
-
+message(STATUS "Using LMDB as default DB type")
+set(BLOCKCHAIN_DB DB_LMDB)
+add_definitions("-DDEFAULT_DB_TYPE=\"lmdb\"")
 add_definitions("-DBLOCKCHAIN_DB=${BLOCKCHAIN_DB}")
 
 # Can't install hook in static build on OSX, because OSX linker does not support --wrap
@@ -506,11 +461,6 @@ link_directories(${EASYLOGGING_LIBRARY_DIRS})
 # Final setup for liblmdb
 include_directories(${LMDB_INCLUDE})
 
-# Final setup for Berkeley DB
-if (BERKELEY_DB)
-  include_directories(${BDB_INCLUDE})
-endif()
-
 # Final setup for libunwind
 include_directories(${LIBUNWIND_INCLUDE})
 link_directories(${LIBUNWIND_LIBRARY_DIRS})
diff --git a/cmake/FindBerkeleyDB.cmake b/cmake/FindBerkeleyDB.cmake
deleted file mode 100644
index 916d8f9cc..000000000
--- a/cmake/FindBerkeleyDB.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-# - Try to find Berkeley DB
-# Once done this will define
-#
-#  BERKELEY_DB_FOUND - system has Berkeley DB
-#  BERKELEY_DB_INCLUDE_DIR - the Berkeley DB include directory
-#  BERKELEY_DB_LIBRARIES - Link these to use Berkeley DB
-#  BERKELEY_DB_DEFINITIONS - Compiler switches required for using Berkeley DB
-
-# Copyright (c) 2006, Alexander Dymo, <adymo@kdevelop.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-find_path(BERKELEY_DB_INCLUDE_DIR db_cxx.h
-  /usr/include/db4
-  /usr/local/include/db4
-)
-
-find_library(BERKELEY_DB_LIBRARIES NAMES db_cxx )
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Berkeley "Could not find Berkeley DB >= 4.1" BERKELEY_DB_INCLUDE_DIR BERKELEY_DB_LIBRARIES)
-# show the BERKELEY_DB_INCLUDE_DIR and BERKELEY_DB_LIBRARIES variables only in the advanced view
-mark_as_advanced(BERKELEY_DB_INCLUDE_DIR BERKELEY_DB_LIBRARIES )
-
diff --git a/src/blockchain_db/CMakeLists.txt b/src/blockchain_db/CMakeLists.txt
index db161fa5e..0a21e4920 100644
--- a/src/blockchain_db/CMakeLists.txt
+++ b/src/blockchain_db/CMakeLists.txt
@@ -31,14 +31,6 @@ set(blockchain_db_sources
   lmdb/db_lmdb.cpp
   )
 
-if (BERKELEY_DB)
-  set(blockchain_db_sources
-  ${blockchain_db_sources}
-  berkeleydb/db_bdb.cpp
-  )
-endif()
-
-
 set(blockchain_db_headers)
 
 set(blockchain_db_private_headers
@@ -46,13 +38,6 @@ set(blockchain_db_private_headers
   lmdb/db_lmdb.h
   )
 
-if (BERKELEY_DB)
-  set(blockchain_db_private_headers
-  ${blockchain_db_private_headers}
-  berkeleydb/db_bdb.h
-  )
-endif()
-
 monero_private_headers(blockchain_db
   ${crypto_private_headers})
 monero_add_library(blockchain_db
@@ -65,7 +50,6 @@ target_link_libraries(blockchain_db
     cncrypto
     ringct
     ${LMDB_LIBRARY}
-    ${BDB_LIBRARY}
     ${Boost_FILESYSTEM_LIBRARY}
     ${Boost_THREAD_LIBRARY}
   PRIVATE
diff --git a/src/blockchain_db/berkeleydb/db_bdb.cpp b/src/blockchain_db/berkeleydb/db_bdb.cpp
deleted file mode 100644
index d138a1e7e..000000000
--- a/src/blockchain_db/berkeleydb/db_bdb.cpp
+++ /dev/null
@@ -1,2296 +0,0 @@
-// Copyright (c) 2014-2019, The Monero Project
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification, are
-// permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice, this list of
-//    conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright notice, this list
-//    of conditions and the following disclaimer in the documentation and/or other
-//    materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its contributors may be
-//    used to endorse or promote products derived from this software without specific
-//    prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "db_bdb.h"
-
-#include <boost/filesystem.hpp>
-#include <memory>  // std::unique_ptr
-#include <cstring>  // memcpy
-
-#include "cryptonote_basic/cryptonote_format_utils.h"
-#include "crypto/crypto.h"
-#include "profile_tools.h"
-
-using epee::string_tools::pod_to_hex;
-#define DB_DEFAULT_TX (m_write_txn != nullptr ? *m_write_txn : (DbTxn*) nullptr)
-
-// Increase when the DB changes in a non backward compatible way, and there
-// is no automatic conversion, so that a full resync is needed.
-#define VERSION 0
-
-namespace
-{
-
-template <typename T>
-inline void throw0(const T &e)
-{
-    LOG_PRINT_L0(e.what());
-    throw e;
-}
-
-template <typename T>
-inline void throw1(const T &e)
-{
-    LOG_PRINT_L1(e.what());
-    throw e;
-}
-
-//  cursor needs to be closed when it goes out of scope,
-//  this helps if the function using it throws
-struct bdb_cur
-{
-    bdb_cur(DbTxn* txn, Db* dbi)
-    {
-        if (dbi->cursor(txn, &m_cur, 0))
-            throw0(cryptonote::DB_ERROR("Error opening db cursor"));
-        done = false;
-    }
-
-    ~bdb_cur()
-    {
-        close();
-    }
-
-    operator Dbc*()
-    {
-        return m_cur;
-    }
-    operator Dbc**()
-    {
-        return &m_cur;
-    }
-    Dbc* operator->()
-    {
-        return m_cur;
-    }
-
-    void close()
-    {
-        if (!done)
-        {
-            m_cur->close();
-            done = true;
-        }
-    }
-
-private:
-    Dbc* m_cur;
-    bool done;
-};
-
-const char* const BDB_BLOCKS = "blocks";
-const char* const BDB_BLOCK_TIMESTAMPS = "block_timestamps";
-const char* const BDB_BLOCK_HEIGHTS = "block_heights";
-const char* const BDB_BLOCK_HASHES = "block_hashes";
-const char* const BDB_BLOCK_SIZES = "block_sizes";
-const char* const BDB_BLOCK_DIFFS = "block_diffs";
-const char* const BDB_BLOCK_COINS = "block_coins";
-
-const char* const BDB_TXS = "txs";
-const char* const BDB_TX_UNLOCKS = "tx_unlocks";
-const char* const BDB_TX_HEIGHTS = "tx_heights";
-const char* const BDB_TX_OUTPUTS = "tx_outputs";
-
-const char* const BDB_OUTPUT_TXS = "output_txs";
-const char* const BDB_OUTPUT_INDICES = "output_indices";
-const char* const BDB_OUTPUT_AMOUNTS = "output_amounts";
-const char* const BDB_OUTPUT_KEYS = "output_keys";
-
-const char* const BDB_SPENT_KEYS = "spent_keys";
-
-const char* const BDB_HF_STARTING_HEIGHTS = "hf_starting_heights";
-const char* const BDB_HF_VERSIONS = "hf_versions";
-
-const char* const BDB_PROPERTIES = "properties";
-
-const unsigned int MB = 1024 * 1024;
-// ND: FIXME: db keeps running out of locks when doing full syncs. Possible bug??? Set it to 5K for now.
-const unsigned int DB_MAX_LOCKS = 5000;
-const unsigned int DB_BUFFER_LENGTH = 32 * MB;
-// 256MB cache adjust as necessary using DB_CONFIG
-const unsigned int DB_DEF_CACHESIZE = 256 * MB;
-
-#if defined(BDB_BULK_CAN_THREAD)
-const unsigned int DB_BUFFER_COUNT = tools::get_max_concurrency();
-#else
-const unsigned int DB_BUFFER_COUNT = 1;
-#endif
-
-template<typename T>
-struct Dbt_copy: public Dbt
-{
-    Dbt_copy(const T &t) :
-        t_copy(t)
-    {
-        init();
-    }
-
-    Dbt_copy()
-    {
-        init();
-    }
-
-    void init()
-    {
-        set_data(&t_copy);
-        set_size(sizeof(T));
-        set_ulen(sizeof(T));
-        set_flags(DB_DBT_USERMEM);
-    }
-
-    operator T()
-    {
-        return t_copy;
-    }
-private:
-    T t_copy;
-};
-
-template<>
-struct Dbt_copy<cryptonote::blobdata>: public Dbt
-{
-    Dbt_copy(const cryptonote::blobdata &bd) :
-        m_data(new char[bd.size()])
-    {
-        memcpy(m_data.get(), bd.data(), bd.size());
-        set_data(m_data.get());
-        set_size(bd.size());
-        set_ulen(bd.size());
-        set_flags(DB_DBT_USERMEM);
-    }
-private:
-    std::unique_ptr<char[]> m_data;
-};
-
-template<>
-struct Dbt_copy<const char*>: public Dbt
-{
-    Dbt_copy(const char *s) :
-        m_data(strdup(s))
-    {
-        size_t len = strlen(s) + 1; // include the NUL, makes it easier for compare
-        set_data(m_data.get());
-        set_size(len);
-        set_ulen(len);
-        set_flags(DB_DBT_USERMEM);
-    }
-private:
-    std::unique_ptr<char[]> m_data;
-};
-
-struct Dbt_safe : public Dbt
-{
-    Dbt_safe()
-    {
-        set_data(NULL);
-        set_flags(DB_DBT_MALLOC);
-    }
-    ~Dbt_safe()
-    {
-        void* buf = get_data();
-        if (buf != NULL)
-        {
-            free(buf);
-        }
-    }
-};
-
-} // anonymous namespace
-
-namespace cryptonote
-{
-
-void BlockchainBDB::add_block(const block& blk, size_t block_weight, const difficulty_type& cumulative_difficulty, const uint64_t& coins_generated, const crypto::hash& blk_hash)
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    Dbt_copy<crypto::hash> val_h(blk_hash);
-    if (m_block_heights->exists(DB_DEFAULT_TX, &val_h, 0) == 0)
-        throw1(BLOCK_EXISTS("Attempting to add block that's already in the db"));
-
-    if (m_height > 0)
-    {
-        Dbt_copy<crypto::hash> parent_key(blk.prev_id);
-        Dbt_copy<uint32_t> parent_h;
-        if (m_block_heights->get(DB_DEFAULT_TX, &parent_key, &parent_h, 0))
-        {
-            LOG_PRINT_L3("m_height: " << m_height);
-            LOG_PRINT_L3("parent_key: " << blk.prev_id);
-            throw0(DB_ERROR("Failed to get top block hash to check for new block's parent"));
-        }
-        uint32_t parent_height = parent_h;
-        if (parent_height != m_height)
-            throw0(BLOCK_PARENT_DNE("Top block is not new block's parent"));
-    }
-
-    Dbt_copy<uint32_t> key(m_height + 1);
-
-    Dbt_copy<blobdata> blob(block_to_blob(blk));
-    auto res = m_blocks->put(DB_DEFAULT_TX, &key, &blob, 0);
-    if (res)
-        throw0(DB_ERROR("Failed to add block blob to db transaction."));
-
-    Dbt_copy<size_t> sz(block_weight);
-    if (m_block_sizes->put(DB_DEFAULT_TX, &key, &sz, 0))
-        throw0(DB_ERROR("Failed to add block size to db transaction."));
-
-    Dbt_copy<uint64_t> ts(blk.timestamp);
-    if (m_block_timestamps->put(DB_DEFAULT_TX, &key, &ts, 0))
-        throw0(DB_ERROR("Failed to add block timestamp to db transaction."));
-
-    Dbt_copy<difficulty_type> diff(cumulative_difficulty);
-    if (m_block_diffs->put(DB_DEFAULT_TX, &key, &diff, 0))
-        throw0(DB_ERROR("Failed to add block cumulative difficulty to db transaction."));
-
-    Dbt_copy<uint64_t> coinsgen(coins_generated);
-    if (m_block_coins->put(DB_DEFAULT_TX, &key, &coinsgen, 0))
-        throw0(DB_ERROR("Failed to add block total generated coins to db transaction."));
-
-    if (m_block_heights->put(DB_DEFAULT_TX, &val_h, &key, 0))
-        throw0(DB_ERROR("Failed to add block height by hash to db transaction."));
-
-    if (m_block_hashes->put(DB_DEFAULT_TX, &key, &val_h, 0))
-        throw0(DB_ERROR("Failed to add block hash to db transaction."));
-}
-
-void BlockchainBDB::remove_block()
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    if (m_height == 0)
-        throw0(BLOCK_DNE ("Attempting to remove block from an empty blockchain"));
-
-    Dbt_copy<uint32_t> k(m_height);
-    Dbt_copy<crypto::hash> h;
-    if (m_block_hashes->get(DB_DEFAULT_TX, &k, &h, 0))
-        throw1(BLOCK_DNE("Attempting to remove block that's not in the db"));
-
-    if (m_blocks->del(DB_DEFAULT_TX, &k, 0))
-        throw1(DB_ERROR("Failed to add removal of block to db transaction"));
-
-    if (m_block_sizes->del(DB_DEFAULT_TX, &k, 0))
-        throw1(DB_ERROR("Failed to add removal of block size to db transaction"));
-
-    if (m_block_diffs->del(DB_DEFAULT_TX, &k, 0))
-        throw1(DB_ERROR("Failed to add removal of block cumulative difficulty to db transaction"));
-
-    if (m_block_coins->del(DB_DEFAULT_TX, &k, 0))
-        throw1(DB_ERROR("Failed to add removal of block total generated coins to db transaction"));
-
-    if (m_block_timestamps->del(DB_DEFAULT_TX, &k, 0))
-        throw1(DB_ERROR("Failed to add removal of block timestamp to db transaction"));
-
-    if (m_block_heights->del(DB_DEFAULT_TX, &h, 0))
-        throw1(DB_ERROR("Failed to add removal of block height by hash to db transaction"));
-
-    if (m_block_hashes->del(DB_DEFAULT_TX, &k, 0))
-        throw1(DB_ERROR("Failed to add removal of block hash to db transaction"));
-}
-
-void BlockchainBDB::add_transaction_data(const crypto::hash& blk_hash, const transaction& tx, const crypto::hash& tx_hash, const crypto::hash& tx_prunable_hash)
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    Dbt_copy<crypto::hash> val_h(tx_hash);
-
-    if (m_txs->exists(DB_DEFAULT_TX, &val_h, 0) == 0)
-        throw1(TX_EXISTS("Attempting to add transaction that's already in the db"));
-
-    Dbt_copy<blobdata> blob(tx_to_blob(tx));
-    if (m_txs->put(DB_DEFAULT_TX, &val_h, &blob, 0))
-        throw0(DB_ERROR("Failed to add tx blob to db transaction"));
-
-    Dbt_copy<uint64_t> height(m_height + 1);
-    if (m_tx_heights->put(DB_DEFAULT_TX, &val_h, &height, 0))
-        throw0(DB_ERROR("Failed to add tx block height to db transaction"));
-
-    Dbt_copy<uint64_t> unlock_time(tx.unlock_time);
-    if (m_tx_unlocks->put(DB_DEFAULT_TX, &val_h, &unlock_time, 0))
-        throw0(DB_ERROR("Failed to add tx unlock time to db transaction"));
-}
-
-void BlockchainBDB::remove_transaction_data(const crypto::hash& tx_hash, const transaction& tx)
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    Dbt_copy<crypto::hash> val_h(tx_hash);
-    if (m_txs->exists(DB_DEFAULT_TX, &val_h, 0))
-        throw1(TX_DNE("Attempting to remove transaction that isn't in the db"));
-
-    if (m_txs->del(DB_DEFAULT_TX, &val_h, 0))
-        throw1(DB_ERROR("Failed to add removal of tx to db transaction"));
-    if (m_tx_unlocks->del(DB_DEFAULT_TX, &val_h, 0))
-        throw1(DB_ERROR("Failed to add removal of tx unlock time to db transaction"));
-    if (m_tx_heights->del(DB_DEFAULT_TX, &val_h, 0))
-        throw1(DB_ERROR("Failed to add removal of tx block height to db transaction"));
-
-    remove_tx_outputs(tx_hash, tx);
-
-    auto result = m_tx_outputs->del(DB_DEFAULT_TX, &val_h, 0);
-    if (result == DB_NOTFOUND)
-        LOG_PRINT_L1("tx has no outputs to remove: " << tx_hash);
-    else if (result)
-        throw1(DB_ERROR("Failed to add removal of tx outputs to db transaction"));
-}
-
-void BlockchainBDB::add_output(const crypto::hash& tx_hash, const tx_out& tx_output, const uint64_t& local_index, const uint64_t unlock_time, const rct::key *commitment)
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    Dbt_copy<uint32_t> k(m_num_outputs + 1);
-    Dbt_copy<crypto::hash> v(tx_hash);
-
-    if (m_output_txs->put(DB_DEFAULT_TX, &k, &v, 0))
-        throw0(DB_ERROR("Failed to add output tx hash to db transaction"));
-    if (m_tx_outputs->put(DB_DEFAULT_TX, &v, &k, 0))
-        throw0(DB_ERROR("Failed to add tx output index to db transaction"));
-
-    Dbt_copy<uint64_t> val_local_index(local_index);
-    if (m_output_indices->put(DB_DEFAULT_TX, &k, &val_local_index, 0))
-        throw0(DB_ERROR("Failed to add tx output index to db transaction"));
-
-    Dbt_copy<uint64_t> val_amount(tx_output.amount);
-    if (m_output_amounts->put(DB_DEFAULT_TX, &val_amount, &k, 0))
-        throw0(DB_ERROR("Failed to add output amount to db transaction."));
-
-    if (tx_output.target.type() == typeid(txout_to_key))
-    {
-        output_data_t od;
-        od.pubkey = boost::get < txout_to_key > (tx_output.target).key;
-        od.unlock_time = unlock_time;
-        od.height = m_height;
-
-        Dbt_copy<output_data_t> data(od);
-        if (m_output_keys->put(DB_DEFAULT_TX, &k, &data, 0))
-            throw0(DB_ERROR("Failed to add output pubkey to db transaction"));
-    }
-    else
-    {
-      throw0(DB_ERROR("Wrong output type: expected txout_to_key"));
-    }
-
-    m_num_outputs++;
-}
-
-void BlockchainBDB::remove_tx_outputs(const crypto::hash& tx_hash, const transaction& tx)
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-
-    bdb_cur cur(DB_DEFAULT_TX, m_tx_outputs);
-
-    Dbt_copy<crypto::hash> k(tx_hash);
-    Dbt_copy<uint32_t> v;
-
-    auto result = cur->get(&k, &v, DB_SET);
-    if (result == DB_NOTFOUND)
-    {
-        LOG_PRINT_L2("tx has no outputs, so no global output indices");
-    }
-    else if (result)
-    {
-        throw0(DB_ERROR("DB error attempting to get an output"));
-    }
-    else
-    {
-        result = cur->get(&k, &v, DB_NEXT_NODUP);
-        if (result != 0 && result != DB_NOTFOUND)
-            throw0(DB_ERROR("DB error attempting to get next non-duplicate tx hash"));
-
-        if (result == 0)
-            result = cur->get(&k, &v, DB_PREV);
-        else if (result == DB_NOTFOUND)
-            result = cur->get(&k, &v, DB_LAST);
-
-        db_recno_t num_elems = 0;
-        cur->count(&num_elems, 0);
-
-        // remove in order: from newest to oldest
-        for (uint64_t i = num_elems; i > 0; --i)
-        {
-            const tx_out tx_output = tx.vout[i-1];
-            remove_output(v, tx_output.amount);
-            if (i > 1)
-            {
-                cur->get(&k, &v, DB_PREV_DUP);
-            }
-        }
-    }
-
-    cur.close();
-}
-
-// TODO: probably remove this function
-void BlockchainBDB::remove_output(const tx_out& tx_output)
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__ << " (unused version - does nothing)");
-    return;
-}
-
-void BlockchainBDB::remove_output(const uint64_t& out_index, const uint64_t amount)
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    Dbt_copy<uint32_t> k(out_index);
-
-    auto result = m_output_indices->del(DB_DEFAULT_TX, &k, 0);
-    if (result == DB_NOTFOUND)
-    {
-        LOG_PRINT_L0("Unexpected: global output index not found in m_output_indices");
-    }
-    else if (result)
-    {
-        throw1(DB_ERROR("Error adding removal of output tx index to db transaction"));
-    }
-
-    result = m_output_txs->del(DB_DEFAULT_TX, &k, 0);
-    // if (result != 0 && result != DB_NOTFOUND)
-    //    throw1(DB_ERROR("Error adding removal of output tx hash to db transaction"));
-    if (result == DB_NOTFOUND)
-    {
-        LOG_PRINT_L0("Unexpected: global output index not found in m_output_txs");
-    }
-    else if (result)
-    {
-        throw1(DB_ERROR("Error adding removal of output tx hash to db transaction"));
-    }
-
-    result = m_output_keys->del(DB_DEFAULT_TX, &k, 0);
-    if (result == DB_NOTFOUND)
-    {
-        LOG_PRINT_L0("Unexpected: global output index not found in m_output_keys");
-    }
-    else if (result)
-        throw1(DB_ERROR("Error adding removal of output pubkey to db transaction"));
-
-    remove_amount_output_index(amount, out_index);
-
-    m_num_outputs--;
-}
-
-void BlockchainBDB::remove_amount_output_index(const uint64_t amount, const uint64_t global_output_index)
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    bdb_cur cur(DB_DEFAULT_TX, m_output_amounts);
-
-    Dbt_copy<uint64_t> k(amount);
-    Dbt_copy<uint32_t> v;
-
-    auto result = cur->get(&k, &v, DB_SET);
-    if (result == DB_NOTFOUND)
-        throw1(OUTPUT_DNE("Attempting to get an output index by amount and amount index, but amount not found"));
-    else if (result)
-        throw0(DB_ERROR("DB error attempting to get an output"));
-
-    db_recno_t num_elems = 0;
-    cur->count(&num_elems, 0);
-
-    // workaround for Berkeley DB to start at end of k's duplicate list:
-    // if next key exists:
-    //   - move cursor to start of next key's duplicate list, then move back one
-    //     duplicate element to reach the end of the original key's duplicate
-    //     list.
-    //
-    // else if the next key doesn't exist:
-    //   - that means we're already on the last key.
-    //   - move cursor to last element in the db, which is the last element of
-    //     the desired key's duplicate list.
-
-    result = cur->get(&k, &v, DB_NEXT_NODUP);
-    if (result != 0 && result != DB_NOTFOUND)
-      throw0(DB_ERROR("DB error attempting to get next non-duplicate output amount"));
-
-    if (result == 0)
-      result = cur->get(&k, &v, DB_PREV);
-    else if (result == DB_NOTFOUND)
-      result = cur->get(&k, &v, DB_LAST);
-
-    bool found_index = false;
-    uint64_t amount_output_index = 0;
-    uint64_t goi = 0;
-
-    for (uint64_t i = num_elems; i > 0; --i)
-    {
-      goi = v;
-      if (goi == global_output_index)
-      {
-        amount_output_index = i-1;
-        found_index = true;
-        break;
-      }
-      if (i > 1)
-        cur->get(&k, &v, DB_PREV_DUP);
-    }
-
-    if (found_index)
-    {
-        // found the amount output index
-        // now delete it
-        result = cur->del(0);
-        if (result)
-            throw0(DB_ERROR(std::string("Error deleting amount output index ").append(boost::lexical_cast<std::string>(amount_output_index)).c_str()));
-    }
-    else
-    {
-        // not found
-        throw1(OUTPUT_DNE("Failed to find amount output index"));
-    }
-    cur.close();
-}
-
-void BlockchainBDB::add_spent_key(const crypto::key_image& k_image)
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    Dbt_copy<crypto::key_image> val_key(k_image);
-    if (m_spent_keys->exists(DB_DEFAULT_TX, &val_key, 0) == 0)
-        throw1(KEY_IMAGE_EXISTS("Attempting to add spent key image that's already in the db"));
-
-    Dbt_copy<char> val('\0');
-    if (m_spent_keys->put(DB_DEFAULT_TX, &val_key, &val, 0))
-        throw1(DB_ERROR("Error adding spent key image to db transaction."));
-}
-
-void BlockchainBDB::remove_spent_key(const crypto::key_image& k_image)
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    Dbt_copy<crypto::key_image> k(k_image);
-    auto result = m_spent_keys->del(DB_DEFAULT_TX, &k, 0);
-    if (result != 0 && result != DB_NOTFOUND)
-        throw1(DB_ERROR("Error adding removal of key image to db transaction"));
-}
-
-bool BlockchainBDB::for_all_key_images(std::function<bool(const crypto::key_image&)> f) const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    bdb_cur cur(DB_DEFAULT_TX, m_spent_keys);
-
-    Dbt_copy<crypto::key_image> k;
-    Dbt_copy<char> v;
-    bool ret = true;
-    int result;
-    while ((result = cur->get(&k, &v, DB_NEXT)) == 0)
-    {
-      if (!f(k))
-      {
-        ret = false;
-        break;
-      }
-    }
-    if (result != DB_NOTFOUND)
-      ret = false;
-
-    cur.close();
-    return ret;
-}
-
-bool BlockchainBDB::for_all_blocks(std::function<bool(uint64_t, const crypto::hash&, const cryptonote::block&)> f) const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    bdb_cur cur(DB_DEFAULT_TX, m_blocks);
-
-    Dbt_copy<uint32_t> k;
-    Dbt_safe v;
-    bool ret = true;
-    int result;
-    while ((result = cur->get(&k, &v, DB_NEXT)) == 0)
-    {
-      uint64_t height = k - 1;
-      blobdata bd;
-      bd.assign(reinterpret_cast<char*>(v.get_data()), v.get_size());
-      block b;
-      if (!parse_and_validate_block_from_blob(bd, b))
-          throw0(DB_ERROR("Failed to parse block from blob retrieved from the db"));
-      crypto::hash hash;
-      if (!get_block_hash(b, hash))
-          throw0(DB_ERROR("Failed to get block hash from blob retrieved from the db"));
-      if (!f(height, hash, b))
-      {
-        ret = false;
-        break;
-      }
-    }
-    if (result != DB_NOTFOUND)
-      ret = false;
-
-    cur.close();
-    return ret;
-}
-
-bool BlockchainBDB::for_all_transactions(std::function<bool(const crypto::hash&, const cryptonote::transaction&)> f, bool pruned) const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    bdb_cur cur(DB_DEFAULT_TX, m_txs);
-
-    Dbt_copy<crypto::hash> k;
-    Dbt_safe v;
-    bool ret = true;
-    int result;
-    while ((result = cur->get(&k, &v, DB_NEXT)) == 0)
-    {
-      blobdata bd;
-      bd.assign(reinterpret_cast<char*>(v.get_data()), v.get_size());
-      transaction tx;
-      if (!parse_and_validate_tx_from_blob(bd, tx))
-          throw0(DB_ERROR("Failed to parse tx from blob retrieved from the db"));
-      if (!f(k, tx))
-      {
-        ret = false;
-        break;
-      }
-    }
-    if (result != DB_NOTFOUND)
-      ret = false;
-
-    cur.close();
-    return ret;
-}
-
-bool BlockchainBDB::for_all_outputs(std::function<bool(uint64_t amount, const crypto::hash &tx_hash, size_t tx_idx)> f) const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    bdb_cur cur(DB_DEFAULT_TX, m_output_amounts);
-
-    Dbt_copy<uint64_t> k;
-    Dbt_copy<uint32_t> v;
-    bool ret = true;
-    int result;
-    while ((result = cur->get(&k, &v, DB_NEXT)) == 0)
-    {
-      uint32_t global_index = v - 1;
-      tx_out_index toi = get_output_tx_and_index_from_global(global_index);
-      if (!f(k, toi.first, toi.second))
-      {
-        ret = false;
-        break;
-      }
-    }
-    if (result != DB_NOTFOUND)
-      ret = false;
-
-    cur.close();
-    return ret;
-}
-
-uint64_t BlockchainBDB::get_output_global_index(const uint64_t& amount, const uint64_t& index)
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    std::vector < uint64_t > offsets;
-    std::vector < uint64_t > global_indices;
-    offsets.push_back(index);
-    get_output_global_indices(amount, offsets, global_indices);
-    if (!global_indices.size())
-        throw1(OUTPUT_DNE("Attempting to get an output index by amount and amount index, but amount not found"));
-
-    return global_indices[0];
-}
-
-void BlockchainBDB::check_open() const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    if (!m_open)
-        throw0(DB_ERROR("DB operation attempted on a not-open DB instance"));
-}
-
-BlockchainBDB::~BlockchainBDB()
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-
-    if (m_open)
-    {
-        close();
-    }
-}
-
-BlockchainBDB::BlockchainBDB(bool batch_transactions) :
-        BlockchainDB(),
-        m_buffer(DB_BUFFER_COUNT, DB_BUFFER_LENGTH)
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    // initialize folder to something "safe" just in case
-    // someone accidentally misuses this class...
-    m_folder = "thishsouldnotexistbecauseitisgibberish";
-    m_run_checkpoint = 0;
-    m_batch_transactions = batch_transactions;
-    m_write_txn = nullptr;
-    m_height = 0;
-
-    m_hardfork = nullptr;
-}
-
-void BlockchainBDB::open(const std::string& filename, const int db_flags)
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-
-    if (m_open)
-        throw0(DB_OPEN_FAILURE("Attempted to open db, but it's already open"));
-
-    boost::filesystem::path direc(filename);
-    if (boost::filesystem::exists(direc))
-    {
-        if (!boost::filesystem::is_directory(direc))
-            throw0(DB_OPEN_FAILURE("DB needs a directory path, but a file was passed"));
-    }
-    else
-    {
-        if (!boost::filesystem::create_directories(direc))
-            throw0(DB_OPEN_FAILURE(std::string("Failed to create directory ").append(filename).c_str()));
-    }
-
-    m_folder = filename;
-
-    try
-    {
-
-        //Create BerkeleyDB environment
-        m_env = new DbEnv(0);  // no flags needed for DbEnv
-
-        uint32_t db_env_open_flags = DB_CREATE | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_TXN | DB_RECOVER | DB_THREAD;
-
-        // Set some default values for these parameters.
-        // They can be overridden using the DB_CONFIG file.
-        m_env->set_cachesize(0, DB_DEF_CACHESIZE, 1);
-        m_env->set_lk_max_locks(DB_MAX_LOCKS);
-        m_env->set_lk_max_lockers(DB_MAX_LOCKS);
-        m_env->set_lk_max_objects(DB_MAX_LOCKS);
-
-        #ifndef __OpenBSD__ //OpenBSD's DB package is too old to support this feature
-        if(m_auto_remove_logs)
-          m_env->log_set_config(DB_LOG_AUTO_REMOVE, 1);
-        #endif
-
-        // last parameter left 0, files will be created with default rw access
-        m_env->open(filename.c_str(), db_env_open_flags, 0);
-        m_env->set_flags(db_flags, 1);
-
-        // begin transaction to init dbs
-        bdb_txn_safe txn;
-        m_env->txn_begin(NULL, txn, 0);
-
-        // create Dbs in the environment
-        m_blocks = new Db(m_env, 0);
-        m_block_heights = new Db(m_env, 0);
-        m_block_hashes = new Db(m_env, 0);
-        m_block_timestamps = new Db(m_env, 0);
-        m_block_sizes = new Db(m_env, 0);
-        m_block_diffs = new Db(m_env, 0);
-        m_block_coins = new Db(m_env, 0);
-
-        m_txs = new Db(m_env, 0);
-        m_tx_unlocks = new Db(m_env, 0);
-        m_tx_heights = new Db(m_env, 0);
-        m_tx_outputs = new Db(m_env, 0);
-
-        m_output_txs = new Db(m_env, 0);
-        m_output_indices = new Db(m_env, 0);
-        m_output_amounts = new Db(m_env, 0);
-        m_output_keys = new Db(m_env, 0);
-
-        m_spent_keys = new Db(m_env, 0);
-
-        m_hf_starting_heights = new Db(m_env, 0);
-        m_hf_versions = new Db(m_env, 0);
-
-        m_properties = new Db(m_env, 0);
-
-        // Tell DB about Dbs that need duplicate support
-        // Note: no need to tell about sorting,
-        //   as the default is insertion order, which we want
-        m_tx_outputs->set_flags(DB_DUP);
-        m_output_amounts->set_flags(DB_DUP);
-
-        // Tell DB about fixed-size values.
-        m_block_hashes->set_re_len(sizeof(crypto::hash));
-        m_block_timestamps->set_re_len(sizeof(uint64_t));
-        m_block_sizes->set_re_len(sizeof(size_t));  // should really store block size as uint64_t...
-        m_block_diffs->set_re_len(sizeof(difficulty_type));
-        m_block_coins->set_re_len(sizeof(uint64_t));
-
-        m_output_txs->set_re_len(sizeof(crypto::hash));
-        m_output_indices->set_re_len(sizeof(uint64_t));
-        m_output_keys->set_re_len(sizeof(output_data_t));
-
-        m_hf_starting_heights->set_re_len(sizeof(uint64_t));
-        m_hf_versions->set_re_len(sizeof(uint8_t));
-
-        //TODO: Find out if we need to do Db::set_flags(DB_RENUMBER)
-        //      for the RECNO databases.  We shouldn't as we're only
-        //      inserting/removing from the end, but we'll see.
-
-        // open Dbs in the environment
-        // m_tx_outputs and m_output_amounts must be DB_HASH or DB_BTREE
-        //   because they need duplicate entry support.  The rest are DB_RECNO,
-        //   as it seems that will be the most performant choice.
-        m_blocks->open(txn, BDB_BLOCKS, NULL, DB_RECNO, DB_CREATE, 0);
-
-        m_block_timestamps->open(txn, BDB_BLOCK_TIMESTAMPS, NULL, DB_RECNO, DB_CREATE, 0);
-        m_block_heights->open(txn, BDB_BLOCK_HEIGHTS, NULL, DB_HASH, DB_CREATE, 0);
-        m_block_hashes->open(txn, BDB_BLOCK_HASHES, NULL, DB_RECNO, DB_CREATE, 0);
-        m_block_sizes->open(txn, BDB_BLOCK_SIZES, NULL, DB_RECNO, DB_CREATE, 0);
-        m_block_diffs->open(txn, BDB_BLOCK_DIFFS, NULL, DB_RECNO, DB_CREATE, 0);
-        m_block_coins->open(txn, BDB_BLOCK_COINS, NULL, DB_RECNO, DB_CREATE, 0);
-
-        m_txs->open(txn, BDB_TXS, NULL, DB_HASH, DB_CREATE, 0);
-        m_tx_unlocks->open(txn, BDB_TX_UNLOCKS, NULL, DB_HASH, DB_CREATE, 0);
-        m_tx_heights->open(txn, BDB_TX_HEIGHTS, NULL, DB_HASH, DB_CREATE, 0);
-        m_tx_outputs->open(txn, BDB_TX_OUTPUTS, NULL, DB_HASH, DB_CREATE, 0);
-
-        m_output_txs->open(txn, BDB_OUTPUT_TXS, NULL, DB_RECNO, DB_CREATE, 0);
-        m_output_indices->open(txn, BDB_OUTPUT_INDICES, NULL, DB_RECNO, DB_CREATE, 0);
-        m_output_amounts->open(txn, BDB_OUTPUT_AMOUNTS, NULL, DB_HASH, DB_CREATE, 0);
-        m_output_keys->open(txn, BDB_OUTPUT_KEYS, NULL, DB_RECNO, DB_CREATE, 0);
-
-        m_spent_keys->open(txn, BDB_SPENT_KEYS, NULL, DB_HASH, DB_CREATE, 0);
-
-        m_hf_starting_heights->open(txn, BDB_HF_STARTING_HEIGHTS, NULL, DB_RECNO, DB_CREATE, 0);
-        m_hf_versions->open(txn, BDB_HF_VERSIONS, NULL, DB_RECNO, DB_CREATE, 0);
-
-        m_properties->open(txn, BDB_PROPERTIES, NULL, DB_HASH, DB_CREATE, 0);
-
-        txn.commit();
-
-        DB_BTREE_STAT* stats;
-
-        // DB_FAST_STAT can apparently cause an incorrect number of records
-        // to be returned.  The flag should be set to 0 instead if this proves
-        // to be the case.
-
-        // ND: The bug above can occur when a block is popped and the application
-        // exits without pushing a new block to the db. Set txn to NULL and DB_FAST_STAT
-        // to zero (0) for reliability.
-        m_blocks->stat(NULL, &stats, 0);
-        m_height = stats->bt_nkeys;
-        free(stats);
-
-        // see above comment about DB_FAST_STAT
-        m_output_indices->stat(NULL, &stats, 0);
-        m_num_outputs = stats->bt_nkeys;
-        free(stats);
-
-        // checks for compatibility
-        bool compatible = true;
-
-        Dbt_copy<const char*> key("version");
-        Dbt_copy<uint32_t> result;
-        auto get_result = m_properties->get(DB_DEFAULT_TX, &key, &result, 0);
-        if (get_result == 0)
-        {
-            if (result > VERSION)
-            {
-                LOG_PRINT_RED_L0("Existing BerkeleyDB database was made by a later version. We don't know how it will change yet.");
-                compatible = false;
-            }
-#if VERSION > 0
-            else if (result < VERSION)
-            {
-                compatible = false;
-            }
-#endif
-        }
-        else
-        {
-            // if not found, but we're on version 0, it's fine. If the DB's empty, it's fine too.
-            if (VERSION > 0 && m_height > 0)
-                compatible = false;
-        }
-
-        if (!compatible)
-        {
-            m_open = false;
-            LOG_PRINT_RED_L0("Existing BerkeleyDB database is incompatible with this version.");
-            LOG_PRINT_RED_L0("Please delete the existing database and resync.");
-            return;
-        }
-
-        if (1 /* this can't be set readonly atm */)
-        {
-            // only write version on an empty DB
-            if (m_height == 0)
-            {
-                Dbt_copy<const char*> k("version");
-                Dbt_copy<uint32_t> v(VERSION);
-                auto put_result = m_properties->put(DB_DEFAULT_TX, &k, &v, 0);
-                if (put_result != 0)
-                {
-                    m_open = false;
-                    LOG_PRINT_RED_L0("Failed to write version to database.");
-                    return;
-                }
-            }
-        }
-
-        // run checkpoint thread
-        m_run_checkpoint = true;
-        m_checkpoint_thread.reset(new boost::thread(&BlockchainBDB::checkpoint_worker, this));
-    }
-    catch (const std::exception& e)
-    {
-        throw0(DB_OPEN_FAILURE(e.what()));
-    }
-
-    m_open = true;
-}
-
-void BlockchainBDB::close()
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    this->sync();
-
-    m_run_checkpoint = false;
-    m_checkpoint_thread->join();
-    m_checkpoint_thread.reset();
-
-    // FIXME: not yet thread safe!!!  Use with care.
-    m_open = false;
-
-    // DB_FORCESYNC is only available on newer version of libdb.
-    // The libdb doc says using the DB_FORCESYNC flag to DB_ENV->close
-    // is "similar to calling the DB->close(0) method to close each
-    // database handle". So this is what we do here as a fallback.
-#ifdef DB_FORCESYNC
-    m_env->close(DB_FORCESYNC);
-#else
-    m_blocks->close(0);
-    m_block_heights->close(0);
-    m_block_hashes->close(0);
-    m_block_timestamps->close(0);
-    m_block_sizes->close(0);
-    m_block_diffs->close(0);
-    m_block_coins->close(0);
-
-    m_txs->close(0);
-    m_tx_unlocks->close(0);
-    m_tx_heights->close(0);
-    m_tx_outputs->close(0);
-
-    m_output_txs->close(0);
-    m_output_indices->close(0);
-    m_output_amounts->close(0);
-    m_output_keys->close(0);
-
-    m_spent_keys->close(0);
-
-    m_hf_starting_heights->close(0);
-    m_hf_versions->close(0);
-
-    m_properties->close(0);
-
-    m_env->close(0);
-#endif
-}
-
-void BlockchainBDB::sync()
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    try
-    {
-        m_blocks->sync(0);
-        m_block_heights->sync(0);
-        m_block_hashes->sync(0);
-        m_block_timestamps->sync(0);
-        m_block_sizes->sync(0);
-        m_block_diffs->sync(0);
-        m_block_coins->sync(0);
-
-        m_txs->sync(0);
-        m_tx_unlocks->sync(0);
-        m_tx_heights->sync(0);
-        m_tx_outputs->sync(0);
-
-        m_output_txs->sync(0);
-        m_output_indices->sync(0);
-        m_output_amounts->sync(0);
-        m_output_keys->sync(0);
-
-        m_spent_keys->sync(0);
-
-        if (m_hf_starting_heights != nullptr)
-          m_hf_starting_heights->sync(0);
-        if (m_hf_versions != nullptr)
-          m_hf_versions->sync(0);
-
-        m_properties->sync(0);
-    }
-    catch (const std::exception& e)
-    {
-        throw0(DB_ERROR(std::string("Failed to sync database: ").append(e.what()).c_str()));
-    }
-}
-
-void BlockchainBDB::reset()
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    bdb_txn_safe txn;
-    if (m_env->txn_begin(NULL, txn, 0))
-        throw0(DB_ERROR("Failed to create a transaction for the db"));
-    m_write_txn = &txn;
-    try
-    {
-        uint32_t count;
-
-        m_blocks->truncate(*m_write_txn, &count, 0);
-        m_block_heights->truncate(*m_write_txn, &count, 0);
-        m_block_hashes->truncate(*m_write_txn, &count, 0);
-        m_block_timestamps->truncate(*m_write_txn, &count, 0);
-        m_block_sizes->truncate(*m_write_txn, &count, 0);
-        m_block_diffs->truncate(*m_write_txn, &count, 0);
-        m_block_coins->truncate(*m_write_txn, &count, 0);
-
-        m_txs->truncate(*m_write_txn, &count, 0);
-        m_tx_unlocks->truncate(*m_write_txn, &count, 0);
-        m_tx_heights->truncate(*m_write_txn, &count, 0);
-        m_tx_outputs->truncate(*m_write_txn, &count, 0);
-
-        m_output_txs->truncate(*m_write_txn, &count, 0);
-        m_output_indices->truncate(*m_write_txn, &count, 0);
-        m_output_amounts->truncate(*m_write_txn, &count, 0);
-        m_output_keys->truncate(*m_write_txn, &count, 0);
-
-        m_spent_keys->truncate(*m_write_txn, &count, 0);
-
-        m_hf_starting_heights->truncate(*m_write_txn, &count, 0);
-        m_hf_versions->truncate(*m_write_txn, &count, 0);
-
-        m_properties->truncate(*m_write_txn, &count, 0);
-    }
-    catch (const std::exception& e)
-    {
-        throw0(DB_ERROR(std::string("Failed to reset database: ").append(e.what()).c_str()));
-    }
-    m_write_txn = NULL;
-}
-
-std::vector<std::string> BlockchainBDB::get_filenames() const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    std::vector<std::string> filenames;
-
-    char *fname, *dbname;
-    const char **pfname, **pdbname;
-
-    pfname = (const char **)&fname;
-    pdbname = (const char **)&dbname;
-
-    m_blocks->get_dbname(pfname, pdbname);
-    filenames.push_back(fname);
-
-    m_block_heights->get_dbname(pfname, pdbname);
-    filenames.push_back(fname);
-
-    m_block_hashes->get_dbname(pfname, pdbname);
-    filenames.push_back(fname);
-
-    m_block_timestamps->get_dbname(pfname, pdbname);
-    filenames.push_back(fname);
-
-    m_block_sizes->get_dbname(pfname, pdbname);
-    filenames.push_back(fname);
-
-    m_block_diffs->get_dbname(pfname, pdbname);
-    filenames.push_back(fname);
-
-    m_block_coins->get_dbname(pfname, pdbname);
-    filenames.push_back(fname);
-
-    m_txs->get_dbname(pfname, pdbname);
-    filenames.push_back(fname);
-
-    m_tx_unlocks->get_dbname(pfname, pdbname);
-    filenames.push_back(fname);
-
-    m_tx_heights->get_dbname(pfname, pdbname);
-    filenames.push_back(fname);
-
-    m_tx_outputs->get_dbname(pfname, pdbname);
-    filenames.push_back(fname);
-
-    m_output_txs->get_dbname(pfname, pdbname);
-    filenames.push_back(fname);
-
-    m_output_indices->get_dbname(pfname, pdbname);
-    filenames.push_back(fname);
-
-    m_output_amounts->get_dbname(pfname, pdbname);
-    filenames.push_back(fname);
-
-    m_output_keys->get_dbname(pfname, pdbname);
-    filenames.push_back(fname);
-
-    m_spent_keys->get_dbname(pfname, pdbname);
-    filenames.push_back(fname);
-
-    m_hf_starting_heights->get_dbname(pfname, pdbname);
-    filenames.push_back(fname);
-
-    m_hf_versions->get_dbname(pfname, pdbname);
-    filenames.push_back(fname);
-
-    m_properties->get_dbname(pfname, pdbname);
-    filenames.push_back(fname);
-
-    std::vector<std::string> full_paths;
-
-    for (auto& filename : filenames)
-    {
-        boost::filesystem::path p(m_folder);
-        p /= filename;
-        full_paths.push_back(p.string());
-    }
-
-    return full_paths;
-}
-
-bool BlockchainBDB::remove_data_file(const std::string& folder)
-{
-    return true;
-}
-
-std::string BlockchainBDB::get_db_name() const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-
-    return std::string("BerkeleyDB");
-}
-
-// TODO: this?
-bool BlockchainBDB::lock()
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-    return false;
-}
-
-// TODO: this?
-void BlockchainBDB::unlock()
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-}
-
-bool BlockchainBDB::block_exists(const crypto::hash& h, uint64_t *height) const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    Dbt_copy<crypto::hash> key(h);
-
-    auto get_result = m_block_heights->exists(DB_DEFAULT_TX, &key, 0);
-    if (get_result == DB_NOTFOUND)
-    {
-        LOG_PRINT_L3("Block with hash " << epee::string_tools::pod_to_hex(h) << " not found in db");
-        return false;
-    }
-    else if (get_result)
-        throw0(DB_ERROR("DB error attempting to fetch block index from hash"));
-
-    if (height)
-      *height = get_result - 1;
-
-    return true;
-}
-
-block BlockchainBDB::get_block(const crypto::hash& h) const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    return get_block_from_height(get_block_height(h));
-}
-
-uint64_t BlockchainBDB::get_block_height(const crypto::hash& h) const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    Dbt_copy<crypto::hash> key(h);
-    Dbt_copy<uint32_t> result;
-
-    auto get_result = m_block_heights->get(DB_DEFAULT_TX, &key, &result, 0);
-    if (get_result == DB_NOTFOUND)
-        throw1(BLOCK_DNE("Attempted to retrieve non-existent block height"));
-    else if (get_result)
-        throw0(DB_ERROR("Error attempting to retrieve a block height from the db"));
-
-    return result - 1;
-}
-
-block_header BlockchainBDB::get_block_header(const crypto::hash& h) const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    // block_header object is automatically cast from block object
-    return get_block(h);
-}
-
-block BlockchainBDB::get_block_from_height(const uint64_t& height) const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    Dbt_copy<uint32_t> key(height + 1);
-    Dbt_safe result;
-    auto get_result = m_blocks->get(DB_DEFAULT_TX, &key, &result, 0);
-    if (get_result == DB_NOTFOUND)
-    {
-        throw0(BLOCK_DNE(std::string("Attempt to get block from height ").append(boost::lexical_cast<std::string>(height)).append(" failed -- block not in db").c_str()));
-    }
-    else if (get_result)
-        throw0(DB_ERROR("Error attempting to retrieve a block from the db"));
-
-    blobdata bd;
-    bd.assign(reinterpret_cast<char*>(result.get_data()), result.get_size());
-
-    block b;
-    if (!parse_and_validate_block_from_blob(bd, b))
-        throw0(DB_ERROR("Failed to parse block from blob retrieved from the db"));
-
-    return b;
-}
-
-uint64_t BlockchainBDB::get_block_timestamp(const uint64_t& height) const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    Dbt_copy<uint32_t> key(height + 1);
-    Dbt_copy<uint64_t> result;
-    auto get_result = m_block_timestamps->get(DB_DEFAULT_TX, &key, &result, 0);
-    if (get_result == DB_NOTFOUND)
-    {
-        throw0(BLOCK_DNE(std::string("Attempt to get timestamp from height ").append(boost::lexical_cast<std::string>(height)).append(" failed -- timestamp not in db").c_str()));
-    }
-    else if (get_result)
-        throw0(DB_ERROR("Error attempting to retrieve a timestamp from the db"));
-
-    return result;
-}
-
-uint64_t BlockchainBDB::get_top_block_timestamp() const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    // if no blocks, return 0
-    if (m_height == 0)
-    {
-        return 0;
-    }
-
-    return get_block_timestamp(m_height - 1);
-}
-
-size_t BlockchainBDB::get_block_weight(const uint64_t& height) const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    Dbt_copy<uint32_t> key(height + 1);
-    Dbt_copy<size_t> result;
-    auto get_result = m_block_sizes->get(DB_DEFAULT_TX, &key, &result, 0);
-    if (get_result == DB_NOTFOUND)
-    {
-        throw0(BLOCK_DNE(std::string("Attempt to get block size from height ").append(boost::lexical_cast<std::string>(height)).append(" failed -- block size not in db").c_str()));
-    }
-    else if (get_result)
-        throw0(DB_ERROR("Error attempting to retrieve a block size from the db"));
-
-    return result;
-}
-
-difficulty_type BlockchainBDB::get_block_cumulative_difficulty(const uint64_t& height) const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__ << "  height: " << height);
-    check_open();
-
-    Dbt_copy<uint32_t> key(height + 1);
-    Dbt_copy<difficulty_type> result;
-    auto get_result = m_block_diffs->get(DB_DEFAULT_TX, &key, &result, 0);
-    if (get_result == DB_NOTFOUND)
-    {
-        throw0(BLOCK_DNE(std::string("Attempt to get cumulative difficulty from height ").append(boost::lexical_cast<std::string>(height)).append(" failed -- difficulty not in db").c_str()));
-    }
-    else if (get_result)
-        throw0(DB_ERROR("Error attempting to retrieve a cumulative difficulty from the db"));
-
-    return result;
-}
-
-difficulty_type BlockchainBDB::get_block_difficulty(const uint64_t& height) const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    difficulty_type diff1 = 0;
-    difficulty_type diff2 = 0;
-
-    diff1 = get_block_cumulative_difficulty(height);
-    if (height != 0)
-    {
-        diff2 = get_block_cumulative_difficulty(height - 1);
-    }
-
-    return diff1 - diff2;
-}
-
-uint64_t BlockchainBDB::get_block_already_generated_coins(const uint64_t& height) const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    Dbt_copy<uint32_t> key(height + 1);
-    Dbt_copy<uint64_t> result;
-    auto get_result = m_block_coins->get(DB_DEFAULT_TX, &key, &result, 0);
-    if (get_result == DB_NOTFOUND)
-    {
-        throw0(BLOCK_DNE(std::string("Attempt to get generated coins from height ").append(boost::lexical_cast<std::string>(height)).append(" failed -- block size not in db").c_str()));
-    }
-    else if (get_result)
-        throw0(DB_ERROR("Error attempting to retrieve a total generated coins from the db"));
-
-    return result;
-}
-
-crypto::hash BlockchainBDB::get_block_hash_from_height(const uint64_t& height) const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    Dbt_copy<uint32_t> key(height + 1);
-    Dbt_copy<crypto::hash> result;
-    auto get_result = m_block_hashes->get(DB_DEFAULT_TX, &key, &result, 0);
-    if (get_result == DB_NOTFOUND)
-    {
-        throw0(BLOCK_DNE(std::string("Attempt to get hash from height ").append(boost::lexical_cast<std::string>(height)).append(" failed -- hash not in db").c_str()));
-    }
-    else if (get_result)
-        throw0(DB_ERROR("Error attempting to retrieve a block hash from the db."));
-
-    return result;
-}
-
-std::vector<block> BlockchainBDB::get_blocks_range(const uint64_t& h1, const uint64_t& h2) const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-    std::vector<block> v;
-
-    for (uint64_t height = h1; height <= h2; ++height)
-    {
-        v.push_back(get_block_from_height(height));
-    }
-
-    return v;
-}
-
-std::vector<crypto::hash> BlockchainBDB::get_hashes_range(const uint64_t& h1, const uint64_t& h2) const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-    std::vector<crypto::hash> v;
-
-    for (uint64_t height = h1; height <= h2; ++height)
-    {
-        v.push_back(get_block_hash_from_height(height));
-    }
-
-    return v;
-}
-
-crypto::hash BlockchainBDB::top_block_hash() const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-    if (m_height > 0)
-    {
-        return get_block_hash_from_height(m_height - 1);
-    }
-
-    return null_hash;
-}
-
-block BlockchainBDB::get_top_block() const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    if (m_height > 0)
-    {
-        return get_block_from_height(m_height - 1);
-    }
-
-    block b;
-    return b;
-}
-
-uint64_t BlockchainBDB::height() const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    return m_height;
-}
-
-bool BlockchainBDB::tx_exists(const crypto::hash& h) const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    Dbt_copy<crypto::hash> key(h);
-
-    TIME_MEASURE_START(time1);
-    auto get_result = m_txs->exists(DB_DEFAULT_TX, &key, 0);
-    TIME_MEASURE_FINISH(time1);
-    time_tx_exists += time1;
-    if (get_result == DB_NOTFOUND)
-    {
-        LOG_PRINT_L1("transaction with hash " << epee::string_tools::pod_to_hex(h) << " not found in db");
-        return false;
-    }
-    else if (get_result)
-        throw0(DB_ERROR("DB error attempting to fetch transaction from hash"));
-
-    return true;
-}
-
-uint64_t BlockchainBDB::get_tx_unlock_time(const crypto::hash& h) const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    Dbt_copy<crypto::hash> key(h);
-    Dbt_copy<uint64_t> result;
-    auto get_result = m_tx_unlocks->get(DB_DEFAULT_TX, &key, &result, 0);
-    if (get_result == DB_NOTFOUND)
-        throw1(TX_DNE(std::string("tx unlock time with hash ").append(epee::string_tools::pod_to_hex(h)).append(" not found in db").c_str()));
-    else if (get_result)
-        throw0(DB_ERROR("DB error attempting to fetch tx unlock time from hash"));
-
-    return result;
-}
-
-transaction BlockchainBDB::get_tx(const crypto::hash& h) const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    Dbt_copy<crypto::hash> key(h);
-    Dbt_safe result;
-    auto get_result = m_txs->get(DB_DEFAULT_TX, &key, &result, 0);
-    if (get_result == DB_NOTFOUND)
-        throw1(TX_DNE(std::string("tx with hash ").append(epee::string_tools::pod_to_hex(h)).append(" not found in db").c_str()));
-    else if (get_result)
-        throw0(DB_ERROR("DB error attempting to fetch tx from hash"));
-
-    blobdata bd;
-    bd.assign(reinterpret_cast<char*>(result.get_data()), result.get_size());
-
-    transaction tx;
-    if (!parse_and_validate_tx_from_blob(bd, tx))
-        throw0(DB_ERROR("Failed to parse tx from blob retrieved from the db"));
-
-    return tx;
-}
-
-uint64_t BlockchainBDB::get_tx_count() const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    DB_BTREE_STAT* stats;
-
-    // DB_FAST_STAT can apparently cause an incorrect number of records
-    // to be returned.  The flag should be set to 0 instead if this proves
-    // to be the case.
-    m_txs->stat(DB_DEFAULT_TX, &stats, DB_FAST_STAT);
-    auto num_txs = stats->bt_nkeys;
-    delete stats;
-
-    return num_txs;
-}
-
-std::vector<transaction> BlockchainBDB::get_tx_list(const std::vector<crypto::hash>& hlist) const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-    std::vector<transaction> v;
-
-for (auto& h : hlist)
-    {
-        v.push_back(get_tx(h));
-    }
-
-    return v;
-}
-
-uint64_t BlockchainBDB::get_tx_block_height(const crypto::hash& h) const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    Dbt_copy<crypto::hash> key(h);
-    Dbt_copy<uint64_t> result;
-    auto get_result = m_tx_heights->get(DB_DEFAULT_TX, &key, &result, 0);
-    if (get_result == DB_NOTFOUND)
-    {
-        throw1(TX_DNE(std::string("tx height with hash ").append(epee::string_tools::pod_to_hex(h)).append(" not found in db").c_str()));
-    }
-    else if (get_result)
-        throw0(DB_ERROR("DB error attempting to fetch tx height from hash"));
-
-    return (uint64_t)result - 1;
-}
-
-uint64_t BlockchainBDB::get_num_outputs(const uint64_t& amount) const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    bdb_cur cur(DB_DEFAULT_TX, m_output_amounts);
-
-    Dbt_copy<uint64_t> k(amount);
-    Dbt_copy<uint32_t> v;
-    auto result = cur->get(&k, &v, DB_SET);
-    if (result == DB_NOTFOUND)
-    {
-        return 0;
-    }
-    else if (result)
-        throw0(DB_ERROR("DB error attempting to get number of outputs of an amount"));
-
-    db_recno_t num_elems = 0;
-    cur->count(&num_elems, 0);
-
-    cur.close();
-
-    return num_elems;
-}
-
-output_data_t BlockchainBDB::get_output_key(const uint64_t& global_index) const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    Dbt_copy<uint32_t> k(global_index);
-    Dbt_copy<output_data_t> v;
-    auto get_result = m_output_keys->get(DB_DEFAULT_TX, &k, &v, 0);
-    if (get_result == DB_NOTFOUND)
-        throw1(OUTPUT_DNE("Attempting to get output pubkey by global index, but key does not exist"));
-    else if (get_result)
-        throw0(DB_ERROR("Error attempting to retrieve an output pubkey from the db"));
-
-    return v;
-}
-
-output_data_t BlockchainBDB::get_output_key(const uint64_t& amount, const uint64_t& index) const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    uint64_t glob_index = get_output_global_index(amount, index);
-    return get_output_key(glob_index);
-}
-
-tx_out_index BlockchainBDB::get_output_tx_and_index(const uint64_t& amount, const uint64_t& index) const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    std::vector < uint64_t > offsets;
-    std::vector<tx_out_index> indices;
-    offsets.push_back(index);
-    get_output_tx_and_index(amount, offsets, indices);
-    if (!indices.size())
-        throw1(OUTPUT_DNE("Attempting to get an output index by amount and amount index, but amount not found"));
-
-    return indices[0];
-}
-
-std::vector<uint64_t> BlockchainBDB::get_tx_amount_output_indices(const crypto::hash& h) const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-    std::vector<uint64_t> index_vec;
-    std::vector<uint64_t> index_vec2;
-
-    // get the transaction's global output indices first
-    index_vec = get_tx_output_indices(h);
-    // these are next used to obtain the amount output indices
-
-    transaction tx = get_tx(h);
-
-    uint64_t i = 0;
-    uint64_t global_index;
-    for (const auto& vout : tx.vout)
-    {
-        uint64_t amount =  vout.amount;
-
-        global_index = index_vec[i];
-
-        bdb_cur cur(DB_DEFAULT_TX, m_output_amounts);
-
-        Dbt_copy<uint64_t> k(amount);
-        Dbt_copy<uint32_t> v;
-
-        auto result = cur->get(&k, &v, DB_SET);
-        if (result == DB_NOTFOUND)
-            throw1(OUTPUT_DNE("Attempting to get an output index by amount and amount index, but amount not found"));
-        else if (result)
-            throw0(DB_ERROR("DB error attempting to get an output"));
-
-        db_recno_t num_elems = 0;
-        cur->count(&num_elems, 0);
-
-        uint64_t amount_output_index = 0;
-        uint64_t output_index = 0;
-        bool found_index = false;
-        for (uint64_t j = 0; j < num_elems; ++j)
-        {
-            output_index = v;
-            if (output_index == global_index)
-            {
-                amount_output_index = j;
-                found_index = true;
-                break;
-            }
-            cur->get(&k, &v, DB_NEXT_DUP);
-        }
-        if (found_index)
-        {
-            index_vec2.push_back(amount_output_index);
-        }
-        else
-        {
-            // not found
-            cur.close();
-            throw1(OUTPUT_DNE("specified output not found in db"));
-        }
-
-        cur.close();
-        ++i;
-    }
-
-    return index_vec2;
-}
-
-
-tx_out_index BlockchainBDB::get_output_tx_and_index_from_global(const uint64_t& index) const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    Dbt_copy<uint32_t> k(index);
-    Dbt_copy<crypto::hash > v;
-
-    auto get_result = m_output_txs->get(DB_DEFAULT_TX, &k, &v, 0);
-    if (get_result == DB_NOTFOUND)
-        throw1(OUTPUT_DNE("output with given index not in db"));
-    else if (get_result)
-        throw0(DB_ERROR("DB error attempting to fetch output tx hash"));
-
-    crypto::hash tx_hash = v;
-
-    Dbt_copy<uint64_t> result;
-    get_result = m_output_indices->get(DB_DEFAULT_TX, &k, &result, 0);
-    if (get_result == DB_NOTFOUND)
-        throw1(OUTPUT_DNE("output with given index not in db"));
-    else if (get_result)
-        throw0(DB_ERROR("DB error attempting to fetch output tx index"));
-
-    return tx_out_index(tx_hash, result);
-}
-
-bool BlockchainBDB::has_key_image(const crypto::key_image& img) const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    Dbt_copy<crypto::key_image> val_key(img);
-    if (m_spent_keys->exists(DB_DEFAULT_TX, &val_key, 0) == 0)
-    {
-        return true;
-    }
-
-    return false;
-}
-
-// Ostensibly BerkeleyDB has batch transaction support built-in,
-// so the following few functions will be NOP.
-
-bool BlockchainBDB::batch_start(uint64_t batch_num_blocks)
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    return false;
-}
-
-void BlockchainBDB::batch_commit()
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-}
-
-void BlockchainBDB::batch_stop()
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-}
-
-void BlockchainBDB::batch_abort()
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-}
-
-void BlockchainBDB::set_batch_transactions(bool batch_transactions)
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    m_batch_transactions = batch_transactions;
-    LOG_PRINT_L3("batch transactions " << (m_batch_transactions ? "enabled" : "disabled"));
-}
-
-void BlockchainBDB::block_txn_start(bool readonly)
-{
-  // TODO
-}
-
-void BlockchainBDB::block_txn_stop()
-{
-  // TODO
-}
-
-void BlockchainBDB::block_txn_abort()
-{
-  // TODO
-}
-
-uint64_t BlockchainBDB::add_block(const block& blk, size_t block_weight, const difficulty_type& cumulative_difficulty, const uint64_t& coins_generated, const std::vector<transaction>& txs)
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    bdb_txn_safe txn;
-    if (m_env->txn_begin(NULL, txn, 0))
-        throw0(DB_ERROR("Failed to create a transaction for the db"));
-    m_write_txn = &txn;
-
-    uint64_t num_outputs = m_num_outputs;
-    try
-    {
-        BlockchainDB::add_block(blk, block_weight, cumulative_difficulty, coins_generated, txs);
-        m_write_txn = NULL;
-
-        TIME_MEASURE_START(time1);
-        txn.commit();
-        TIME_MEASURE_FINISH(time1);
-        time_commit1 += time1;
-    }
-    catch (const std::exception& e)
-    {
-        m_num_outputs = num_outputs;
-        m_write_txn = NULL;
-        throw;
-    }
-
-    return ++m_height;
-}
-
-void BlockchainBDB::pop_block(block& blk, std::vector<transaction>& txs)
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    bdb_txn_safe txn;
-    if (m_env->txn_begin(NULL, txn, 0))
-        throw0(DB_ERROR("Failed to create a transaction for the db"));
-    m_write_txn = &txn;
-
-    uint64_t num_outputs = m_num_outputs;
-    try
-    {
-        BlockchainDB::pop_block(blk, txs);
-
-        m_write_txn = NULL;
-        txn.commit();
-    }
-    catch (...)
-    {
-        m_num_outputs = num_outputs;
-        m_write_txn = NULL;
-        throw;
-    }
-
-    --m_height;
-}
-
-void BlockchainBDB::get_output_tx_and_index_from_global(const std::vector<uint64_t> &global_indices, std::vector<tx_out_index> &tx_out_indices) const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-    tx_out_indices.clear();
-
-    for (const uint64_t &index : global_indices)
-    {
-        Dbt_copy<uint32_t> k(index);
-        Dbt_copy<crypto::hash> v;
-
-        auto get_result = m_output_txs->get(DB_DEFAULT_TX, &k, &v, 0);
-        if (get_result == DB_NOTFOUND)
-            throw1(OUTPUT_DNE("output with given index not in db"));
-        else if (get_result)
-            throw0(DB_ERROR("DB error attempting to fetch output tx hash"));
-
-        crypto::hash tx_hash = v;
-
-        Dbt_copy<uint64_t> result;
-        get_result = m_output_indices->get(DB_DEFAULT_TX, &k, &result, 0);
-        if (get_result == DB_NOTFOUND)
-            throw1(OUTPUT_DNE("output with given index not in db"));
-        else if (get_result)
-            throw0(DB_ERROR("DB error attempting to fetch output tx index"));
-        auto hashindex = tx_out_index(tx_hash, result);
-        tx_out_indices.push_back(hashindex);
-    }
-}
-
-void BlockchainBDB::get_output_global_indices(const uint64_t& amount, const std::vector<uint64_t> &offsets, std::vector<uint64_t> &global_indices)
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    TIME_MEASURE_START(txx);
-    check_open();
-
-    bdb_cur cur(DB_DEFAULT_TX, m_output_amounts);
-    uint64_t max = 0;
-    for (const uint64_t& index : offsets)
-    {
-        if (index > max)
-            max = index;
-    }
-
-    // get returned keypairs count
-#define DB_COUNT_RECORDS(dbt, cnt) \
-        do { \
-            uint32_t *_p = (uint32_t *) ((uint8_t *)(dbt)->data + \
-                    (dbt)->ulen - sizeof(uint32_t)); \
-                    cnt = 0; \
-                    while(*_p != (uint32_t) -1) { \
-                        _p -= 2; \
-                        ++cnt; \
-                    } \
-        } while(0); \
-
-    Dbt_copy<uint64_t> k(amount);
-    Dbt_copy<uint32_t> v;
-    uint64_t buflen = 0;
-    uint64_t t_dbmul = 0;
-    uint64_t t_dbscan = 0;
-
-    auto result = cur->get(&k, &v, DB_SET);
-    if (result == DB_NOTFOUND)
-        throw1(OUTPUT_DNE("Attempting to get an output index by amount and amount index, but amount not found"));
-    else if (result)
-        throw0(DB_ERROR("DB error attempting to get an output"));
-
-    db_recno_t num_elems = 0;
-    cur->count(&num_elems, 0);
-
-    if (max <= 1 && num_elems <= max)
-        throw1(OUTPUT_DNE("Attempting to get an output index by amount and amount index, but output not found"));
-
-    TIME_MEASURE_START(db2);
-    if (max <= 1)
-    {
-        for (const uint64_t& index : offsets)
-        {
-            TIME_MEASURE_START(t_seek);
-
-            auto result = cur->get(&k, &v, DB_SET);
-            if (result == DB_NOTFOUND)
-                throw1(OUTPUT_DNE("Attempting to get an output index by amount and amount index, but amount not found"));
-            else if (result)
-                throw0(DB_ERROR("DB error attempting to get an output"));
-
-            for (uint64_t i = 0; i < index; ++i)
-                cur->get(&k, &v, DB_NEXT_DUP);
-
-            uint64_t glob_index = v;
-
-            LOG_PRINT_L3("L0->v: " << glob_index);
-            global_indices.push_back(glob_index);
-
-            TIME_MEASURE_FINISH(t_seek);
-        }
-    }
-    else
-    {
-        // setup a 256KB minimum buffer size
-        uint32_t pagesize = 256 * 1024;
-
-        // Retrieve only a suitable portion of the kvp data, up to somewhere near
-        // the maximum offset value being retrieved
-        buflen = (max + 1) * 4 * sizeof(uint64_t);
-        buflen = ((buflen / pagesize) + ((buflen % pagesize) > 0 ? 1 : 0)) * pagesize;
-
-        bool nomem = false;
-        Dbt data;
-
-        bool singlebuff = buflen <= m_buffer.get_buffer_size();
-        buflen = buflen < m_buffer.get_buffer_size() ? buflen : m_buffer.get_buffer_size();
-        bdb_safe_buffer_t::type buffer = nullptr;
-        bdb_safe_buffer_autolock<bdb_safe_buffer_t> lock(m_buffer, buffer);
-
-        data.set_data(buffer);
-        data.set_ulen(buflen);
-        data.set_size(buflen);
-        data.set_flags(DB_DBT_USERMEM);
-
-        uint32_t curcount = 0;
-        uint32_t blockstart = 0;
-        for (const uint64_t& index : offsets)
-        {
-            if (index >= num_elems)
-            {
-                LOG_PRINT_L1("Index: " << index << " Elems: " << num_elems << " partial results found for get_output_tx_and_index");
-                break;
-            }
-
-            // fixme! for whatever reason, the first call to DB_MULTIPLE | DB_SET does not
-            // retrieve the first value.
-            if (index <= 1 || nomem)
-            {
-                auto result = cur->get(&k, &v, DB_SET);
-                if (result == DB_NOTFOUND)
-                {
-                    throw1(OUTPUT_DNE("Attempting to get an output index by amount and amount index, but amount not found"));
-                }
-                else if (result)
-                {
-                    throw0(DB_ERROR("DB error attempting to get an output"));
-                }
-
-                for (uint64_t i = 0; i < index; ++i)
-                    cur->get(&k, &v, DB_NEXT_DUP);
-            }
-            else
-            {
-                while (index >= curcount)
-                {
-                    TIME_MEASURE_START(t_db1);
-                    try
-                    {
-                        cur->get(&k, &data, DB_MULTIPLE | (curcount == 0 ? DB_SET : DB_NEXT_DUP));
-                        blockstart = curcount;
-
-                        int count = 0;
-                        DB_COUNT_RECORDS((DBT * ) &data, count);
-                        curcount += count;
-                    }
-                    catch (const std::exception &e)
-                    {
-                        cur.close();
-                        throw0(DB_ERROR(std::string("Failed on DB_MULTIPLE: ").append(e.what()).c_str()));
-                    }
-
-                    TIME_MEASURE_FINISH(t_db1);
-                    t_dbmul += t_db1;
-                    if (singlebuff)
-                        break;
-                }
-
-                LOG_PRINT_L3("Records returned: " << curcount << " Index: " << index);
-                TIME_MEASURE_START(t_db2);
-                DBT *pdata = (DBT *) &data;
-
-                uint8_t *value;
-                uint64_t dlen = 0;
-
-                void *pbase = ((uint8_t *) (pdata->data)) + pdata->ulen - sizeof(uint32_t);
-                uint32_t *p = (uint32_t *) pbase;
-                if (*p == (uint32_t) -1)
-                {
-                    value = NULL;
-                }
-                else
-                {
-                    p -= (index - blockstart) * 2; // index * 4 + 2; <- if DB_MULTIPLE_KEY
-                    value = (uint8_t *) pdata->data + *p--;
-                    dlen = *p--;
-                    if (value == (uint8_t *) pdata->data)
-                        value = NULL;
-                }
-
-                if (value != NULL)
-                {
-                    v = dlen == sizeof(uint64_t) ? *((uint64_t *) value) : *((uint32_t *) value);
-                }
-                TIME_MEASURE_FINISH(t_db2);
-                t_dbscan += t_db2;
-            }
-
-            uint64_t glob_index = v;
-
-            LOG_PRINT_L3("L1->v: " << glob_index);
-            global_indices.push_back(glob_index);
-        }
-    }
-    TIME_MEASURE_FINISH(db2);
-
-    cur.close();
-
-    TIME_MEASURE_FINISH(txx);
-
-    LOG_PRINT_L3("blen: " << buflen << " txx: " << txx << " db1: " << t_dbmul << " db2: " << t_dbscan);
-
-}
-
-void BlockchainBDB::get_output_key(const uint64_t &amount, const std::vector<uint64_t> &offsets, std::vector<output_data_t> &outputs)
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-    TIME_MEASURE_START(txx);
-    outputs.clear();
-
-    std::vector < uint64_t > global_indices;
-    get_output_global_indices(amount, offsets, global_indices);
-
-    TIME_MEASURE_START(db3);
-    if (global_indices.size() > 0)
-    {
-        for (const uint64_t &index : global_indices)
-        {
-            Dbt_copy<uint32_t> k(index);
-            Dbt_copy<output_data_t> v;
-
-            auto get_result = m_output_keys->get(DB_DEFAULT_TX, &k, &v, 0);
-            if (get_result == DB_NOTFOUND)
-                throw1(OUTPUT_DNE("output with given index not in db"));
-            else if (get_result)
-                throw0(DB_ERROR("DB error attempting to fetch output tx hash"));
-
-            output_data_t data = *(output_data_t *) v.get_data();
-            outputs.push_back(data);
-        }
-    }
-
-    TIME_MEASURE_FINISH(txx);
-    LOG_PRINT_L3("db3: " << db3);
-}
-
-void BlockchainBDB::get_output_tx_and_index(const uint64_t& amount, const std::vector<uint64_t> &offsets, std::vector<tx_out_index> &indices)
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    std::vector < uint64_t > global_indices;
-    get_output_global_indices(amount, offsets, global_indices);
-
-    TIME_MEASURE_START(db3);
-    if (global_indices.size() > 0)
-        get_output_tx_and_index_from_global(global_indices, indices);
-    TIME_MEASURE_FINISH(db3);
-
-    LOG_PRINT_L3("db3: " << db3);
-}
-
-std::map<uint64_t, uint64_t>::BlockchainBDB::get_output_histogram(const std::vector<uint64_t> &amounts) const
-{
-  LOG_PRINT_L3("BlockchainBDB::" << __func__);
-  throw1(DB_ERROR("Not implemented."));
-}
-
-void BlockchainBDB::check_hard_fork_info()
-{
-  LOG_PRINT_L3("BlockchainBDB::" << __func__);
-  check_open();
-
-  if (m_hf_versions == nullptr)
-  {
-    LOG_PRINT_L0("hf versions DB not open, so not checking");
-    return;
-  }
-
-  DB_BTREE_STAT* db_stat1, * db_stat2;
-
-  // DB_FAST_STAT can apparently cause an incorrect number of records
-  // to be returned.  The flag should be set to 0 instead if this proves
-  // to be the case.
-
-  // Set txn to NULL and DB_FAST_STAT to zero (0) for reliability.
-  m_blocks->stat(NULL, &db_stat1, 0);
-  m_hf_versions->stat(NULL, &db_stat2, 0);
-  if (db_stat1->bt_nkeys != db_stat2->bt_nkeys)
-  {
-    LOG_PRINT_L0("num blocks " << db_stat1->bt_nkeys << " != " << "num hf_versions " << db_stat2->bt_nkeys << " - will clear the two hard fork DBs");
-
-    bdb_txn_safe txn;
-    bdb_txn_safe* txn_ptr = &txn;
-    if (m_write_txn)
-      txn_ptr = m_write_txn;
-    else
-    {
-      if (m_env->txn_begin(NULL, txn, 0))
-        throw0(DB_ERROR("Failed to create a transaction for the db"));
-    }
-
-    try
-    {
-      uint32_t count;
-      m_hf_starting_heights->truncate(*txn_ptr, &count, 0);
-      LOG_PRINT_L0("hf_starting_heights count: " << count);
-      m_hf_versions->truncate(*txn_ptr, &count, 0);
-      LOG_PRINT_L0("hf_versions count: " << count);
-
-      if (!m_write_txn)
-        txn.commit();
-    }
-    catch (const std::exception& e)
-    {
-      throw0(DB_ERROR(std::string("Failed to clear two hard fork DBs: ").append(e.what()).c_str()));
-    }
-  }
-  delete db_stat1;
-  delete db_stat2;
-}
-
-void BlockchainBDB::drop_hard_fork_info()
-{
-  LOG_PRINT_L3("BlockchainBDB::" << __func__);
-  check_open();
-
-  bdb_txn_safe txn;
-  bdb_txn_safe* txn_ptr = &txn;
-  if (m_write_txn)
-    txn_ptr = m_write_txn;
-  else
-  {
-    if (m_env->txn_begin(NULL, txn, 0))
-      throw0(DB_ERROR("Failed to create a transaction for the db"));
-  }
-
-  try
-  {
-    m_hf_starting_heights->close(0);
-    m_hf_versions->close(0);
-    m_hf_starting_heights = nullptr;
-    m_hf_versions = nullptr;
-    if (m_env->dbremove(*txn_ptr, BDB_HF_STARTING_HEIGHTS, NULL, 0) != 0)
-      LOG_ERROR("Error removing hf_starting_heights");
-    if (m_env->dbremove(*txn_ptr, BDB_HF_VERSIONS, NULL, 0) != 0)
-      LOG_ERROR("Error removing hf_versions");
-
-    if (!m_write_txn)
-      txn.commit();
-  }
-  catch (const std::exception& e)
-  {
-    throw0(DB_ERROR(std::string("Failed to drop hard fork info: ").append(e.what()).c_str()));
-  }
-}
-
-void BlockchainBDB::set_hard_fork_version(uint64_t height, uint8_t version)
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    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."));
-}
-
-uint8_t BlockchainBDB::get_hard_fork_version(uint64_t height) const
-{
-    LOG_PRINT_L3("BlockchainBDB::" << __func__);
-    check_open();
-
-    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);
-    if (get_result == DB_NOTFOUND || get_result == DB_KEYEMPTY)
-        throw0(OUTPUT_DNE("Error attempting to retrieve hard fork version from the db"));
-    else if (get_result)
-        throw0(DB_ERROR("Error attempting to retrieve hard fork version from the db"));
-
-    return result;
-}
-
-void BlockchainBDB::checkpoint_worker() const
-{
-    LOG_PRINT_L0("Entering BDB checkpoint thread.");
-    int count = 0;
-    while(m_run_checkpoint && m_open)
-    {
-        // sleep every second, so we don't delay exit condition m_run_checkpoint = false
-        sleep(1);
-        // checkpoint every 5 minutes
-        if(count++ >= 300)
-        {
-            count = 0;
-            if(m_env->txn_checkpoint(0, 0, 0) != 0)
-            {
-                LOG_PRINT_L0("BDB txn_checkpoint failed.");
-                break;
-            }
-        }
-    }
-    LOG_PRINT_L0("Leaving BDB checkpoint thread.");
-}
-
-bool BlockchainBDB::is_read_only() const
-{
-  return false;
-}
-
-void BlockchainBDB::fixup()
-{
-  LOG_PRINT_L3("BlockchainBDB::" << __func__);
-  // Always call parent as well
-  BlockchainDB::fixup();
-}
-
-}  // namespace cryptonote
diff --git a/src/blockchain_db/berkeleydb/db_bdb.h b/src/blockchain_db/berkeleydb/db_bdb.h
deleted file mode 100644
index 3ae90efe1..000000000
--- a/src/blockchain_db/berkeleydb/db_bdb.h
+++ /dev/null
@@ -1,452 +0,0 @@
-// Copyright (c) 2014-2019, The Monero Project
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification, are
-// permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice, this list of
-//    conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright notice, this list
-//    of conditions and the following disclaimer in the documentation and/or other
-//    materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its contributors may be
-//    used to endorse or promote products derived from this software without specific
-//    prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <db_cxx.h>
-
-#include "blockchain_db/blockchain_db.h"
-#include "cryptonote_basic/blobdatatype.h" // for type blobdata
-
-#include <unordered_map>
-#include <condition_variable>
-
-// ND: Enables multi-threaded bulk reads for when getting indices.
-//     TODO: Disabled for now, as it doesn't seem to provide noticeable improvements (??. Reason: TBD.
-// #define BDB_BULK_CAN_THREAD
-namespace cryptonote
-{
-
-struct bdb_txn_safe
-{
-  bdb_txn_safe() : m_txn(NULL) { }
-  ~bdb_txn_safe()
-  {
-    LOG_PRINT_L3("bdb_txn_safe: destructor");
-
-    if (m_txn != NULL)
-      abort();
-  }
-
-  void commit(std::string message = "")
-  {
-    if (message.size() == 0)
-    {
-      message = "Failed to commit a transaction to the db";
-    }
-
-    if (m_txn->commit(0))
-    {
-      m_txn = NULL;
-      LOG_PRINT_L0(message);
-      throw DB_ERROR(message.c_str());
-    }
-    m_txn = NULL;
-  }
-
-  void abort()
-  {
-    LOG_PRINT_L3("bdb_txn_safe: abort()");
-    if(m_txn != NULL)
-    {
-      m_txn->abort();
-      m_txn = NULL;
-    }
-    else
-    {
-      LOG_PRINT_L0("WARNING: bdb_txn_safe: abort() called, but m_txn is NULL");
-    }
-  }
-
-  operator DbTxn*()
-  {
-    return m_txn;
-  }
-
-  operator DbTxn**()
-  {
-    return &m_txn;
-  }
-private:
-  DbTxn* m_txn;
-};
-
-// ND: Class to handle buffer management when doing bulk queries
-// (DB_MULTIPLE). Allocates buffers then handles thread queuing
-// so a fixed set of buffers can be used (instead of allocating
-// every time a bulk query is needed).
-template <typename T>
-class bdb_safe_buffer
-{
-  // limit the number of buffers to 8
-  const size_t MaxAllowedBuffers = 8;
-public:
-    bdb_safe_buffer(size_t num_buffers, size_t count)
-    {
-      if(num_buffers > MaxAllowedBuffers)
-        num_buffers = MaxAllowedBuffers;
-
-      set_count(num_buffers);
-      for (size_t i = 0; i < num_buffers; i++)
-        m_buffers.push_back((T) malloc(sizeof(T) * count));
-      m_buffer_count = count;
-    }
-
-    ~bdb_safe_buffer()
-    {
-        for (size_t i = 0; i < m_buffers.size(); i++)
-        {
-            if (m_buffers[i])
-            {
-                free(m_buffers[i]);
-                m_buffers[i] = nullptr;
-            }
-        }
-
-        m_buffers.resize(0);
-    }
-
-    T acquire_buffer()
-    {
-        boost::unique_lock<boost::mutex> lock(m_lock);
-        m_cv.wait(lock, [&]{ return m_count > 0; });
-
-        --m_count;
-        size_t index = -1;
-        for (size_t i = 0; i < m_open_slot.size(); i++)
-        {
-            if (m_open_slot[i])
-            {
-                m_open_slot[i] = false;
-                index = i;
-                break;
-            }
-        }
-
-        assert(index >= 0);
-
-        T buffer = m_buffers[index];
-        m_buffer_map.emplace(buffer, index);
-        return buffer;
-    }
-
-    void release_buffer(T buffer)
-    {
-        boost::unique_lock<boost::mutex> lock(m_lock);
-
-        assert(buffer != nullptr);
-        auto it = m_buffer_map.find(buffer);
-        if (it != m_buffer_map.end())
-        {
-            auto index = it->second;
-
-            assert(index < m_open_slot.size());
-            assert(m_open_slot[index] == false);
-            assert(m_count < m_open_slot.size());
-
-            ++m_count;
-            m_open_slot[index] = true;
-            m_buffer_map.erase(it);
-            m_cv.notify_one();
-        }
-    }
-
-    size_t get_buffer_size() const
-    {
-        return m_buffer_count * sizeof(T);
-    }
-
-    size_t get_buffer_count() const
-    {
-        return m_buffer_count;
-    }
-
-    typedef T type;
-
-private:
-    void set_count(size_t count)
-    {
-        assert(count > 0);
-        m_open_slot.resize(count, true);
-        m_count = count;
-    }
-
-    std::vector<T> m_buffers;
-    std::unordered_map<T, size_t> m_buffer_map;
-
-    boost::condition_variable m_cv;
-    std::vector<bool> m_open_slot;
-    size_t m_count;
-    boost::mutex m_lock;
-
-    size_t m_buffer_count;
-};
-
-template <typename T>
-class bdb_safe_buffer_autolock
-{
-public:
-    bdb_safe_buffer_autolock(T &safe_buffer, typename T::type &buffer) :
-        m_safe_buffer(safe_buffer), m_buffer(nullptr)
-    {
-        m_buffer = m_safe_buffer.acquire_buffer();
-        buffer = m_buffer;
-    }
-
-    ~bdb_safe_buffer_autolock()
-    {
-        if (m_buffer != nullptr)
-        {
-            m_safe_buffer.release_buffer(m_buffer);
-            m_buffer = nullptr;
-        }
-    }
-private:
-    T &m_safe_buffer;
-    typename T::type m_buffer;
-};
-
-class BlockchainBDB : public BlockchainDB
-{
-public:
-  BlockchainBDB(bool batch_transactions=false);
-  ~BlockchainBDB();
-
-  virtual void open(const std::string& filename, const int db_flags);
-
-  virtual void close();
-
-  virtual void sync();
-
-  virtual void reset();
-
-  virtual std::vector<std::string> get_filenames() const;
-
-  virtual bool remove_data_file(const std::string& folder);
-
-  virtual std::string get_db_name() const;
-
-  virtual bool lock();
-
-  virtual void unlock();
-
-  virtual bool block_exists(const crypto::hash& h, uint64_t *height = NULL) const;
-
-  virtual block get_block(const crypto::hash& h) const;
-
-  virtual uint64_t get_block_height(const crypto::hash& h) const;
-
-  virtual block_header get_block_header(const crypto::hash& h) const;
-
-  virtual block get_block_from_height(const uint64_t& height) const;
-
-  virtual uint64_t get_block_timestamp(const uint64_t& height) const;
-
-  virtual uint64_t get_top_block_timestamp() const;
-
-  virtual size_t get_block_weight(const uint64_t& height) const;
-
-  virtual difficulty_type get_block_cumulative_difficulty(const uint64_t& height) const;
-
-  virtual difficulty_type get_block_difficulty(const uint64_t& height) const;
-
-  virtual uint64_t get_block_already_generated_coins(const uint64_t& height) const;
-
-  virtual crypto::hash get_block_hash_from_height(const uint64_t& height) const;
-
-  virtual std::vector<block> get_blocks_range(const uint64_t& h1, const uint64_t& h2) const;
-
-  virtual std::vector<crypto::hash> get_hashes_range(const uint64_t& h1, const uint64_t& h2) const;
-
-  virtual crypto::hash top_block_hash() const;
-
-  virtual block get_top_block() const;
-
-  virtual uint64_t height() const;
-
-  virtual bool tx_exists(const crypto::hash& h) const;
-
-  virtual uint64_t get_tx_unlock_time(const crypto::hash& h) const;
-
-  virtual transaction get_tx(const crypto::hash& h) const;
-
-  virtual uint64_t get_tx_count() const;
-
-  virtual std::vector<transaction> get_tx_list(const std::vector<crypto::hash>& hlist) const;
-
-  virtual uint64_t get_tx_block_height(const crypto::hash& h) const;
-
-  virtual uint64_t get_num_outputs(const uint64_t& amount) const;
-
-  virtual uint64_t get_indexing_base() const { return 1; }
-
-  virtual output_data_t get_output_key(const uint64_t& amount, const uint64_t& index);
-  virtual void get_output_key(const uint64_t &amount, const std::vector<uint64_t> &offsets, std::vector<output_data_t> &outputs);
-
-  virtual tx_out_index get_output_tx_and_index_from_global(const uint64_t& index) const;
-  virtual void get_output_tx_and_index_from_global(const std::vector<uint64_t> &global_indices,
-          std::vector<tx_out_index> &tx_out_indices) const;
-
-  virtual tx_out_index get_output_tx_and_index(const uint64_t& amount, const uint64_t& index);
-  virtual void get_output_tx_and_index(const uint64_t& amount, const std::vector<uint64_t> &offsets, std::vector<tx_out_index> &indices);
-
-  virtual std::vector<uint64_t> get_tx_amount_output_indices(const crypto::hash& h) const;
-
-  virtual bool has_key_image(const crypto::key_image& img) const;
-
-  virtual uint64_t add_block( const block& blk
-                            , size_t block_weight
-                            , const difficulty_type& cumulative_difficulty
-                            , const uint64_t& coins_generated
-                            , const std::vector<transaction>& txs
-                            );
-
-  virtual void set_batch_transactions(bool batch_transactions);
-  virtual bool batch_start(uint64_t batch_num_blocks=0);
-  virtual void batch_commit();
-  virtual void batch_stop();
-  virtual void batch_abort();
-
-  virtual void block_txn_start(bool readonly);
-  virtual void block_txn_stop();
-  virtual void block_txn_abort();
-
-  virtual void pop_block(block& blk, std::vector<transaction>& txs);
-
-#if defined(BDB_BULK_CAN_THREAD)
-  virtual bool can_thread_bulk_indices() const { return true; }
-#else
-  virtual bool can_thread_bulk_indices() const { return false; }
-#endif
-
-  /**
-   * @brief return a histogram of outputs on the blockchain
-   *
-   * @param amounts optional set of amounts to lookup
-   *
-   * @return a set of amount/instances
-   */
-  std::map<uint64_t, uint64_t> get_output_histogram(const std::vector<uint64_t> &amounts) const;
-
-private:
-  virtual void add_block( const block& blk
-                , size_t block_weight
-                , const difficulty_type& cumulative_difficulty
-                , const uint64_t& coins_generated
-                , const crypto::hash& block_hash
-                );
-
-  virtual void remove_block();
-
-  virtual void add_transaction_data(const crypto::hash& blk_hash, const transaction& tx, const crypto::hash& tx_hash, const crypto::hash& tx_prunable_hash);
-
-  virtual void remove_transaction_data(const crypto::hash& tx_hash, const transaction& tx);
-
-  virtual void add_output(const crypto::hash& tx_hash, const tx_out& tx_output, const uint64_t& local_index, const uint64_t unlock_time, const rct::key *commitment);
-
-  virtual void remove_output(const tx_out& tx_output);
-
-  void remove_tx_outputs(const crypto::hash& tx_hash, const transaction& tx);
-
-  void remove_output(const uint64_t& out_index, const uint64_t amount);
-  void remove_amount_output_index(const uint64_t amount, const uint64_t global_output_index);
-
-  virtual void add_spent_key(const crypto::key_image& k_image);
-
-  virtual void remove_spent_key(const crypto::key_image& k_image);
-
-  void get_output_global_indices(const uint64_t& amount, const std::vector<uint64_t> &offsets, std::vector<uint64_t> &global_indices);
-
-  virtual bool for_all_key_images(std::function<bool(const crypto::key_image&)>) const;
-  virtual bool for_all_blocks(std::function<bool(uint64_t, const crypto::hash&, const cryptonote::block&)>) const;
-  virtual bool for_all_transactions(std::function<bool(const crypto::hash&, const cryptonote::transaction&)>, bool pruned) const;
-  virtual bool for_all_outputs(std::function<bool(uint64_t amount, const crypto::hash &tx_hash, size_t tx_idx)> f) const;
-
-  // Hard fork related storage
-  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();
-  virtual void drop_hard_fork_info();
-
-  /**
-   * @brief get the global index of the index-th output of the given amount
-   *
-   * @param amount the output amount
-   * @param index the index into the set of outputs of that amount
-   *
-   * @return the global index of the desired output
-   */
-  uint64_t get_output_global_index(const uint64_t& amount, const uint64_t& index);
-  output_data_t get_output_key(const uint64_t& global_index) const;
-  void checkpoint_worker() const;
-  void check_open() const;
-
-  virtual bool is_read_only() const;
-
-  //
-  // fix up anything that may be wrong due to past bugs
-  virtual void fixup();
-
-  bool m_run_checkpoint;
-  std::unique_ptr<boost::thread> m_checkpoint_thread;
-  typedef bdb_safe_buffer<void *> bdb_safe_buffer_t;
-  bdb_safe_buffer_t m_buffer;
-
-  DbEnv* m_env;
-
-  Db* m_blocks;
-  Db* m_block_heights;
-  Db* m_block_hashes;
-  Db* m_block_timestamps;
-  Db* m_block_sizes;
-  Db* m_block_diffs;
-  Db* m_block_coins;
-
-  Db* m_txs;
-  Db* m_tx_unlocks;
-  Db* m_tx_heights;
-  Db* m_tx_outputs;
-
-  Db* m_output_txs;
-  Db* m_output_indices;
-  Db* m_output_amounts;
-  Db* m_output_keys;
-
-  Db* m_spent_keys;
-
-  Db* m_hf_starting_heights;
-  Db* m_hf_versions;
-
-  Db* m_properties;
-
-  uint64_t m_height;
-  uint64_t m_num_outputs;
-  std::string m_folder;
-  bdb_txn_safe *m_write_txn;
-
-  bool m_batch_transactions; // support for batch transactions
-};
-
-}  // namespace cryptonote
diff --git a/src/blockchain_db/blockchain_db.cpp b/src/blockchain_db/blockchain_db.cpp
index 2b039f557..63ac38a88 100644
--- a/src/blockchain_db/blockchain_db.cpp
+++ b/src/blockchain_db/blockchain_db.cpp
@@ -35,17 +35,6 @@
 #include "ringct/rctOps.h"
 
 #include "lmdb/db_lmdb.h"
-#ifdef BERKELEY_DB
-#include "berkeleydb/db_bdb.h"
-#endif
-
-static const char *db_types[] = {
-  "lmdb",
-#ifdef BERKELEY_DB
-  "berkeley",
-#endif
-  NULL
-};
 
 #undef MONERO_DEFAULT_LOG_CATEGORY
 #define MONERO_DEFAULT_LOG_CATEGORY "blockchain.db"
@@ -55,36 +44,6 @@ using epee::string_tools::pod_to_hex;
 namespace cryptonote
 {
 
-bool blockchain_valid_db_type(const std::string& db_type)
-{
-  int i;
-  for (i=0; db_types[i]; i++)
-  {
-    if (db_types[i] == db_type)
-      return true;
-  }
-  return false;
-}
-
-std::string blockchain_db_types(const std::string& sep)
-{
-  int i;
-  std::string ret = "";
-  for (i=0; db_types[i]; i++)
-  {
-    if (i)
-      ret += sep;
-    ret += db_types[i];
-  }
-  return ret;
-}
-
-std::string arg_db_type_description = "Specify database type, available: " + cryptonote::blockchain_db_types(", ");
-const command_line::arg_descriptor<std::string> arg_db_type = {
-  "db-type"
-, arg_db_type_description.c_str()
-, DEFAULT_DB_TYPE
-};
 const command_line::arg_descriptor<std::string> arg_db_sync_mode = {
   "db-sync-mode"
 , "Specify sync option, using format [safe|fast|fastest]:[sync|async]:[<nblocks_per_sync>[blocks]|<nbytes_per_sync>[bytes]]." 
@@ -96,20 +55,13 @@ const command_line::arg_descriptor<bool> arg_db_salvage  = {
 , false
 };
 
-BlockchainDB *new_db(const std::string& db_type)
+BlockchainDB *new_db()
 {
-  if (db_type == "lmdb")
-    return new BlockchainLMDB();
-#if defined(BERKELEY_DB)
-  if (db_type == "berkeley")
-    return new BlockchainBDB();
-#endif
-  return NULL;
+  return new BlockchainLMDB();
 }
 
 void BlockchainDB::init_options(boost::program_options::options_description& desc)
 {
-  command_line::add_arg(desc, arg_db_type);
   command_line::add_arg(desc, arg_db_sync_mode);
   command_line::add_arg(desc, arg_db_salvage);
 }
diff --git a/src/blockchain_db/blockchain_db.h b/src/blockchain_db/blockchain_db.h
index bb4de3ce6..8a6695cd8 100644
--- a/src/blockchain_db/blockchain_db.h
+++ b/src/blockchain_db/blockchain_db.h
@@ -102,7 +102,6 @@ namespace cryptonote
 /** a pair of <transaction hash, output index>, typedef for convenience */
 typedef std::pair<crypto::hash, uint64_t> tx_out_index;
 
-extern const command_line::arg_descriptor<std::string> arg_db_type;
 extern const command_line::arg_descriptor<std::string> arg_db_sync_mode;
 extern const command_line::arg_descriptor<bool, false> arg_db_salvage;
 
@@ -1826,7 +1825,7 @@ private:
 class db_rtxn_guard: public db_txn_guard { public: db_rtxn_guard(BlockchainDB *db): db_txn_guard(db, true) {} };
 class db_wtxn_guard: public db_txn_guard { public: db_wtxn_guard(BlockchainDB *db): db_txn_guard(db, false) {} };
 
-BlockchainDB *new_db(const std::string& db_type);
+BlockchainDB *new_db();
 
 }  // namespace cryptonote
 
diff --git a/src/blockchain_db/db_types.h b/src/blockchain_db/db_types.h
deleted file mode 100644
index 04cadbb10..000000000
--- a/src/blockchain_db/db_types.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) 2014-2019, The Monero Project
-//
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification, are
-// permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice, this list of
-//    conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright notice, this list
-//    of conditions and the following disclaimer in the documentation and/or other
-//    materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its contributors may be
-//    used to endorse or promote products derived from this software without specific
-//    prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
-#pragma once
-
-namespace cryptonote
-{
-  bool blockchain_valid_db_type(const std::string& db_type);
-  std::string blockchain_db_types(const std::string& sep);
-} // namespace cryptonote
diff --git a/src/blockchain_utilities/blockchain_ancestry.cpp b/src/blockchain_utilities/blockchain_ancestry.cpp
index a6ee0573f..db6d6f7d7 100644
--- a/src/blockchain_utilities/blockchain_ancestry.cpp
+++ b/src/blockchain_utilities/blockchain_ancestry.cpp
@@ -40,7 +40,6 @@
 #include "cryptonote_core/cryptonote_core.h"
 #include "cryptonote_core/blockchain.h"
 #include "blockchain_db/blockchain_db.h"
-#include "blockchain_db/db_types.h"
 #include "version.h"
 
 #undef MONERO_DEFAULT_LOG_CATEGORY
@@ -336,11 +335,6 @@ int main(int argc, char* argv[])
 
   epee::string_tools::set_module_name_and_folder(argv[0]);
 
-  std::string default_db_type = "lmdb";
-
-  std::string available_dbs = cryptonote::blockchain_db_types(", ");
-  available_dbs = "available: " + available_dbs;
-
   uint32_t log_level = 0;
 
   tools::on_startup();
@@ -350,9 +344,6 @@ int main(int argc, char* argv[])
   po::options_description desc_cmd_only("Command line options");
   po::options_description desc_cmd_sett("Command line options and settings options");
   const command_line::arg_descriptor<std::string> arg_log_level  = {"log-level",  "0-4 or categories", ""};
-  const command_line::arg_descriptor<std::string> arg_database = {
-    "database", available_dbs.c_str(), default_db_type
-  };
   const command_line::arg_descriptor<std::string> arg_txid  = {"txid", "Get ancestry for this txid", ""};
   const command_line::arg_descriptor<std::string> arg_output  = {"output", "Get ancestry for this output (amount/offset format)", ""};
   const command_line::arg_descriptor<uint64_t> arg_height  = {"height", "Get ancestry for all txes at this height", 0};
@@ -367,7 +358,6 @@ int main(int argc, char* argv[])
   command_line::add_arg(desc_cmd_sett, cryptonote::arg_testnet_on);
   command_line::add_arg(desc_cmd_sett, cryptonote::arg_stagenet_on);
   command_line::add_arg(desc_cmd_sett, arg_log_level);
-  command_line::add_arg(desc_cmd_sett, arg_database);
   command_line::add_arg(desc_cmd_sett, arg_txid);
   command_line::add_arg(desc_cmd_sett, arg_output);
   command_line::add_arg(desc_cmd_sett, arg_height);
@@ -446,13 +436,6 @@ int main(int argc, char* argv[])
     }
   }
 
-  std::string db_type = command_line::get_arg(vm, arg_database);
-  if (!cryptonote::blockchain_valid_db_type(db_type))
-  {
-    std::cerr << "Invalid database type: " << db_type << std::endl;
-    return 1;
-  }
-
   // If we wanted to use the memory pool, we would set up a fake_core.
 
   // Use Blockchain instead of lower-level BlockchainDB for two reasons:
@@ -468,13 +451,13 @@ int main(int argc, char* argv[])
   std::unique_ptr<Blockchain> core_storage;
   tx_memory_pool m_mempool(*core_storage);
   core_storage.reset(new Blockchain(m_mempool));
-  BlockchainDB *db = new_db(db_type);
+  BlockchainDB *db = new_db();
   if (db == NULL)
   {
-    LOG_ERROR("Attempted to use non-existent database type: " << db_type);
-    throw std::runtime_error("Attempting to use non-existent database type");
+    LOG_ERROR("Failed to initialize a database");
+    throw std::runtime_error("Failed to initialize a database");
   }
-  LOG_PRINT_L0("database: " << db_type);
+  LOG_PRINT_L0("database: LMDB");
 
   const std::string filename = (boost::filesystem::path(opt_data_dir) / db->get_db_name()).string();
   LOG_PRINT_L0("Loading blockchain from folder " << filename << " ...");
diff --git a/src/blockchain_utilities/blockchain_blackball.cpp b/src/blockchain_utilities/blockchain_blackball.cpp
index 857e97afd..4a5712921 100644
--- a/src/blockchain_utilities/blockchain_blackball.cpp
+++ b/src/blockchain_utilities/blockchain_blackball.cpp
@@ -39,7 +39,6 @@
 #include "cryptonote_core/cryptonote_core.h"
 #include "cryptonote_core/blockchain.h"
 #include "blockchain_db/blockchain_db.h"
-#include "blockchain_db/db_types.h"
 #include "wallet/ringdb.h"
 #include "version.h"
 
@@ -1170,11 +1169,6 @@ int main(int argc, char* argv[])
 
   epee::string_tools::set_module_name_and_folder(argv[0]);
 
-  std::string default_db_type = "lmdb";
-
-  std::string available_dbs = cryptonote::blockchain_db_types(", ");
-  available_dbs = "available: " + available_dbs;
-
   uint32_t log_level = 0;
 
   tools::on_startup();
@@ -1188,9 +1182,6 @@ int main(int argc, char* argv[])
       get_default_db_path(),
   };
   const command_line::arg_descriptor<std::string> arg_log_level  = {"log-level",  "0-4 or categories", ""};
-  const command_line::arg_descriptor<std::string> arg_database = {
-    "database", available_dbs.c_str(), default_db_type
-  };
   const command_line::arg_descriptor<bool> arg_rct_only  = {"rct-only", "Only work on ringCT outputs", false};
   const command_line::arg_descriptor<bool> arg_check_subsets  = {"check-subsets", "Check ring subsets (very expensive)", false};
   const command_line::arg_descriptor<bool> arg_verbose  = {"verbose", "Verbose output)", false};
@@ -1207,7 +1198,6 @@ int main(int argc, char* argv[])
 
   command_line::add_arg(desc_cmd_sett, arg_blackball_db_dir);
   command_line::add_arg(desc_cmd_sett, arg_log_level);
-  command_line::add_arg(desc_cmd_sett, arg_database);
   command_line::add_arg(desc_cmd_sett, arg_rct_only);
   command_line::add_arg(desc_cmd_sett, arg_check_subsets);
   command_line::add_arg(desc_cmd_sett, arg_verbose);
@@ -1261,12 +1251,6 @@ int main(int argc, char* argv[])
   std::string extra_spent_list = command_line::get_arg(vm, arg_extra_spent_list);
   std::vector<std::pair<uint64_t, uint64_t>> extra_spent_outputs = extra_spent_list.empty() ? std::vector<std::pair<uint64_t, uint64_t>>() : load_outputs(extra_spent_list);
 
-  std::string db_type = command_line::get_arg(vm, arg_database);
-  if (!cryptonote::blockchain_valid_db_type(db_type))
-  {
-    std::cerr << "Invalid database type: " << db_type << std::endl;
-    return 1;
-  }
 
   std::string db_sync_mode = command_line::get_arg(vm, arg_db_sync_mode);
   if (!parse_db_sync_mode(db_sync_mode))
diff --git a/src/blockchain_utilities/blockchain_depth.cpp b/src/blockchain_utilities/blockchain_depth.cpp
index 8be83ee67..153f5f7c6 100644
--- a/src/blockchain_utilities/blockchain_depth.cpp
+++ b/src/blockchain_utilities/blockchain_depth.cpp
@@ -34,7 +34,6 @@
 #include "cryptonote_core/cryptonote_core.h"
 #include "cryptonote_core/blockchain.h"
 #include "blockchain_db/blockchain_db.h"
-#include "blockchain_db/db_types.h"
 #include "version.h"
 
 #undef MONERO_DEFAULT_LOG_CATEGORY
@@ -50,11 +49,6 @@ int main(int argc, char* argv[])
 
   epee::string_tools::set_module_name_and_folder(argv[0]);
 
-  std::string default_db_type = "lmdb";
-
-  std::string available_dbs = cryptonote::blockchain_db_types(", ");
-  available_dbs = "available: " + available_dbs;
-
   uint32_t log_level = 0;
 
   tools::on_startup();
@@ -64,9 +58,6 @@ int main(int argc, char* argv[])
   po::options_description desc_cmd_only("Command line options");
   po::options_description desc_cmd_sett("Command line options and settings options");
   const command_line::arg_descriptor<std::string> arg_log_level  = {"log-level",  "0-4 or categories", ""};
-  const command_line::arg_descriptor<std::string> arg_database = {
-    "database", available_dbs.c_str(), default_db_type
-  };
   const command_line::arg_descriptor<std::string> arg_txid  = {"txid", "Get min depth for this txid", ""};
   const command_line::arg_descriptor<uint64_t> arg_height  = {"height", "Get min depth for all txes at this height", 0};
   const command_line::arg_descriptor<bool> arg_include_coinbase  = {"include-coinbase", "Include coinbase in the average", false};
@@ -75,7 +66,6 @@ int main(int argc, char* argv[])
   command_line::add_arg(desc_cmd_sett, cryptonote::arg_testnet_on);
   command_line::add_arg(desc_cmd_sett, cryptonote::arg_stagenet_on);
   command_line::add_arg(desc_cmd_sett, arg_log_level);
-  command_line::add_arg(desc_cmd_sett, arg_database);
   command_line::add_arg(desc_cmd_sett, arg_txid);
   command_line::add_arg(desc_cmd_sett, arg_height);
   command_line::add_arg(desc_cmd_sett, arg_include_coinbase);
@@ -133,13 +123,6 @@ int main(int argc, char* argv[])
     }
   }
 
-  std::string db_type = command_line::get_arg(vm, arg_database);
-  if (!cryptonote::blockchain_valid_db_type(db_type))
-  {
-    std::cerr << "Invalid database type: " << db_type << std::endl;
-    return 1;
-  }
-
   // If we wanted to use the memory pool, we would set up a fake_core.
 
   // Use Blockchain instead of lower-level BlockchainDB for two reasons:
@@ -155,13 +138,13 @@ int main(int argc, char* argv[])
   std::unique_ptr<Blockchain> core_storage;
   tx_memory_pool m_mempool(*core_storage);
   core_storage.reset(new Blockchain(m_mempool));
-  BlockchainDB *db = new_db(db_type);
+  BlockchainDB *db = new_db();
   if (db == NULL)
   {
-    LOG_ERROR("Attempted to use non-existent database type: " << db_type);
-    throw std::runtime_error("Attempting to use non-existent database type");
+    LOG_ERROR("Failed to initialize a database");
+    throw std::runtime_error("Failed to initialize a database");
   }
-  LOG_PRINT_L0("database: " << db_type);
+  LOG_PRINT_L0("database: LMDB");
 
   const std::string filename = (boost::filesystem::path(opt_data_dir) / db->get_db_name()).string();
   LOG_PRINT_L0("Loading blockchain from folder " << filename << " ...");
diff --git a/src/blockchain_utilities/blockchain_export.cpp b/src/blockchain_utilities/blockchain_export.cpp
index 85566efca..b180f88de 100644
--- a/src/blockchain_utilities/blockchain_export.cpp
+++ b/src/blockchain_utilities/blockchain_export.cpp
@@ -32,7 +32,6 @@
 #include "cryptonote_core/tx_pool.h"
 #include "cryptonote_core/cryptonote_core.h"
 #include "blockchain_db/blockchain_db.h"
-#include "blockchain_db/db_types.h"
 #include "version.h"
 
 #undef MONERO_DEFAULT_LOG_CATEGORY
@@ -47,11 +46,6 @@ int main(int argc, char* argv[])
 
   epee::string_tools::set_module_name_and_folder(argv[0]);
 
-  std::string default_db_type = "lmdb";
-
-  std::string available_dbs = cryptonote::blockchain_db_types(", ");
-  available_dbs = "available: " + available_dbs;
-
   uint32_t log_level = 0;
   uint64_t block_stop = 0;
   bool blocks_dat = false;
@@ -65,9 +59,6 @@ int main(int argc, char* argv[])
   const command_line::arg_descriptor<std::string> arg_output_file = {"output-file", "Specify output file", "", true};
   const command_line::arg_descriptor<std::string> arg_log_level  = {"log-level",  "0-4 or categories", ""};
   const command_line::arg_descriptor<uint64_t> arg_block_stop = {"block-stop", "Stop at block number", block_stop};
-  const command_line::arg_descriptor<std::string> arg_database = {
-    "database", available_dbs.c_str(), default_db_type
-  };
   const command_line::arg_descriptor<bool> arg_blocks_dat = {"blocksdat", "Output in blocks.dat format", blocks_dat};
 
 
@@ -76,7 +67,6 @@ int main(int argc, char* argv[])
   command_line::add_arg(desc_cmd_sett, cryptonote::arg_testnet_on);
   command_line::add_arg(desc_cmd_sett, cryptonote::arg_stagenet_on);
   command_line::add_arg(desc_cmd_sett, arg_log_level);
-  command_line::add_arg(desc_cmd_sett, arg_database);
   command_line::add_arg(desc_cmd_sett, arg_block_stop);
   command_line::add_arg(desc_cmd_sett, arg_blocks_dat);
 
@@ -124,13 +114,6 @@ int main(int argc, char* argv[])
 
   m_config_folder = command_line::get_arg(vm, cryptonote::arg_data_dir);
 
-  std::string db_type = command_line::get_arg(vm, arg_database);
-  if (!cryptonote::blockchain_valid_db_type(db_type))
-  {
-    std::cerr << "Invalid database type: " << db_type << std::endl;
-    return 1;
-  }
-
   if (command_line::has_arg(vm, arg_output_file))
     output_file_path = boost::filesystem::path(command_line::get_arg(vm, arg_output_file));
   else
@@ -153,13 +136,13 @@ int main(int argc, char* argv[])
   tx_memory_pool m_mempool(*core_storage);
   core_storage = new Blockchain(m_mempool);
 
-  BlockchainDB* db = new_db(db_type);
+  BlockchainDB* db = new_db();
   if (db == NULL)
   {
-    LOG_ERROR("Attempted to use non-existent database type: " << db_type);
-    throw std::runtime_error("Attempting to use non-existent database type");
+    LOG_ERROR("Failed to initialize a database");
+    throw std::runtime_error("Failed to initialize a database");
   }
-  LOG_PRINT_L0("database: " << db_type);
+  LOG_PRINT_L0("database: LMDB");
 
   boost::filesystem::path folder(m_config_folder);
   folder /= db->get_db_name();
diff --git a/src/blockchain_utilities/blockchain_import.cpp b/src/blockchain_utilities/blockchain_import.cpp
index 801fe34ef..a285c2bd0 100644
--- a/src/blockchain_utilities/blockchain_import.cpp
+++ b/src/blockchain_utilities/blockchain_import.cpp
@@ -42,7 +42,6 @@
 #include "serialization/binary_utils.h" // dump_binary(), parse_binary()
 #include "serialization/json_utils.h" // dump_json()
 #include "include_base_utils.h"
-#include "blockchain_db/db_types.h"
 #include "cryptonote_core/cryptonote_core.h"
 
 #undef MONERO_DEFAULT_LOG_CATEGORY
@@ -93,44 +92,6 @@ int get_db_flags_from_mode(const std::string& db_mode)
   return db_flags;
 }
 
-int parse_db_arguments(const std::string& db_arg_str, std::string& db_type, int& db_flags)
-{
-  std::vector<std::string> db_args;
-  boost::split(db_args, db_arg_str, boost::is_any_of("#"));
-  db_type = db_args.front();
-  boost::algorithm::trim(db_type);
-
-  if (db_args.size() == 1)
-  {
-    return 0;
-  }
-  else if (db_args.size() > 2)
-  {
-    std::cerr << "unrecognized database argument format: " << db_arg_str << ENDL;
-    return 1;
-  }
-
-  std::string db_arg_str2 = db_args[1];
-  boost::split(db_args, db_arg_str2, boost::is_any_of(","));
-
-  // optionally use a composite mode instead of individual flags
-  const std::unordered_set<std::string> db_modes {"safe", "fast", "fastest"};
-  std::string db_mode;
-  if (db_args.size() == 1)
-  {
-    if (db_modes.count(db_args[0]) > 0)
-    {
-      db_mode = db_args[0];
-    }
-  }
-  if (! db_mode.empty())
-  {
-    db_flags = get_db_flags_from_mode(db_mode);
-  }
-  return 0;
-}
-
-
 int pop_blocks(cryptonote::core& core, int num_blocks)
 {
   bool use_batch = opt_batch;
@@ -594,11 +555,6 @@ int main(int argc, char* argv[])
 
   epee::string_tools::set_module_name_and_folder(argv[0]);
 
-  std::string default_db_type = "lmdb";
-
-  std::string available_dbs = cryptonote::blockchain_db_types(", ");
-  available_dbs = "available: " + available_dbs;
-
   uint32_t log_level = 0;
   uint64_t num_blocks = 0;
   uint64_t block_stop = 0;
@@ -622,9 +578,6 @@ int main(int argc, char* argv[])
       , "Count blocks in bootstrap file and exit"
       , false
   };
-  const command_line::arg_descriptor<std::string> arg_database = {
-    "database", available_dbs.c_str(), default_db_type
-  };
   const command_line::arg_descriptor<bool> arg_noverify =  {"dangerous-unverified-import",
     "Blindly trust the import file and use potentially malicious blocks and transactions during import (only enable if you exported the file yourself)", false};
   const command_line::arg_descriptor<bool> arg_batch  =  {"batch",
@@ -634,7 +587,6 @@ int main(int argc, char* argv[])
 
   command_line::add_arg(desc_cmd_sett, arg_input_file);
   command_line::add_arg(desc_cmd_sett, arg_log_level);
-  command_line::add_arg(desc_cmd_sett, arg_database);
   command_line::add_arg(desc_cmd_sett, arg_batch_size);
   command_line::add_arg(desc_cmd_sett, arg_block_stop);
 
@@ -709,7 +661,6 @@ int main(int argc, char* argv[])
     return 1;
   }
   m_config_folder = command_line::get_arg(vm, cryptonote::arg_data_dir);
-  db_arg_str = command_line::get_arg(vm, arg_database);
 
   mlog_configure(mlog_get_default_log_path("monero-blockchain-import.log"), true);
   if (!command_line::is_arg_defaulted(vm, arg_log_level))
@@ -735,25 +686,7 @@ int main(int argc, char* argv[])
     return 0;
   }
 
-
-  std::string db_type;
-  int db_flags = 0;
-  int res = 0;
-  res = parse_db_arguments(db_arg_str, db_type, db_flags);
-  if (res)
-  {
-    std::cerr << "Error parsing database argument(s)" << ENDL;
-    return 1;
-  }
-
-  if (!cryptonote::blockchain_valid_db_type(db_type))
-  {
-    std::cerr << "Invalid database type: " << db_type << std::endl;
-    return 1;
-  }
-
-  MINFO("database: " << db_type);
-  MINFO("database flags: " << db_flags);
+  MINFO("database: LMDB");
   MINFO("verify:  " << std::boolalpha << opt_verify << std::noboolalpha);
   if (opt_batch)
   {
diff --git a/src/blockchain_utilities/blockchain_prune.cpp b/src/blockchain_utilities/blockchain_prune.cpp
index 8e13f2c04..9a9d58c46 100644
--- a/src/blockchain_utilities/blockchain_prune.cpp
+++ b/src/blockchain_utilities/blockchain_prune.cpp
@@ -35,7 +35,6 @@
 #include "cryptonote_core/blockchain.h"
 #include "blockchain_db/blockchain_db.h"
 #include "blockchain_db/lmdb/db_lmdb.h"
-#include "blockchain_db/db_types.h"
 #include "version.h"
 
 #undef MONERO_DEFAULT_LOG_CATEGORY
@@ -441,11 +440,6 @@ int main(int argc, char* argv[])
 
   epee::string_tools::set_module_name_and_folder(argv[0]);
 
-  std::string default_db_type = "lmdb";
-
-  std::string available_dbs = cryptonote::blockchain_db_types(", ");
-  available_dbs = "available: " + available_dbs;
-
   uint32_t log_level = 0;
 
   tools::on_startup();
@@ -455,9 +449,6 @@ int main(int argc, char* argv[])
   po::options_description desc_cmd_only("Command line options");
   po::options_description desc_cmd_sett("Command line options and settings options");
   const command_line::arg_descriptor<std::string> arg_log_level  = {"log-level",  "0-4 or categories", ""};
-  const command_line::arg_descriptor<std::string> arg_database = {
-    "database", available_dbs.c_str(), default_db_type
-  };
   const command_line::arg_descriptor<std::string> arg_db_sync_mode = {
     "db-sync-mode"
   , "Specify sync option, using format [safe|fast|fastest]:[nrecords_per_sync]."
@@ -469,7 +460,6 @@ int main(int argc, char* argv[])
   command_line::add_arg(desc_cmd_sett, cryptonote::arg_testnet_on);
   command_line::add_arg(desc_cmd_sett, cryptonote::arg_stagenet_on);
   command_line::add_arg(desc_cmd_sett, arg_log_level);
-  command_line::add_arg(desc_cmd_sett, arg_database);
   command_line::add_arg(desc_cmd_sett, arg_db_sync_mode);
   command_line::add_arg(desc_cmd_sett, arg_copy_pruned_database);
   command_line::add_arg(desc_cmd_only, command_line::arg_help);
@@ -511,18 +501,6 @@ int main(int argc, char* argv[])
   while (boost::ends_with(data_dir, "/") || boost::ends_with(data_dir, "\\"))
     data_dir.pop_back();
 
-  std::string db_type = command_line::get_arg(vm, arg_database);
-  if (!cryptonote::blockchain_valid_db_type(db_type))
-  {
-    MERROR("Invalid database type: " << db_type);
-    return 1;
-  }
-  if (db_type != "lmdb")
-  {
-    MERROR("Unsupported database type: " << db_type << ". Only lmdb is supported");
-    return 1;
-  }
-
   std::string db_sync_mode = command_line::get_arg(vm, arg_db_sync_mode);
   uint64_t db_flags = 0;
   if (!parse_db_sync_mode(db_sync_mode, db_flags))
@@ -552,13 +530,12 @@ int main(int argc, char* argv[])
   {
     core_storage[n].reset(new Blockchain(m_mempool));
 
-    BlockchainDB* db = new_db(db_type);
+    BlockchainDB* db = new_db();
     if (db == NULL)
     {
-      MERROR("Attempted to use non-existent database type: " << db_type);
-      throw std::runtime_error("Attempting to use non-existent database type");
+      MERROR("Failed to initialize a database");
+      throw std::runtime_error("Failed to initialize a database");
     }
-    MDEBUG("database: " << db_type);
 
     if (n == 1)
     {
diff --git a/src/blockchain_utilities/blockchain_prune_known_spent_data.cpp b/src/blockchain_utilities/blockchain_prune_known_spent_data.cpp
index 2d49b6ecd..cee24d4da 100644
--- a/src/blockchain_utilities/blockchain_prune_known_spent_data.cpp
+++ b/src/blockchain_utilities/blockchain_prune_known_spent_data.cpp
@@ -33,7 +33,6 @@
 #include "cryptonote_core/cryptonote_core.h"
 #include "cryptonote_core/blockchain.h"
 #include "blockchain_db/blockchain_db.h"
-#include "blockchain_db/db_types.h"
 #include "version.h"
 
 #undef MONERO_DEFAULT_LOG_CATEGORY
@@ -102,11 +101,6 @@ int main(int argc, char* argv[])
 
   epee::string_tools::set_module_name_and_folder(argv[0]);
 
-  std::string default_db_type = "lmdb";
-
-  std::string available_dbs = cryptonote::blockchain_db_types(", ");
-  available_dbs = "available: " + available_dbs;
-
   uint32_t log_level = 0;
 
   tools::on_startup();
@@ -114,9 +108,6 @@ int main(int argc, char* argv[])
   po::options_description desc_cmd_only("Command line options");
   po::options_description desc_cmd_sett("Command line options and settings options");
   const command_line::arg_descriptor<std::string> arg_log_level  = {"log-level",  "0-4 or categories", ""};
-  const command_line::arg_descriptor<std::string> arg_database = {
-    "database", available_dbs.c_str(), default_db_type
-  };
   const command_line::arg_descriptor<bool> arg_verbose  = {"verbose", "Verbose output", false};
   const command_line::arg_descriptor<bool> arg_dry_run  = {"dry-run", "Do not actually prune", false};
   const command_line::arg_descriptor<std::string> arg_input = {"input", "Path to the known spent outputs file"};
@@ -125,7 +116,6 @@ int main(int argc, char* argv[])
   command_line::add_arg(desc_cmd_sett, cryptonote::arg_testnet_on);
   command_line::add_arg(desc_cmd_sett, cryptonote::arg_stagenet_on);
   command_line::add_arg(desc_cmd_sett, arg_log_level);
-  command_line::add_arg(desc_cmd_sett, arg_database);
   command_line::add_arg(desc_cmd_sett, arg_verbose);
   command_line::add_arg(desc_cmd_sett, arg_dry_run);
   command_line::add_arg(desc_cmd_sett, arg_input);
@@ -167,26 +157,18 @@ int main(int argc, char* argv[])
   bool opt_verbose = command_line::get_arg(vm, arg_verbose);
   bool opt_dry_run = command_line::get_arg(vm, arg_dry_run);
 
-  std::string db_type = command_line::get_arg(vm, arg_database);
-  if (!cryptonote::blockchain_valid_db_type(db_type))
-  {
-    std::cerr << "Invalid database type: " << db_type << std::endl;
-    return 1;
-  }
-
   const std::string input = command_line::get_arg(vm, arg_input);
 
   LOG_PRINT_L0("Initializing source blockchain (BlockchainDB)");
   std::unique_ptr<Blockchain> core_storage;
   tx_memory_pool m_mempool(*core_storage);
   core_storage.reset(new Blockchain(m_mempool));
-  BlockchainDB *db = new_db(db_type);
+  BlockchainDB *db = new_db();
   if (db == NULL)
   {
-    LOG_ERROR("Attempted to use non-existent database type: " << db_type);
-    throw std::runtime_error("Attempting to use non-existent database type");
+    LOG_ERROR("Failed to initialize a database");
+    throw std::runtime_error("Failed to initialize a database");
   }
-  LOG_PRINT_L0("database: " << db_type);
 
   const std::string filename = (boost::filesystem::path(opt_data_dir) / db->get_db_name()).string();
   LOG_PRINT_L0("Loading blockchain from folder " << filename << " ...");
diff --git a/src/blockchain_utilities/blockchain_stats.cpp b/src/blockchain_utilities/blockchain_stats.cpp
index 33c26277e..2f66d54aa 100644
--- a/src/blockchain_utilities/blockchain_stats.cpp
+++ b/src/blockchain_utilities/blockchain_stats.cpp
@@ -34,7 +34,6 @@
 #include "cryptonote_core/cryptonote_core.h"
 #include "cryptonote_core/blockchain.h"
 #include "blockchain_db/blockchain_db.h"
-#include "blockchain_db/db_types.h"
 #include "version.h"
 
 #undef MONERO_DEFAULT_LOG_CATEGORY
@@ -52,11 +51,6 @@ int main(int argc, char* argv[])
 
   epee::string_tools::set_module_name_and_folder(argv[0]);
 
-  std::string default_db_type = "lmdb";
-
-  std::string available_dbs = cryptonote::blockchain_db_types(", ");
-  available_dbs = "available: " + available_dbs;
-
   uint32_t log_level = 0;
   uint64_t block_start = 0;
   uint64_t block_stop = 0;
@@ -68,9 +62,6 @@ int main(int argc, char* argv[])
   po::options_description desc_cmd_only("Command line options");
   po::options_description desc_cmd_sett("Command line options and settings options");
   const command_line::arg_descriptor<std::string> arg_log_level  = {"log-level",  "0-4 or categories", ""};
-  const command_line::arg_descriptor<std::string> arg_database = {
-    "database", available_dbs.c_str(), default_db_type
-  };
   const command_line::arg_descriptor<uint64_t> arg_block_start  = {"block-start", "start at block number", block_start};
   const command_line::arg_descriptor<uint64_t> arg_block_stop = {"block-stop", "Stop at block number", block_stop};
   const command_line::arg_descriptor<bool> arg_inputs  = {"with-inputs", "with input stats", false};
@@ -82,7 +73,6 @@ int main(int argc, char* argv[])
   command_line::add_arg(desc_cmd_sett, cryptonote::arg_testnet_on);
   command_line::add_arg(desc_cmd_sett, cryptonote::arg_stagenet_on);
   command_line::add_arg(desc_cmd_sett, arg_log_level);
-  command_line::add_arg(desc_cmd_sett, arg_database);
   command_line::add_arg(desc_cmd_sett, arg_block_start);
   command_line::add_arg(desc_cmd_sett, arg_block_stop);
   command_line::add_arg(desc_cmd_sett, arg_inputs);
@@ -131,24 +121,16 @@ int main(int argc, char* argv[])
   bool do_ringsize = command_line::get_arg(vm, arg_ringsize);
   bool do_hours = command_line::get_arg(vm, arg_hours);
 
-  std::string db_type = command_line::get_arg(vm, arg_database);
-  if (!cryptonote::blockchain_valid_db_type(db_type))
-  {
-    std::cerr << "Invalid database type: " << db_type << std::endl;
-    return 1;
-  }
-
   LOG_PRINT_L0("Initializing source blockchain (BlockchainDB)");
   std::unique_ptr<Blockchain> core_storage;
   tx_memory_pool m_mempool(*core_storage);
   core_storage.reset(new Blockchain(m_mempool));
-  BlockchainDB *db = new_db(db_type);
+  BlockchainDB *db = new_db();
   if (db == NULL)
   {
-    LOG_ERROR("Attempted to use non-existent database type: " << db_type);
-    throw std::runtime_error("Attempting to use non-existent database type");
+    LOG_ERROR("Failed to initialize a database");
+    throw std::runtime_error("Failed to initialize a database");
   }
-  LOG_PRINT_L0("database: " << db_type);
 
   const std::string filename = (boost::filesystem::path(opt_data_dir) / db->get_db_name()).string();
   LOG_PRINT_L0("Loading blockchain from folder " << filename << " ...");
diff --git a/src/blockchain_utilities/blockchain_usage.cpp b/src/blockchain_utilities/blockchain_usage.cpp
index bd73350b3..2fa56452b 100644
--- a/src/blockchain_utilities/blockchain_usage.cpp
+++ b/src/blockchain_utilities/blockchain_usage.cpp
@@ -34,7 +34,6 @@
 #include "cryptonote_core/cryptonote_core.h"
 #include "cryptonote_core/blockchain.h"
 #include "blockchain_db/blockchain_db.h"
-#include "blockchain_db/db_types.h"
 #include "version.h"
 
 #undef MONERO_DEFAULT_LOG_CATEGORY
@@ -82,11 +81,6 @@ int main(int argc, char* argv[])
 
   epee::string_tools::set_module_name_and_folder(argv[0]);
 
-  std::string default_db_type = "lmdb";
-
-  std::string available_dbs = cryptonote::blockchain_db_types(", ");
-  available_dbs = "available: " + available_dbs;
-
   uint32_t log_level = 0;
 
   tools::on_startup();
@@ -96,16 +90,12 @@ int main(int argc, char* argv[])
   po::options_description desc_cmd_only("Command line options");
   po::options_description desc_cmd_sett("Command line options and settings options");
   const command_line::arg_descriptor<std::string> arg_log_level  = {"log-level",  "0-4 or categories", ""};
-  const command_line::arg_descriptor<std::string> arg_database = {
-    "database", available_dbs.c_str(), default_db_type
-  };
   const command_line::arg_descriptor<bool> arg_rct_only  = {"rct-only", "Only work on ringCT outputs", false};
   const command_line::arg_descriptor<std::string> arg_input = {"input", ""};
 
   command_line::add_arg(desc_cmd_sett, cryptonote::arg_testnet_on);
   command_line::add_arg(desc_cmd_sett, cryptonote::arg_stagenet_on);
   command_line::add_arg(desc_cmd_sett, arg_log_level);
-  command_line::add_arg(desc_cmd_sett, arg_database);
   command_line::add_arg(desc_cmd_sett, arg_rct_only);
   command_line::add_arg(desc_cmd_sett, arg_input);
   command_line::add_arg(desc_cmd_only, command_line::arg_help);
@@ -147,13 +137,6 @@ int main(int argc, char* argv[])
   network_type net_type = opt_testnet ? TESTNET : opt_stagenet ? STAGENET : MAINNET;
   bool opt_rct_only = command_line::get_arg(vm, arg_rct_only);
 
-  std::string db_type = command_line::get_arg(vm, arg_database);
-  if (!cryptonote::blockchain_valid_db_type(db_type))
-  {
-    std::cerr << "Invalid database type: " << db_type << std::endl;
-    return 1;
-  }
-
   // If we wanted to use the memory pool, we would set up a fake_core.
 
   // Use Blockchain instead of lower-level BlockchainDB for two reasons:
@@ -170,13 +153,13 @@ int main(int argc, char* argv[])
   std::unique_ptr<Blockchain> core_storage;
   tx_memory_pool m_mempool(*core_storage);
   core_storage.reset(new Blockchain(m_mempool));
-  BlockchainDB* db = new_db(db_type);
+  BlockchainDB* db = new_db();
   if (db == NULL)
   {
-    LOG_ERROR("Attempted to use non-existent database type: " << db_type);
-    throw std::runtime_error("Attempting to use non-existent database type");
+    LOG_ERROR("Failed to initialize a database");
+    throw std::runtime_error("Failed to initialize a database");
   }
-  LOG_PRINT_L0("database: " << db_type);
+  LOG_PRINT_L0("database: LMDB");
 
   const std::string filename = input;
   LOG_PRINT_L0("Loading blockchain from folder " << filename << " ...");
diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp
index 777b5cf58..e34ab8fbd 100644
--- a/src/cryptonote_core/cryptonote_core.cpp
+++ b/src/cryptonote_core/cryptonote_core.cpp
@@ -455,7 +455,6 @@ namespace cryptonote
     bool r = handle_command_line(vm);
     CHECK_AND_ASSERT_MES(r, false, "Failed to handle command line");
 
-    std::string db_type = command_line::get_arg(vm, cryptonote::arg_db_type);
     std::string db_sync_mode = command_line::get_arg(vm, cryptonote::arg_db_sync_mode);
     bool db_salvage = command_line::get_arg(vm, cryptonote::arg_db_salvage) != 0;
     bool fast_sync = command_line::get_arg(vm, arg_fast_block_sync) != 0;
@@ -489,10 +488,10 @@ namespace cryptonote
     // folder might not be a directory, etc, etc
     catch (...) { }
 
-    std::unique_ptr<BlockchainDB> db(new_db(db_type));
+    std::unique_ptr<BlockchainDB> db(new_db());
     if (db == NULL)
     {
-      LOG_ERROR("Attempted to use non-existent database type");
+      LOG_ERROR("Failed to initialize a database");
       return false;
     }
 
diff --git a/src/daemon/main.cpp b/src/daemon/main.cpp
index cb288071e..8fa983fe5 100644
--- a/src/daemon/main.cpp
+++ b/src/daemon/main.cpp
@@ -44,7 +44,6 @@
 #include "rpc/core_rpc_server.h"
 #include "rpc/rpc_args.h"
 #include "daemon/command_line_args.h"
-#include "blockchain_db/db_types.h"
 #include "version.h"
 
 #ifdef STACK_TRACE
@@ -224,16 +223,6 @@ int main(int argc, char const * argv[])
       return 1;
     }
 
-    std::string db_type = command_line::get_arg(vm, cryptonote::arg_db_type);
-
-    // verify that blockchaindb type is valid
-    if(!cryptonote::blockchain_valid_db_type(db_type))
-    {
-      std::cout << "Invalid database type (" << db_type << "), available types are: " <<
-        cryptonote::blockchain_db_types(", ") << std::endl;
-      return 0;
-    }
-
     // data_dir
     //   default: e.g. ~/.bitmonero/ or ~/.bitmonero/testnet
     //   if data-dir argument given:
diff --git a/tests/unit_tests/blockchain_db.cpp b/tests/unit_tests/blockchain_db.cpp
index d7c60cecb..6b569d113 100644
--- a/tests/unit_tests/blockchain_db.cpp
+++ b/tests/unit_tests/blockchain_db.cpp
@@ -38,9 +38,6 @@
 #include "string_tools.h"
 #include "blockchain_db/blockchain_db.h"
 #include "blockchain_db/lmdb/db_lmdb.h"
-#ifdef BERKELEY_DB
-#include "blockchain_db/berkeleydb/db_bdb.h"
-#endif
 #include "cryptonote_basic/cryptonote_format_utils.h"
 
 using namespace cryptonote;
@@ -233,11 +230,7 @@ protected:
 
 using testing::Types;
 
-typedef Types<BlockchainLMDB
-#ifdef BERKELEY_DB
-  , BlockchainBDB
-#endif
-> implementations;
+typedef Types<BlockchainLMDB> implementations;
 
 TYPED_TEST_CASE(BlockchainDBTest, implementations);