mirror of
https://github.com/bitcoin/bitcoin.git
synced 2024-11-20 02:25:40 +01:00
Remove createwitnessaddress
This RPC command is unsafe as it will return an address even if the script is invalid.
This commit is contained in:
parent
2a0836f6d5
commit
86c3f8db0b
@ -321,43 +321,6 @@ UniValue createmultisig(const UniValue& params, bool fHelp)
|
||||
return result;
|
||||
}
|
||||
|
||||
UniValue createwitnessaddress(const UniValue& params, bool fHelp)
|
||||
{
|
||||
if (fHelp || params.size() < 1 || params.size() > 1)
|
||||
{
|
||||
string msg = "createwitnessaddress \"script\"\n"
|
||||
"\nCreates a witness address for a particular script.\n"
|
||||
"It returns a json object with the address and witness script.\n"
|
||||
|
||||
"\nArguments:\n"
|
||||
"1. \"script\" (string, required) A hex encoded script\n"
|
||||
|
||||
"\nResult:\n"
|
||||
"{\n"
|
||||
" \"address\":\"multisigaddress\", (string) The value of the new address (P2SH of witness script).\n"
|
||||
" \"witnessScript\":\"script\" (string) The string value of the hex-encoded witness script.\n"
|
||||
"}\n"
|
||||
;
|
||||
throw runtime_error(msg);
|
||||
}
|
||||
|
||||
if (!IsHex(params[0].get_str())) {
|
||||
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Script must be hex-encoded");
|
||||
}
|
||||
|
||||
std::vector<unsigned char> code = ParseHex(params[0].get_str());
|
||||
CScript script(code.begin(), code.end());
|
||||
CScript witscript = GetScriptForWitness(script);
|
||||
CScriptID witscriptid(witscript);
|
||||
CBitcoinAddress address(witscriptid);
|
||||
|
||||
UniValue result(UniValue::VOBJ);
|
||||
result.push_back(Pair("address", address.ToString()));
|
||||
result.push_back(Pair("witnessScript", HexStr(witscript.begin(), witscript.end())));
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
UniValue verifymessage(const UniValue& params, bool fHelp)
|
||||
{
|
||||
if (fHelp || params.size() != 3)
|
||||
@ -493,7 +456,6 @@ static const CRPCCommand commands[] =
|
||||
{ "control", "getinfo", &getinfo, true }, /* uses wallet if enabled */
|
||||
{ "util", "validateaddress", &validateaddress, true }, /* uses wallet if enabled */
|
||||
{ "util", "createmultisig", &createmultisig, true },
|
||||
{ "util", "createwitnessaddress", &createwitnessaddress, true },
|
||||
{ "util", "verifymessage", &verifymessage, true },
|
||||
{ "util", "signmessagewithprivkey", &signmessagewithprivkey, true },
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user