feat: allow setting historical validators bulk count

QuokkaStake · Jul 31, 2023 · c22466e · c22466e
1 parent 28fa343
commit c22466e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/pkg/config/chain.go b/pkg/config/chain.go
@@ -6,15 +6,20 @@ import (
 	"gopkg.in/guregu/null.v4"
 )
 
+type ChainPagination struct {
+	HistoricalValidators int `default:"100"  toml:"historical-validators"`
+}
+
 type ChainConfig struct {
-	Name                 string    `toml:"name"`
-	PrettyName           string    `toml:"pretty-name"`
-	RPCEndpoints         []string  `toml:"rpc-endpoints"`
-	StoreBlocks          int64     `default:"20000"      toml:"store-blocks"`
-	BlocksWindow         int64     `default:"10000"      toml:"blocks-window"`
-	MinSignedPerWindow   float64   `default:"0.05"       toml:"min-signed-per-window"`
-	QueryEachSigningInfo null.Bool `default:"false"      toml:"query-each-signing-info"`
-	QuerySlashingParams  null.Bool `default:"true"       toml:"query-slashing-params"`
+	Name                 string          `toml:"name"`
+	PrettyName           string          `toml:"pretty-name"`
+	RPCEndpoints         []string        `toml:"rpc-endpoints"`
+	StoreBlocks          int64           `default:"20000"      toml:"store-blocks"`
+	BlocksWindow         int64           `default:"10000"      toml:"blocks-window"`
+	MinSignedPerWindow   float64         `default:"0.05"       toml:"min-signed-per-window"`
+	QueryEachSigningInfo null.Bool       `default:"false"      toml:"query-each-signing-info"`
+	QuerySlashingParams  null.Bool       `default:"true"       toml:"query-slashing-params"`
+	Pagination           ChainPagination `toml:"pagination"`
 
 	IsConsumer              null.Bool `default:"false"                  toml:"consumer"`
 	ProviderRPCEndpoints    []string  `toml:"provider-rpc-endpoints"`

diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go
@@ -9,8 +9,6 @@ const (
 	BlockSearchPagination       int64  = 100
 	ValidatorsQueryPagination   uint64 = 1000
 	SigningInfosQueryPagination uint64 = 1000
-	ActiveSetPagination         int    = 100
-	ActiveSetsBulkQueryCount    int64  = 50
 
 	NewBlocksQuery = "tm.event='NewBlock'"
 

diff --git a/pkg/tendermint/http.go b/pkg/tendermint/http.go
@@ -240,7 +240,7 @@ func (rpc *RPC) GetActiveSetAtBlock(height int64) (map[string]bool, error) {
 		queryURL := fmt.Sprintf(
 			"/validators?height=%d&per_page=%d&page=%d",
 			height,
-			constants.ActiveSetPagination,
+			rpc.config.Pagination.HistoricalValidators,
 			page,
 		)
 
@@ -268,7 +268,7 @@ func (rpc *RPC) GetActiveSetAtBlock(height int64) (map[string]bool, error) {
 			activeSetMap[validator.Address] = true
 		}
 
-		if len(response.Result.Validators) < constants.ActiveSetPagination {
+		if len(response.Result.Validators) < rpc.config.Pagination.HistoricalValidators {
 			break
 		}
 

diff --git a/pkg/types/responses.go b/pkg/types/responses.go
@@ -89,6 +89,8 @@ type ValidatorsResponse struct {
 
 type ValidatorsResult struct {
 	Validators []HistoricalValidator `json:"validators"`
+	Count      string                `json:"count"`
+	Total      string                `json:"total"`
 }
 
 type HistoricalValidator struct {