From 9f9bb586358fa5f1f46c21574f3f31b618e141da Mon Sep 17 00:00:00 2001 From: Miguel Freitas Date: Fri, 10 Jan 2014 16:04:52 -0200 Subject: [PATCH] disable safemode & add checkpoint --- src/bitcoinrpc.cpp | 2 +- src/checkpoints.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index cc409c43..24142968 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -1084,7 +1084,7 @@ json_spirit::Value CRPCTable::execute(const std::string &strMethod, const json_s // Observe safe mode string strWarning = GetWarnings("rpc"); - if (strWarning != "" && !GetBoolArg("-disablesafemode", false) && + if (strWarning != "" && !GetBoolArg("-disablesafemode", true) && !pcmd->okSafeMode) throw JSONRPCError(RPC_FORBIDDEN_BY_SAFE_MODE, string("Safe mode: ") + strWarning); diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index 82ef913f..09b8a9f7 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -39,11 +39,12 @@ namespace Checkpoints boost::assign::map_list_of ( 121, uint256("0xcfdd9b4eb621c93163af7b730b3590b7a90c3d5e233569d76a1c0363527c92ae")) ( 13081, uint256("0x5125dc1f6a3b8f1c463baf3e078d8af9f1b35aa4b34fb441e3a7ee391f8727c6")) + ( 18000, uint256("0xa3cab01c0e3e9b17b2a63b3cc93d258112f5ad753df1df7bd45e37a5c60814a9")) ; static const CCheckpointData data = { &mapCheckpoints, - 1388417972, // * UNIX timestamp of last checkpoint block - 13100, // * total number of transactions between genesis and last checkpoint + 1389317765, // * UNIX timestamp of last checkpoint block + 21106, // * total number of transactions between genesis and last checkpoint // (the tx=... number in the SetBestChain debug.log lines) 144.0 // * estimated number of transactions per day after checkpoint };