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

Port tweakfedpegscript from liquid

Browse source 
Port tweakfedpegscript from liquid
This commit is contained in:
Mike 2018-06-21 13:10:57 -07:00
parent c929443996
commit 9bcfdd8c5c
2 changed files with 40 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
qa/rpc-tests/pegging.py
View file

@ -201,9 +201,12 @@ try:
sidechain.generate(101) sidechain.generate(101)
addrs = sidechain.getpeginaddress() getpeginaddr_res = sidechain.getpeginaddress()
txid1 = bitcoin.sendtoaddress(addrs["mainchain_address"], 24) addr = getpeginaddr_res["mainchain_address"]
# 10+2 confirms required to get into mempool and confirm claim_script = getpeginaddr_res["claim_script"]
assert(addr == sidechain.tweakfedpegscript(claim_script)["address"])
txid1 = bitcoin.sendtoaddress(addr, 24)
bitcoin.generate(1) bitcoin.generate(1)
time.sleep(2) time.sleep(2)
proof = bitcoin.gettxoutproof([txid1]) proof = bitcoin.gettxoutproof([txid1])

35
src/rpc/misc.cpp
View file

@ -583,6 +583,38 @@ UniValue echo(const JSONRPCRequest& request)
return request.params; return request.params;
} }
UniValue tweakfedpegscript(const JSONRPCRequest& request)
{
if (request.fHelp || request.params.size() != 1)
throw runtime_error(
"tweakfedpegscript \"claim_script\"\n"
"\nReturns a tweaked fedpegscript.\n"
"\nArguments:\n"
"1. \"claim_script\" (string, required) Script to tweak the fedpegscript with. For example obtained as a result of getpeginaddress.\n"
"\nResult:\n"
"{\n"
"\"script\" (string) The fedpegscript tweaked with claim_script\n"
"\"address\" (string) The address corresponding to the tweaked fedpegscript\n"
"}\n"
);
if (!IsHex(request.params[0].get_str())) {
throw JSONRPCError(RPC_TYPE_ERROR, "the first argument must be a hex string");
}
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);
CParentBitcoinAddress addr(CScriptID(GetScriptForWitness(tweaked_script)));
UniValue ret(UniValue::VOBJ);
ret.pushKV("script", HexStr(tweaked_script));
ret.pushKV("address", addr.ToString());
return ret;
}
static const CRPCCommand commands[] = static const CRPCCommand commands[] =
{ // category name actor (function) okSafeMode { // category name actor (function) okSafeMode
// --------------------- ------------------------ ----------------------- ---------- // --------------------- ------------------------ ----------------------- ----------
@ -593,11 +625,12 @@ static const CRPCCommand commands[] =
{ "util", "createblindedaddress", &createblindedaddress, true, {} }, { "util", "createblindedaddress", &createblindedaddress, true, {} },
{ "util", "verifymessage", &verifymessage, true, {"address","signature","message"} }, { "util", "verifymessage", &verifymessage, true, {"address","signature","message"} },
{ "util", "signmessagewithprivkey", &signmessagewithprivkey, true, {"privkey","message"} }, { "util", "signmessagewithprivkey", &signmessagewithprivkey, true, {"privkey","message"} },
{ "util", "tweakfedpegscript", &tweakfedpegscript, true, {"claim_script"} },
/* Not shown in help */ /* Not shown in help */
{ "hidden", "setmocktime", &setmocktime, true, {"timestamp"}}, { "hidden", "setmocktime", &setmocktime, true, {"timestamp"}},
{ "hidden", "echo", &echo, true, {"arg0","arg1","arg2","arg3","arg4","arg5","arg6","arg7","arg8","arg9"}}, { "hidden", "echo", &echo, true, {"arg0","arg1","arg2","arg3","arg4","arg5","arg6","arg7","arg8","arg9"}},
{ "hidden", "echojson", &echo, true, {"arg0","arg1","arg2","arg3","arg4","arg5","arg6","arg7","arg8","arg9"}}, { "hidden", "echojson", &echo, true, {"arg0","arg1","arg2","arg3","arg4","arg5","arg6","arg7","arg8","arg9"}},
}; };
void RegisterMiscRPCCommands(CRPCTable &t) void RegisterMiscRPCCommands(CRPCTable &t)