X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fbitcoinrpc.cpp;h=60c5449080955cd272d893dfc8e76d3d15bbcd8d;hb=09f2a990950512cbe418526d91838887a0dded2a;hp=033250fe84ea5602a931c9fd8b906966712e69c9;hpb=d56fde1346ccd32ca6a6e98d9a0a84c8fa9939e7;p=novacoin.git diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index 033250f..60c5449 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -216,10 +216,11 @@ double GetDifficulty() if (pindexBest == NULL) return 1.0; - int nShift = (pindexBest->nBits >> 24) & 0xff; + const CBlockIndex* pindexLastProofOfWork = GetLastBlockIndex(pindexBest, false); + int nShift = (pindexLastProofOfWork->nBits >> 24) & 0xff; double dDiff = - (double)0x0000ffff / (double)(pindexBest->nBits & 0x00ffffff); + (double)0x0000ffff / (double)(pindexLastProofOfWork->nBits & 0x00ffffff); while (nShift < 29) { @@ -306,7 +307,7 @@ Value getinfo(const Array& params, bool fHelp) "Returns an object containing various state info."); Object obj; - obj.push_back(Pair("version", (int)VERSION)); + obj.push_back(Pair("version", FormatFullVersion())); obj.push_back(Pair("balance", ValueFromAmount(pwalletMain->GetBalance()))); obj.push_back(Pair("newmint", ValueFromAmount(pwalletMain->GetNewMint()))); obj.push_back(Pair("stake", ValueFromAmount(pwalletMain->GetStake()))); @@ -1656,14 +1657,14 @@ Value getwork(const Array& params, bool fHelp) nStart = GetTime(); // Create new block - pblock = CreateNewBlock(pwalletMain); + pblock = CreateNewBlock(pwalletMain, true); if (!pblock) throw JSONRPCError(-7, "Out of memory"); vNewBlock.push_back(pblock); } // Update nTime - pblock->nTime = max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime()); + pblock->nTime = max(pblock->GetBlockTime(), GetAdjustedTime()); pblock->nNonce = 0; // Update nExtraNonce @@ -1709,6 +1710,8 @@ Value getwork(const Array& params, bool fHelp) pblock->nNonce = pdata->nNonce; pblock->vtx[0].vin[0].scriptSig = mapNewBlock[pdata->hashMerkleRoot].second; pblock->hashMerkleRoot = pblock->BuildMerkleTree(); + if (!pblock->SignBlock(*pwalletMain)) + throw JSONRPCError(-100, "Unable to sign block"); return CheckWork(pblock, *pwalletMain, reservekey); } @@ -1802,47 +1805,22 @@ Value getmemorypool(const Array& params, bool fHelp) } -// ppcoin: reset auto checkpoint -Value resetcheckpoint(const Array& params, bool fHelp) -{ - if (fHelp || params.size() < 1 || params.size() > 1) - throw runtime_error( - "resetcheckpoint \n" - "Reset automatic checkpoint to specified height.\n" - " is the height of the new checkpoint block.\n"); - - int nCheckpoint = params[0].get_int(); - if (nCheckpoint <= 0 || nCheckpoint >= nBestHeight) - throw runtime_error( - "invalid checkpoint height.\n" - ); - if (nCheckpoint >= Checkpoints::nAutoCheckpoint) - throw runtime_error( - "new checkpoint must be earlier than current auto checkpoint.\n" - ); - if (!Checkpoints::ResetAutoCheckpoint(nCheckpoint)) - throw runtime_error( - "internal error - reset checkpoint failed.\n" - ); - - return Value::null; -} - - -// ppcoin: get branch point of alternative branch -Value getbranchpoint(const Array& params, bool fHelp) +// ppcoin: get information of sync-checkpoint +Value getcheckpoint(const Array& params, bool fHelp) { if (fHelp || params.size() != 0) throw runtime_error( - "getbranchpoint\n" - "Returns height of branch point of alternative branch.\n"); + "getcheckpoint\n" + "Show info of synchronized checkpoint.\n"); Object result; - if (Checkpoints::nBranchPoint > 0) - result.push_back(Pair("branchpoint", Checkpoints::nBranchPoint)); - else - result.push_back(Pair("branchpoint", "none")); - result.push_back(Pair("checkpoint", Checkpoints::nAutoCheckpoint)); + CBlockIndex* pindexCheckpoint; + + result.push_back(Pair("synccheckpoint", Checkpoints::hashSyncCheckpoint.ToString().c_str())); + pindexCheckpoint = mapBlockIndex[Checkpoints::hashSyncCheckpoint]; + result.push_back(Pair("height", pindexCheckpoint->nHeight)); + result.push_back(Pair("timestamp", DateTimeStrFormat("%x %H:%M:%S", pindexCheckpoint->GetBlockTime()).c_str())); + return result; } @@ -1934,10 +1912,23 @@ Value repairwallet(const Array& params, bool fHelp) // ppcoin: make a public-private key pair Value makekeypair(const Array& params, bool fHelp) { + if (fHelp || params.size() > 1) + throw runtime_error( + "makekeypair [prefix]\n" + "Make a public/private key pair.\n" + "[prefix] is optional preferred prefix for the public key.\n"); + + string strPrefix = ""; + if (params.size() > 0) + strPrefix = params[0].get_str(); + CKey key; - key.MakeNewKey(); - CPrivKey vchPrivKey = key.GetPrivKey(); + do + { + key.MakeNewKey(); + } while (strPrefix != HexStr(key.GetPubKey()).substr(0, strPrefix.size())); + CPrivKey vchPrivKey = key.GetPrivKey(); Object result; result.push_back(Pair("PrivateKey", HexStr(vchPrivKey.begin(), vchPrivKey.end()))); result.push_back(Pair("PublicKey", HexStr(key.GetPubKey()))); @@ -2026,6 +2017,13 @@ Value sendcheckpoint(const Array& params, bool fHelp) throw runtime_error( "Provided checkpoint block is not on main chain\n"); } + else + { + checkpoint.hashCheckpoint = Checkpoints::AutoSelectSyncCheckpoint(); + if (checkpoint.hashCheckpoint == Checkpoints::hashSyncCheckpoint) + throw runtime_error( + "Unable to select a more recent sync-checkpoint"); + } CDataStream sMsg; sMsg << (CUnsignedSyncCheckpoint)checkpoint; @@ -2045,7 +2043,11 @@ Value sendcheckpoint(const Array& params, bool fHelp) BOOST_FOREACH(CNode* pnode, vNodes) checkpoint.RelayTo(pnode); - return Value::null; + Object result; + result.push_back(Pair("checkpoint", Checkpoints::hashSyncCheckpoint.ToString().c_str())); + result.push_back(Pair("height", mapBlockIndex[Checkpoints::hashSyncCheckpoint]->nHeight)); + result.push_back(Pair("timestamp", DateTimeStrFormat("%x %H:%M:%S", mapBlockIndex[Checkpoints::hashSyncCheckpoint]->GetBlockTime()).c_str())); + return result; } @@ -2095,8 +2097,7 @@ pair pCallTable[] = make_pair("settxfee", &settxfee), make_pair("getmemorypool", &getmemorypool), make_pair("listsinceblock", &listsinceblock), - make_pair("resetcheckpoint", &resetcheckpoint), - make_pair("getbranchpoint", &getbranchpoint), + make_pair("getcheckpoint", &getcheckpoint), make_pair("reservebalance", &reservebalance), make_pair("checkwallet", &checkwallet), make_pair("repairwallet", &repairwallet), @@ -2129,8 +2130,7 @@ string pAllowInSafeMode[] = "validateaddress", "getwork", "getmemorypool", - "resetcheckpoint", - "getbranchpoint", + "getcheckpoint", }; set setAllowInSafeMode(pAllowInSafeMode, pAllowInSafeMode + sizeof(pAllowInSafeMode)/sizeof(pAllowInSafeMode[0])); @@ -2742,7 +2742,6 @@ int CommandLineRPC(int argc, char *argv[]) params[1] = v.get_obj(); } if (strMethod == "sendmany" && n > 2) ConvertTo(params[2]); - if (strMethod == "resetcheckpoint" && n > 0) ConvertTo(params[0]); if (strMethod == "reservebalance" && n > 0) ConvertTo(params[0]); if (strMethod == "reservebalance" && n > 1) ConvertTo(params[1]);