Page MenuHomePhabricator

D8300.diff
No OneTemporary

D8300.diff

diff --git a/doc/release-notes.md b/doc/release-notes.md
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -36,6 +36,16 @@
- Importing blocks upon startup via the `bootstrap.dat` file no longer occurs
by default. The file must now be specified with `-loadblock=<file>`.
+
+Utilities
+---------
+
+- The `bitcoin-cli` utility used with the `-getinfo` parameter now returns a
+ `headers` field with the number of downloaded block headers on the best
+ headers chain (similar to the `blocks` field that is also returned) and a
+ `verificationprogress` field that estimates how much of the best block chain
+ has been synced by the local node. The information returned no longer
+ includes the `protocolversion`, `walletversion`, and `keypoololdest` fields.
Build system changes
--------------------
diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -322,8 +322,6 @@
return batch[ID_BLOCKCHAININFO];
}
result.pushKV("version", batch[ID_NETWORKINFO]["result"]["version"]);
- result.pushKV("protocolversion",
- batch[ID_NETWORKINFO]["result"]["protocolversion"]);
result.pushKV("blocks", batch[ID_BLOCKCHAININFO]["result"]["blocks"]);
result.pushKV("headers", batch[ID_BLOCKCHAININFO]["result"]["headers"]);
result.pushKV(
@@ -340,11 +338,7 @@
result.pushKV("chain",
UniValue(batch[ID_BLOCKCHAININFO]["result"]["chain"]));
if (!batch[ID_WALLETINFO]["result"].isNull()) {
- result.pushKV("walletversion",
- batch[ID_WALLETINFO]["result"]["walletversion"]);
result.pushKV("balance", batch[ID_WALLETINFO]["result"]["balance"]);
- result.pushKV("keypoololdest",
- batch[ID_WALLETINFO]["result"]["keypoololdest"]);
result.pushKV("keypoolsize",
batch[ID_WALLETINFO]["result"]["keypoolsize"]);
if (!batch[ID_WALLETINFO]["result"]["unlocked_until"].isNull()) {
diff --git a/test/functional/interface_bitcoin_cli.py b/test/functional/interface_bitcoin_cli.py
--- a/test/functional/interface_bitcoin_cli.py
+++ b/test/functional/interface_bitcoin_cli.py
@@ -75,8 +75,6 @@
blockchain_info = self.nodes[0].getblockchaininfo()
assert_equal(cli_get_info['version'], network_info['version'])
- assert_equal(cli_get_info['protocolversion'],
- network_info['protocolversion'])
assert_equal(cli_get_info['blocks'], blockchain_info['blocks'])
assert_equal(cli_get_info['timeoffset'], network_info['timeoffset'])
assert_equal(cli_get_info['connections'], network_info['connections'])
@@ -85,11 +83,7 @@
assert_equal(cli_get_info['difficulty'], blockchain_info['difficulty'])
assert_equal(cli_get_info['chain'], blockchain_info['chain'])
if self.is_wallet_compiled():
- assert_equal(cli_get_info['walletversion'],
- wallet_info['walletversion'])
assert_equal(cli_get_info['balance'], wallet_info['balance'])
- assert_equal(cli_get_info['keypoololdest'],
- wallet_info['keypoololdest'])
assert_equal(
cli_get_info['keypoolsize'],
wallet_info['keypoolsize'])

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 1, 10:58 (11 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5187435
Default Alt Text
D8300.diff (3 KB)

Event Timeline