lthn/blockchain
6
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

auditable wallet tracking ID: attempt to simplify things and auto-determine restoration phrase type

Browse source
This commit is contained in:
sowle 2020-06-19 23:39:46 +03:00
parent e4fe9f95c8
commit 2c54e15d50
No known key found for this signature in database
GPG key ID: C07A24B2D89D49FC
5 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/qt-daemon/application/mainwindow.cpp
View file

@ -1639,7 +1639,7 @@ QString MainWindow::restore_wallet(const QString& param)
//return que_call2<view::restore_wallet_request>("restore_wallet", param, [this](const view::restore_wallet_request& owd, view::api_response& ar){ //return que_call2<view::restore_wallet_request>("restore_wallet", param, [this](const view::restore_wallet_request& owd, view::api_response& ar){
PREPARE_ARG_FROM_JSON(view::restore_wallet_request, owd); PREPARE_ARG_FROM_JSON(view::restore_wallet_request, owd);
PREPARE_RESPONSE(view::open_wallet_response, ar); PREPARE_RESPONSE(view::open_wallet_response, ar);
ar.error_code = m_backend.restore_wallet(epee::string_encoding::utf8_to_wstring(owd.path), owd.pass, owd.restore_key, owd.auditable_watch_only, ar.response_data); ar.error_code = m_backend.restore_wallet(epee::string_encoding::utf8_to_wstring(owd.path), owd.pass, owd.restore_key, ar.response_data);
return MAKE_RESPONSE(ar); return MAKE_RESPONSE(ar);
CATCH_ENTRY_FAIL_API_RESPONCE(); CATCH_ENTRY_FAIL_API_RESPONCE();
} }

2
src/wallet/plain_wallet_api.cpp
View file

@ -380,7 +380,7 @@ namespace plain_wallet
std::string full_path = get_wallets_folder() + path; std::string full_path = get_wallets_folder() + path;
epee::json_rpc::response<view::open_wallet_response, epee::json_rpc::dummy_error> ok_response = AUTO_VAL_INIT(ok_response); epee::json_rpc::response<view::open_wallet_response, epee::json_rpc::dummy_error> ok_response = AUTO_VAL_INIT(ok_response);
std::string rsp = inst_ptr->gwm.restore_wallet(epee::string_encoding::convert_to_unicode(full_path), password, seed, false, ok_response.result); std::string rsp = inst_ptr->gwm.restore_wallet(epee::string_encoding::convert_to_unicode(full_path), password, seed, ok_response.result);
if (rsp == API_RETURN_CODE_OK || rsp == API_RETURN_CODE_FILE_RESTORED) if (rsp == API_RETURN_CODE_OK || rsp == API_RETURN_CODE_FILE_RESTORED)
{ {
if (rsp == API_RETURN_CODE_FILE_RESTORED) if (rsp == API_RETURN_CODE_FILE_RESTORED)

2
src/wallet/view_iface.h
View file

@ -422,13 +422,11 @@ public:
std::string pass; std::string pass;
std::string path; std::string path;
std::string restore_key; std::string restore_key;
bool auditable_watch_only;
BEGIN_KV_SERIALIZE_MAP() BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(pass) KV_SERIALIZE(pass)
KV_SERIALIZE(path) KV_SERIALIZE(path)
KV_SERIALIZE(restore_key) KV_SERIALIZE(restore_key)
KV_SERIALIZE(auditable_watch_only)
END_KV_SERIALIZE_MAP() END_KV_SERIALIZE_MAP()
}; };

3
src/wallet/wallets_manager.cpp
View file

@ -1023,7 +1023,7 @@ void wallets_manager::get_gui_options(view::gui_options& opt)
{ {
opt = m_ui_opt; opt = m_ui_opt;
} }
std::string wallets_manager::restore_wallet(const std::wstring& path, const std::string& password, const std::string& restore_key, bool auditable_watch_only, view::open_wallet_response& owr) std::string wallets_manager::restore_wallet(const std::wstring& path, const std::string& password, const std::string& restore_key, view::open_wallet_response& owr)
{ {
std::shared_ptr<tools::wallet2> w(new tools::wallet2()); std::shared_ptr<tools::wallet2> w(new tools::wallet2());
w->set_use_deffered_global_outputs(m_use_deffered_global_outputs); w->set_use_deffered_global_outputs(m_use_deffered_global_outputs);
@ -1046,6 +1046,7 @@ std::string wallets_manager::restore_wallet(const std::wstring& path, const std:
currency::account_base acc; currency::account_base acc;
try try
{ {
bool auditable_watch_only = restore_key.find(':') != std::string::npos;
w->restore(path, password, restore_key, auditable_watch_only); w->restore(path, password, restore_key, auditable_watch_only);
owr.seed = w->get_account().get_restore_braindata(); owr.seed = w->get_account().get_restore_braindata();
} }

2
src/wallet/wallets_manager.h
View file

@ -98,7 +98,7 @@ public:
bool get_opened_wallets(std::list<view::open_wallet_response>& result); bool get_opened_wallets(std::list<view::open_wallet_response>& result);
std::string open_wallet(const std::wstring& path, const std::string& password, uint64_t txs_to_return, view::open_wallet_response& owr); std::string open_wallet(const std::wstring& path, const std::string& password, uint64_t txs_to_return, view::open_wallet_response& owr);
std::string generate_wallet(const std::wstring& path, const std::string& password, view::open_wallet_response& owr); std::string generate_wallet(const std::wstring& path, const std::string& password, view::open_wallet_response& owr);
std::string restore_wallet(const std::wstring& path, const std::string& password, const std::string& restore_key, bool auditable_watch_only, view::open_wallet_response& owr); std::string restore_wallet(const std::wstring& path, const std::string& password, const std::string& restore_key, view::open_wallet_response& owr);
std::string invoke(uint64_t wallet_id, std::string params); std::string invoke(uint64_t wallet_id, std::string params);
std::string get_wallet_status(uint64_t wallet_id); std::string get_wallet_status(uint64_t wallet_id);
std::string run_wallet(uint64_t wallet_id); std::string run_wallet(uint64_t wallet_id);