X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fmain.h;h=56ce0e4c11aed3f2c18c3b4e0f89e9d3ecbe9b96;hb=3176e0f244d929669aa3e1d81e0787d82d9150d3;hp=34ec560c33258966e7b36e22a42273f6cb0b2430;hpb=6b0e5bf1425e8d96732cc7133aee048c2a35d17c;p=novacoin.git diff --git a/src/main.h b/src/main.h index 34ec560..56ce0e4 100644 --- a/src/main.h +++ b/src/main.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2012 The Bitcoin developers -// Copyright (c) 2011-2012 The PPCoin developers +// Copyright (c) 2011-2013 The PPCoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef BITCOIN_MAIN_H @@ -9,6 +9,7 @@ #include "bignum.h" #include "net.h" #include "script.h" +#include "scrypt_mine.h" #ifdef WIN32 #include /* for _commit */ @@ -35,20 +36,26 @@ static const unsigned int MAX_ORPHAN_TRANSACTIONS = MAX_BLOCK_SIZE/100; 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 MAX_MINT_PROOF_OF_WORK = 100 * 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 = 500; +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 +static const int STAKE_TARGET_SPACING = 10 * 60; // 10-minute block spacing +static const int STAKE_MIN_AGE = 60 * 60 * 24 * 30; // minimum age for coin age +static const int STAKE_MAX_AGE = 60 * 60 * 24 * 90; // stake age of full weight + #ifdef USE_UPNP static const int fHaveUPnP = true; #else static const int fHaveUPnP = false; #endif -static const uint256 hashGenesisBlockOfficial("0x0000000032fe677166d54963b62a4677d8957e87c508eaa4fd7eb1c880cd27e3"); -static const uint256 hashGenesisBlockTestNet("0x00000001f757bb737f6596503e17cd17b0658ce630cc727c0cca81aec47c9f06"); +static const uint256 hashGenesisBlockOfficial("0x00000a060336cbb72fe969666d337b87198b1add2abaa59cca226820b32933a4"); +static const uint256 hashGenesisBlockTestNet("0x00000a060336cbb72fe969666d337b87198b1add2abaa59cca226820b32933a4"); + +static const int64 nMaxClockDrift = 2 * 60 * 60; // two hours extern CScript COINBASE_FLAGS; @@ -72,6 +79,7 @@ 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; @@ -387,7 +395,7 @@ public: std::string ToStringShort() const { - return strprintf(" out amount %s", FormatMoney(nValue).c_str()); + return strprintf(" out %s %s", FormatMoney(nValue).c_str(), scriptPubKey.ToString(true).c_str()); } std::string ToString() const @@ -395,7 +403,7 @@ public: 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 @@ -740,7 +748,6 @@ public: bool CheckTransaction() const; bool AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs=true, bool* pfMissingInputs=NULL); bool GetCoinAge(CTxDB& txdb, uint64& nCoinAge) const; // ppcoin: get transaction coin age - bool CheckProofOfStake(unsigned int nBits) const; protected: const CTxOut& GetOutputFor(const CTxIn& input, const MapPrevTx& inputs) const; @@ -884,7 +891,7 @@ public: // network and disk std::vector vtx; - // ppcoin: block signature - signed by coin base txout[0]'s owner + // ppcoin: block signature - signed by one of the coin base txout[N]'s owner std::vector vchBlockSig; // memory only @@ -924,7 +931,7 @@ public: void SetNull() { - nVersion = 1; + nVersion = 2; hashPrevBlock = 0; hashMerkleRoot = 0; nTime = 0; @@ -943,9 +950,17 @@ public: uint256 GetHash() const { - return Hash(BEGIN(nVersion), END(nNonce)); + uint256 thash; + void * scratchbuff = scrypt_buffer_alloc(); + + scrypt_hash(CVOIDBEGIN(nVersion), sizeof(block_header), UINTBEGIN(thash), scratchbuff); + + scrypt_buffer_free(scratchbuff); + + return thash; } + int64 GetBlockTime() const { return (int64)nTime; @@ -953,6 +968,18 @@ public: void UpdateTime(const CBlockIndex* pindexPrev); + // ppcoin: entropy bit for stake modifier if chosen by modifier + unsigned int GetStakeEntropyBit() const + { + uint160 hashSig = Hash160(vchBlockSig); + if (fDebug && GetBoolArg("-printstakemodifier")) + printf("GetStakeEntropyBit: hashSig=%s", hashSig.ToString().c_str()); + hashSig >>= 159; // take the first bit of the hash + if (fDebug && GetBoolArg("-printstakemodifier")) + printf(" entropybit=%d\n", hashSig.Get64()); + return hashSig.Get64(); + } + // ppcoin: two types of block: proof-of-work or proof-of-stake bool IsProofOfStake() const { @@ -1152,9 +1179,22 @@ public: int nHeight; int64 nMint; int64 nMoneySupply; - bool fProofOfStake; // ppcoin: is the block of proof-of-stake type + + unsigned int nFlags; // ppcoin: block index flags + enum + { + BLOCK_PROOF_OF_STAKE = (1 << 0), // is proof-of-stake block + BLOCK_STAKE_ENTROPY = (1 << 1), // entropy bit for stake modifier + BLOCK_STAKE_MODIFIER = (1 << 2), // regenerated stake modifier + }; + + uint64 nStakeModifier; // hash modifier for proof-of-stake + unsigned int nStakeModifierChecksum; // checksum of index; in-memeory only + + // proof-of-stake specific fields COutPoint prevoutStake; unsigned int nStakeTime; + uint256 hashProofOfStake; // block header int nVersion; @@ -1175,7 +1215,10 @@ public: bnChainTrust = 0; nMint = 0; nMoneySupply = 0; - fProofOfStake = true; + nFlags = 0; + nStakeModifier = 0; + nStakeModifierChecksum = 0; + hashProofOfStake = 0; prevoutStake.SetNull(); nStakeTime = 0; @@ -1197,9 +1240,13 @@ public: bnChainTrust = 0; nMint = 0; nMoneySupply = 0; - fProofOfStake = block.IsProofOfStake(); - if (fProofOfStake) + nFlags = 0; + nStakeModifier = 0; + nStakeModifierChecksum = 0; + hashProofOfStake = 0; + if (block.IsProofOfStake()) { + SetProofOfStake(); prevoutStake = block.vtx[1].vin[0].prevout; nStakeTime = block.vtx[1].nTime; } @@ -1245,7 +1292,7 @@ public: bnTarget.SetCompact(nBits); if (bnTarget <= 0) return 0; - return (fProofOfStake? (CBigNum(1)<<256) / (bnTarget+1) : 1); + return (IsProofOfStake()? (CBigNum(1)<<256) / (bnTarget+1) : 1); } bool IsInMainChain() const @@ -1255,7 +1302,7 @@ public: bool CheckIndex() const { - return IsProofOfWork() ? CheckProofOfWork(GetBlockHash(), nBits) : true; + return true; } bool EraseBlockFromDisk() @@ -1303,20 +1350,53 @@ public: bool IsProofOfWork() const { - return !fProofOfStake; + return !(nFlags & BLOCK_PROOF_OF_STAKE); } bool IsProofOfStake() const { - return fProofOfStake; + return (nFlags & BLOCK_PROOF_OF_STAKE); + } + + void SetProofOfStake() + { + nFlags |= BLOCK_PROOF_OF_STAKE; + } + + unsigned int GetStakeEntropyBit() const + { + return ((nFlags & BLOCK_STAKE_ENTROPY) >> 1); + } + + bool SetStakeEntropyBit(unsigned int nEntropyBit) + { + if (nEntropyBit > 1) + return false; + nFlags |= (nEntropyBit? BLOCK_STAKE_ENTROPY : 0); + return true; + } + + bool GeneratedStakeModifier() const + { + return (nFlags & BLOCK_STAKE_MODIFIER); + } + + void SetStakeModifier(uint64 nModifier, bool fGeneratedStakeModifier) + { + nStakeModifier = nModifier; + if (fGeneratedStakeModifier) + nFlags |= BLOCK_STAKE_MODIFIER; } std::string ToString() const { - 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)", + return strprintf("CBlockIndex(nprev=%08x, pnext=%08x, nFile=%d, nBlockPos=%-6d nHeight=%d, nMint=%s, nMoneySupply=%s, nFlags=(%s)(%d)(%s), nStakeModifier=%016"PRI64x", nStakeModifierChecksum=%08x, hashProofOfStake=%s, 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, + GeneratedStakeModifier() ? "MOD" : "-", GetStakeEntropyBit(), IsProofOfStake()? "PoS" : "PoW", + nStakeModifier, nStakeModifierChecksum, + hashProofOfStake.ToString().c_str(), + prevoutStake.ToString().c_str(), nStakeTime, hashMerkleRoot.ToString().substr(0,10).c_str(), GetBlockHash().ToString().substr(0,20).c_str()); } @@ -1359,16 +1439,19 @@ public: READWRITE(nHeight); READWRITE(nMint); READWRITE(nMoneySupply); - READWRITE(fProofOfStake); - if (fProofOfStake) + READWRITE(nFlags); + READWRITE(nStakeModifier); + if (IsProofOfStake()) { READWRITE(prevoutStake); READWRITE(nStakeTime); + READWRITE(hashProofOfStake); } else if (fRead) { const_cast(this)->prevoutStake.SetNull(); const_cast(this)->nStakeTime = 0; + const_cast(this)->hashProofOfStake = 0; } // block header @@ -1738,7 +1821,7 @@ public: bool CheckSignature() { CKey key; - if (!key.SetPubKey(ParseHex("04a0a849dd49b113d3179a332dd77715c43be4d0076e2f19e66de23dd707e56630f792f298dfd209bf042bb3561f4af6983f3d81e439737ab0bf7f898fecd21aab"))) + if (!key.SetPubKey(ParseHex("043fa441fd4203d03f5df2b75ea14e36f20d39f43e7a61aa7552ab9bcd7ecb0e77a3be4585b13fcdaa22ef6e51f1ff6f2929bec2494385b086fb86610e33193195"))) return error("CAlert::CheckSignature() : SetPubKey failed"); if (!key.Verify(Hash(vchMsg.begin(), vchMsg.end()), vchSig)) return error("CAlert::CheckSignature() : verify signature failed");