Skip to content

Commit

Permalink
minox fix
Browse files Browse the repository at this point in the history
  • Loading branch information
sapphire-pt committed Jan 9, 2021
1 parent 292b2c1 commit 3e7be7f
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions src/miner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -228,12 +228,17 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn, CWallet* pwallet,
unsigned int nBlockMaxSize = GetArg("-blockmaxsize", DEFAULT_BLOCK_MAX_SIZE);
// Limit to betweeen 1K and MAX_BLOCK_SIZE-1K for sanity:
unsigned int nBlockMaxSizeNetwork = MAX_BLOCK_SIZE_CURRENT;
unsigned int nBlockMaxSizeSpork = (unsigned int)sporkManager.GetSporkValue(SPORK_105_MAX_BLOCK_SIZE);

nBlockMaxSize = std::max(
(unsigned int)1000,
std::min(
(unsigned int)sporkManager.GetSporkValue(SPORK_105_MAX_BLOCK_SIZE),
nBlockMaxSizeNetwork,
nBlockMaxSize));
std::min(
nBlockMaxSizeSpork,
nBlockMaxSizeNetwork),
nBlockMaxSize
)
);

// How much of the block should be dedicated to high-priority transactions,
// included regardless of the fees they pay
Expand Down

0 comments on commit 3e7be7f

Please sign in to comment.