Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions src/cpp/daemon/py_monero_daemon_model.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -767,10 +767,7 @@ void PyMoneroDaemonInfo::from_property_tree(const boost::property_tree::ptree& n
else if (key == std::string("adjusted_time")) info->m_adjusted_timestamp = it->second.get_value<uint64_t>();
else if (key == std::string("target")) info->m_target = it->second.get_value<uint64_t>();
else if (key == std::string("target_height")) info->m_target_height = it->second.get_value<uint64_t>();
else if (key == std::string("top_block_hash") || key == std::string("top_hash")) {
std::string top_hash = it->second.data();
if (!top_hash.empty()) info->m_top_block_hash = top_hash;
}
else if ((key == std::string("top_block_hash") || key == std::string("top_hash")) && !it->second.data().empty()) info->m_top_block_hash = it->second.data();
else if (key == std::string("tx_count")) info->m_num_txs = it->second.get_value<int>();
else if (key == std::string("tx_pool_size")) info->m_num_txs_pool = it->second.get_value<int>();
else if (key == std::string("was_bootstrap_ever_used")) info->m_was_bootstrap_ever_used = it->second.get_value<bool>();
Expand All @@ -792,10 +789,7 @@ void PyMoneroDaemonSyncInfo::from_property_tree(const boost::property_tree::ptre
// TODO implement overview field
//else if (key == std::string("overview") && !it->second.data().empty()) info->m_overview = it->second.data();
else if (key == std::string("credits")) info->m_credits = it->second.get_value<uint64_t>();
else if (key == std::string("top_hash")) {
std::string top_hash = it->second.data();
if (!top_hash.empty()) info->m_top_block_hash = top_hash;
}
else if (key == std::string("top_hash") && !it->second.data().empty()) info->m_top_block_hash = it->second.data();
}
}

Expand All @@ -811,10 +805,7 @@ void PyMoneroHardForkInfo::from_property_tree(const boost::property_tree::ptree&
else if (key == std::string("window")) info->m_window = it->second.get_value<int>();
else if (key == std::string("voting")) info->m_voting = it->second.get_value<int>();
else if (key == std::string("credits")) info->m_credits = it->second.get_value<uint64_t>();
else if (key == std::string("top_hash")) {
std::string top_hash = it->second.data();
if (!top_hash.empty()) info->m_top_block_hash = top_hash;
}
else if (key == std::string("top_hash") && !it->second.data().empty()) info->m_top_block_hash = it->second.data();
}
}

Expand Down
3 changes: 2 additions & 1 deletion src/cpp/daemon/py_monero_daemon_model.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,15 @@ class PyMoneroDownloadUpdateParams : public PyMoneroRequestParams {
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const override;
};

class PyMoneroStartMiningParams : public PyMoneroRequestParams {
class PyMoneroStartMiningParams : public PyMoneroJsonRequestParams {
public:
boost::optional<std::string> m_address;
boost::optional<int> m_num_threads;
boost::optional<bool> m_is_background;
boost::optional<bool> m_ignore_battery;

PyMoneroStartMiningParams(const std::string& address, int num_threads, bool is_background, bool ignore_battery);
PyMoneroStartMiningParams(int num_threads, bool is_background, bool ignore_battery): m_num_threads(num_threads), m_is_background(is_background), m_ignore_battery(ignore_battery) { }

rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const override;
};
Expand Down
45 changes: 7 additions & 38 deletions src/cpp/wallet/py_monero_wallet_model.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -274,10 +274,6 @@ PyMoneroCreateOpenWalletParams::PyMoneroCreateOpenWalletParams(const boost::opti
m_autosave_current(autosave_current) {
}

PyMoneroGetAccountsParams::PyMoneroGetAccountsParams(const std::string& tag): m_tag(tag) {
if (tag.empty()) m_tag = boost::none;
}

PyMoneroReserveProofParams::PyMoneroReserveProofParams(const std::string &message, bool all):
m_all(all), m_message(message) {
}
Expand Down Expand Up @@ -1191,12 +1187,15 @@ void PyMoneroSubaddress::from_rpc_property_tree(const boost::property_tree::ptre
void PyMoneroSubaddress::from_rpc_property_tree(const boost::property_tree::ptree& node, std::vector<std::shared_ptr<monero::monero_subaddress>>& subaddresses) {
for (boost::property_tree::ptree::const_iterator it = node.begin(); it != node.end(); ++it) {
std::string key = it->first;
if (key == std::string("per_subaddress")) {
bool rpc_subaddresses = key == std::string("addresses");

if (key == std::string("per_subaddress") || rpc_subaddresses) {
auto per_subaddress_node = it->second;

for (auto it2 = per_subaddress_node.begin(); it2 != per_subaddress_node.end(); ++it2) {
auto sub = std::make_shared<monero::monero_subaddress>();
from_property_tree(it2->second, sub);
if (rpc_subaddresses) from_rpc_property_tree(it2->second, sub);
else from_property_tree(it2->second, sub);
subaddresses.push_back(sub);
}
}
Expand Down Expand Up @@ -1528,16 +1527,6 @@ rapidjson::Value PyMoneroSplitIntegratedAddressParams::to_rapidjson_val(rapidjso
return root;
}

rapidjson::Value PyMoneroWalletStartMiningParams::to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const {
rapidjson::Value root(rapidjson::kObjectType);
rapidjson::Value value_str(rapidjson::kStringType);
rapidjson::Value value_num(rapidjson::kNumberType);
if (m_num_threads != boost::none) monero_utils::add_json_member("threads_count", m_num_threads.get(), allocator, root, value_num);
if (m_is_background != boost::none) monero_utils::add_json_member("do_background_mining", m_is_background.get(), allocator, root);
if (m_ignore_battery != boost::none) monero_utils::add_json_member("ignore_battery", m_ignore_battery.get(), allocator, root);
return root;
}

rapidjson::Value PyMoneroPrepareMultisigParams::to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const {
rapidjson::Value root(rapidjson::kObjectType);
if (m_enable_multisig_experimental != boost::none) monero_utils::add_json_member("enable_multisig_experimental", m_enable_multisig_experimental.get(), allocator, root);
Expand Down Expand Up @@ -1618,12 +1607,6 @@ rapidjson::Value PyMoneroWalletAttributeParams::to_rapidjson_val(rapidjson::Docu
return root;
}

rapidjson::Value PyMoneroScanTxParams::to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const {
rapidjson::Value root(rapidjson::kObjectType);
if (!m_tx_hashes.empty()) root.AddMember("txids", monero_utils::to_rapidjson_val(allocator, m_tx_hashes), allocator);
return root;
}

rapidjson::Value PyMoneroSetDaemonParams::to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const {
rapidjson::Value root(rapidjson::kObjectType);
rapidjson::Value value_str(rapidjson::kStringType);
Expand All @@ -1647,19 +1630,12 @@ rapidjson::Value PyMoneroAutoRefreshParams::to_rapidjson_val(rapidjson::Document
return root;
}

rapidjson::Value PyMoneroSetAccountTagDescriptionParams::to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const {
rapidjson::Value root(rapidjson::kObjectType);
rapidjson::Value value_str(rapidjson::kStringType);
if (m_tag != boost::none) monero_utils::add_json_member("tag", m_tag.get(), allocator, root, value_str);
if (m_label != boost::none) monero_utils::add_json_member("label", m_label.get(), allocator, root, value_str);
return root;
}

rapidjson::Value PyMoneroTagAccountsParams::to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const {
rapidjson::Value root(rapidjson::kObjectType);
rapidjson::Value value_str(rapidjson::kStringType);
if (m_tag != boost::none) monero_utils::add_json_member("tag", m_tag.get(), allocator, root, value_str);
if (!m_account_indices.empty()) root.AddMember("accounts", monero_utils::to_rapidjson_val(allocator, m_account_indices), allocator);
if (m_label != boost::none) monero_utils::add_json_member("label", m_label.get(), allocator, root, value_str);
if (!m_account_indices.empty()) root.AddMember("accounts", monero_utils::to_rapidjson_val(allocator, m_account_indices), allocator);
return root;
}

Expand All @@ -1683,13 +1659,6 @@ rapidjson::Value PyMoneroAddressBookEntryParams::to_rapidjson_val(rapidjson::Doc
return root;
}

rapidjson::Value PyMoneroGetAccountsParams::to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const {
rapidjson::Value root(rapidjson::kObjectType);
rapidjson::Value value_str(rapidjson::kStringType);
if (m_tag != boost::none) monero_utils::add_json_member("tag", m_tag.get(), allocator, root, value_str);
return root;
}

rapidjson::Value PyMoneroVerifySignMessageParams::to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const {
rapidjson::Value root(rapidjson::kObjectType);
rapidjson::Value value_str(rapidjson::kStringType);
Expand Down
41 changes: 2 additions & 39 deletions src/cpp/wallet/py_monero_wallet_model.h
Original file line number Diff line number Diff line change
Expand Up @@ -240,17 +240,6 @@ class PyMoneroSplitIntegratedAddressParams : public PyMoneroJsonRequestParams {
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const override;
};

class PyMoneroWalletStartMiningParams : public PyMoneroJsonRequestParams {
public:
boost::optional<int> m_num_threads;
boost::optional<bool> m_is_background;
boost::optional<bool> m_ignore_battery;

PyMoneroWalletStartMiningParams(int num_threads, bool is_background, bool ignore_battery): m_num_threads(num_threads), m_is_background(is_background), m_ignore_battery(ignore_battery) { }

rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const override;
};

class PyMoneroPrepareMultisigParams : public PyMoneroJsonRequestParams {
public:
// TODO monero-docs document this parameter
Expand Down Expand Up @@ -414,15 +403,6 @@ class PyMoneroWalletAttributeParams : public PyMoneroJsonRequestParams {
static void from_property_tree(const boost::property_tree::ptree& node, const std::shared_ptr<PyMoneroWalletAttributeParams>& attributes);
};

class PyMoneroScanTxParams : public PyMoneroJsonRequestParams {
public:
std::vector<std::string> m_tx_hashes;

PyMoneroScanTxParams(const std::vector<std::string>& tx_hashes): m_tx_hashes(tx_hashes) { }

rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const override;
};

class PyMoneroSetDaemonParams : public PyMoneroJsonRequestParams {
public:
boost::optional<std::string> m_address;
Expand All @@ -448,21 +428,13 @@ class PyMoneroAutoRefreshParams : public PyMoneroJsonRequestParams {
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const override;
};

class PyMoneroSetAccountTagDescriptionParams : public PyMoneroJsonRequestParams {
public:
boost::optional<std::string> m_tag;
boost::optional<std::string> m_label;

PyMoneroSetAccountTagDescriptionParams(const std::string& tag, const std::string& label): m_tag(tag), m_label(label) { }

rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const override;
};

class PyMoneroTagAccountsParams : public PyMoneroJsonRequestParams {
public:
std::vector<uint32_t> m_account_indices;
boost::optional<std::string> m_tag;
boost::optional<std::string> m_label;

PyMoneroTagAccountsParams(const std::string& tag, const std::string& label = ""): m_tag(tag), m_label(label) { }
PyMoneroTagAccountsParams(const std::vector<uint32_t>& account_indices): m_account_indices(account_indices) { }
PyMoneroTagAccountsParams(const std::string& tag, const std::vector<uint32_t>& account_indices): m_tag(tag), m_account_indices(account_indices) { }

Expand Down Expand Up @@ -512,15 +484,6 @@ class PyMoneroWalletBalance {
PyMoneroWalletBalance(uint64_t balance = 0, uint64_t unlocked_balance = 0): m_balance(balance), m_unlocked_balance(unlocked_balance) { }
};

class PyMoneroGetAccountsParams : public PyMoneroJsonRequestParams {
public:
boost::optional<std::string> m_tag;

PyMoneroGetAccountsParams(const std::string& tag);

rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const override;
};

class PyMoneroVerifySignMessageParams : public PyMoneroJsonRequestParams {
public:
boost::optional<std::string> m_data;
Expand Down
Loading
Loading