Skip to content

Remove excessive custom validation in CProposalValidator::ValidatePaymentAddress #1917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 12, 2018
Merged

Remove excessive custom validation in CProposalValidator::ValidatePaymentAddress #1917

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 5 additions & 14 deletions src/governance-validators.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,26 +154,17 @@ bool CProposalValidator::ValidatePaymentAddress()
return false;
}

static const std::string base58chars = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";

size_t nLength = strPaymentAddress.size();

if((nLength < 26) || (nLength > 35)) {
strErrorMessages += "incorrect payment_address length;";
return false;
}

if(strPaymentAddress.find_first_not_of(base58chars) != std::string::npos) {
strErrorMessages += "payment_address contains invalid characters;";
return false;
}

CBitcoinAddress address(strPaymentAddress);
if(!address.IsValid()) {
strErrorMessages += "payment_address is invalid;";
return false;
}

if(address.IsScript()) {
strErrorMessages += "script addresses are not supported;";
return false;
}

return true;
}

Expand Down