Merge f7c73b03d9 into merged_master (Bitcoin PR #19569)

This commit is contained in:
Andrew Poelstra 2020-11-26 23:15:28 +00:00
commit 0ddf4fafae
8 changed files with 96 additions and 63 deletions

View file

@ -242,3 +242,9 @@ std::vector<std::string> serviceFlagsToStr(uint64_t flags)
return str_flags;
}
GenTxid ToGenTxid(const CInv& inv)
{
assert(inv.IsGenTxMsg());
return {inv.IsMsgWtx(), inv.hash};
}