aboutsummaryrefslogtreecommitdiff
path: root/src/bitcoinrpc.cpp
diff options
context:
space:
mode:
authorGavin Andresen <[email protected]>2011-12-19 07:25:16 -0800
committerGavin Andresen <[email protected]>2011-12-19 07:25:16 -0800
commit1f3bc1c2399fb53eb1b2222194332aca07a31a36 (patch)
treee7afd7d6d4b892af685985f75d5b3d7b5c2330be /src/bitcoinrpc.cpp
parentMerge pull request #709 from luke-jr/newdnsseeds (diff)
parentImplement BIP 14 : separate protocol version from client version (diff)
downloaddiscoin-1f3bc1c2399fb53eb1b2222194332aca07a31a36.tar.xz
discoin-1f3bc1c2399fb53eb1b2222194332aca07a31a36.zip
Merge pull request #707 from gavinandresen/BIP14
Implement BIP 14 : separate protocol version from client version
Diffstat (limited to 'src/bitcoinrpc.cpp')
-rw-r--r--src/bitcoinrpc.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
index bb8d8e2d7..f29b9dd50 100644
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@ -304,7 +304,8 @@ Value getinfo(const Array& params, bool fHelp)
"Returns an object containing various state info.");
Object obj;
- obj.push_back(Pair("version", (int)VERSION));
+ obj.push_back(Pair("version", (int)CLIENT_VERSION));
+ obj.push_back(Pair("protocolversion",(int)PROTOCOL_VERSION));
obj.push_back(Pair("balance", ValueFromAmount(pwalletMain->GetBalance())));
obj.push_back(Pair("blocks", (int)nBestHeight));
obj.push_back(Pair("connections", (int)vNodes.size()));