aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2015-12-17 22:31:49 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2015-12-17 22:32:54 +0000
commit9b4f8b4b7ed6a22b9fa6a3b1d10210d21084cb5b (patch)
tree2e444bdab256379ef0852ba4d02ac8c7922d6272 /src
parentMerge pull request #540 (diff)
downloadmonero-9b4f8b4b7ed6a22b9fa6a3b1d10210d21084cb5b.tar.xz
wallet: save to a temporary file, then rename
This should avoid most of wallet cache corruption cases
Diffstat (limited to 'src')
-rw-r--r--src/wallet/wallet2.cpp15
-rw-r--r--src/wallet/wallet_errors.h6
2 files changed, 20 insertions, 1 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 5a9b96bb8..8fc07db2c 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -48,6 +48,7 @@ using namespace epee;
#include "cryptonote_protocol/blobdatatype.h"
#include "mnemonics/electrum-words.h"
#include "common/dns_utils.h"
+#include "common/util.h"
#include "rapidjson/document.h"
#include "rapidjson/writer.h"
#include "rapidjson/stringbuffer.h"
@@ -1283,8 +1284,20 @@ void wallet2::store()
std::string buf;
bool r = ::serialization::dump_binary(cache_file_data, buf);
- r = r && epee::file_io_utils::save_string_to_file(m_wallet_file, buf);
THROW_WALLET_EXCEPTION_IF(!r, error::file_save_error, m_wallet_file);
+
+ // save to new file, rename main to old, rename new to main
+ // at all times, there should be a valid file on disk
+ const std::string new_file = m_wallet_file + ".new";
+ const std::string old_file = m_wallet_file + ".old";
+ r = epee::file_io_utils::save_string_to_file(new_file, buf);
+ THROW_WALLET_EXCEPTION_IF(!r, error::file_save_error, new_file);
+ boost::filesystem::remove(old_file); // probably does not exist
+ std::error_code e = tools::replace_file(m_wallet_file, old_file);
+ THROW_WALLET_EXCEPTION_IF(e, error::file_save_error, m_wallet_file, e);
+ e = tools::replace_file(new_file, m_wallet_file);
+ THROW_WALLET_EXCEPTION_IF(e, error::file_save_error, m_wallet_file, e);
+ boost::filesystem::remove(old_file);
}
//----------------------------------------------------------------------------------------------------
uint64_t wallet2::unlocked_balance() const
diff --git a/src/wallet/wallet_errors.h b/src/wallet/wallet_errors.h
index 94518e691..dd13343ed 100644
--- a/src/wallet/wallet_errors.h
+++ b/src/wallet/wallet_errors.h
@@ -192,6 +192,12 @@ namespace tools
{
}
+ explicit file_error_base(std::string&& loc, const std::string& file, const std::error_code &e)
+ : wallet_logic_error(std::move(loc), std::string(file_error_messages[msg_index]) + " \"" + file + "\": " + e.message())
+ , m_file(file)
+ {
+ }
+
const std::string& file() const { return m_file; }
std::string to_string() const { return wallet_logic_error::to_string(); }