Skip to content

Commit aa76764

Browse files
MacroFakeDashCoreAutoGuix
authored andcommitted
Merge bitcoin#25439: rpc: Return incrementalrelayfee in getmempoolinfo
fafee78 rpc: Return incrementalrelayfee in getmempoolinfo (MacroFake) Pull request description: Seems odd to return other policy info, but not the incremental relay fee ACKs for top commit: 1440000bytes: ACK bitcoin@fafee78 w0xlt: Code Review ACK bitcoin@fafee78 jarolrod: tACK fafee78 Tree-SHA512: faad0af6c039b8257acbeac913bc5dcdb2ea2db304c95e52601536c8de60eb1186e9fbb4a64a68adf476605f18022aeda16a5644a0d7912592b0977e4c029638
1 parent bc0e908 commit aa76764

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/rpc/mempool.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,7 @@ UniValue MempoolInfoToJSON(const CTxMemPool& pool, const llmq::CInstantSendManag
393393
ret.pushKV("maxmempool", maxmempool);
394394
ret.pushKV("mempoolminfee", ValueFromAmount(std::max(pool.GetMinFee(maxmempool), ::minRelayTxFee).GetFeePerK()));
395395
ret.pushKV("minrelaytxfee", ValueFromAmount(::minRelayTxFee.GetFeePerK()));
396+
ret.pushKV("incrementalrelayfee", ValueFromAmount(::incrementalRelayFee.GetFeePerK()));
396397
ret.pushKV("instantsendlocks", (int64_t)isman.GetInstantSendLockCount());
397398
ret.pushKV("unbroadcastcount", uint64_t{pool.GetUnbroadcastTxs().size()});
398399
return ret;
@@ -401,7 +402,7 @@ UniValue MempoolInfoToJSON(const CTxMemPool& pool, const llmq::CInstantSendManag
401402
RPCHelpMan getmempoolinfo()
402403
{
403404
return RPCHelpMan{"getmempoolinfo",
404-
"\nReturns details on the active state of the TX memory pool.\n",
405+
"Returns details on the active state of the TX memory pool.",
405406
{},
406407
RPCResult{
407408
RPCResult::Type::OBJ, "", "",
@@ -414,6 +415,7 @@ RPCHelpMan getmempoolinfo()
414415
{RPCResult::Type::NUM, "maxmempool", "Maximum memory usage for the mempool"},
415416
{RPCResult::Type::STR_AMOUNT, "mempoolminfee", "Minimum fee rate in " + CURRENCY_UNIT + "/kB for tx to be accepted. Is the maximum of minrelaytxfee and minimum mempool fee"},
416417
{RPCResult::Type::STR_AMOUNT, "minrelaytxfee", "Current minimum relay fee for transactions"},
418+
{RPCResult::Type::STR_AMOUNT, "incrementalrelayfee", "minimum fee rate increment for mempool limiting or BIP 125 replacement in " + CURRENCY_UNIT + "/kB"},
417419
{RPCResult::Type::NUM, "instantsendlocks", "Number of unconfirmed InstantSend locks"},
418420
{RPCResult::Type::NUM, "unbroadcastcount", "Current number of transactions that haven't passed initial broadcast yet"}
419421
}},

0 commit comments

Comments
 (0)