diff --git a/_autocrossref.yaml b/_autocrossref.yaml index a799e292..11c3f756 100644 --- a/_autocrossref.yaml +++ b/_autocrossref.yaml @@ -544,3 +544,4 @@ Bitcoin Core 0.9.0: Bitcoin Core 0.9.1: Bitcoin Core 0.9.3: Bitcoin Core 0.10.0: +Bitcoin Core master: diff --git a/_includes/helpers/summaries.md b/_includes/helpers/summaries.md index 16e6bea3..1138cd40 100644 --- a/_includes/helpers/summaries.md +++ b/_includes/helpers/summaries.md @@ -27,7 +27,7 @@ This file is licensed under the terms of its source texts{%endcomment%} {% assign summary_getConnectionCount="returns the number of connections to other nodes." %} {% assign summary_getDifficultly="returns the proof-of-work difficulty as a multiple of the minimum difficulty." %} {% assign summary_getGenerate="returns true if the node is set to generate blocks using its CPU." %} -{% assign summary_getHashesPerSec="returns a recent hashes per second performance measurement when the node is generating blocks." %} +{% assign summary_getHashesPerSec="was removed in Bitcoin Core master (unreleased). It returned a recent hashes per second performance measurement when the node was generating blocks." %} {% assign summary_getInfo="prints various information about the node and the network." %} {% assign summary_getMemPoolInfo="returns information about the node's current transaction memory pool." %} {% assign summary_getMiningInfo="returns various mining-related information." %} diff --git a/_includes/ref/bitcoin-core/rpcs/quick-ref.md b/_includes/ref/bitcoin-core/rpcs/quick-ref.md index 5a56a0c1..d6b64447 100644 --- a/_includes/ref/bitcoin-core/rpcs/quick-ref.md +++ b/_includes/ref/bitcoin-core/rpcs/quick-ref.md @@ -16,6 +16,9 @@ changes made more than two years ago. Use v0.n.n in abbreviation title to prevent autocrossrefing. {% endcomment %} + +{% assign UPDATED_MASTER='**Updated in master**' %} + {% assign DEPRECATED='**Deprecated**' %} {% assign NEW0_10_0='**New in 0.10.0**' %} @@ -74,7 +77,6 @@ Use v0.n.n in abbreviation title to prevent autocrossrefing. {% autocrossref %} * [GetGenerate][rpc getgenerate]: {{summary_getGenerate}} -* [GetHashesPerSec][rpc gethashespersec]: {{summary_getHashesPerSec}} * [SetGenerate][rpc setgenerate]: {{summary_setGenerate}} {% endautocrossref %} @@ -86,7 +88,7 @@ Use v0.n.n in abbreviation title to prevent autocrossrefing. {% autocrossref %} * [GetBlockTemplate][rpc getblocktemplate]: {{summary_getBlockTemplate}} -* [GetMiningInfo][rpc getmininginfo]: {{summary_getMiningInfo}} +* [GetMiningInfo][rpc getmininginfo]: {{summary_getMiningInfo}} {{UPDATED_MASTER}} * [GetNetworkHashPS][rpc getnetworkhashps]: {{summary_getNetworkHashPS}} * [PrioritiseTransaction][rpc prioritisetransaction]: {{summary_prioritiseTransaction}} {{NEW0_10_0}} * [SubmitBlock][rpc submitblock]: {{summary_submitBlock}} @@ -196,6 +198,7 @@ default. {% autocrossref %} -* [GetWork][rpc getwork]: {{summary_getWork}} {{REMOVED0_10_0}} +* [GetHashesPerSec][rpc gethashespersec]: {{summary_getHashesPerSec}} +* [GetWork][rpc getwork]: {{summary_getWork}} {% endautocrossref %} diff --git a/_includes/ref/bitcoin-core/rpcs/rpcs/gethashespersec.md b/_includes/ref/bitcoin-core/rpcs/rpcs/gethashespersec.md index 23abbd63..5b5f9363 100644 --- a/_includes/ref/bitcoin-core/rpcs/rpcs/gethashespersec.md +++ b/_includes/ref/bitcoin-core/rpcs/rpcs/gethashespersec.md @@ -7,7 +7,7 @@ http://opensource.org/licenses/MIT. ##### GetHashesPerSec {% include helpers/subhead-links.md %} -{% assign summary_getHashesPerSec="returns a recent hashes per second performance measurement when the node is generating blocks." %} +{% assign summary_getHashesPerSec="was removed in Bitcoin Core master (unreleased). It returned a recent hashes per second performance measurement when the node was generating blocks." %} {% autocrossref %} diff --git a/_includes/ref/bitcoin-core/rpcs/rpcs/getmininginfo.md b/_includes/ref/bitcoin-core/rpcs/rpcs/getmininginfo.md index 96909f98..97fde486 100644 --- a/_includes/ref/bitcoin-core/rpcs/rpcs/getmininginfo.md +++ b/_includes/ref/bitcoin-core/rpcs/rpcs/getmininginfo.md @@ -31,7 +31,7 @@ The `getmininginfo` RPC {{summary_getMiningInfo}} | →
`testnet` | bool | Required
(exactly 1) | Set to `true` if this node is running on testnet. Set to `false` if this node is on mainnet or a regtest | →
`chain` | string | Required
(exactly 1) | Set to `main` for mainnet, `test` for testnet, and `regtest` for regtest | →
`generate` | bool | Optional
(0 or 1) | Set to `true` if generation is currently enabled; set to `false` if generation is currently disabled. Only returned if the node has wallet support enabled -| →
`hashespersec` | number (int) | Optional
(0 or 1) | The approximate number of hashes per second this node is generating across all CPUs, if generation is enabled. Otherwise `0`. Only returned if the node has wallet support enabled +| →
`hashespersec` | number (int) | Optional
(0 or 1) | *Removed in Bitcoin Core master (unreleased)*

The approximate number of hashes per second this node is generating across all CPUs, if generation is enabled. Otherwise `0`. Only returned if the node has wallet support enabled {:.ntpd} *Example from Bitcoin Core 0.10.0* diff --git a/_includes/references.md b/_includes/references.md index 3c0af5b6..794af5bd 100644 --- a/_includes/references.md +++ b/_includes/references.md @@ -386,6 +386,7 @@ http://opensource.org/licenses/MIT. [Bitcoin Core 0.3.18]: https://github.com/bitcoin/bitcoin/commit/82201801336f64ee77851b9eaab9383ee4e442f0 [bitcoin core fee drop commit]: https://github.com/bitcoin/bitcoin/commit/6a4c196dd64da2fd33dc7ae77a8cdd3e4cf0eff1 [Bitcoin Core issue #2381]: https://github.com/bitcoin/bitcoin/issues/2381 +[Bitcoin Core master]: https://github.com/bitcoin/bitcoin [Bitcoin Core pull #4468]: https://github.com/bitcoin/bitcoin/pull/4468 [Bitcoin Seeder]: https://github.com/sipa/bitcoin-seeder [bitcoin-documentation mailing list]: https://groups.google.com/forum/#!forum/bitcoin-documentation