2 files changed, 1 insertions, 16 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index 5f9d6937b..e27261c46 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -1778,7 +1778,7 @@ bool Blockchain::get_outs(const COMMAND_RPC_GET_OUTPUTS_BIN::request& req, COMMA
     tx_out_index toi = m_db->get_output_tx_and_index(i.amount, i.index);
     bool unlocked = is_tx_spendtime_unlocked(m_db->get_tx_unlock_time(toi.first));
 
-    res.outs.push_back({od.pubkey, od.commitment, unlocked});
+    res.outs.push_back({od.pubkey, od.commitment, unlocked, od.height, toi.first});
   }
   return true;
 }
diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp
index 96bf28e38..c63a08ee4 100644
--- a/src/cryptonote_core/cryptonote_core.cpp
+++ b/src/cryptonote_core/cryptonote_core.cpp
@@ -141,7 +141,6 @@ namespace cryptonote
     command_line::add_arg(desc, command_line::arg_fast_block_sync);
     command_line::add_arg(desc, command_line::arg_db_sync_mode);
     command_line::add_arg(desc, command_line::arg_show_time_stats);
-    command_line::add_arg(desc, command_line::arg_db_auto_remove_logs);
     command_line::add_arg(desc, command_line::arg_block_sync_size);
   }
   //-----------------------------------------------------------------------------------------------
@@ -303,18 +302,6 @@ namespace cryptonote
       DBS_FAST_MODE = MDB_NORDAHEAD | MDB_NOSYNC;
       DBS_FASTEST_MODE = MDB_NORDAHEAD | MDB_NOSYNC | MDB_WRITEMAP | MDB_MAPASYNC;
     }
-    else if (db_type == "berkeley")
-    {
-#if defined(BERKELEY_DB)
-      db = new BlockchainBDB();
-      DBS_FAST_MODE = DB_TXN_WRITE_NOSYNC;
-      DBS_FASTEST_MODE = DB_TXN_NOSYNC;
-      DBS_SAFE_MODE = DB_TXN_SYNC;
-#else
-      LOG_ERROR("BerkeleyDB support disabled.");
-      return false;
-#endif
-    }
     else
     {
       LOG_ERROR("Attempted to use non-existent database type");
@@ -382,8 +369,6 @@ namespace cryptonote
           blocks_per_sync = bps;
       }
 
-      bool auto_remove_logs = command_line::get_arg(vm, command_line::arg_db_auto_remove_logs) != 0;
-      db->set_auto_remove_logs(auto_remove_logs);
       db->open(filename, db_flags);
       if(!db->m_open)
         return false;