[WIP] Obey mintxfee on txconfirmtarget, Bump mintxfee #7295

pull MarcoFalke wants to merge 1 commits into bitcoin:master from MarcoFalke:Mf1601-wallet-mintxfee changing 2 files +2 −2

MarcoFalke commented at 2:50 PM on January 5, 2016: member

[untested, unreviewed draft. may not compile]
[WIP] Obey mintxfee on txconfirmtarget, Bump mintxfee a2a052b6e3

in src/wallet/wallet.cpp:None in a2a052b6e3

2217 | @@ -2218,7 +2218,7 @@ CAmount CWallet::GetMinimumFee(unsigned int nTxBytes, unsigned int nConfirmTarge
2218 |      // But always obey the maximum
2219 |      if (nFeeNeeded > maxTxFee)
2220 |          nFeeNeeded = maxTxFee;
2221 | -    return nFeeNeeded;
2222 | +    return std::max(nFeeNeeded, GetRequiredFee(nTxBytes));

MarcoFalke commented at 3:02 PM on January 5, 2016:

IRC:

limiting below at GetRequiredFee should be before limiting above at maxTxFee -- if you typo and set the RequiredFee crazy high, better to have it capped than not

MarcoFalke closed this on Jan 5, 2016
MarcoFalke deleted the branch on Jan 5, 2016
DrahtBot locked this on Sep 8, 2021

Contributors

MarcoFalke