diff --git a/src/bench/bls_dkg.cpp b/src/bench/bls_dkg.cpp index 031304d11a0d..8164c570c971 100644 --- a/src/bench/bls_dkg.cpp +++ b/src/bench/bls_dkg.cpp @@ -27,12 +27,14 @@ struct DKG DKG(int quorumSize) { - members.resize(quorumSize); - ids.resize(quorumSize); + members.reserve(quorumSize); + ids.reserve(quorumSize); for (int i = 0; i < quorumSize; i++) { - members[i].id.SetInt(i + 1); - ids[i] = members[i].id; + uint256 id; + WriteLE64(id.begin(), i + 1); + members.push_back({id, {}, {}}); + ids.emplace_back(id); } for (int i = 0; i < quorumSize; i++) { diff --git a/src/bls/bls.cpp b/src/bls/bls.cpp index 6fe738656ce8..9ca1084a0083 100644 --- a/src/bls/bls.cpp +++ b/src/bls/bls.cpp @@ -14,34 +14,13 @@ #include #include -void CBLSId::SetInt(int x) +CBLSId::CBLSId(const uint256& nHash) : CBLSWrapper() { - impl.SetHex(strprintf("%x", x)); + impl = nHash; fValid = true; UpdateHash(); } -void CBLSId::SetHash(const uint256& hash) -{ - impl = hash; - fValid = true; - UpdateHash(); -} - -CBLSId CBLSId::FromInt(int64_t i) -{ - CBLSId id; - id.SetInt(i); - return id; -} - -CBLSId CBLSId::FromHash(const uint256& hash) -{ - CBLSId id; - id.SetHash(hash); - return id; -} - void CBLSSecretKey::AggregateInsecure(const CBLSSecretKey& o) { assert(IsValid() && o.IsValid()); diff --git a/src/bls/bls.h b/src/bls/bls.h index 17b610ab0910..b2c87e56ed32 100644 --- a/src/bls/bls.h +++ b/src/bls/bls.h @@ -240,12 +240,7 @@ class CBLSId : public CBLSWrapper using CBLSWrapper::operator!=; CBLSId() {} - - void SetInt(int x); - void SetHash(const uint256& hash); - - static CBLSId FromInt(int64_t i); - static CBLSId FromHash(const uint256& hash); + CBLSId(const uint256& nHash); }; class CBLSSecretKey : public CBLSWrapper diff --git a/src/llmq/quorums.cpp b/src/llmq/quorums.cpp index e8bbbb91a4c7..52b9c5d923ec 100644 --- a/src/llmq/quorums.cpp +++ b/src/llmq/quorums.cpp @@ -84,7 +84,7 @@ CBLSPublicKey CQuorum::GetPubKeyShare(size_t memberIdx) const return CBLSPublicKey(); } auto& m = members[memberIdx]; - return blsCache.BuildPubKeyShare(m->proTxHash, quorumVvec, CBLSId::FromHash(m->proTxHash)); + return blsCache.BuildPubKeyShare(m->proTxHash, quorumVvec, CBLSId(m->proTxHash)); } CBLSSecretKey CQuorum::GetSkShare() const diff --git a/src/llmq/quorums_dkgsession.cpp b/src/llmq/quorums_dkgsession.cpp index 56c6861415cc..27cbcb3a69f8 100644 --- a/src/llmq/quorums_dkgsession.cpp +++ b/src/llmq/quorums_dkgsession.cpp @@ -84,7 +84,7 @@ CDKGPrematureCommitment::CDKGPrematureCommitment(const Consensus::LLMQParams& pa CDKGMember::CDKGMember(CDeterministicMNCPtr _dmn, size_t _idx) : dmn(_dmn), idx(_idx), - id(CBLSId::FromHash(_dmn->proTxHash)) + id(_dmn->proTxHash) { } diff --git a/src/llmq/quorums_signing_shares.cpp b/src/llmq/quorums_signing_shares.cpp index 356b1c049054..ea97a8085f1e 100644 --- a/src/llmq/quorums_signing_shares.cpp +++ b/src/llmq/quorums_signing_shares.cpp @@ -807,7 +807,7 @@ void CSigSharesManager::TryRecoverSig(const CQuorumCPtr& quorum, const uint256& for (auto it = sigShares->begin(); it != sigShares->end() && sigSharesForRecovery.size() < quorum->params.threshold; ++it) { auto& sigShare = it->second; sigSharesForRecovery.emplace_back(sigShare.sigShare.Get()); - idsForRecovery.emplace_back(CBLSId::FromHash(quorum->members[sigShare.quorumMember]->proTxHash)); + idsForRecovery.emplace_back(quorum->members[sigShare.quorumMember]->proTxHash); } // check if we can recover the final signature