mirror of
https://github.com/dashpay/dash.git
synced 2024-12-24 11:32:46 +01:00
Compare commits
2 Commits
62360a3096
...
f0e7eb571e
Author | SHA1 | Date | |
---|---|---|---|
|
f0e7eb571e | ||
|
fd987f38bb |
@ -411,6 +411,12 @@ CQuorumPtr CQuorumManager::BuildQuorumFromCommitment(const Consensus::LLMQType l
|
||||
|
||||
quorum->Init(std::move(qc), pQuorumBaseBlockIndex, minedBlockHash, members);
|
||||
|
||||
if (populate_cache && llmq_params_opt->size == 1) {
|
||||
WITH_LOCK(cs_map_quorums, mapQuorumsCache[llmqType].insert(quorumHash, quorum));
|
||||
|
||||
return quorum;
|
||||
}
|
||||
|
||||
bool hasValidVvec = false;
|
||||
if (WITH_LOCK(cs_db, return quorum->ReadContributions(*db))) {
|
||||
hasValidVvec = true;
|
||||
|
@ -179,7 +179,7 @@ static RPCHelpMan quorum_list_extended()
|
||||
};
|
||||
}
|
||||
|
||||
static UniValue BuildQuorumInfo(const llmq::CQuorumBlockProcessor& quorum_block_processor, const llmq::CQuorumCPtr& quorum, bool includeMembers, bool includeSkShare)
|
||||
static UniValue BuildQuorumInfo(const llmq::CQuorumBlockProcessor& quorum_block_processor, const llmq::CQuorumCPtr& quorum, bool includeMembers, bool includeSkShare, bool single_node_quorum = false)
|
||||
{
|
||||
UniValue ret(UniValue::VOBJ);
|
||||
|
||||
@ -210,9 +210,13 @@ static UniValue BuildQuorumInfo(const llmq::CQuorumBlockProcessor& quorum_block_
|
||||
mo.pushKV("pubKeyOperator", dmn->pdmnState->pubKeyOperator.ToString());
|
||||
mo.pushKV("valid", quorum->qc->validMembers[i]);
|
||||
if (quorum->qc->validMembers[i]) {
|
||||
CBLSPublicKey pubKey = quorum->GetPubKeyShare(i);
|
||||
if (pubKey.IsValid()) {
|
||||
mo.pushKV("pubKeyShare", pubKey.ToString());
|
||||
if (single_node_quorum) {
|
||||
mo.pushKV("pubKeyShare", dmn->pdmnState->pubKeyOperator.ToString());
|
||||
} else {
|
||||
CBLSPublicKey pubKey = quorum->GetPubKeyShare(i);
|
||||
if (pubKey.IsValid()) {
|
||||
mo.pushKV("pubKeyShare", pubKey.ToString());
|
||||
}
|
||||
}
|
||||
}
|
||||
membersArr.push_back(mo);
|
||||
@ -225,6 +229,14 @@ static UniValue BuildQuorumInfo(const llmq::CQuorumBlockProcessor& quorum_block_
|
||||
if (includeSkShare && skShare.IsValid()) {
|
||||
ret.pushKV("secretKeyShare", skShare.ToString());
|
||||
}
|
||||
/*
|
||||
if (includeSkShare)
|
||||
const CBLSSecretKey& skShare = !single_node_quorum ? quorum->GetSkShare() : ????
|
||||
if (skShare.IsValid()) {
|
||||
ret.pushKV("secretKeyShare", skShare.ToString());
|
||||
}
|
||||
}
|
||||
*/
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -245,7 +257,8 @@ static RPCHelpMan quorum_info()
|
||||
const LLMQContext& llmq_ctx = EnsureLLMQContext(node);
|
||||
|
||||
const Consensus::LLMQType llmqType{static_cast<Consensus::LLMQType>(ParseInt32V(request.params[0], "llmqType"))};
|
||||
if (!Params().GetLLMQ(llmqType).has_value()) {
|
||||
auto llmq_opt = Params().GetLLMQ(llmqType);
|
||||
if (!llmq_opt.has_value()) {
|
||||
throw JSONRPCError(RPC_INVALID_PARAMETER, "invalid LLMQ type");
|
||||
}
|
||||
|
||||
@ -260,7 +273,7 @@ static RPCHelpMan quorum_info()
|
||||
throw JSONRPCError(RPC_INVALID_PARAMETER, "quorum not found");
|
||||
}
|
||||
|
||||
return BuildQuorumInfo(*llmq_ctx.quorum_block_processor, quorum, true, includeSkShare);
|
||||
return BuildQuorumInfo(*llmq_ctx.quorum_block_processor, quorum, true, includeSkShare, llmq_opt->size == 1);
|
||||
},
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user