aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/api
diff options
context:
space:
mode:
Diffstat (limited to 'src/wallet/api')
-rw-r--r--src/wallet/api/pending_transaction.cpp53
-rw-r--r--src/wallet/api/pending_transaction.h5
-rw-r--r--src/wallet/api/wallet.cpp589
-rw-r--r--src/wallet/api/wallet.h15
-rw-r--r--src/wallet/api/wallet2_api.h98
-rw-r--r--src/wallet/api/wallet_manager.cpp44
-rw-r--r--src/wallet/api/wallet_manager.h16
7 files changed, 521 insertions, 299 deletions
diff --git a/src/wallet/api/pending_transaction.cpp b/src/wallet/api/pending_transaction.cpp
index ff4619f0f..8d200220d 100644
--- a/src/wallet/api/pending_transaction.cpp
+++ b/src/wallet/api/pending_transaction.cpp
@@ -34,6 +34,7 @@
#include "cryptonote_basic/cryptonote_format_utils.h"
#include "cryptonote_basic/cryptonote_basic_impl.h"
+#include "common/base58.h"
#include <memory>
#include <vector>
@@ -102,6 +103,11 @@ bool PendingTransactionImpl::commit(const std::string &filename, bool overwrite)
}
// Commit tx
else {
+ auto multisigState = m_wallet.multisig();
+ if (multisigState.isMultisig && m_signers.size() < multisigState.threshold) {
+ throw runtime_error("Not enough signers to send multisig transaction");
+ }
+
m_wallet.pauseRefresh();
while (!m_pending_tx.empty()) {
auto & ptx = m_pending_tx.back();
@@ -188,6 +194,53 @@ std::vector<std::set<uint32_t>> PendingTransactionImpl::subaddrIndices() const
return result;
}
+std::string PendingTransactionImpl::multisigSignData() {
+ try {
+ if (!m_wallet.multisig().isMultisig) {
+ throw std::runtime_error("wallet is not multisig");
+ }
+
+ auto cipher = m_wallet.m_wallet->save_multisig_tx(m_pending_tx);
+ return epee::string_tools::buff_to_hex_nodelimer(cipher);
+ } catch (const std::exception& e) {
+ m_status = Status_Error;
+ m_errorString = std::string(tr("Couldn't multisig sign data: ")) + e.what();
+ }
+
+ return std::string();
+}
+
+void PendingTransactionImpl::signMultisigTx() {
+ try {
+ std::vector<crypto::hash> ignore;
+
+ tools::wallet2::multisig_tx_set txSet;
+ txSet.m_ptx = m_pending_tx;
+ txSet.m_signers = m_signers;
+
+ if (!m_wallet.m_wallet->sign_multisig_tx(txSet, ignore)) {
+ throw std::runtime_error("couldn't sign multisig transaction");
+ }
+
+ std::swap(m_pending_tx, txSet.m_ptx);
+ std::swap(m_signers, txSet.m_signers);
+ } catch (const std::exception& e) {
+ m_status = Status_Error;
+ m_errorString = std::string(tr("Couldn't sign multisig transaction: ")) + e.what();
+ }
+}
+
+std::vector<std::string> PendingTransactionImpl::signersKeys() const {
+ std::vector<std::string> keys;
+ keys.reserve(m_signers.size());
+
+ for (const auto& signer: m_signers) {
+ keys.emplace_back(tools::base58::encode(cryptonote::t_serializable_object_to_blob(signer)));
+ }
+
+ return keys;
+}
+
}
namespace Bitmonero = Monero;
diff --git a/src/wallet/api/pending_transaction.h b/src/wallet/api/pending_transaction.h
index d0bd66eb5..4f963c134 100644
--- a/src/wallet/api/pending_transaction.h
+++ b/src/wallet/api/pending_transaction.h
@@ -55,6 +55,10 @@ public:
std::vector<std::set<uint32_t>> subaddrIndices() const;
// TODO: continue with interface;
+ std::string multisigSignData();
+ void signMultisigTx();
+ std::vector<std::string> signersKeys() const;
+
private:
friend class WalletImpl;
WalletImpl &m_wallet;
@@ -62,6 +66,7 @@ private:
int m_status;
std::string m_errorString;
std::vector<tools::wallet2::pending_tx> m_pending_tx;
+ std::unordered_set<crypto::public_key> m_signers;
};
diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp
index 63211fab0..19185ddb0 100644
--- a/src/wallet/api/wallet.cpp
+++ b/src/wallet/api/wallet.cpp
@@ -60,7 +60,7 @@ namespace Monero {
namespace {
// copy-pasted from simplewallet
- static const size_t DEFAULT_MIXIN = 4;
+ static const size_t DEFAULT_MIXIN = 6;
static const int DEFAULT_REFRESH_INTERVAL_MILLIS = 1000 * 10;
// limit maximum refresh interval as one minute
static const int MAX_REFRESH_INTERVAL_MILLIS = 1000 * 60 * 1;
@@ -69,14 +69,48 @@ namespace {
// Connection timeout 30 sec
static const int DEFAULT_CONNECTION_TIMEOUT_MILLIS = 1000 * 30;
- std::string get_default_ringdb_path()
+ std::string get_default_ringdb_path(cryptonote::network_type nettype)
{
boost::filesystem::path dir = tools::get_default_data_dir();
// remove .bitmonero, replace with .shared-ringdb
dir = dir.remove_filename();
dir /= ".shared-ringdb";
+ if (nettype == cryptonote::TESTNET)
+ dir /= "testnet";
+ else if (nettype == cryptonote::STAGENET)
+ dir /= "stagenet";
return dir.string();
}
+
+ void checkMultisigWalletReady(const tools::wallet2* wallet) {
+ if (!wallet) {
+ throw runtime_error("Wallet is not initialized yet");
+ }
+
+ bool ready;
+ if (!wallet->multisig(&ready)) {
+ throw runtime_error("Wallet is not multisig");
+ }
+
+ if (!ready) {
+ throw runtime_error("Multisig wallet is not finalized yet");
+ }
+ }
+
+ void checkMultisigWalletNotReady(const tools::wallet2* wallet) {
+ if (!wallet) {
+ throw runtime_error("Wallet is not initialized yet");
+ }
+
+ bool ready;
+ if (!wallet->multisig(&ready)) {
+ throw runtime_error("Wallet is not multisig");
+ }
+
+ if (ready) {
+ throw runtime_error("Multisig wallet is already finalized");
+ }
+ }
}
struct Wallet2CallbackImpl : public tools::i_wallet2_callback
@@ -305,14 +339,14 @@ uint64_t Wallet::maximumAllowedAmount()
return std::numeric_limits<uint64_t>::max();
}
-void Wallet::init(const char *argv0, const char *default_log_base_name) {
+void Wallet::init(const char *argv0, const char *default_log_base_name, const std::string &log_path, bool console) {
#ifdef WIN32
// Activate UTF-8 support for Boost filesystem classes on Windows
std::locale::global(boost::locale::generator().generate(""));
boost::filesystem::path::imbue(std::locale());
#endif
epee::string_tools::set_module_name_and_folder(argv0);
- mlog_configure(mlog_get_default_log_path(default_log_base_name), true);
+ mlog_configure(log_path.empty() ? mlog_get_default_log_path(default_log_base_name) : log_path.c_str(), console);
}
void Wallet::debug(const std::string &category, const std::string &str) {
@@ -395,9 +429,9 @@ bool WalletImpl::create(const std::string &path, const std::string &password, co
// add logic to error out if new wallet requested but named wallet file exists
if (keys_file_exists || wallet_file_exists) {
- m_errorString = "attempting to generate or restore wallet, but specified file(s) exist. Exiting to not risk overwriting.";
- LOG_ERROR(m_errorString);
- m_status = Status_Critical;
+ std::string error = "attempting to generate or restore wallet, but specified file(s) exist. Exiting to not risk overwriting.";
+ LOG_ERROR(error);
+ setStatusCritical(error);
return false;
}
// TODO: validate language
@@ -406,11 +440,10 @@ bool WalletImpl::create(const std::string &path, const std::string &password, co
try {
recovery_val = m_wallet->generate(path, password, secret_key, false, false);
m_password = password;
- m_status = Status_Ok;
+ clearStatus();
} catch (const std::exception &e) {
LOG_ERROR("Error creating wallet: " << e.what());
- m_status = Status_Critical;
- m_errorString = e.what();
+ setStatusCritical(e.what());
return false;
}
@@ -434,9 +467,9 @@ bool WalletImpl::createWatchOnly(const std::string &path, const std::string &pas
// add logic to error out if new wallet requested but named wallet file exists
if (keys_file_exists || wallet_file_exists) {
- m_errorString = "attempting to generate view only wallet, but specified file(s) exist. Exiting to not risk overwriting.";
- LOG_ERROR(m_errorString);
- m_status = Status_Error;
+ std::string error = "attempting to generate view only wallet, but specified file(s) exist. Exiting to not risk overwriting.";
+ LOG_ERROR(error);
+ setStatusError(error);
return false;
}
// TODO: validate language
@@ -472,11 +505,10 @@ bool WalletImpl::createWatchOnly(const std::string &path, const std::string &pas
uint64_t spent = 0;
uint64_t unspent = 0;
view_wallet->import_key_images(key_images,spent,unspent,false);
- m_status = Status_Ok;
+ clearStatus();
} catch (const std::exception &e) {
LOG_ERROR("Error creating view only wallet: " << e.what());
- m_status = Status_Error;
- m_errorString = e.what();
+ setStatusError(e.what());
return false;
}
// Store wallet
@@ -503,8 +535,7 @@ bool WalletImpl::recoverFromKeysWithPassword(const std::string &path,
cryptonote::address_parse_info info;
if(!get_account_address_from_str(info, m_wallet->nettype(), address_string))
{
- m_errorString = tr("failed to parse address");
- m_status = Status_Error;
+ setStatusError(tr("failed to parse address"));
return false;
}
@@ -515,8 +546,7 @@ bool WalletImpl::recoverFromKeysWithPassword(const std::string &path,
cryptonote::blobdata spendkey_data;
if(!epee::string_tools::parse_hexstr_to_binbuff(spendkey_string, spendkey_data) || spendkey_data.size() != sizeof(crypto::secret_key))
{
- m_errorString = tr("failed to parse secret spend key");
- m_status = Status_Error;
+ setStatusError(tr("failed to parse secret spend key"));
return false;
}
has_spendkey = true;
@@ -525,15 +555,13 @@ bool WalletImpl::recoverFromKeysWithPassword(const std::string &path,
// parse view secret key
if (viewkey_string.empty()) {
- m_errorString = tr("No view key supplied, cancelled");
- m_status = Status_Error;
+ setStatusError(tr("No view key supplied, cancelled"));
return false;
}
cryptonote::blobdata viewkey_data;
if(!epee::string_tools::parse_hexstr_to_binbuff(viewkey_string, viewkey_data) || viewkey_data.size() != sizeof(crypto::secret_key))
{
- m_errorString = tr("failed to parse secret view key");
- m_status = Status_Error;
+ setStatusError(tr("failed to parse secret view key"));
return false;
}
crypto::secret_key viewkey = *reinterpret_cast<const crypto::secret_key*>(viewkey_data.data());
@@ -542,24 +570,20 @@ bool WalletImpl::recoverFromKeysWithPassword(const std::string &path,
crypto::public_key pkey;
if(has_spendkey) {
if (!crypto::secret_key_to_public_key(spendkey, pkey)) {
- m_errorString = tr("failed to verify secret spend key");
- m_status = Status_Error;
+ setStatusError(tr("failed to verify secret spend key"));
return false;
}
if (info.address.m_spend_public_key != pkey) {
- m_errorString = tr("spend key does not match address");
- m_status = Status_Error;
+ setStatusError(tr("spend key does not match address"));
return false;
}
}
if (!crypto::secret_key_to_public_key(viewkey, pkey)) {
- m_errorString = tr("failed to verify secret view key");
- m_status = Status_Error;
+ setStatusError(tr("failed to verify secret view key"));
return false;
}
if (info.address.m_view_public_key != pkey) {
- m_errorString = tr("view key does not match address");
- m_status = Status_Error;
+ setStatusError(tr("view key does not match address"));
return false;
}
@@ -577,8 +601,7 @@ bool WalletImpl::recoverFromKeysWithPassword(const std::string &path,
}
catch (const std::exception& e) {
- m_errorString = string(tr("failed to generate new wallet: ")) + e.what();
- m_status = Status_Error;
+ setStatusError(string(tr("failed to generate new wallet: ")) + e.what());
return false;
}
return true;
@@ -599,16 +622,15 @@ bool WalletImpl::open(const std::string &path, const std::string &password)
// Rebuilding wallet cache, using refresh height from .keys file
m_rebuildWalletCache = true;
}
- m_wallet->set_ring_database(get_default_ringdb_path());
+ m_wallet->set_ring_database(get_default_ringdb_path(m_wallet->nettype()));
m_wallet->load(path, password);
m_password = password;
} catch (const std::exception &e) {
LOG_ERROR("Error opening wallet: " << e.what());
- m_status = Status_Critical;
- m_errorString = e.what();
+ setStatusCritical(e.what());
}
- return m_status == Status_Ok;
+ return status() == Status_Ok;
}
bool WalletImpl::recover(const std::string &path, const std::string &seed)
@@ -621,9 +643,8 @@ bool WalletImpl::recover(const std::string &path, const std::string &password, c
clearStatus();
m_errorString.clear();
if (seed.empty()) {
- m_errorString = "Electrum seed is empty";
- LOG_ERROR(m_errorString);
- m_status = Status_Error;
+ LOG_ERROR("Electrum seed is empty");
+ setStatusError(tr("Electrum seed is empty"));
return false;
}
@@ -631,8 +652,7 @@ bool WalletImpl::recover(const std::string &path, const std::string &password, c
crypto::secret_key recovery_key;
std::string old_language;
if (!crypto::ElectrumWords::words_to_bytes(seed, recovery_key, old_language)) {
- m_errorString = "Electrum-style word list failed verification";
- m_status = Status_Error;
+ setStatusError(tr("Electrum-style word list failed verification"));
return false;
}
@@ -644,10 +664,9 @@ bool WalletImpl::recover(const std::string &path, const std::string &password, c
m_wallet->generate(path, password, recovery_key, true, false);
} catch (const std::exception &e) {
- m_status = Status_Critical;
- m_errorString = e.what();
+ setStatusCritical(e.what());
}
- return m_status == Status_Ok;
+ return status() == Status_Ok;
}
bool WalletImpl::close(bool store)
@@ -671,8 +690,7 @@ bool WalletImpl::close(bool store)
result = true;
clearStatus();
} catch (const std::exception &e) {
- m_status = Status_Critical;
- m_errorString = e.what();
+ setStatusCritical(e.what());
LOG_ERROR("Error closing wallet: " << e.what());
}
return result;
@@ -698,14 +716,22 @@ void WalletImpl::setSeedLanguage(const std::string &arg)
int WalletImpl::status() const
{
+ boost::lock_guard<boost::mutex> l(m_statusMutex);
return m_status;
}
std::string WalletImpl::errorString() const
{
+ boost::lock_guard<boost::mutex> l(m_statusMutex);
return m_errorString;
}
+void WalletImpl::statusWithErrorString(int& status, std::string& errorString) const {
+ boost::lock_guard<boost::mutex> l(m_statusMutex);
+ status = m_status;
+ errorString = m_errorString;
+}
+
bool WalletImpl::setPassword(const std::string &password)
{
clearStatus();
@@ -713,10 +739,9 @@ bool WalletImpl::setPassword(const std::string &password)
m_wallet->rewrite(m_wallet->get_wallet_file(), password);
m_password = password;
} catch (const std::exception &e) {
- m_status = Status_Error;
- m_errorString = e.what();
+ setStatusError(e.what());
}
- return m_status == Status_Ok;
+ return status() == Status_Ok;
}
std::string WalletImpl::address(uint32_t accountIndex, uint32_t addressIndex) const
@@ -769,11 +794,11 @@ bool WalletImpl::store(const std::string &path)
}
} catch (const std::exception &e) {
LOG_ERROR("Error saving wallet: " << e.what());
- m_status = Status_Error;
- m_errorString = e.what();
+ setStatusError(e.what());
+ return false;
}
- return m_status == Status_Ok;
+ return true;
}
string WalletImpl::filename() const
@@ -806,8 +831,7 @@ bool WalletImpl::lightWalletImportWalletRequest(std::string &payment_id, uint64_
{
cryptonote::COMMAND_RPC_IMPORT_WALLET_REQUEST::response response;
if(!m_wallet->light_wallet_import_wallet_request(response)){
- m_errorString = tr("Failed to send import wallet request");
- m_status = Status_Error;
+ setStatusError(tr("Failed to send import wallet request"));
return false;
}
fee = response.import_fee;
@@ -820,8 +844,7 @@ bool WalletImpl::lightWalletImportWalletRequest(std::string &payment_id, uint64_
catch (const std::exception &e)
{
LOG_ERROR("Error sending import wallet request: " << e.what());
- m_errorString = e.what();
- m_status = Status_Error;
+ setStatusError(e.what());
return false;
}
return true;
@@ -870,12 +893,9 @@ uint64_t WalletImpl::daemonBlockChainHeight() const
if (!err.empty()) {
LOG_ERROR(__FUNCTION__ << ": " << err);
result = 0;
- m_errorString = err;
- m_status = Status_Error;
-
+ setStatusError(err);
} else {
- m_status = Status_Ok;
- m_errorString = "";
+ clearStatus();
}
return result;
}
@@ -892,12 +912,9 @@ uint64_t WalletImpl::daemonBlockChainTargetHeight() const
if (!err.empty()) {
LOG_ERROR(__FUNCTION__ << ": " << err);
result = 0;
- m_errorString = err;
- m_status = Status_Error;
-
+ setStatusError(err);
} else {
- m_status = Status_Ok;
- m_errorString = "";
+ clearStatus();
}
// Target height can be 0 when daemon is synced. Use blockchain height instead.
if(result == 0)
@@ -921,8 +938,10 @@ bool WalletImpl::synchronized() const
bool WalletImpl::refresh()
{
clearStatus();
+ //TODO: make doRefresh return bool to know whether the error occured during refresh or not
+ //otherwise one may try, say, to send transaction, transfer fails and this method returns false
doRefresh();
- return m_status == Status_Ok;
+ return status() == Status_Ok;
}
void WalletImpl::refreshAsync()
@@ -952,8 +971,7 @@ UnsignedTransaction *WalletImpl::loadUnsignedTx(const std::string &unsigned_file
clearStatus();
UnsignedTransactionImpl * transaction = new UnsignedTransactionImpl(*this);
if (!m_wallet->load_unsigned_tx(unsigned_filename, transaction->m_unsigned_tx_set)){
- m_errorString = tr("Failed to load unsigned transactions");
- m_status = Status_Error;
+ setStatusError(tr("Failed to load unsigned transactions"));
}
// Check tx data and construct confirmation message
@@ -961,8 +979,7 @@ UnsignedTransaction *WalletImpl::loadUnsignedTx(const std::string &unsigned_file
if (!transaction->m_unsigned_tx_set.transfers.empty())
extra_message = (boost::format("%u outputs to import. ") % (unsigned)transaction->m_unsigned_tx_set.transfers.size()).str();
transaction->checkLoadedTx([&transaction](){return transaction->m_unsigned_tx_set.txes.size();}, [&transaction](size_t n)->const tools::wallet2::tx_construction_data&{return transaction->m_unsigned_tx_set.txes[n];}, extra_message);
- m_status = transaction->status();
- m_errorString = transaction->errorString();
+ setStatus(transaction->status(), transaction->errorString());
return transaction;
}
@@ -973,14 +990,12 @@ bool WalletImpl::submitTransaction(const string &fileName) {
bool r = m_wallet->load_tx(fileName, transaction->m_pending_tx);
if (!r) {
- m_errorString = tr("Failed to load transaction from file");
- m_status = Status_Ok;
+ setStatus(Status_Ok, tr("Failed to load transaction from file"));
return false;
}
if(!transaction->commit()) {
- m_errorString = transaction->m_errorString;
- m_status = Status_Error;
+ setStatusError(transaction->m_errorString);
return false;
}
@@ -991,8 +1006,7 @@ bool WalletImpl::exportKeyImages(const string &filename)
{
if (m_wallet->watch_only())
{
- m_errorString = tr("Wallet is view only");
- m_status = Status_Error;
+ setStatusError(tr("Wallet is view only"));
return false;
}
@@ -1000,16 +1014,14 @@ bool WalletImpl::exportKeyImages(const string &filename)
{
if (!m_wallet->export_key_images(filename))
{
- m_errorString = tr("failed to save file ") + filename;
- m_status = Status_Error;
+ setStatusError(tr("failed to save file ") + filename);
return false;
}
}
catch (const std::exception &e)
{
LOG_ERROR("Error exporting key images: " << e.what());
- m_errorString = e.what();
- m_status = Status_Error;
+ setStatusError(e.what());
return false;
}
return true;
@@ -1018,8 +1030,7 @@ bool WalletImpl::exportKeyImages(const string &filename)
bool WalletImpl::importKeyImages(const string &filename)
{
if (!trustedDaemon()) {
- m_status = Status_Error;
- m_errorString = tr("Key images can only be imported with a trusted daemon");
+ setStatusError(tr("Key images can only be imported with a trusted daemon"));
return false;
}
try
@@ -1032,8 +1043,7 @@ bool WalletImpl::importKeyImages(const string &filename)
catch (const std::exception &e)
{
LOG_ERROR("Error exporting key images: " << e.what());
- m_errorString = string(tr("Failed to import key images: ")) + e.what();
- m_status = Status_Error;
+ setStatusError(string(tr("Failed to import key images: ")) + e.what());
return false;
}
@@ -1065,8 +1075,7 @@ std::string WalletImpl::getSubaddressLabel(uint32_t accountIndex, uint32_t addre
catch (const std::exception &e)
{
LOG_ERROR("Error getting subaddress label: ") << e.what();
- m_errorString = string(tr("Failed to get subaddress label: ")) + e.what();
- m_status = Status_Error;
+ setStatusError(string(tr("Failed to get subaddress label: ")) + e.what());
return "";
}
}
@@ -1079,9 +1088,134 @@ void WalletImpl::setSubaddressLabel(uint32_t accountIndex, uint32_t addressIndex
catch (const std::exception &e)
{
LOG_ERROR("Error setting subaddress label: ") << e.what();
- m_errorString = string(tr("Failed to set subaddress label: ")) + e.what();
- m_status = Status_Error;
+ setStatusError(string(tr("Failed to set subaddress label: ")) + e.what());
+ }
+}
+
+MultisigState WalletImpl::multisig() const {
+ MultisigState state;
+ state.isMultisig = m_wallet->multisig(&state.isReady, &state.threshold, &state.total);
+
+ return state;
+}
+
+string WalletImpl::getMultisigInfo() const {
+ try {
+ clearStatus();
+ return m_wallet->get_multisig_info();
+ } catch (const exception& e) {
+ LOG_ERROR("Error on generating multisig info: ") << e.what();
+ setStatusError(string(tr("Failed to get multisig info: ")) + e.what());
+ }
+
+ return string();
+}
+
+string WalletImpl::makeMultisig(const vector<string>& info, uint32_t threshold) {
+ try {
+ clearStatus();
+
+ if (m_wallet->multisig()) {
+ throw runtime_error("Wallet is already multisig");
+ }
+
+ return m_wallet->make_multisig(epee::wipeable_string(m_password), info, threshold);
+ } catch (const exception& e) {
+ LOG_ERROR("Error on making multisig wallet: ") << e.what();
+ setStatusError(string(tr("Failed to make multisig: ")) + e.what());
+ }
+
+ return string();
+}
+
+bool WalletImpl::finalizeMultisig(const vector<string>& extraMultisigInfo) {
+ try {
+ clearStatus();
+ checkMultisigWalletNotReady(m_wallet);
+
+ if (m_wallet->finalize_multisig(epee::wipeable_string(m_password), extraMultisigInfo)) {
+ return true;
+ }
+
+ setStatusError(tr("Failed to finalize multisig wallet creation"));
+ } catch (const exception& e) {
+ LOG_ERROR("Error on finalizing multisig wallet creation: ") << e.what();
+ setStatusError(string(tr("Failed to finalize multisig wallet creation: ")) + e.what());
+ }
+
+ return false;
+}
+
+bool WalletImpl::exportMultisigImages(string& images) {
+ try {
+ clearStatus();
+ checkMultisigWalletReady(m_wallet);
+
+ auto blob = m_wallet->export_multisig();
+ images = epee::string_tools::buff_to_hex_nodelimer(blob);
+ return true;
+ } catch (const exception& e) {
+ LOG_ERROR("Error on exporting multisig images: ") << e.what();
+ setStatusError(string(tr("Failed to export multisig images: ")) + e.what());
+ }
+
+ return false;
+}
+
+size_t WalletImpl::importMultisigImages(const vector<string>& images) {
+ try {
+ clearStatus();
+ checkMultisigWalletReady(m_wallet);
+
+ std::vector<std::string> blobs;
+ blobs.reserve(images.size());
+
+ for (const auto& image: images) {
+ std::string blob;
+ if (!epee::string_tools::parse_hexstr_to_binbuff(image, blob)) {
+ LOG_ERROR("Failed to parse imported multisig images");
+ setStatusError(tr("Failed to parse imported multisig images"));
+ return 0;
+ }
+
+ blobs.emplace_back(std::move(blob));
+ }
+
+ return m_wallet->import_multisig(blobs);
+ } catch (const exception& e) {
+ LOG_ERROR("Error on importing multisig images: ") << e.what();
+ setStatusError(string(tr("Failed to import multisig images: ")) + e.what());
+ }
+
+ return 0;
+}
+
+PendingTransaction* WalletImpl::restoreMultisigTransaction(const string& signData) {
+ try {
+ clearStatus();
+ checkMultisigWalletReady(m_wallet);
+
+ string binary;
+ if (!epee::string_tools::parse_hexstr_to_binbuff(signData, binary)) {
+ throw runtime_error("Failed to deserialize multisig transaction");
+ }
+
+ tools::wallet2::multisig_tx_set txSet;
+ if (!m_wallet->load_multisig_tx(binary, txSet, {})) {
+ throw runtime_error("couldn't parse multisig transaction data");
+ }
+
+ auto ptx = new PendingTransactionImpl(*this);
+ ptx->m_pending_tx = txSet.m_ptx;
+ ptx->m_signers = txSet.m_signers;
+
+ return ptx;
+ } catch (exception& e) {
+ LOG_ERROR("Error on restoring multisig transaction: ") << e.what();
+ setStatusError(string(tr("Failed to restore multisig transaction: ")) + e.what());
}
+
+ return nullptr;
}
// TODO:
@@ -1117,8 +1251,7 @@ PendingTransaction *WalletImpl::createTransaction(const string &dst_addr, const
do {
if(!cryptonote::get_account_address_from_str(info, m_wallet->nettype(), dst_addr)) {
// TODO: copy-paste 'if treating as an address fails, try as url' from simplewallet.cpp:1982
- m_status = Status_Error;
- m_errorString = "Invalid destination address";
+ setStatusError(tr("Invalid destination address"));
break;
}
@@ -1143,8 +1276,7 @@ PendingTransaction *WalletImpl::createTransaction(const string &dst_addr, const
}
if (!r) {
- m_status = Status_Error;
- m_errorString = tr("payment id has invalid format, expected 16 or 64 character hex string: ") + payment_id;
+ setStatusError(tr("payment id has invalid format, expected 16 or 64 character hex string: ") + payment_id);
break;
}
}
@@ -1153,8 +1285,7 @@ PendingTransaction *WalletImpl::createTransaction(const string &dst_addr, const
set_encrypted_payment_id_to_tx_extra_nonce(extra_nonce, info.payment_id);
bool r = add_extra_nonce_to_tx_extra(extra, extra_nonce);
if (!r) {
- m_status = Status_Error;
- m_errorString = tr("Failed to add short payment id: ") + epee::string_tools::pod_to_hex(info.payment_id);
+ setStatusError(tr("Failed to add short payment id: ") + epee::string_tools::pod_to_hex(info.payment_id));
break;
}
}
@@ -1185,40 +1316,33 @@ PendingTransaction *WalletImpl::createTransaction(const string &dst_addr, const
extra, subaddr_account, subaddr_indices, m_trustedDaemon);
}
+ if (multisig().isMultisig) {
+ transaction->m_signers = m_wallet->make_multisig_tx_set(transaction->m_pending_tx).m_signers;
+ }
} catch (const tools::error::daemon_busy&) {
// TODO: make it translatable with "tr"?
- m_errorString = tr("daemon is busy. Please try again later.");
- m_status = Status_Error;
+ setStatusError(tr("daemon is busy. Please try again later."));
} catch (const tools::error::no_connection_to_daemon&) {
- m_errorString = tr("no connection to daemon. Please make sure daemon is running.");
- m_status = Status_Error;
+ setStatusError(tr("no connection to daemon. Please make sure daemon is running."));
} catch (const tools::error::wallet_rpc_error& e) {
- m_errorString = tr("RPC error: ") + e.to_string();
- m_status = Status_Error;
+ setStatusError(tr("RPC error: ") + e.to_string());
} catch (const tools::error::get_random_outs_error &e) {
- m_errorString = (boost::format(tr("failed to get random outputs to mix: %s")) % e.what()).str();
- m_status = Status_Error;
-
+ setStatusError((boost::format(tr("failed to get random outputs to mix: %s")) % e.what()).str());
} catch (const tools::error::not_enough_unlocked_money& e) {
- m_status = Status_Error;
std::ostringstream writer;
writer << boost::format(tr("not enough money to transfer, available only %s, sent amount %s")) %
print_money(e.available()) %
print_money(e.tx_amount());
- m_errorString = writer.str();
-
+ setStatusError(writer.str());
} catch (const tools::error::not_enough_money& e) {
- m_status = Status_Error;
std::ostringstream writer;
writer << boost::format(tr("not enough money to transfer, overall balance only %s, sent amount %s")) %
print_money(e.available()) %
print_money(e.tx_amount());
- m_errorString = writer.str();
-
+ setStatusError(writer.str());
} catch (const tools::error::tx_not_possible& e) {
- m_status = Status_Error;
std::ostringstream writer;
writer << boost::format(tr("not enough money to transfer, available only %s, transaction amount %s = %s + %s (fee)")) %
@@ -1226,8 +1350,7 @@ PendingTransaction *WalletImpl::createTransaction(const string &dst_addr, const
print_money(e.tx_amount() + e.fee()) %
print_money(e.tx_amount()) %
print_money(e.fee());
- m_errorString = writer.str();
-
+ setStatusError(writer.str());
} catch (const tools::error::not_enough_outs_to_mix& e) {
std::ostringstream writer;
writer << tr("not enough outputs for specified ring size") << " = " << (e.mixin_count() + 1) << ":";
@@ -1235,42 +1358,31 @@ PendingTransaction *WalletImpl::createTransaction(const string &dst_addr, const
writer << "\n" << tr("output amount") << " = " << print_money(outs_for_amount.first) << ", " << tr("found outputs to use") << " = " << outs_for_amount.second;
}
writer << "\n" << tr("Please sweep unmixable outputs.");
- m_errorString = writer.str();
- m_status = Status_Error;
+ setStatusError(writer.str());
} catch (const tools::error::tx_not_constructed&) {
- m_errorString = tr("transaction was not constructed");
- m_status = Status_Error;
+ setStatusError(tr("transaction was not constructed"));
} catch (const tools::error::tx_rejected& e) {
std::ostringstream writer;
writer << (boost::format(tr("transaction %s was rejected by daemon with status: ")) % get_transaction_hash(e.tx())) << e.status();
- m_errorString = writer.str();
- m_status = Status_Error;
+ setStatusError(writer.str());
} catch (const tools::error::tx_sum_overflow& e) {
- m_errorString = e.what();
- m_status = Status_Error;
+ setStatusError(e.what());
} catch (const tools::error::zero_destination&) {
- m_errorString = tr("one of destinations is zero");
- m_status = Status_Error;
+ setStatusError(tr("one of destinations is zero"));
} catch (const tools::error::tx_too_big& e) {
- m_errorString = tr("failed to find a suitable way to split transactions");
- m_status = Status_Error;
+ setStatusError(tr("failed to find a suitable way to split transactions"));
} catch (const tools::error::transfer_error& e) {
- m_errorString = string(tr("unknown transfer error: ")) + e.what();
- m_status = Status_Error;
+ setStatusError(string(tr("unknown transfer error: ")) + e.what());
} catch (const tools::error::wallet_internal_error& e) {
- m_errorString = string(tr("internal error: ")) + e.what();
- m_status = Status_Error;
+ setStatusError(string(tr("internal error: ")) + e.what());
} catch (const std::exception& e) {
- m_errorString = string(tr("unexpected error: ")) + e.what();
- m_status = Status_Error;
+ setStatusError(string(tr("unexpected error: ")) + e.what());
} catch (...) {
- m_errorString = tr("unknown error");
- m_status = Status_Error;
+ setStatusError(tr("unknown error"));
}
} while (false);
- transaction->m_status = m_status;
- transaction->m_errorString = m_errorString;
+ statusWithErrorString(transaction->m_status, transaction->m_errorString);
// Resume refresh thread
startRefresh();
return transaction;
@@ -1291,38 +1403,31 @@ PendingTransaction *WalletImpl::createSweepUnmixableTransaction()
} catch (const tools::error::daemon_busy&) {
// TODO: make it translatable with "tr"?
- m_errorString = tr("daemon is busy. Please try again later.");
- m_status = Status_Error;
+ setStatusError(tr("daemon is busy. Please try again later."));
} catch (const tools::error::no_connection_to_daemon&) {
- m_errorString = tr("no connection to daemon. Please make sure daemon is running.");
- m_status = Status_Error;
+ setStatusError(tr("no connection to daemon. Please make sure daemon is running."));
} catch (const tools::error::wallet_rpc_error& e) {
- m_errorString = tr("RPC error: ") + e.to_string();
- m_status = Status_Error;
+ setStatusError(tr("RPC error: ") + e.to_string());
} catch (const tools::error::get_random_outs_error&) {
- m_errorString = tr("failed to get random outputs to mix");
- m_status = Status_Error;
-
+ setStatusError(tr("failed to get random outputs to mix"));
} catch (const tools::error::not_enough_unlocked_money& e) {
- m_status = Status_Error;
+ setStatusError("");
std::ostringstream writer;
writer << boost::format(tr("not enough money to transfer, available only %s, sent amount %s")) %
print_money(e.available()) %
print_money(e.tx_amount());
- m_errorString = writer.str();
-
+ setStatusError(writer.str());
} catch (const tools::error::not_enough_money& e) {
- m_status = Status_Error;
+ setStatusError("");
std::ostringstream writer;
writer << boost::format(tr("not enough money to transfer, overall balance only %s, sent amount %s")) %
print_money(e.available()) %
print_money(e.tx_amount());
- m_errorString = writer.str();
-
+ setStatusError(writer.str());
} catch (const tools::error::tx_not_possible& e) {
- m_status = Status_Error;
+ setStatusError("");
std::ostringstream writer;
writer << boost::format(tr("not enough money to transfer, available only %s, transaction amount %s = %s + %s (fee)")) %
@@ -1330,50 +1435,38 @@ PendingTransaction *WalletImpl::createSweepUnmixableTransaction()
print_money(e.tx_amount() + e.fee()) %
print_money(e.tx_amount()) %
print_money(e.fee());
- m_errorString = writer.str();
-
+ setStatusError(writer.str());
} catch (const tools::error::not_enough_outs_to_mix& e) {
std::ostringstream writer;
writer << tr("not enough outputs for specified ring size") << " = " << (e.mixin_count() + 1) << ":";
for (const std::pair<uint64_t, uint64_t> outs_for_amount : e.scanty_outs()) {
writer << "\n" << tr("output amount") << " = " << print_money(outs_for_amount.first) << ", " << tr("found outputs to use") << " = " << outs_for_amount.second;
}
- m_errorString = writer.str();
- m_status = Status_Error;
+ setStatusError(writer.str());
} catch (const tools::error::tx_not_constructed&) {
- m_errorString = tr("transaction was not constructed");
- m_status = Status_Error;
+ setStatusError(tr("transaction was not constructed"));
} catch (const tools::error::tx_rejected& e) {
std::ostringstream writer;
writer << (boost::format(tr("transaction %s was rejected by daemon with status: ")) % get_transaction_hash(e.tx())) << e.status();
- m_errorString = writer.str();
- m_status = Status_Error;
+ setStatusError(writer.str());
} catch (const tools::error::tx_sum_overflow& e) {
- m_errorString = e.what();
- m_status = Status_Error;
+ setStatusError(e.what());
} catch (const tools::error::zero_destination&) {
- m_errorString = tr("one of destinations is zero");
- m_status = Status_Error;
+ setStatusError(tr("one of destinations is zero"));
} catch (const tools::error::tx_too_big& e) {
- m_errorString = tr("failed to find a suitable way to split transactions");
- m_status = Status_Error;
+ setStatusError(tr("failed to find a suitable way to split transactions"));
} catch (const tools::error::transfer_error& e) {
- m_errorString = string(tr("unknown transfer error: ")) + e.what();
- m_status = Status_Error;
+ setStatusError(string(tr("unknown transfer error: ")) + e.what());
} catch (const tools::error::wallet_internal_error& e) {
- m_errorString = string(tr("internal error: ")) + e.what();
- m_status = Status_Error;
+ setStatusError(string(tr("internal error: ")) + e.what());
} catch (const std::exception& e) {
- m_errorString = string(tr("unexpected error: ")) + e.what();
- m_status = Status_Error;
+ setStatusError(string(tr("unexpected error: ")) + e.what());
} catch (...) {
- m_errorString = tr("unknown error");
- m_status = Status_Error;
+ setStatusError(tr("unknown error"));
}
} while (false);
- transaction->m_status = m_status;
- transaction->m_errorString = m_errorString;
+ statusWithErrorString(transaction->m_status, transaction->m_errorString);
return transaction;
}
@@ -1444,8 +1537,7 @@ std::string WalletImpl::getTxKey(const std::string &txid_str) const
crypto::hash txid;
if(!epee::string_tools::hex_to_pod(txid_str, txid))
{
- m_status = Status_Error;
- m_errorString = tr("Failed to parse txid");
+ setStatusError(tr("Failed to parse txid"));
return "";
}
@@ -1453,7 +1545,7 @@ std::string WalletImpl::getTxKey(const std::string &txid_str) const
std::vector<crypto::secret_key> additional_tx_keys;
if (m_wallet->get_tx_key(txid, tx_key, additional_tx_keys))
{
- m_status = Status_Ok;
+ clearStatus();
std::ostringstream oss;
oss << epee::string_tools::pod_to_hex(tx_key);
for (size_t i = 0; i < additional_tx_keys.size(); ++i)
@@ -1462,8 +1554,7 @@ std::string WalletImpl::getTxKey(const std::string &txid_str) const
}
else
{
- m_status = Status_Error;
- m_errorString = tr("no tx keys found for this txid");
+ setStatusError(tr("no tx keys found for this txid"));
return "";
}
}
@@ -1473,8 +1564,7 @@ bool WalletImpl::checkTxKey(const std::string &txid_str, std::string tx_key_str,
crypto::hash txid;
if (!epee::string_tools::hex_to_pod(txid_str, txid))
{
- m_status = Status_Error;
- m_errorString = tr("Failed to parse txid");
+ setStatusError(tr("Failed to parse txid"));
return false;
}
@@ -1482,8 +1572,7 @@ bool WalletImpl::checkTxKey(const std::string &txid_str, std::string tx_key_str,
std::vector<crypto::secret_key> additional_tx_keys;
if (!epee::string_tools::hex_to_pod(tx_key_str.substr(0, 64), tx_key))
{
- m_status = Status_Error;
- m_errorString = tr("Failed to parse tx key");
+ setStatusError(tr("Failed to parse tx key"));
return false;
}
tx_key_str = tx_key_str.substr(64);
@@ -1492,8 +1581,7 @@ bool WalletImpl::checkTxKey(const std::string &txid_str, std::string tx_key_str,
additional_tx_keys.resize(additional_tx_keys.size() + 1);
if (!epee::string_tools::hex_to_pod(tx_key_str.substr(0, 64), additional_tx_keys.back()))
{
- m_status = Status_Error;
- m_errorString = tr("Failed to parse tx key");
+ setStatusError(tr("Failed to parse tx key"));
return false;
}
tx_key_str = tx_key_str.substr(64);
@@ -1502,21 +1590,19 @@ bool WalletImpl::checkTxKey(const std::string &txid_str, std::string tx_key_str,
cryptonote::address_parse_info info;
if (!cryptonote::get_account_address_from_str(info, m_wallet->nettype(), address_str))
{
- m_status = Status_Error;
- m_errorString = tr("Failed to parse address");
+ setStatusError(tr("Failed to parse address"));
return false;
}
try
{
m_wallet->check_tx_key(txid, tx_key, additional_tx_keys, info.address, received, in_pool, confirmations);
- m_status = Status_Ok;
+ clearStatus();
return true;
}
catch (const std::exception &e)
{
- m_status = Status_Error;
- m_errorString = e.what();
+ setStatusError(e.what());
return false;
}
}
@@ -1526,28 +1612,25 @@ std::string WalletImpl::getTxProof(const std::string &txid_str, const std::strin
crypto::hash txid;
if (!epee::string_tools::hex_to_pod(txid_str, txid))
{
- m_status = Status_Error;
- m_errorString = tr("Failed to parse txid");
+ setStatusError(tr("Failed to parse txid"));
return "";
}
cryptonote::address_parse_info info;
if (!cryptonote::get_account_address_from_str(info, m_wallet->nettype(), address_str))
{
- m_status = Status_Error;
- m_errorString = tr("Failed to parse address");
+ setStatusError(tr("Failed to parse address"));
return "";
}
try
{
- m_status = Status_Ok;
+ clearStatus();
return m_wallet->get_tx_proof(txid, info.address, info.is_subaddress, message);
}
catch (const std::exception &e)
{
- m_status = Status_Error;
- m_errorString = e.what();
+ setStatusError(e.what());
return "";
}
}
@@ -1557,29 +1640,26 @@ bool WalletImpl::checkTxProof(const std::string &txid_str, const std::string &ad
crypto::hash txid;
if (!epee::string_tools::hex_to_pod(txid_str, txid))
{
- m_status = Status_Error;
- m_errorString = tr("Failed to parse txid");
+ setStatusError(tr("Failed to parse txid"));
return false;
}
cryptonote::address_parse_info info;
if (!cryptonote::get_account_address_from_str(info, m_wallet->nettype(), address_str))
{
- m_status = Status_Error;
- m_errorString = tr("Failed to parse address");
+ setStatusError(tr("Failed to parse address"));
return false;
}
try
{
good = m_wallet->check_tx_proof(txid, info.address, info.is_subaddress, message, signature, received, in_pool, confirmations);
- m_status = Status_Ok;
+ clearStatus();
return true;
}
catch (const std::exception &e)
{
- m_status = Status_Error;
- m_errorString = e.what();
+ setStatusError(e.what());
return false;
}
}
@@ -1588,20 +1668,18 @@ std::string WalletImpl::getSpendProof(const std::string &txid_str, const std::st
crypto::hash txid;
if(!epee::string_tools::hex_to_pod(txid_str, txid))
{
- m_status = Status_Error;
- m_errorString = tr("Failed to parse txid");
+ setStatusError(tr("Failed to parse txid"));
return "";
}
try
{
- m_status = Status_Ok;
+ clearStatus();
return m_wallet->get_spend_proof(txid, message);
}
catch (const std::exception &e)
{
- m_status = Status_Error;
- m_errorString = e.what();
+ setStatusError(e.what());
return "";
}
}
@@ -1611,21 +1689,19 @@ bool WalletImpl::checkSpendProof(const std::string &txid_str, const std::string
crypto::hash txid;
if(!epee::string_tools::hex_to_pod(txid_str, txid))
{
- m_status = Status_Error;
- m_errorString = tr("Failed to parse txid");
+ setStatusError(tr("Failed to parse txid"));
return false;
}
try
{
- m_status = Status_Ok;
+ clearStatus();
good = m_wallet->check_spend_proof(txid, message, signature);
return true;
}
catch (const std::exception &e)
{
- m_status = Status_Error;
- m_errorString = e.what();
+ setStatusError(e.what());
return false;
}
}
@@ -1633,7 +1709,7 @@ bool WalletImpl::checkSpendProof(const std::string &txid_str, const std::string
std::string WalletImpl::getReserveProof(bool all, uint32_t account_index, uint64_t amount, const std::string &message) const {
try
{
- m_status = Status_Ok;
+ clearStatus();
boost::optional<std::pair<uint32_t, uint64_t>> account_minreserve;
if (!all)
{
@@ -1643,8 +1719,7 @@ std::string WalletImpl::getReserveProof(bool all, uint32_t account_index, uint64
}
catch (const std::exception &e)
{
- m_status = Status_Error;
- m_errorString = e.what();
+ setStatusError(e.what());
return "";
}
}
@@ -1653,28 +1728,25 @@ bool WalletImpl::checkReserveProof(const std::string &address, const std::string
cryptonote::address_parse_info info;
if (!cryptonote::get_account_address_from_str(info, m_wallet->nettype(), address))
{
- m_status = Status_Error;
- m_errorString = tr("Failed to parse address");
+ setStatusError(tr("Failed to parse address"));
return false;
}
if (info.is_subaddress)
{
- m_status = Status_Error;
- m_errorString = tr("Address must not be a subaddress");
+ setStatusError(tr("Address must not be a subaddress"));
return false;
}
good = false;
try
{
- m_status = Status_Ok;
+ clearStatus();
good = m_wallet->check_reserve_proof(info.address, message, signature, total, spent);
return true;
}
catch (const std::exception &e)
{
- m_status = Status_Error;
- m_errorString = e.what();
+ setStatusError(e.what());
return false;
}
}
@@ -1741,10 +1813,10 @@ bool WalletImpl::verifyMessageWithPublicKey(const std::string &message, const st
bool WalletImpl::connectToDaemon()
{
bool result = m_wallet->check_connection(NULL, DEFAULT_CONNECTION_TIMEOUT_MILLIS);
- m_status = result ? Status_Ok : Status_Error;
if (!result) {
- m_errorString = "Error connecting to daemon at " + m_wallet->get_daemon_address();
+ setStatusError("Error connecting to daemon at " + m_wallet->get_daemon_address());
} else {
+ clearStatus();
// start refreshing here
}
return result;
@@ -1779,10 +1851,28 @@ bool WalletImpl::watchOnly() const
void WalletImpl::clearStatus() const
{
+ boost::lock_guard<boost::mutex> l(m_statusMutex);
m_status = Status_Ok;
m_errorString.clear();
}
+void WalletImpl::setStatusError(const std::string& message) const
+{
+ setStatus(Status_Error, message);
+}
+
+void WalletImpl::setStatusCritical(const std::string& message) const
+{
+ setStatus(Status_Critical, message);
+}
+
+void WalletImpl::setStatus(int status, const std::string& message) const
+{
+ boost::lock_guard<boost::mutex> l(m_statusMutex);
+ m_status = status;
+ m_errorString = message;
+}
+
void WalletImpl::refreshThreadFunc()
{
LOG_PRINT_L3(__FUNCTION__ << ": starting refresh thread");
@@ -1804,7 +1894,7 @@ void WalletImpl::refreshThreadFunc()
LOG_PRINT_L3(__FUNCTION__ << ": refresh lock acquired...");
LOG_PRINT_L3(__FUNCTION__ << ": m_refreshEnabled: " << m_refreshEnabled);
- LOG_PRINT_L3(__FUNCTION__ << ": m_status: " << m_status);
+ LOG_PRINT_L3(__FUNCTION__ << ": m_status: " << status());
if (m_refreshEnabled) {
LOG_PRINT_L3(__FUNCTION__ << ": refreshing...");
doRefresh();
@@ -1836,8 +1926,7 @@ void WalletImpl::doRefresh()
LOG_PRINT_L3(__FUNCTION__ << ": skipping refresh - daemon is not synced");
}
} catch (const std::exception &e) {
- m_status = Status_Error;
- m_errorString = e.what();
+ setStatusError(e.what());
}
if (m_wallet2Callback->getListener()) {
m_wallet2Callback->getListener()->refreshed();
@@ -1926,16 +2015,14 @@ bool WalletImpl::rescanSpent()
{
clearStatus();
if (!trustedDaemon()) {
- m_status = Status_Error;
- m_errorString = tr("Rescan spent can only be used with a trusted daemon");
+ setStatusError(tr("Rescan spent can only be used with a trusted daemon"));
return false;
}
try {
m_wallet->rescan_spent();
} catch (const std::exception &e) {
LOG_ERROR(__FUNCTION__ << " error: " << e.what());
- m_status = Status_Error;
- m_errorString = e.what();
+ setStatusError(e.what());
return false;
}
return true;
@@ -1961,8 +2048,7 @@ bool WalletImpl::blackballOutputs(const std::vector<std::string> &pubkeys, bool
crypto::public_key pkey;
if (!epee::string_tools::hex_to_pod(str, pkey))
{
- m_status = Status_Error;
- m_errorString = tr("Failed to parse output public key");
+ setStatusError(tr("Failed to parse output public key"));
return false;
}
raw_pubkeys.push_back(pkey);
@@ -1970,8 +2056,7 @@ bool WalletImpl::blackballOutputs(const std::vector<std::string> &pubkeys, bool
bool ret = m_wallet->set_blackballed_outputs(raw_pubkeys, add);
if (!ret)
{
- m_status = Status_Error;
- m_errorString = tr("Failed to set blackballed outputs");
+ setStatusError(tr("Failed to set blackballed outputs"));
return false;
}
return true;
@@ -1982,15 +2067,13 @@ bool WalletImpl::unblackballOutput(const std::string &pubkey)
crypto::public_key raw_pubkey;
if (!epee::string_tools::hex_to_pod(pubkey, raw_pubkey))
{
- m_status = Status_Error;
- m_errorString = tr("Failed to parse output public key");
+ setStatusError(tr("Failed to parse output public key"));
return false;
}
bool ret = m_wallet->unblackball_output(raw_pubkey);
if (!ret)
{
- m_status = Status_Error;
- m_errorString = tr("Failed to unblackball output");
+ setStatusError(tr("Failed to unblackball output"));
return false;
}
return true;
@@ -2001,15 +2084,13 @@ bool WalletImpl::getRing(const std::string &key_image, std::vector<uint64_t> &ri
crypto::key_image raw_key_image;
if (!epee::string_tools::hex_to_pod(key_image, raw_key_image))
{
- m_status = Status_Error;
- m_errorString = tr("Failed to parse key image");
+ setStatusError(tr("Failed to parse key image"));
return false;
}
bool ret = m_wallet->get_ring(raw_key_image, ring);
if (!ret)
{
- m_status = Status_Error;
- m_errorString = tr("Failed to get ring");
+ setStatusError(tr("Failed to get ring"));
return false;
}
return true;
@@ -2020,16 +2101,14 @@ bool WalletImpl::getRings(const std::string &txid, std::vector<std::pair<std::st
crypto::hash raw_txid;
if (!epee::string_tools::hex_to_pod(txid, raw_txid))
{
- m_status = Status_Error;
- m_errorString = tr("Failed to parse txid");
+ setStatusError(tr("Failed to parse txid"));
return false;
}
std::vector<std::pair<crypto::key_image, std::vector<uint64_t>>> raw_rings;
bool ret = m_wallet->get_rings(raw_txid, raw_rings);
if (!ret)
{
- m_status = Status_Error;
- m_errorString = tr("Failed to get rings");
+ setStatusError(tr("Failed to get rings"));
return false;
}
for (const auto &r: raw_rings)
@@ -2044,15 +2123,13 @@ bool WalletImpl::setRing(const std::string &key_image, const std::vector<uint64_
crypto::key_image raw_key_image;
if (!epee::string_tools::hex_to_pod(key_image, raw_key_image))
{
- m_status = Status_Error;
- m_errorString = tr("Failed to parse key image");
+ setStatusError(tr("Failed to parse key image"));
return false;
}
bool ret = m_wallet->set_ring(raw_key_image, ring, relative);
if (!ret)
{
- m_status = Status_Error;
- m_errorString = tr("Failed to set ring");
+ setStatusError(tr("Failed to set ring"));
return false;
}
return true;
diff --git a/src/wallet/api/wallet.h b/src/wallet/api/wallet.h
index fed1e75f2..d2b4cd506 100644
--- a/src/wallet/api/wallet.h
+++ b/src/wallet/api/wallet.h
@@ -83,6 +83,7 @@ public:
// void setListener(Listener *) {}
int status() const;
std::string errorString() const;
+ void statusWithErrorString(int& status, std::string& errorString) const override;
bool setPassword(const std::string &password);
std::string address(uint32_t accountIndex = 0, uint32_t addressIndex = 0) const;
std::string integratedAddress(const std::string &payment_id) const;
@@ -126,6 +127,14 @@ public:
std::string getSubaddressLabel(uint32_t accountIndex, uint32_t addressIndex) const;
void setSubaddressLabel(uint32_t accountIndex, uint32_t addressIndex, const std::string &label);
+ MultisigState multisig() const override;
+ std::string getMultisigInfo() const override;
+ std::string makeMultisig(const std::vector<std::string>& info, uint32_t threshold) override;
+ bool finalizeMultisig(const std::vector<std::string>& extraMultisigInfo) override;
+ bool exportMultisigImages(std::string& images) override;
+ size_t importMultisigImages(const std::vector<std::string>& images) override;
+ PendingTransaction* restoreMultisigTransaction(const std::string& signData) override;
+
PendingTransaction * createTransaction(const std::string &dst_addr, const std::string &payment_id,
optional<uint64_t> amount, uint32_t mixin_count,
PendingTransaction::Priority priority = PendingTransaction::Priority_Low,
@@ -176,6 +185,9 @@ public:
private:
void clearStatus() const;
+ void setStatusError(const std::string& message) const;
+ void setStatusCritical(const std::string& message) const;
+ void setStatus(int status, const std::string& message) const;
void refreshThreadFunc();
void doRefresh();
bool daemonSynced() const;
@@ -193,7 +205,8 @@ private:
friend class SubaddressAccountImpl;
tools::wallet2 * m_wallet;
- mutable std::atomic<int> m_status;
+ mutable boost::mutex m_statusMutex;
+ mutable int m_status;
mutable std::string m_errorString;
std::string m_password;
TransactionHistoryImpl * m_history;
diff --git a/src/wallet/api/wallet2_api.h b/src/wallet/api/wallet2_api.h
index 4f9d25957..d0c4b36b9 100644
--- a/src/wallet/api/wallet2_api.h
+++ b/src/wallet/api/wallet2_api.h
@@ -100,6 +100,30 @@ struct PendingTransaction
virtual uint64_t txCount() const = 0;
virtual std::vector<uint32_t> subaddrAccount() const = 0;
virtual std::vector<std::set<uint32_t>> subaddrIndices() const = 0;
+
+ /**
+ * @brief multisigSignData
+ * @return encoded multisig transaction with signers' keys.
+ * Transfer this data to another wallet participant to sign it.
+ * Assumed use case is:
+ * 1. Initiator:
+ * auto data = pendingTransaction->multisigSignData();
+ * 2. Signer1:
+ * pendingTransaction = wallet->restoreMultisigTransaction(data);
+ * pendingTransaction->signMultisigTx();
+ * auto signed = pendingTransaction->multisigSignData();
+ * 3. Signer2:
+ * pendingTransaction = wallet->restoreMultisigTransaction(signed);
+ * pendingTransaction->signMultisigTx();
+ * pendingTransaction->commit();
+ */
+ virtual std::string multisigSignData() = 0;
+ virtual void signMultisigTx() = 0;
+ /**
+ * @brief signersKeys
+ * @return vector of base58-encoded signers' public keys
+ */
+ virtual std::vector<std::string> signersKeys() const = 0;
};
/**
@@ -291,6 +315,15 @@ struct SubaddressAccount
virtual void refresh() = 0;
};
+struct MultisigState {
+ MultisigState() : isMultisig(false), isReady(false), threshold(0), total(0) {}
+
+ bool isMultisig;
+ bool isReady;
+ uint32_t threshold;
+ uint32_t total;
+};
+
struct WalletListener
{
virtual ~WalletListener() = 0;
@@ -358,9 +391,11 @@ struct Wallet
virtual std::string getSeedLanguage() const = 0;
virtual void setSeedLanguage(const std::string &arg) = 0;
//! returns wallet status (Status_Ok | Status_Error)
- virtual int status() const = 0;
+ virtual int status() const = 0; //deprecated: use safe alternative statusWithErrorString
//! in case error status, returns error string
- virtual std::string errorString() const = 0;
+ virtual std::string errorString() const = 0; //deprecated: use safe alternative statusWithErrorString
+ //! returns both error and error string atomically. suggested to use in instead of status() and errorString()
+ virtual void statusWithErrorString(int& status, std::string& errorString) const = 0;
virtual bool setPassword(const std::string &password) = 0;
virtual std::string address(uint32_t accountIndex = 0, uint32_t addressIndex = 0) const = 0;
std::string mainAddress() const { return address(0, 0); }
@@ -556,7 +591,8 @@ struct Wallet
}
static uint64_t maximumAllowedAmount();
// Easylogger wrapper
- static void init(const char *argv0, const char *default_log_base_name);
+ static void init(const char *argv0, const char *default_log_base_name) { init(argv0, default_log_base_name, "", true); }
+ static void init(const char *argv0, const char *default_log_base_name, const std::string &log_path, bool console);
static void debug(const std::string &category, const std::string &str);
static void info(const std::string &category, const std::string &str);
static void warning(const std::string &category, const std::string &str);
@@ -628,6 +664,48 @@ struct Wallet
*/
virtual void setSubaddressLabel(uint32_t accountIndex, uint32_t addressIndex, const std::string &label) = 0;
+ /**
+ * @brief multisig - returns current state of multisig wallet creation process
+ * @return MultisigState struct
+ */
+ virtual MultisigState multisig() const = 0;
+ /**
+ * @brief getMultisigInfo
+ * @return serialized and signed multisig info string
+ */
+ virtual std::string getMultisigInfo() const = 0;
+ /**
+ * @brief makeMultisig - switches wallet in multisig state. The one and only creation phase for N / N wallets
+ * @param info - vector of multisig infos from other participants obtained with getMulitisInfo call
+ * @param threshold - number of required signers to make valid transaction. Must be equal to number of participants (N) or N - 1
+ * @return in case of N / N wallets returns empty string since no more key exchanges needed. For N - 1 / N wallets returns base58 encoded extra multisig info
+ */
+ virtual std::string makeMultisig(const std::vector<std::string>& info, uint32_t threshold) = 0;
+ /**
+ * @brief finalizeMultisig - finalizes N - 1 / N multisig wallets creation
+ * @param extraMultisigInfo - wallet participants' extra multisig info obtained with makeMultisig call
+ * @return true if success
+ */
+ virtual bool finalizeMultisig(const std::vector<std::string>& extraMultisigInfo) = 0;
+ /**
+ * @brief exportMultisigImages - exports transfers' key images
+ * @param images - output paramter for hex encoded array of images
+ * @return true if success
+ */
+ virtual bool exportMultisigImages(std::string& images) = 0;
+ /**
+ * @brief importMultisigImages - imports other participants' multisig images
+ * @param images - array of hex encoded arrays of images obtained with exportMultisigImages
+ * @return number of imported images
+ */
+ virtual size_t importMultisigImages(const std::vector<std::string>& images) = 0;
+
+ /**
+ * @brief restoreMultisigTransaction creates PendingTransaction from signData
+ * @param signData encrypted unsigned transaction. Obtained with PendingTransaction::multisigSignData
+ * @return PendingTransaction
+ */
+ virtual PendingTransaction* restoreMultisigTransaction(const std::string& signData) = 0;
/*!
* \brief createTransaction creates transaction. if dst_addr is an integrated address, payment_id is ignored
* \param dst_addr destination address as string
@@ -971,25 +1049,25 @@ struct WalletManager
virtual void setDaemonAddress(const std::string &address) = 0;
//! returns whether the daemon can be reached, and its version number
- virtual bool connected(uint32_t *version = NULL) const = 0;
+ virtual bool connected(uint32_t *version = NULL) = 0;
//! returns current blockchain height
- virtual uint64_t blockchainHeight() const = 0;
+ virtual uint64_t blockchainHeight() = 0;
//! returns current blockchain target height
- virtual uint64_t blockchainTargetHeight() const = 0;
+ virtual uint64_t blockchainTargetHeight() = 0;
//! returns current network difficulty
- virtual uint64_t networkDifficulty() const = 0;
+ virtual uint64_t networkDifficulty() = 0;
//! returns current mining hash rate (0 if not mining)
- virtual double miningHashRate() const = 0;
+ virtual double miningHashRate() = 0;
//! returns current block target
- virtual uint64_t blockTarget() const = 0;
+ virtual uint64_t blockTarget() = 0;
//! returns true iff mining
- virtual bool isMining() const = 0;
+ virtual bool isMining() = 0;
//! starts mining with the set number of threads
virtual bool startMining(const std::string &address, uint32_t threads = 1, bool background_mining = false, bool ignore_battery = true) = 0;
diff --git a/src/wallet/api/wallet_manager.cpp b/src/wallet/api/wallet_manager.cpp
index 80f5780b5..a63716576 100644
--- a/src/wallet/api/wallet_manager.cpp
+++ b/src/wallet/api/wallet_manager.cpp
@@ -47,15 +47,6 @@ namespace epee {
unsigned int g_test_dbg_lock_sleep = 0;
}
-namespace {
- template<typename Request, typename Response>
- bool connect_and_invoke(const std::string& address, const std::string& path, const Request& request, Response& response)
- {
- epee::net_utils::http::http_simple_client client{};
- return client.set_server(address, boost::none) && epee::net_utils::invoke_http_json(path, request, response, client);
- }
-}
-
namespace Monero {
Wallet *WalletManagerImpl::createWallet(const std::string &path, const std::string &password,
@@ -193,16 +184,19 @@ std::string WalletManagerImpl::errorString() const
void WalletManagerImpl::setDaemonAddress(const std::string &address)
{
m_daemonAddress = address;
+ if(m_http_client.is_connected())
+ m_http_client.disconnect();
+ m_http_client.set_server(address, boost::none);
}
-bool WalletManagerImpl::connected(uint32_t *version) const
+bool WalletManagerImpl::connected(uint32_t *version)
{
epee::json_rpc::request<cryptonote::COMMAND_RPC_GET_VERSION::request> req_t = AUTO_VAL_INIT(req_t);
epee::json_rpc::response<cryptonote::COMMAND_RPC_GET_VERSION::response, std::string> resp_t = AUTO_VAL_INIT(resp_t);
req_t.jsonrpc = "2.0";
req_t.id = epee::serialization::storage_entry(0);
req_t.method = "get_version";
- if (!connect_and_invoke(m_daemonAddress, "/json_rpc", req_t, resp_t))
+ if (!epee::net_utils::invoke_http_json("/json_rpc", req_t, resp_t, m_http_client))
return false;
if (version)
@@ -210,65 +204,65 @@ bool WalletManagerImpl::connected(uint32_t *version) const
return true;
}
-uint64_t WalletManagerImpl::blockchainHeight() const
+uint64_t WalletManagerImpl::blockchainHeight()
{
cryptonote::COMMAND_RPC_GET_INFO::request ireq;
cryptonote::COMMAND_RPC_GET_INFO::response ires;
- if (!connect_and_invoke(m_daemonAddress, "/getinfo", ireq, ires))
+ if (!epee::net_utils::invoke_http_json("/getinfo", ireq, ires, m_http_client))
return 0;
return ires.height;
}
-uint64_t WalletManagerImpl::blockchainTargetHeight() const
+uint64_t WalletManagerImpl::blockchainTargetHeight()
{
cryptonote::COMMAND_RPC_GET_INFO::request ireq;
cryptonote::COMMAND_RPC_GET_INFO::response ires;
- if (!connect_and_invoke(m_daemonAddress, "/getinfo", ireq, ires))
+ if (!epee::net_utils::invoke_http_json("/getinfo", ireq, ires, m_http_client))
return 0;
return ires.target_height >= ires.height ? ires.target_height : ires.height;
}
-uint64_t WalletManagerImpl::networkDifficulty() const
+uint64_t WalletManagerImpl::networkDifficulty()
{
cryptonote::COMMAND_RPC_GET_INFO::request ireq;
cryptonote::COMMAND_RPC_GET_INFO::response ires;
- if (!connect_and_invoke(m_daemonAddress, "/getinfo", ireq, ires))
+ if (!epee::net_utils::invoke_http_json("/getinfo", ireq, ires, m_http_client))
return 0;
return ires.difficulty;
}
-double WalletManagerImpl::miningHashRate() const
+double WalletManagerImpl::miningHashRate()
{
cryptonote::COMMAND_RPC_MINING_STATUS::request mreq;
cryptonote::COMMAND_RPC_MINING_STATUS::response mres;
epee::net_utils::http::http_simple_client http_client;
- if (!connect_and_invoke(m_daemonAddress, "/mining_status", mreq, mres))
+ if (!epee::net_utils::invoke_http_json("/mining_status", mreq, mres, m_http_client))
return 0.0;
if (!mres.active)
return 0.0;
return mres.speed;
}
-uint64_t WalletManagerImpl::blockTarget() const
+uint64_t WalletManagerImpl::blockTarget()
{
cryptonote::COMMAND_RPC_GET_INFO::request ireq;
cryptonote::COMMAND_RPC_GET_INFO::response ires;
- if (!connect_and_invoke(m_daemonAddress, "/getinfo", ireq, ires))
+ if (!epee::net_utils::invoke_http_json("/getinfo", ireq, ires, m_http_client))
return 0;
return ires.target;
}
-bool WalletManagerImpl::isMining() const
+bool WalletManagerImpl::isMining()
{
cryptonote::COMMAND_RPC_MINING_STATUS::request mreq;
cryptonote::COMMAND_RPC_MINING_STATUS::response mres;
- if (!connect_and_invoke(m_daemonAddress, "/mining_status", mreq, mres))
+ if (!epee::net_utils::invoke_http_json("/mining_status", mreq, mres, m_http_client))
return false;
return mres.active;
}
@@ -283,7 +277,7 @@ bool WalletManagerImpl::startMining(const std::string &address, uint32_t threads
mreq.ignore_battery = ignore_battery;
mreq.do_background_mining = background_mining;
- if (!connect_and_invoke(m_daemonAddress, "/start_mining", mreq, mres))
+ if (!epee::net_utils::invoke_http_json("/start_mining", mreq, mres, m_http_client))
return false;
return mres.status == CORE_RPC_STATUS_OK;
}
@@ -293,7 +287,7 @@ bool WalletManagerImpl::stopMining()
cryptonote::COMMAND_RPC_STOP_MINING::request mreq;
cryptonote::COMMAND_RPC_STOP_MINING::response mres;
- if (!connect_and_invoke(m_daemonAddress, "/stop_mining", mreq, mres))
+ if (!epee::net_utils::invoke_http_json("/stop_mining", mreq, mres, m_http_client))
return false;
return mres.status == CORE_RPC_STATUS_OK;
}
diff --git a/src/wallet/api/wallet_manager.h b/src/wallet/api/wallet_manager.h
index 409a6d499..26238b658 100644
--- a/src/wallet/api/wallet_manager.h
+++ b/src/wallet/api/wallet_manager.h
@@ -30,6 +30,7 @@
#include "wallet/api/wallet2_api.h"
+#include "net/http_client.h"
#include <string>
namespace Monero {
@@ -69,13 +70,13 @@ public:
std::vector<std::string> findWallets(const std::string &path);
std::string errorString() const;
void setDaemonAddress(const std::string &address);
- bool connected(uint32_t *version = NULL) const;
- uint64_t blockchainHeight() const;
- uint64_t blockchainTargetHeight() const;
- uint64_t networkDifficulty() const;
- double miningHashRate() const;
- uint64_t blockTarget() const;
- bool isMining() const;
+ bool connected(uint32_t *version = NULL);
+ uint64_t blockchainHeight();
+ uint64_t blockchainTargetHeight();
+ uint64_t networkDifficulty();
+ double miningHashRate();
+ uint64_t blockTarget();
+ bool isMining();
bool startMining(const std::string &address, uint32_t threads = 1, bool background_mining = false, bool ignore_battery = true);
bool stopMining();
std::string resolveOpenAlias(const std::string &address, bool &dnssec_valid) const;
@@ -84,6 +85,7 @@ private:
WalletManagerImpl() {}
friend struct WalletManagerFactory;
std::string m_daemonAddress;
+ epee::net_utils::http::http_simple_client m_http_client;
std::string m_errorString;
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 10:25:24 +0000