neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix GetBlockSubsidy for regtest, bump regtest settings

Browse Source 
Closes #719
This commit is contained in:
UdjinM6 2016-03-06 18:07:30 +03:00 committed by Holger Schinzel
parent 3cf048d01c
commit b682fcb8d6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/chainparams.cpp
View File

@ -269,9 +269,9 @@ public:
CRegTestParams() {
strNetworkID = "regtest";
consensus.nSubsidyHalvingInterval = 150;
consensus.nMasternodePaymentsStartBlock = 40;
consensus.nMasternodePaymentsIncreaseBlock = 50;
consensus.nMasternodePaymentsIncreasePeriod = 100;
consensus.nMasternodePaymentsStartBlock = 240;
consensus.nMasternodePaymentsIncreaseBlock = 350;
consensus.nMasternodePaymentsIncreasePeriod = 10;
consensus.nBudgetPaymentsStartBlock = 1000;
consensus.nBudgetPaymentsCycleBlocks = 50;
consensus.nBudgetPaymentsWindowBlocks = 100;

2
src/main.cpp
View File

@ -1503,7 +1503,7 @@ CAmount GetBlockSubsidy(int nPrevBits, int nPrevHeight, const Consensus::Params&
double dDiff = (double)0x0000ffff / (double)(nPrevBits & 0x00ffffff);
/* fixed bug caused diff to not be correctly calculated */
if(nPrevHeight > 4500 || Params().NetworkIDString() == CBaseChainParams::TESTNET) dDiff = ConvertBitsToDouble(nPrevBits);
if(nPrevHeight > 4500 || Params().NetworkIDString() != CBaseChainParams::MAIN) dDiff = ConvertBitsToDouble(nPrevBits);
CAmount nSubsidy = 0;
if(nPrevHeight >= 5465) {