From cbc093c6a84cbee4119de880d83a7a4c0a598c01 Mon Sep 17 00:00:00 2001
From: woodser <woodser@protonmail.com>
Date: Wed, 19 Jun 2019 22:50:01 -0400
Subject: [PATCH] MoneroTransferRequest getIsIncoming() returns member; ready
 to implement MoneroTxRequest meetsCriteria()

---
 src/wallet/MoneroWalletModel.cpp | 8 ++++++--
 src/wallet/MoneroWalletModel.h   | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/wallet/MoneroWalletModel.cpp b/src/wallet/MoneroWalletModel.cpp
index fbb42c6..7ce262f 100644
--- a/src/wallet/MoneroWalletModel.cpp
+++ b/src/wallet/MoneroWalletModel.cpp
@@ -94,6 +94,10 @@ namespace monero {
     return node;
   }
 
+  bool MoneroTxRequest::meetsCriteria(MoneroTxWallet* tx) const {
+    throw runtime_error("MoneroTxRequest meetsCriteria() not implemented");
+  }
+
   //boost::property_tree::ptree MoneroUtils::txRequestToPropertyTree(const MoneroTxRequest& tx) {
   //  cout << "txWalletToPropertyTree(tx)" << endl;
   //  boost::property_tree::ptree txNode = txWalletToPropertyTree(tx);
@@ -157,7 +161,7 @@ namespace monero {
 
   // ----------------------- MONERO TRANSFER REQUEST --------------------------
 
-  boost::optional<bool> MoneroTransferRequest::getIsIncoming() const { return false; }
+  boost::optional<bool> MoneroTransferRequest::getIsIncoming() const { return isIncoming; }
 
   boost::property_tree::ptree MoneroTransferRequest::toPropertyTree() const {
     //cout << "MoneroTransferRequest::toPropertyTree(node)" << endl;
@@ -238,7 +242,7 @@ namespace monero {
     if (inTransfer == nullptr && outTransfer == nullptr) throw runtime_error("Transfer must be MoneroIncomingTransfer or MoneroOutgoingTransfer");
 
     // filter with tx filter
-    //if (this.getTxRequest() != null && !this.getTxRequest().meetsCriteria(transfer.getTx())) return false;  // TODO
+    if (txRequest != boost::none && !(*txRequest)->meetsCriteria(transfer->tx.get())) return false;
     return true;
   }
 }
diff --git a/src/wallet/MoneroWalletModel.h b/src/wallet/MoneroWalletModel.h
index a860706..0e35e3f 100644
--- a/src/wallet/MoneroWalletModel.h
+++ b/src/wallet/MoneroWalletModel.h
@@ -186,6 +186,7 @@ namespace monero {
 
     boost::optional<uint64_t> getHeight() { return block == boost::none ? boost::none : (*block)->height; }
     boost::property_tree::ptree toPropertyTree() const;
+    bool meetsCriteria(MoneroTxWallet* tx) const;
   };
 
   /**