X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fmain.h;h=2cde696683e1915e0d1df2e18e07aa9f12d34c54;hb=4f6b3161b2dc18c9a3d4143d63fbbd0737296eb0;hp=92bfd77ac8553ee1c111e3671ffd43235ea0cb3d;hpb=8bb29178006eafab89b9c2106bdcd0dd75f21b94;p=novacoin.git diff --git a/src/main.h b/src/main.h index 92bfd77..2cde696 100644 --- a/src/main.h +++ b/src/main.h @@ -32,13 +32,13 @@ static const unsigned int MAX_BLOCK_SIZE = 1000000; static const unsigned int MAX_BLOCK_SIZE_GEN = MAX_BLOCK_SIZE/2; static const unsigned int MAX_BLOCK_SIGOPS = MAX_BLOCK_SIZE/50; static const unsigned int MAX_ORPHAN_TRANSACTIONS = MAX_BLOCK_SIZE/100; -static const int64 MIN_TX_FEE = 10000; -static const int64 MIN_RELAY_TX_FEE = 10000; +static const int64 MIN_TX_FEE = CENT; +static const int64 MIN_RELAY_TX_FEE = CENT; static const int64 MAX_MONEY = 2000000000 * COIN; static const int64 MAX_MINT_PROOF_OF_WORK = 9999 * COIN; static const int64 MIN_TXOUT_AMOUNT = MIN_TX_FEE; inline bool MoneyRange(int64 nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); } -static const int COINBASE_MATURITY = 100; +static const int COINBASE_MATURITY_PPC = 500; // Threshold for nLockTime: below this value it is interpreted as block number, otherwise as UNIX timestamp. static const int LOCKTIME_THRESHOLD = 500000000; // Tue Nov 5 00:53:20 1985 UTC #ifdef USE_UPNP @@ -47,8 +47,8 @@ static const int fHaveUPnP = true; static const int fHaveUPnP = false; #endif -static const uint256 hashGenesisBlockOfficial("0x000000007c82d1f0aa2896b01bf533a8cc26a1f44790be4ceb4ecde7bee24add"); -static const uint256 hashGenesisBlockTestNet("0x00000007199508e34a9ff81e6ec0c477a4cccff2a4767a8eee39c11db367b008"); +static const uint256 hashGenesisBlockOfficial("0x0000000032fe677166d54963b62a4677d8957e87c508eaa4fd7eb1c880cd27e3"); +static const uint256 hashGenesisBlockTestNet("0x00000001f757bb737f6596503e17cd17b0658ce630cc727c0cca81aec47c9f06"); extern CScript COINBASE_FLAGS; @@ -61,15 +61,18 @@ extern CCriticalSection cs_main; extern std::map mapBlockIndex; extern std::set > setStakeSeen; extern uint256 hashGenesisBlock; +extern unsigned int nStakeMinAge; +extern int nCoinbaseMaturity; extern CBlockIndex* pindexGenesisBlock; extern int nBestHeight; -extern uint64 nBestChainTrust; -extern uint64 nBestInvalidTrust; +extern CBigNum bnBestChainTrust; +extern CBigNum bnBestInvalidTrust; extern uint256 hashBestChain; extern CBlockIndex* pindexBest; extern unsigned int nTransactionsUpdated; extern uint64 nLastBlockTx; extern uint64 nLastBlockSize; +extern int64 nLastCoinStakeSearchInterval; extern const std::string strMessageMagic; extern double dHashesPerSec; extern int64 nHPSTimerStart; @@ -105,12 +108,12 @@ void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& void FormatHashBuffers(CBlock* pblock, char* pmidstate, char* pdata, char* phash1); bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey); bool CheckProofOfWork(uint256 hash, unsigned int nBits); +int64 GetProofOfWorkReward(unsigned int nBits); int64 GetProofOfStakeReward(int64 nCoinAge); unsigned int ComputeMinWork(unsigned int nBase, int64 nTime); int GetNumBlocksOfPeers(); bool IsInitialBlockDownload(); std::string GetWarnings(std::string strFor); -bool Reorganize(CTxDB& txdb, CBlockIndex* pindexNew); uint256 WantedByOrphan(const CBlock* pblockOrphan); const CBlockIndex* GetLastBlockIndex(const CBlockIndex* pindex, bool fProofOfStake); void BitcoinMiner(CWallet *pwallet, bool fProofOfStake); @@ -290,6 +293,11 @@ public: return !(a == b); } + std::string ToStringShort() const + { + return strprintf(" %s %d", prevout.hash.ToString().c_str(), prevout.n); + } + std::string ToString() const { std::string str; @@ -378,12 +386,17 @@ public: return !(a == b); } + std::string ToStringShort() const + { + return strprintf(" out %s %s", FormatMoney(nValue).c_str(), scriptPubKey.ToString(true).c_str()); + } + std::string ToString() const { if (IsEmpty()) return "CTxOut(empty)"; if (scriptPubKey.size() < 6) return "CTxOut(error)"; - return strprintf("CTxOut(nValue=%s, scriptPubKey=%s)", FormatMoney(nValue).c_str(), scriptPubKey.ToString().substr(0,30).c_str()); + return strprintf("CTxOut(nValue=%s, scriptPubKey=%s)", FormatMoney(nValue).c_str(), scriptPubKey.ToString().c_str()); } void print() const @@ -503,13 +516,13 @@ public: bool IsCoinBase() const { - return (vin.size() == 1 && vin[0].prevout.IsNull() && vout.size() == 1); + return (vin.size() == 1 && vin[0].prevout.IsNull() && vout.size() >= 1); } bool IsCoinStake() const { // ppcoin: the coin stake transaction is marked with the first output empty - return (vin.size() > 0 && vout.size() == 2 && vout[0].IsEmpty()); + return (vin.size() > 0 && (!vin[0].prevout.IsNull()) && vout.size() >= 2 && vout[0].IsEmpty()); } /** Check for standard transaction types @@ -660,6 +673,13 @@ public: } + std::string ToStringShort() const + { + std::string str; + str += strprintf("%s %s", GetHash().ToString().c_str(), IsCoinBase()? "base" : (IsCoinStake()? "stake" : "user")); + return str; + } + std::string ToString() const { std::string str; @@ -1018,6 +1038,8 @@ public: return error("CBlock::WriteToDisk() : AppendBlockFile failed"); // Write index header + unsigned char pchMessageStart[4]; + GetMessageStart(pchMessageStart, true); unsigned int nSize = fileout.GetSerializeSize(*this); fileout << FLATDATA(pchMessageStart) << nSize; @@ -1127,8 +1149,10 @@ public: CBlockIndex* pnext; unsigned int nFile; unsigned int nBlockPos; - uint64 nChainTrust;// ppcoin: trust score of chain, in the unit of coin-days + CBigNum bnChainTrust; // ppcoin: trust score of block chain int nHeight; + int64 nMint; + int64 nMoneySupply; bool fProofOfStake; // ppcoin: is the block of proof-of-stake type COutPoint prevoutStake; unsigned int nStakeTime; @@ -1149,7 +1173,9 @@ public: nFile = 0; nBlockPos = 0; nHeight = 0; - nChainTrust = 0; + bnChainTrust = 0; + nMint = 0; + nMoneySupply = 0; fProofOfStake = true; prevoutStake.SetNull(); nStakeTime = 0; @@ -1169,7 +1195,9 @@ public: nFile = nFileIn; nBlockPos = nBlockPosIn; nHeight = 0; - nChainTrust = 0; + bnChainTrust = 0; + nMint = 0; + nMoneySupply = 0; fProofOfStake = block.IsProofOfStake(); if (fProofOfStake) { @@ -1212,9 +1240,13 @@ public: return (int64)nTime; } - int64 GetBlockTrust() const + CBigNum GetBlockTrust() const { - return (nChainTrust - (pprev? pprev->nChainTrust : 0)); + CBigNum bnTarget; + bnTarget.SetCompact(nBits); + if (bnTarget <= 0) + return 0; + return (fProofOfStake? (CBigNum(1)<<256) / (bnTarget+1) : 1); } bool IsInMainChain() const @@ -1282,8 +1314,9 @@ public: std::string ToString() const { - return strprintf("CBlockIndex(nprev=%08x, pnext=%08x, nFile=%d, nBlockPos=%-6d nChainTrust=%"PRI64d" nHeight=%d, fProofOfStake=%d prevoutStake=(%s), nStakeTime=%d merkle=%s, hashBlock=%s)", - pprev, pnext, nFile, nBlockPos, nChainTrust, nHeight, + return strprintf("CBlockIndex(nprev=%08x, pnext=%08x, nFile=%d, nBlockPos=%-6d nHeight=%d, nMint=%s, nMoneySupply=%s, fProofOfStake=%d prevoutStake=(%s), nStakeTime=%d merkle=%s, hashBlock=%s)", + pprev, pnext, nFile, nBlockPos, nHeight, + FormatMoney(nMint).c_str(), FormatMoney(nMoneySupply).c_str(), fProofOfStake, prevoutStake.ToString().c_str(), nStakeTime, hashMerkleRoot.ToString().substr(0,10).c_str(), GetBlockHash().ToString().substr(0,20).c_str()); @@ -1324,8 +1357,9 @@ public: READWRITE(hashNext); READWRITE(nFile); READWRITE(nBlockPos); - READWRITE(nChainTrust); READWRITE(nHeight); + READWRITE(nMint); + READWRITE(nMoneySupply); READWRITE(fProofOfStake); if (fProofOfStake) { @@ -1705,7 +1739,7 @@ public: bool CheckSignature() { CKey key; - if (!key.SetPubKey(ParseHex("0487ca85b6ae9d311f996c7616d20d0c88a5b4f07d25e78f419019f35cce6522acf978b2d99f0e7a58db1f120439e5c1889266927854aa57c93956c2569188a539"))) + if (!key.SetPubKey(ParseHex("04a0a849dd49b113d3179a332dd77715c43be4d0076e2f19e66de23dd707e56630f792f298dfd209bf042bb3561f4af6983f3d81e439737ab0bf7f898fecd21aab"))) return error("CAlert::CheckSignature() : SetPubKey failed"); if (!key.Verify(Hash(vchMsg.begin(), vchMsg.end()), vchSig)) return error("CAlert::CheckSignature() : verify signature failed");