Merge pull request #87 from MinterTeam/dev

v0.2.2

CHANGELOG.md

@@ -4,6 +4,17 @@
 
 - [api] Add validators rewards to block api
 
+## 0.2.2
+*Aug 23th, 2018*
+
+In this update we well test blockchain's hardfork.
+There is no need to wipe old data, just be sure to update binary
+until 15000 block.
+
+BUG FIXES
+
+- [validators] Fix api
+
 ## 0.2.1
 *Aug 23th, 2018*
 

api/validators.go

@@ -7,6 +7,7 @@ import (
 	"github.com/MinterTeam/minter-go-node/core/types"
 	"net/http"
 	"strconv"
+	"github.com/MinterTeam/minter-go-node/core/validators"
 )
 
 type Stake struct {
@@ -80,7 +81,13 @@ func GetValidators(w http.ResponseWriter, r *http.Request) {
 
 	var responseValidators []Validator
 
-	for _, val := range vals {
+	count := validators.GetValidatorsCountForBlock(uint64(height))
+
+	if len(vals) < count {
+		count = len(vals)
+	}
+
+	for _, val := range vals[:count] {
 		responseValidators = append(responseValidators, makeResponseValidator(val, rState))
 	}
 

core/state/statedb.go

@@ -776,7 +776,7 @@ func (s *StateDB) GetCandidates(count int, block int64) []Candidate {
 	// TODO: remove condition in next testnet
 	if block >= 15000 {
 		sort.Slice(activeCandidates, func(i, j int) bool {
-			return activeCandidates[i].TotalBipStake.Cmp(activeCandidates[j].TotalBipStake) == -1
+			return activeCandidates[i].TotalBipStake.Cmp(activeCandidates[j].TotalBipStake) == 1
 		})
 
 		activeCandidates = activeCandidates[:count]

version/version.go

@@ -4,12 +4,12 @@ package version
 const (
 	Maj = "0"
 	Min = "2"
-	Fix = "1"
+	Fix = "2"
 )
 
 var (
 	// Must be a string because scripts like dist.sh read this file.
-	Version = "0.2.1"
+	Version = "0.2.2"
 
 	// GitCommit is the current HEAD set using ldflags.
 	GitCommit string