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

Add is_pegin response for raw transaction RPCs

Browse source
This commit is contained in:
Gregory Sanders 2017-09-29 10:14:02 -04:00
parent d4d00da7f4
commit 6534bd3b86
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -172,6 +172,11 @@ try:
else: else:
raise Exception("Peg-in confirmation has failed.") raise Exception("Peg-in confirmation has failed.")
# Look at pegin fields
decoded = sidechain.decoderawtransaction(tx1["hex"])
assert decoded["vin"][0]["is_pegin"] == True
assert len(decoded["vin"][0]["pegin_witness"]) > 0
# Quick reorg checks of pegs # Quick reorg checks of pegs
sidechain.invalidateblock(blockhash[0]) sidechain.invalidateblock(blockhash[0])
if sidechain.gettransaction(pegtxid1)["confirmations"] != 0: if sidechain.gettransaction(pegtxid1)["confirmations"] != 0:

1
src/rpc/rawtransaction.cpp
View file

@ -110,6 +110,7 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry)
o.push_back(Pair("asm", ScriptToAsmStr(txin.scriptSig, true))); o.push_back(Pair("asm", ScriptToAsmStr(txin.scriptSig, true)));
o.push_back(Pair("hex", HexStr(txin.scriptSig.begin(), txin.scriptSig.end()))); o.push_back(Pair("hex", HexStr(txin.scriptSig.begin(), txin.scriptSig.end())));
in.push_back(Pair("scriptSig", o)); in.push_back(Pair("scriptSig", o));
in.push_back(Pair("is_pegin", txin.m_is_pegin));
} }
if (tx.HasWitness()) { if (tx.HasWitness()) {
UniValue scriptWitness(UniValue::VARR); UniValue scriptWitness(UniValue::VARR);