RPC - Remove unsupported feature (segwit and RBF-related) content (#158)

* RPC - Remove segwit-related addwitnessadress

* RPC - Remove RBF-related bumpfee

* Remove segwit-related comments

_autocrossref.yaml

@@ -295,14 +295,10 @@ DIP8:
 '`addmultisigaddress` RPC': rpc addmultisigaddress
 '`addnode`': rpc addnode
 '`addnode` RPC': rpc addnode
-'`addwitnessaddress`': rpc addwitnessaddress
-'`addwitnessaddress` RPC': rpc addwitnessaddress
 '`backupwallet`': rpc backupwallet
 '`backupwallet` RPC': rpc backupwallet
 '`bls`': rpc bls
 '`bls` RPC': rpc bls
-'`bumpfee`': rpc bumpfee
-'`bumpfee` RPC': rpc bumpfee
 '`clearbanned`': rpc clearbanned
 '`clearbanned` RPC': rpc clearbanned
 '`createmultisig`': rpc createmultisig

_config.yml

@@ -169,10 +169,8 @@ devsearches:
     - 'AbortRescan': "/en/developer-reference#abortrescan"
     - 'AddMultiSigAddress': "/en/developer-reference#addmultisigaddress"
     - 'AddNode': "/en/developer-reference#addnode"
-    - 'AddWitnessAddress': "/en/developer-reference#addwitnessaddress"
     - 'BackupWallet': "/en/developer-reference#backupwallet"
     - 'BLS': "/en/developer-reference#bls"
-    - 'BumpFee': "/en/developer-reference#bumpfee"
     - 'ClearBanned': "/en/developer-reference#clearbanned"
     - 'CreateMultisig': "/en/developer-reference#createmultisig"
     - 'CreateRawTransaction': "/en/developer-reference#createrawtransaction"

_includes/devdoc/dash-core/rest/requests/get_block-notxdetails.md

@@ -72,6 +72,11 @@ GET /block/notxdetails/<hash>.<format>
   p: "Required<br>(exactly 1)"
   d: "This block's version number.  See [block version numbers][section block versions]"
 
+- n: "→<br>`versionHex`"
+  t: "number (int)"
+  p: "Required<br>(exactly 1)"
+  d: "*Added in Bitcoin Core 0.13.0*<br><br>This block's version number formatted in hexadecimal.  See [BIP9 assignments]"
+
 - n: "→<br>`merkleroot`"
   t: "string (hex)"
   p: "Required<br>(exactly 1)"
@@ -129,25 +134,6 @@ GET /block/notxdetails/<hash>.<format>
 
 {% enditemplate %}
 
-<!--
-  Segwit related fields not in Dash
-- n: "→<br>`strippedsize`"
-  t: "number (int)"
-  p: "Required<br>(exactly 1)"
-  d: "*Added in Bitcoin Core 0.13.0*<br><br>The size of this block in serialized block format excluding witness data, counted in bytes"
-
-
-- n: "→<br>`weight`"
-  t: "number (int)"
-  p: "Required<br>(exactly 1)"
-  d: "*Added in Bitcoin Core 0.13.0*<br><br>The block weight as defined in BIP 141"
-
-- n: "→<br>`versionHex`"
-  t: "number (int)"
-  p: "Required<br>(exactly 1)"
-  d: "*Added in Bitcoin Core 0.13.0*<br><br>This block's version number formatted in hexadecimal.  See [BIP9 assignments]"
--->
-
 *Examples from Dash Core 0.12.2*
 
 Request a block in hex-encoded serialized block format:

_includes/devdoc/dash-core/rest/requests/get_block.md

@@ -75,6 +75,11 @@ GET /block/<hash>.<format>
   p: "Required<br>(exactly 1)"
   d: "This block's version number.  See [block version numbers][section block versions]"
 
+- n: "→<br>`versionHex`"
+  t: "number (int)"
+  p: "Required<br>(exactly 1)"
+  d: "This block's version number formatted in hexadecimal."
+
 - n: "→<br>`merkleroot`"
   t: "string (hex)"
   p: "Required<br>(exactly 1)"
@@ -133,25 +138,6 @@ GET /block/<hash>.<format>
 
 {% enditemplate %}
 
-<!--
-  Segwit related fields not in Dash
-- n: "→<br>`strippedsize`"
-  t: "number (int)"
-  p: "Required<br>(exactly 1)"
-  d: "*Added in Bitcoin Core 0.13.0*<br><br>The size of this block in serialized block format excluding witness data, counted in bytes"
-
-
-- n: "→<br>`weight`"
-  t: "number (int)"
-  p: "Required<br>(exactly 1)"
-  d: "*Added in Bitcoin Core 0.13.0*<br><br>The block weight as defined in BIP 141"
-
-- n: "→<br>`versionHex`"
-  t: "number (int)"
-  p: "Required<br>(exactly 1)"
-  d: "*Added in Bitcoin Core 0.13.0*<br><br>This block's version number formatted in hexadecimal.  See [BIP9 assignments]"
--->
-
 *Examples from Dash Core 0.12.2*
 
 Request a block in hex-encoded serialized block format:

_includes/devdoc/dash-core/rpcs/quick-reference.md

@@ -332,9 +332,6 @@ default.
 * [WalletPassphrase][rpc walletpassphrase]: {{summary_walletPassphrase}}
 * [WalletPassphraseChange][rpc walletpassphrasechange]: {{summary_walletPassphraseChange}}
 
-* {{DASH_NOT_IMPLEMENTED}}  [AddWitnessAddress][rpc addwitnessaddress]: {{summary_addWitnessAddress}} {{NEW0_13_0}}
-* {{DASH_NOT_IMPLEMENTED}}  [BumpFee][rpc bumpfee]: {{summary_bumpFee}} {{NEW0_14_0}}
-
 {% endautocrossref %}
 
 #### Removed RPCs

_includes/devdoc/dash-core/rpcs/rpcs/addwitnessaddress.md

@@ -1,67 +0,0 @@
-{% comment %}
-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/addwitnessaddress.md" %}
-
-##### AddWitnessAddress
-{% include helpers/subhead-links.md %}
-
-{% assign summary_addWitnessAddress="adds a witness address for a script (with pubkey or redeem script known)." %}
-
-<!-- __ -->
-
-{% autocrossref %}
-
-*Added in Bitcoin Core 0.13.0*
-
-{{WARNING_ICON}} **_Not implemented in Dash Core (as of 0.12.2)_**
-
-{% comment %}
-*Requires wallet support. Requires an unlocked wallet or an unencrypted wallet.*
-
-The `addwitnessaddress` RPC {{summary_addWitnessAddress}}
-
-*Parameter #1---the witness address*
-
-{% itemplate ntpd1 %}
-- n: "Address"
-  t: "string (base58)"
-  p: "Required<br>(exactly 1)"
-  d: "A witness address that gets added to a script.  Needs to be in the wallet and uncompressed"
-
-{% enditemplate %}
-
-*Result---the witness script*
-
-{% itemplate ntpd1 %}
-- n: "`result`"
-  t: "string (base58)"
-  p: "Required<br>(exactly 1)"
-  d: "The value of the new address (P2SH of witness script)"
-
-{% enditemplate %}
-
-*Example from Bitcoin Core 0.13.1*
-
-{% highlight bash %}
-bitcoin-cli addwitnessaddress 1BRo7qrYHMPrzdBDzfjmzteBdYAyTMXW75
-{% endhighlight %}
-
-Result:
-
-The RPC is disabled by default on mainnet as long as Segregated Witness has not been activated.
-`-walletprematurewitness` enables the RPC.
-
-{% highlight text %}
-3LfAujMsBHgQKoxLn59dVbeYPmfUrHSAQb
-{% endhighlight %}
-
-*See also*
-
-* [BIP-141 - Segregated Witness](https://github.com/bitcoin/bips/blob/master/bip-0141.mediawiki)
-* [BIP-142 - Address Format for Segregated Witness](https://github.com/bitcoin/bips/blob/master/bip-0142.mediawiki)
-
-{% endcomment %}
-
-{% endautocrossref %}

_includes/devdoc/dash-core/rpcs/rpcs/bumpfee.md

@@ -1,123 +0,0 @@
-{% comment %}
-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/bumpfee.md" %}
-
-##### BumpFee
-{% include helpers/subhead-links.md %}
-
-{% assign summary_bumpFee="replaces an unconfirmed wallet transaction that signaled RBF with a new transaction that pays a higher fee." %}
-
-<!-- __ -->
-
-{% autocrossref %}
-
-*Added in Bitcoin Core 0.14.0*
-
-{{WARNING_ICON}} **_Not implemented in Dash Core (as of 0.12.2)_**
-
-{% comment %}
-*Requires wallet support. Wallet must be unlocked.*
-
-The `bumpfee` RPC {{summary_bumpFee}} The increased fee is deducted from the change output. The command fails if the change output is too small to increase the fee or
-if the wallet or mempool contains a transaction that spends one of the transaction's outputs. The `-walletrbf` option needs to be enabled (default is `false`).
-
-*Parameter #1---The TXID of the transaction*
-
-{% itemplate ntpd1 %}
-- n: "TXID"
-  t: "string (hex)"
-  p: "Required<br>(exactly 1)"
-  d: "The id of the transaction"
-
-{% enditemplate %}
-
-*Parameter #2---Additional options*
-
-{% itemplate ntpd1 %}
-- n: "Options"
-  t: "Object"
-  p: "Optional<br>(0 or 1)"
-  d: "Additional options"
-
-- n: "→ <br>`confTarget`"
-  t: "numeric (int)"
-  p: "Optional<br>(0 or 1)"
-  d: "The confirmation target in blocks. Based on this value the new fee will be calculated using the same code as the `estimatefee` RPC. If not set, the default target of ´6´ blocks will be used"
-
-- n: "→ <br>`totalFee`"
-  t: "numeric (satoshis)"
-  p: "Optional<br>(0 or 1)"
-  d: "The total fee to pay in satoshis (not the feerate). The actual fee can be higher in rare cases if the change output is close to the dust limit"
-
-- n: "→ <br>`replaceable`"
-  t: "bool"
-  p: "Optional<br>(0 or 1)"
-  d: "Whether the new transaction should still be BIP 125 replaceable. Even if set to `false` the transaction may still be replacable, for example if it has unconfirmed ancestors which are replaceable. The default is `true`"
-
-{% enditemplate %}
-
-*Result---information about the new transaction*
-
-{% itemplate ntpd1 %}
-- n: "`result`"
-  t: "object"
-  p: "Required<br>(exactly 1)"
-  d: "An object including information about the new transaction"
-
-- n: "→ <br>`txid`"
-  t: "string (hex)"
-  p: "Required<br>(exactly 1)"
-  d: "The id of the new transaction"
-
-- n: "→ <br>`origfee`"
-  t: "numeric (bitcoins)"
-  p: "Required<br>(exactly 1)"
-  d: "The fee of the replaced transaction"
-
-- n: "→ <br>`fee`"
-  t: "numeric (bitcoins)"
-  p: "Required<br>(exactly 1)"
-  d: "The fee of the new transaction"
-
-- n: "→ <br>`errors`"
-  t: "array"
-  p: "Required<br>(exactly 1)"
-  d: "Errors encountered during processing (may be empty)"
-
-{% enditemplate %}
-
-*Example from Bitcoin Core 0.14.1*
-
-{% highlight bash %}
-bitcoin-cli -testnet bumpfee d4a33e0cabaz723149e1fcab4e033a40173\
-88a644c65370e3cb06ba2f0e13975\
-'{
-    "totalFee": 4000,
-    "replaceable": false
-}'
-{% endhighlight %}
-
-Result:
-
-{% highlight json %}
-{
-	"txid": "37a55ce49636977k79bcb04ee1143573b570b1743e09660e79e7ec3320968ca54",
-	"origfee": 0.00002450,
-	"fee": 0.00004000,
-	"errors": ""
-}
-{% endhighlight %}
-
-*See also*
-
-* [CreateRawTransaction][rpc createrawtransaction]: {{summary_createRawTransaction}}
-* [FundRawTransaction][rpc fundrawtransaction]: {{summary_fundRawTransaction}}
-* [SignRawTransaction][rpc signrawtransaction]: {{summary_signRawTransaction}}
-* [SendRawTransaction][rpc sendrawtransaction]: {{summary_sendRawTransaction}}
-* [Serialized Transaction Format][raw transaction format]
-
-{% endcomment %}
-
-{% endautocrossref %}

_includes/helpers/summaries.md

@@ -4,10 +4,8 @@ This file is licensed under the terms of its source texts{%endcomment%}
 {% assign summary_abortRescan="Stops current wallet rescan" %}
 {% assign summary_addMultiSigAddress="adds a P2SH multisig address to the wallet." %}
 {% assign summary_addNode="attempts to add or remove a node from the addnode list, or to try a connection to a node once." %}
-{% assign summary_addWitnessAddress="adds a witness address for a script (with pubkey or redeem script known)." %}
 {% assign summary_backupWallet="safely copies `wallet.dat`<!--noref--> to the specified file, which can be a directory or a path with filename." %}
 {% assign summary_bls="provides a set of commands to execute BLS-related actions." %}
-{% assign summary_bumpFee="replaces an unconfirmed wallet transaction that signaled RBF with a new transaction that pays a higher fee." %}
 {% assign summary_clearBanned="clears list of banned nodes." %}
 {% assign summary_createMultiSig="creates a P2SH multi-signature address." %}
 {% assign summary_createRawTransaction="creates an unsigned serialized transaction that spends a previous output to a new output with a P2PKH or P2SH address. The transaction is not stored in the wallet or transmitted to the network." %}

_includes/helpers/vars.md

@@ -146,27 +146,11 @@ dash even if this parameter is set to `1` or higher.{% endcapture %}
   p: "Required<br>(exactly 1)"
   d: "The transaction's TXID encoded as hex in RPC byte order"
 
-{% comment %}
-NOT IN DASH
-- n: "{{DEPTH}} →<br>`hash`"
-  t: "string (hex)"
-  p: "Required<br>(exactly 1)"
-  d: "*Added in Bitcoin Core 0.13.0*<br><br>The transaction hash.  Differs from txid for witness transactions"
-{% endcomment %}  
-
 - n: "{{DEPTH}} →<br>`size`"
   t: "number (int)"
   p: "Required<br>(exactly 1)"
   d: "*Added in Bitcoin Core 0.12.0*<br><br>The serialized transaction size"
 
-{% comment %}
-NOT IN DASH
-- n: "{{DEPTH}} →<br>`vsize`"
-  t: "number (int)"
-  p: "Required<br>(exactly 1)"
-  d: "*Added in Bitcoin Core 0.13.0*<br><br>The virtual transaction size.  Differs from size for witness transactions"
-{% endcomment %}  
-
 - n: "{{DEPTH}} →<br>`version`"
   t: "number (int)"
   p: "Required<br>(exactly 1)"
@@ -247,14 +231,6 @@ NOT IN DASH
   p: "Required<br>(exactly 1)"
   d: "The input sequence number"
 
-{% comment %}
-NOT IN DASH
-- n: "{{DEPTH}} → → →<br>`txinwitness`"
-  t: "string : array"
-  p: "Optional<br>(0 or 1)"
-  d: "*Added in Bitcoin Core 0.13.0*<br><br>Hex-encoded witness data. Only for segregated witness transactions"  
-{% endcomment %}  
-
 - n: "{{DEPTH}} →<br>`vout`"
   t: "array"
   p: "Required<br>(exactly 1)"

_includes/layout/base/rpc-table.html

@@ -589,24 +589,12 @@ th.tg-sort-header::-moz-selection { background:transparent; }th.tg-sort-header::
     <td class="tg-baqh">Y</td>
     <td class="tg-baqh"></td>
   </tr>
-  <tr>
-    <td class="tg-b7b8">Wallet</td>
-    <td class="tg-b7b8"><a href="#addwitnessaddress">AddWitnessAddress</a></td>
-    <td class="tg-dzk6">N</td>
-    <td class="tg-dzk6">N/A</td>
-  </tr>
   <tr>
     <td class="tg-yw4l">Wallet</td>
     <td class="tg-yw4l"><a href="#backupwallet">BackupWallet</a></td>
     <td class="tg-baqh">Y</td>
     <td class="tg-baqh"></td>
   </tr>
-  <tr>
-    <td class="tg-b7b8">Wallet</td>
-    <td class="tg-b7b8"><a href="#bumpfee">BumpFee</a></td>
-    <td class="tg-dzk6">N</td>
-    <td class="tg-dzk6">N/A</td>
-  </tr>
   <tr>
     <td class="tg-yw4l">Wallet</td>
     <td class="tg-yw4l"><a href="#dumphdinfo">DumpHDInfo</a></td>

_includes/references.md

@@ -72,10 +72,8 @@ http://opensource.org/licenses/MIT.
 [rpc abortrescan]: /en/developer-reference#abortrescan
 [rpc addmultisigaddress]: /en/developer-reference#addmultisigaddress
 [rpc addnode]: /en/developer-reference#addnode
-[rpc addwitnessaddress]: /en/developer-reference#addwitnessaddress
 [rpc backupwallet]: /en/developer-reference#backupwallet
 [rpc bls]: /en/developer-reference#bls
-[rpc bumpfee]: /en/developer-reference#bumpfee
 [rpc clearbanned]: /en/developer-reference#clearbanned
 [rpc createmultisig]: /en/developer-reference#createmultisig
 [rpc createrawtransaction]: /en/developer-reference#createrawtransaction

en/developer-reference.md

@@ -78,14 +78,10 @@ untrusted source.
 
 {% include devdoc/dash-core/rpcs/rpcs/addnode.md %}
 
-{% include devdoc/dash-core/rpcs/rpcs/addwitnessaddress.md %}
-
 {% include devdoc/dash-core/rpcs/rpcs/backupwallet.md %}
 
 {% include devdoc/dash-core/rpcs/rpcs/bls.md %}
 
-{% include devdoc/dash-core/rpcs/rpcs/bumpfee.md %}
-
 {% include devdoc/dash-core/rpcs/rpcs/clearbanned.md %}
 
 {% include devdoc/dash-core/rpcs/rpcs/createmultisig.md %}