V0.13.2 RPC Masternode lists (#110)

* RPC - Update protx list
 - Add missing fields
 - Re-order to match actual output

* RPC - Update masternodelist

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

@@ -19,7 +19,11 @@ Use v0.n.n in abbreviation title to prevent autocrossrefing.
 <!-- Dash - Not Implemented -->
 {% assign DASH_NOT_IMPLEMENTED='**<abbr title="Not Implemented in Dash">Not Implemented</abbr>**' %}
 
-<!-- Dash Core 0.13.0.0 Feb 2019 -->
+<!-- Dash Core 0.13.2.0 Mar 2019 -->
+{% assign DASH_NEW0_13_2='**<abbr title="New in Dash Core v0.13.2">New in Dash Core 0.13.2</abbr>**' %}
+{% assign DASH_UPDATED0_13_2='**<abbr title="Updated in Dash Core v0.13.2">Updated in Dash Core 0.13.2</abbr>**' %}
+
+<!-- Dash Core 0.13.1.0 Feb 2019 -->
 {% assign DASH_NEW0_13_1='**<abbr title="New in Dash Core v0.13.1">New in Dash Core 0.13.1</abbr>**' %}
 {% assign DASH_UPDATED0_13_1='**<abbr title="Updated in Dash Core v0.13.1">Updated in Dash Core 0.13.1</abbr>**' %}
 
@@ -173,7 +177,7 @@ These RPCs are all Dash-specific and not found in Bitcoin Core
 {% autocrossref %}
 
 * [BLS][rpc bls]: {{summary_bls}} {{DASH_NEW0_13_0}}
-* [ProTx][rpc protx]: {{summary_proTx}} {{DASH_NEW0_13_0}}
+* [ProTx][rpc protx]: {{summary_proTx}} {{DASH_UPDATED0_13_2}}
 
 {% endautocrossref %}
 

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

@@ -70,7 +70,7 @@ Mode | Description
 
 {% enditemplate %}
 
-*Example from Dash Core 0.12.3*
+*Example from Dash Core 0.13.2*
 
 Get unfiltered Masternode list in default mode
 
@@ -81,122 +81,69 @@ dash-cli -testnet masternodelist
 Result:
 {% highlight json %}
 {
-  "83ab0eaeffc212fab5aea4a3057fba51dafdfa6da8b29c3f0de62ed9319fea03-0": {
+  "c568e386687bb317e52f4dcb402e83a93a13a43df6da029c95834ed2603c1f01-0": {
-    "address": "203.0.113.1:19999",
+    "address": "173.61.30.231:19003",
-    "payee": "yiz8WZ9VY9F7SyGuc8mXj6wrDERs6T47B1",
+    "payee": "yWc9sVgvRi6mB81KZLwchwUjjCNmF6ktaJ",
     "status": "ENABLED",
-    "protocol": 70208,
+    "protocol": 70213,
-    "daemonversion": "Unknown",
-    "sentinelversion": "1.0.2",
-    "sentinelstate": "current",
-    "lastseen": 1520876844,
-    "activeseconds": 3389581,
-    "lastpaidtime": 1520868832,
-    "lastpaidblock": 89879
-  },
-  "33a833559acc50b63e0909a550d10af26f41043382a9eed30e5218df5adf5304-1": {
-    "address": "203.0.113.2:39999",
-    "payee": "yfY21tLcuKtohnkKtwBQXzEKFapwuhb9FE",
-    "status": "ENABLED",
-    "protocol": 70208,
-    "daemonversion": "Unknown",
-    "sentinelversion": "1.1.0",
-    "sentinelstate": "current",
-    "lastseen": 1520876480,
-    "activeseconds": 2110895,
-    "lastpaidtime": 1520866020,
-    "lastpaidblock": 89862
-  },
-  "54754314335419cc04ef09295ff7765c8062a6123486aed55fd7e9b04f300b13-0": {
-    "address": "203.0.113.3:20019",
-    "payee": "ycn5RWc4Ruo35FTS8bJwugVyCEkfVcrw9a",
-    "status": "NEW_START_REQUIRED",
-    "protocol": 70208,
     "daemonversion": "Unknown",
     "sentinelversion": "Unknown",
     "sentinelstate": "expired",
-    "lastseen": 1517843286,
+    "lastseen": 0,
-    "activeseconds": 0,
+    "activeseconds": -1553091168,
-    "lastpaidtime": 1520873295,
+    "lastpaidtime": 1553077123,
-    "lastpaidblock": 89898
+    "lastpaidblock": 64693,
+    "owneraddress": "yjW7bQrKBsMV8Wh19LgT8Z1uLkWY8P2EBd",
+    "votingaddress": "yjW7bQrKBsMV8Wh19LgT8Z1uLkWY8P2EBd",
+    "collateraladdress": "yVZjfAYphQeyFj3XKGJ7FE7n4A9Lok1X7y"
   },
-  "a4676419793d232359dfd7240bf1b0635b56f2a16aac4cb57f7e9ba459d50116-1": {
+  "bc3b58904a9f09b4641ffece61af28744826fffa00aabe45ef40af959a78690c-1": {
-    "address": "203.0.113.4:19999",
+    "address": "52.42.213.147:19999",
-    "payee": "ydZHEVgMX67xsi97BhN8KoacN6SCMz6Xho",
+    "payee": "yXsKagNKcHkE2eUKQe8Sf2Z32SKrmQ6XEJ",
-    "status": "SENTINEL_PING_EXPIRED",
+    "status": "ENABLED",
-    "protocol": 70208,
+    "protocol": 70213,
     "daemonversion": "Unknown",
-    "sentinelversion": "1.0.2",
+    "sentinelversion": "Unknown",
     "sentinelstate": "expired",
-    "lastseen": 1520876776,
+    "lastseen": 0,
-    "activeseconds": 7694877,
+    "activeseconds": -1553091168,
-    "lastpaidtime": 0,
+    "lastpaidtime": 1553078267,
-    "lastpaidblock": 0
+    "lastpaidblock": 64747,
+    "owneraddress": "yeARCinqiurM9oni3VQ2Grm3Z6tXYxfKAR",
+    "votingaddress": "yeARCinqiurM9oni3VQ2Grm3Z6tXYxfKAR",
+    "collateraladdress": "yUq2J9YhZXSTQ76ifm9BHFvTtDMhWR8v6k"
   },
-  "3d64bd65cb84b935278420de3673cba33470a1e1996c4debfccb5d722254404c-1": {
+  "8b4a475fec02166c0d4a1dc6ede23e236a4cd07bb31d959fe5ed155fdc902b18-0": {
-    "address": "203.0.113.5:19999",
+    "address": "95.183.53.17:10003",
-    "payee": "ySkDc9dHns1AFcjJzGqNmkNnErjakcB2Bp",
+    "payee": "yYdXDDtfzSkRKUBDLH8qW2AfvehD1M9gM8",
     "status": "ENABLED",
-    "protocol": 70208,
+    "protocol": 70213,
     "daemonversion": "Unknown",
-    "sentinelversion": "1.0.2",
+    "sentinelversion": "Unknown",
-    "sentinelstate": "current",
-    "lastseen": 1520876576,
-    "activeseconds": 10796968,
-    "lastpaidtime": 1520876143,
-    "lastpaidblock": 89922
-  },
-  "54355b4b4d26b84821dab6e0e1c0bded7d8fefc72414f22f45515d1732f1c8e6-1": {
-    "address": "203.0.113.6:29999",
-    "payee": "yPk4NCyqvWjeJbE3tW1wmJ9LV2wgVLiYRT",
-    "status": "ENABLED",
-    "protocol": 70208,
-    "daemonversion": "Unknown",
-    "sentinelversion": "1.1.0",
-    "sentinelstate": "current",
-    "lastseen": 1520876323,
-    "activeseconds": 2110746,
-    "lastpaidtime": 1520875985,
-    "lastpaidblock": 89920
-  },
-  "c6585f4ba88875eb2edc376b9ae24b74fd8c0ef89288923cf16a8fe2787b7ce8-1": {
-    "address": "203.0.113.7:19999",
-    "payee": "yP1UHNx26ShYLej56SbHiTiPAUv2QppbUv",
-    "status": "SENTINEL_PING_EXPIRED",
-    "protocol": 70208,
-    "daemonversion": "Unknown",
-    "sentinelversion": "1.0.2",
     "sentinelstate": "expired",
-    "lastseen": 1520876884,
+    "lastseen": 0,
-    "activeseconds": 7694986,
+    "activeseconds": -1553091168,
-    "lastpaidtime": 0,
+    "lastpaidtime": 1553078177,
-    "lastpaidblock": 0
+    "lastpaidblock": 64743,
+    "owneraddress": "yW9zeJrPv5yJf71qvNfyPrJg8Me9UdaDP3",
+    "votingaddress": "yW9zeJrPv5yJf71qvNfyPrJg8Me9UdaDP3",
+    "collateraladdress": "yX91ss7HuAH85TAv7tq5dVdMXJ68d4vJHT"
   },
-  "b7d45ac3d8c5ddea9ff90d81d92d362e09713a06b2a0089f49c7deb9b2521fef-0": {
+  "d0a5d2bb6316a78e1e82569f625b56f68d7578eb2e22949f2a652bb1915f881b-1": {
-    "address": "203.0.113.8:19999",
+    "address": "140.82.59.51:19999",
-    "payee": "yN4iFe7a2G6YYoBtUXcoyixCTV3vDzWSrS",
+    "payee": "yYRfiUCoTjYAontZHqd7wAw7PhR2zru55V",
-    "status": "NEW_START_REQUIRED",
-    "protocol": 70208,
-    "daemonversion": "Unknown",
-    "sentinelversion": "1.0.2",
-    "sentinelstate": "current",
-    "lastseen": 1508842770,
-    "activeseconds": 416775,
-    "lastpaidtime": 0,
-    "lastpaidblock": 0
-  },
-  "5ef4e5c9d09f6fb927b7b815ea2736ddfce468021d49704acfc3bb7939b425ff-1": {
-    "address": "203.0.113.9:19999",
-    "payee": "yPwTQgY8JDFaDjAgUdHmapG4SmzY6SDbE9",
     "status": "ENABLED",
-    "protocol": 70208,
+    "protocol": 70213,
     "daemonversion": "Unknown",
-    "sentinelversion": "1.1.0",
+    "sentinelversion": "Unknown",
-    "sentinelstate": "current",
+    "sentinelstate": "expired",
-    "lastseen": 1520876862,
+    "lastseen": 0,
-    "activeseconds": 2111317,
+    "activeseconds": -1553091168,
-    "lastpaidtime": 1520872118,
+    "lastpaidtime": 1553077735,
-    "lastpaidblock": 89892
+    "lastpaidblock": 64724,
+    "owneraddress": "yX2VYLpM9ybXZHTbTEmND581QZSNRHucWm",
+    "votingaddress": "yX2VYLpM9ybXZHTbTEmND581QZSNRHucWm",
+    "collateraladdress": "ygkUtF9AbUwmGVjq2vfCUp4Znd3X9QiEqv"
   }
 }
 {% endhighlight %}

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

@@ -497,7 +497,7 @@ returned. If set to `false`, only the hashes of the ProTx will be returned.
 
 {% enditemplate %}
 
-*Example from Dash Core 0.13.0*
+*Example from Dash Core 0.13.2*
 
 {% highlight bash %}
 dash-cli -testnet protx list
@@ -537,30 +537,31 @@ Result:
 {% highlight json %}
 [
   {
-    "proTxHash": "2b4a07a9b04dc42a0c19b85edb60954a27acaadfe3ee21d0171385778f34e1c2",
+    "proTxHash": "c48a44a9493eae641bea36992bc8c27eaaa33adb1884960f55cd259608d26d2f",
-    "collateralHash": "8d23d08ee6e2e0577550c90afde9bc63745f734605724ba9908e0220c48dec04",
+    "collateralHash": "e3270ff48c4b802d56ee58d3d53777f7f9c289964e4df0842518075fc81345b1",
-    "collateralIndex": 1,
+    "collateralIndex": 3,
-    "operatorReward": 5,
+    "collateralAddress": "yYpzTXjVx7A5uohsmW8sRy7TJp4tihVuZg",
+    "operatorReward": 0,
     "state": {
-      "registeredHeight": 683,
+      "service": "1.2.3.4:1234",
-      "lastPaidHeight": 700,
+      "registeredHeight": 7090,
+      "lastPaidHeight": 0,
       "PoSePenalty": 0,
       "PoSeRevivedHeight": -1,
       "PoSeBanHeight": -1,
       "revocationReason": 0,
-      "keyIDOwner": "29705bab955f252f876cbe47958b20feaa2b3e99",
+      "ownerAddress": "yTMDce5yEpiPqmgPrPmTj7yAmQPJERUSVy",
-      "pubKeyOperator": "0bfd3d519f16de1669e977c316bd53fc902f83a75b6008dff3a7037ab4d3edaa39eadb13f5d6d1f192673f9ab86f17a2",
+      "votingAddress": "yTMDce5yEpiPqmgPrPmTj7yAmQPJERUSVy",
-      "keyIDVoting": "29705bab955f252f876cbe47958b20feaa2b3e99",
+      "payoutAddress": "yU3UdrmS6KpWwBDLQTkp1KjXePwWsMbYdj",
-      "addr": "1.2.3.4:1234",
+      "pubKeyOperator": "8700add55a28ef22ec042a2f28e25fb4ef04b3024a7c56ad7eed4aebc736f312d18f355370dfb6a5fec9258f464b227e"
-      "payoutAddress": "ybeK49S8ineDqNV698GZdMpdiHaYsZUJ2g"
     },
-    "confirmations": -1,
+    "confirmations": 1,
     "wallet": {
-      "hasOwnerKey": true,
+      "hasOwnerKey": false,
       "hasOperatorKey": false,
-      "hasVotingKey": true,
+      "hasVotingKey": false,
-      "ownsCollateral": true,
+      "ownsCollateral": false,
-      "ownsPayeeScript": true,
+      "ownsPayeeScript": false,
       "ownsOperatorRewardScript": false
     }
   }

_includes/helpers/vars.md

@@ -459,6 +459,11 @@ NOT IN DASH
   p: "Required<br>(exactly 1)"
   d: "The collateral index"
 
+- n: "{{DEPTH}} → →<br>`collateralAddress`"
+  t: "string (hex)"
+  p: "Required<br>(exactly 1)"
+  d: "The collateral address"
+
 - n: "{{DEPTH}} →<br>`operatorReward`"
   t: "number (int)"
   p: "Required<br>(exactly 1)"
@@ -469,6 +474,11 @@ NOT IN DASH
   p: "Required<br>(exactly 1)"
   d: "An object containing a provider transaction state"
 
+- n: "{{DEPTH}} → →<br>`service`"
+  t: "string"
+  p: "Required<br>(exactly 1)"
+  d: "The masternode's IP:Port"
+
 - n: "{{DEPTH}} → →<br>`registeredHeight`"
   t: "number (int)"
   p: "Required<br>(exactly 1)"
@@ -499,30 +509,30 @@ NOT IN DASH
   p: "Required<br>(exactly 1)"
   d: "The reason for a ProUpRegTx revocation"
 
-- n: "{{DEPTH}} → →<br>`keyIDOwner`"
+- n: "{{DEPTH}} → →<br>`ownerAddress`"
   t: "string (hex)"
   p: "Required<br>(exactly 1)"
-  d: "The owner key"
+  d: "The owner address"
+
+- n: "{{DEPTH}} → →<br>`votingAddress`"
+  t: "string (hex)"
+  p: "Required<br>(exactly 1)"
+  d: "The voting address"
+
+- n: "{{DEPTH}} → →<br>`payoutAddress`"
+  t: "string (hex)"
+  p: "Required<br>(exactly 1)"
+  d: "The owner's payout address"
 
 - n: "{{DEPTH}} → →<br>`pubKeyOperator`"
   t: "string (hex)"
   p: "Required<br>(exactly 1)"
   d: "The operator public key"
 
-- n: "{{DEPTH}} → →<br>`keyIDVoting`"
+- n: "{{DEPTH}} → →<br>`operatorPayoutAddress`"
   t: "string (hex)"
   p: "Required<br>(exactly 1)"
-  d: "The voting key"
+  d: "The operator's payout address"
-
-- n: "{{DEPTH}} → →<br>`addr`"
-  t: "string"
-  p: "Required<br>(exactly 1)"
-  d: "The masternode's IP:Port"
-
-- n: "{{DEPTH}} → →<br>`payoutAddress`"
-  t: "string (hex)"
-  p: "Required<br>(exactly 1)"
-  d: "The payout address"
 
 - n: "{{DEPTH}} →<br>`confirmations`"
   t: "number (int)"

_includes/layout/base/rpc-table.html

@@ -269,7 +269,7 @@ th.tg-sort-header::-moz-selection { background:transparent; }th.tg-sort-header::
     <td class="tg-b7b8">Dash</td>
     <td class="tg-b7b8"><a href="#masternodelist">MasternodeList</a></td>
     <td class="tg-dzk6">Y</td>
-    <td class="tg-dzk6">Updated in 0.12.3.0</td>
+    <td class="tg-dzk6">Updated in 0.13.2.0</td>
   </tr>
   <tr>
     <td class="tg-yw4l">Dash</td>
@@ -311,7 +311,7 @@ th.tg-sort-header::-moz-selection { background:transparent; }th.tg-sort-header::
     <td class="tg-yw4l">Evolution</td>
     <td class="tg-yw4l"><a href="#protx">ProTx</a></td>
     <td class="tg-baqh">Y</td>
-    <td class="tg-baqh">Added in 0.13.0</td>
+    <td class="tg-baqh">Updated in 0.13.2</td>
   </tr>
   <tr>
     <td class="tg-b7b8">Generating</td>