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

Merge pull request 'Sync duke branch to dev' (#420) from duke into dev

Browse Source 
Reviewed-on: https://git.hush.is/hush/hush3/pulls/420
This commit is contained in:
duke
2024-09-16 17:31:37 +02:00
parent bc20629b9f 3f50dd988a
commit 49f303d804
13 changed files with 234 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/chainparams.cpp
View File

@@ -492,13 +492,14 @@ void UpdateNetworkUpgradeParameters(Consensus::UpgradeIndex idx, int nActivation
int32_t MAX_BLOCK_SIZE(int32_t height)
{
int32_t saplinght = pCurrentParams->consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight;
// this codebase requires sapling activation at height=1
int32_t saplinght = 1; // pCurrentParams->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 <= 0 || (saplinght > 0 && height >= saplinght) )
{
//if ( height <= 0 || (saplinght > 0 && height >= saplinght) )
//{
return(_MAX_BLOCK_SIZE);
}
else return(2000000);
//}
//else return(2000000);
}
// Change the Hush blocktime at run-time(!)