using namespace std;
extern void TxToJSON(const CTransaction& tx, const uint256 hashBlock, json_spirit::Object& entry);
+extern enum Checkpoints::CPMode CheckpointsMode;
double GetDifficulty(const CBlockIndex* blockindex)
{
return dDiff;
}
+double GetPoWMHashPS()
+{
+ int nPoWInterval = 72;
+ int64_t nTargetSpacingWorkMin = 30, nTargetSpacingWork = 30;
+
+ CBlockIndex* pindex = pindexGenesisBlock;
+ CBlockIndex* pindexPrevWork = pindexGenesisBlock;
+
+ while (pindex)
+ {
+ if (pindex->IsProofOfWork())
+ {
+ int64_t nActualSpacingWork = pindex->GetBlockTime() - pindexPrevWork->GetBlockTime();
+ nTargetSpacingWork = ((nPoWInterval - 1) * nTargetSpacingWork + nActualSpacingWork + nActualSpacingWork) / (nPoWInterval + 1);
+ nTargetSpacingWork = max(nTargetSpacingWork, nTargetSpacingWorkMin);
+ pindexPrevWork = pindex;
+ }
+
+ pindex = pindex->pnext;
+ }
+
+ return GetDifficulty() * 4294.967296 / nTargetSpacingWork;
+}
+
+double GetPoSKernelPS()
+{
+ int nPoSInterval = 72;
+ double dStakeKernelsTriedAvg = 0;
+ int nStakesHandled = 0, nStakesTime = 0;
+
+ CBlockIndex* pindex = pindexBest;;
+ CBlockIndex* pindexPrevStake = NULL;
+
+ while (pindex && nStakesHandled < nPoSInterval)
+ {
+ if (pindex->IsProofOfStake())
+ {
+ dStakeKernelsTriedAvg += GetDifficulty(pindex) * 4294967296.0;
+ nStakesTime += pindexPrevStake ? (pindexPrevStake->nTime - pindex->nTime) : 0;
+ pindexPrevStake = pindex;
+ nStakesHandled++;
+ }
+
+ pindex = pindex->pprev;
+ }
+
+ if (!nStakesHandled)
+ return 0;
+
+ return dStakeKernelsTriedAvg / nStakesTime;
+}
Object blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool fPrintTransactionDetail)
{
result.push_back(Pair("nonce", (boost::uint64_t)block.nNonce));
result.push_back(Pair("bits", HexBits(block.nBits)));
result.push_back(Pair("difficulty", GetDifficulty(blockindex)));
-
+ result.push_back(Pair("blocktrust", leftTrim(blockindex->GetBlockTrust().GetHex(), '0')));
+ result.push_back(Pair("chaintrust", leftTrim(blockindex->nChainTrust.GetHex(), '0')));
if (blockindex->pprev)
result.push_back(Pair("previousblockhash", blockindex->pprev->GetBlockHash().GetHex()));
if (blockindex->pnext)
result.push_back(Pair("flags", strprintf("%s%s", blockindex->IsProofOfStake()? "proof-of-stake" : "proof-of-work", blockindex->GeneratedStakeModifier()? " stake-modifier": "")));
result.push_back(Pair("proofhash", blockindex->IsProofOfStake()? blockindex->hashProofOfStake.GetHex() : blockindex->GetBlockHash().GetHex()));
result.push_back(Pair("entropybit", (int)blockindex->GetStakeEntropyBit()));
- result.push_back(Pair("modifier", strprintf("%016"PRI64x, blockindex->nStakeModifier)));
+ result.push_back(Pair("modifier", strprintf("%016" PRIx64, blockindex->nStakeModifier)));
result.push_back(Pair("modifierchecksum", strprintf("%08x", blockindex->nStakeModifierChecksum)));
Array txinfo;
BOOST_FOREACH (const CTransaction& tx, block.vtx)
{
if (fPrintTransactionDetail)
{
- Object entry;
+ CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
+ ssTx << tx;
+ string strHex = HexStr(ssTx.begin(), ssTx.end());
- entry.push_back(Pair("txid", tx.GetHash().GetHex()));
- TxToJSON(tx, 0, entry);
-
- txinfo.push_back(entry);
+ txinfo.push_back(strHex);
}
else
txinfo.push_back(tx.GetHash().GetHex());
result.push_back(Pair("tx", txinfo));
- if (!fTestNet && block.GetBlockTime() < CHAINCHECKS_SWITCH_TIME)
+ if ( block.IsProofOfStake() || (!fTestNet && block.GetBlockTime() < ENTROPY_SWITCH_TIME) )
result.push_back(Pair("signature", HexStr(block.vchBlockSig.begin(), block.vchBlockSig.end())));
return result;
}
+Value getbestblockhash(const Array& params, bool fHelp)
+{
+ if (fHelp || params.size() != 0)
+ throw runtime_error(
+ "getbestblockhash\n"
+ "Returns the hash of the best block in the longest block chain.");
+
+ return hashBestChain.GetHex();
+}
Value getblockcount(const Array& params, bool fHelp)
{
if (fHelp || params.size() < 1 || params.size() > 1 || AmountFromValue(params[0]) < MIN_TX_FEE)
throw runtime_error(
"settxfee <amount>\n"
- "<amount> is a real and is rounded to the nearest 0.01");
+ "<amount> is a real and is rounded to the nearest " + FormatMoney(MIN_TX_FEE));
nTransactionFee = AmountFromValue(params[0]);
- nTransactionFee = (nTransactionFee / CENT) * CENT; // round to cent
+ nTransactionFee = (nTransactionFee / MIN_TX_FEE) * MIN_TX_FEE; // round to minimum fee
return true;
}
return blockToJSON(block, pblockindex, params.size() > 1 ? params[1].get_bool() : false);
}
-// ppcoin: get information of sync-checkpoint
+// get information of sync-checkpoint
Value getcheckpoint(const Array& params, bool fHelp)
{
if (fHelp || params.size() != 0)
CBlockIndex* pindexCheckpoint;
result.push_back(Pair("synccheckpoint", Checkpoints::hashSyncCheckpoint.ToString().c_str()));
- pindexCheckpoint = mapBlockIndex[Checkpoints::hashSyncCheckpoint];
+ pindexCheckpoint = mapBlockIndex[Checkpoints::hashSyncCheckpoint];
result.push_back(Pair("height", pindexCheckpoint->nHeight));
result.push_back(Pair("timestamp", DateTimeStrFormat(pindexCheckpoint->GetBlockTime()).c_str()));
+
+ if (Checkpoints::checkpointMessage.vchSig.size() != 0)
+ {
+ Object msgdata;
+ CUnsignedSyncCheckpoint checkpoint;
+
+ CDataStream sMsg(Checkpoints::checkpointMessage.vchMsg, SER_NETWORK, PROTOCOL_VERSION);
+ sMsg >> checkpoint;
+
+ Object parsed; // message version and data (block hash)
+ parsed.push_back(Pair("version", checkpoint.nVersion));
+ parsed.push_back(Pair("hash", checkpoint.hashCheckpoint.GetHex().c_str()));
+ msgdata.push_back(Pair("parsed", parsed));
+
+ Object raw; // raw checkpoint message data
+ raw.push_back(Pair("data", HexStr(Checkpoints::checkpointMessage.vchMsg).c_str()));
+ raw.push_back(Pair("signature", HexStr(Checkpoints::checkpointMessage.vchSig).c_str()));
+ msgdata.push_back(Pair("raw", raw));
+
+ result.push_back(Pair("data", msgdata));
+ }
+
+ // Check that the block satisfies synchronized checkpoint
+ if (CheckpointsMode == Checkpoints::STRICT)
+ result.push_back(Pair("policy", "strict"));
+
+ if (CheckpointsMode == Checkpoints::ADVISORY)
+ result.push_back(Pair("policy", "advisory"));
+
+ if (CheckpointsMode == Checkpoints::PERMISSIVE)
+ result.push_back(Pair("policy", "permissive"));
+
if (mapArgs.count("-checkpointkey"))
result.push_back(Pair("checkpointmaster", true));
git://git.novaco.in / novacoin.git / blobdiff