VSPs: Add BlockHeight & EstimatedNetworkProportion

Author: amass01

.gitignore

@@ -4,6 +4,7 @@ dcrwebapi
 .DS_Store
 vendor/ 
 .vscode/
+.idea/
 
 # Testing, profiling, and benchmarking artifacts
 cov.out

service.go

@@ -50,13 +50,15 @@ type Vsp struct {
 	// Set by dcrwebapi each time info is successfully updated.
 	LastUpdated int64 `json:"lastupdated"`
 	// Retrieved from the /api/vspinfo.
-	APIVersions   []int64 `json:"apiversions"`
-	FeePercentage float64 `json:"feepercentage"`
-	Closed        bool    `json:"closed"`
-	Voting        int64   `json:"voting"`
-	Voted         int64   `json:"voted"`
-	Revoked       int64   `json:"revoked"`
-	VspdVersion   string  `json:"vspdversion"`
+	APIVersions                []int64 `json:"apiversions"`
+	FeePercentage              float64 `json:"feepercentage"`
+	Closed                     bool    `json:"closed"`
+	Voting                     int64   `json:"voting"`
+	Voted                      int64   `json:"voted"`
+	Revoked                    int64   `json:"revoked"`
+	VspdVersion                string  `json:"vspdversion"`
+	BlockHeight                uint64  `json:"blockheight"`
+	EstimatedNetworkProportion float64 `json:"estimatednetworkproportion"`
 }
 type vspSet map[string]Vsp
 
@@ -65,8 +67,7 @@ type Stakepool struct {
 	// APIEnabled defines if the api is enabled.
 	APIEnabled bool `json:"APIEnabled"`
 
-	// APIVersionsSupported contains the collection of collection of API
-	// versions supported.
+	// APIVersionsSupported contains the collection of API versions supported.
 	APIVersionsSupported []interface{} `json:"APIVersionsSupported"`
 
 	// Network defines the active network.
@@ -561,9 +562,12 @@ func vspStats(service *Service, url string) error {
 	voted, hasVoted := info["voted"]
 	revoked, hasRevoked := info["revoked"]
 	version, hasVersion := info["vspdversion"]
+	blockheight, hasBlockHeight := info["blockheight"]
+	networkproportion, hasnetworkproportion := info["estimatednetworkproportion"]
 
 	hasRequiredFields := hasAPIVersions && hasFeePercentage &&
-		hasClosed && hasVoting && hasVoted && hasRevoked && hasVersion
+		hasClosed && hasVoting && hasVoted && hasRevoked && hasVersion &&
+		hasBlockHeight && hasnetworkproportion
 
 	if !hasRequiredFields {
 		return fmt.Errorf("%v: missing required fields: %+v", infoURL, info)
@@ -580,6 +584,8 @@ func vspStats(service *Service, url string) error {
 	vsp.Voted = int64(voted.(float64))
 	vsp.Revoked = int64(revoked.(float64))
 	vsp.VspdVersion = version.(string)
+	vsp.BlockHeight = uint64(blockheight.(float64))
+	vsp.EstimatedNetworkProportion = networkproportion.(float64)
 
 	vsp.LastUpdated = time.Now().Unix()