diff --git a/src/LedgerProposal.cpp b/src/LedgerProposal.cpp index 3830143820..5f5f058735 100644 --- a/src/LedgerProposal.cpp +++ b/src/LedgerProposal.cpp @@ -10,8 +10,9 @@ DECLARE_INSTANCE(LedgerProposal); LedgerProposal::LedgerProposal(const uint256& pLgr, uint32 seq, const uint256& tx, uint32 closeTime, - const RippleAddress& naPeerPublic) : - mPreviousLedger(pLgr), mCurrentHash(tx), mCloseTime(closeTime), mProposeSeq(seq), mPublicKey(naPeerPublic) + const RippleAddress& naPeerPublic, const uint256& suppression) : + mPreviousLedger(pLgr), mCurrentHash(tx), mSuppression(suppression), mCloseTime(closeTime), + mProposeSeq(seq), mPublicKey(naPeerPublic) { // XXX Validate key. // if (!mKey->SetPubKey(pubKey)) diff --git a/src/NetworkOPs.cpp b/src/NetworkOPs.cpp index 820b1168ad..d5e19d4ef6 100644 --- a/src/NetworkOPs.cpp +++ b/src/NetworkOPs.cpp @@ -718,7 +718,7 @@ uint256 NetworkOPs::getConsensusLCL() return mConsensus->getLCL(); } -void NetworkOPs::processTrustedProposal(uint256 suppression, LedgerProposal::pointer proposal, +void NetworkOPs::processTrustedProposal(LedgerProposal::pointer proposal, boost::shared_ptr set, RippleAddress nodePublic, uint256 checkLedger, bool sigGood) { bool relay = true; @@ -754,7 +754,7 @@ void NetworkOPs::processTrustedProposal(uint256 suppression, LedgerProposal::poi if (relay) { std::set peers; - theApp->getSuppression().swapSet(suppression, peers, SF_RELAYED); + theApp->getSuppression().swapSet(proposal->getSuppression(), peers, SF_RELAYED); PackedMessage::pointer message = boost::make_shared(*set, ripple::mtPROPOSE_LEDGER); theApp->getConnectionPool().relayMessageBut(peers, message); }