From a8e1fb38934134359be2b4d80122858bfe879ae8 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 24 Nov 2018 21:16:58 -1100 Subject: [PATCH] Make sure activated before size change --- src/chainparams.cpp | 4 ++-- src/main.cpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 30feb82f7..1050cf19e 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -217,8 +217,8 @@ void CChainParams::SetCheckpointData(CChainParams::CCheckpointData checkpointDat 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); - if ( 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 ( mainParams.consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight > 0 && height >= mainParams.consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight ) return(4096 * 1024); else return(2000000); } diff --git a/src/main.cpp b/src/main.cpp index 3ec7f0306..14e90fe93 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4648,6 +4648,7 @@ bool CheckBlock(int32_t *futureblockp,int32_t height,CBlockIndex *pindex,const C // because we receive the wrong transactions for it. // 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)) return state.DoS(100, error("CheckBlock: size limits failed"), REJECT_INVALID, "bad-blk-length");