From 70c7cdbf7ca6594718ec87d8517d38761154ab19 Mon Sep 17 00:00:00 2001
From: woodser <woodser@protonmail.com>
Date: Wed, 19 Jun 2019 18:14:10 -0400
Subject: [PATCH] MoneroTxRequest::toPropertyTree(); print tx request from root
 block

---
 src/wallet/MoneroWallet.cpp      |  5 ++++-
 src/wallet/MoneroWalletModel.cpp | 17 +++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/wallet/MoneroWallet.cpp b/src/wallet/MoneroWallet.cpp
index 742b3b0..ed44bfc 100644
--- a/src/wallet/MoneroWallet.cpp
+++ b/src/wallet/MoneroWallet.cpp
@@ -550,7 +550,10 @@ namespace monero {
     cout << "vector<shared_ptr<MoneroTransfer>> getTransfers(request)" << endl;
 
     // print request
-    cout << "Fetching transfers with request: " << MoneroUtils::serialize(request.toPropertyTree()) << endl;
+    cout << "Fetching transfers with request: ";
+    if (request.txRequest == boost::none) cout << request.serialize() << endl;
+    else if ((*request.txRequest)->block == boost::none) cout << (*request.txRequest)->serialize() << endl;
+    else cout << (*(*request.txRequest)->block)->serialize() << endl;
 
     // normalize request
     // TODO: this will modify original request, construct copy? add test
diff --git a/src/wallet/MoneroWalletModel.cpp b/src/wallet/MoneroWalletModel.cpp
index 24f1cce..fbb42c6 100644
--- a/src/wallet/MoneroWalletModel.cpp
+++ b/src/wallet/MoneroWalletModel.cpp
@@ -80,9 +80,18 @@ namespace monero {
   // -------------------------- MONERO TX REQUEST -----------------------------
 
   boost::property_tree::ptree MoneroTxRequest::toPropertyTree() const {
-    //cout << "MoneroTxRequest::toPropertyTree(node)" << endl;
-    //if (transferRequest != boost::none) node.add_child("transferRequest", (*transferRequest)->toPropertyTree());
-    throw runtime_error("MoneroTxRequest toPropertyTree() Not implemented");
+//    cout << "MoneroTxRequest::toPropertyTree(node)" << endl;
+    boost::property_tree::ptree node = MoneroTxWallet::toPropertyTree();
+    if (isOutgoing != boost::none) node.put("isOutgoing", *isOutgoing);
+    if (isIncoming != boost::none) node.put("isIncoming", *isIncoming);
+    if (!txIds.empty()) throw runtime_error("txIds not implemented");
+    if (hasPaymentId != boost::none) node.put("hasPaymentId", *hasPaymentId);
+    if (!paymentIds.empty()) throw runtime_error("paymentIds not implemented");
+    if (minHeight != boost::none) node.put("minHeight", *minHeight);
+    if (maxHeight != boost::none) node.put("maxHeight", *maxHeight);
+    if (includeOutputs != boost::none) node.put("includeOutputs", *includeOutputs);
+    if (transferRequest != boost::none) node.add_child("transferRequest", (*transferRequest)->toPropertyTree());
+    return node;
   }
 
   //boost::property_tree::ptree MoneroUtils::txRequestToPropertyTree(const MoneroTxRequest& tx) {
@@ -100,7 +109,7 @@ namespace monero {
   //  return txNode;
   //}
 
-  // ----------------------- MONERO DESTINATION -------------------------
+  // -------------------------- MONERO DESTINATION ----------------------------
 
   boost::property_tree::ptree MoneroDestination::toPropertyTree() const {
     //cout << "MoneroDestination::toPropertyTree(node)" << endl;