[WIP] Fix builds

Author: ximinez

src/xrpld/app/consensus/RCLValidations.cpp

@@ -190,7 +190,7 @@ handleNewValidation(
 
     // masterKey is seated only if validator is trusted or listed
     auto const nodeKey = masterKey.value_or(signingKey);
-    assert(nodeKey != app.getValidationPublicKey());
+    // assert(nodeKey != app.getValidationPublicKey());
     auto const outcome = validations.add(calcNodeID(nodeKey), val);
 
     if (outcome == ValStatus::current)

src/xrpld/app/misc/NetworkOPs.cpp

@@ -1887,6 +1887,15 @@ NetworkOPsImp::beginConsensus(uint256 const& networkClosed)
 bool
 NetworkOPsImp::processTrustedProposal(RCLCxPeerPos peerPos)
 {
+    if (auto const localPk = app_.getValidationPublicKey())
+    {
+        auto const localID = calcNodeID(*localPk);
+        auto const& peerID = peerPos.proposal().nodeID();
+        assert(localID != peerID);
+        if (localID == peerID)
+            return false;
+    }
+
     return mConsensus.peerProposal(app_.timeKeeper().closeTime(), peerPos);
 }
 

src/xrpld/consensus/ConsensusParms.h

@@ -25,6 +25,7 @@
 #include <cstddef>
 #include <functional>
 #include <map>
+#include <optional>
 
 namespace ripple {