From a708715cc3ba10c9a590fcfe346d67140b404267 Mon Sep 17 00:00:00 2001 From: Jonathan Cross Date: Sun, 23 Apr 2017 18:36:44 +0200 Subject: [PATCH 1/2] Improve warning with details for estimatepriority RPC --- .../devdoc/bitcoin-core/rpcs/rpcs/estimatepriority.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/estimatepriority.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/estimatepriority.md index 67bac9e3..69b17dfb 100644 --- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/estimatepriority.md +++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/estimatepriority.md @@ -9,14 +9,13 @@ http://opensource.org/licenses/MIT. {% autocrossref %} -{% assign summary_estimatePriority="estimates the priority that a transaction needs in order to be included within a certain number of blocks as a free high-priority transaction." %} +{% assign summary_estimatePriority="estimates the priority (coin age) that a transaction needs in order to be included within a certain number of blocks as a free high-priority transaction." %} *Added in Bitcoin Core 0.10.0.* -The `estimatepriority` RPC {{summary_estimatePriority}} +The `estimatepriority` RPC {{summary_estimatePriority}} (not to be confused with the `prioritisetransaction` RPC which will remain supported for adding fee deltas to transactions) -{{WARNING}} `estimatepriority` will be removed in a later version of Bitcoin -Core. Use the RPCs listed in the See Also subsection below instead. +{{WARNING}} `estimatepriority` has been [removed](https://github.com/bitcoin/bitcoin/commit/fe282acd7604b5265762b24e531bdf1ebb1f009b) and will no longer be available in the next major release (target v0.15.0). Use the RPCs listed in the "See Also" subsection below instead. Transaction priority is relative to a transaction's byte size. From e25cbcefcdf653aab07cb9fbe2d47759e4a9bbbf Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Fri, 12 May 2017 13:54:57 -0400 Subject: [PATCH 2/2] Dev docs: edits to removed estimatepriority RPC --- _includes/devdoc/bitcoin-core/rpcs/rpcs/estimatepriority.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/estimatepriority.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/estimatepriority.md index 69b17dfb..e245666c 100644 --- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/estimatepriority.md +++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/estimatepriority.md @@ -13,9 +13,9 @@ http://opensource.org/licenses/MIT. *Added in Bitcoin Core 0.10.0.* -The `estimatepriority` RPC {{summary_estimatePriority}} (not to be confused with the `prioritisetransaction` RPC which will remain supported for adding fee deltas to transactions) +The `estimatepriority` RPC {{summary_estimatePriority}} This should not to be confused with the `prioritisetransaction` RPC which will remain supported for adding fee deltas to transactions. -{{WARNING}} `estimatepriority` has been [removed](https://github.com/bitcoin/bitcoin/commit/fe282acd7604b5265762b24e531bdf1ebb1f009b) and will no longer be available in the next major release (target v0.15.0). Use the RPCs listed in the "See Also" subsection below instead. +{{WARNING}} `estimatepriority` has been [removed](https://github.com/bitcoin/bitcoin/commit/fe282acd7604b5265762b24e531bdf1ebb1f009b) and will no longer be available in the next major release (planned for Bitcoin Core 0.15.0). Use the RPC listed in the "See Also" subsection below instead. Transaction priority is relative to a transaction's byte size.