github-jwinterm/myriadcoin
1
0
Fork 0
mirror of https://github.com/jwinterm/myriadcoin.git synced 2026-10-18 05:51:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Phase 2 timespan

Browse Source
This commit is contained in:
myriadcoin
2015-07-14 19:30:00 +02:00
parent c6f9bb4f11
commit 2be772d85d
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core.h
+1 -1
View File
@@ -46,7 +46,7 @@ static const int AUXPOW_CHAIN_ID = 0x005A;
static const int AUXPOW_START_MAINNET = 9999999; //TODO change me
static const int AUXPOW_START_TESTNET = 1;
static const int Phase2Reward_Start = 9999999;
static const int Phase2Timespan_Start = 9999999;
static const int GeoAvgWork_Start = 9999999;
inline int GetAlgo(int nVersion)
src/main.cpp
+12 -13
View File
@@ -1256,21 +1256,20 @@ const CBlockIndex* GetLastBlockIndexForAlgo(const CBlockIndex* pindex, int algo)
static const int64_t nStartSubsidy = 1000 * COIN;
static const int64_t nMinSubsidy = 1 * COIN;
static const int64_t nRewardPhase2StartSubsidy = 50 * COIN;
int64_t GetBlockValue(int nHeight, int64_t nFees)
{
int64_t nSubsidy;
int64_t nSubsidy = nStartSubsidy;
if (!TestNet() && (nHeight < Phase2Reward_Start))
// Mining phase: Subsidy is cut in half every SubsidyHalvingInterval
nSubsidy >>= (nHeight / Params().SubsidyHalvingInterval());
// Inflation phase: Subsidy reaches minimum subsidy
// Network is rewarded for transaction processing with transaction fees and
// the inflationary subsidy
if (nSubsidy < nMinSubsidy)
{
nSubsidy = nStartSubsidy;
nSubsidy >>= (nHeight / Params().SubsidyHalvingInterval());
}
else
{
nSubsidy = nRewardPhase2StartSubsidy;
nSubsidy += (nHeight / Params().SubsidyHalvingInterval());
nSubsidy = nMinSubsidy;
}
return nSubsidy + nFees;
@@ -1461,7 +1460,7 @@ unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHead
}
int64_t lnMinActualTimespan;
if (TestNet() || (pindexLast->nHeight >= Phase2Reward_Start))
if (TestNet() || (pindexLast->nHeight >= Phase2Timespan_Start))
lnMinActualTimespan = nMinActualTimespanP2;
else
if (pindexLast->nHeight >= nBlockDiffAdjustV2)
@@ -1470,7 +1469,7 @@ unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHead
lnMinActualTimespan = nMinActualTimespanV1;
int64_t lnMaxActualTimespan;
if (TestNet() || (pindexLast->nHeight >= Phase2Reward_Start))
if (TestNet() || (pindexLast->nHeight >= Phase2Timespan_Start))
lnMaxActualTimespan = nMaxActualTimespanP2;
else
lnMaxActualTimespan = nMaxActualTimespanP1;
@@ -1482,7 +1481,7 @@ unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHead
LogPrintf(" nActualTimespan = %d after bounds %d %d\n", nActualTimespan, lnMinActualTimespan, lnMaxActualTimespan);
int64_t lnAveragingTargetTimespan;
if (TestNet() || (pindexLast->nHeight >= Phase2Reward_Start))
if (TestNet() || (pindexLast->nHeight >= Phase2Timespan_Start))
lnAveragingTargetTimespan = nAveragingTargetTimespanP2;
else
lnAveragingTargetTimespan = nAveragingTargetTimespanP1;