Move getinfo to rpcnet.cpp
Where to place `getinfo` is a difficult issue as it shows information from the wallet, net and block chain. However, I moved it out of rpcwallet as the command needs also to be available without wallet.
This commit is contained in:
Wladimir J. van der Laan
parent
bbb093652e
commit
991685d3dc
2 changed files with 59 additions and 58 deletions
|
|
@ -8,6 +8,9 @@
|
||||||
#include "protocol.h"
|
#include "protocol.h"
|
||||||
#include "sync.h"
|
#include "sync.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
|
#include "wallet.h" // for getinfo
|
||||||
|
#include "init.h" // for getinfo
|
||||||
|
#include "main.h" // for getinfo
|
||||||
|
|
||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
|
|
||||||
|
|
@ -329,3 +332,59 @@ Value getnettotals(const Array& params, bool fHelp)
|
||||||
obj.push_back(Pair("timemillis", static_cast<boost::int64_t>(GetTimeMillis())));
|
obj.push_back(Pair("timemillis", static_cast<boost::int64_t>(GetTimeMillis())));
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Value getinfo(const Array& params, bool fHelp)
|
||||||
|
{
|
||||||
|
if (fHelp || params.size() != 0)
|
||||||
|
throw runtime_error(
|
||||||
|
"getinfo\n"
|
||||||
|
"Returns an object containing various state info.\n"
|
||||||
|
"\nResult:\n"
|
||||||
|
"{\n"
|
||||||
|
" \"version\": xxxxx, (numeric) the server version\n"
|
||||||
|
" \"protocolversion\": xxxxx, (numeric) the protocol version\n"
|
||||||
|
" \"walletversion\": xxxxx, (numeric) the wallet version\n"
|
||||||
|
" \"balance\": xxxxxxx, (numeric) the total bitcoin balance of the wallet\n"
|
||||||
|
" \"blocks\": xxxxxx, (numeric) the current number of blocks processed in the server\n"
|
||||||
|
" \"timeoffset\": xxxxx, (numeric) the time offset\n"
|
||||||
|
" \"connections\": xxxxx, (numeric) the number of connections\n"
|
||||||
|
" \"proxy\": \"host:port\", (string, optional) the proxy used by the server\n"
|
||||||
|
" \"difficulty\": xxxxxx, (numeric) the current difficulty\n"
|
||||||
|
" \"testnet\": true|false, (boolean) if the server is using testnet or not\n"
|
||||||
|
" \"keypoololdest\": xxxxxx, (numeric) the timestamp (seconds since GMT epoch) of the oldest pre-generated key in the key pool\n"
|
||||||
|
" \"keypoolsize\": xxxx, (numeric) how many new keys are pre-generated\n"
|
||||||
|
" \"paytxfee\": x.xxxx, (numeric) the transaction fee set in btc\n"
|
||||||
|
" \"unlocked_until\": ttt, (numeric) the timestamp in seconds since epoch (midnight Jan 1 1970 GMT) that the wallet is unlocked for transfers, or 0 if the wallet is locked\n"
|
||||||
|
" \"errors\": \"...\" (string) any error messages\n"
|
||||||
|
"}\n"
|
||||||
|
"\nExamples:\n"
|
||||||
|
+ HelpExampleCli("getinfo", "")
|
||||||
|
+ HelpExampleRpc("getinfo", "")
|
||||||
|
);
|
||||||
|
|
||||||
|
proxyType proxy;
|
||||||
|
GetProxy(NET_IPV4, proxy);
|
||||||
|
|
||||||
|
Object obj;
|
||||||
|
obj.push_back(Pair("version", (int)CLIENT_VERSION));
|
||||||
|
obj.push_back(Pair("protocolversion",(int)PROTOCOL_VERSION));
|
||||||
|
if (pwalletMain) {
|
||||||
|
obj.push_back(Pair("walletversion", pwalletMain->GetVersion()));
|
||||||
|
obj.push_back(Pair("balance", ValueFromAmount(pwalletMain->GetBalance())));
|
||||||
|
}
|
||||||
|
obj.push_back(Pair("blocks", (int)chainActive.Height()));
|
||||||
|
obj.push_back(Pair("timeoffset", (boost::int64_t)GetTimeOffset()));
|
||||||
|
obj.push_back(Pair("connections", (int)vNodes.size()));
|
||||||
|
obj.push_back(Pair("proxy", (proxy.first.IsValid() ? proxy.first.ToStringIPPort() : string())));
|
||||||
|
obj.push_back(Pair("difficulty", (double)GetDifficulty()));
|
||||||
|
obj.push_back(Pair("testnet", TestNet()));
|
||||||
|
if (pwalletMain) {
|
||||||
|
obj.push_back(Pair("keypoololdest", (boost::int64_t)pwalletMain->GetOldestKeyPoolTime()));
|
||||||
|
obj.push_back(Pair("keypoolsize", (int)pwalletMain->GetKeyPoolSize()));
|
||||||
|
}
|
||||||
|
obj.push_back(Pair("paytxfee", ValueFromAmount(nTransactionFee)));
|
||||||
|
if (pwalletMain && pwalletMain->IsCrypted())
|
||||||
|
obj.push_back(Pair("unlocked_until", (boost::int64_t)nWalletUnlockTime));
|
||||||
|
obj.push_back(Pair("errors", GetWarnings("statusbar")));
|
||||||
|
return obj;
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -66,64 +66,6 @@ string AccountFromValue(const Value& value)
|
||||||
return strAccount;
|
return strAccount;
|
||||||
}
|
}
|
||||||
|
|
||||||
Value getinfo(const Array& params, bool fHelp)
|
|
||||||
{
|
|
||||||
if (fHelp || params.size() != 0)
|
|
||||||
throw runtime_error(
|
|
||||||
"getinfo\n"
|
|
||||||
"Returns an object containing various state info.\n"
|
|
||||||
"\nResult:\n"
|
|
||||||
"{\n"
|
|
||||||
" \"version\": xxxxx, (numeric) the server version\n"
|
|
||||||
" \"protocolversion\": xxxxx, (numeric) the protocol version\n"
|
|
||||||
" \"walletversion\": xxxxx, (numeric) the wallet version\n"
|
|
||||||
" \"balance\": xxxxxxx, (numeric) the total bitcoin balance of the wallet\n"
|
|
||||||
" \"blocks\": xxxxxx, (numeric) the current number of blocks processed in the server\n"
|
|
||||||
" \"timeoffset\": xxxxx, (numeric) the time offset\n"
|
|
||||||
" \"connections\": xxxxx, (numeric) the number of connections\n"
|
|
||||||
" \"proxy\": \"host:port\", (string, optional) the proxy used by the server\n"
|
|
||||||
" \"difficulty\": xxxxxx, (numeric) the current difficulty\n"
|
|
||||||
" \"testnet\": true|false, (boolean) if the server is using testnet or not\n"
|
|
||||||
" \"keypoololdest\": xxxxxx, (numeric) the timestamp (seconds since GMT epoch) of the oldest pre-generated key in the key pool\n"
|
|
||||||
" \"keypoolsize\": xxxx, (numeric) how many new keys are pre-generated\n"
|
|
||||||
" \"paytxfee\": x.xxxx, (numeric) the transaction fee set in btc\n"
|
|
||||||
" \"unlocked_until\": ttt, (numeric) the timestamp in seconds since epoch (midnight Jan 1 1970 GMT) that the wallet is unlocked for transfers, or 0 if the wallet is locked\n"
|
|
||||||
" \"errors\": \"...\" (string) any error messages\n"
|
|
||||||
"}\n"
|
|
||||||
"\nExamples:\n"
|
|
||||||
+ HelpExampleCli("getinfo", "")
|
|
||||||
+ HelpExampleRpc("getinfo", "")
|
|
||||||
);
|
|
||||||
|
|
||||||
proxyType proxy;
|
|
||||||
GetProxy(NET_IPV4, proxy);
|
|
||||||
|
|
||||||
Object obj;
|
|
||||||
obj.push_back(Pair("version", (int)CLIENT_VERSION));
|
|
||||||
obj.push_back(Pair("protocolversion",(int)PROTOCOL_VERSION));
|
|
||||||
if (pwalletMain) {
|
|
||||||
obj.push_back(Pair("walletversion", pwalletMain->GetVersion()));
|
|
||||||
obj.push_back(Pair("balance", ValueFromAmount(pwalletMain->GetBalance())));
|
|
||||||
}
|
|
||||||
obj.push_back(Pair("blocks", (int)chainActive.Height()));
|
|
||||||
obj.push_back(Pair("timeoffset", (boost::int64_t)GetTimeOffset()));
|
|
||||||
obj.push_back(Pair("connections", (int)vNodes.size()));
|
|
||||||
obj.push_back(Pair("proxy", (proxy.first.IsValid() ? proxy.first.ToStringIPPort() : string())));
|
|
||||||
obj.push_back(Pair("difficulty", (double)GetDifficulty()));
|
|
||||||
obj.push_back(Pair("testnet", TestNet()));
|
|
||||||
if (pwalletMain) {
|
|
||||||
obj.push_back(Pair("keypoololdest", (boost::int64_t)pwalletMain->GetOldestKeyPoolTime()));
|
|
||||||
obj.push_back(Pair("keypoolsize", (int)pwalletMain->GetKeyPoolSize()));
|
|
||||||
}
|
|
||||||
obj.push_back(Pair("paytxfee", ValueFromAmount(nTransactionFee)));
|
|
||||||
if (pwalletMain && pwalletMain->IsCrypted())
|
|
||||||
obj.push_back(Pair("unlocked_until", (boost::int64_t)nWalletUnlockTime));
|
|
||||||
obj.push_back(Pair("errors", GetWarnings("statusbar")));
|
|
||||||
return obj;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Value getnewaddress(const Array& params, bool fHelp)
|
Value getnewaddress(const Array& params, bool fHelp)
|
||||||
{
|
{
|
||||||
if (fHelp || params.size() > 1)
|
if (fHelp || params.size() > 1)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue