github-wownero/wownero-cpp
1
0
Fork 0
mirror of https://github.com/wownero/wownero-cpp.git synced 2026-10-18 07:41:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

support is_unlocked in tx_query meets_criteria, node_to_tx_wallet, copy

Browse Source
This commit is contained in:
woodser
2019-11-21 16:01:21 -05:00
parent 0d392b96b9
commit 293ad48d63
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utils/monero_utils.cpp
+6 -4
View File
@@ -198,6 +198,8 @@ void node_to_tx_wallet(const boost::property_tree::ptree& node, shared_ptr<moner
for (boost::property_tree::ptree::const_iterator it = node.begin(); it != node.end(); ++it) {
string key = it->first;
//if (key == string("id")) tx->m_id = it->second.data();
if (key == string("isUnlocked")) tx_wallet->m_is_unlocked = it->second.get_value<bool>();
// TODO: deserialize other fields
}
}
@@ -224,7 +226,7 @@ shared_ptr<monero_tx_query> node_to_tx_query(const boost::property_tree::ptree&
return m_tx_query;
}
shared_ptr<monero_block> node_to_blockquery(const boost::property_tree::ptree& node) {
shared_ptr<monero_block> node_to_block_query(const boost::property_tree::ptree& node) {
shared_ptr<monero_block> block = make_shared<monero_block>();
for (boost::property_tree::ptree::const_iterator it = node.begin(); it != node.end(); ++it) {
string key = it->first;
@@ -322,7 +324,7 @@ shared_ptr<monero_tx_query> monero_utils::deserialize_tx_query(const string& tx_
boost::property_tree::read_json(iss, block_node);
// convert query property tree to block
shared_ptr<monero_block> block = node_to_blockquery(block_node);
shared_ptr<monero_block> block = node_to_block_query(block_node);
// get tx query
shared_ptr<monero_tx_query> tx_query = static_pointer_cast<monero_tx_query>(block->m_txs[0]);
@@ -339,7 +341,7 @@ shared_ptr<monero_transfer_query> monero_utils::deserialize_transfer_query(const
boost::property_tree::read_json(iss, blockNode);
// convert query property tree to block
shared_ptr<monero_block> block = node_to_blockquery(blockNode);
shared_ptr<monero_block> block = node_to_block_query(blockNode);
// return mpty query if no txs
if (block->m_txs.empty()) return make_shared<monero_transfer_query>();
@@ -366,7 +368,7 @@ shared_ptr<monero_output_query> monero_utils::deserialize_output_query(const str
boost::property_tree::read_json(iss, blockNode);
// convert query property tree to block
shared_ptr<monero_block> block = node_to_blockquery(blockNode);
shared_ptr<monero_block> block = node_to_block_query(blockNode);
// empty query if no txs
if (block->m_txs.empty()) return make_shared<monero_output_query>();
src/wallet/monero_wallet_model.cpp
+2
View File
@@ -133,6 +133,7 @@ namespace monero {
tgt->m_outgoing_transfer = transferCopy;
}
tgt->m_note = src->m_note;
tgt->m_is_unlocked = src->m_is_unlocked;
return tgt;
};
@@ -242,6 +243,7 @@ namespace monero {
if (m_do_not_relay != boost::none && m_do_not_relay != tx->m_do_not_relay) return false;
if (m_is_failed != boost::none && m_is_failed != tx->m_is_failed) return false;
if (m_is_miner_tx != boost::none && m_is_miner_tx != tx->m_is_miner_tx) return false;
if (m_is_unlocked != boost::none && m_is_unlocked != tx->m_is_unlocked) return false;
// at least one transfer must meet transfer query if defined
if (m_transfer_query != boost::none) {