diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-06-17 13:44:31 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-06-17 14:11:28 +0200 |
| commit | 2151419b1b124c490a09692f3bc234e82295a7c0 (patch) | |
| tree | 1fde9706d9339161c32c870ee6bc4955654a4680 /src/rpcmining.cpp | |
| parent | Merge pull request #4357 (diff) | |
| parent | Add "chain" to getmininginfo, improve help in getblockchaininfo (diff) | |
| download | discoin-2151419b1b124c490a09692f3bc234e82295a7c0.tar.xz discoin-2151419b1b124c490a09692f3bc234e82295a7c0.zip | |
Merge pull request #4333
f6984e8 Add "chain" to getmininginfo, improve help in getblockchaininfo (jtimon)
b82b7ec Get rid of Params().RPCisTestNet() (jtimon)
Diffstat (limited to 'src/rpcmining.cpp')
| -rw-r--r-- | src/rpcmining.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index 3caf7d89f..57a51c0fd 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -253,6 +253,7 @@ Value getmininginfo(const Array& params, bool fHelp) " \"hashespersec\": n (numeric) The hashes per second of the generation, or 0 if no generation.\n" " \"pooledtx\": n (numeric) The size of the mem pool\n" " \"testnet\": true|false (boolean) If using testnet or not\n" + " \"chain\": \"xxxx\", (string) current network name as defined in BIP70 (main, test, regtest)\n" "}\n" "\nExamples:\n" + HelpExampleCli("getmininginfo", "") @@ -268,7 +269,8 @@ Value getmininginfo(const Array& params, bool fHelp) obj.push_back(Pair("genproclimit", (int)GetArg("-genproclimit", -1))); obj.push_back(Pair("networkhashps", getnetworkhashps(params, false))); obj.push_back(Pair("pooledtx", (uint64_t)mempool.size())); - obj.push_back(Pair("testnet", Params().RPCisTestNet())); + obj.push_back(Pair("testnet", Params().NetworkID() == CChainParams::TESTNET)); + obj.push_back(Pair("chain", Params().NetworkIDString())); #ifdef ENABLE_WALLET obj.push_back(Pair("generate", getgenerate(params, false))); obj.push_back(Pair("hashespersec", gethashespersec(params, false))); |