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

Merge 8ad5f1c376 into merged_master (Bitcoin PR #19106)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-26 01:08:54 +00:00
commit ea6e25d012
4 changed files with 32 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/rpc/util.cpp
View file

@ -852,14 +852,10 @@ std::vector<CScript> EvalDescriptorStringOrObject(const UniValue& scanobject, Fl
UniValue GetServicesNames(ServiceFlags services)
{
const uint64_t services_n = services;
UniValue servicesNames(UniValue::VARR);
for (int i = 0; i < 64; ++i) {
const uint64_t mask = 1ull << i;
if (services_n & mask) {
servicesNames.push_back(serviceFlagToStr(mask, i));
}
for (const auto& flag : serviceFlagsToStr(services)) {
servicesNames.push_back(flag);
}
return servicesNames;