mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-10-10 19:43:13 +02:00
Merge #9602: Remove coin age priority and free transactions - implementation
b421e6d
Update example bitcoin.conf (Alex Morcos)7d4e950
Allow setting minrelaytxfee to 0 (Alex Morcos)359e8a0
[cleanup] Remove coin age priority completely. (Alex Morcos)f9b9371
[rpc] Remove priorityDelta from prioritisetransaction (Alex Morcos)49be7e1
[rpc] Remove priority information from mempool RPC calls (Alex Morcos)0315888
[test] Remove priority from tests (Alex Morcos)f838005
No longer allow "free" transactions (Alex Morcos)ad727f4
[rpc] sendrawtransaction no longer bypasses minRelayTxFee (Alex Morcos)fe282ac
[cleanup] Remove estimatePriority and estimateSmartPriority (Alex Morcos)400b151
[debug] Change -printpriority option (Alex Morcos)272b25a
[mining] Remove -blockprioritysize. (Alex Morcos)12839cd
[rpc] Remove estimatepriority and estimatesmartpriority. (Alex Morcos)ddf58c7
wallet: Remove sendfree (MarcoFalke) Tree-SHA512: a9a4499405923ce794ef18f9e334dbbd59dfc73a3dc2df6f85cc9c62af6f353ec2eed9c2d5e58e904f918d0d7ab738f403dd4939d9bc2276136864fe63710782
This commit is contained in:
12
src/miner.h
12
src/miner.h
@@ -158,10 +158,6 @@ private:
|
||||
int64_t nLockTimeCutoff;
|
||||
const CChainParams& chainparams;
|
||||
|
||||
// Variables used for addPriorityTxs
|
||||
int lastFewTxs;
|
||||
bool blockFinished;
|
||||
|
||||
public:
|
||||
struct Options {
|
||||
Options();
|
||||
@@ -184,17 +180,9 @@ private:
|
||||
void AddToBlock(CTxMemPool::txiter iter);
|
||||
|
||||
// Methods for how to add transactions to a block.
|
||||
/** Add transactions based on tx "priority" */
|
||||
void addPriorityTxs();
|
||||
/** Add transactions based on feerate including unconfirmed ancestors */
|
||||
void addPackageTxs();
|
||||
|
||||
// helper function for addPriorityTxs
|
||||
/** Test if tx will still "fit" in the block */
|
||||
bool TestForBlock(CTxMemPool::txiter iter);
|
||||
/** Test if tx still has unconfirmed parents not yet in block */
|
||||
bool isStillDependent(CTxMemPool::txiter iter);
|
||||
|
||||
// helper functions for addPackageTxs()
|
||||
/** Remove confirmed (inBlock) entries from given set */
|
||||
void onlyUnconfirmed(CTxMemPool::setEntries& testSet);
|
||||
|
Reference in New Issue
Block a user