Skip to content

fix: retain initialized DKG sessions during inventory reads #7824

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PastaPastaPasta wants to merge 1 commit into
base: develop
Choose a base branch
from
+41 −20
Open

fix: retain initialized DKG sessions during inventory reads #7824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 27 additions & 10 deletions src/active/dkgsessionhandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,16 +87,23 @@ bool ActiveDKGSessionHandler::InitNewQuorum(gsl::not_null<const CBlockIndex*> pQ
return false;
}

curSession = std::make_unique<ActiveDKGSession>(m_bls_worker, m_dmnman, m_dkgdbgman, m_qdkgsman, m_mn_metaman,
m_qsnapman, m_mn_activeman, m_chainman, m_sporkman,
pQuorumBaseBlockIndex, params);
auto next_session = std::make_shared<ActiveDKGSession>(m_bls_worker, m_dmnman, m_dkgdbgman, m_qdkgsman,
m_mn_metaman, m_qsnapman, m_mn_activeman, m_chainman,
m_sporkman, pQuorumBaseBlockIndex, params);

if (!curSession->Init(m_mn_activeman.GetProTxHash(), quorumIndex)) {
{
std::shared_ptr<CDKGSession> previous_session;
WITH_LOCK(cs_session, previous_session.swap(curSession));
}

if (!next_session->Init(m_mn_activeman.GetProTxHash(), quorumIndex)) {
LogPrintf("ActiveDKGSessionHandler::%s -- height[%d] quorum initialization failed for %s qi[%d]\n", __func__,
pQuorumBaseBlockIndex->nHeight, params.name, quorumIndex);
return false;
}

WITH_LOCK(cs_session, curSession = std::move(next_session));

LogPrintf("ActiveDKGSessionHandler::%s -- height[%d] quorum initialization OK for %s qi[%d]\n", __func__, pQuorumBaseBlockIndex->nHeight, params.name, quorumIndex);
return true;
}
Expand Down Expand Up @@ -166,7 +173,8 @@ void ActiveDKGSessionHandler::WaitForNewQuorum(const uint256& oldQuorumHash) con
void ActiveDKGSessionHandler::SleepBeforePhase(QuorumPhase curPhase, const uint256& expectedQuorumHash,
double randomSleepFactor, const WhileWaitFunc& runWhileWaiting) const
{
if (!curSession->AreWeMember()) {
const auto session = GetCurSession();
if (!session || !session->AreWeMember()) {
// Non-members do not participate and do not create any network load, no need to sleep.
return;
}
Expand All @@ -187,7 +195,7 @@ void ActiveDKGSessionHandler::SleepBeforePhase(QuorumPhase curPhase, const uint2
// Don't expect perfect block times and thus reduce the phase time to be on the secure side (caller chooses factor)
double adjustedPhaseSleepTimePerMember = phaseSleepTimePerMember * randomSleepFactor;

int64_t sleepTime = static_cast<int64_t>(adjustedPhaseSleepTimePerMember * curSession->GetMyMemberIndex().value_or(0));
int64_t sleepTime = static_cast<int64_t>(adjustedPhaseSleepTimePerMember * session->GetMyMemberIndex().value_or(0));
const auto endTime = SteadyClock::now() + std::chrono::milliseconds{sleepTime};
int heightTmp{currentHeight.load()};
int heightStart{heightTmp};
Expand Down Expand Up @@ -248,22 +256,31 @@ void ActiveDKGSessionHandler::HandlePhase(QuorumPhase curPhase, QuorumPhase next

bool ActiveDKGSessionHandler::GetContribution(const uint256& hash, CDKGContribution& ret) const
{
return curSession && curSession->GetContribution(hash, ret);
const auto session = GetCurSession();
return session && session->GetContribution(hash, ret);
}

bool ActiveDKGSessionHandler::GetComplaint(const uint256& hash, CDKGComplaint& ret) const
{
return curSession && curSession->GetComplaint(hash, ret);
const auto session = GetCurSession();
return session && session->GetComplaint(hash, ret);
}

bool ActiveDKGSessionHandler::GetJustification(const uint256& hash, CDKGJustification& ret) const
{
return curSession && curSession->GetJustification(hash, ret);
const auto session = GetCurSession();
return session && session->GetJustification(hash, ret);
}

bool ActiveDKGSessionHandler::GetPrematureCommitment(const uint256& hash, CDKGPrematureCommitment& ret) const
{
return curSession && curSession->GetPrematureCommitment(hash, ret);
const auto session = GetCurSession();
return session && session->GetPrematureCommitment(hash, ret);
}

std::shared_ptr<CDKGSession> ActiveDKGSessionHandler::GetCurSession() const
{
return WITH_LOCK(cs_session, return curSession);
}

QuorumPhase ActiveDKGSessionHandler::GetPhase() const
Expand Down
22 changes: 13 additions & 9 deletions src/active/dkgsessionhandler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ class ActiveDKGSessionHandler final : public llmq::CDKGSessionHandler
private:
std::atomic<bool> stopRequested{false};
std::atomic<int> currentHeight{-1};
std::unique_ptr<CDKGSession> curSession{nullptr};
mutable Mutex cs_session;
std::shared_ptr<CDKGSession> curSession GUARDED_BY(cs_session);

mutable Mutex cs_phase_qhash;
QuorumPhase phase GUARDED_BY(cs_phase_qhash){QuorumPhase::Idle};
Expand All @@ -81,10 +82,12 @@ class ActiveDKGSessionHandler final : public llmq::CDKGSessionHandler

public:
//! CDKGSessionHandler
bool GetContribution(const uint256& hash, CDKGContribution& ret) const override;
bool GetComplaint(const uint256& hash, CDKGComplaint& ret) const override;
bool GetJustification(const uint256& hash, CDKGJustification& ret) const override;
bool GetPrematureCommitment(const uint256& hash, CDKGPrematureCommitment& ret) const override;
bool GetContribution(const uint256& hash, CDKGContribution& ret) const override EXCLUSIVE_LOCKS_REQUIRED(!cs_session);
bool GetComplaint(const uint256& hash, CDKGComplaint& ret) const override EXCLUSIVE_LOCKS_REQUIRED(!cs_session);
bool GetJustification(const uint256& hash, CDKGJustification& ret) const override
EXCLUSIVE_LOCKS_REQUIRED(!cs_session);
bool GetPrematureCommitment(const uint256& hash, CDKGPrematureCommitment& ret) const override
EXCLUSIVE_LOCKS_REQUIRED(!cs_session);
QuorumPhase GetPhase() const override EXCLUSIVE_LOCKS_REQUIRED(!cs_phase_qhash);
void UpdatedBlockTip(const CBlockIndex* pindexNew) override EXCLUSIVE_LOCKS_REQUIRED(!cs_phase_qhash);

Expand All @@ -96,12 +99,12 @@ class ActiveDKGSessionHandler final : public llmq::CDKGSessionHandler
int QuorumIndex() const { return quorumIndex; }
bool QuorumsWatch() const { return m_quorums_watch; }
uint256 GetCurrentQuorumHash() const EXCLUSIVE_LOCKS_REQUIRED(!cs_phase_qhash);
CDKGSession* GetCurSession() { return curSession.get(); }
std::shared_ptr<CDKGSession> GetCurSession() const EXCLUSIVE_LOCKS_REQUIRED(!cs_session);

void RequestStop() { stopRequested = true; }
bool IsStopRequested() const { return stopRequested; }

bool InitNewQuorum(gsl::not_null<const CBlockIndex*> pQuorumBaseBlockIndex);
bool InitNewQuorum(gsl::not_null<const CBlockIndex*> pQuorumBaseBlockIndex) EXCLUSIVE_LOCKS_REQUIRED(!cs_session);

/**
* @param curPhase current QuorumPhase
Expand All @@ -114,10 +117,11 @@ class ActiveDKGSessionHandler final : public llmq::CDKGSessionHandler
const WhileWaitFunc& shouldNotWait = [] { return false; }) const EXCLUSIVE_LOCKS_REQUIRED(!cs_phase_qhash);
void WaitForNewQuorum(const uint256& oldQuorumHash) const EXCLUSIVE_LOCKS_REQUIRED(!cs_phase_qhash);
void SleepBeforePhase(QuorumPhase curPhase, const uint256& expectedQuorumHash, double randomSleepFactor,
const WhileWaitFunc& runWhileWaiting) const EXCLUSIVE_LOCKS_REQUIRED(!cs_phase_qhash);
const WhileWaitFunc& runWhileWaiting) const
EXCLUSIVE_LOCKS_REQUIRED(!cs_phase_qhash, !cs_session);
void HandlePhase(QuorumPhase curPhase, QuorumPhase nextPhase, const uint256& expectedQuorumHash,
double randomSleepFactor, const StartPhaseFunc& startPhaseFunc,
const WhileWaitFunc& runWhileWaiting) EXCLUSIVE_LOCKS_REQUIRED(!cs_phase_qhash);
const WhileWaitFunc& runWhileWaiting) EXCLUSIVE_LOCKS_REQUIRED(!cs_phase_qhash, !cs_session);

private:
std::pair<QuorumPhase, uint256> GetPhaseAndQuorumHash() const EXCLUSIVE_LOCKS_REQUIRED(!cs_phase_qhash);
Expand Down
2 changes: 1 addition & 1 deletion src/llmq/net_dkg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,7 +851,7 @@ void NetDKG::HandleDKGRound(ActiveDKGSessionHandler& handler)

active.dkgdbgman.MarkPhaseAdvanced(handler.params.type, handler.QuorumIndex(), QuorumPhase::Initialized);

auto* curSession = handler.GetCurSession();
const auto curSession = handler.GetCurSession();
if (handler.params.is_single_member()) {
auto finalCommitment = curSession->FinalizeSingleCommitment();
if (!finalCommitment.IsNull()) { // it can be null only if we are not member
Expand Down
Loading