diff --git a/doc/release-notes.md b/doc/release-notes.md --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -4,4 +4,7 @@ -This is a maintenance release with no user-visible change. +This release includes the following features and fixes: + - The `fees.ancestor` and `fees.descendant` fields from the `getrawmempool`, + `getmempoolentry`, `getmempoolancestors` and `getmempooldescendants` were + deprecated since v0.27.0 and have been completely removed. diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -498,22 +498,6 @@ "transaction fee with fee deltas used for " "mining priority in " + ticker}, - RPCResult{ - RPCResult::Type::STR_AMOUNT, "ancestor", - "DEPRECATED: modified fees (see above) of in-mempool " - "ancestors (including this one) in " + - ticker + - ". Only displayed if the " - "-deprecatedrpc=mempool_ancestors_descendants " - "option is set"}, - RPCResult{ - RPCResult::Type::STR_AMOUNT, "descendant", - "DEPRECATED: modified fees (see above) of in-mempool " - "descendants (including this one) in " + - ticker + - ". Only displayed if the " - "-deprecatedrpc=mempool_ancestors_descendants " - "option is set"}, }}, RPCResult{ RPCResult::Type::ARR, @@ -581,10 +565,6 @@ UniValue fees(UniValue::VOBJ); fees.pushKV("base", e.GetFee()); fees.pushKV("modified", e.GetModifiedFee()); - if (deprecated_ancestors_descendants) { - fees.pushKV("ancestor", e.GetModFeesWithAncestors()); - fees.pushKV("descendant", e.GetModFeesWithDescendants()); - } info.pushKV("fees", fees); info.pushKV("size", (int)e.GetTxSize()); diff --git a/src/txmempool.h b/src/txmempool.h --- a/src/txmempool.h +++ b/src/txmempool.h @@ -130,15 +130,12 @@ uint64_t nCountWithDescendants{1}; //! ... and size uint64_t nSizeWithDescendants; - //! ... and total fees (all including us) - Amount nModFeesWithDescendants; //! ... and sichecks int64_t nSigChecksWithDescendants; // Analogous statistics for ancestor transactions uint64_t nCountWithAncestors{1}; uint64_t nSizeWithAncestors; - Amount nModFeesWithAncestors; int64_t nSigChecksWithAncestors; public: @@ -167,8 +164,7 @@ size_t DynamicMemoryUsage() const { return nUsageSize; } const LockPoints &GetLockPoints() const { return lockPoints; } - // Updates the fee delta used for mining priority score, and the - // modified fees with descendants. + // Updates the fee delta used for mining priority score void UpdateFeeDelta(Amount feeDelta); // Update the LockPoints after a reorg void UpdateLockPoints(const LockPoints &lp); @@ -176,7 +172,6 @@ uint64_t GetCountWithDescendants() const { return nCountWithDescendants; } uint64_t GetSizeWithDescendants() const { return nSizeWithDescendants; } uint64_t GetVirtualSizeWithDescendants() const; - Amount GetModFeesWithDescendants() const { return nModFeesWithDescendants; } int64_t GetSigChecksWithDescendants() const { return nSigChecksWithDescendants; } @@ -186,7 +181,6 @@ uint64_t GetCountWithAncestors() const { return nCountWithAncestors; } uint64_t GetSizeWithAncestors() const { return nSizeWithAncestors; } uint64_t GetVirtualSizeWithAncestors() const; - Amount GetModFeesWithAncestors() const { return nModFeesWithAncestors; } int64_t GetSigChecksWithAncestors() const { return nSigChecksWithAncestors; } diff --git a/src/txmempool.cpp b/src/txmempool.cpp --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -55,8 +55,7 @@ nTxSize(tx->GetTotalSize()), nUsageSize{RecursiveDynamicUsage(tx)}, nTime(time), entryHeight{entry_height}, spendsCoinbase(spends_coinbase), sigChecks(_sigChecks), lockPoints(lp), nSizeWithDescendants{GetTxSize()}, - nModFeesWithDescendants{nFee}, nSigChecksWithDescendants{sigChecks}, - nSizeWithAncestors{GetTxSize()}, nModFeesWithAncestors{nFee}, + nSigChecksWithDescendants{sigChecks}, nSizeWithAncestors{GetTxSize()}, nSigChecksWithAncestors{sigChecks} {} size_t CTxMemPoolEntry::GetTxVirtualSize() const { @@ -80,9 +79,6 @@ } void CTxMemPoolEntry::UpdateFeeDelta(Amount newFeeDelta) { - // Remove after wellington; this stat is unused after wellington - nModFeesWithDescendants += newFeeDelta - feeDelta; - nModFeesWithAncestors += newFeeDelta - feeDelta; feeDelta = newFeeDelta; }