Merge branch 'TheBlueMatt-setaccountfix' into integration

This commit is contained in:
tcatm 2011-03-05 17:26:14 +01:00
commit b104df742d

View File

@ -381,6 +381,12 @@ Value setaccount(const Array& params, bool fHelp)
"Sets the account associated with the given address."); "Sets the account associated with the given address.");
string strAddress = params[0].get_str(); string strAddress = params[0].get_str();
uint160 hash160;
bool isValid = AddressToHash160(strAddress, hash160);
if (!isValid)
throw JSONRPCError(-5, "Invalid bitcoin address");
string strAccount; string strAccount;
if (params.size() > 1) if (params.size() > 1)
strAccount = AccountFromValue(params[1]); strAccount = AccountFromValue(params[1]);