Merge branch 'dev' into zsweep

2022-09-12 09:40:35 -04:00
parent bd9006623c def5f815e0
commit bd4d2d71d3
15 changed files with 8 additions and 485 deletions
--- a/src/base58.cpp
+++ b/src/base58.cpp
@@ -324,14 +324,6 @@ bool CBitcoinAddress::GetKeyID(CKeyID& keyID) const
    return true;
 }

-bool CBitcoinAddress::GetKeyID_NoCheck(CKeyID& keyID) const
-{
-    uint160 id;
-    memcpy(&id, &vchData[0], 20);
-    keyID = CKeyID(id);
-    return true;
-}
-
 bool CBitcoinAddress::IsScript() const
 {
    return IsValid() && vchVersion == Params().Base58Prefix(CChainParams::SCRIPT_ADDRESS);