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

Merge 2bdce7f7ad into merged_master (Bitcoin PR bitcoin/bitcoin#25514)

Browse source 
Note I did manually run the trim headers functional test successfully on
this commit, since it touched some of trim headers code.
This commit is contained in:
Byron Hambly 2024-10-17 10:33:17 +02:00
commit 299207b5d6
13 changed files with 199 additions and 203 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/rpc/net.cpp
View file

@ -195,8 +195,9 @@ static RPCHelpMan getpeerinfo()
if (stats.m_mapped_as != 0) {
obj.pushKV("mapped_as", uint64_t(stats.m_mapped_as));
}
obj.pushKV("services", strprintf("%016x", stats.nServices));
obj.pushKV("servicesnames", GetServicesNames(stats.nServices));
ServiceFlags services{fStateStats ? statestats.their_services : ServiceFlags::NODE_NONE};
obj.pushKV("services", strprintf("%016x", services));
obj.pushKV("servicesnames", GetServicesNames(services));
obj.pushKV("lastsend", count_seconds(stats.m_last_send));
obj.pushKV("lastrecv", count_seconds(stats.m_last_recv));
obj.pushKV("last_transaction", count_seconds(stats.m_last_tx_time));