From c31012eb70ecd9794c0abc3989f1a55faf33d1f6 Mon Sep 17 00:00:00 2001 From: thephez Date: Mon, 22 Oct 2018 15:16:30 -0400 Subject: [PATCH] Content - RPC - addlockconf to addlocked conversion - Update 8 RPCs based on dashpay/dash#2040 --- .../devdoc/dash-core/rpcs/rpcs/getbalance.md | 6 +++--- .../dash-core/rpcs/rpcs/getreceivedbyaccount.md | 6 +++--- .../dash-core/rpcs/rpcs/getreceivedbyaddress.md | 6 +++--- .../devdoc/dash-core/rpcs/rpcs/listaccounts.md | 6 +++--- .../dash-core/rpcs/rpcs/listreceivedbyaccount.md | 6 +++--- .../dash-core/rpcs/rpcs/listreceivedbyaddress.md | 6 +++--- _includes/devdoc/dash-core/rpcs/rpcs/sendfrom.md | 4 ++-- _includes/devdoc/dash-core/rpcs/rpcs/sendmany.md | 4 ++-- _includes/helpers/vars.md | 6 +++--- _includes/layout/base/rpc-table.html | 16 ++++++++-------- 10 files changed, 33 insertions(+), 33 deletions(-) diff --git a/_includes/devdoc/dash-core/rpcs/rpcs/getbalance.md b/_includes/devdoc/dash-core/rpcs/rpcs/getbalance.md index efc86e5e..d47311d4 100644 --- a/_includes/devdoc/dash-core/rpcs/rpcs/getbalance.md +++ b/_includes/devdoc/dash-core/rpcs/rpcs/getbalance.md @@ -31,13 +31,13 @@ The `getbalance` RPC {{summary_getBalance}} {{INCLUDE_CONFIRMATIONS_PARAMETER}} -*Parameter #3---whether to add 5 confirmations to transactions locked via InstantSend* +*Parameter #3---whether to add the balance from transactions locked via InstantSend* {% itemplate ntpd1 %} -- n: "addlockconf" +- n: "addlocked" t: "bool" p: "Optional
(exactly 1)" - d: "Add the number of InstantSend confirmations to InstantSend locked transactions" + d: "Add the balance from InstantSend locked transactions" {% enditemplate %} diff --git a/_includes/devdoc/dash-core/rpcs/rpcs/getreceivedbyaccount.md b/_includes/devdoc/dash-core/rpcs/rpcs/getreceivedbyaccount.md index 7ed4e40d..64a9ac36 100644 --- a/_includes/devdoc/dash-core/rpcs/rpcs/getreceivedbyaccount.md +++ b/_includes/devdoc/dash-core/rpcs/rpcs/getreceivedbyaccount.md @@ -34,13 +34,13 @@ Core. Use the RPCs listed in the See Also subsection below instead. {{INCLUDE_CONFIRMATIONS_PARAMETER}} -*Parameter #3---whether to add 5 confirmations to transactions locked via InstantSend* +*Parameter #3---whether to include transactions locked via InstantSend* {% itemplate ntpd1 %} -- n: "addlockconf" +- n: "addlocked" t: "bool" p: "Optional
(exactly 1)" - d: "Add the number of InstantSend confirmations to InstantSend locked transactions (default=false)" + d: "Add the balance from InstantSend locked transactions (default=false)" {% enditemplate %} diff --git a/_includes/devdoc/dash-core/rpcs/rpcs/getreceivedbyaddress.md b/_includes/devdoc/dash-core/rpcs/rpcs/getreceivedbyaddress.md index b2d87964..1cc1b113 100644 --- a/_includes/devdoc/dash-core/rpcs/rpcs/getreceivedbyaddress.md +++ b/_includes/devdoc/dash-core/rpcs/rpcs/getreceivedbyaddress.md @@ -31,13 +31,13 @@ The `getreceivedbyaddress` RPC {{summary_getReceivedByAddress}} {{INCLUDE_CONFIRMATIONS_PARAMETER}} -*Parameter #3---whether to add 5 confirmations to transactions locked via InstantSend* +*Parameter #3---whether to include transactions locked via InstantSend* {% itemplate ntpd1 %} -- n: "addlockconf" +- n: "addlocked" t: "bool" p: "Optional
(exactly 1)" - d: "Add the number of InstantSend confirmations to InstantSend locked transactions" + d: "Add the balance from InstantSend locked transactions" {% enditemplate %} diff --git a/_includes/devdoc/dash-core/rpcs/rpcs/listaccounts.md b/_includes/devdoc/dash-core/rpcs/rpcs/listaccounts.md index 042e238c..3fd6b56b 100644 --- a/_includes/devdoc/dash-core/rpcs/rpcs/listaccounts.md +++ b/_includes/devdoc/dash-core/rpcs/rpcs/listaccounts.md @@ -24,13 +24,13 @@ Core. Use the RPCs listed in the See Also subsection below instead. {{INCLUDE_CONFIRMATIONS_PARAMETER}} -*Parameter #2---whether to add 5 confirmations to transactions locked via InstantSend* +*Parameter #2--- whether to include transactions locked via InstantSend* {% itemplate ntpd1 %} -- n: "addlockconf" +- n: "addlocked" t: "bool" p: "Optional
(exactly 1)" - d: "Add the number of InstantSend confirmations to InstantSend locked transactions" + d: "Add the balance from InstantSend locked transactions" {% enditemplate %} diff --git a/_includes/devdoc/dash-core/rpcs/rpcs/listreceivedbyaccount.md b/_includes/devdoc/dash-core/rpcs/rpcs/listreceivedbyaccount.md index 9ce6d3e3..390ecc64 100644 --- a/_includes/devdoc/dash-core/rpcs/rpcs/listreceivedbyaccount.md +++ b/_includes/devdoc/dash-core/rpcs/rpcs/listreceivedbyaccount.md @@ -24,13 +24,13 @@ Core. Use the RPCs listed in the See Also subsection below instead. {{INCLUDE_CONFIRMATIONS_PARAMETER}} -*Parameter #2---whether to add 5 confirmations to transactions locked via InstantSend* +*Parameter #2---whether to include transactions locked via InstantSend* {% itemplate ntpd1 %} -- n: "addlockconf" +- n: "addlocked" t: "bool" p: "Optional
(exactly 1)" - d: "Add the number of InstantSend confirmations to InstantSend locked transactions" + d: "Add the balance from InstantSend locked transactions" {% enditemplate %} diff --git a/_includes/devdoc/dash-core/rpcs/rpcs/listreceivedbyaddress.md b/_includes/devdoc/dash-core/rpcs/rpcs/listreceivedbyaddress.md index dea5c33f..1d892892 100644 --- a/_includes/devdoc/dash-core/rpcs/rpcs/listreceivedbyaddress.md +++ b/_includes/devdoc/dash-core/rpcs/rpcs/listreceivedbyaddress.md @@ -21,13 +21,13 @@ The `listreceivedbyaddress` RPC {{summary_listReceivedByAddress}} {{INCLUDE_CONFIRMATIONS_PARAMETER}} -*Parameter #2---whether to add 5 confirmations to transactions locked via InstantSend* +*Parameter #2---whether to include transactions locked via InstantSend* {% itemplate ntpd1 %} -- n: "addlockconf" +- n: "addlocked" t: "bool" p: "Optional
(exactly 1)" - d: "Add the number of InstantSend confirmations to InstantSend locked transactions" + d: "Add the balance from InstantSend locked transactions" {% enditemplate %} diff --git a/_includes/devdoc/dash-core/rpcs/rpcs/sendfrom.md b/_includes/devdoc/dash-core/rpcs/rpcs/sendfrom.md index dc922693..08b9bfa4 100644 --- a/_includes/devdoc/dash-core/rpcs/rpcs/sendfrom.md +++ b/_includes/devdoc/dash-core/rpcs/rpcs/sendfrom.md @@ -55,9 +55,9 @@ Core. Use the RPCs listed in the See Also subsection below instead. {{INCLUDE_SPEND_CONFIRMATIONS}} -*Parameter #5---whether to add 5 confirmations to transactions locked via InstantSend* +*Parameter #5---whether to add the balance from transactions locked via InstantSend* -{{INCLUDE_ADD_LOCK_CONFIRMATIONS_PARAMETER}} +{{INCLUDE_ADD_LOCKED_PARAMETER}} *Parameter #6---a comment* diff --git a/_includes/devdoc/dash-core/rpcs/rpcs/sendmany.md b/_includes/devdoc/dash-core/rpcs/rpcs/sendmany.md index ebe4f37a..98b78f15 100644 --- a/_includes/devdoc/dash-core/rpcs/rpcs/sendmany.md +++ b/_includes/devdoc/dash-core/rpcs/rpcs/sendmany.md @@ -47,8 +47,8 @@ The `sendmany` RPC {{summary_sendMany}} {{INCLUDE_SPEND_CONFIRMATIONS}} -*Parameter #4--whether to add 5 confirmations to transactions locked via InstantSend* -{{INCLUDE_ADD_LOCK_CONFIRMATIONS_PARAMETER}} +*Parameter #4--whether to add the balance from transactions locked via InstantSend* +{{INCLUDE_ADD_LOCKED_PARAMETER}} *Parameter #5---a comment* diff --git a/_includes/helpers/vars.md b/_includes/helpers/vars.md index b3ba1ee9..2c5e238d 100644 --- a/_includes/helpers/vars.md +++ b/_includes/helpers/vars.md @@ -319,12 +319,12 @@ NOT IN DASH {% enditemplate %} {% endcapture %} -{% capture INCLUDE_ADD_LOCK_CONFIRMATIONS_PARAMETER %} +{% capture INCLUDE_ADD_LOCKED_PARAMETER %} {% itemplate ntpd1 %} -- n: "addlockconf" +- n: "addlocked" t: "bool" p: "Optional
(0 or 1)" - d: "If set to `true`, add the number of InstantSend confirmations (default=5) to the confirmation count for transactions locked via InstantSend. If set to `false` (the default), the standard confirmation count is not modified for InstantSend transactions." + d: "If set to `true`, add the balance from InstantSend locked transactions. If set to `false` (the default), InstantSend locked transaction balances are not included." {% enditemplate %} {% endcapture %} diff --git a/_includes/layout/base/rpc-table.html b/_includes/layout/base/rpc-table.html index fd761ba9..05ab5043 100644 --- a/_includes/layout/base/rpc-table.html +++ b/_includes/layout/base/rpc-table.html @@ -605,7 +605,7 @@ th.tg-sort-header::-moz-selection { background:transparent; }th.tg-sort-header:: Wallet GetBalance Y - + Updated in 0.12.4.0 Wallet @@ -623,13 +623,13 @@ th.tg-sort-header::-moz-selection { background:transparent; }th.tg-sort-header:: Wallet GetReceivedByAccount Y - + Updated in 0.12.4.0 Wallet GetReceivedByAddress Y - + Updated in 0.12.4.0 Wallet @@ -713,7 +713,7 @@ th.tg-sort-header::-moz-selection { background:transparent; }th.tg-sort-header:: Wallet ListAccounts Y - + Updated in 0.12.4.0 Wallet @@ -737,13 +737,13 @@ th.tg-sort-header::-moz-selection { background:transparent; }th.tg-sort-header:: Wallet ListReceivedByAccount Y - + Updated in 0.12.4.0 Wallet ListReceivedByAddress Y - + Updated in 0.12.4.0 Wallet @@ -785,13 +785,13 @@ th.tg-sort-header::-moz-selection { background:transparent; }th.tg-sort-header:: Wallet SendFrom Y - + Updated in 0.12.4.0 Wallet SendMany Y - + Updated in 0.12.4.0 Wallet