diff options
| author | jtimon <jtimon@monetize.io> | 2014-06-12 14:52:12 +0200 |
|---|---|---|
| committer | jtimon <jtimon@monetize.io> | 2014-06-17 13:11:36 +0200 |
| commit | f6984e814134d2383e1353ce8aa951649f5fcbd2 (patch) | |
| tree | 1fde9706d9339161c32c870ee6bc4955654a4680 /src | |
| parent | b82b7ec3dcbeda9e9f5de9bac05cc63c492e662e (diff) | |
| download | bitcoin-f6984e814134d2383e1353ce8aa951649f5fcbd2.tar.xz | |
Add "chain" to getmininginfo, improve help in getblockchaininfo
Diffstat (limited to 'src')
| -rw-r--r-- | src/rpcblockchain.cpp | 2 | ||||
| -rw-r--r-- | src/rpcmining.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index 0fabc86872..580c6bd5ba 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -438,7 +438,7 @@ Value getblockchaininfo(const Array& params, bool fHelp) "Returns an object containing various state info regarding block chain processing.\n" "\nResult:\n" "{\n" - " \"chain\": \"xxxx\", (string) current chain (main, testnet3, regtest)\n" + " \"chain\": \"xxxx\", (string) current network name as defined in BIP70 (main, test, regtest)\n" " \"blocks\": xxxxxx, (numeric) the current number of blocks processed in the server\n" " \"bestblockhash\": \"...\", (string) the hash of the currently best block\n" " \"difficulty\": xxxxxx, (numeric) the current difficulty\n" diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index e18e44c5ef..57a51c0fde 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", "") @@ -269,6 +270,7 @@ Value getmininginfo(const Array& params, bool fHelp) obj.push_back(Pair("networkhashps", getnetworkhashps(params, false))); obj.push_back(Pair("pooledtx", (uint64_t)mempool.size())); 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))); |