Removed main.h dependency from rpcserver.cpp
Rebased by @laanwj:
- update for RPC methods added since 84d13ee: setmocktime,
invalidateblock, reconsiderblock. Only the first, setmocktime, required a change,
the other two are thread safe.
This commit is contained in:
committed by
Wladimir J. van der Laan
parent
6b5f5294bb
commit
4401b2d7c5
@@ -105,6 +105,7 @@ Value getblockcount(const Array& params, bool fHelp)
|
||||
+ HelpExampleRpc("getblockcount", "")
|
||||
);
|
||||
|
||||
LOCK(cs_main);
|
||||
return chainActive.Height();
|
||||
}
|
||||
|
||||
@@ -121,6 +122,7 @@ Value getbestblockhash(const Array& params, bool fHelp)
|
||||
+ HelpExampleRpc("getbestblockhash", "")
|
||||
);
|
||||
|
||||
LOCK(cs_main);
|
||||
return chainActive.Tip()->GetBlockHash().GetHex();
|
||||
}
|
||||
|
||||
@@ -137,6 +139,7 @@ Value getdifficulty(const Array& params, bool fHelp)
|
||||
+ HelpExampleRpc("getdifficulty", "")
|
||||
);
|
||||
|
||||
LOCK(cs_main);
|
||||
return GetDifficulty();
|
||||
}
|
||||
|
||||
@@ -173,6 +176,8 @@ Value getrawmempool(const Array& params, bool fHelp)
|
||||
+ HelpExampleRpc("getrawmempool", "true")
|
||||
);
|
||||
|
||||
LOCK(cs_main);
|
||||
|
||||
bool fVerbose = false;
|
||||
if (params.size() > 0)
|
||||
fVerbose = params[0].get_bool();
|
||||
@@ -233,6 +238,8 @@ Value getblockhash(const Array& params, bool fHelp)
|
||||
+ HelpExampleRpc("getblockhash", "1000")
|
||||
);
|
||||
|
||||
LOCK(cs_main);
|
||||
|
||||
int nHeight = params[0].get_int();
|
||||
if (nHeight < 0 || nHeight > chainActive.Height())
|
||||
throw JSONRPCError(RPC_INVALID_PARAMETER, "Block height out of range");
|
||||
@@ -277,6 +284,8 @@ Value getblock(const Array& params, bool fHelp)
|
||||
+ HelpExampleRpc("getblock", "\"00000000c937983704a73af28acdec37b049d214adbda81d7e2a3dd146f6ed09\"")
|
||||
);
|
||||
|
||||
LOCK(cs_main);
|
||||
|
||||
std::string strHash = params[0].get_str();
|
||||
uint256 hash(uint256S(strHash));
|
||||
|
||||
@@ -326,6 +335,8 @@ Value gettxoutsetinfo(const Array& params, bool fHelp)
|
||||
+ HelpExampleRpc("gettxoutsetinfo", "")
|
||||
);
|
||||
|
||||
LOCK(cs_main);
|
||||
|
||||
Object ret;
|
||||
|
||||
CCoinsStats stats;
|
||||
@@ -380,6 +391,8 @@ Value gettxout(const Array& params, bool fHelp)
|
||||
+ HelpExampleRpc("gettxout", "\"txid\", 1")
|
||||
);
|
||||
|
||||
LOCK(cs_main);
|
||||
|
||||
Object ret;
|
||||
|
||||
std::string strHash = params[0].get_str();
|
||||
@@ -436,6 +449,8 @@ Value verifychain(const Array& params, bool fHelp)
|
||||
+ HelpExampleRpc("verifychain", "")
|
||||
);
|
||||
|
||||
LOCK(cs_main);
|
||||
|
||||
int nCheckLevel = GetArg("-checklevel", 3);
|
||||
int nCheckDepth = GetArg("-checkblocks", 288);
|
||||
if (params.size() > 0)
|
||||
@@ -467,6 +482,8 @@ Value getblockchaininfo(const Array& params, bool fHelp)
|
||||
+ HelpExampleRpc("getblockchaininfo", "")
|
||||
);
|
||||
|
||||
LOCK(cs_main);
|
||||
|
||||
Object obj;
|
||||
obj.push_back(Pair("chain", Params().NetworkIDString()));
|
||||
obj.push_back(Pair("blocks", (int)chainActive.Height()));
|
||||
@@ -526,6 +543,8 @@ Value getchaintips(const Array& params, bool fHelp)
|
||||
+ HelpExampleRpc("getchaintips", "")
|
||||
);
|
||||
|
||||
LOCK(cs_main);
|
||||
|
||||
/* Build up a list of chain tips. We start with the list of all
|
||||
known blocks, and successively remove blocks that appear as pprev
|
||||
of another block. */
|
||||
|
||||
Reference in New Issue
Block a user