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 335798c496 into merged_master (Bitcoin PR bitcoin/bitcoin#31397)

Browse source
This commit is contained in:
Tom Trevethan 2026-04-10 00:57:49 +01:00
commit 041eaa0342
18 changed files with 637 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/rpc/mempool.cpp
View file

@ -856,7 +856,9 @@ static UniValue OrphanToJSON(const TxOrphanage::OrphanTxBase& orphan)
o.pushKV("entry", int64_t{TicksSinceEpoch<std::chrono::seconds>(orphan.nTimeExpire - ORPHAN_TX_EXPIRE_TIME)});
o.pushKV("expiration", int64_t{TicksSinceEpoch<std::chrono::seconds>(orphan.nTimeExpire)});
UniValue from(UniValue::VARR);
from.push_back(orphan.fromPeer); // only one fromPeer for now
for (const auto fromPeer: orphan.announcers) {
from.push_back(fromPeer);
}
o.pushKV("from", from);
return o;
}