From 246796c98f0df0ba5ac9158879da86de78d680eb Mon Sep 17 00:00:00 2001 From: woodser Date: Tue, 26 Nov 2019 13:51:32 -0500 Subject: [PATCH] implement deserialize_tx_set --- src/utils/monero_utils.cpp | 86 +++++++++++++++++++++++++----------- src/utils/monero_utils.h | 2 + src/wallet/monero_wallet.cpp | 10 +++-- src/wallet/monero_wallet.h | 8 ++++ 4 files changed, 77 insertions(+), 29 deletions(-) diff --git a/src/utils/monero_utils.cpp b/src/utils/monero_utils.cpp index ac16b8b..2e37f9c 100644 --- a/src/utils/monero_utils.cpp +++ b/src/utils/monero_utils.cpp @@ -155,16 +155,16 @@ void node_to_tx(const boost::property_tree::ptree& node, shared_ptr t else if (key == string("version")) throw runtime_error("version deserializationn not implemented"); else if (key == string("isMinerTx")) tx->m_is_miner_tx = it->second.get_value(); else if (key == string("paymentId")) throw runtime_error("paymentId deserializationn not implemented"); - else if (key == string("fee")) throw runtime_error("fee deserialization not implemented"); + else if (key == string("fee")) tx->m_fee = it->second.get_value(); else if (key == string("mixin")) throw runtime_error("mixin deserialization not implemented"); else if (key == string("doNotRelay")) tx->m_do_not_relay = it->second.get_value(); else if (key == string("isRelayed")) tx->m_is_relayed = it->second.get_value(); else if (key == string("isConfirmed")) tx->m_is_confirmed = it->second.get_value(); else if (key == string("inTxPool")) tx->m_in_tx_pool = it->second.get_value(); - else if (key == string("numConfirmations")) throw runtime_error("numConfirmations deserialization not implemented"); - else if (key == string("unlockTime")) throw runtime_error("unlockTime deserialization not implemented"); - else if (key == string("lastRelayedTimestamp")) throw runtime_error("lastRelayedTimestamp deserialization not implemented"); - else if (key == string("receivedTimestamp")) throw runtime_error("receivedTimestamp deserializationn not implemented"); + else if (key == string("numConfirmations")) tx->m_num_confirmations = it->second.get_value(); + else if (key == string("unlockTime")) tx->m_unlock_time = it->second.get_value(); + else if (key == string("lastRelayedTimestamp")) tx->m_last_relayed_timestamp = it->second.get_value(); + else if (key == string("receivedTimestamp")) tx->m_received_timestamp = it->second.get_value(); else if (key == string("isDoubleSpendSeen")) tx->m_is_double_spend_seen = it->second.get_value(); else if (key == string("key")) tx->m_key = it->second.data(); else if (key == string("fullHex")) tx->m_full_hex = it->second.data(); @@ -176,7 +176,12 @@ void node_to_tx(const boost::property_tree::ptree& node, shared_ptr t else if (key == string("vins")) throw runtime_error("vins deserializationn not implemented"); else if (key == string("vouts")) throw runtime_error("vouts deserializationn not implemented"); else if (key == string("outputIndices")) throw runtime_error("m_output_indices deserialization not implemented"); - else if (key == string("metadata")) throw runtime_error("metadata deserialization not implemented"); + else if (key == string("metadata")) { + cout << "Assigning metadata" << endl; + tx->m_metadata = it->second.data(); + cout << "DONE ASSIGNING METADATA!" << endl; + //throw runtime_error("metadata deserialization not implemented"); + } else if (key == string("commonTxSets")) throw runtime_error("commonTxSets deserialization not implemented"); else if (key == string("extra")) throw runtime_error("extra deserialization not implemented"); else if (key == string("rctSignatures")) throw runtime_error("rctSignatures deserialization not implemented"); @@ -204,26 +209,26 @@ void node_to_tx_wallet(const boost::property_tree::ptree& node, shared_ptr node_to_tx_query(const boost::property_tree::ptree& node) { - shared_ptr m_tx_query = make_shared(); - node_to_tx_wallet(node, m_tx_query); + shared_ptr tx_query = make_shared(); + node_to_tx_wallet(node, tx_query); // initialize query from node for (boost::property_tree::ptree::const_iterator it = node.begin(); it != node.end(); ++it) { string key = it->first; - if (key == string("isOutgoing")) m_tx_query->m_is_outgoing = it->second.get_value(); - else if (key == string("isIncoming")) m_tx_query->m_is_incoming = it->second.get_value(); - else if (key == string("txIds")) for (boost::property_tree::ptree::const_iterator it2 = it->second.begin(); it2 != it->second.end(); ++it2) m_tx_query->m_tx_ids.push_back(it2->second.data()); - else if (key == string("hasPaymentId")) m_tx_query->m_has_payment_id = it->second.get_value(); - else if (key == string("paymentIds")) for (boost::property_tree::ptree::const_iterator it2 = it->second.begin(); it2 != it->second.end(); ++it2) m_tx_query->m_payment_ids.push_back(it2->second.data()); - else if (key == string("height")) m_tx_query->m_height = it->second.get_value(); - else if (key == string("minHeight")) m_tx_query->m_min_height = it->second.get_value(); - else if (key == string("maxHeight")) m_tx_query->m_max_height = it->second.get_value(); - else if (key == string("includeOutputs")) m_tx_query->m_include_outputs = it->second.get_value(); - else if (key == string("transferQuery")) m_tx_query->m_transfer_query = node_to_transfer_query(it->second); - else if (key == string("outputQuery")) m_tx_query->m_output_query = node_to_output_query(it->second); + if (key == string("isOutgoing")) tx_query->m_is_outgoing = it->second.get_value(); + else if (key == string("isIncoming")) tx_query->m_is_incoming = it->second.get_value(); + else if (key == string("txIds")) for (boost::property_tree::ptree::const_iterator it2 = it->second.begin(); it2 != it->second.end(); ++it2) tx_query->m_tx_ids.push_back(it2->second.data()); + else if (key == string("hasPaymentId")) tx_query->m_has_payment_id = it->second.get_value(); + else if (key == string("paymentIds")) for (boost::property_tree::ptree::const_iterator it2 = it->second.begin(); it2 != it->second.end(); ++it2) tx_query->m_payment_ids.push_back(it2->second.data()); + else if (key == string("height")) tx_query->m_height = it->second.get_value(); + else if (key == string("minHeight")) tx_query->m_min_height = it->second.get_value(); + else if (key == string("maxHeight")) tx_query->m_max_height = it->second.get_value(); + else if (key == string("includeOutputs")) tx_query->m_include_outputs = it->second.get_value(); + else if (key == string("transferQuery")) tx_query->m_transfer_query = node_to_transfer_query(it->second); + else if (key == string("outputQuery")) tx_query->m_output_query = node_to_output_query(it->second); } - return m_tx_query; + return tx_query; } shared_ptr node_to_block_query(const boost::property_tree::ptree& node) { @@ -231,8 +236,8 @@ shared_ptr node_to_block_query(const boost::property_tree::ptree& for (boost::property_tree::ptree::const_iterator it = node.begin(); it != node.end(); ++it) { string key = it->first; if (key == string("txs")) { - boost::property_tree::ptree txsNode = it->second; - for (boost::property_tree::ptree::const_iterator it2 = txsNode.begin(); it2 != txsNode.end(); ++it2) { + boost::property_tree::ptree txs_node = it->second; + for (boost::property_tree::ptree::const_iterator it2 = txs_node.begin(); it2 != txs_node.end(); ++it2) { block->m_txs.push_back(node_to_tx_query(it2->second)); } } @@ -289,7 +294,7 @@ void monero_utils::binary_blocks_to_json(const std::string &bin, std::string &js } // parse and validate txs - boost::property_tree::ptree txsNode; + boost::property_tree::ptree txs_node; for (int txIdx = 0; txIdx < resp_struct.blocks[blockIdx].txs.size(); txIdx++) { cryptonote::transaction tx; if (cryptonote::parse_and_validate_tx_from_blob(resp_struct.blocks[blockIdx].txs[txIdx].blob, tx)) { @@ -298,12 +303,12 @@ void monero_utils::binary_blocks_to_json(const std::string &bin, std::string &js boost::property_tree::ptree txNode; MTRACE("PRUNED:\n" << monero_utils::get_pruned_tx_json(tx)); txNode.put("", monero_utils::get_pruned_tx_json(tx)); // TODO: no pretty print - txsNode.push_back(std::make_pair("", txNode)); + txs_node.push_back(std::make_pair("", txNode)); } else { throw std::runtime_error("failed to parse tx blob at index " + std::to_string(txIdx)); } } - txsNodes.push_back(std::make_pair("", txsNode)); // array of array of transactions, one array per block + txsNodes.push_back(std::make_pair("", txs_node)); // array of array of transactions, one array per block } root.add_child("blocks", blocksNode); root.add_child("txs", txsNodes); @@ -316,6 +321,35 @@ void monero_utils::binary_blocks_to_json(const std::string &bin, std::string &js json = ss.str(); } +monero_tx_set monero_utils::deserialize_tx_set(const string& tx_set_str) { + cout << "monero_utils::deserialize_tx_set(...)" << endl; + cout << tx_set_str; + + // deserialize tx set to property + std::istringstream iss = tx_set_str.empty() ? std::istringstream() : std::istringstream(tx_set_str); + boost::property_tree::ptree tx_set_node; + boost::property_tree::read_json(iss, tx_set_node); + + // initialize tx_set from property node + monero_tx_set tx_set; + for (boost::property_tree::ptree::const_iterator it = tx_set_node.begin(); it != tx_set_node.end(); ++it) { + string key = it->first; + if (key == string("unsignedTxHex")) tx_set.m_unsigned_tx_hex = it->second.data(); + else if (key == string("multisigTxHex")) tx_set.m_multisig_tx_hex = it->second.data(); + else if (key == string("txs")) { + boost::property_tree::ptree txs_node = it->second; + for (boost::property_tree::ptree::const_iterator it2 = txs_node.begin(); it2 != txs_node.end(); ++it2) { + shared_ptr tx_wallet = make_shared(); + node_to_tx_wallet(it2->second, tx_wallet); + tx_set.m_txs.push_back(tx_wallet); + } + } + else throw runtime_error("monero_utils::deserialize_tx_set() field '" + key + "' not supported"); + } + + return tx_set; +} + shared_ptr monero_utils::deserialize_tx_query(const string& tx_query_str) { // deserialize tx query string to property rooted at block @@ -343,7 +377,7 @@ shared_ptr monero_utils::deserialize_transfer_query(const // convert query property tree to block shared_ptr block = node_to_block_query(blockNode); - // return mpty query if no txs + // return empty query if no txs if (block->m_txs.empty()) return make_shared(); // get tx query diff --git a/src/utils/monero_utils.h b/src/utils/monero_utils.h index 31b41aa..a9250b0 100644 --- a/src/utils/monero_utils.h +++ b/src/utils/monero_utils.h @@ -72,6 +72,8 @@ namespace monero_utils void binary_blocks_to_json(const std::string &bin, std::string &json); + monero_tx_set deserialize_tx_set(const string& tx_set_str); + shared_ptr deserialize_tx_query(const string& txQueryStr); shared_ptr deserialize_transfer_query(const string& transfer_query_str); diff --git a/src/wallet/monero_wallet.cpp b/src/wallet/monero_wallet.cpp index 19b3bb3..4634284 100644 --- a/src/wallet/monero_wallet.cpp +++ b/src/wallet/monero_wallet.cpp @@ -1510,7 +1510,7 @@ namespace monero { if (query.m_tx_query.get()->m_transfer_query != boost::none && query.m_tx_query.get()->m_transfer_query.get().get() == &query) { _query = tx_query->m_transfer_query.get(); } else { - if (query.m_tx_query.get()->m_transfer_query != boost::none) throw new runtime_error("Transfer query's tx query must be a circular reference or null"); + if (query.m_tx_query.get()->m_transfer_query != boost::none) throw runtime_error("Transfer query's tx query must be a circular reference or null"); shared_ptr query_ptr = make_shared(query); // convert query to shared pointer for copy _query = query_ptr->copy(query_ptr, make_shared()); _query->m_tx_query = tx_query; @@ -1653,7 +1653,7 @@ namespace monero { if (query.m_tx_query.get()->m_output_query != boost::none && query.m_tx_query.get()->m_output_query.get().get() == &query) { _query = tx_query->m_output_query.get(); } else { - if (query.m_tx_query.get()->m_output_query != boost::none) throw new runtime_error("Output query's tx query must be a circular reference or null"); + if (query.m_tx_query.get()->m_output_query != boost::none) throw runtime_error("Output query's tx query must be a circular reference or null"); shared_ptr query_ptr = make_shared(query); // convert query to shared pointer for copy _query = query_ptr->copy(query_ptr, make_shared()); _query->m_tx_query = tx_query; @@ -2368,6 +2368,10 @@ namespace monero { return tx_set; } + monero_tx_set monero_wallet::parse_tx_set(const monero_tx_set& tx_set) { + throw runtime_error("Not implemented"); + } + string monero_wallet::sign(const string& msg) const { return m_w2->sign(msg); } @@ -2775,7 +2779,7 @@ namespace monero { // validate state and args bool ready; uint32_t threshold, total; - if (!m_w2->multisig(&ready, &threshold, &total)) throw new runtime_error("This wallet is not multisig"); + if (!m_w2->multisig(&ready, &threshold, &total)) throw runtime_error("This wallet is not multisig"); if (ready) throw runtime_error("This wallet is multisig, and already finalized"); if (multisig_hexes.size() < 1 || multisig_hexes.size() > total) throw runtime_error("Needs multisig info from more participants"); diff --git a/src/wallet/monero_wallet.h b/src/wallet/monero_wallet.h index 1a47835..3f1e175 100644 --- a/src/wallet/monero_wallet.h +++ b/src/wallet/monero_wallet.h @@ -1006,6 +1006,14 @@ namespace monero { */ monero_tx_set sweep_dust(bool do_not_relay = false); + /** + * Parses a tx set containing unsigned or multisig tx hex to a new tx set containing structured transactions. + * + * @param tx_set is a tx set containing unsigned or multisig tx hex + * @return the parsed tx set containing structured transactions + */ + monero_tx_set parse_tx_set(const monero_tx_set& tx_set); + /** * Sign a message. *