DragonX/hush3
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

CBitcoinAddress should use nVersionBytes == 2.

Browse Source 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood
2016-10-04 02:53:55 +01:00
committed by Jack Grigg
parent fbad4cac24
commit 00e56272e8
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/base58.cpp
View File

@@ -179,9 +179,9 @@ bool CBase58Data::SetString(const char* psz, unsigned int nVersionBytes)
return true;
}
bool CBase58Data::SetString(const std::string& str)
bool CBase58Data::SetString(const std::string& str, unsigned int nVersionBytes)
{
return SetString(str.c_str());
return SetString(str.c_str(), nVersionBytes);
}
std::string CBase58Data::ToString() const
@@ -251,6 +251,16 @@ bool CBitcoinAddress::IsValid(const CChainParams& params) const
return fCorrectSize && fKnownVersion;
}
bool CBitcoinAddress::SetString(const char* pszAddress)
{
return CBase58Data::SetString(pszAddress, 2);
}
bool CBitcoinAddress::SetString(const std::string& strAddress)
{
return SetString(strAddress.c_str());
}
CTxDestination CBitcoinAddress::Get() const
{
if (!IsValid())
@@ -305,7 +315,7 @@ bool CBitcoinSecret::IsValid() const
bool CBitcoinSecret::SetString(const char* pszSecret)
{
return CBase58Data::SetString(pszSecret) && IsValid();
return CBase58Data::SetString(pszSecret, 1) && IsValid();
}
bool CBitcoinSecret::SetString(const std::string& strSecret)