sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-27 21:12:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use new sessionId based session management in CSigSharesManager

Browse Source 
Stop relying on the information previously found in the CSigSharesInv
and CBatchedSigShares messages and instead use the information found in
the session refereced by the session id.

This also updates a few LogPrintf calls. Previously, CSigSharesInv::ToString
also included the signHash in the returned string, which is not the case
anymore, so we have to add it manually.
This commit is contained in:
Alexander Block 2019-02-26 08:48:05 +01:00
parent 34e3f8eb53
commit fa25728ca5
2 changed files with 69 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
src/llmq/quorums_signing_shares.cpp
View File

@ -311,14 +311,8 @@ void CSigSharesManager::ProcessMessageSigSesAnn(CNode* pfrom, const CSigSesAnn&
nodeState.sessionByRecvId.emplace(ann.sessionId, &session); nodeState.sessionByRecvId.emplace(ann.sessionId, &session);
} }
bool CSigSharesManager::VerifySigSharesInv(NodeId from, const CSigSharesInv& inv) bool CSigSharesManager::VerifySigSharesInv(NodeId from, Consensus::LLMQType llmqType, const CSigSharesInv& inv)
{ {
Consensus::LLMQType llmqType = (Consensus::LLMQType)inv.llmqType;
if (!Params().GetConsensus().llmqs.count(llmqType) || inv.signHash.IsNull()) {
BanNode(from);
return false;
}
if (!fMasternodeMode || activeMasternodeInfo.proTxHash.IsNull()) { if (!fMasternodeMode || activeMasternodeInfo.proTxHash.IsNull()) {
return false; return false;
} }
@ -334,46 +328,71 @@ bool CSigSharesManager::VerifySigSharesInv(NodeId from, const CSigSharesInv& inv
void CSigSharesManager::ProcessMessageSigSharesInv(CNode* pfrom, const CSigSharesInv& inv, CConnman& connman) void CSigSharesManager::ProcessMessageSigSharesInv(CNode* pfrom, const CSigSharesInv& inv, CConnman& connman)
{ {
if (!VerifySigSharesInv(pfrom->id, inv)) { CSigSharesNodeState::SessionInfo sessionInfo;
if (!GetSessionInfoByRecvId(pfrom->id, inv.sessionId, sessionInfo)) {
return;
}
if (!VerifySigSharesInv(pfrom->id, sessionInfo.llmqType, inv)) {
return; return;
} }
// TODO for PoSe, we should consider propagating shares even if we already have a recovered sig // TODO for PoSe, we should consider propagating shares even if we already have a recovered sig
if (quorumSigningManager->HasRecoveredSigForSession(inv.signHash)) { if (quorumSigningManager->HasRecoveredSigForSession(sessionInfo.signHash)) {
return; return;
} }
LogPrint("llmq", "CSigSharesManager::%s -- inv={%s}, node=%d\n", __func__, inv.ToString(), pfrom->id); LogPrint("llmq", "CSigSharesManager::%s -- signHash=%s, inv={%s}, node=%d\n", __func__,
sessionInfo.signHash.ToString(), inv.ToString(), pfrom->id);
LOCK(cs); LOCK(cs);
auto& nodeState = nodeStates[pfrom->id]; auto& nodeState = nodeStates[pfrom->id];
nodeState.MarkAnnounced(inv.signHash, inv); auto session = nodeState.GetSessionByRecvId(inv.sessionId);
nodeState.MarkKnows(inv.signHash, inv); if (!session) {
return;
}
session->announced.Merge(inv);
session->knows.Merge(inv);
} }
void CSigSharesManager::ProcessMessageGetSigShares(CNode* pfrom, const CSigSharesInv& inv, CConnman& connman) void CSigSharesManager::ProcessMessageGetSigShares(CNode* pfrom, const CSigSharesInv& inv, CConnman& connman)
{ {
if (!VerifySigSharesInv(pfrom->id, inv)) { CSigSharesNodeState::SessionInfo sessionInfo;
if (!GetSessionInfoByRecvId(pfrom->id, inv.sessionId, sessionInfo)) {
return;
}
if (!VerifySigSharesInv(pfrom->id, sessionInfo.llmqType, inv)) {
return; return;
} }
// TODO for PoSe, we should consider propagating shares even if we already have a recovered sig // TODO for PoSe, we should consider propagating shares even if we already have a recovered sig
if (quorumSigningManager->HasRecoveredSigForSession(inv.signHash)) { if (quorumSigningManager->HasRecoveredSigForSession(sessionInfo.signHash)) {
return; return;
} }
LogPrint("llmq", "CSigSharesManager::%s -- inv={%s}, node=%d\n", __func__, inv.ToString(), pfrom->id); LogPrint("llmq", "CSigSharesManager::%s -- signHash=%s, inv={%s}, node=%d\n", __func__,
sessionInfo.signHash.ToString(), inv.ToString(), pfrom->id);
LOCK(cs); LOCK(cs);
auto& nodeState = nodeStates[pfrom->id]; auto& nodeState = nodeStates[pfrom->id];
nodeState.MarkRequested(inv.signHash, inv); auto session = nodeState.GetSessionByRecvId(inv.sessionId);
nodeState.MarkKnows(inv.signHash, inv); if (!session) {
return;
}
session->requested.Merge(inv);
session->knows.Merge(inv);
} }
void CSigSharesManager::ProcessMessageBatchedSigShares(CNode* pfrom, const CBatchedSigShares& batchedSigShares, CConnman& connman) void CSigSharesManager::ProcessMessageBatchedSigShares(CNode* pfrom, const CBatchedSigShares& batchedSigShares, CConnman& connman)
{ {
CSigSharesNodeState::SessionInfo sessionInfo;
if (!GetSessionInfoByRecvId(pfrom->id, batchedSigShares.sessionId, sessionInfo)) {
return;
}
bool ban = false; bool ban = false;
if (!PreVerifyBatchedSigShares(pfrom->id, batchedSigShares, ban)) { if (!PreVerifyBatchedSigShares(pfrom->id, sessionInfo, batchedSigShares, ban)) {
if (ban) { if (ban) {
BanNode(pfrom->id); BanNode(pfrom->id);
return; return;
@ -409,8 +428,8 @@ void CSigSharesManager::ProcessMessageBatchedSigShares(CNode* pfrom, const CBatc
} }
} }
LogPrint("llmq", "CSigSharesManager::%s -- shares=%d, new=%d, inv={%s}, node=%d\n", __func__, LogPrint("llmq", "CSigSharesManager::%s -- signHash=%s, shares=%d, new=%d, inv={%s}, node=%d\n", __func__,
batchedSigShares.sigShares.size(), sigShares.size(), batchedSigShares.ToInv().ToString(), pfrom->id); sessionInfo.signHash.ToString(), batchedSigShares.sigShares.size(), sigShares.size(), batchedSigShares.ToInv(sessionInfo.llmqType).ToString(), pfrom->id);
if (sigShares.empty()) { if (sigShares.empty()) {
return; return;
@ -423,35 +442,22 @@ void CSigSharesManager::ProcessMessageBatchedSigShares(CNode* pfrom, const CBatc
} }
} }
bool CSigSharesManager::PreVerifyBatchedSigShares(NodeId nodeId, const CBatchedSigShares& batchedSigShares, bool& retBan) bool CSigSharesManager::PreVerifyBatchedSigShares(NodeId nodeId, const CSigSharesNodeState::SessionInfo& session, const CBatchedSigShares& batchedSigShares, bool& retBan)
{ {
retBan = false; retBan = false;
auto llmqType = (Consensus::LLMQType)batchedSigShares.llmqType; if (!CLLMQUtils::IsQuorumActive(session.llmqType, session.quorum->quorumHash)) {
if (!Params().GetConsensus().llmqs.count(llmqType)) {
retBan = true;
return false;
}
CQuorumCPtr quorum = quorumManager->GetQuorum(llmqType, batchedSigShares.quorumHash);
if (!quorum) {
// TODO should we ban here?
LogPrintf("CSigSharesManager::%s -- quorum %s not found, node=%d\n", __func__,
batchedSigShares.quorumHash.ToString(), nodeId);
return false;
}
if (!CLLMQUtils::IsQuorumActive(llmqType, quorum->quorumHash)) {
// quorum is too old // quorum is too old
return false; return false;
} }
if (!quorum->IsMember(activeMasternodeInfo.proTxHash)) { if (!session.quorum->IsMember(activeMasternodeInfo.proTxHash)) {
// we're not a member so we can't verify it (we actually shouldn't have received it) // we're not a member so we can't verify it (we actually shouldn't have received it)
return false; return false;
} }
if (quorum->quorumVvec == nullptr) { if (session.quorum->quorumVvec == nullptr) {
// TODO we should allow to ask other nodes for the quorum vvec if we missed it in the DKG // TODO we should allow to ask other nodes for the quorum vvec if we missed it in the DKG
LogPrintf("CSigSharesManager::%s -- we don't have the quorum vvec for %s, no verification possible. node=%d\n", __func__, LogPrintf("CSigSharesManager::%s -- we don't have the quorum vvec for %s, no verification possible. node=%d\n", __func__,
batchedSigShares.quorumHash.ToString(), nodeId); session.quorumHash.ToString(), nodeId);
return false; return false;
} }
@ -464,12 +470,12 @@ bool CSigSharesManager::PreVerifyBatchedSigShares(NodeId nodeId, const CBatchedS
return false; return false;
} }
if (quorumMember >= quorum->members.size()) { if (quorumMember >= session.quorum->members.size()) {
LogPrintf("CSigSharesManager::%s -- quorumMember out of bounds\n", __func__); LogPrintf("CSigSharesManager::%s -- quorumMember out of bounds\n", __func__);
retBan = true; retBan = true;
return false; return false;
} }
if (!quorum->validMembers[quorumMember]) { if (!session.quorum->validMembers[quorumMember]) {
LogPrintf("CSigSharesManager::%s -- quorumMember not valid\n", __func__); LogPrintf("CSigSharesManager::%s -- quorumMember not valid\n", __func__);
retBan = true; retBan = true;
return false; return false;
@ -684,8 +690,10 @@ void CSigSharesManager::ProcessSigShare(NodeId nodeId, const CSigShare& sigShare
if (!quorumNodes.count(p.first) && !p.second.interestedIn.count(std::make_pair((Consensus::LLMQType)sigShare.llmqType, sigShare.quorumHash))) { if (!quorumNodes.count(p.first) && !p.second.interestedIn.count(std::make_pair((Consensus::LLMQType)sigShare.llmqType, sigShare.quorumHash))) {
continue; continue;
} }
p.second.MarkRequested((Consensus::LLMQType)sigShare.llmqType, sigShare.GetSignHash(), sigShare.quorumMember); auto& session = p.second.GetOrCreateSessionFromShare(sigShare);
p.second.MarkKnows((Consensus::LLMQType)sigShare.llmqType, sigShare.GetSignHash(), sigShare.quorumMember); session.quorum = quorum;
session.requested.Set(sigShare.quorumMember, true);
session.knows.Set(sigShare.quorumMember, true);
} }
} }
@ -848,7 +856,7 @@ void CSigSharesManager::CollectSigSharesToRequest(std::unordered_map<NodeId, std
} }
auto& inv = (*invMap)[signHash]; auto& inv = (*invMap)[signHash];
if (inv.inv.empty()) { if (inv.inv.empty()) {
inv.Init((Consensus::LLMQType)session.announced.llmqType, signHash); inv.Init(session.llmqType);
} }
inv.inv[k.second] = true; inv.inv[k.second] = true;
@ -896,12 +904,6 @@ void CSigSharesManager::CollectSigSharesToSend(std::unordered_map<NodeId, std::u
continue; continue;
} }
if (batchedSigShares.sigShares.empty()) {
batchedSigShares.llmqType = sigShare->llmqType;
batchedSigShares.quorumHash = sigShare->quorumHash;
batchedSigShares.id = sigShare->id;
batchedSigShares.msgHash = sigShare->msgHash;
}
batchedSigShares.sigShares.emplace_back((uint16_t)i, sigShare->sigShare); batchedSigShares.sigShares.emplace_back((uint16_t)i, sigShare->sigShare);
} }
@ -956,7 +958,7 @@ void CSigSharesManager::CollectSigSharesToAnnounce(std::unordered_map<NodeId, st
continue; continue;
} }
auto& session = nodeState.GetOrCreateSession((Consensus::LLMQType)sigShare->llmqType, signHash); auto& session = nodeState.GetOrCreateSessionFromShare(*sigShare);
if (session.knows.inv[quorumMember]) { if (session.knows.inv[quorumMember]) {
// he already knows that one // he already knows that one
@ -965,7 +967,7 @@ void CSigSharesManager::CollectSigSharesToAnnounce(std::unordered_map<NodeId, st
auto& inv = sigSharesToAnnounce[nodeId][signHash]; auto& inv = sigSharesToAnnounce[nodeId][signHash];
if (inv.inv.empty()) { if (inv.inv.empty()) {
inv.Init((Consensus::LLMQType)sigShare->llmqType, signHash); inv.Init((Consensus::LLMQType)sigShare->llmqType);
} }
inv.inv[quorumMember] = true; inv.inv[quorumMember] = true;
session.knows.inv[quorumMember] = true; session.knows.inv[quorumMember] = true;
@ -1006,8 +1008,8 @@ bool CSigSharesManager::SendMessages()
if (it != sigSharesToRequest.end()) { if (it != sigSharesToRequest.end()) {
for (auto& p : it->second) { for (auto& p : it->second) {
assert(p.second.CountSet() != 0); assert(p.second.CountSet() != 0);
LogPrint("llmq", "CSigSharesManager::SendMessages -- QGETSIGSHARES inv={%s}, node=%d\n", LogPrint("llmq", "CSigSharesManager::SendMessages -- QGETSIGSHARES signHash=%s, inv={%s}, node=%d\n",
p.second.ToString(), pnode->id); p.first.ToString(), p.second.ToString(), pnode->id);
g_connman->PushMessage(pnode, msgMaker.Make(NetMsgType::QGETSIGSHARES, p.second), false); g_connman->PushMessage(pnode, msgMaker.Make(NetMsgType::QGETSIGSHARES, p.second), false);
didSend = true; didSend = true;
} }
@ -1017,8 +1019,12 @@ bool CSigSharesManager::SendMessages()
if (jt != sigSharesToSend.end()) { if (jt != sigSharesToSend.end()) {
for (auto& p : jt->second) { for (auto& p : jt->second) {
assert(!p.second.sigShares.empty()); assert(!p.second.sigShares.empty());
LogPrint("llmq", "CSigSharesManager::SendMessages -- QBSIGSHARES inv={%s}, node=%d\n", if (LogAcceptCategory("llmq")) {
p.second.ToInv().ToString(), pnode->id); LOCK(cs);
auto session = nodeStates[pnode->id].GetSessionBySignHash(p.first);
LogPrint("llmq", "CSigSharesManager::SendMessages -- QBSIGSHARES signHash=%s, inv={%s}, node=%d\n",
p.first.ToString(), p.second.ToInv(session->llmqType).ToString(), pnode->id);
}
g_connman->PushMessage(pnode, msgMaker.Make(NetMsgType::QBSIGSHARES, p.second), false); g_connman->PushMessage(pnode, msgMaker.Make(NetMsgType::QBSIGSHARES, p.second), false);
didSend = true; didSend = true;
} }
@ -1028,8 +1034,8 @@ bool CSigSharesManager::SendMessages()
if (kt != sigSharesToAnnounce.end()) { if (kt != sigSharesToAnnounce.end()) {
for (auto& p : kt->second) { for (auto& p : kt->second) {
assert(p.second.CountSet() != 0); assert(p.second.CountSet() != 0);
LogPrint("llmq", "CSigSharesManager::SendMessages -- QSIGSHARESINV inv={%s}, node=%d\n", LogPrint("llmq", "CSigSharesManager::SendMessages -- QSIGSHARESINV signHash=%s, inv={%s}, node=%d\n",
p.second.ToString(), pnode->id); p.first.ToString(), p.second.ToString(), pnode->id);
g_connman->PushMessage(pnode, msgMaker.Make(NetMsgType::QSIGSHARESINV, p.second), false); g_connman->PushMessage(pnode, msgMaker.Make(NetMsgType::QSIGSHARESINV, p.second), false);
didSend = true; didSend = true;
} }
@ -1317,15 +1323,15 @@ void CSigSharesManager::Sign(const CQuorumCPtr& quorum, const uint256& id, const
sigShare.sigShare.SetSig(skShare.Sign(signHash)); sigShare.sigShare.SetSig(skShare.Sign(signHash));
if (!sigShare.sigShare.GetSig().IsValid()) { if (!sigShare.sigShare.GetSig().IsValid()) {
LogPrintf("CSigSharesManager::%s -- failed to sign sigShare. id=%s, msgHash=%s, time=%s\n", __func__, LogPrintf("CSigSharesManager::%s -- failed to sign sigShare. signHahs=%s, id=%s, msgHash=%s, time=%s\n", __func__,
sigShare.id.ToString(), sigShare.msgHash.ToString(), t.count()); signHash.ToString(), sigShare.id.ToString(), sigShare.msgHash.ToString(), t.count());
return; return;
} }
sigShare.UpdateKey(); sigShare.UpdateKey();
LogPrintf("CSigSharesManager::%s -- signed sigShare. id=%s, msgHash=%s, time=%s\n", __func__, LogPrintf("CSigSharesManager::%s -- signed sigShare. signHash=%s, id=%s, msgHash=%s, time=%s\n", __func__,
sigShare.id.ToString(), sigShare.msgHash.ToString(), t.count()); signHash.ToString(), sigShare.id.ToString(), sigShare.msgHash.ToString(), t.count());
ProcessSigShare(-1, sigShare, *g_connman, quorum); ProcessSigShare(-1, sigShare, *g_connman, quorum);
} }

4
src/llmq/quorums_signing_shares.h
View File

@ -391,8 +391,8 @@ private:
void ProcessMessageGetSigShares(CNode* pfrom, const CSigSharesInv& inv, CConnman& connman); void ProcessMessageGetSigShares(CNode* pfrom, const CSigSharesInv& inv, CConnman& connman);
void ProcessMessageBatchedSigShares(CNode* pfrom, const CBatchedSigShares& batchedSigShares, CConnman& connman); void ProcessMessageBatchedSigShares(CNode* pfrom, const CBatchedSigShares& batchedSigShares, CConnman& connman);
bool VerifySigSharesInv(NodeId from, const CSigSharesInv& inv); bool VerifySigSharesInv(NodeId from, Consensus::LLMQType llmqType, const CSigSharesInv& inv);
bool PreVerifyBatchedSigShares(NodeId nodeId, const CBatchedSigShares& batchedSigShares, bool& retBan); bool PreVerifyBatchedSigShares(NodeId nodeId, const CSigSharesNodeState::SessionInfo& session, const CBatchedSigShares& batchedSigShares, bool& retBan);
void CollectPendingSigSharesToVerify(size_t maxUniqueSessions, void CollectPendingSigSharesToVerify(size_t maxUniqueSessions,
std::unordered_map<NodeId, std::vector<CSigShare>>& retSigShares, std::unordered_map<NodeId, std::vector<CSigShare>>& retSigShares,