mirror of
https://codeberg.org/anoncontributorxmr/monero.git
synced 2024-11-27 13:23:29 +01:00
wallet: save to a temporary file, then rename
This should avoid most of wallet cache corruption cases
This commit is contained in:
parent
0576ff42b5
commit
9b4f8b4b7e
@ -48,6 +48,7 @@ using namespace epee;
|
|||||||
#include "cryptonote_protocol/blobdatatype.h"
|
#include "cryptonote_protocol/blobdatatype.h"
|
||||||
#include "mnemonics/electrum-words.h"
|
#include "mnemonics/electrum-words.h"
|
||||||
#include "common/dns_utils.h"
|
#include "common/dns_utils.h"
|
||||||
|
#include "common/util.h"
|
||||||
#include "rapidjson/document.h"
|
#include "rapidjson/document.h"
|
||||||
#include "rapidjson/writer.h"
|
#include "rapidjson/writer.h"
|
||||||
#include "rapidjson/stringbuffer.h"
|
#include "rapidjson/stringbuffer.h"
|
||||||
@ -1283,8 +1284,20 @@ void wallet2::store()
|
|||||||
|
|
||||||
std::string buf;
|
std::string buf;
|
||||||
bool r = ::serialization::dump_binary(cache_file_data, 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);
|
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
|
uint64_t wallet2::unlocked_balance() const
|
||||||
|
@ -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; }
|
const std::string& file() const { return m_file; }
|
||||||
|
|
||||||
std::string to_string() const { return wallet_logic_error::to_string(); }
|
std::string to_string() const { return wallet_logic_error::to_string(); }
|
||||||
|
Loading…
Reference in New Issue
Block a user