Skip to content

Commit 54e2588

Browse files
Merge #6862: fix: compilation error due to conflict between #6826 (SignHash refactoring) and #6613 (Platform ban)
cc13f15 fix: compilation error due to conflict between #6826 (SignHash refactoring) and #6613 (Platform ban) (Konstantin Akimov) Pull request description: ## Issue being fixed or feature implemented Conflict between #6826 (SignHash refactoring) and #6613 (Platform ban) causes compile error on develop. ## What was done? Fixed compilation error. ## How Has This Been Tested? Run build ## Breaking Changes N/A ## Checklist: - [x] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [x] I have assigned this pull request to a milestone ACKs for top commit: kwvg: ACK cc13f15 Tree-SHA512: b1cd2ccc0f9262fe881502eb8e1eac6fee424e6a4888187a4b0b231c0849040156b01f8f38db0a038dba40dd26a7cf544effaabb7046a5ea557bc9962584742c
2 parents 2d3e95f + cc13f15 commit 54e2588

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/net_processing.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3596,9 +3596,9 @@ MessageProcessingResult PeerManagerImpl::ProcessPlatformBanMessage(NodeId node,
35963596
const uint256 request_id = ::SerializeHash(std::make_pair(PLATFORM_BAN_REQUESTID_PREFIX, data));
35973597
const uint256 msg_hash = ::SerializeHash(data);
35983598

3599-
uint256 signHash = llmq::BuildSignHash(llmq_type, quorum->qc->quorumHash, request_id, msg_hash);
3599+
auto signHash = llmq::SignHash(llmq_type, quorum->qc->quorumHash, request_id, msg_hash);
36003600

3601-
if (!ban_msg.m_signature.VerifyInsecure(quorum->qc->quorumPublicKey, signHash)) {
3601+
if (!ban_msg.m_signature.VerifyInsecure(quorum->qc->quorumPublicKey, signHash.Get())) {
36023602
LogPrintf("PLATFORMBAN -- hash: %s protx_hash: %s request_id: %s msg_hash: %s sig validation failed\n", hash.ToString(), ban_msg.m_protx_hash.ToString(), request_id.ToString(), msg_hash.ToString());
36033603
ret.m_error = MisbehavingError{100};
36043604
return ret;

0 commit comments

Comments
 (0)