diff --git a/_includes/devdoc/dash-core/rpcs/quick-reference.md b/_includes/devdoc/dash-core/rpcs/quick-reference.md index a44e38ed..2aa3a143 100644 --- a/_includes/devdoc/dash-core/rpcs/quick-reference.md +++ b/_includes/devdoc/dash-core/rpcs/quick-reference.md @@ -110,7 +110,7 @@ These RPCs are all Dash-specific and not found in Bitcoin Core * [GetMemPoolDescendants][rpc getmempooldescendants]: {{summary_getMemPoolDescendants}} {{DASH_NEW0_12_3}} {{NEW0_13_0}} * [GetMemPoolEntry][rpc getmempoolentry]: {{summary_getMemPoolEntry}} {{DASH_NEW0_12_3}} {{NEW0_13_0}} * [GetMemPoolInfo][rpc getmempoolinfo]: {{summary_getMemPoolInfo}} {{UPDATED0_12_0}} -* [GetRawMemPool][rpc getrawmempool]: {{summary_getRawMemPool}} {{UPDATED0_13_0}} +* [GetRawMemPool][rpc getrawmempool]: {{summary_getRawMemPool}} {{DASH_UPDATED0_12_3}} {{UPDATED0_13_0}} * [GetSpentInfo][rpc getspentinfo]: {{summary_getSpentInfo}} {{DASH_NEW0_12_1}} * [GetTxOut][rpc gettxout]: {{summary_getTxOut}} * [GetTxOutProof][rpc gettxoutproof]: {{summary_getTxOutProof}} {{NEW0_11_0}} @@ -150,7 +150,7 @@ These RPCs are all Dash-specific and not found in Bitcoin Core * [MasternodeBroadcast][rpc masternodebroadcast]: {{summary_masternodeBroadcast}} * [MasternodeList][rpc masternodelist]: {{summary_masternodeList}} {{DASH_UPDATED0_12_3}} * [MnSync][rpc mnsync]: {{summary_mnSync}} -* [PrivateSend][rpc privatesend]: {{summary_privateSend}} +* [PrivateSend][rpc privatesend]: {{summary_privateSend}} {{DASH_UPDATED0_12_3}} * [SentinelPing][rpc sentinelping]: {{summary_sentinelPing}} * [Spork][rpc spork]: {{summary_spork-rpc}} * [VoteRaw][rpc voteraw]: {{summary_voteRaw}} @@ -264,7 +264,7 @@ default. * [GetReceivedByAddress][rpc getreceivedbyaddress]: {{summary_getReceivedByAddress}} * [GetTransaction][rpc gettransaction]: {{summary_getTransaction}} {{UPDATED0_12_0}} * [GetUnconfirmedBalance][rpc getunconfirmedbalance]: {{summary_getUnconfirmedBalance}} -* [GetWalletInfo][rpc getwalletinfo]: {{summary_getWalletInfo}} +* [GetWalletInfo][rpc getwalletinfo]: {{summary_getWalletInfo}} {{DASH_UPDATED0_12_3}} * [ImportAddress][rpc importaddress]: {{summary_importAddress}} * [ImportElectrumWallet][rpc importelectrumwallet]: {{summary_importElectrumWallet}} {{DASH_NEW0_12_1}} * [ImportMulti][rpc importmulti]: {{summary_importMulti}} {{DASH_NEW0_12_3}} {{NEW0_14_0}} diff --git a/_includes/devdoc/dash-core/rpcs/rpcs/getrawmempool.md b/_includes/devdoc/dash-core/rpcs/rpcs/getrawmempool.md index a95dc1f7..e5224288 100644 --- a/_includes/devdoc/dash-core/rpcs/rpcs/getrawmempool.md +++ b/_includes/devdoc/dash-core/rpcs/rpcs/getrawmempool.md @@ -9,6 +9,8 @@ http://opensource.org/licenses/MIT. {% assign summary_getRawMemPool="returns all transaction identifiers (TXIDs) in the memory pool as a JSON array, or detailed information about each transaction in the memory pool as a JSON object." %} + + {% autocrossref %} The `getrawmempool` RPC {{summary_getRawMemPool}} @@ -101,6 +103,21 @@ The `getrawmempool` RPC {{summary_getRawMemPool}} p: "Required
(exactly 1)" d: "*Added in Bitcoin Core 0.12.0*

The modified fees (see `modifiedfee` above) of in-mempool descendants (including this one)" +- n: "→ →
`ancestorcount`" + t: "number (int)" + p: "Required
(exactly 1)" + d: "*Added in Dash Core 0.12.3 / Bitcoin Core 0.13.0*

The number of in-mempool ancestor transactions (including this one)" + +- n: "→ →
`ancestorsize`" + t: "number (int)" + p: "Required
(exactly 1)" + d: "*Added in Dash Core 0.12.3 / Bitcoin Core 0.13.0*

The size of in-mempool ancestors (including this one)" + +- n: "→ →
`ancestorfees`" + t: "number (int)" + p: "Required
(exactly 1)" + d: "*Added in Dash Core 0.12.3 / Bitcoin Core 0.13.0*

The modified fees (see `modifiedfee` above) of in-mempool ancestors (including this one)" + - n: "→ →
`depends`" t: "array" p: "Required
(exactly 1)" @@ -111,28 +128,19 @@ The `getrawmempool` RPC {{summary_getRawMemPool}} p: "Optional (0 or more)" d: "The TXIDs of any unconfirmed transactions this transaction depends upon, encoded as hex in RPC byte order" +- n: "→ →
`instantsend`" + t: "bool" + p: "Required
(exactly 1)" + d: "*Added in Dash Core 0.12.3*

Set to `true` for transactions broadcast via the `ix` message (InstantSend lock requested). Set to `false` for standard (non-InstantSend) transactions" + +- n: "→ →
`instantlock`" + t: "bool" + p: "Required
(exactly 1)" + d: "*Added in Dash Core 0.12.3*

Set to `true` for locked InstantSend transactions (masternode quorum has locked the transaction inputs via `txlvote` messages). Set to `false` if the masternodes have not approved the InstantSend transaction" + {% enditemplate %} -*Changes from Bitcoin - Following items not present in Dash result* - -{% itemplate ntpd1 %} -- n: "→ TXID→
`ancestorcount`" - t: "number (int)" - p: "Required
(exactly 1)" - d: "*Added in Bitcoin Core 0.13.0*

The number of in-mempool ancestor transactions (including this one)" - -- n: "→ TXID→
`ancestorsize`" - t: "number (int)" - p: "Required
(exactly 1)" - d: "*Added in Bitcoin Core 0.13.0*

The size of in-mempool ancestors (including this one)" - -- n: "→ TXID→
`ancestorfees`" - t: "number (int)" - p: "Required
(exactly 1)" - d: "*Added in Bitcoin Core 0.13.0*

The modified fees (see `modifiedfee` above) of in-mempool ancestors (including this one)" -{% enditemplate %} - -*Examples from Dash Core 0.12.2* +*Examples from Dash Core 0.12.3* The default (`false`): @@ -158,20 +166,44 @@ Result: {% highlight json %} { - "286b3ec21e6ce5463fc712c98d86e02353525e09452113836651f3f91e562354": { - "size": 225, - "fee": 0.00000225, - "modifiedfee": 0.00000225, - "time": 1507735322, - "height": 7940, + "8fd1440ed74d3739aa4e1700e9b2fdb32bc5c138fe79dd319f965f67339eb1ce": { + "size": 372, + "fee": 0.00020000, + "modifiedfee": 0.00020000, + "time": 1519928121, + "height": 83907, + "startingpriority": 2224190635.564103, + "currentpriority": 2224190635.564103, + "descendantcount": 2, + "descendantsize": 598, + "descendantfees": 20226, + "ancestorcount": 1, + "ancestorsize": 372, + "ancestorfees": 20000, + "depends": [ + ], + "instantsend": true, + "instantlock": true + }, + "2d914d77305dd968bbd67aeb8604cf7e9d66a7df58bf5216724db69a54000f40": { + "size": 226, + "fee": 0.00000226, + "modifiedfee": 0.00000226, + "time": 1519928256, + "height": 83907, "startingpriority": 0, "currentpriority": 0, - "descendantcount": 4, - "descendantsize": 901, - "descendantfees": 902, + "descendantcount": 1, + "descendantsize": 226, + "descendantfees": 226, + "ancestorcount": 2, + "ancestorsize": 598, + "ancestorfees": 20226, "depends": [ - "2aacf53e0e15d3b4d778837792c7b6bd298edd3c41a0608586bdec41adcfe7c4" - ] + "8fd1440ed74d3739aa4e1700e9b2fdb32bc5c138fe79dd319f965f67339eb1ce" + ], + "instantsend": false, + "instantlock": false } } {% endhighlight %} diff --git a/_includes/devdoc/dash-core/rpcs/rpcs/getwalletinfo.md b/_includes/devdoc/dash-core/rpcs/rpcs/getwalletinfo.md index f4754ec0..0f945f96 100644 --- a/_includes/devdoc/dash-core/rpcs/rpcs/getwalletinfo.md +++ b/_includes/devdoc/dash-core/rpcs/rpcs/getwalletinfo.md @@ -37,6 +37,11 @@ The `getwalletinfo` RPC {{summary_getWalletInfo}} p: "Required
(exactly 1)" d: "The total confirmed balance of the wallet. The same as returned by the `getbalance` RPC with default parameters" +- n: "→
`privatesendbalance`" + t: "number (dash)" + p: "Required
(exactly 1)" + d: "*Added in Dash Core 0.12.3*

The total PrivateSend balance of the wallet" + - n: "→
`unconfirmed_balance`" t: "number (dash)" p: "Required
(exactly 1)" @@ -109,7 +114,7 @@ The `getwalletinfo` RPC {{summary_getWalletInfo}} {% enditemplate %} -*Example from Dash Core 0.12.2* +*Example from Dash Core 0.12.3* {% highlight bash %} dash-cli -testnet getwalletinfo @@ -121,6 +126,7 @@ Result: { "walletversion": 61000, "balance": 3000.00000000, + "privatesend_balance": 413.20413200, "unconfirmed_balance": 10.10000000, "immature_balance": 11.25000000, "txcount": 267, diff --git a/_includes/devdoc/dash-core/rpcs/rpcs/privatesend.md b/_includes/devdoc/dash-core/rpcs/rpcs/privatesend.md index ff886173..bd303a9b 100644 --- a/_includes/devdoc/dash-core/rpcs/rpcs/privatesend.md +++ b/_includes/devdoc/dash-core/rpcs/rpcs/privatesend.md @@ -11,6 +11,8 @@ http://opensource.org/licenses/MIT. {% autocrossref %} +As of Dash Core 0.12.3, client-side mixing is not supported on masternodes. + The `privatesend` RPC {{summary_privateSend}} {% itemplate ntpd1 %} diff --git a/_includes/layout/base/rpc-table.html b/_includes/layout/base/rpc-table.html index f62e2f07..f6d74752 100644 --- a/_includes/layout/base/rpc-table.html +++ b/_includes/layout/base/rpc-table.html @@ -149,7 +149,7 @@ th.tg-sort-header::-moz-selection { background:transparent; }th.tg-sort-header:: Blockchain GetRawMemPool Y - + Updated in 0.12.3.0 Blockchain @@ -275,7 +275,7 @@ th.tg-sort-header::-moz-selection { background:transparent; }th.tg-sort-header:: Dash PrivateSend Y - + Updated in 0.12.3.0 Dash @@ -647,7 +647,7 @@ th.tg-sort-header::-moz-selection { background:transparent; }th.tg-sort-header:: Wallet GetWalletInfo Y - + Updated in 0.12.3.0 Wallet