diff --git a/_includes/devdoc/dash-core/rpcs/rpcs/move.md b/_includes/devdoc/dash-core/rpcs/rpcs/move.md index 9bb9a73c..f3e6f668 100644 --- a/_includes/devdoc/dash-core/rpcs/rpcs/move.md +++ b/_includes/devdoc/dash-core/rpcs/rpcs/move.md @@ -9,19 +9,21 @@ http://opensource.org/licenses/MIT. {% assign summary_move="moves a specified amount from one account in your wallet to another using an off-block-chain transaction." %} + + {% autocrossref %} *Requires wallet support.* The `move` RPC {{summary_move}} -{{WARNING}} `move` will be removed in a later version of Bitcoin +{{WARNING}} `move` will be removed in a later version of Dash Core. Use the RPCs listed in the See Also subsection below instead. {{WARNING}} it's allowed to move more funds than are in an account, giving the sending account a negative balance and giving the receiving -account a balance that may exceed the number of bitcoins in the wallet -(or the number of bitcoins in existence). +account a balance that may exceed the number of dash in the wallet +(or the number of dash in existence). *Parameter #1---from account* @@ -47,9 +49,9 @@ account a balance that may exceed the number of bitcoins in the wallet {% itemplate ntpd1 %} - n: "Amount" - t: "number (bitcoins)" + t: "number (dash)" p: "Required
(exactly 1)" - d: "The amount of bitcoins to move" + d: "The amount of dash to move" {% enditemplate %} @@ -83,13 +85,13 @@ account a balance that may exceed the number of bitcoins in the wallet {% enditemplate %} -*Example from Bitcoin Core 0.10.0* +*Example from Dash Core 0.12.2* -Move 0.1 bitcoins from "doc test" to "test1", giving the transaction the +Move 1 dash from "doc test" to "test1", giving the transaction the comment "Example move": {% highlight bash %} -bitcoin-cli -testnet move "doc test" "test1" 0.1 0 "Example move" +dash-cli -testnet move "doc test" "test1" 0.1 0 "Example move" {% endhighlight %} Result: diff --git a/_includes/devdoc/dash-core/rpcs/rpcs/sendfrom.md b/_includes/devdoc/dash-core/rpcs/rpcs/sendfrom.md index 2eaa73cb..dc922693 100644 --- a/_includes/devdoc/dash-core/rpcs/rpcs/sendfrom.md +++ b/_includes/devdoc/dash-core/rpcs/rpcs/sendfrom.md @@ -7,7 +7,9 @@ http://opensource.org/licenses/MIT. ##### SendFrom {% include helpers/subhead-links.md %} -{% assign summary_sendFrom="spends an amount from a local account to a bitcoin address." %} +{% assign summary_sendFrom="spends an amount from a local account to a dash address." %} + + {% autocrossref %} @@ -16,7 +18,7 @@ unencrypted wallet.* The `sendfrom` RPC {{summary_sendFrom}} -{{WARNING}} `sendfrom` will be removed in a later version of Bitcoin +{{WARNING}} `sendfrom` will be removed in a later version of Dash Core. Use the RPCs listed in the See Also subsection below instead. *Parameter #1---from account* @@ -25,7 +27,7 @@ Core. Use the RPCs listed in the See Also subsection below instead. - n: "From Account" t: "string" p: "Required
(exactly 1)" - d: "The name of the account from which the bitcoins should be spent. Use an empty string (\"\") for the default account" + d: "The name of the account from which the dash should be spent. Use an empty string (\"\") for the default account" {% enditemplate %} @@ -35,7 +37,7 @@ Core. Use the RPCs listed in the See Also subsection below instead. - n: "To Address" t: "string" p: "Required
(exactly 1)" - d: "A P2PKH or P2SH address to which the bitcoins should be sent" + d: "A P2PKH or P2SH address to which the dash should be sent" {% enditemplate %} @@ -43,9 +45,9 @@ Core. Use the RPCs listed in the See Also subsection below instead. {% itemplate ntpd1 %} - n: "Amount" - t: "number (bitcoins)" + t: "number (dash)" p: "Required
(exactly 1)" - d: "The amount to spend in bitcoins. Bitcoin Core will ensure the account has sufficient bitcoins to pay this amount (but the transaction fee paid is not included in the calculation, so an account can spend a total of its balance plus the transaction fee)" + d: "The amount to spend in dash. Dash Core will ensure the account has sufficient dash to pay this amount (but the transaction fee paid is not included in the calculation, so an account can spend a total of its balance plus the transaction fee)" {% enditemplate %} @@ -53,7 +55,11 @@ Core. Use the RPCs listed in the See Also subsection below instead. {{INCLUDE_SPEND_CONFIRMATIONS}} -*Parameter #5---a comment* +*Parameter #5---whether to add 5 confirmations to transactions locked via InstantSend* + +{{INCLUDE_ADD_LOCK_CONFIRMATIONS_PARAMETER}} + +*Parameter #6---a comment* {% itemplate ntpd1 %} - n: "Comment" @@ -63,7 +69,7 @@ Core. Use the RPCs listed in the See Also subsection below instead. {% enditemplate %} -*Parameter #6---a comment about who the payment was sent to* +*Parameter #7---a comment about who the payment was sent to* {% itemplate ntpd1 %} - n: "Comment To" @@ -83,19 +89,20 @@ Core. Use the RPCs listed in the See Also subsection below instead. {% enditemplate %} -*Example from Bitcoin Core 0.10.0* +*Example from Dash Core 0.12.2* -Spend 0.1 bitcoins from the account "test" to the address indicated below +Spend 0.1 dash from the account "test" to the address indicated below using only UTXOs with at least six confirmations, giving the transaction the comment "Example spend" and labeling the spender "Example.com": {% highlight bash %} -bitcoin-cli -testnet sendfrom "test" \ - mgnucj8nYqdrPFh2JfZSB1NmUThUGnmsqe \ +dash-cli -testnet sendfrom "test" \ + yhJays6zGUFKq1KS5V5WLbyk3cwCXyGrKd \ 0.1 \ 6 \ + false \ "Example spend" \ "Example.com" {% endhighlight %} @@ -103,7 +110,7 @@ bitcoin-cli -testnet sendfrom "test" \ Result: {% highlight text %} -f14ee5368c339644d3037d929bbe1f1544a532f8826c7b7288cb994b0b0ff5d8 +cd64b9d55c63bf247f2eca32f978e340622107b607a46c422dabcdc20c0571fe {% endhighlight %} *See also* diff --git a/_includes/devdoc/dash-core/rpcs/rpcs/sendmany.md b/_includes/devdoc/dash-core/rpcs/rpcs/sendmany.md index 8358e0e3..ebe4f37a 100644 --- a/_includes/devdoc/dash-core/rpcs/rpcs/sendmany.md +++ b/_includes/devdoc/dash-core/rpcs/rpcs/sendmany.md @@ -9,6 +9,8 @@ http://opensource.org/licenses/MIT. {% assign summary_sendMany="creates and broadcasts a transaction which sends outputs to multiple addresses." %} + + {% autocrossref %} *Requires wallet support. Requires an unlocked wallet or an @@ -22,7 +24,7 @@ The `sendmany` RPC {{summary_sendMany}} - n: "From Account" t: "string" p: "Required
(exactly 1)" - d: "*Deprecated: will be removed in a later version of Bitcoin Core*

The name of the account from which the bitcoins should be spent. Use an empty string (\"\") for the default account. Bitcoin Core will ensure the account has sufficient bitcoins to pay the total amount in the *outputs* field described below (but the transaction fee paid is not included in the calculation, so an account can spend a total of its balance plus the transaction fee)" + d: "*Deprecated: will be removed in a later version of Dash Core*

The name of the account from which the dash should be spent. Use an empty string (\"\") for the default account. Dash Core will ensure the account has sufficient dash to pay the total amount in the *outputs* field described below (but the transaction fee paid is not included in the calculation, so an account can spend a total of its balance plus the transaction fee)" {% enditemplate %} @@ -35,9 +37,9 @@ The `sendmany` RPC {{summary_sendMany}} d: "An object containing key/value pairs corresponding to the addresses and amounts to pay" - n: "→
Address/Amount" - t: "string (base58) : number (bitcoins)" + t: "string (base58) : number (dash)" p: "Required
(1 or more)" - d: "A key/value pair with a base58check-encoded string containing the P2PKH or P2SH address to pay as the key, and an amount of bitcoins to pay as the value" + d: "A key/value pair with a base58check-encoded string containing the P2PKH or P2SH address to pay as the key, and an amount of dash to pay as the value" {% enditemplate %} @@ -45,7 +47,10 @@ The `sendmany` RPC {{summary_sendMany}} {{INCLUDE_SPEND_CONFIRMATIONS}} -*Parameter #4---a comment* +*Parameter #4--whether to add 5 confirmations to transactions locked via InstantSend* +{{INCLUDE_ADD_LOCK_CONFIRMATIONS_PARAMETER}} + +*Parameter #5---a comment* {% itemplate ntpd1 %} - n: "Comment" @@ -55,20 +60,40 @@ The `sendmany` RPC {{summary_sendMany}} {% enditemplate %} -*Parameter #5---automatic fee subtraction* +*Parameter #6---automatic fee subtraction* {% itemplate ntpd1 %} - n: "Subtract Fee From Amount" t: "array" p: "Optional
(0 or 1)" d: "An array of addresses. The fee will be equally divided by as many addresses as are entries in this array and subtracted from each address. If this array is empty or not provided, the fee will be paid by the sender" - + - n: "→
Address" t: "string (base58)" p: "Optional (0 or more)" d: "An address previously listed as one of the recipients." {% enditemplate %} +*Parameter #7---use InstantSend* + +{% itemplate ntpd1 %} +- n: "Use InstantSend" + t: "bool" + p: "Optional
(0 or 1)" + d: "If set to `true`, send this transaction as InstantSend (default: false)." + +{% enditemplate %} + +*Parameter #8---use PrivateSend* + +{% itemplate ntpd1 %} +- n: "Use PrivateSend" + t: "bool" + p: "Optional
(0 or 1)" + d: "If set to `true`, use anonymized funds only (default: false)." + +{% enditemplate %} + *Result---a TXID of the sent transaction* {% itemplate ntpd1 %} @@ -79,27 +104,85 @@ The `sendmany` RPC {{summary_sendMany}} {% enditemplate %} -*Example from Bitcoin Core 0.10.0* +*Example from Dash Core 0.12.2* -From the account *test1*, send 0.1 bitcoins to the first address and 0.2 -bitcoins to the second address, with a comment of "Example Transaction". +From the account *test1*, send 0.1 dash to the first address and 0.2 +dash to the second address, with a comment of "Example Transaction". {% highlight bash %} -bitcoin-cli -testnet sendmany \ +dash-cli -testnet sendmany \ "test1" \ ''' { - "mjSk1Ny9spzU2fouzYgLqGUD8U41iR35QN": 0.1, - "mgnucj8nYqdrPFh2JfZSB1NmUThUGnmsqe": 0.2 + "ySutkc49Khpz1HQN8AfWNitVBLwqtyaxvv": 0.1, + "yhQrX8CZTTfSjKmaq5h7DgSShyEsumCRBi": 0.2 } ''' \ 6 \ + false \ "Example Transaction" {% endhighlight %} Result: {% highlight text %} -ec259ab74ddff199e61caa67a26e29b13b5688dc60f509ce0df4d044e8f4d63d +a7c0194a005a220b9bfeb5fdd12d5b90979c10f53de4f8a48a1495aa198a6b95 +{% endhighlight %} + +*Example from Dash Core 0.12.2 (InstantSend)* + +From the account *test1*, send 0.1 dash to the first address and 0.2 +dash to the second address using InstantSend, with a comment of "Example Transaction". + +{% highlight bash %} +dash-cli -testnet sendmany \ + "test1" \ + ''' + { + "ySutkc49Khpz1HQN8AfWNitVBLwqtyaxvv": 0.1, + "yhQrX8CZTTfSjKmaq5h7DgSShyEsumCRBi": 0.2 + } ''' \ + 6 \ + false \ + "Example Transaction" + ''' + [""] + ''' \ + true +{% endhighlight %} + +Result: + +{% highlight text %} +3a5bbaa1a7aa3a8af45e8f1adf79528f99efc61052b0616d41b33fb8fb7af347 +{% endhighlight %} + +*Example from Dash Core 0.12.2 (PrivateSend)* + +From the account *test1*, send 0.1 dash to the first address and 0.2 +dash to the second address using PrivateSend, with a comment of "Example Transaction". + +{% highlight bash %} +dash-cli -testnet sendmany \ + "test1" \ + ''' + { + "ySutkc49Khpz1HQN8AfWNitVBLwqtyaxvv": 0.1, + "yhQrX8CZTTfSjKmaq5h7DgSShyEsumCRBi": 0.2 + } ''' \ + 6 \ + false \ + "Example Transaction" + ''' + [""] + ''' \ + false \ + true +{% endhighlight %} + +Result: + +{% highlight text %} +43337c8e4f3b21bedad7765fa851a6e855e4bb04f60d6b3e4c091ed21ffc5753 {% endhighlight %} *See also* diff --git a/_includes/devdoc/dash-core/rpcs/rpcs/sendtoaddress.md b/_includes/devdoc/dash-core/rpcs/rpcs/sendtoaddress.md index ead7971a..05ce636e 100644 --- a/_includes/devdoc/dash-core/rpcs/rpcs/sendtoaddress.md +++ b/_includes/devdoc/dash-core/rpcs/rpcs/sendtoaddress.md @@ -9,6 +9,8 @@ http://opensource.org/licenses/MIT. {% assign summary_sendToAddress="spends an amount to a given address." %} + + {% autocrossref %} *Requires wallet support. Requires an unlocked wallet or an @@ -22,7 +24,7 @@ The `sendtoaddress` RPC {{summary_sendToAddress}} - n: "To Address" t: "string" p: "Required
(exactly 1)" - d: "A P2PKH or P2SH address to which the bitcoins should be sent" + d: "A P2PKH or P2SH address to which the dash should be sent" {% enditemplate %} @@ -30,9 +32,9 @@ The `sendtoaddress` RPC {{summary_sendToAddress}} {% itemplate ntpd1 %} - n: "Amount" - t: "number (bitcoins)" + t: "number (dash)" p: "Required
(exactly 1)" - d: "The amount to spent in bitcoins" + d: "The amount to spent in dash" {% enditemplate %} @@ -62,8 +64,28 @@ The `sendtoaddress` RPC {{summary_sendToAddress}} - n: "Subtract Fee From Amount" t: "boolean" p: "Optional
(0 or 1)" - d: "The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. Default is `false`" - + d: "The fee will be deducted from the amount being sent. The recipient will receive less dash than you enter in the amount field. Default is `false`" + +{% enditemplate %} + +*Parameter #6---use InstantSend* + +{% itemplate ntpd1 %} +- n: "Use InstantSend" + t: "bool" + p: "Optional
(0 or 1)" + d: "If set to `true`, send this transaction as InstantSend (default: false)." + +{% enditemplate %} + +*Parameter #7---use PrivateSend* + +{% itemplate ntpd1 %} +- n: "Use PrivateSend" + t: "bool" + p: "Optional
(0 or 1)" + d: "If set to `true`, use anonymized funds only (default: false)." + {% enditemplate %} *Result---a TXID of the sent transaction* @@ -73,23 +95,71 @@ The `sendtoaddress` RPC {{summary_sendToAddress}} t: "string" p: "Required
(exactly 1)" d: "The TXID of the sent transaction, encoded as hex in RPC byte order" - + {% enditemplate %} -*Example from Bitcoin Core 0.10.0* +*Example from Dash Core 0.12.2* -Spend 0.1 bitcoins to the address below with the comment "sendtoadress +Spend 0.1 dash to the address below with the comment "sendtoadress example" and the comment-to "Nemo From Example.com": {% highlight bash %} -bitcoin-cli -testnet sendtoaddress mmXgiR6KAhZCyQ8ndr2BCfEq1wNG2UnyG6 \ - 0.1 "sendtoaddress example" "Nemo From Example.com" +dash-cli -testnet sendtoaddress ySutkc49Khpz1HQN8AfWNitVBLwqtyaxvv \ + 1.0 "sendtoaddress example" "Nemo From Example.com" {% endhighlight %} Result: {% highlight text %} -a2a2eb18cb051b5fe896a32b1cb20b179d981554b6bd7c5a956e56a0eecb04f0 +70e2029d363f0110fe8a0aa2ba7bd771a579453135568b2aa559b2cb30f875aa +{% endhighlight %} + +*Example from Dash Core 0.12.2 (InstantSend)* + +Spend 0.1 dash via InstantSend to the address below with the comment "sendtoadress +example" and the comment-to "Nemo From Example.com": + +{% highlight bash %} +dash-cli -testnet sendtoaddress ySutkc49Khpz1HQN8AfWNitVBLwqtyaxvv \ + 1.0 "sendtoaddress example" "Nemo From Example.com" false true +{% endhighlight %} + +Result: + +{% highlight text %} +af002b9c931b5efb5b2852df3d65efd48c3b9ac2ba0ef8a4cf97b894f3ff08c2 +{% endhighlight %} + +*Example from Dash Core 0.12.2 (PrivateSend)* + +Spend 0.1 dash via PrivateSend to the address below with the comment "sendtoadress +example" and the comment-to "Nemo From Example.com": + +{% highlight bash %} +dash-cli -testnet sendtoaddress ySutkc49Khpz1HQN8AfWNitVBLwqtyaxvv \ + 1.0 "sendtoaddress example" "Nemo From Example.com" false false true +{% endhighlight %} + +Result: + +{% highlight text %} +949833bc49e0643f63e2afed1704ccccf005a93067a4e46165b06ace42544694 +{% endhighlight %} + +*Example from Dash Core 0.12.2 (InstantSend + PrivateSend)* + +Spend 0.1 dash via InstantSend and PrivateSend to the address below with the +comment "sendtoadressexample" and the comment-to "Nemo From Example.com": + +{% highlight bash %} +dash-cli -testnet sendtoaddress ySutkc49Khpz1HQN8AfWNitVBLwqtyaxvv \ + 1.008 "sendtoaddress example" "Nemo From Example.com" false true true +{% endhighlight %} + +Result: + +{% highlight text %} +ba4bbe29fa06b67d6f3f3a73e381627e66abe22e217ce329aefad41ea72c3922 {% endhighlight %} *See also* diff --git a/_includes/helpers/summaries.md b/_includes/helpers/summaries.md index 64525770..f0393b38 100644 --- a/_includes/helpers/summaries.md +++ b/_includes/helpers/summaries.md @@ -113,7 +113,7 @@ This file is licensed under the terms of its source texts{%endcomment%} {% assign summary_restGetMemPool-contents="returns all transaction in the memory pool with detailed information." %} {% assign summary_restGetMemPool-info="returns information about the node's current transaction memory pool." %} {% assign summary_restGetTx="gets a hex-encoded serialized transaction or a JSON object describing the transaction. By default, Bitcoin Core only stores complete transaction data for UTXOs and your own transactions, so this method may fail on historic transactions unless you use the non-default `txindex=1` in your Bitcoin Core startup settings." %} -{% assign summary_sendFrom="spends an amount from a local account to a bitcoin address." %} +{% assign summary_sendFrom="spends an amount from a local account to a dash address." %} {% assign summary_sendMany="creates and broadcasts a transaction which sends outputs to multiple addresses." %} {% assign summary_sendRawTransaction="validates a transaction and broadcasts it to the peer-to-peer network." %} {% assign summary_sendToAddress="spends an amount to a given address." %} diff --git a/_includes/helpers/vars.md b/_includes/helpers/vars.md index 87f24a6d..322e1f8d 100644 --- a/_includes/helpers/vars.md +++ b/_includes/helpers/vars.md @@ -319,6 +319,17 @@ NOT IN DASH {% enditemplate %} {% endcapture %} +{% capture INCLUDE_ADD_LOCK_CONFIRMATIONS_PARAMETER %} +{% itemplate ntpd1 %} +- n: "addlockconf" + 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." + +{% enditemplate %} +{% endcapture %} + + {% assign WARNING="![Warning icon](/img/icons/icon_warning.svg) **Warning:**" %} {% assign WARNING_ICON="![Warning icon](/img/icons/icon_warning.svg)" %}