X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fkernel.cpp;h=bd1cdf302ce68f7f9fc396f8ce42b2bac6744a65;hb=8d43f1482a14263a76c039c227c4383580dcc1db;hp=71a14e3cbd2f9a69224ac318df9ebdddcc3ea3b5;hpb=0c0eb55c15b7cc09e8f422f1e2e54fe569f06c2e;p=novacoin.git diff --git a/src/kernel.cpp b/src/kernel.cpp index 71a14e3..bd1cdf3 100644 --- a/src/kernel.cpp +++ b/src/kernel.cpp @@ -5,7 +5,7 @@ #include #include "kernel.h" -#include "db.h" +#include "txdb.h" using namespace std; @@ -21,6 +21,11 @@ static std::map mapStakeModifierCheckpoints = ( 9690, 0x97dcdafau ) ( 12661, 0x5d84115du ) ( 37092, 0xd230afccu ) + ( 44200, 0x05370164u ) + ( 65000, 0xc8e7be6au ) + ( 68600, 0x73a8cc4cu ) + ( 92161, 0xe21a911au ) + ( 98661, 0xd20c44d4u ) ; // Hard checkpoints of stake modifiers to ensure they are deterministic (testNet) @@ -29,6 +34,18 @@ static std::map mapStakeModifierCheckpointsTestNet = ( 0, 0x0e00670bu ) ; +// Get time weight +int64 GetWeight(int64 nIntervalBeginning, int64 nIntervalEnd) +{ + // Kernel hash weight starts from 0 at the 30-day min age + // this change increases active coins participating the hash and helps + // to secure the network when proof-of-stake difficulty is low + // + // Maximum TimeWeight is 90 days. + + return min(nIntervalEnd - nIntervalBeginning - nStakeMinAge, (int64)nStakeMaxAge); +} + // Get the last stake modifier and its generation time from a given block static bool GetLastStakeModifier(const CBlockIndex* pindex, uint64& nStakeModifier, int64& nModifierTime) { @@ -62,11 +79,8 @@ static int64 GetStakeModifierSelectionInterval() // select a block from the candidate blocks in vSortedByTimestamp, excluding // already selected blocks in vSelectedBlocks, and with timestamp up to // nSelectionIntervalStop. -static bool SelectBlockFromCandidates( - vector >& vSortedByTimestamp, - map& mapSelectedBlocks, - int64 nSelectionIntervalStop, uint64 nStakeModifierPrev, - const CBlockIndex** pindexSelected) +static bool SelectBlockFromCandidates(vector >& vSortedByTimestamp, map& mapSelectedBlocks, + int64 nSelectionIntervalStop, uint64 nStakeModifierPrev, const CBlockIndex** pindexSelected) { bool fSelected = false; uint256 hashBest = 0; @@ -173,8 +187,7 @@ bool ComputeNextStakeModifier(const CBlockIndex* pindexPrev, uint64& nStakeModif // add the selected block from candidates to selected list mapSelectedBlocks.insert(make_pair(pindex->GetBlockHash(), pindex)); if (fDebug && GetBoolArg("-printstakemodifier")) - printf("ComputeNextStakeModifier: selected round %d stop=%s height=%d bit=%d\n", - nRound, DateTimeStrFormat(nSelectionIntervalStop).c_str(), pindex->nHeight, pindex->GetStakeEntropyBit()); + printf("ComputeNextStakeModifier: selected round %d stop=%s height=%d bit=%d\n", nRound, DateTimeStrFormat(nSelectionIntervalStop).c_str(), pindex->nHeight, pindex->GetStakeEntropyBit()); } // Print selection map for visualization of the selected blocks @@ -250,10 +263,8 @@ static bool GetKernelStakeModifier(uint256 hashBlockFrom, uint64& nStakeModifier // this ensures that the chance of getting a coinstake is proportional to the // amount of coin age one owns. // The reason this hash is chosen is the following: -// nStakeModifier: -// (v0.3) scrambles computation to make it very difficult to precompute -// future proof-of-stake at the time of the coin's confirmation -// (v0.2) nBits (deprecated): encodes all past block timestamps +// nStakeModifier: scrambles computation to make it very difficult to precompute +// future proof-of-stake at the time of the coin's confirmation // txPrev.block.nTime: prevent nodes from guessing a good timestamp to // generate transaction for future advantage // txPrev.offset: offset of txPrev inside block, to reduce the chance of @@ -279,25 +290,9 @@ bool CheckStakeKernelHash(unsigned int nBits, const CBlock& blockFrom, unsigned bnTargetPerCoinDay.SetCompact(nBits); int64 nValueIn = txPrev.vout[prevout.n].nValue; - int64 nTimeWeight; uint256 hashBlockFrom = blockFrom.GetHash(); - // Kernel hash weight starts from 0 at the 30-day min age - // this change increases active coins participating the hash and helps - // to secure the network when proof-of-stake difficulty is low - // - if(fTestNet || (STAKEWEIGHT_SWITCH_TIME < nTimeTx)) - { - // New rule since 01 Jan 2014: Maximum TimeWeight is 90 days. - nTimeWeight = min((int64)nTimeTx - txPrev.nTime - nStakeMinAge, (int64)nStakeMaxAge); - } - else - { - // Current rule: Maximum TimeWeight is 60 days. - nTimeWeight = min((int64)nTimeTx - txPrev.nTime, (int64)nStakeMaxAge) - nStakeMinAge; - } - - CBigNum bnCoinDayWeight = CBigNum(nValueIn) * nTimeWeight / COIN / (24 * 60 * 60); + CBigNum bnCoinDayWeight = CBigNum(nValueIn) * GetWeight((int64)txPrev.nTime, (int64)nTimeTx) / COIN / (24 * 60 * 60); targetProofOfStake = (bnCoinDayWeight * bnTargetPerCoinDay).getuint256(); // Calculate hash @@ -319,8 +314,7 @@ bool CheckStakeKernelHash(unsigned int nBits, const CBlock& blockFrom, unsigned DateTimeStrFormat(nStakeModifierTime).c_str(), mapBlockIndex[hashBlockFrom]->nHeight, DateTimeStrFormat(blockFrom.GetBlockTime()).c_str()); - printf("CheckStakeKernelHash() : check protocol=%s modifier=0x%016"PRI64x" nTimeBlockFrom=%u nTxPrevOffset=%u nTimeTxPrev=%u nPrevout=%u nTimeTx=%u hashProof=%s\n", - "0.3", + printf("CheckStakeKernelHash() : check modifier=0x%016"PRI64x" nTimeBlockFrom=%u nTxPrevOffset=%u nTimeTxPrev=%u nPrevout=%u nTimeTx=%u hashProof=%s\n", nStakeModifier, nTimeBlockFrom, nTxPrevOffset, txPrev.nTime, prevout.n, nTimeTx, hashProofOfStake.ToString().c_str()); @@ -336,8 +330,7 @@ bool CheckStakeKernelHash(unsigned int nBits, const CBlock& blockFrom, unsigned DateTimeStrFormat(nStakeModifierTime).c_str(), mapBlockIndex[hashBlockFrom]->nHeight, DateTimeStrFormat(blockFrom.GetBlockTime()).c_str()); - printf("CheckStakeKernelHash() : pass protocol=%s modifier=0x%016"PRI64x" nTimeBlockFrom=%u nTxPrevOffset=%u nTimeTxPrev=%u nPrevout=%u nTimeTx=%u hashProof=%s\n", - "0.3", + printf("CheckStakeKernelHash() : pass modifier=0x%016"PRI64x" nTimeBlockFrom=%u nTxPrevOffset=%u nTimeTxPrev=%u nPrevout=%u nTimeTx=%u hashProof=%s\n", nStakeModifier, nTimeBlockFrom, nTxPrevOffset, txPrev.nTime, prevout.n, nTimeTx, hashProofOfStake.ToString().c_str()); @@ -360,7 +353,6 @@ bool CheckProofOfStake(const CTransaction& tx, unsigned int nBits, uint256& hash CTxIndex txindex; if (!txPrev.ReadFromDisk(txdb, txin.prevout, txindex)) return tx.DoS(1, error("CheckProofOfStake() : INFO: read txPrev failed")); // previous transaction not in main chain, may occur during initial download - txdb.Close(); // Verify signature if (!VerifySignature(txPrev, tx, 0, true, 0)) @@ -377,13 +369,6 @@ bool CheckProofOfStake(const CTransaction& tx, unsigned int nBits, uint256& hash return true; } -// Check whether the coinstake timestamp meets protocol -bool CheckCoinStakeTimestamp(int64 nTimeBlock, int64 nTimeTx) -{ - // v0.3 protocol - return (nTimeBlock == nTimeTx); -} - // Get stake modifier checksum unsigned int GetStakeModifierChecksum(const CBlockIndex* pindex) {