Merge b75f2ad72d into merged_master (Bitcoin PR #19660)

This commit is contained in:
Andrew Poelstra 2020-11-27 04:05:36 +00:00
commit 419fd4f90d
17 changed files with 53 additions and 73 deletions

View file

@ -263,7 +263,7 @@ public:
UniValue obj(UniValue::VOBJ);
obj.pushKV("iswitness", true);
obj.pushKV("witness_version", (int)id.version);
obj.pushKV("witness_program", HexStr(id.program, id.program + id.length));
obj.pushKV("witness_program", HexStr(Span<const unsigned char>(id.program, id.length)));
return obj;
}