Merge 80862ff943 into merged_master (Elements PR ElementsProject/elements#1075)

This commit is contained in:
Glenn Willen 2022-05-25 13:00:55 -07:00
commit 16507123c0
3 changed files with 16 additions and 3 deletions

View file

@ -169,6 +169,15 @@ std::string EncodeHexTx(const CTransaction& tx, const int serializeFlags)
return HexStr(ssTx);
}
UniValue EncodeHexScriptWitness(const CScriptWitness& witness)
{
UniValue witness_hex(UniValue::VARR);
for (const auto &item : witness.stack) {
witness_hex.push_back(HexStr(item));
}
return witness_hex;
}
void ScriptToUniv(const CScript& script, UniValue& out, bool include_address)
{
out.pushKV("asm", ScriptToAsmStr(script));