DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Make sure activated before size change

Browse Source
This commit is contained in:
jl777
2018-11-24 21:16:58 -11:00
parent 5cfcb8622d
commit a8e1fb3893
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/chainparams.cpp
View File

@@ -217,8 +217,8 @@ void CChainParams::SetCheckpointData(CChainParams::CCheckpointData checkpointDat
int32_t MAX_BLOCK_SIZE(int32_t height) int32_t MAX_BLOCK_SIZE(int32_t height)
{ {
fprintf(stderr,"MAX_BLOCK_SIZE %d vs. %d\n",height,mainParams.consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight); //fprintf(stderr,"MAX_BLOCK_SIZE %d vs. %d\n",height,mainParams.consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight);
if ( height >= mainParams.consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight ) if ( mainParams.consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight > 0 && height >= mainParams.consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight )
return(4096 * 1024); return(4096 * 1024);
else return(2000000); else return(2000000);
} }

1
src/main.cpp
View File

@@ -4648,6 +4648,7 @@ bool CheckBlock(int32_t *futureblockp,int32_t height,CBlockIndex *pindex,const C
// because we receive the wrong transactions for it. // because we receive the wrong transactions for it.
// Size limits // Size limits
fprintf(stderr,"checkblock %d -> %d\n",height,MAX_BLOCK_SIZE(height));
if (block.vtx.empty() || block.vtx.size() > MAX_BLOCK_SIZE(height) || ::GetSerializeSize(block, SER_NETWORK, PROTOCOL_VERSION) > MAX_BLOCK_SIZE(height)) if (block.vtx.empty() || block.vtx.size() > MAX_BLOCK_SIZE(height) || ::GetSerializeSize(block, SER_NETWORK, PROTOCOL_VERSION) > MAX_BLOCK_SIZE(height))
return state.DoS(100, error("CheckBlock: size limits failed"), return state.DoS(100, error("CheckBlock: size limits failed"),
REJECT_INVALID, "bad-blk-length"); REJECT_INVALID, "bad-blk-length");