GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-15 12:51:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace CScriptID and CKeyID in CTxDestination with dedicated type

Browse source
This commit is contained in:
Gregory Sanders 2019-02-19 17:00:45 -05:00 • committed by Steven Roose
parent 3e7cff1e45
commit aa375e66c1
No known key found for this signature in database
GPG key ID: 7FC91380BB4CE800
28 changed files with 201 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/rpc/misc.cpp
View file

@ -177,8 +177,8 @@ static UniValue verifymessage(const JSONRPCRequest& request)
throw JSONRPCError(RPC_TYPE_ERROR, "Invalid address");
}
const CKeyID *keyID = boost::get<CKeyID>(&destination);
if (!keyID) {
const PKHash *pkhash = boost::get<PKHash>(&destination);
if (!pkhash) {
throw JSONRPCError(RPC_TYPE_ERROR, "Address does not refer to key");
}
@ -196,7 +196,7 @@ static UniValue verifymessage(const JSONRPCRequest& request)
if (!pubkey.RecoverCompact(ss.GetHash(), vchSig))
return false;
return (pubkey.GetID() == *keyID);
return (pubkey.GetID() == *pkhash);
}
static UniValue signmessagewithprivkey(const JSONRPCRequest& request)
@ -470,7 +470,7 @@ UniValue tweakfedpegscript(const JSONRPCRequest& request)
std::vector<unsigned char> scriptData = ParseHex(request.params[0].get_str());
CScript claim_script = CScript(scriptData.begin(), scriptData.end());
CScript tweaked_script = calculate_contract(Params().GetConsensus().fedpegScript, claim_script);
CTxDestination parent_addr(CScriptID(GetScriptForWitness(tweaked_script)));
CTxDestination parent_addr(ScriptHash(GetScriptForWitness(tweaked_script)));
UniValue ret(UniValue::VOBJ);
ret.pushKV("script", HexStr(tweaked_script));