From 8ed9adf6e634173814c6e36591cc02c7a08ce3c4 Mon Sep 17 00:00:00 2001 From: thephez Date: Wed, 27 Mar 2019 16:08:23 -0400 Subject: [PATCH] RPC - Coin age priority updates - Remove estimate*priority - Remove priority param from prioritisetransactions - Adjust relay-fee param descriptions --- .../devdoc/dash-core/rpcs/quick-reference.md | 12 ++++++------ .../dash-core/rpcs/rpcs/estimatepriority.md | 8 ++------ .../rpcs/rpcs/estimatesmartpriority.md | 8 +++----- _includes/devdoc/dash-core/rpcs/rpcs/getinfo.md | 3 ++- .../dash-core/rpcs/rpcs/getnetworkinfo.md | 2 +- .../rpcs/rpcs/prioritisetransaction.md | 17 ++++------------- _includes/helpers/summaries.md | 4 ++-- _includes/layout/base/rpc-table.html | 12 ++++++------ 8 files changed, 26 insertions(+), 40 deletions(-) diff --git a/_includes/devdoc/dash-core/rpcs/quick-reference.md b/_includes/devdoc/dash-core/rpcs/quick-reference.md index b9d3281c..fc6a70a6 100644 --- a/_includes/devdoc/dash-core/rpcs/quick-reference.md +++ b/_includes/devdoc/dash-core/rpcs/quick-reference.md @@ -145,8 +145,8 @@ These RPCs are all Dash-specific and not found in Bitcoin Core {% autocrossref %} -* [Debug][rpc debug]: {{summary_debug}} {{DASH_UPDATED0_12_3}} -* [GetInfo][rpc getinfo]: {{summary_getInfo}} {{DEPRECATED}} +* [Debug][rpc debug]: {{summary_debug}} {{DASH_UPDATED0_14_0}} +* [GetInfo][rpc getinfo]: {{summary_getInfo}} {{DASH_UPDATED0_14_0}} {{DEPRECATED}} * [GetMemoryInfo][rpc getmemoryinfo]: {{summary_getMemoryInfo}} {{DASH_NEW0_12_3}} {{NEW_14_0}} * [Help][rpc help]: {{summary_help}} * [Stop][rpc stop]: {{summary_stop}} @@ -203,7 +203,7 @@ These RPCs are all Dash-specific and not found in Bitcoin Core * [GetBlockTemplate][rpc getblocktemplate]: {{summary_getBlockTemplate}} {{DASH_UPDATED0_13_0}} * [GetMiningInfo][rpc getmininginfo]: {{summary_getMiningInfo}} {{UPDATED0_14_0}} * [GetNetworkHashPS][rpc getnetworkhashps]: {{summary_getNetworkHashPS}} -* [PrioritiseTransaction][rpc prioritisetransaction]: {{summary_prioritiseTransaction}} +* [PrioritiseTransaction][rpc prioritisetransaction]: {{summary_prioritiseTransaction}} {{UPDATED0_14_0}} * [SubmitBlock][rpc submitblock]: {{summary_submitBlock}} {% endautocrossref %} @@ -220,7 +220,7 @@ These RPCs are all Dash-specific and not found in Bitcoin Core * [GetAddedNodeInfo][rpc getaddednodeinfo]: {{summary_getAddedNodeInfo}} {{DASH_UPDATED0_12_3}} {{UPDATED0_14_0}} * [GetConnectionCount][rpc getconnectioncount]: {{summary_getConnectionCount}} * [GetNetTotals][rpc getnettotals]: {{summary_getNetTotals}} {{UPDATED0_12_0}} -* [GetNetworkInfo][rpc getnetworkinfo]: {{summary_getNetworkInfo}} {{DASH_UPDATED0_12_3}} {{UPDATED0_13_0}} +* [GetNetworkInfo][rpc getnetworkinfo]: {{summary_getNetworkInfo}} {{DASH_UPDATED0_14_0}} * [GetPeerInfo][rpc getpeerinfo]: {{summary_getPeerInfo}} {{UPDATED0_13_0}} * [ListBanned][rpc listbanned]: {{summary_listBanned}} {{NEW0_12_0}} * [Ping][rpc ping]: {{summary_ping-rpc}} @@ -253,9 +253,7 @@ These RPCs are all Dash-specific and not found in Bitcoin Core * [CreateMultiSig][rpc createmultisig]: {{summary_createMultiSig}} * [EstimateFee][rpc estimatefee]: {{summary_estimateFee}} -* [EstimatePriority][rpc estimatepriority]: {{summary_estimatePriority}} {{DEPRECATED}} * [EstimateSmartFee][rpc estimatesmartfee]: {{summary_estimateSmartFee}} {{DEPRECATED}} -* [EstimateSmartPriority][rpc estimatesmartpriority]: {{summary_estimateSmartPriority}} {{DEPRECATED}} * [SetBIP69Enabled][rpc setbip69enabled]: {{summary_setBIP69Enabled}} {{DASH_NEW0_12_3}} * [SignMessageWithPrivKey][rpc signmessagewithprivkey]: {{summary_signMessageWithPrivKey}} {{DASH_NEW0_12_3}} {{NEW0_13_0}} * [ValidateAddress][rpc validateaddress]: {{summary_validateAddress}} {{DASH_UPDATED0_12_3}} {{UPDATED0_13_0}} @@ -336,6 +334,8 @@ default. {% autocrossref %} +* [EstimatePriority][rpc estimatepriority]: {{summary_estimatePriority}} +* [EstimateSmartPriority][rpc estimatesmartpriority]: {{summary_estimateSmartPriority}} * [GetHashesPerSec][rpc gethashespersec]: {{summary_getHashesPerSec}} * [GetWork][rpc getwork]: {{summary_getWork}} * [GetGenerate][rpc getgenerate]: {{summary_getGenerate}} diff --git a/_includes/devdoc/dash-core/rpcs/rpcs/estimatepriority.md b/_includes/devdoc/dash-core/rpcs/rpcs/estimatepriority.md index 9f5522d8..d8042985 100644 --- a/_includes/devdoc/dash-core/rpcs/rpcs/estimatepriority.md +++ b/_includes/devdoc/dash-core/rpcs/rpcs/estimatepriority.md @@ -11,16 +11,12 @@ 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="was removed in Dash Core 0.14.0." %} -*Added in Bitcoin Core 0.10.0.* +{{WARNING}} **_Removed in Dash Core 0.14.0._** 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 from Bitcoin](https://github.com/bitcoin/bitcoin/commit/fe282acd7604b5265762b24e531bdf1ebb1f009b). While still present in Dash Core, it is deprecated as of 0.12.3 (should be considered unstable and will disappear in the future). Use the RPC listed in the "See Also" subsection below instead. - -Transaction priority is relative to a transaction's byte size. - *Parameter #1---how many blocks the transaction may wait before being included as a free high-priority transaction* {% itemplate ntpd1 %} diff --git a/_includes/devdoc/dash-core/rpcs/rpcs/estimatesmartpriority.md b/_includes/devdoc/dash-core/rpcs/rpcs/estimatesmartpriority.md index 8ac27612..dc5516b5 100644 --- a/_includes/devdoc/dash-core/rpcs/rpcs/estimatesmartpriority.md +++ b/_includes/devdoc/dash-core/rpcs/rpcs/estimatesmartpriority.md @@ -11,14 +11,12 @@ http://opensource.org/licenses/MIT. {% autocrossref %} -{% assign summary_estimateSmartPriority="estimates the priority that a transaction needs in order to be included within a certain number of blocks as a free high-priority transaction and returns the number of blocks for which the estimate is valid." %} +{% assign summary_estimateSmartPriority="was removed in Dash Core 0.14.0." %} + +{{WARNING}} **_Removed in Dash Core 0.14.0._** The `estimatesmartpriority` RPC {{summary_estimateSmartPriority}} This should not to be confused with the `prioritisetransaction` RPC which will remain supported for adding fee deltas to transactions. -{{WARNING}} `estimatesmartpriority` has been [removed from Bitcoin](https://github.com/bitcoin/bitcoin/commit/fe282acd7604b5265762b24e531bdf1ebb1f009b). While still present in Dash Core, it is deprecated as of 0.12.3 (should be considered unstable and will disappear in the future). Use the RPC listed in the "See Also" subsection below instead. - -Transaction priority is relative to a transaction's byte size. - *Parameter #1---how many blocks the transaction may wait before being included as a free high-priority transaction* {% itemplate ntpd1 %} diff --git a/_includes/devdoc/dash-core/rpcs/rpcs/getinfo.md b/_includes/devdoc/dash-core/rpcs/rpcs/getinfo.md index 3612c887..a7fafd5c 100644 --- a/_includes/devdoc/dash-core/rpcs/rpcs/getinfo.md +++ b/_includes/devdoc/dash-core/rpcs/rpcs/getinfo.md @@ -3,6 +3,7 @@ This file is licensed under the MIT License (MIT) available on http://opensource.org/licenses/MIT. {% endcomment %} {% assign filename="_includes/devdoc/dash-core/rpcs/rpcs/getinfo.md" %} + ##### GetInfo {% include helpers/subhead-links.md %} @@ -104,7 +105,7 @@ Core. Use the RPCs listed in the See Also subsection below instead. - n: "→
`relayfee`" t: "number (duffs)" p: "Required
(exactly 1)" - d: "The minimum fee a low-priority transaction must pay in order for this node to accept it into its memory pool" + d: "The minimum fee per kilobyte a transaction must pay in order for this node to accept it into its memory pool" - n: "→
`errors`" t: "string" diff --git a/_includes/devdoc/dash-core/rpcs/rpcs/getnetworkinfo.md b/_includes/devdoc/dash-core/rpcs/rpcs/getnetworkinfo.md index 277b8813..9377d2ee 100644 --- a/_includes/devdoc/dash-core/rpcs/rpcs/getnetworkinfo.md +++ b/_includes/devdoc/dash-core/rpcs/rpcs/getnetworkinfo.md @@ -103,7 +103,7 @@ The `getnetworkinfo` RPC {{summary_getNetworkInfo}} - n: "→
`relayfee`" t: "number (DASH)" p: "Required
(exactly 1)" - d: "The minimum relay fee for non-free transactions in order for this node to accept it into its memory pool" + d: "The minimum relay fee per kilobyte for transactions in order for this node to accept it into its memory pool" - n: "→
`incrementalfee`" t: "number (DASH)" diff --git a/_includes/devdoc/dash-core/rpcs/rpcs/prioritisetransaction.md b/_includes/devdoc/dash-core/rpcs/rpcs/prioritisetransaction.md index 13736a78..9d15b299 100644 --- a/_includes/devdoc/dash-core/rpcs/rpcs/prioritisetransaction.md +++ b/_includes/devdoc/dash-core/rpcs/rpcs/prioritisetransaction.md @@ -3,6 +3,7 @@ This file is licensed under the MIT License (MIT) available on http://opensource.org/licenses/MIT. {% endcomment %} {% assign filename="_includes/devdoc/dash-core/rpcs/rpcs/prioritisetransaction.md" %} + ##### PrioritiseTransaction {% include helpers/subhead-links.md %} @@ -23,17 +24,7 @@ The `prioritisetransaction` RPC {{summary_prioritiseTransaction}} {% enditemplate %} -*Parameter #2---the change to make to the virtual priority* - -{% itemplate ntpd1 %} -- n: "Priority" - t: "number (real)" - p: "Required
(exactly 1)" - d: "If positive, the priority to add to the transaction in addition to its computed priority; if negative, the priority to subtract from the transaction's computed priory. Computed priority is the age of each input in days since it was added to the block chain as an output (coinage) times the value of the input in satoshis (value) divided by the size of the serialized transaction (size), which is `coinage * value / size`" - -{% enditemplate %} - -*Parameter #3---the change to make to the virtual fee* +*Parameter #2---the change to make to the virtual fee* {% itemplate ntpd1 %} - n: "Fee" @@ -53,12 +44,12 @@ The `prioritisetransaction` RPC {{summary_prioritiseTransaction}} {% enditemplate %} -*Example from Dash Core 0.12.2* +*Example from Dash Core 0.14.0* {% highlight bash %} dash-cli -testnet prioritisetransaction \ f86c74f27fdd9c7e618d69b3606eeae1710b3f02fabede6ae8c88dd7bb756942 \ - 1234 456789 + 456789 {% endhighlight %} Result: diff --git a/_includes/helpers/summaries.md b/_includes/helpers/summaries.md index c97cb6d9..cb470aee 100644 --- a/_includes/helpers/summaries.md +++ b/_includes/helpers/summaries.md @@ -19,9 +19,9 @@ This file is licensed under the terms of its source texts{%endcomment%} {% assign summary_dumpWallet="creates or overwrites a file with all wallet keys in a human-readable format." %} {% assign summary_encryptWallet="encrypts the wallet with a passphrase. This is only to enable encryption for the first time. After encryption is enabled, you will need to enter the passphrase to use private keys." %} {% assign summary_estimateFee="estimates the transaction fee per kilobyte that needs to be paid for a transaction to begin confirmation within a certain number of blocks." %} -{% 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="was removed in Dash Core 0.14.0." %} {% assign summary_estimateSmartFee="estimates the transaction fee per kilobyte that needs to be paid for a transaction to begin confirmation within a certain number of blocks and returns the number of blocks for which the estimate is valid." %} -{% assign summary_estimateSmartPriority="estimates the priority that a transaction needs in order to be included within a certain number of blocks as a free high-priority transaction and returns the number of blocks for which the estimate is valid." %} +{% assign summary_estimateSmartPriority="was removed in Dash Core 0.14.0." %} {% assign summary_fundRawTransaction="adds inputs to a transaction until it has enough in value to meet its out value." %} {% assign summary_gObject="provides a set of commands for managing governance objects and displaying information about them." %} {% assign summary_generate="mines blocks immediately (before the RPC call returns)." %} diff --git a/_includes/layout/base/rpc-table.html b/_includes/layout/base/rpc-table.html index 8bcf9193..9bede4cf 100644 --- a/_includes/layout/base/rpc-table.html +++ b/_includes/layout/base/rpc-table.html @@ -209,13 +209,13 @@ th.tg-sort-header::-moz-selection { background:transparent; }th.tg-sort-header:: Control Debug Y - Updated in 0.12.3.0 + Updated in 0.14.0 Control GetInfo Y - + Updated in 0.14.0 Control @@ -359,7 +359,7 @@ th.tg-sort-header::-moz-selection { background:transparent; }th.tg-sort-header:: Mining PrioritiseTransaction Y - + Updated in 0.14.0 Mining @@ -407,7 +407,7 @@ th.tg-sort-header::-moz-selection { background:transparent; }th.tg-sort-header:: Network GetNetworkInfo Y - Updated in 0.12.3.0 + Updated in 0.14.0 Network @@ -509,7 +509,7 @@ th.tg-sort-header::-moz-selection { background:transparent; }th.tg-sort-header:: Util EstimatePriority Y - Deprecated in 0.12.3.0 + Removed in 0.14.0 Util @@ -521,7 +521,7 @@ th.tg-sort-header::-moz-selection { background:transparent; }th.tg-sort-header:: Util EstimateSmartPriority Y - Deprecated in 0.12.3.0 + Removed in 0.14.0 Util