Merge pull request #961 from MonsieurNicolas/filterQSetFix

filtering fix: use companion quorum set from statements

Reviewed-by: graydon

src/scp/Slot.cpp

@@ -192,7 +192,15 @@ Slot::isNodeInQuorum(NodeID const& node)
         n.emplace_back(&e.first);
     }
     return mSCP.getLocalNode()->isNodeInQuorum(
-        node, std::bind(&Slot::getQuorumSetFromStatement, this, _1), m);
+        node,
+        [this](SCPStatement const& st)
+        {
+            // uses the companion set here as we want to consider
+            // nodes that were used up to EXTERNALIZE
+            Hash h = getCompanionQuorumSetHashFromStatement(st);
+            return getSCPDriver().getQSet(h);
+        },
+        m);
 }
 
 SCPEnvelope

src/scp/Slot.h

@@ -142,7 +142,7 @@ class Slot : public std::enable_shared_from_this<Slot>
     static std::vector<Value> getStatementValues(SCPStatement const& st);
 
     // returns the QuorumSet that should be used for a node given the
-    // statement
+    // statement (singleton for externalize)
     SCPQuorumSetPtr getQuorumSetFromStatement(SCPStatement const& st);
 
     // wraps a statement in an envelope (sign it, etc)