GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-15 12:51:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 2ab4a80480 into merged_master (Bitcoin PR bitcoin/bitcoin#25254)

Browse source 
This commit moved DEFAULT_MIN_RELAY_TX_FEE to a different file.
Please confirm that the new value is equal to the old one.
This commit is contained in:
James Dorfman 2024-09-09 18:21:18 +00:00
commit caa3ef8844
19 changed files with 83 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/validation.cpp
View file

@ -141,8 +141,6 @@ int64_t nMaxTipAge = DEFAULT_MAX_TIP_AGE;
uint256 hashAssumeValid;
arith_uint256 nMinimumChainWork;
CFeeRate minRelayTxFee = CFeeRate(DEFAULT_MIN_RELAY_TX_FEE);
const CBlockIndex* CChainState::FindForkInGlobalIndex(const CBlockLocator& locator) const
{
AssertLockHeld(cs_main);