mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-01-20 23:29:12 +01:00
17cf9ff7efUse cluster size limit for -maxmempool bound, and allow -maxmempool=0 in general (Suhas Daftuar)315e43e5d8Sanity check `GetFeerateDiagram()` in CTxMemPool::check() (Suhas Daftuar)de2e9a24c4test: extend package rbf functional test to larger clusters (Suhas Daftuar)4ef4ddb504doc: update policy/packages.md for new package acceptance logic (Suhas Daftuar)79f73ad713Add check that GetSortedScoreWithTopology() agrees with CompareMiningScoreWithTopology() (Suhas Daftuar)a86ac11768Update comments for CTxMemPool class (Suhas Daftuar)9567eaa66dInvoke TxGraph::DoWork() at appropriate times (Suhas Daftuar)6c5c44f774test: add functional test for new cluster mempool RPCs (Suhas Daftuar)72f60c877edoc: Update mempool_replacements.md to reflect feerate diagram checks (Suhas Daftuar)21693f031aExpose cluster information via rpc (Suhas Daftuar)72e74e0d42fuzz: try to add more code coverage for mempool fuzzing (Suhas Daftuar)f107417490bench: add more mempool benchmarks (Suhas Daftuar)7976eb1ae7Avoid violating mempool policy limits in tests (Suhas Daftuar)84de685cf7Stop tracking parents/children outside of txgraph (Suhas Daftuar)88672e205bRewrite GatherClusters to use the txgraph implementation (Suhas Daftuar)1ca4f01090Fix miniminer_tests to work with cluster limits (Suhas Daftuar)1902111e0fEliminate CheckPackageLimits, which no longer does anything (Suhas Daftuar)3a646ec462Rework RBF and TRUC validation (Suhas Daftuar)19b8479868Make getting parents/children a function of the mempool, not a mempool entry (Suhas Daftuar)5560913e51Rework truc_policy to use descendants, not children (Suhas Daftuar)a4458d6c40Use txgraph to calculate descendants (Suhas Daftuar)c8b6f70d64Use txgraph to calculate ancestors (Suhas Daftuar)241a3e666bSimplify ancestor calculation functions (Suhas Daftuar)b9cec7f0a1Make removeConflicts private (Suhas Daftuar)0402e6c780Remove unused limits from CalculateMemPoolAncestors (Suhas Daftuar)08be765ac2Remove mempool logic designed to maintain ancestor/descendant state (Suhas Daftuar)fc4e3e6bc1Remove unused members from CTxMemPoolEntry (Suhas Daftuar)ff3b398d12mempool: eliminate accessors to mempool entry ancestor/descendant cached state (Suhas Daftuar)b9a2039f51Eliminate use of cached ancestor data in miniminer_tests and truc_policy (Suhas Daftuar)ba09fc9774mempool: Remove unused function CalculateDescendantMaximum (Suhas Daftuar)8e49477e86wallet: Replace max descendant count with cluster_count (Suhas Daftuar)e031085fd4Eliminate Single-Conflict RBF Carve Out (Suhas Daftuar)cf3ab8e1d0Stop enforcing descendant size/count limits (Suhas Daftuar)89ae38f489test: remove rbf carveout test from mempool_limit.py (Suhas Daftuar)c0bd04d18fCalculate descendant information for mempool RPC output on-the-fly (Suhas Daftuar)bdcefb8a8bUse mempool/txgraph to determine if a tx has descendants (Suhas Daftuar)69e1eaa6edAdd test case for cluster size limits to TRUC logic (Suhas Daftuar)9cda64b86cStop enforcing ancestor size/count limits (Suhas Daftuar)1f93227a84Remove dependency on cached ancestor data in mini-miner (Suhas Daftuar)9fbe0a4ac2rpc: Calculate ancestor data from scratch for mempool rpc calls (Suhas Daftuar)7961496ddaReimplement GetTransactionAncestry() to not rely on cached data (Suhas Daftuar)feceaa42e8Remove CTxMemPool::GetSortedDepthAndScore (Suhas Daftuar)21b5cea588Use cluster linearization for transaction relay sort order (Suhas Daftuar)6445aa7d97Remove the ancestor and descendant indices from the mempool (Suhas Daftuar)216e693729Implement new RBF logic for cluster mempool (Suhas Daftuar)ff8f115decpolicy: Remove CPFP carveout rule (Suhas Daftuar)c3f1afc934test: rewrite PopulateMempool to not violate mempool policy (cluster size) limits (Suhas Daftuar)47ab32fdb1Select transactions for blocks based on chunk feerate (Suhas Daftuar)dec138d1ddfuzz: remove comparison between mini_miner block construction and miner (Suhas Daftuar)6c2bceb200bench: rewrite ComplexMemPool to not create oversized clusters (Suhas Daftuar)1ad4590f63Limit mempool size based on chunk feerate (Suhas Daftuar)b11c89cab2Rework miner_tests to not require large cluster limit (Suhas Daftuar)95a8297d48Check cluster limits when using -walletrejectlongchains (Suhas Daftuar)95762e6759Do not allow mempool clusters to exceed configured limits (Suhas Daftuar)edb3e7cdf6[test] rework/delete feature_rbf tests requiring large clusters (glozow)435fd56711test: update feature_rbf.py replacement test (Suhas Daftuar)34e32985e8Add new (unused) limits for cluster size/count (Suhas Daftuar)838d7e3553Add transactions to txgraph, but without cluster dependencies (Suhas Daftuar)d5ed9cb3ebAdd accessor for sigops-adjusted weight (Suhas Daftuar)1bf3b51396Add sigops adjusted weight calculator (Suhas Daftuar)c18c68a950Create a txgraph inside CTxMemPool (Suhas Daftuar)29a94d5b2fMake CTxMemPoolEntry derive from TxGraph::Ref (Suhas Daftuar)92b0079fe3Allow moving CTxMemPoolEntry objects, disallow copying (Suhas Daftuar)6c73e47448mempool: Store iterators into mapTx in mapNextTx (Suhas Daftuar)51430680ecAllow moving an Epoch::Marker (Suhas Daftuar) Pull request description: [Reopening #28676 here as a new PR, because GitHub is slow to load the page making it hard to scroll through and see comments. Also, that PR was originally opened with a prototype implementation which has changed significantly with the introduction of `TxGraph`.] This is an implementation of the [cluster mempool proposal](https://delvingbitcoin.org/t/an-overview-of-the-cluster-mempool-proposal/393). This branch implements the following observable behavior changes: - Maintains a partitioning of the mempool into connected clusters (via the `txgraph` class), which are limited in vsize to 101 kvB by default, and limited in count to 64 by default. - Each cluster is sorted ("linearized") to try to optimize for selecting highest-feerate-subsets of a cluster first - Transaction selection for mining is updated to use the cluster linearizations, selecting highest feerate "chunks" first for inclusion in a block template. - Mempool eviction is updated to use the cluster linearizations, selecting lowest feerate "chunks" first for removal. - The RBF rules are updated to: (a) drop the requirement that no new inputs are introduced; (b) change the feerate requirement to instead check that the feerate diagram of the mempool will strictly improve; (c) replace the direct conflicts limit with a directly-conflicting-clusters limit. - The CPFP carveout rule is eliminated (it doesn't make sense in a cluster-limited mempool) - The ancestor and descendant limits are no longer enforced. - New cluster count/cluster vsize limits are now enforced instead. - Transaction relay now uses chunk feerate comparisons to determine the order that newly received transactions are announced to peers. Additionally, the cached ancestor and descendant data are dropped from the mempool, along with the multi_index indices that were maintained to sort the mempool by ancestor and descendant feerates. For compatibility (eg with wallet behavior or RPCs exposing this), this information is now calculated dynamically instead. ACKs for top commit: instagibbs: reACK17cf9ff7efglozow: reACK17cf9ff7efsipa: ACK17cf9ff7efTree-SHA512: bbde46d913d56f8d9c0426cb0a6c4fa80b01b0a4c2299500769921f886082fb4f51f1694e0ee1bc318c52e1976d7ebed8134a64eda0b8044f3a708c04938eee7
164 lines
6.5 KiB
C++
164 lines
6.5 KiB
C++
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
|
// Copyright (c) 2009-present The Bitcoin Core developers
|
|
// Distributed under the MIT software license, see the accompanying
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
#ifndef BITCOIN_NODE_MINER_H
|
|
#define BITCOIN_NODE_MINER_H
|
|
|
|
#include <interfaces/types.h>
|
|
#include <node/types.h>
|
|
#include <policy/policy.h>
|
|
#include <primitives/block.h>
|
|
#include <txmempool.h>
|
|
#include <util/feefrac.h>
|
|
|
|
#include <cstdint>
|
|
#include <memory>
|
|
#include <optional>
|
|
|
|
#include <boost/multi_index/identity.hpp>
|
|
#include <boost/multi_index/indexed_by.hpp>
|
|
#include <boost/multi_index/ordered_index.hpp>
|
|
#include <boost/multi_index/tag.hpp>
|
|
#include <boost/multi_index_container.hpp>
|
|
|
|
class ArgsManager;
|
|
class CBlockIndex;
|
|
class CChainParams;
|
|
class CScript;
|
|
class Chainstate;
|
|
class ChainstateManager;
|
|
|
|
namespace Consensus { struct Params; };
|
|
|
|
using interfaces::BlockRef;
|
|
|
|
namespace node {
|
|
class KernelNotifications;
|
|
|
|
static const bool DEFAULT_PRINT_MODIFIED_FEE = false;
|
|
|
|
struct CBlockTemplate
|
|
{
|
|
CBlock block;
|
|
// Fees per transaction, not including coinbase transaction (unlike CBlock::vtx).
|
|
std::vector<CAmount> vTxFees;
|
|
// Sigops per transaction, not including coinbase transaction (unlike CBlock::vtx).
|
|
std::vector<int64_t> vTxSigOpsCost;
|
|
std::vector<unsigned char> vchCoinbaseCommitment;
|
|
/* A vector of package fee rates, ordered by the sequence in which
|
|
* packages are selected for inclusion in the block template.*/
|
|
std::vector<FeePerVSize> m_package_feerates;
|
|
};
|
|
|
|
/** Generate a new block, without valid proof-of-work */
|
|
class BlockAssembler
|
|
{
|
|
private:
|
|
// The constructed block template
|
|
std::unique_ptr<CBlockTemplate> pblocktemplate;
|
|
|
|
// Information on the current status of the block
|
|
uint64_t nBlockWeight;
|
|
uint64_t nBlockTx;
|
|
uint64_t nBlockSigOpsCost;
|
|
CAmount nFees;
|
|
|
|
// Chain context for the block
|
|
int nHeight;
|
|
int64_t m_lock_time_cutoff;
|
|
|
|
const CChainParams& chainparams;
|
|
const CTxMemPool* const m_mempool;
|
|
Chainstate& m_chainstate;
|
|
|
|
public:
|
|
struct Options : BlockCreateOptions {
|
|
// Configuration parameters for the block size
|
|
size_t nBlockMaxWeight{DEFAULT_BLOCK_MAX_WEIGHT};
|
|
CFeeRate blockMinFeeRate{DEFAULT_BLOCK_MIN_TX_FEE};
|
|
// Whether to call TestBlockValidity() at the end of CreateNewBlock().
|
|
bool test_block_validity{true};
|
|
bool print_modified_fee{DEFAULT_PRINT_MODIFIED_FEE};
|
|
};
|
|
|
|
explicit BlockAssembler(Chainstate& chainstate, const CTxMemPool* mempool, const Options& options);
|
|
|
|
/** Construct a new block template */
|
|
std::unique_ptr<CBlockTemplate> CreateNewBlock();
|
|
|
|
/** The number of transactions in the last assembled block (excluding coinbase transaction) */
|
|
inline static std::optional<int64_t> m_last_block_num_txs{};
|
|
/** The weight of the last assembled block (including reserved weight for block header, txs count and coinbase tx) */
|
|
inline static std::optional<int64_t> m_last_block_weight{};
|
|
|
|
private:
|
|
const Options m_options;
|
|
|
|
// utility functions
|
|
/** Clear the block's state and prepare for assembling a new block */
|
|
void resetBlock();
|
|
/** Add a tx to the block */
|
|
void AddToBlock(const CTxMemPoolEntry& entry);
|
|
|
|
// Methods for how to add transactions to a block.
|
|
/** Add transactions based on chunk feerate
|
|
*
|
|
* @pre BlockAssembler::m_mempool must not be nullptr
|
|
*/
|
|
void addChunks() EXCLUSIVE_LOCKS_REQUIRED(m_mempool->cs);
|
|
|
|
// helper functions for addChunks()
|
|
/** Test if a new package would "fit" in the block */
|
|
bool TestPackage(FeePerWeight package_feerate, int64_t packageSigOpsCost) const;
|
|
/** Perform checks on each transaction in a package:
|
|
* locktime, premature-witness, serialized size (if necessary)
|
|
* These checks should always succeed, and they're here
|
|
* only as an extra check in case of suboptimal node configuration */
|
|
bool TestPackageTransactions(const std::vector<CTxMemPoolEntryRef>& txs) const;
|
|
};
|
|
|
|
/**
|
|
* Get the minimum time a miner should use in the next block. This always
|
|
* accounts for the BIP94 timewarp rule, so does not necessarily reflect the
|
|
* consensus limit.
|
|
*/
|
|
int64_t GetMinimumTime(const CBlockIndex* pindexPrev, const int64_t difficulty_adjustment_interval);
|
|
|
|
int64_t UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParams, const CBlockIndex* pindexPrev);
|
|
|
|
/** Update an old GenerateCoinbaseCommitment from CreateNewBlock after the block txs have changed */
|
|
void RegenerateCommitments(CBlock& block, ChainstateManager& chainman);
|
|
|
|
/** Apply -blockmintxfee and -blockmaxweight options from ArgsManager to BlockAssembler options. */
|
|
void ApplyArgsManOptions(const ArgsManager& gArgs, BlockAssembler::Options& options);
|
|
|
|
/* Compute the block's merkle root, insert or replace the coinbase transaction and the merkle root into the block */
|
|
void AddMerkleRootAndCoinbase(CBlock& block, CTransactionRef coinbase, uint32_t version, uint32_t timestamp, uint32_t nonce);
|
|
|
|
|
|
/* Interrupt the current wait for the next block template. */
|
|
void InterruptWait(KernelNotifications& kernel_notifications, bool& interrupt_wait);
|
|
/**
|
|
* Return a new block template when fees rise to a certain threshold or after a
|
|
* new tip; return nullopt if timeout is reached.
|
|
*/
|
|
std::unique_ptr<CBlockTemplate> WaitAndCreateNewBlock(ChainstateManager& chainman,
|
|
KernelNotifications& kernel_notifications,
|
|
CTxMemPool* mempool,
|
|
const std::unique_ptr<CBlockTemplate>& block_template,
|
|
const BlockWaitOptions& options,
|
|
const BlockAssembler::Options& assemble_options,
|
|
bool& interrupt_wait);
|
|
|
|
/* Locks cs_main and returns the block hash and block height of the active chain if it exists; otherwise, returns nullopt.*/
|
|
std::optional<BlockRef> GetTip(ChainstateManager& chainman);
|
|
|
|
/* Waits for the connected tip to change until timeout has elapsed. During node initialization, this will wait until the tip is connected (regardless of `timeout`).
|
|
* Returns the current tip, or nullopt if the node is shutting down. */
|
|
std::optional<BlockRef> WaitTipChanged(ChainstateManager& chainman, KernelNotifications& kernel_notifications, const uint256& current_tip, MillisecondsDouble& timeout);
|
|
} // namespace node
|
|
|
|
#endif // BITCOIN_NODE_MINER_H
|