Merge pull request #4166 from kittywhiskers/encodespan

Merge bitcoin#19628, bitcoin#19687: change CNetAddr::ip to have flexible size
dashpay · May 23, 2021 · 41a8349 · 41a8349
2 parents b76e7fe + 065cc46
commit 41a8349
Show file tree

Hide file tree

Showing 12 changed files with 521 additions and 257 deletions.
diff --git a/src/messagesigner.cpp b/src/messagesigner.cpp
@@ -64,7 +64,7 @@ bool CHashSigner::VerifyHash(const uint256& hash, const CKeyID& keyID, const std
     if(pubkeyFromSig.GetID() != keyID) {
         strErrorRet = strprintf("Keys don't match: pubkey=%s, pubkeyFromSig=%s, hash=%s, vchSig=%s",
                     keyID.ToString(), pubkeyFromSig.GetID().ToString(), hash.ToString(),
-                    EncodeBase64(vchSig.data(), vchSig.size()));
+                    EncodeBase64(vchSig));
         return false;
     }