refactor: remove dependency of llmq/chainlocks, llmq/quorum_block_processor, ehf_signals on PeerManager #6292
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,7 +11,6 @@ | |
| #include <chainparams.h> | ||
| #include <consensus/validation.h> | ||
| #include <masternode/sync.h> | ||
| #include <node/blockstorage.h> | ||
| #include <node/ui_interface.h> | ||
| #include <scheduler.h> | ||
|
|
@@ -23,25 +22,29 @@ | |
| #include <validation.h> | ||
| #include <validationinterface.h> | ||
|
|
||
| static bool ChainLocksSigningEnabled(const CSporkManager& sporkman) | ||
| { | ||
| return sporkman.GetSporkValue(SPORK_19_CHAINLOCKS_ENABLED) == 0; | ||
| } | ||
|
|
||
| namespace llmq | ||
| { | ||
| std::unique_ptr<CChainLocksHandler> chainLocksHandler; | ||
|
|
||
| CChainLocksHandler::CChainLocksHandler(CChainState& chainstate, CQuorumManager& _qman, CSigningManager& _sigman, | ||
| CSigSharesManager& _shareman, CSporkManager& sporkman, CTxMemPool& _mempool, | ||
| const CMasternodeSync& mn_sync, bool is_masternode) : | ||
| m_chainstate(chainstate), | ||
| qman(_qman), | ||
| sigman(_sigman), | ||
| shareman(_shareman), | ||
| spork_manager(sporkman), | ||
| mempool(_mempool), | ||
| m_mn_sync(mn_sync), | ||
| m_is_masternode{is_masternode}, | ||
| scheduler(std::make_unique<CScheduler>()), | ||
| scheduler_thread( | ||
| std::make_unique<std::thread>(std::thread(util::TraceThread, "cl-schdlr", [&] { scheduler->serviceQueue(); }))) | ||
| { | ||
| } | ||
|
|
||
|
|
@@ -93,31 +96,11 @@ CChainLockSig CChainLocksHandler::GetBestChainLock() const | |
| return bestChainLock; | ||
| } | ||
|
|
||
| MessageProcessingResult CChainLocksHandler::ProcessNewChainLock(const NodeId from, const llmq::CChainLockSig& clsig, | ||
| const uint256& hash) | ||
| { | ||
| CheckActiveState(); | ||
|
|
||
| { | ||
| LOCK(cs); | ||
| if (!seenChainLocks.emplace(hash, GetTimeMillis()).second) { | ||
|
|
@@ -133,7 +116,7 @@ PeerMsgRet CChainLocksHandler::ProcessNewChainLock(const NodeId from, const llmq | |
| if (const auto ret = VerifyChainLock(clsig); ret != VerifyRecSigStatus::Valid) { | ||
| LogPrint(BCLog::CHAINLOCKS, "CChainLocksHandler::%s -- invalid CLSIG (%s), status=%d peer=%d\n", __func__, clsig.ToString(), ToUnderlying(ret), from); | ||
| if (from != -1) { | ||
| return MisbehavingError{10}; | ||
| } | ||
| return {}; | ||
| } | ||
|
|
@@ -162,14 +145,12 @@ PeerMsgRet CChainLocksHandler::ProcessNewChainLock(const NodeId from, const llmq | |
| // Note: make sure to still relay clsig further. | ||
| } | ||
|
|
||
| CInv clsigInv(MSG_CLSIG, hash); | ||
|
|
||
| if (pindex == nullptr) { | ||
| // we don't know the block/header for this CLSIG yet, so bail out for now | ||
| // when the block or the header later comes in, we will enforce the correct chain | ||
| return clsigInv; | ||
| } | ||
|
|
||
| scheduler->scheduleFromNow([&]() { | ||
|
|
@@ -179,7 +160,7 @@ PeerMsgRet CChainLocksHandler::ProcessNewChainLock(const NodeId from, const llmq | |
|
|
||
| LogPrint(BCLog::CHAINLOCKS, "CChainLocksHandler::%s -- processed new CLSIG (%s), peer=%d\n", | ||
| __func__, clsig.ToString(), from); | ||
| return clsigInv; | ||
| } | ||
|
|
||
| void CChainLocksHandler::AcceptedBlockHeader(gsl::not_null<const CBlockIndex*> pindexNew) | ||
|
|
@@ -520,10 +501,10 @@ void CChainLocksHandler::EnforceBestChainLock() | |
| uiInterface.NotifyChainLock(clsig->getBlockHash().ToString(), clsig->getHeight()); | ||
| } | ||
|
|
||
| MessageProcessingResult CChainLocksHandler::HandleNewRecoveredSig(const llmq::CRecoveredSig& recoveredSig) | ||
|
There was a problem hiding this comment. I'm confused, this method doesn't doesn't return any error values? There was a problem hiding this comment.
which belongs to |
||
| { | ||
| if (!isEnabled) { | ||
| return {}; | ||
| } | ||
|
|
||
| CChainLockSig clsig; | ||
|
|
@@ -532,17 +513,17 @@ void CChainLocksHandler::HandleNewRecoveredSig(const llmq::CRecoveredSig& recove | |
|
|
||
| if (recoveredSig.getId() != lastSignedRequestId || recoveredSig.getMsgHash() != lastSignedMsgHash) { | ||
| // this is not what we signed, so lets not create a CLSIG for it | ||
| return {}; | ||
| } | ||
| if (bestChainLock.getHeight() >= lastSignedHeight) { | ||
| // already got the same or a better CLSIG through the CLSIG message | ||
| return {}; | ||
| } | ||
|
|
||
|
|
||
| clsig = CChainLockSig(lastSignedHeight, lastSignedMsgHash, recoveredSig.sig.Get()); | ||
| } | ||
| return ProcessNewChainLock(-1, clsig, ::SerializeHash(clsig)); | ||
| } | ||
|
|
||
| bool CChainLocksHandler::HasChainLock(int nHeight, const uint256& blockHash) const | ||
|
|
@@ -678,9 +659,4 @@ bool AreChainLocksEnabled(const CSporkManager& sporkman) | |
| return sporkman.IsSporkActive(SPORK_19_CHAINLOCKS_ENABLED); | ||
| } | ||
|
|
||
| } // namespace llmq | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.