From e1901d24aa4a1b49ef312b3bea5730106c6d485e Mon Sep 17 00:00:00 2001 From: Alexander Block Date: Wed, 9 Jan 2019 07:29:57 +0100 Subject: [PATCH] Handle review suggestions --- src/batchedlogger.h | 2 +- src/consensus/params.h | 16 ++++++++++++++++ src/llmq/quorums_debug.cpp | 2 +- src/llmq/quorums_debug.h | 2 +- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/batchedlogger.h b/src/batchedlogger.h index 3d5a067f8172f..6f1d1d54535fb 100644 --- a/src/batchedlogger.h +++ b/src/batchedlogger.h @@ -25,4 +25,4 @@ class CBatchedLogger void Flush(); }; -#endif//DASH_BATCHEDLOGGER_H \ No newline at end of file +#endif//DASH_BATCHEDLOGGER_H diff --git a/src/consensus/params.h b/src/consensus/params.h index d452c327844c6..c59e01783f652 100644 --- a/src/consensus/params.h +++ b/src/consensus/params.h @@ -97,11 +97,27 @@ struct LLMQParams { // should at the same time not be too large so that not too much space is wasted with null commitments in case a DKG // session failed. int dkgMiningWindowEnd; + + // Each member will sleep for a random time between 0 and dkgRndSleepTime milliseconds. The purpose of this is to + // avoid overloading the network due to all members sending out expensive-to-verify DKG messages at once int dkgRndSleepTime; + + // In the complaint phase, members will vote on other members being bad (missing valid contribution). If at least + // dkgBadVotesThreshold have voted for another member to be bad, it will considered to be bad by all other members + // as well. This serves as a protection against late-comers who send their contribution on the bring of + // phase-transition, which would otherwise result in inconsistent views of the valid members set int dkgBadVotesThreshold; + // Used for inter-quorum communication. This is the number of deterministic connections built to the clockwise + // neighbors on the circle shaped nodes topography int neighborConnections; + + // Used for inter-quorum communication. This is the number of deterministic connections built diagonally to the + // member on the circle shaped nodes topography. int diagonalConnections; + + // Used for inter-quorum communication. This is the number of quorums for which we should keep old connections. This + // should be at least as much as the active quorums set. int keepOldConnections; }; diff --git a/src/llmq/quorums_debug.cpp b/src/llmq/quorums_debug.cpp index e203cffe953f2..f9b0a3cf3b6bf 100644 --- a/src/llmq/quorums_debug.cpp +++ b/src/llmq/quorums_debug.cpp @@ -64,7 +64,7 @@ UniValue CDKGDebugSessionStatus::ToJson(int detailLevel) const v.arr.push_back((int)idx); } else if (detailLevel == 2) { UniValue a(UniValue::VOBJ); - a.push_back(Pair("memberIndex", idx)); + a.push_back(Pair("memberIndex", (int)idx)); if (idx < dmnMembers.size()) { a.push_back(Pair("proTxHash", dmnMembers[idx]->proTxHash.ToString())); } diff --git a/src/llmq/quorums_debug.h b/src/llmq/quorums_debug.h index 1e5e333a1956b..a3d8ee5b6cc50 100644 --- a/src/llmq/quorums_debug.h +++ b/src/llmq/quorums_debug.h @@ -39,7 +39,7 @@ class CDKGDebugMemberStatus uint16_t statusBitset; }; - std::set complaintsFromMembers; + std::set complaintsFromMembers; public: CDKGDebugMemberStatus() : statusBitset(0) {}