Permalink
Browse files

remove unused synccheckpoint code, fix C99 macro syntax, upgrade to hp14

  • Loading branch information...
gjhiggins committed Apr 3, 2018
1 parent 692c69f commit d778f711438a248bf12857e2da3a5fc961aa82b4
Showing with 399 additions and 1,016 deletions.
  1. +286 −77 datacoin-qt.pro
  2. +1 −11 src/bitcoinrpc.cpp
  3. +0 −4 src/bitcoinrpc.h
  4. +0 −3 src/checkpoints.h
  5. +0 −558 src/checkpointsync.cpp
  6. +0 −131 src/checkpointsync.h
  7. +6 −6 src/clientversion.h
  8. +19 −21 src/init.cpp
  9. +32 −121 src/main.cpp
  10. +6 −5 src/main.h
  11. +5 −6 src/makefile.unix
  12. +21 −28 src/net.cpp
  13. +1 −3 src/net.h
  14. +11 −7 src/prime.cpp
  15. +3 −1 src/prime.h
  16. +1 −0 src/rpcblockchain.cpp
  17. +3 −3 src/rpcmining.cpp
  18. +1 −1 src/rpcnet.cpp
  19. +0 −21 src/txdb.cpp
  20. +0 −6 src/txdb.h
  21. +3 −3 src/walletdb.cpp
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -260,11 +260,7 @@ static const CRPCCommand vRPCCommands[] =
{ "listsinceblock", &listsinceblock, false, false },
{ "dumpprivkey", &dumpprivkey, true, false },
{ "importprivkey", &importprivkey, false, false },
{ "getcheckpoint", &getcheckpoint, true, false },
{ "sendcheckpoint", &sendcheckpoint, true, false },
{ "enforcecheckpoint", &enforcecheckpoint, true, false },
{ "makekeypair", &makekeypair, true, false },
{ "sendalert", &sendalert, true, false },
{ "listunspent", &listunspent, false, false },
{ "getrawtransaction", &getrawtransaction, false, false },
{ "createrawtransaction", &createrawtransaction, false, false },
@@ -366,7 +362,7 @@ static string HTTPReply(int nStatus, const string& strMsg, bool keepalive)
"HTTP/1.1 %d %s\r\n"
"Date: %s\r\n"
"Connection: %s\r\n"
"Content-Length: %"PRIszu"\r\n"
"Content-Length: %" PRIszu"\r\n"
"Content-Type: application/json\r\n"
"Server: datacoin-json-rpc/%s\r\n"
"\r\n"
@@ -1184,12 +1180,6 @@ Array RPCConvertValues(const std::string &strMethod, const std::vector<std::stri
if (strMethod == "walletpassphrase" && n > 1) ConvertTo<boost::int64_t>(params[1]);
if (strMethod == "getblocktemplate" && n > 0) ConvertTo<Object>(params[0]);
if (strMethod == "listsinceblock" && n > 1) ConvertTo<boost::int64_t>(params[1]);
if (strMethod == "sendalert" && n > 2) ConvertTo<boost::int64_t>(params[2]);
if (strMethod == "sendalert" && n > 3) ConvertTo<boost::int64_t>(params[3]);
if (strMethod == "sendalert" && n > 4) ConvertTo<boost::int64_t>(params[4]);
if (strMethod == "sendalert" && n > 5) ConvertTo<boost::int64_t>(params[5]);
if (strMethod == "sendalert" && n > 6) ConvertTo<boost::int64_t>(params[6]);
if (strMethod == "enforcecheckpoint" && n > 0) ConvertTo<bool>(params[0]);
if (strMethod == "sendmany" && n > 1) ConvertTo<Object>(params[1]);
if (strMethod == "sendmany" && n > 2) ConvertTo<boost::int64_t>(params[2]);
if (strMethod == "addmultisigaddress" && n > 0) ConvertTo<boost::int64_t>(params[0]);
View
@@ -140,10 +140,6 @@ extern json_spirit::Value getpeerinfo(const json_spirit::Array& params, bool fHe
extern json_spirit::Value addnode(const json_spirit::Array& params, bool fHelp);
extern json_spirit::Value getaddednodeinfo(const json_spirit::Array& params, bool fHelp);
extern json_spirit::Value makekeypair(const json_spirit::Array& params, bool fHelp);
extern json_spirit::Value sendalert(const json_spirit::Array& params, bool fHelp);
extern json_spirit::Value getcheckpoint(const json_spirit::Array& params, bool fHelp); // in checkpointsync.cpp
extern json_spirit::Value sendcheckpoint(const json_spirit::Array& params, bool fHelp);
extern json_spirit::Value enforcecheckpoint(const json_spirit::Array& params, bool fHelp);
extern json_spirit::Value dumpprivkey(const json_spirit::Array& params, bool fHelp); // in rpcdump.cpp
extern json_spirit::Value importprivkey(const json_spirit::Array& params, bool fHelp);
View
@@ -23,9 +23,6 @@ namespace Checkpoints
// Returns last CBlockIndex* in mapBlockIndex that is a checkpoint
CBlockIndex* GetLastCheckpoint(const std::map<uint256, CBlockIndex*>& mapBlockIndex);
// Returns the block hash of latest hardened checkpoint
uint256 GetLatestHardenedCheckpoint();
double GuessVerificationProgress(CBlockIndex *pindex);
}
Oops, something went wrong.

0 comments on commit d778f71

Please sign in to comment.