|
|
@ -320,43 +320,6 @@ UniValue createmultisig(const UniValue& params, bool fHelp) |
|
|
|
return result; |
|
|
|
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) |
|
|
|
UniValue verifymessage(const UniValue& params, bool fHelp) |
|
|
|
{ |
|
|
|
{ |
|
|
|
if (fHelp || params.size() != 3) |
|
|
|
if (fHelp || params.size() != 3) |
|
|
@ -490,7 +453,6 @@ static const CRPCCommand commands[] = |
|
|
|
{ "control", "getinfo", &getinfo, true }, /* uses wallet if enabled */ |
|
|
|
{ "control", "getinfo", &getinfo, true }, /* uses wallet if enabled */ |
|
|
|
{ "util", "validateaddress", &validateaddress, true }, /* uses wallet if enabled */ |
|
|
|
{ "util", "validateaddress", &validateaddress, true }, /* uses wallet if enabled */ |
|
|
|
{ "util", "createmultisig", &createmultisig, true }, |
|
|
|
{ "util", "createmultisig", &createmultisig, true }, |
|
|
|
{ "util", "createwitnessaddress", &createwitnessaddress, true }, |
|
|
|
|
|
|
|
{ "util", "verifymessage", &verifymessage, true }, |
|
|
|
{ "util", "verifymessage", &verifymessage, true }, |
|
|
|
{ "util", "signmessagewithprivkey", &signmessagewithprivkey, true }, |
|
|
|
{ "util", "signmessagewithprivkey", &signmessagewithprivkey, true }, |
|
|
|
|
|
|
|
|
|
|
|