dash/blackcoin-more
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Broken addresses on command line no longer trigger testnet.

Browse Source 
When passing a bitcoin: URI on the command line, invalid addresses do not incorrectly send the
user to the test network.
This commit is contained in:
Ross Nicoll
2014-08-02 19:54:57 +01:00
parent 9d26dc3b29
commit e84843c0db
5 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/base58.cpp
View File

@@ -215,9 +215,13 @@ bool CBitcoinAddress::Set(const CTxDestination &dest) {
}
bool CBitcoinAddress::IsValid() const {
return IsValid(Params());
}
bool CBitcoinAddress::IsValid(const CChainParams &params) const {
bool fCorrectSize = vchData.size() == 20;
bool fKnownVersion = vchVersion == Params().Base58Prefix(CChainParams::PUBKEY_ADDRESS) ||
vchVersion == Params().Base58Prefix(CChainParams::SCRIPT_ADDRESS);
bool fKnownVersion = vchVersion == params.Base58Prefix(CChainParams::PUBKEY_ADDRESS) ||
vchVersion == params.Base58Prefix(CChainParams::SCRIPT_ADDRESS);
return fCorrectSize && fKnownVersion;
}