extern uint256 hashGenesisBlock;
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;
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
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;
nFile = 0;
nBlockPos = 0;
nHeight = 0;
- nChainTrust = 0;
+ bnChainTrust = 0;
+ nMint = 0;
+ nMoneySupply = 0;
fProofOfStake = true;
prevoutStake.SetNull();
nStakeTime = 0;
nFile = nFileIn;
nBlockPos = nBlockPosIn;
nHeight = 0;
- nChainTrust = 0;
+ bnChainTrust = 0;
+ nMint = 0;
+ nMoneySupply = 0;
fProofOfStake = block.IsProofOfStake();
if (fProofOfStake)
{
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
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());
READWRITE(hashNext);
READWRITE(nFile);
READWRITE(nBlockPos);
- READWRITE(nChainTrust);
READWRITE(nHeight);
+ READWRITE(nMint);
+ READWRITE(nMoneySupply);
READWRITE(fProofOfStake);
if (fProofOfStake)
{