1 files changed, 8 insertions, 7 deletions
diff --git a/src/policy/rbf.cpp b/src/policy/rbf.cpp
index 98b1a1ba4c..133cff611d 100644
--- a/src/policy/rbf.cpp
+++ b/src/policy/rbf.cpp
@@ -14,33 +14,34 @@ bool SignalsOptInRBF(const CTransaction &tx)
     return false;
 }
 
-bool IsRBFOptIn(const CTxMemPoolEntry &entry, CTxMemPool &pool)
+RBFTransactionState IsRBFOptIn(const CTransaction &tx, CTxMemPool &pool)
 {
     AssertLockHeld(pool.cs);
 
     CTxMemPool::setEntries setAncestors;
 
     // First check the transaction itself.
-    if (SignalsOptInRBF(entry.GetTx())) {
-        return true;
+    if (SignalsOptInRBF(tx)) {
+        return RBF_TRANSACTIONSTATE_REPLACEABLE_BIP125;
     }
 
     // If this transaction is not in our mempool, then we can't be sure
     // we will know about all its inputs.
-    if (!pool.exists(entry.GetTx().GetHash())) {
-        throw std::runtime_error("Cannot determine RBF opt-in signal for non-mempool transaction\n");
+    if (!pool.exists(tx.GetHash())) {
+        return RBF_TRANSACTIONSTATE_UNKNOWN;
     }
 
     // If all the inputs have nSequence >= maxint-1, it still might be
     // signaled for RBF if any unconfirmed parents have signaled.
     uint64_t noLimit = std::numeric_limits<uint64_t>::max();
     std::string dummy;
+    CTxMemPoolEntry entry = *pool.mapTx.find(tx.GetHash());
     pool.CalculateMemPoolAncestors(entry, setAncestors, noLimit, noLimit, noLimit, noLimit, dummy, false);
 
     BOOST_FOREACH(CTxMemPool::txiter it, setAncestors) {
         if (SignalsOptInRBF(it->GetTx())) {
-            return true;
+            return RBF_TRANSACTIONSTATE_REPLACEABLE_BIP125;
         }
     }
-    return false;
+    return RBF_TRANSACTIONSTATE_FINAL;
 }