X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fkernel.h;h=464e401c8a7eae0710120f18f7ea82644f23ad97;hb=cecf7a56ed5a5efd939b21c760c69da616306005;hp=5cfa9466b79d3fe0255ad626f1a9f8f10992d087;hpb=9958f531a04f41133dfb10ff14c1422164ec1080;p=novacoin.git diff --git a/src/kernel.h b/src/kernel.h index 5cfa946..464e401 100644 --- a/src/kernel.h +++ b/src/kernel.h @@ -11,9 +11,7 @@ extern unsigned int nModifierUpgradeTime; // MODIFIER_INTERVAL: time to elapse before new modifier is computed -extern const unsigned int nModifierInterval; - -extern bool fCoinsDataActual; +extern unsigned int nModifierInterval; // MODIFIER_INTERVAL_RATIO: // ratio of group interval length between the last group and the first group @@ -23,45 +21,39 @@ static const int MODIFIER_INTERVAL_RATIO = 3; bool IsFixedModifierInterval(unsigned int nTimeBlock); // Compute the hash modifier for proof-of-stake -bool ComputeNextStakeModifier(const CBlockIndex* pindexCurrent, uint64& nStakeModifier, bool& fGeneratedStakeModifier); +bool ComputeNextStakeModifier(const CBlockIndex* pindexCurrent, uint64_t& nStakeModifier, bool& fGeneratedStakeModifier); // The stake modifier used to hash for a stake kernel is chosen as the stake // modifier about a selection interval later than the coin generating the kernel -bool GetKernelStakeModifier(uint256 hashBlockFrom, uint64& nStakeModifier); +bool GetKernelStakeModifier(uint256 hashBlockFrom, uint64_t& nStakeModifier); // Check whether stake kernel meets hash target // Sets hashProofOfStake on success return -bool CheckStakeKernelHash(unsigned int nBits, const CBlock& blockFrom, unsigned int nTxPrevOffset, const CTransaction& txPrev, const COutPoint& prevout, unsigned int nTimeTx, uint256& hashProofOfStake, uint256& targetProofOfStake, bool fPrintProofOfStake=false); - -// Coins scanning options -typedef struct KernelSearchSettings { - unsigned int nBits; // Packed difficulty - unsigned int nTime; // Basic time - unsigned int nOffset; // Offset inside CoinsSet (isn't used yet) - unsigned int nLimit; // Coins to scan (isn't used yet) - unsigned int nSearchInterval; // Number of seconds allowed to go into the past -} KernelSearchSettings; - -typedef std::set > CoinsSet; +bool CheckStakeKernelHash(unsigned int nBits, const CBlock& blockFrom, uint32_t nTxPrevOffset, const CTransaction& txPrev, const COutPoint& prevout, uint32_t nTimeTx, uint256& hashProofOfStake, uint256& targetProofOfStake, bool fPrintProofOfStake=false); -// Preloaded coins metadata -// txid => ((txindex, (tx, vout.n)), (block, modifier)) -typedef std::map, std::pair >, std::pair > > MetaMap; - -// Scan given coins set for kernel solution -bool ScanForStakeKernelHash(MetaMap &mapMeta, KernelSearchSettings &settings, CoinsSet::value_type &kernelcoin, unsigned int &nTimeTx, unsigned int &nBlockTime); +// Scan given kernel for solutions +bool ScanKernelForward(unsigned char *kernel, uint32_t nBits, uint32_t nInputTxTime, int64_t nValueIn, std::pair &SearchInterval, std::vector > &solutions); // Check kernel hash target and coinstake signature // Sets hashProofOfStake on success return bool CheckProofOfStake(const CTransaction& tx, unsigned int nBits, uint256& hashProofOfStake, uint256& targetProofOfStake); // Get stake modifier checksum -unsigned int GetStakeModifierChecksum(const CBlockIndex* pindex); +uint32_t GetStakeModifierChecksum(const CBlockIndex* pindex); // Check stake modifier hard checkpoints -bool CheckStakeModifierCheckpoints(int nHeight, unsigned int nStakeModifierChecksum); +bool CheckStakeModifierCheckpoints(int nHeight, uint32_t nStakeModifierChecksum); // Get time weight using supplied timestamps -int64 GetWeight(int64 nIntervalBeginning, int64 nIntervalEnd); - -#endif // PPCOIN_KERNEL_H +inline int64_t GetWeight(int64_t nIntervalBeginning, int64_t 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 std::min(nIntervalEnd - nIntervalBeginning - nStakeMinAge, (int64_t)nStakeMaxAge); +} + +#endif // PPCOIN_KERNEL_H \ No newline at end of file