@ -4158,10 +4158,6 @@ CBlockTemplate* CreateNewBlock(CReserveKey& reservekey)
@@ -4158,10 +4158,6 @@ CBlockTemplate* CreateNewBlock(CReserveKey& reservekey)
// Limit to betweeen 1K and MAX_BLOCK_SIZE-1K for sanity:
nBlockMaxSize = std : : max ( ( unsigned int ) 1000 , std : : min ( ( unsigned int ) ( MAX_BLOCK_SIZE - 1000 ) , nBlockMaxSize ) ) ;
// Special compatibility rule before 15 May: limit size to 500,000 bytes:
if ( GetAdjustedTime ( ) < 1368576000 )
nBlockMaxSize = std : : min ( nBlockMaxSize , ( unsigned int ) ( MAX_BLOCK_SIZE_GEN ) ) ;
// How much of the block should be dedicated to high-priority transactions,
// included regardless of the fees they pay
unsigned int nBlockPrioritySize = GetArg ( " -blockprioritysize " , 27000 ) ;